升级至0.4.0-12

gradle.properties

@@ -25,7 +25,7 @@ kotlin.debug.generateLineNumbers=true
 kotlin.debug.generateLocalVariables=true
 
 
-ohosSkikoVersion=0.9.22.2-0.4.0-03
+ohosSkikoVersion=0.9.22.2-0.4.0-04
 #rendererBackend=fusion-renderer
 #rendererBackend=skia
 

gradle/libs.versions.toml

@@ -15,18 +15,16 @@ androidx-espresso = "3.7.0"
 androidx-lifecycle = "2.9.6"
 androidx-material = "1.12.0"
 androidx-testExt = "1.3.0"
-
+junit = "4.13.2"
 # Compose
 compose = "1.9.4"
 compose-material3 = "1.4.0"
-composeMultiplatform = "1.9.2-0.4.0-04"
+composeMultiplatform = "1.9.2-0.4.0-12"
 
 # Kotlin & testing
-junit = "4.13.2"
 kotlin = "2.2.21-0.4.0-02"
-kotlinx-coroutines = "1.10.2-0.4.0-01"
-atomicFu = "0.31.0-0.4.0-01"
-skiko = "0.9.22.2-0.4.0-03"
+kotlinx-coroutines = "1.10.2-0.4.0-02"
+atomicFu = "0.31.0-0.4.0-02"
 
 
 [libraries]

harmonyApp/AppScope/app.json5

@@ -5,8 +5,8 @@
     "versionCode": 1000000,
     "versionName": "1.0.0",
     "icon": "$media:layered_image",
-    "label": "$string:app_name"
+    "label": "$string:app_name",
     //"hwasanEnabled": true
-    //"asanEnabled": true
+    "asanEnabled": true
   }
 }

harmonyApp/entry/build-profile.json5

@@ -9,7 +9,7 @@
     "externalNativeOptions": {
       "path": "./src/main/cpp/CMakeLists.txt",
       //"arguments": "-DOHOS_ENABLE_HWASAN=ON",
-      //"arguments": "-DOH0S_ENABLE_ASAN=ON",
+      "arguments": "-DOHOS_ENABLE_ASAN=ON",
       "cppFlags": "",
       "abiFilters": ["arm64-v8a","x86_64"]
     },

harmonyApp/entry/src/main/cpp/include/arm64-v8a/libkn_api.h

