浏览代码

format

/siyaoH-1.17-PlatformMessage
siyao 4 年前
当前提交
59dbc978
共有 11 个文件被更改,包括 51 次插入60 次删除
  1. 5
      Samples/UIWidgetsSamples_2019_4/Assets/Script/ImageTest.cs
  2. 3
      com.unity.uiwidgets/Runtime/engine2/UIWidgetsPanelWrapper.cs
  3. 6
      com.unity.uiwidgets/Runtime/material/animated_icons/animated_icons_data.cs
  4. 4
      com.unity.uiwidgets/Runtime/material/animated_icons/data/add_event.g.cs
  5. 4
      com.unity.uiwidgets/Runtime/material/animated_icons/data/arrow_menu.g.cs
  6. 4
      com.unity.uiwidgets/Runtime/material/animated_icons/data/close_menu.g.cs
  7. 4
      com.unity.uiwidgets/Runtime/material/animated_icons/data/ellipsis_search.g.cs
  8. 4
      com.unity.uiwidgets/Runtime/material/animated_icons/data/event_add.g.cs
  9. 68
      engine/Build.bee.cs
  10. 2
      engine/README.md
  11. 7
      engine/src/shell/platform/unity/android/uiwidgets_panel.cc

5
Samples/UIWidgetsSamples_2019_4/Assets/Script/ImageTest.cs


using Unity.UIWidgets.painting;
using Unity.UIWidgets.ui;
using Unity.UIWidgets.widgets;
using UnityEngine;
using Color = Unity.UIWidgets.ui.Color;
using FontStyle = Unity.UIWidgets.ui.FontStyle;
using Image = Unity.UIWidgets.widgets.Image;
using TextStyle = Unity.UIWidgets.painting.TextStyle;

decoration: new BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(8))
),
// child: Image.file("test.gif", gaplessPlayback: true)
child:Image.network( System.IO.Path.Combine(Application.streamingAssetsPath, "test.gif"), gaplessPlayback: true)
child: Image.file("test.gif", gaplessPlayback: true)
),
new Container(
width: 200,

3
com.unity.uiwidgets/Runtime/engine2/UIWidgetsPanelWrapper.cs


public void Initiate(IUIWidgetsWindow host, int width, int height, float dpr, Configurations _configurations) {
D.assert(renderTexture == null);
NativeConsole.OnEnable();
#if !UNITY_EDITOR && UNITY_ANDROID
AndroidUnpackStreamingAssets.OnEnable();
#endif

var fontsetting = new Dictionary<string, object>();
fontsetting.Add("fonts", _configurations.fontsToObject());
_enableUIWidgetsPanel(JSONMessageCodec.instance.toJson(message: fontsetting));
NativeConsole.OnEnable();
}
public void _entryPoint() {

6
com.unity.uiwidgets/Runtime/material/animated_icons/animated_icons_data.cs


namespace Unity.UIWidgets.material {
public abstract class AnimatedIcons {
//public static readonly AnimatedIconData add_event = AnimatedIconsData._add_event;
public static readonly AnimatedIconData add_event = AnimatedIconsData._add_event;
//public static readonly AnimatedIconData arrow_menu = AnimatedIconsData._arrow_menu;
public static readonly AnimatedIconData arrow_menu = AnimatedIconsData._arrow_menu;
//public static readonly AnimatedIconData close_menu = AnimatedIconsData._close_menu;
public static readonly AnimatedIconData close_menu = AnimatedIconsData._close_menu;
// public readonly AnimatedIconData ellipsis_search = AnimatedIconsData._ellipsis_search;

4
com.unity.uiwidgets/Runtime/material/animated_icons/data/add_event.g.cs


/*using System.Collections.Generic;
using System.Collections.Generic;
using Unity.UIWidgets.ui;
using UnityEngine;

);
}
}*/
}

4
com.unity.uiwidgets/Runtime/material/animated_icons/data/arrow_menu.g.cs


/*using System.Collections.Generic;
using System.Collections.Generic;
using Unity.UIWidgets.ui;
using UnityEngine;

);
}
}*/
}

4
com.unity.uiwidgets/Runtime/material/animated_icons/data/close_menu.g.cs


/*using System.Collections.Generic;
using System.Collections.Generic;
using Unity.UIWidgets.ui;
using UnityEngine;

);
}
}*/
}

4
com.unity.uiwidgets/Runtime/material/animated_icons/data/ellipsis_search.g.cs


/*using Unity.UIWidgets.ui;
using Unity.UIWidgets.ui;
using System.Collections.Generic;
namespace Unity.UIWidgets.material

}
);
}
}*/
}

4
com.unity.uiwidgets/Runtime/material/animated_icons/data/event_add.g.cs


/*using Unity.UIWidgets.ui;
using Unity.UIWidgets.ui;
using System.Collections.Generic;
namespace Unity.UIWidgets.material {

}
);
}
}*/
}

68
engine/Build.bee.cs


"-Wl,-soname=libUIWidgets_d.so",
"-Wl,--whole-archive",
}));
if (platform == UIWidgetsBuildTargetPlatform.android)
{
SetupSkia(np);
}
else
{
SetupDependency(np);
//SetupFml(np);
//SetupSkia(np);
//SetupTxt(np);
}
SetupDependency(np);
//SetupFml(np);
//SetupSkia(np);
//SetupTxt(np);
var codegens = new[] { CodeGen.Debug };
dependencies = new List<NPath>();

new SystemFramework("CoreVideo"),
};
});
np.Libraries.Add(IsAndroid, c =>
{
var basePath = skiaRoot + "/out/arm";
return new PrecompiledLibrary[]
{
// icudtl
new StaticLibrary("icudtl.o"),
new StaticLibrary(flutterRoot+"/third_party/android_tools/ndk/platforms/android-16/arch-arm/usr/lib/crtbegin_so.o"),
new StaticLibrary(flutterRoot+"/third_party/android_tools/ndk/platforms/android-16/arch-arm/usr/lib/crtend_so.o"),
new StaticLibrary(flutterRoot+"/out/android_debug_unopt/obj/flutter/third_party/txt/libtxt_lib.a"),
new SystemLibrary("android_support"),
new SystemLibrary("unwind"),
new SystemLibrary("gcc"),
new SystemLibrary("c"),
new SystemLibrary("dl"),
new SystemLibrary("m"),
new SystemLibrary("android"),
new SystemLibrary("EGL"),
new SystemLibrary("GLESv2"),
new SystemLibrary("log"),
};
});
}
static void SetupSkia(NativeProgram np)

};
});
np.Libraries.Add(IsAndroid, c =>
{
var basePath = skiaRoot + "/out/arm";
return new PrecompiledLibrary[]
{
// icudtl
new StaticLibrary("icudtl.o"),
new StaticLibrary(flutterRoot+"/third_party/android_tools/ndk/platforms/android-16/arch-arm/usr/lib/crtbegin_so.o"),
new StaticLibrary(flutterRoot+"/third_party/android_tools/ndk/platforms/android-16/arch-arm/usr/lib/crtend_so.o"),
new StaticLibrary(flutterRoot+"/out/android_debug_unopt/obj/flutter/third_party/txt/libtxt_lib.a"),
new SystemLibrary("android_support"),
new SystemLibrary("unwind"),
new SystemLibrary("gcc"),
new SystemLibrary("c"),
new SystemLibrary("dl"),
new SystemLibrary("m"),
new SystemLibrary("android"),
new SystemLibrary("EGL"),
new SystemLibrary("GLESv2"),
new SystemLibrary("log"),
};
});
var basePath = skiaRoot + "/out/Debug";
np.SupportFiles.Add(c => IsWindows(c), new[] {

2
engine/README.md


cd $FLUTTER_ROOT
python ./flutter/tools/gn --unoptimized --android
ninja -C out/android_debug_unopt/ flutter/third_party/txt:txt_lib
ninja -C out/android_debug_unopt/ third_party/libcxx
ninja -C out/android_debug_unopt/ third_party/libcxxabi
```
If the compilation fails because "no available Mac SDK is found" (in flutter-1.17 the build tool will only try to find Mac 10.XX SDKs), please modify the file "/src/build/Mac/find_sdk.py" under flutter root by setting "sdks" as your current sdk, e.g., ['11.0'].
### build icu

7
engine/src/shell/platform/unity/android/uiwidgets_panel.cc


ui_task_runner.identifier = 2;
ui_task_runner.user_data = task_runner_.get();
// TODO: waht is this
ui_task_runner.runs_task_on_current_thread_callback =
[](void *user_data) -> bool {
return static_cast<CocoaTaskRunner *>(user_data)->RunsTasksOnCurrentThread();

args.assets_path = streaming_assets_path;
args.font_asset = settings;
// // std::string icu_path = std::string(streaming_assets_path) + "/icudtl.dat";
// // args.icu_data_path = icu_path.c_str();
args.icu_mapper = GetICUStaticMapping;

int UIWidgetsPanel::RegisterTexture(void *native_texture_ptr)
{
std::cerr << "registering external texture is not implemented for android" << std::endl;
int texture_identifier = 0;
// texture_identifier++;

void UIWidgetsPanel::UnregisterTexture(int texture_id)
{
std::cerr << "registering external texture is not implemented for android" << std::endl;
auto *engine = reinterpret_cast<EmbedderEngine *>(engine_);
engine->GetShell().GetPlatformView()->UnregisterTexture(texture_id);
}

正在加载...
取消
保存