@xrnjs/app-template 0.0.6 → 0.1.0

package/harmony/entry/src/main/cpp/generated/{RNLocalize.h → XRNKeyboard.h}

@@ -13,9 +13,9 @@
 
 namespace rnoh {
 
-class JSI_EXPORT RNLocalize : public ArkTSTurboModule {
+class JSI_EXPORT XRNKeyboard : public ArkTSTurboModule {
   public:
-    RNLocalize(const ArkTSTurboModule::Context ctx, const std::string name);
+    XRNKeyboard(const ArkTSTurboModule::Context ctx, const std::string name);
 };
 
 } // namespace rnoh

package/harmony/entry/src/main/cpp/generated/XRNNavigation.cpp

@@ -15,8 +15,13 @@ using namespace facebook;
 XRNNavigation::XRNNavigation(const ArkTSTurboModule::Context ctx, const std::string name) : ArkTSTurboModule(ctx, name) {
     methodMap_ = {
         ARK_METHOD_METADATA(setNavigationKey, 1),
+        ARK_METHOD_METADATA(setNavigationState, 1),
         ARK_ASYNC_METHOD_METADATA(dispatchAction, 1),
         ARK_ASYNC_METHOD_METADATA(getCurrentModuleInfo, 0),
+        ARK_METHOD_METADATA(setShouldInterceptSideSwipe, 2),
+        ARK_METHOD_METADATA(confirmShouldSideSwipePop, 0),
+        ARK_METHOD_METADATA(addListener, 1),
+        ARK_METHOD_METADATA(removeListeners, 1),
     };
 }
 

package/harmony/entry/src/main/cpp/generated/{RNCWebViewModule.cpp → XRNNetworkModule.cpp}

@@ -7,15 +7,13 @@
  * @generatorVersion: 1
  */
 
-#include "RNCWebViewModule.h"
+#include "XRNNetworkModule.h"
 
 namespace rnoh {
 using namespace facebook;
 
-RNCWebViewModule::RNCWebViewModule(const ArkTSTurboModule::Context ctx, const std::string name) : ArkTSTurboModule(ctx, name) {
+XRNNetworkModule::XRNNetworkModule(const ArkTSTurboModule::Context ctx, const std::string name) : ArkTSTurboModule(ctx, name) {
     methodMap_ = {
-        ARK_ASYNC_METHOD_METADATA(isFileUploadSupported, 0),
-        ARK_METHOD_METADATA(shouldStartLoadWithLockIdentifier, 2),
     };
 }
 

package/harmony/entry/src/main/cpp/generated/{RNCWebViewModule.h → XRNNetworkModule.h}

@@ -13,9 +13,9 @@
 
 namespace rnoh {
 
-class JSI_EXPORT RNCWebViewModule : public ArkTSTurboModule {
+class JSI_EXPORT XRNNetworkModule : public ArkTSTurboModule {
   public:
-    RNCWebViewModule(const ArkTSTurboModule::Context ctx, const std::string name);
+    XRNNetworkModule(const ArkTSTurboModule::Context ctx, const std::string name);
 };
 
 } // namespace rnoh

package/harmony/entry/src/main/ets/BundleHelper.ets

@@ -1,38 +1,37 @@
-import { AsyncStoragePackage } from "@react-native-oh-tpl/async-storage";
-import { ClipboardPackage } from "@react-native-oh-tpl/clipboard";
-import { CookiesPackage } from "@react-native-oh-tpl/cookies";
-import { LottieAnimationView, LOTTIE_TYPE } from "@react-native-oh-tpl/lottie-react-native";
-import { RNConfigPackage } from "@react-native-oh-tpl/react-native-config";
-import { RNDeviceInfoPackage } from "@react-native-oh-tpl/react-native-device-info";
-import { RNGetRandomValuesPackage } from "@react-native-oh-tpl/react-native-get-random-values";
-import { RNLocalizePackage } from "@react-native-oh-tpl/react-native-localize";
-import { PermissionsPackage } from "@react-native-oh-tpl/react-native-permissions";
-import { SafeAreaViewPackage } from "@react-native-oh-tpl/react-native-safe-area-context";
-import { SvgPackage } from "@react-native-oh-tpl/react-native-svg";
-import { TouchIdPackage } from "@react-native-oh-tpl/react-native-touch-id";
-import { CameraRollPackage } from "@react-native-oh-tpl/camera-roll"
-import { LottieAnimationViewPackage } from "@react-native-oh-tpl/lottie-react-native/ts"
-import { NetInfoPackage } from "@react-native-oh-tpl/netinfo/ts"
-import { BlobUtilPackage } from "@react-native-oh-tpl/react-native-blob-util"
-import { DocumentPickerPackage } from "@react-native-oh-tpl/react-native-document-picker/ts"
-import { FastImagePackage } from "@react-native-oh-tpl/react-native-fast-image"
-import { GestureHandlerPackage } from "@react-native-oh-tpl/react-native-gesture-handler"
-import { ImagePickerViewPackage } from "@react-native-oh-tpl/react-native-image-picker"
-import { ImageResizerPackage } from "@react-native-oh-tpl/react-native-image-resizer"
-import { RNOrientationLockerPackage } from "@react-native-oh-tpl/react-native-orientation-locker"
-import { ReanimatedPackage } from "@react-native-oh-tpl/react-native-reanimated/ts"
-import { RNCVideoPackage } from "@react-native-oh-tpl/react-native-video/ts"
+import { AsyncStoragePackage } from "@react-native-ohos/async-storage";
+import { ClipboardPackage } from "@react-native-ohos/clipboard";
+import { CookiesPackage } from "@react-native-ohos/cookies";
+import { LottieAnimationView, LOTTIE_TYPE } from "@react-native-ohos/lottie-react-native";
+import { RNConfigPackage } from "@react-native-ohos/react-native-config";
+import { RNDeviceInfoPackage } from "@react-native-ohos/react-native-device-info";
+import { RNGetRandomValuesPackage } from "@react-native-ohos/react-native-get-random-values";
+import { RNLocalizePackage } from "@react-native-ohos/react-native-localize";
+import { PermissionsPackage } from "@react-native-ohos/react-native-permissions";
+import { SafeAreaViewPackage } from "@react-native-ohos/react-native-safe-area-context";
+import { SvgPackage } from "@react-native-ohos/react-native-svg";
+import { CameraRollPackage } from "@react-native-ohos/camera-roll"
+import { LottieAnimationViewPackage } from "@react-native-ohos/lottie-react-native/ts"
+import { NetInfoPackage } from "@react-native-ohos/netinfo/ts"
+import { BlobUtilPackage } from "@react-native-ohos/react-native-blob-util"
+import { DocumentPickerPackage } from "@react-native-ohos/react-native-document-picker/ts"
+import { FastImagePackage } from "@react-native-ohos/react-native-fast-image"
+import { GestureHandlerPackage } from "@react-native-ohos/react-native-gesture-handler"
+import { ImagePickerViewPackage } from "@react-native-ohos/react-native-image-picker"
+import { ImageResizerPackage } from "@react-native-ohos/react-native-image-resizer"
+import { RNOrientationLockerPackage } from "@react-native-ohos/react-native-orientation-locker"
+import { ReanimatedPackage } from "@react-native-ohos/react-native-reanimated/ts"
+import { RNCVideoPackage } from "@react-native-ohos/react-native-video/ts"
 
-import { VisionCameraModulePackage } from "@react-native-oh-tpl/react-native-vision-camera"
+import { VisionCameraModulePackage } from "@react-native-ohos/react-native-vision-camera"
 import { PushNotificationPackage } from "@react-native-ohos/push-notification-ios"
 import { FsPackage } from "@react-native-ohos/react-native-fs"
-import { WebViewPackage} from '@react-native-oh-tpl/react-native-webview/ts'
-import { CodePushPackage } from 'xrn-code-push'
-import { RTNPdfView, PDF_VIEW_TYPE } from '@react-native-oh-tpl/react-native-pdf';
-import { WebView, WEB_VIEW } from "@react-native-oh-tpl/react-native-webview"
-import { RNCVideo, RNC_VIDEO_TYPE } from "@react-native-oh-tpl/react-native-video"
-import { VisionCameraView } from "@react-native-oh-tpl/react-native-vision-camera";
-import { XRNNativeStoragePackage } from 'xrn-native-storage'
+import { WebViewPackage} from '@react-native-ohos/react-native-webview/ts'
+import { CodePushPackage } from '@xrnjs/react-native-code-push'
+import { RTNPdfView, PDF_VIEW_TYPE } from '@react-native-ohos/react-native-pdf';
+import { WebView, WEB_VIEW } from "@react-native-ohos/react-native-webview"
+import { RNCVideo, RNC_VIDEO_TYPE } from "@react-native-ohos/react-native-video"
+import { VisionCameraView } from "@react-native-ohos/react-native-vision-camera";
+import { XRNNativeStoragePackage } from '@xrnjs/native-storage'
 
 
 import {
@@ -41,13 +40,13 @@ import {
   RNPackageContext,
   WrappedCustomRNComponentBuilder } from "@rnoh/react-native-openharmony/src/main/ets/RNOH";
 import { RNInstance, RNInstanceOptions } from "@rnoh/react-native-openharmony/src/main/ets/RNOH/RNInstance";
-import { BundleInfo, RNContainerOptions, XRNMultiBundlePackage } from "xrn-multi-bundle";
-import { XRNLoadingPackage } from "xrn-loading";
-import { SmartRefreshPackage } from "@react-native-oh-tpl/react-native-smartrefreshlayout";
-import { XRNBundlePackage } from "xrn-bundle";
-import { XRNNavigationPackage } from "xrn-navigation";
-import { XRNAppUtilsPackage, XRNFilePackage, XRNToastPackage } from "xrn-app-utils";
-import  { XRNDebugToolsPackage } from  'xrn-debug-tools';
+import { BundleInfo, RNContainerOptions, XRNMultiBundlePackage } from "@xrnjs/multi-bundle";
+import { XRNLoadingPackage } from "@xrnjs/loading";
+import { SmartRefreshPackage } from "@react-native-ohos/react-native-smartrefreshlayout";
+import { XRNBundlePackage } from "@xrnjs/bundle";
+import { XRNNavigationPackage } from "@xrnjs/navigation";
+import { XRNAppUtilsPackage } from "@xrnjs/app-utils";
+import  { XRNDebugToolsPackage } from  '@xrnjs/debug-tools';
 
 export function getRNContainerOptions(): RNContainerOptions {
 	return {
@@ -91,7 +90,6 @@ export function createRNPackages(ctx: RNPackageContext, bundleInfo: BundleInfo):
     new GestureHandlerPackage(ctx),
     new SvgPackage(ctx),
     new WebViewPackage(ctx),
-    new TouchIdPackage(ctx),
     new PermissionsPackage(ctx),
     new CookiesPackage(ctx),
     new LottieAnimationViewPackage(ctx),
@@ -112,16 +110,14 @@ export function createRNPackages(ctx: RNPackageContext, bundleInfo: BundleInfo):
     new ReanimatedPackage(ctx),
     new RNCVideoPackage(ctx),
     new VisionCameraModulePackage(ctx),
-    new CodePushPackage(ctx, bundleInfo, ""),
+    new CodePushPackage(ctx, bundleInfo, "", ""),
     new XRNLoadingPackage(ctx),
     new SmartRefreshPackage(ctx),
     new XRNMultiBundlePackage(ctx),
-    new XRNBundlePackage(ctx, bundleInfo.bundleName),
+    new XRNBundlePackage(ctx, bundleInfo.bundleName, "", ""),
     new XRNAppUtilsPackage(ctx),
-    new XRNFilePackage(ctx),
     new XRNNavigationPackage(ctx),
     new XRNNativeStoragePackage(ctx),
-    new XRNToastPackage(ctx),
     new XRNDebugToolsPackage(ctx, bundleInfo.bundleName),
   ]
 }
@@ -195,4 +191,4 @@ const fontResourceByFontFamily: Record<string, string | Resource> = {
   // 'icomoon': $rawfile('fonts/icomoon.ttf'),
   // 'fontello': $rawfile('fonts/fontello.ttf'),
   // 'poppy-icon': $rawfile('fonts/test.ttf')
-}
+}

package/harmony/entry/src/main/ets/MainAbilityStage.ets

@@ -1,7 +1,7 @@
 import { AbilityStage } from "@kit.AbilityKit";
 import {
   APP_RNOH_RNOHCoreContext,
-  BundleInfo, BundleInfoManager, initRNContainerOptions, RNInstanceManager } from "xrn-multi-bundle";
+  BundleInfo, BundleInfoManager, initRNContainerOptions, RNInstanceManager } from "@xrnjs/multi-bundle";
 import { getRNContainerOptions, getRNInstanceOptions } from "./BundleHelper";
 import {
   AnyJSBundleProvider,
@@ -9,7 +9,7 @@ import {
   ResourceJSBundleProvider,
   RNOHCoreContext,
   TraceJSBundleProviderDecorator} from "@rnoh/react-native-openharmony";
-import { CodePushJSBundleProvider } from "xrn-code-push";
+import { CodePushJSBundleProvider } from "@xrnjs/react-native-code-push";
 
 export default class MainAbilityStage extends AbilityStage {
 
@@ -19,10 +19,15 @@ export default class MainAbilityStage extends AbilityStage {
 
   onCreate(): void {
     initRNContainerOptions(getRNContainerOptions())
-    BundleInfoManager.initWithRawFile(this.context, "bundle_config.json5", undefined)
+    BundleInfoManager.initWithRawFile(this.context, "bundle_config.json5", undefined, undefined)
     RNInstanceManager.init({
       getRNInstanceOptions: getRNInstanceOptions,
       createJSBundleProvider: createJSBundleProvider,
+      getSplitBundleOptions: () => ({
+        getCommonBundleName: () => "oh.xt-app-common.bundle",
+        isSplitMode: (_bundleInfo: BundleInfo) => false,
+      }),
+      isMemoryPressured: () => false,
     })
 
   }
@@ -43,7 +48,7 @@ function createJSBundleProvider(bundleInfo: BundleInfo): JSBundleProvider | unde
   //本地服务，TODO：Dev 环境
   jsBundleProviderArray.push(new MetroJSBundleProvider(bundleInfo.getLocalServerUrl(), bundleInfo.getModuleNames()))
   // //热更新
-  jsBundleProviderArray.push(CodePushJSBundleProvider.loadCodePushBundle(rnohCoreContext?.uiAbilityContext, bundleInfo.getJSBundleName(), bundleInfo.getCodePushKey()))
+  jsBundleProviderArray.push(CodePushJSBundleProvider.loadCodePushBundle(rnohCoreContext?.uiAbilityContext, bundleInfo, bundleInfo.getCodePushKey(), "", "", false))
   // NOTE: to load the bundle from file, place it in
   // `/data/app/el2/100/base/com.rnoh.tester/files/bundle.harmony.js`
   // on your device. The path mismatch is due to app sandboxing on HarmonyOS

package/harmony/entry/src/main/ets/entryability/EntryAbility.ets

@@ -1,4 +1,4 @@
-import { XRNAbility } from 'xrn-multi-bundle';
+import { XRNAbility } from '@xrnjs/multi-bundle';
 import { window } from '@kit.ArkUI';
 import { BusinessError } from '@kit.BasicServicesKit';
 import { APP_SYS_NAVIGATION_HEIGHT, APP_SYS_SYSTEM_BAR_HEIGHT } from '../Constants';

package/harmony/entry/src/main/ets/navDestination/BizModuleContainer.ets

@@ -1,8 +1,8 @@
-import { BaseModuleContainer } from "xrn-navigation";
+import { BaseModuleContainer } from "@xrnjs/navigation";
 
 @Component
 export struct BizModuleContainer {
   build() {
     BaseModuleContainer()
   }
-}
+}

package/harmony/entry/src/main/ets/navDestination/MainModuleContainer.ets

@@ -1,8 +1,8 @@
-import { BaseModuleContainer } from "xrn-navigation";
+import { BaseModuleContainer } from "@xrnjs/navigation";
 
 @Component
 export struct MainModuleContainer {
   build() {
     BaseModuleContainer()
   }
-}
+}

package/harmony/entry/src/main/ets/navDestination/Splash.ets

@@ -1,4 +1,4 @@
-import { NavPath, replaceToMain } from "xrn-navigation"
+import { NavPath, replaceToMain } from "@xrnjs/navigation"
 
 @Component
 export struct Splash {
@@ -35,4 +35,3 @@ export struct Splash {
     .hideToolBar(true)
   }
 }
-

package/harmony/entry/src/main/ets/pages/Index.ets

@@ -1,13 +1,13 @@
 import { Splash } from '../navDestination/Splash';
-import { NavigationContainer, getModuleRouteParams, ModuleRouteParams } from 'xrn-navigation'
+import { NavigationContainer, getModuleRouteParams, ModuleRouteParams } from '@xrnjs/navigation'
 import webview from '@ohos.web.webview';
 import { preferences } from "@kit.ArkData";
 import { MainModuleContainer } from '../navDestination/MainModuleContainer';
 import { BizModuleContainer } from '../navDestination/BizModuleContainer';
-import { RN_INSTANCE_MANAGER } from 'xrn-multi-bundle';
+import { RN_INSTANCE_MANAGER } from '@xrnjs/multi-bundle';
 import { FloatBall } from '../module/devtools/components/FloatBall'
 import { RNInstance } from '@rnoh/react-native-openharmony';
-import { BuildConfig } from '@react-native-oh-tpl/react-native-config/BuildConfig'
+import { BuildConfig } from '@react-native-ohos/react-native-config/BuildConfig'
 // const DEV_ENV_NAME = "DEV_ENV_NAME"
 const DEV_ENV_NAME = "dev"
 const PROD = 'prod';
@@ -63,4 +63,4 @@ struct MainPage {
     .height('100%')
 
   }
-}
+}

package/harmony/entry/src/main/resources/rawfile/bundle_config.json5

@@ -1,21 +1,17 @@
 {
-  "project": {
-    "name": "XRNTemplate"
-  },
-  "defaultOptions": {
-    "bundleType": "sub"
-  },
   "bundles": [
     {
       "bundleName": "main-bundle",
       "bundlePackageRelativePath": "./main-bundle",
       "bundleType": "main",
+      "checkNativeDep": false,
       "codePushKey": "0NzkdHaOp6RhCDWjD1G3KogLieV54ksvOXqog",
       "port": 8081
     },
     {
       "bundleName": "sub-bundle",
       "bundlePackageRelativePath": "./sub-bundle",
+      "checkNativeDep": false,
       "codePushKey": "KpWDtkf7lssWGGhFVlubzRq9gAg74ksvOXqog",
       "port": 6061
     }

package/harmony/entry/src/main/resources/rawfile/xrn-manifest.json

@@ -0,0 +1 @@
+{"dependencies":{"@xrnjs/cli":"0.1.0","@xrnjs/core":"0.1.0"},"commonBaseLine":{"modules":{},"id":0,"hash":"","useOldApp":true}}

package/harmony/oh-package-lock.json5

@@ -1,6 +1,7 @@
 {
   "meta": {
-    "stableOrder": true
+    "stableOrder": true,
+    "enableUnifiedLockfile": false
   },
   "lockfileVersion": 3,
   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",

package/harmony/oh-package.json5

@@ -8,10 +8,18 @@
     "@ohos/hamock": "1.0.0"
   },
   "overrides": {
-  //  "@rnoh/react-native-openharmony": "0.72.38",
+//    "@rnoh/react-native-openharmony": "0.72.38",
     "@rnoh/react-native-openharmony": "../node_modules/@react-native-oh/react-native-harmony/react_native_openharmony.har",
-    "xrn-multi-bundle": "../node_modules/@xrnjs/multi-bundle/harmony/xrn_multi_bundle",
-    "xrn-navigation": "../node_modules/@xrnjs/navigation/harmony/xrn_navigation",
-    "xrn-code-push": "../node_modules/@xrnjs/react-native-code-push/harmony/codePush"
+    "@xrnjs/multi-bundle": "../node_modules/@xrnjs/multi-bundle/harmony/xrn_multi_bundle",
+    "@xrnjs/react-native-code-push": "../node_modules/@xrnjs/react-native-code-push/harmony/codePush",
+    "@xrnjs/navigation": "../node_modules/@xrnjs/navigation/harmony/xrn_navigation",
+    "@xrnjs/bundle": "../node_modules/@xrnjs/bundle/harmony/xrn_bundle",
+    "@xrnjs/app-utils": "../node_modules/@xrnjs/app-utils/harmony/xrn_app_utils",
+    "@xrnjs/debug-tools": "../node_modules/@xrnjs/debug-tools/harmony/xrn_debug_tools",
+    "@xrnjs/native-storage": "../node_modules/@xrnjs/native-storage/harmony/xrn_native_storage",
+    "@xrnjs/loading": "../node_modules/@xrnjs/loading/harmony/xrn_loading",
+    "@xrnjs/modules-core": "../node_modules/@xrnjs/modules-core/harmony/xrn_modules_core",
+    "@wolfx/json5": "2.2.3-rc.1",
+    "@ohos/lottie": "2.0.25"
   }
 }

package/ios/BundleEventCenter/Hooks/XRNCustomKeyborad+XTHooks.h

@@ -0,0 +1,16 @@
+//
+//  XRNCustomKeyborad+XTHooks.h
+//  xrngo
+//
+//  Created by  xupeng on 2025/10/14.
+//
+
+#import <XRNCustomKeyborad.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface XRNCustomKeyborad (XTHooks)
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/BundleEventCenter/Hooks/XRNCustomKeyborad+XTHooks.mm

@@ -0,0 +1,40 @@
+//
+//  XRNCustomKeyborad+XTHooks.mm
+//  xrngo
+//
+//  Created by  xupeng on 2025/10/14.
+//
+
+#import "XRNCustomKeyborad+XTHooks.h"
+#import "XTIQKeyboardManagerBridge.h"
+#import <JRSwizzle/JRSwizzle.h>
+
+@implementation XRNCustomKeyborad (XTHooks)
+
++ (void)load {
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    [XRNCustomKeyborad jr_swizzleMethod:@selector(setMode:) withMethod:@selector(xt_setMode:) error:nil];
+    [XRNCustomKeyborad jr_swizzleMethod:@selector(setExtra:) withMethod:@selector(xt_setExtra:) error:nil];
+//    [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(hiddenKeyboard) name:UIKeyboardWillHideNotification object:nil];
+  });
+}
+
+
+- (void)xt_setMode:(NSString *)mode {
+  [XTIQKeyboardManagerBridge xt_setViewSoftInputMode:mode];
+  [self xt_setMode:mode];
+}
+
+- (void)xt_setExtra:(NSDictionary *)extra {
+  if (extra[@"softInputSpace"]) {
+    [XTIQKeyboardManagerBridge xt_setViewSoftInputSpace:extra[@"softInputSpace"]];
+  }
+  [self xt_setExtra:extra];
+}
+
++ (void)hiddenKeyboard {
+  [XTIQKeyboardManagerBridge xt_clearViewPositionInfo];
+}
+
+@end

package/ios/BundleEventCenter/Hooks/XTIQKeyboardManagerBridge.h

@@ -0,0 +1,15 @@
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/// Pure ObjC shim so ObjC++ files (e.g. hooks pulling in ReactCodegen) do not need `@import IQKeyboardManagerSwift`,
+/// which requires C++ modules in `.mm` translation units.
+@interface XTIQKeyboardManagerBridge : NSObject
+
++ (void)xt_setViewSoftInputMode:(NSString *)mode;
++ (void)xt_setViewSoftInputSpace:(nullable id)space;
++ (void)xt_clearViewPositionInfo;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/BundleEventCenter/Hooks/XTIQKeyboardManagerBridge.m

@@ -0,0 +1,22 @@
+#import "XTIQKeyboardManagerBridge.h"
+
+@import IQKeyboardManagerSwift;
+
+@implementation XTIQKeyboardManagerBridge
+
++ (void)xt_setViewSoftInputMode:(NSString *)mode
+{
+  [IQKeyboardManager shared].viewSoftInputMode.softInputMode = mode;
+}
+
++ (void)xt_setViewSoftInputSpace:(id)space
+{
+  [IQKeyboardManager shared].viewSoftInputMode.space = space;
+}
+
++ (void)xt_clearViewPositionInfo
+{
+  [[IQKeyboardManager shared] clearViewPositionInfo];
+}
+
+@end