@@ -235,6 +235,9 @@ extern void androidx_compose_ui_arkui_ArkUIViewController_setRendererBackendId(v
 extern void androidx_compose_ui_arkui_ArkUIViewController_setRootView(void* controllerRef, void* backRootView, void* foreRootView, void* touchableRootView);
 extern void androidx_compose_ui_arkui_ArkUIViewController_setUIContext(void* controllerRef, void* uiContext);
 extern void androidx_compose_ui_arkui_ArkUIViewController_setXComponentRender(void* controllerRef, void* render);
+extern void androidx_compose_ui_platform_LowMemoryMonitor_notifyLowMemoryFromHost(libkn_KInt rawLevel);
+extern libkn_KFloat androidx_compose_ui_arkui_ArkUIViewController_consumeOuterScroll(void* controllerRef, libkn_KFloat offsetVp, libkn_KInt sourceInt);
+extern void androidx_compose_ui_arkui_ArkUIViewController_setParentScrollBridge(void* controllerRef, void* scroller);
 extern void androidx_compose_ui_arkui_init(void* env, void* exports);
 
 typedef struct {
@@ -1147,7 +1150,10 @@ typedef struct {
                 void (*_Export_ArkUIViewController_setRootView)(void* controllerRef, void* backRootView, void* foreRootView, void* touchableRootView);
                 void (*_Export_ArkUIViewController_setUIContext)(void* controllerRef, void* uiContext);
                 void (*_Export_ArkUIViewController_setXComponentRender)(void* controllerRef, void* render);
+                void (*_Export_LowMemoryMonitor_notifyLowMemoryFromHost)(libkn_KInt rawLevel);
                 libkn_KLong (*getCurrentTimeNanos)();
+                libkn_KFloat (*_Export_ArkUIViewController_consumeOuterScroll)(void* controllerRef, libkn_KFloat offsetVp, libkn_KInt sourceInt);
+                void (*_Export_ArkUIViewController_setParentScrollBridge)(void* controllerRef, void* scroller);
                 void (*_Export_ArkUIViewInitializer_init)(void* env, void* exports);
               } arkui;
             } ui;

harmonyApp/entry/src/main/cpp/include/x86_64/libkn_api.h

@@ -235,6 +235,9 @@ extern void androidx_compose_ui_arkui_ArkUIViewController_setRendererBackendId(v
 extern void androidx_compose_ui_arkui_ArkUIViewController_setRootView(void* controllerRef, void* backRootView, void* foreRootView, void* touchableRootView);
 extern void androidx_compose_ui_arkui_ArkUIViewController_setUIContext(void* controllerRef, void* uiContext);
 extern void androidx_compose_ui_arkui_ArkUIViewController_setXComponentRender(void* controllerRef, void* render);
+extern void androidx_compose_ui_platform_LowMemoryMonitor_notifyLowMemoryFromHost(libkn_KInt rawLevel);
+extern libkn_KFloat androidx_compose_ui_arkui_ArkUIViewController_consumeOuterScroll(void* controllerRef, libkn_KFloat offsetVp, libkn_KInt sourceInt);
+extern void androidx_compose_ui_arkui_ArkUIViewController_setParentScrollBridge(void* controllerRef, void* scroller);
 extern void androidx_compose_ui_arkui_init(void* env, void* exports);
 
 typedef struct {
@@ -1147,7 +1150,10 @@ typedef struct {
                 void (*_Export_ArkUIViewController_setRootView)(void* controllerRef, void* backRootView, void* foreRootView, void* touchableRootView);
                 void (*_Export_ArkUIViewController_setUIContext)(void* controllerRef, void* uiContext);
                 void (*_Export_ArkUIViewController_setXComponentRender)(void* controllerRef, void* render);
+                void (*_Export_LowMemoryMonitor_notifyLowMemoryFromHost)(libkn_KInt rawLevel);
                 libkn_KLong (*getCurrentTimeNanos)();
+                libkn_KFloat (*_Export_ArkUIViewController_consumeOuterScroll)(void* controllerRef, libkn_KFloat offsetVp, libkn_KInt sourceInt);
+                void (*_Export_ArkUIViewController_setParentScrollBridge)(void* controllerRef, void* scroller);
                 void (*_Export_ArkUIViewInitializer_init)(void* env, void* exports);
               } arkui;
             } ui;

harmonyApp/entry/src/main/cpp/napi_init.cpp

@@ -9,8 +9,8 @@
 #define LOG_DOMAIN 0x0000
 #endif
 
-static napi_value MainArkUIViewController(napi_env env, napi_callback_info info) {
-    return reinterpret_cast<napi_value>(MainArkUIViewController(env));
+static napi_value NapiMainArkUIViewController(napi_env env, napi_callback_info /*info*/) {
+    return reinterpret_cast<napi_value>(::MainArkUIViewController(env));
 }
 
 
@@ -27,7 +27,7 @@ EXTERN_C_START
 static napi_value Init(napi_env env, napi_value exports) {
     androidx_compose_ui_arkui_init(env, exports);
     napi_property_descriptor desc[] = {
-        {"MainArkUIViewController", nullptr, MainArkUIViewController, nullptr, nullptr, nullptr, napi_default, nullptr},
+        {"MainArkUIViewController", nullptr, NapiMainArkUIViewController, nullptr, nullptr, nullptr, napi_default, nullptr},
         {"testArkTsToKotin", nullptr, nativeTestArkTsToKotin, nullptr, nullptr, nullptr, napi_default, nullptr},
     };
     napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc);