update RNOH SDK dependence from local to remote (#473)

* fix harmony more than 2M issue

* fix mtpush-react-native conflics

* update harmony remote dependency flow

* udpate

* udpate

* udpate

* udpate

* udpate

* update

* uddate

* udpapte

Example/harmony_use_pushy/harmony/entry/src/main/cpp/CMakeLists.txt

@@ -2,12 +2,23 @@ cmake_minimum_required(VERSION 3.16)
 project(rnapp)
 set(RNOH_APP_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(NODE_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../node_modules")
-set(RNOH_CPP_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../libs/rnoh/src/main/cpp")
+set(OH_MODULE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../oh_modules")
+set(RNOH_CPP_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../oh_modules/@rnoh/react-native-openharmony/src/main/cpp")
 set(OH_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/../../../oh_modules")
-add_subdirectory("${OH_MODULES}/pushy/src/main/cpp" ./pushy)
+set(LOG_VERBOSITY_LEVEL 1)
+set(CMAKE_ASM_FLAGS "-Wno-error=unused-command-line-argument -Qunused-arguments")
+set(CMAKE_CXX_FLAGS "-fstack-protector-strong -Wl,-z,relro,-z,now,-z,noexecstack -s -fPIE -pie")
+set(OH_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/../../../oh_modules")
+set(WITH_HITRACE_SYSTRACE 1) # for other CMakeLists.txt files to use
+add_compile_definitions(WITH_HITRACE_SYSTRACE)
 
+add_subdirectory("${OH_MODULES}/pushy/src/main/cpp" ./pushy)
 add_subdirectory("${RNOH_CPP_DIR}" ./rn)
+
+file(GLOB GENERATED_CPP_FILES "${CMAKE_CURRENT_SOURCE_DIR}/generated/*.cpp") # this line is needed by codegen v1
+
 add_library(rnoh_app SHARED
+    ${GENERATED_CPP_FILES}
     "./PackageProvider.cpp"
     "${RNOH_CPP_DIR}/RNOHAppNapiBridge.cpp"
 )

Example/harmony_use_pushy/harmony/entry/src/main/ets/RNPackagesFactory.ts

@@ -1,4 +1,4 @@
-import type {RNPackageContext, RNPackage} from 'rnoh/ts';
+import type {RNPackageContext, RNPackage} from '@rnoh/react-native-openharmony/ts';
 import {PushyPackage} from 'pushy/ts';
 
 export function createRNPackages(ctx: RNPackageContext): RNPackage[] {

Example/harmony_use_pushy/harmony/entry/src/main/ets/entryability/EntryAbility.ets

@@ -1,4 +1,4 @@
-import {RNAbility} from 'rnoh/ts';
+import {RNAbility} from '@rnoh/react-native-openharmony';
 
 export default class EntryAbility extends RNAbility {
   getPagePath() {

Example/harmony_use_pushy/harmony/entry/src/main/ets/pages/Index.ets

@@ -1,26 +1,32 @@
 import { FileJSBundleProvider } from 'pushy/src/main/ets/FileJSBundleProvider';
-import { ComponentBuilderContext, JSBundleProvider, RNOHLogger } from 'rnoh';
+import { ComponentBuilderContext, RNOHCoreContext,RNAbility } from '@rnoh/react-native-openharmony';
 import {
   RNApp,
-  RNAbility,
   AnyJSBundleProvider,
   ResourceJSBundleProvider,
   TraceJSBundleProviderDecorator,
-} from 'rnoh'
+} from '@rnoh/react-native-openharmony'
 import { createRNPackages } from '../RNPackagesFactory'
+import preferences from '@ohos.data.preferences';
+
+const arkTsComponentNames: Array<string> = [];
 
 @Builder
-export function CustomComponentBuilder(ctx: ComponentBuilderContext) {
-
+export function buildCustomRNComponent(ctx: ComponentBuilderContext) {
+  // There seems to be a problem with the placement of ArkTS components in mixed mode. Nested Stack temporarily avoided.
+  Stack() {
+  }
+  .position({ x: 0, y: 0 })
 }
 
 
+const wrappedCustomRNComponentBuilder = wrapBuilder(buildCustomRNComponent)
+
 @Entry
 @Component
 struct Index {
-  @StorageLink('RNAbility') private rnAbility: RNAbility | undefined = undefined
+  @StorageLink('RNOHCoreContext') private rnohCoreContext: RNOHCoreContext | undefined = undefined
   @State shouldShow: boolean = false
-  @State message: string = 'Hello World';
 
   aboutToAppear(): void {
     this.shouldShow = true
@@ -30,28 +36,37 @@ struct Index {
     // NOTE: this is required since `Ability`'s `onBackPressed` function always
     // terminates or puts the app in the background, but we want Ark to ignore it completely
     // when handled by RN
-    return this.rnAbility?.onBackPress();
+    this.rnohCoreContext!.dispatchBackPress()
+
+    // this.preferences = preferences.getPreferencesSync(this.context, {name:'update'});
+    return true
   }
 
   build() {
     Column() {
-      if (this.rnAbility && this.shouldShow) {
+      if (this.rnohCoreContext && this.shouldShow) {
         RNApp({
-          rnInstanceConfig: { createRNPackages },
+          rnInstanceConfig: {
+            createRNPackages,
+            enableNDKTextMeasuring: true,
+            enableBackgroundExecutor: false,
+            enableCAPIArchitecture: true,
+            arkTsComponentNames: arkTsComponentNames,
+          },
           initialProps: { "foo": "bar" } as Record<string, string>,
           appKey: "harmony_use_pushy",
-          buildCustomComponent: CustomComponentBuilder,
+          wrappedCustomRNComponentBuilder: wrappedCustomRNComponentBuilder,
           onSetUp: (rnInstance) => {
             rnInstance.enableFeatureFlag("ENABLE_RN_INSTANCE_CLEAN_UP")
           },
           jsBundleProvider: new TraceJSBundleProviderDecorator(
             new AnyJSBundleProvider([
               // MetroJSBundleProvider.fromServerIp('127.0.0.1'),
-              // new ResourceJSBundleProvider(this.rnAbility.context.resourceManager, 'hermes_bundle.hbc'),
-              new FileJSBundleProvider(this.rnAbility.context),
-              new ResourceJSBundleProvider(this.rnAbility.context.resourceManager, 'bundle.harmony.js')
+              // new ResourceJSBundleProvider(rnohCoreContext.uiAbilityContext.resourceManager, 'hermes_bundle.hbc'),
+              new FileJSBundleProvider(this.rnohCoreContext.uiAbilityContext),
+              new ResourceJSBundleProvider(this.rnohCoreContext.uiAbilityContext.resourceManager, 'bundle.harmony.js')
             ]),
-            this.rnAbility.getLogger()),
+            this.rnohCoreContext.logger),
         })
       }
     }

Example/harmony_use_pushy/harmony/entry/src/main/resources/rawfile/meta.json

@@ -0,0 +1,4 @@
+{
+    "pushy_build_time": "2025-02-14T09:43:25.648Z",
+    "versionName": "1.0.0"
+}

Example/harmony_use_pushy/harmony/entry/src/main/resources/rawfile/update.json

@@ -0,0 +1,14 @@
+{
+  "ios": {
+    "appId": 24794,
+    "appKey": "SqShg4Klnj2hG6LAFMW2PdcgSSuniz0T"
+  },
+  "android": {
+    "appId": 27509,
+    "appKey": "aQz3Uc2pA7gt_prDaQ4rbWRY"
+  },
+  "harmony": {
+    "appId": 29140,
+    "appKey": "JLklGflGIRbY-cMebjQwm1J1"
+  }
+}