From 26a5414ab4be4ece7d1cf715fd7bf7e09c1b3b7e Mon Sep 17 00:00:00 2001 From: Galen wei <1947612015@qq.com> Date: Thu, 13 Feb 2025 17:16:46 +0800 Subject: [PATCH 01/10] Format the code format of the Sample project Signed-off-by: Galen wei <1947612015@qq.com> --- .../entry/src/main/ets/pages/Index.ets | 3 +- .../src/main/ets/RNComponent/SelectBox.ets | 5 +- .../entry/src/main/ets/pages/Index.ets | 6 +- .../main/ets/entryability/EntryAbility.ets | 10 +- .../entry/src/main/ets/pages/RNPage.ets | 2 - .../entry/src/main/ets/pages/common.ets | 1 - .../entry/src/main/ets/rn/BaseRN.ets | 2 +- .../entry/src/main/ets/rn/LoadBundle.ets | 21 ++-- .../entry/src/main/ets/pages/Index.ets | 4 +- .../entry/src/main/ets/pages/Index.ets | 7 +- .../main/ets/entryability/EntryAbility.ets | 2 - .../entry/src/main/ets/pages/Index.ets | 105 +++++++++--------- .../main/cpp/ButtonView/ButtonViewJSIBinder.h | 1 - .../ets/TurboModule/SampleTurboModule.ets | 8 +- .../main/ets/TurboModule/SampleTurboModule.ts | 8 +- .../src/main/ets/customView/MarqueeView.ets | 7 +- .../main/ets/entryability/EntryAbility.ets | 2 - .../entry/src/main/ets/pages/Details.ets | 1 - .../entry/src/main/ets/pages/Index.ets | 26 +++-- .../entry/src/main/ets/pages/MultiSurface.ets | 35 +++--- .../src/main/ets/pages/SandboxBundle.ets | 5 +- .../entry/src/main/ets/pages/Test.ets | 1 - .../src/main/ets/rn/BasePrecreateView.ets | 4 +- .../entry/src/main/ets/rn/LoadBundle.ets | 15 ++- .../entry/src/main/ets/pages/Index.ets | 10 +- .../main/ets/entryability/EntryAbility.ets | 1 + .../entry/src/main/ets/pages/RNPage.ets | 3 +- .../main/ets/entryability/EntryAbility.ets | 3 - .../entry/src/main/ets/pages/Index.ets | 44 ++++---- .../ets/TurboModule/SampleTurboModule.ets | 8 +- .../main/ets/TurboModule/SampleTurboModule.ts | 8 +- .../TurboModule/SampleWorkerTurboModule.ets | 11 +- .../main/ets/entryability/EntryAbility.ets | 3 - .../entry/src/main/ets/pages/Index.ets | 1 - 34 files changed, 198 insertions(+), 175 deletions(-) diff --git a/docs/Samples/Capture_bundle/NativeProject/entry/src/main/ets/pages/Index.ets b/docs/Samples/Capture_bundle/NativeProject/entry/src/main/ets/pages/Index.ets index bc6ef0a3..9ce6839c3 100644 --- a/docs/Samples/Capture_bundle/NativeProject/entry/src/main/ets/pages/Index.ets +++ b/docs/Samples/Capture_bundle/NativeProject/entry/src/main/ets/pages/Index.ets @@ -20,7 +20,8 @@ import { import { createRNPackages } from '../RNPackagesFactory'; @Builder -export function buildCustomRNComponent(ctx: ComponentBuilderContext) {}; +export function buildCustomRNComponent(ctx: ComponentBuilderContext) { +}; const wrappedCustomRNComponentBuilder = wrapBuilder(buildCustomRNComponent); diff --git a/docs/Samples/FabricComponentSample/NativeProject/entry/src/main/ets/RNComponent/SelectBox.ets b/docs/Samples/FabricComponentSample/NativeProject/entry/src/main/ets/RNComponent/SelectBox.ets index caa553ed..e7d3f3ca 100644 --- a/docs/Samples/FabricComponentSample/NativeProject/entry/src/main/ets/RNComponent/SelectBox.ets +++ b/docs/Samples/FabricComponentSample/NativeProject/entry/src/main/ets/RNComponent/SelectBox.ets @@ -44,14 +44,15 @@ export struct SelectBox { this.onDescriptorWrapperChange(new RNC.SelectBox.DescriptorWrapper(descriptor)) } )) - this.cleanUpCallbacks.push(new RNC.SelectBox.CommandReceiver(this.ctx.componentCommandReceiver, this.tag).subscribe("emitNativeEvent", (argv) => { + this.cleanUpCallbacks.push(new RNC.SelectBox.CommandReceiver(this.ctx.componentCommandReceiver, + this.tag).subscribe("emitNativeEvent", (argv) => { console.log(`收到 RN 传来的消息 ================ ${JSON.stringify(argv)}`); this.mutil = argv[0] || false })) } private onDescriptorWrapperChange(descriptorWrapper: RNC.SelectBox.DescriptorWrapper) { - this.descriptorWrapper = descriptorWrapper + this.descriptorWrapper = descriptorWrapper this.data = [] const data = this.descriptorWrapper.props.data; const value = this.descriptorWrapper.props.value; diff --git a/docs/Samples/FabricComponentSample/NativeProject/entry/src/main/ets/pages/Index.ets b/docs/Samples/FabricComponentSample/NativeProject/entry/src/main/ets/pages/Index.ets index 571b6134..f49022cd 100644 --- a/docs/Samples/FabricComponentSample/NativeProject/entry/src/main/ets/pages/Index.ets +++ b/docs/Samples/FabricComponentSample/NativeProject/entry/src/main/ets/pages/Index.ets @@ -21,9 +21,10 @@ import { createRNPackages } from '../RNPackagesFactory'; import { SelectBox } from "../rnc/SelectBox" const arkTsComponentNames: Array = [SelectBox.NAME]; + @Builder export function buildCustomRNComponent(ctx: ComponentBuilderContext) { - Stack(){ + Stack() { if (ctx.componentName === SelectBox.NAME) { SelectBox({ ctx: ctx.rnComponentContext, @@ -31,7 +32,7 @@ export function buildCustomRNComponent(ctx: ComponentBuilderContext) { }) } } - .position({x:0, y: 0}) + .position({ x: 0, y: 0 }) } @@ -44,7 +45,6 @@ struct Index { @State shouldShow: boolean = false private logger!: RNOHLogger - aboutToAppear() { this.logger = this.rnohCoreContext!.logger.clone("Index") const stopTracing = this.logger.clone("aboutToAppear").startTracing() diff --git a/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/entryability/EntryAbility.ets b/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/entryability/EntryAbility.ets index 8cace666..48f7b51e 100644 --- a/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/entryability/EntryAbility.ets +++ b/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/entryability/EntryAbility.ets @@ -7,9 +7,7 @@ import dataPreferences from '@ohos.data.preferences'; import window from '@ohos.window'; -import { - RNAbility, -} from '@rnoh/react-native-openharmony'; +import { RNAbility, } from '@rnoh/react-native-openharmony'; export let preferences: dataPreferences.Preferences | null = null; @@ -21,9 +19,11 @@ export default class EntryAbility extends RNAbility { onWindowStageCreate(windowStage: window.WindowStage) { super.onWindowStageCreate(windowStage); try { - let options: dataPreferences.Options = { name: 'test'}; + let options: dataPreferences.Options = { + name: 'test' + }; preferences = dataPreferences.getPreferencesSync(this.context, options); - } catch(err) { + } catch (err) { console.error('Failed to get preferences'); } } diff --git a/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/pages/RNPage.ets b/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/pages/RNPage.ets index 92f25440..9d3d3299 100644 --- a/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/pages/RNPage.ets +++ b/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/pages/RNPage.ets @@ -8,10 +8,8 @@ import { RNOHCoreContext, ComponentBuilderContext, } from '@rnoh/react-native-openharmony'; import { NodeController, FrameNode, BuilderNode, Size } from '@ohos.arkui.node'; import { LoadManager } from '../rn'; - import { promptAction } from '@kit.ArkUI'; import FrameNodeRNPage from './FrameNodeRNPage'; - import { Params, BuilderData } from './BuilderType'; import { getRNController } from './common'; diff --git a/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/pages/common.ets b/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/pages/common.ets index 1a23db57..2df69eb9 100644 --- a/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/pages/common.ets +++ b/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/pages/common.ets @@ -29,7 +29,6 @@ function myRNPageBuilder(params: Params) { FrameNodeRNPage(params) .width('100%') .height('30%') - } } } diff --git a/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/rn/BaseRN.ets b/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/rn/BaseRN.ets index 239aaae7..6ac51e29 100644 --- a/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/rn/BaseRN.ets +++ b/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/rn/BaseRN.ets @@ -42,7 +42,7 @@ export struct BaseRN { RNSurface({ surfaceConfig: { appKey: this.moduleName, - initialProps: { "propA": "good" } as Record, + initialProps: { "propA": "good" } as Record, } as SurfaceConfig2, ctx: new RNComponentContext( RNOHContext.fromCoreContext(this.rnohCoreContext!, this.rnInstance), diff --git a/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/rn/LoadBundle.ets b/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/rn/LoadBundle.ets index d8561a8c..b2489346 100644 --- a/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/rn/LoadBundle.ets +++ b/docs/Samples/FrameNodeSample/FrameNodeSampleApp/entry/src/main/ets/rn/LoadBundle.ets @@ -16,34 +16,30 @@ import { buildRNComponentForTag, } from '@rnoh/react-native-openharmony'; import { createRNPackages } from './RNPackagesFactory' - import { ENABLE_CAPI_ARCHITECTURE } from './config'; export const arkTsComponentNames = []; -@Builder export function buildCustomComponent(ctx: ComponentBuilderContext) { - Stack(){ +@Builder +export function buildCustomComponent(ctx: ComponentBuilderContext) { + Stack() { } - .position({x:0, y:0}) + .position({ x: 0, y: 0 }) } export class LoadManager { - private static loadedBundle: Set = new Set(); public static metroInstance: RNInstance; public static cpInstance: RNInstance; public static bpInstance: RNInstance; - private static shouldResetMetroInstance: Boolean = true; static ctx: RNComponentContext; public static loadBundle(instance: RNInstance, bundlePath: string, useBundleCache: boolean = true): Promise { - if (LoadManager.loadedBundle.has(bundlePath) && useBundleCache) - { + if (LoadManager.loadedBundle.has(bundlePath) && useBundleCache) { return Promise.resolve(); - } - if (useBundleCache) - { + } + if (useBundleCache) { LoadManager.loadedBundle.add(bundlePath); } return instance.runJSBundle(new ResourceJSBundleProvider(getContext().resourceManager, bundlePath)); @@ -70,7 +66,8 @@ export class LoadManager { const provider = new MetroJSBundleProvider(); await LoadManager.metroInstance.runJSBundle(provider); - const jsBundleExecutionStatus: string = LoadManager.metroInstance.getBundleExecutionStatus(provider.getURL()) as string; + const jsBundleExecutionStatus: string = + LoadManager.metroInstance.getBundleExecutionStatus(provider.getURL()) as string; LoadManager.shouldResetMetroInstance = false; if (jsBundleExecutionStatus === "DONE") { return true diff --git a/docs/Samples/MutilBundleSample/NativeProject/entry/src/main/ets/pages/Index.ets b/docs/Samples/MutilBundleSample/NativeProject/entry/src/main/ets/pages/Index.ets index ae0f8441..d28ad757 100644 --- a/docs/Samples/MutilBundleSample/NativeProject/entry/src/main/ets/pages/Index.ets +++ b/docs/Samples/MutilBundleSample/NativeProject/entry/src/main/ets/pages/Index.ets @@ -6,9 +6,7 @@ */ import router from '@ohos.router'; -import { - ResourceJSBundleProvider, -} from '@rnoh/react-native-openharmony'; +import { ResourceJSBundleProvider, } from '@rnoh/react-native-openharmony'; import { RNInstanceManager } from "../rn/RNInstanceManager"; @Entry diff --git a/docs/Samples/RegisterFont/RegisterFontNativeProject/entry/src/main/ets/pages/Index.ets b/docs/Samples/RegisterFont/RegisterFontNativeProject/entry/src/main/ets/pages/Index.ets index 6d4ebc22..37d38b19 100644 --- a/docs/Samples/RegisterFont/RegisterFontNativeProject/entry/src/main/ets/pages/Index.ets +++ b/docs/Samples/RegisterFont/RegisterFontNativeProject/entry/src/main/ets/pages/Index.ets @@ -21,7 +21,8 @@ import { createRNPackages } from '../RNPackagesFactory'; import fs from '@ohos.file.fs'; @Builder -export function buildCustomRNComponent(ctx: ComponentBuilderContext) {}; +export function buildCustomRNComponent(ctx: ComponentBuilderContext) { +}; const wrappedCustomRNComponentBuilder = wrapBuilder(buildCustomRNComponent); @Entry @@ -56,8 +57,8 @@ struct Index { } if (this.rnAbility) { RNApp({ - rnInstanceConfig: { - createRNPackages, + rnInstanceConfig: { + createRNPackages, enableCAPIArchitecture: true, arkTsComponentNames: [], fontResourceByFontFamily: { diff --git a/docs/Samples/RootTagSample/NativeProject/entry/src/main/ets/entryability/EntryAbility.ets b/docs/Samples/RootTagSample/NativeProject/entry/src/main/ets/entryability/EntryAbility.ets index 59ae400a..32cb381b 100644 --- a/docs/Samples/RootTagSample/NativeProject/entry/src/main/ets/entryability/EntryAbility.ets +++ b/docs/Samples/RootTagSample/NativeProject/entry/src/main/ets/entryability/EntryAbility.ets @@ -6,7 +6,6 @@ */ import { RNAbility, } from '@rnoh/react-native-openharmony'; - import dataPreferences from '@ohos.data.preferences'; import window from '@ohos.window'; @@ -27,7 +26,6 @@ export default class EntryAbility extends RNAbility { } catch (err) { console.error('Failed to get preferences'); } - AppStorage.setOrCreate('RNAbility', this); } } diff --git a/docs/Samples/RootTagSample/NativeProject/entry/src/main/ets/pages/Index.ets b/docs/Samples/RootTagSample/NativeProject/entry/src/main/ets/pages/Index.ets index 6fafb1ef..c46722b3 100644 --- a/docs/Samples/RootTagSample/NativeProject/entry/src/main/ets/pages/Index.ets +++ b/docs/Samples/RootTagSample/NativeProject/entry/src/main/ets/pages/Index.ets @@ -21,7 +21,8 @@ import { @Builder function buildCustomComponent(ctx: ComponentBuilderContext) { - Stack() {} + Stack() { + } .position({ x: 0, y: 0 }) } @@ -57,62 +58,66 @@ export struct Index { enableCAPIArchitecture: true, arkTsComponentNames: [] }); - await this.instance.runJSBundle(new ResourceJSBundleProvider(getContext().resourceManager, this.bundlePath)).then(() => { - this.isBundleReady = true; - }) - + await this.instance.runJSBundle(new ResourceJSBundleProvider(getContext().resourceManager, this.bundlePath)) + .then(() => { + this.isBundleReady = true; + }) } build() { NavDestination() { if (this.isBundleReady) { - Column() { - Row() { - RNSurface({ - surfaceConfig: { - appKey: 'Hotel_Page', - }, - ctx: new RNComponentContext( - RNOHContext.fromCoreContext(this.rnohCoreContext!, this.instance), - wrappedCustomRNComponentBuilder, - wrapBuilder(buildRNComponentForTag), - new Map() - ), - updateViewRootTag: (rnInstance: RNInstance, rootViewTag: Tag) => { - // 将当前RNSurface的RNInstance和rootTag保存起来 - this.receivedRootTag = rootViewTag; - this.receivedInstance = rnInstance; - } - }) - } - .height("45%") - Row() { - Button("CLICK ME") - .onClick(() => { - // 向RN发送消息 - this.instance?.emitDeviceEvent("clickEvent", { params: ({ - rootTag: this.receivedRootTag - } as Params) }) + Column() { + Row() { + RNSurface({ + surfaceConfig: { + appKey: 'Hotel_Page', + }, + ctx: new RNComponentContext( + RNOHContext.fromCoreContext(this.rnohCoreContext!, this.instance), + wrappedCustomRNComponentBuilder, + wrapBuilder(buildRNComponentForTag), + new Map() + ), + updateViewRootTag: (rnInstance: RNInstance, rootViewTag: Tag) => { + // 将当前RNSurface的RNInstance和rootTag保存起来 + this.receivedRootTag = rootViewTag; + this.receivedInstance = rnInstance; + } }) + } + .height("45%") + + Row() { + Button("CLICK ME") + .onClick(() => { + // 向RN发送消息 + this.instance?.emitDeviceEvent("clickEvent", { + params: ({ + rootTag: this.receivedRootTag + } as Params) + }) + }) + } + .height("10%") + + Row() { + RNSurface({ + surfaceConfig: { + appKey: 'Ticket_Page', + }, + ctx: new RNComponentContext( + RNOHContext.fromCoreContext(this.rnohCoreContext!, this.instance), + wrappedCustomRNComponentBuilder, + wrapBuilder(buildRNComponentForTag), + new Map() + ), + }) + } + .height("45%") } - .height("10%") - Row() { - RNSurface({ - surfaceConfig: { - appKey: 'Ticket_Page', - }, - ctx: new RNComponentContext( - RNOHContext.fromCoreContext(this.rnohCoreContext!, this.instance), - wrappedCustomRNComponentBuilder, - wrapBuilder(buildRNComponentForTag), - new Map() - ), - }) - } - .height("45%") - } - .width('100%') - .height('100%') + .width('100%') + .height('100%') } } } diff --git a/docs/Samples/Sample/SampleApp/entry/src/main/cpp/ButtonView/ButtonViewJSIBinder.h b/docs/Samples/Sample/SampleApp/entry/src/main/cpp/ButtonView/ButtonViewJSIBinder.h index dbbff00e..65755c7a 100644 --- a/docs/Samples/Sample/SampleApp/entry/src/main/cpp/ButtonView/ButtonViewJSIBinder.h +++ b/docs/Samples/Sample/SampleApp/entry/src/main/cpp/ButtonView/ButtonViewJSIBinder.h @@ -19,7 +19,6 @@ namespace rnoh { facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override { facebook::jsi::Object events(rt); - events.setProperty(rt, "topButtonClick", createDirectEvent(rt, "onButtonClick")); return events; } diff --git a/docs/Samples/Sample/SampleApp/entry/src/main/ets/TurboModule/SampleTurboModule.ets b/docs/Samples/Sample/SampleApp/entry/src/main/ets/TurboModule/SampleTurboModule.ets index 767b695c..dcc48fa0 100644 --- a/docs/Samples/Sample/SampleApp/entry/src/main/ets/TurboModule/SampleTurboModule.ets +++ b/docs/Samples/Sample/SampleApp/entry/src/main/ets/TurboModule/SampleTurboModule.ets @@ -47,7 +47,9 @@ export class SampleTurboModule extends TurboModule { } getPreferencesData(key: string): string { - if (!preferences) return 'null'; + if (!preferences) { + return 'null'; + } try { let val = preferences.getSync(key, '默认值') as string return val @@ -57,7 +59,9 @@ export class SampleTurboModule extends TurboModule { } putPreferencesData(key: string, value: string) { - if (!preferences) return; + if (!preferences) { + return; + } preferences.putSync(key, value) try { preferences.flush((err: BusinessError) => { diff --git a/docs/Samples/Sample/SampleApp/entry/src/main/ets/TurboModule/SampleTurboModule.ts b/docs/Samples/Sample/SampleApp/entry/src/main/ets/TurboModule/SampleTurboModule.ts index 561cf750..ae1f4104 100644 --- a/docs/Samples/Sample/SampleApp/entry/src/main/ets/TurboModule/SampleTurboModule.ts +++ b/docs/Samples/Sample/SampleApp/entry/src/main/ets/TurboModule/SampleTurboModule.ts @@ -68,7 +68,9 @@ export class SampleTurboModule extends TurboModule { } getPreferencesData(key: string): string { - if (!SampleTurboModule.preferences) return 'null'; + if (!SampleTurboModule.preferences) { + return 'null'; + } try { let val = SampleTurboModule.preferences.getSync(key, '默认值') as string return val @@ -78,7 +80,9 @@ export class SampleTurboModule extends TurboModule { } putPreferencesData(key: string, value: string) { - if (!SampleTurboModule.preferences) return; + if (!SampleTurboModule.preferences) { + return; + } SampleTurboModule.preferences.putSync(key, value) try { SampleTurboModule.preferences.flush((err: BusinessError) => { diff --git a/docs/Samples/Sample/SampleApp/entry/src/main/ets/customView/MarqueeView.ets b/docs/Samples/Sample/SampleApp/entry/src/main/ets/customView/MarqueeView.ets index b4f2016d..cb6465c5 100644 --- a/docs/Samples/Sample/SampleApp/entry/src/main/ets/customView/MarqueeView.ets +++ b/docs/Samples/Sample/SampleApp/entry/src/main/ets/customView/MarqueeView.ets @@ -31,9 +31,10 @@ export struct MarqueeView { this.start = true this.descriptor = this.ctx.descriptorRegistry.getDescriptor(this.tag) - this.unregisterDescriptorChangesListener = this.ctx.descriptorRegistry.subscribeToDescriptorChanges(this.tag, (newDescriptor) => { - this.descriptor = (newDescriptor as MarqueeViewDescriptor) - }) + this.unregisterDescriptorChangesListener = + this.ctx.descriptorRegistry.subscribeToDescriptorChanges(this.tag, (newDescriptor) => { + this.descriptor = (newDescriptor as MarqueeViewDescriptor) + }) console.log('MarqueeView rawProps = ', JSON.stringify(this.descriptor.rawProps), this.tag) console.log('MarqueeView props = ', JSON.stringify(this.descriptor.props), this.tag) diff --git a/docs/Samples/Sample/SampleApp/entry/src/main/ets/entryability/EntryAbility.ets b/docs/Samples/Sample/SampleApp/entry/src/main/ets/entryability/EntryAbility.ets index 6ae5159f..ef9873e1 100644 --- a/docs/Samples/Sample/SampleApp/entry/src/main/ets/entryability/EntryAbility.ets +++ b/docs/Samples/Sample/SampleApp/entry/src/main/ets/entryability/EntryAbility.ets @@ -6,13 +6,11 @@ */ import { RNAbility, } from '@rnoh/react-native-openharmony'; - import dataPreferences from '@ohos.data.preferences' import window from '@ohos.window'; export let preferences: dataPreferences.Preferences | null = null - export default class EntryAbility extends RNAbility { getPagePath() { return 'pages/Index'; diff --git a/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/Details.ets b/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/Details.ets index 5cd9beae..f9bebe12 100644 --- a/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/Details.ets +++ b/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/Details.ets @@ -9,7 +9,6 @@ import { RNInstance } from '@rnoh/react-native-openharmony'; import { BaseRN, LoadManager } from '../rn'; import { MetroBaseRN } from '../rn/MetroBaseRN' - @Component export default struct Details { private instance: RNInstance = LoadManager.bpInstance diff --git a/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/Index.ets b/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/Index.ets index ad534c4a..7ba62ef3 100644 --- a/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/Index.ets +++ b/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/Index.ets @@ -22,7 +22,6 @@ import { createRNPackages, LoadManager, buildCustomComponent } from '../rn'; import { ENABLE_CAPI_ARCHITECTURE } from '../rn' import { arkTsComponentNames } from '../rn/LoadBundle'; - @Entry() @Component struct Index { @@ -37,7 +36,9 @@ struct Index { } aboutToAppear() { - if (!this.rnohCoreContext) return; + if (!this.rnohCoreContext) { + return; + } this.loadMetroBundle() } @@ -47,7 +48,9 @@ struct Index { } subscribeReload() { - if (!this.rnohCoreContext) return; + if (!this.rnohCoreContext) { + return; + } this.cleanUpCallbacks.forEach(cleanUp => cleanUp()) this.cleanUpCallbacks.push(this.rnohCoreContext!.devToolsController.eventEmitter.subscribe("RELOAD", async () => { this.isBundleReady = false @@ -76,12 +79,14 @@ struct Index { }) }) - this.cleanUpCallbacks.push(LoadManager.metroInstance.getTurboModule(LogBoxTurboModule.NAME).eventEmitter.subscribe("SHOW", () => { - this.logBoxDialogController.open() - })) - this.cleanUpCallbacks.push(LoadManager.metroInstance.getTurboModule(LogBoxTurboModule.NAME).eventEmitter.subscribe("HIDE", () => { - this.logBoxDialogController.close() - })) + this.cleanUpCallbacks.push(LoadManager.metroInstance.getTurboModule(LogBoxTurboModule.NAME).eventEmitter.subscribe("SHOW", + () => { + this.logBoxDialogController.open() + })) + this.cleanUpCallbacks.push(LoadManager.metroInstance.getTurboModule(LogBoxTurboModule.NAME).eventEmitter.subscribe("HIDE", + () => { + this.logBoxDialogController.close() + })) } loadMetroBundle() { @@ -98,8 +103,9 @@ struct Index { } async register(): Promise> { - if (!this.rnohCoreContext) + if (!this.rnohCoreContext) { return new Map() + } if (this.isMetroAvailable) { this.isBundleReady = true diff --git a/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/MultiSurface.ets b/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/MultiSurface.ets index 325a7947..2a3836b9 100644 --- a/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/MultiSurface.ets +++ b/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/MultiSurface.ets @@ -73,11 +73,13 @@ export struct MultiSurface { wrapBuilder(buildRNComponentForTag), new Map() ); - await this.instance1.runJSBundle(new ResourceJSBundleProvider(getContext().resourceManager, 'bundle/basic/basic.harmony.bundle')); - await this.instance1.runJSBundle(new ResourceJSBundleProvider(getContext().resourceManager, this.bundlePath1)).then(() => { - this.isBundleReady1 = true - console.log('instance1 加载完成' + this.bundlePath1) - }) + await this.instance1.runJSBundle(new ResourceJSBundleProvider(getContext().resourceManager, + 'bundle/basic/basic.harmony.bundle')); + await this.instance1.runJSBundle(new ResourceJSBundleProvider(getContext().resourceManager, this.bundlePath1)) + .then(() => { + this.isBundleReady1 = true + console.log('instance1 加载完成' + this.bundlePath1) + }) this.instance2 = await this.rnohCoreContext.createAndRegisterRNInstance({ createRNPackages: createRNPackages, @@ -92,11 +94,13 @@ export struct MultiSurface { wrapBuilder(buildRNComponentForTag), new Map() ); - await this.instance2.runJSBundle(new ResourceJSBundleProvider(getContext().resourceManager, 'bundle/basic/basic.harmony.bundle')); - await this.instance2.runJSBundle(new ResourceJSBundleProvider(getContext().resourceManager, this.bundlePath2)).then(() => { - this.isBundleReady2 = true - console.log('instance2 加载完成' + this.bundlePath2) - }) + await this.instance2.runJSBundle(new ResourceJSBundleProvider(getContext().resourceManager, + 'bundle/basic/basic.harmony.bundle')); + await this.instance2.runJSBundle(new ResourceJSBundleProvider(getContext().resourceManager, this.bundlePath2)) + .then(() => { + this.isBundleReady2 = true + console.log('instance2 加载完成' + this.bundlePath2) + }) this.instance3 = await this.rnohCoreContext.createAndRegisterRNInstance({ createRNPackages: createRNPackages, @@ -111,11 +115,11 @@ export struct MultiSurface { wrapBuilder(buildRNComponentForTag), new Map() ); - await this.instance3.runJSBundle(new ResourceJSBundleProvider(getContext().resourceManager, this.bundlePath3)).then(() => { - this.isBundleReady3 = true - console.log('instance3 加载完成' + this.bundlePath3) - }) - + await this.instance3.runJSBundle(new ResourceJSBundleProvider(getContext().resourceManager, this.bundlePath3)) + .then(() => { + this.isBundleReady3 = true + console.log('instance3 加载完成' + this.bundlePath3) + }) } @Builder @@ -163,7 +167,6 @@ export struct MultiSurface { .width('100%') .height('100%') } - } } \ No newline at end of file diff --git a/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/SandboxBundle.ets b/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/SandboxBundle.ets index c174a434..a9070e0e 100644 --- a/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/SandboxBundle.ets +++ b/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/SandboxBundle.ets @@ -50,7 +50,8 @@ export default struct SandBoxApp { async downloadBundle() { if (this.rnAbility) { // 将bundlejs下载并保存到沙箱 - let uint8Array = await this.rnAbility.context.resourceManager.getRawFileContent('rawfile/bundle/bp/sandbox.harmony.bundle') + let uint8Array = + await this.rnAbility.context.resourceManager.getRawFileContent('rawfile/bundle/bp/sandbox.harmony.bundle') let rawBuffer = uint8Array.buffer let num = rawBuffer.byteLength // 获取沙箱路径 @@ -104,7 +105,7 @@ export default struct SandBoxApp { arkTsComponentNames: [], }, appKey: "Sandbox", - initialProps: {'params1': '哈哈哈'}, + initialProps: { 'params1': '哈哈哈' }, wrappedCustomRNComponentBuilder: wrapBuilder(buildCustomComponent), onSetUp: (rnInstance) => { rnInstance.enableFeatureFlag("ENABLE_RN_INSTANCE_CLEAN_UP") diff --git a/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/Test.ets b/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/Test.ets index 6f3d98d6..1323a333 100644 --- a/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/Test.ets +++ b/docs/Samples/Sample/SampleApp/entry/src/main/ets/pages/Test.ets @@ -9,7 +9,6 @@ import { RNInstance } from '@rnoh/react-native-openharmony'; import { BaseRN, LoadManager } from '../rn'; import { MetroBaseRN } from '../rn/MetroBaseRN' - @Component export default struct Test { private instance: RNInstance = LoadManager.cpInstance; diff --git a/docs/Samples/Sample/SampleApp/entry/src/main/ets/rn/BasePrecreateView.ets b/docs/Samples/Sample/SampleApp/entry/src/main/ets/rn/BasePrecreateView.ets index a3d5af83..36539e18 100644 --- a/docs/Samples/Sample/SampleApp/entry/src/main/ets/rn/BasePrecreateView.ets +++ b/docs/Samples/Sample/SampleApp/entry/src/main/ets/rn/BasePrecreateView.ets @@ -73,7 +73,6 @@ export struct BasePrecreateView { this.shouldShow = true console.log("BasePrecreateView 预创建的 RNInstance 已完成 JSBundle 加载，直接展示页面") } - } private async getOrCreateRNInstance(): Promise { @@ -132,7 +131,8 @@ export struct BasePrecreateView { instance.status = "DONE" console.log("BasePrecreateView status = ", instance.status) - console.log("BasePrecreateView 预加载 JSBundle 完成，RNInstance ID = " + rnInstance.getId() + " instances.count = " + instances.length) + console.log("BasePrecreateView 预加载 JSBundle 完成，RNInstance ID = " + rnInstance.getId() + + " instances.count = " + instances.length) console.log("BasePrecreateView End ======================================================= ") } } diff --git a/docs/Samples/Sample/SampleApp/entry/src/main/ets/rn/LoadBundle.ets b/docs/Samples/Sample/SampleApp/entry/src/main/ets/rn/LoadBundle.ets index 8627a752..c19ffc7d 100644 --- a/docs/Samples/Sample/SampleApp/entry/src/main/ets/rn/LoadBundle.ets +++ b/docs/Samples/Sample/SampleApp/entry/src/main/ets/rn/LoadBundle.ets @@ -33,8 +33,7 @@ export function buildCustomComponent(ctx: ComponentBuilderContext) { tag: ctx.tag, buildCustomComponent: buildCustomComponent }) - } - else if (ctx.componentName === MarqueeView.NAME) { + } else if (ctx.componentName === MarqueeView.NAME) { MarqueeView({ ctx: ctx.rnComponentContext, tag: ctx.tag @@ -54,9 +53,12 @@ export class LoadManager { static ctx: RNComponentContext; public static loadBundle(instance: RNInstance, bundlePath: string, useBundleCache: boolean = true): Promise { - if (LoadManager.loadedBundle.has(bundlePath) && useBundleCache) return Promise.resolve(); - if (useBundleCache) LoadManager.loadedBundle.add(bundlePath); - + if (LoadManager.loadedBundle.has(bundlePath) && useBundleCache) { + return Promise.resolve(); + } + if (useBundleCache) { + LoadManager.loadedBundle.add(bundlePath); + } return instance.runJSBundle(new ResourceJSBundleProvider(getContext().resourceManager, bundlePath)); } @@ -80,7 +82,8 @@ export class LoadManager { const provider = new MetroJSBundleProvider() await LoadManager.metroInstance.runJSBundle(provider) - const jsBundleExecutionStatus: string = LoadManager.metroInstance.getBundleExecutionStatus(provider.getURL()) as string + const jsBundleExecutionStatus: string = + LoadManager.metroInstance.getBundleExecutionStatus(provider.getURL()) as string console.log("SampleApp --- getBundleExecutionStatus", jsBundleExecutionStatus); LoadManager.shouldResetMetroInstance = false if (jsBundleExecutionStatus === "DONE") { diff --git a/docs/Samples/Sandbox/SandBoxNativeProject/entry/src/main/ets/pages/Index.ets b/docs/Samples/Sandbox/SandBoxNativeProject/entry/src/main/ets/pages/Index.ets index c6f960d0..08e17f2b 100644 --- a/docs/Samples/Sandbox/SandBoxNativeProject/entry/src/main/ets/pages/Index.ets +++ b/docs/Samples/Sandbox/SandBoxNativeProject/entry/src/main/ets/pages/Index.ets @@ -22,7 +22,8 @@ import { createRNPackages } from '../RNPackagesFactory'; import fs from '@ohos.file.fs'; @Builder -export function buildCustomRNComponent(ctx: ComponentBuilderContext) {}; +export function buildCustomRNComponent(ctx: ComponentBuilderContext) { +}; const wrappedCustomRNComponentBuilder = wrapBuilder(buildCustomRNComponent); @Entry @@ -49,7 +50,8 @@ struct Index { async downloadBundle() { if (this.rnAbility) { // 将bundlejs下载并保存到沙箱。 - let uint8Array = await this.rnAbility.context.resourceManager.getRawFileContent('rawfile/bundle/sandbox.harmony.bundle'); + let uint8Array = + await this.rnAbility.context.resourceManager.getRawFileContent('rawfile/bundle/sandbox.harmony.bundle'); let rawBuffer = uint8Array.buffer; let num = rawBuffer.byteLength; // 获取沙箱路径 @@ -96,8 +98,8 @@ struct Index { } if (this.rnAbility && this.hasBundle) { RNApp({ - rnInstanceConfig: { - createRNPackages, + rnInstanceConfig: { + createRNPackages, enableCAPIArchitecture: true, arkTsComponentNames: [] }, diff --git a/docs/Samples/demo_without_rnAbility/NativeProject/entry/src/main/ets/entryability/EntryAbility.ets b/docs/Samples/demo_without_rnAbility/NativeProject/entry/src/main/ets/entryability/EntryAbility.ets index eca4f151..55e3238f 100644 --- a/docs/Samples/demo_without_rnAbility/NativeProject/entry/src/main/ets/entryability/EntryAbility.ets +++ b/docs/Samples/demo_without_rnAbility/NativeProject/entry/src/main/ets/entryability/EntryAbility.ets @@ -12,6 +12,7 @@ import { UPRNSDK, UPRNSDKImpl } from 'library'; export default class EntryAbility extends UIAbility { rnSDK: UPRNSDKImpl | undefined = undefined; + // rnSDK: UPRNSDK | undefined = undefined; onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void { hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onCreate'); diff --git a/docs/Samples/demo_without_rnAbility/NativeProject/entry/src/main/ets/pages/RNPage.ets b/docs/Samples/demo_without_rnAbility/NativeProject/entry/src/main/ets/pages/RNPage.ets index 25bd400b..57b917cd 100644 --- a/docs/Samples/demo_without_rnAbility/NativeProject/entry/src/main/ets/pages/RNPage.ets +++ b/docs/Samples/demo_without_rnAbility/NativeProject/entry/src/main/ets/pages/RNPage.ets @@ -6,10 +6,11 @@ */ import { RNInfo, UPReactView, UPRNSDK } from 'library'; + @Entry @Component export struct RNPage { - rnInfo: RNInfo = {businessId: 'App', bundlePath: 'bundle.harmony.js', isFromMetro: false}; + rnInfo: RNInfo = { businessId: 'App', bundlePath: 'bundle.harmony.js', isFromMetro: false }; @StorageLink('UPRNSDK') rnSdk: UPRNSDK | undefined = undefined; onBackPress(): boolean | void { diff --git a/docs/Samples/using_RNSurface/SampleApp/entry/src/main/ets/entryability/EntryAbility.ets b/docs/Samples/using_RNSurface/SampleApp/entry/src/main/ets/entryability/EntryAbility.ets index e289b75c..32cb381b 100644 --- a/docs/Samples/using_RNSurface/SampleApp/entry/src/main/ets/entryability/EntryAbility.ets +++ b/docs/Samples/using_RNSurface/SampleApp/entry/src/main/ets/entryability/EntryAbility.ets @@ -6,13 +6,11 @@ */ import { RNAbility, } from '@rnoh/react-native-openharmony'; - import dataPreferences from '@ohos.data.preferences'; import window from '@ohos.window'; export let preferences: dataPreferences.Preferences | null = null; - export default class EntryAbility extends RNAbility { getPagePath() { return 'pages/Index'; @@ -28,7 +26,6 @@ export default class EntryAbility extends RNAbility { } catch (err) { console.error('Failed to get preferences'); } - AppStorage.setOrCreate('RNAbility', this); } } diff --git a/docs/Samples/using_RNSurface/SampleApp/entry/src/main/ets/pages/Index.ets b/docs/Samples/using_RNSurface/SampleApp/entry/src/main/ets/pages/Index.ets index 2660a58e..721b3cff 100644 --- a/docs/Samples/using_RNSurface/SampleApp/entry/src/main/ets/pages/Index.ets +++ b/docs/Samples/using_RNSurface/SampleApp/entry/src/main/ets/pages/Index.ets @@ -20,7 +20,8 @@ import { @Builder function buildCustomComponent(ctx: ComponentBuilderContext) { - Stack() {} + Stack() { + } .position({ x: 0, y: 0 }) } @@ -52,34 +53,33 @@ export struct Index { enableCAPIArchitecture: true, arkTsComponentNames: [] }); - await this.instance.runJSBundle(new ResourceJSBundleProvider(getContext().resourceManager, this.bundlePath)).then(() => { - this.isBundleReady = true; - console.log('instance 加载完成' + this.bundlePath); - }) - + await this.instance.runJSBundle(new ResourceJSBundleProvider(getContext().resourceManager, this.bundlePath)) + .then(() => { + this.isBundleReady = true; + console.log('instance 加载完成' + this.bundlePath); + }) } build() { NavDestination() { if (this.isBundleReady) { - Column() { - RNSurface({ - surfaceConfig: { - appKey: this.moduleName, - }, - ctx: new RNComponentContext( - RNOHContext.fromCoreContext(this.rnohCoreContext!, this.instance), - wrappedCustomRNComponentBuilder, - wrapBuilder(buildRNComponentForTag), - new Map() - ), - }) - } - .width('100%') - .height('100%') + Column() { + RNSurface({ + surfaceConfig: { + appKey: this.moduleName, + }, + ctx: new RNComponentContext( + RNOHContext.fromCoreContext(this.rnohCoreContext!, this.instance), + wrappedCustomRNComponentBuilder, + wrapBuilder(buildRNComponentForTag), + new Map() + ), + }) + } + .width('100%') + .height('100%') } } - } } \ No newline at end of file diff --git a/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/TurboModule/SampleTurboModule.ets b/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/TurboModule/SampleTurboModule.ets index bb674f04..d891cba0 100644 --- a/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/TurboModule/SampleTurboModule.ets +++ b/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/TurboModule/SampleTurboModule.ets @@ -47,7 +47,9 @@ export class SampleTurboModule extends TurboModule { } getPreferencesData(key: string): string { - if (!preferences) return 'null'; + if (!preferences) { + return 'null'; + } try { let val = preferences.getSync(key, '默认值') as string return val @@ -57,7 +59,9 @@ export class SampleTurboModule extends TurboModule { } putPreferencesData(key: string, value: string) { - if (!preferences) return; + if (!preferences) { + return; + } preferences.putSync(key, value) try { preferences.flush((err: BusinessError) => { diff --git a/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/TurboModule/SampleTurboModule.ts b/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/TurboModule/SampleTurboModule.ts index f50a4bc1..30a0d877 100644 --- a/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/TurboModule/SampleTurboModule.ts +++ b/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/TurboModule/SampleTurboModule.ts @@ -68,7 +68,9 @@ export class SampleTurboModule extends TurboModule { } getPreferencesData(key: string): string { - if (!SampleTurboModule.preferences) return 'null'; + if (!SampleTurboModule.preferences) { + return 'null'; + } try { let val = SampleTurboModule.preferences.getSync(key, '默认值') as string; return val; @@ -78,7 +80,9 @@ export class SampleTurboModule extends TurboModule { } putPreferencesData(key: string, value: string) { - if (!SampleTurboModule.preferences) return; + if (!SampleTurboModule.preferences) { + return; + } SampleTurboModule.preferences.putSync(key, value) try { SampleTurboModule.preferences.flush((err: BusinessError) => { diff --git a/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/TurboModule/SampleWorkerTurboModule.ets b/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/TurboModule/SampleWorkerTurboModule.ets index 331271e6..54e35c1d 100644 --- a/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/TurboModule/SampleWorkerTurboModule.ets +++ b/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/TurboModule/SampleWorkerTurboModule.ets @@ -12,8 +12,7 @@ import { AnyThreadTurboModule, } from '@rnoh/react-native-openharmony/ts'; import { preferences } from '../entryability/EntryAbility'; import { BusinessError } from '@ohos.base'; -export class SampleWorkerTurboModule extends AnyThreadTurboModule{ - +export class SampleWorkerTurboModule extends AnyThreadTurboModule { registerFunction(onComplete: (value: string) => void): void { console.log(`RNOH SampleTurboModule::registerFunction + trigger`); setTimeout(() => { @@ -38,7 +37,9 @@ export class SampleWorkerTurboModule extends AnyThreadTurboModule{ } getPreferencesData(key: string): string { - if (!preferences) return 'null'; + if (!preferences) { + return 'null'; + } try { let val = preferences.getSync(key, '默认值') as string; return val; @@ -48,7 +49,9 @@ export class SampleWorkerTurboModule extends AnyThreadTurboModule{ } putPreferencesData(key: string, value: string) { - if (!preferences) return; + if (!preferences) { + return; + } preferences.putSync(key, value); try { preferences.flush((err: BusinessError) => { diff --git a/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/entryability/EntryAbility.ets b/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/entryability/EntryAbility.ets index f9649aa7..1b166fb0 100644 --- a/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/entryability/EntryAbility.ets +++ b/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/entryability/EntryAbility.ets @@ -6,13 +6,11 @@ */ import { RNAbility, } from '@rnoh/react-native-openharmony'; - import dataPreferences from '@ohos.data.preferences'; import window from '@ohos.window'; export let preferences: dataPreferences.Preferences | null = null; - export default class EntryAbility extends RNAbility { getPagePath() { return 'pages/Index'; @@ -32,7 +30,6 @@ export default class EntryAbility extends RNAbility { } catch (err) { console.error('Failed to get preferences'); } - AppStorage.setOrCreate('RNAbility', this); } } diff --git a/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/pages/Index.ets b/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/pages/Index.ets index 7b23c607..68d1d465 100644 --- a/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/pages/Index.ets +++ b/docs/Samples/using_turboModule/SampleApp/entry/src/main/ets/pages/Index.ets @@ -41,7 +41,6 @@ export struct MultiSurface { private moduleName = 'App'; @State isBundleReady: boolean = false; - async aboutToAppear() { console.log("MultiSurface=====") if (!this.rnohCoreContext) { -- Gitee From 105111e77fe7104199ec081d30b72c0418e1727e Mon Sep 17 00:00:00 2001 From: Galen wei <1947612015@qq.com> Date: Thu, 13 Feb 2025 20:27:50 +0800 Subject: [PATCH 02/10] Format the code format of the Sample project Signed-off-by: Galen wei <1947612015@qq.com> --- .../NativeProject/entry/hvigorfile.ts | 2 +- .../entry/src/main/ets/RNPackagesFactory.ets | 1 + .../Capture_bundle/ReactProject/App.tsx | 102 ++--- .../Capture_bundle/ReactProject/index.js | 4 +- .../ReactProject/metro.config.js | 4 +- .../NativeProject/entry/hvigorfile.ts | 4 +- .../entry/src/main/ets/pages/Index.ets | 1 - .../ReactProject/App.tsx | 12 +- .../ReactProject/index.js | 4 +- .../ReactProject/metro.config.js | 26 +- .../ReactProject/src/SelectBoxApp.tsx | 1 - .../FrameNodeSampleApp/entry/hvigorfile.ts | 4 +- .../entry/src/main/ets/rn/index.ets | 3 + .../GenerateBundle/generate.config.js | 30 +- .../FrameNodeSample/GenerateBundle/index.js | 4 +- .../GenerateBundle/metro.config.js | 20 +- .../MutilBundleSample/FlightRN/App.tsx | 4 +- .../FlightRN/build/moduleId.js | 50 +-- .../FlightRN/bundles/flight.js | 2 +- .../MutilBundleSample/FlightRN/index.js | 4 +- .../FlightRN/metro.config.js | 26 +- .../Samples/MutilBundleSample/HotelRN/App.tsx | 4 +- .../HotelRN/build/moduleId.js | 50 +-- .../HotelRN/bundles/hotel.js | 2 +- .../MutilBundleSample/HotelRN/index.js | 4 +- .../MutilBundleSample/HotelRN/metro.config.js | 26 +- .../NativeProject/entry/hvigorfile.ts | 4 +- .../src/main/ets/rn/CustomRNComponent.ets | 9 +- .../entry/hvigorfile.ts | 4 +- .../entry/src/main/ets/pages/Index.ets | 1 - .../RegisterFontRnProject/index.js | 2 +- .../RegisterFontRnProject/metro.config.js | 22 +- .../registerFont.config.js | 30 +- .../src/bundles/RegisterFont/examples.tsx | 10 +- .../RootTagSample/NativeProject/hvigorfile.ts | 4 +- .../ReactProject/bundle.config.js | 4 +- .../RootTagSample/ReactProject/index.js | 2 +- .../ReactProject/metro.config.js | 22 +- .../ReactProject/src/Hotel_Page.tsx | 6 +- .../ReactProject/src/Ticket_Page.tsx | 6 +- .../src/main/cpp/ButtonView/ButtonNode.cpp | 1 - .../ButtonViewComponentDescriptor.h | 1 - .../cpp/ButtonView/ButtonViewEventEmitter.cpp | 2 - .../cpp/ButtonView/ButtonViewEventEmitter.h | 1 - .../main/cpp/ButtonView/ButtonViewJSIBinder.h | 1 - .../Fabric/MarqueeViewComponentDescriptor.h | 1 - .../MarqueeViewEventEmitRequestHandler.h | 2 - .../cpp/Fabric/MarqueeViewEventEmitter.cpp | 2 - .../main/cpp/Fabric/MarqueeViewEventEmitter.h | 1 - .../main/cpp/Fabric/MarqueeViewJSIBinder.h | 1 - .../main/cpp/Fabric/MarqueeViewNapiBinder.h | 1 - .../entry/src/main/cpp/Fabric/Props.cpp | 2 - .../SampleApp/entry/src/main/ets/rn/index.ets | 5 + .../MainProject/build/multibundle/moduleId.js | 146 ++++---- .../MainProject/components/index.ts | 8 + .../Sample/SampleProject/MainProject/index.js | 10 +- .../src/bundles/Details/DetailsMainPage.tsx | 14 +- .../MainProject/src/bundles/Details/index.js | 12 +- .../src/bundles/Goods/GoodsButton.tsx | 6 +- .../src/bundles/Goods/GoodsMainPage.tsx | 16 +- .../MainProject/src/bundles/Goods/index.js | 2 +- .../src/bundles/HomePage/CategoryButton.tsx | 4 +- .../src/bundles/HomePage/HomeListPage.tsx | 4 +- .../src/bundles/HomePage/HomePage.tsx | 14 +- .../MainProject/src/bundles/HomePage/index.js | 2 +- .../src/bundles/Sandbox/examples.tsx | 6 +- .../MainProject/src/bundles/Sandbox/index.js | 2 +- .../src/bundles/basic/ButtonView.tsx | 2 +- .../basic/ButtonViewNativeComponent.tsx | 2 +- .../src/bundles/basic/MarqueeView.tsx | 2 +- .../basic/MarqueeViewNativeComponent.tsx | 2 +- .../basic/NativeSampleTurboModule2.tsx | 12 +- .../src/bundles/basic/SampleTurboModule2.tsx | 12 +- .../MainProject/src/bundles/test/index.js | 2 +- .../MainProject/src/bundles/test/testPage.tsx | 14 +- .../tests/ActivityIndicatorTest.tsx | 4 +- .../MainProject/tests/AlertTest.tsx | 30 +- .../MainProject/tests/AnimatedEasingTest.tsx | 8 +- .../MainProject/tests/AnimatedTest.tsx | 80 ++-- .../MainProject/tests/AnimatedValueTest.tsx | 66 ++-- .../MainProject/tests/AppRegistryTest.tsx | 34 +- .../MainProject/tests/AppStateTest.tsx | 20 +- .../MainProject/tests/AppearanceTest.tsx | 8 +- .../MainProject/tests/BackHandlerTest.tsx | 16 +- .../MainProject/tests/BlobTest.tsx | 2 +- .../MainProject/tests/ButtonTest.tsx | 2 +- .../MainProject/tests/ConsoleTest.tsx | 2 +- .../tests/CustomNativeComponentTest.tsx | 2 +- .../MainProject/tests/DevSettingsTest.tsx | 8 +- .../MainProject/tests/DimensionsTest.tsx | 14 +- .../MainProject/tests/FlatListTest.tsx | 68 ++-- .../SampleProject/MainProject/tests/HMLog.ts | 6 +- .../MainProject/tests/I18nManagerTest.tsx | 6 +- .../MainProject/tests/ImageBackgroundTest.tsx | 6 +- .../MainProject/tests/ImageTest.tsx | 122 +++--- .../tests/InteractionManagerTest.tsx | 2 +- .../tests/KeyboardAvoidingViewTest.tsx | 28 +- .../MainProject/tests/KeyboardTest.tsx | 24 +- .../tests/LayoutAnimationsTest.tsx | 8 +- .../MainProject/tests/LinkingTest.tsx | 12 +- .../MainProject/tests/MiscTest.tsx | 20 +- .../MainProject/tests/ModalTest.tsx | 12 +- .../tests/NativeEventEmitterTest.tsx | 4 +- .../MainProject/tests/NetworkingTest.tsx | 12 +- .../MainProject/tests/PanResponderTest.tsx | 8 +- .../MainProject/tests/PixelRatioTest.tsx | 10 +- .../tests/PlatformConstantsTest.tsx | 16 +- .../MainProject/tests/PressableTest.tsx | 42 +-- .../MainProject/tests/RefreshControlTest.tsx | 24 +- .../tests/RenderingTest.harmony.tsx | 12 +- .../MainProject/tests/RenderingTest.tsx | 4 +- .../MainProject/tests/ScrollViewTest.tsx | 192 +++++----- .../ContentContainerStyleTest.tsx | 4 +- .../tests/ScrollViewTest/KeyboardTest.tsx | 16 +- .../tests/ScrollViewTest/MiscPropsTest.tsx | 54 +-- .../ScrollViewTest/MomentumCallbacksTest.tsx | 26 +- .../ScrollViewTest/PointerEventsTest.tsx | 42 +-- .../tests/ScrollViewTest/ScrollBarsTest.tsx | 12 +- .../tests/ScrollViewTest/ScrollToTest.tsx | 16 +- .../tests/ScrollViewTest/ScrollViewTest.tsx | 30 +- .../tests/ScrollViewTest/SnapTest.tsx | 46 +-- .../ScrollViewTest/StickyHeadersTest.tsx | 6 +- .../tests/ScrollViewTest/StylesTest.tsx | 4 +- .../tests/ScrollViewTest/fixtures.tsx | 28 +- .../MainProject/tests/SectionListTest.tsx | 42 +-- .../MainProject/tests/StatusBarTest.tsx | 6 +- .../MainProject/tests/StyleSheetTest.tsx | 10 +- .../MainProject/tests/SwitchTest.tsx | 12 +- .../MainProject/tests/TextInputTest.tsx | 58 +-- .../MainProject/tests/TextTest.tsx | 348 +++++++++--------- .../MainProject/tests/TimerTest.tsx | 20 +- .../MainProject/tests/TouchHandlingTest.tsx | 72 ++-- .../tests/TouchableOpacityTest.tsx | 14 +- .../MainProject/tests/TouchablesTest.tsx | 30 +- .../MainProject/tests/TransformTest.tsx | 24 +- .../MainProject/tests/UIManagerTest.tsx | 50 +-- .../MainProject/tests/UseColorSchemeTest.tsx | 6 +- .../tests/UseWindowDimensionsTest.tsx | 12 +- .../MainProject/tests/VibrationTest.tsx | 4 +- .../MainProject/tests/ViewTest.tsx | 172 ++++----- .../MainProject/tests/VirtualizedListTest.tsx | 212 +++++------ .../SandBoxNativeProject/entry/hvigorfile.ts | 4 +- .../entry/src/main/ets/pages/Index.ets | 4 +- .../Samples/Sandbox/SandBoxRnProject/index.js | 4 +- .../Sandbox/SandBoxRnProject/metro.config.js | 22 +- .../SandBoxRnProject/sandbox.config.js | 30 +- .../src/bundles/Sandbox/examples.tsx | 6 +- .../library/src/main/ets/UPRNSDK.ts | 2 +- .../library/src/main/ets/UPRNSDKImpl.ets | 10 +- .../RNProject/MainProject/bundle.config.js | 24 +- .../RNProject/MainProject/metro.config.js | 4 +- .../MainProject/src/bundles/MainPage.tsx | 6 +- .../using_RNSurface/SampleApp/hvigorfile.ts | 4 +- .../MainProject/bundle.config.js | 4 +- .../SampleProject/MainProject/metro.config.js | 22 +- .../MainProject/src/bundles/MainPage.tsx | 6 +- .../entry/src/main/ets/pages/Index.ets | 5 +- .../using_turboModule/SampleApp/hvigorfile.ts | 4 +- .../SampleProject/MainProject/demo.config.js | 4 +- .../SampleProject/MainProject/metro.config.js | 22 +- .../MainProject/src/bundles/Demo/MainPage.tsx | 2 +- .../MainProject/src/bundles/Demo/index.js | 2 +- .../basic/NativeSampleTurboModule2.tsx | 12 +- .../src/bundles/basic/SampleTurboModule2.tsx | 12 +- 164 files changed, 1681 insertions(+), 1679 deletions(-) diff --git a/docs/Samples/Capture_bundle/NativeProject/entry/hvigorfile.ts b/docs/Samples/Capture_bundle/NativeProject/entry/hvigorfile.ts index d0f029bd..2ca6b9a0 100644 --- a/docs/Samples/Capture_bundle/NativeProject/entry/hvigorfile.ts +++ b/docs/Samples/Capture_bundle/NativeProject/entry/hvigorfile.ts @@ -9,5 +9,5 @@ import { hapTasks } from '@ohos/hvigor-ohos-plugin'; export default { system: hapTasks, /* Built-in plugin of Hvigor. It cannot be modified. */ - plugins:[] /* Custom plugin to extend the functionality of Hvigor. */ + plugins: [] /* Custom plugin to extend the functionality of Hvigor. */ } diff --git a/docs/Samples/Capture_bundle/NativeProject/entry/src/main/ets/RNPackagesFactory.ets b/docs/Samples/Capture_bundle/NativeProject/entry/src/main/ets/RNPackagesFactory.ets index 193ab159..32a1c1f8 100644 --- a/docs/Samples/Capture_bundle/NativeProject/entry/src/main/ets/RNPackagesFactory.ets +++ b/docs/Samples/Capture_bundle/NativeProject/entry/src/main/ets/RNPackagesFactory.ets @@ -6,6 +6,7 @@ */ import { RNPackageContext, RNPackage } from '@rnoh/react-native-openharmony/ts'; + export function createRNPackages(ctx: RNPackageContext): RNPackage[] { return []; } \ No newline at end of file diff --git a/docs/Samples/Capture_bundle/ReactProject/App.tsx b/docs/Samples/Capture_bundle/ReactProject/App.tsx index 1c91d6b6..3024526b 100644 --- a/docs/Samples/Capture_bundle/ReactProject/App.tsx +++ b/docs/Samples/Capture_bundle/ReactProject/App.tsx @@ -5,94 +5,94 @@ * LICENSE-MIT file in the root directory of this source tree. */ -import React ,{useState} from 'react'; -import {View,Text,Button,Alert,StyleSheet} from 'react-native' +import React, { useState } from 'react'; +import { View, Text, Button, Alert, StyleSheet } from 'react-native' -const App:React.FC = () => { - const[errorMessage,setErrorMessage] = useState(''); +const App: React.FC = () => { + const [errorMessage, setErrorMessage] = useState(''); - const handleReferenceError = () =>{ - try{ + const handleReferenceError = () => { + try { const erro = new ReferenceError('Some error happened'); throw error; - }catch(e){ - console.error('Caught an error:',e); + } catch (e) { + console.error('Caught an error:', e); setErrorMessage(e.message); } }; - const handleStandardError = () =>{ - try{ + const handleStandardError = () => { + try { const error = new Error('Some error happened'); throw error; - }catch(e){ - console.error('Caught an error:',e); + } catch (e) { + console.error('Caught an error:', e); setErrorMessage(e.message); } }; - const handleFrozenError = () =>{ - try{ + const handleFrozenError = () => { + try { const error = Object.freeze(new Error('Some error happened')); throw error; - }catch(e){ - console.error('Caught an error:',e); + } catch (e) { + console.error('Caught an error:', e); setErrorMessage(e.message); } }; - const handleWarningError = () =>{ - try{ - const warning = new Error('This is a warning message') as any; + const handleWarningError = () => { + try { + const warning = new Error('This is a warning message') as any; warning.type = 'warn'; throw warning; - }catch(e){ - Alert.alert('Warning',e.message); - setErrorMessage('Warning displayed:'+e.message); + } catch (e) { + Alert.alert('Warning', e.message); + setErrorMessage('Warning displayed:' + e.message); } }; - return( + return ( - Press a Button to trigger an error or warning: - -