@xrnjs/app-template 0.0.1 → 0.0.3

package/$package.json

@@ -7,7 +7,7 @@
     "codegen": "react-native codegen-harmony --cpp-output-path ./harmony/entry/src/main/cpp/generated --rnoh-module-path ./harmony/entry/oh_modules/@rnoh/react-native-openharmony",
     "build:harmony": "xrn build XRNTemplate harmony --type debug --appFormat hap",
     "build:ios": "xrn build XRNTemplate ios --type debug --appFormat ipa",
-    "build:ios-sim": "xrn build XRNTemplate ios --type release --appFormat app",
+    "build:ios-sim": "xrn build XRNTemplate ios --type debug --appFormat app",
     "build:android": "xrn build XRNTemplate android --type debug --appFormat apk",
     "publish:ios": "xrn app-publish XRNTemplate ios --type release --appFormat ipa --changeLog iOS发布",
     "postinstall": "xrn-native-postinstall"
@@ -16,7 +16,7 @@
     "@react-native-async-storage/async-storage": "1.21.0",
     "@react-native-clipboard/clipboard": "1.13.2",
     "@react-native-community/netinfo": "11.3.2",
-    "@xrn/core": "0.0.2-beta.65",
+    "@xrnjs/core": "0.0.3",
     "react": "18.2.0",
     "react-native": "0.72.5",
     "react-native-config": "1.5.3",
@@ -38,7 +38,7 @@
     "@types/lodash": "^4.17.12",
     "@types/react": "18.0.25",
     "@types/react-native": "0.72.8",
-    "@xrn/cli": "0.0.2-beta.31",
+    "@xrnjs/cli": "0.0.3",
     "eslint": "^7.32.0",
     "metro-react-native-babel-preset": "0.72.4",
     "patch-package": "^8.0.0"

package/.env

@@ -3,4 +3,4 @@ ENV_NAME=dev
 CDN_URL_PREFIX=https://example.oss-cn-hangzhou.aliyuncs.com
 
 # CodePush
-CODEPUSH_URL=http://cp.example.cn/
+CODEPUSH_URL=""

package/.env.prod

@@ -3,4 +3,4 @@ ENV_NAME=prod
 CDN_URL_PREFIX=https://cdn-cn2.example.cn
 
 # CodePush
-CODEPUSH_URL=http://cp.example.cn/
+CODEPUSH_URL=""

package/android/app/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlinx-serialization'
 
-apply from: "../../node_modules/@xrn/react-native-code-push/android/codepush.gradle"
+apply from: "../../node_modules/@xrnjs/react-native-code-push/android/codepush.gradle"
 apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
 
 /**
@@ -135,10 +135,10 @@ dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
 
-    implementation project(':xrn_multi-bundle')
-    implementation project(':xrn_bundle')
-    implementation project(':xrn_debug-tools')
-    implementation project(':xrn_react-native-code-push')
+    implementation project(':xrnjs_multi-bundle')
+    implementation project(':xrnjs_bundle')
+    implementation project(':xrnjs_debug-tools')
+    implementation project(':xrnjs_react-native-code-push')
 
     implementation "androidx.multidex:multidex:2.0.1"
 

package/android/app/src/main/AndroidManifest.xml

@@ -3,8 +3,6 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
 
-    <queries><provider android:authorities="com.facebook.katana.provider.PlatformProvider" /></queries>
-
     <application
       android:name="com.xrn.template.MainApplication"
       android:label="@string/app_name"
@@ -13,12 +11,6 @@
       android:allowBackup="false"
       android:theme="@style/AppTheme">
 
-<!--        <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/facebook_app_id"/>-->
-<!--        <meta-data android:name="com.facebook.sdk.ClientToken" android:value="@string/facebook_client_token"/>-->
-<!--        <provider android:authorities="com.facebook.app.FacebookContentProvider1023244862344164"-->
-<!--            android:name="com.facebook.FacebookContentProvider"-->
-<!--            android:exported="true"/>-->
-
       <activity
         android:name="com.xrn.template.MainActivity"
         android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"

package/android/app/src/main/assets/xrn-manifest.json

@@ -1 +1 @@
-{"dependencies":{"@bam.tech/react-native-image-resizer":"3.0.9","@react-native-async-storage/async-storage":"1.21.0","@react-native-camera-roll/camera-roll":"7.8.3","@react-native-clipboard/clipboard":"1.13.2","@react-native-community/netinfo":"11.3.2","@react-native-community/push-notification-ios":"1.11.0","@react-native-cookies/cookies":"6.2.1","@react-native-oh/react-native-harmony":"0.72.38","@react-native-picker/picker":"2.6.1","@sdcx/pull-to-refresh":"0.21.0","@sentry/react-native":"4.15.2","@xrn/core":"0.0.2-beta.33","@yidun/quickpass-plugin-rn":"1.3.4","lottie-react-native":"6.4.1","react":"18.2.0","react-native":"0.72.5","react-native-adjust":"4.38.0","react-native-blob-util":"0.19.11","react-native-config":"1.5.3","react-native-device-info":"11.1.0","react-native-document-picker":"9.2.0","react-native-fast-image":"8.6.3","react-native-fs":"2.20.0","react-native-gesture-handler":"2.14.1","react-native-get-random-values":"1.11.0","react-native-image-picker":"7.0.3","react-native-keyboard-manager":"6.5.16-0","react-native-keychain":"8.1.2","react-native-linear-gradient":"3.0.0-alpha.1","react-native-localize":"3.1.0","react-native-modpow":"1.1.1-0","react-native-orientation-locker":"1.7.0","react-native-pdf":"6.7.4","react-native-permissions":"4.1.2","react-native-place-module":"0.1.1","react-native-reanimated":"3.6.0","react-native-safe-area-context":"4.7.4","react-native-screens":"3.33.0","react-native-svg":"15.0.0","react-native-touch-id":"4.4.1","react-native-update-in-app-xt":"1.0.5","react-native-video":"6.0.0-alpha.9","react-native-vision-camera":"4.0.1","react-native-webview":"13.10.2"},"commonBaseLine":{"modules":{},"id":0,"hash":"","useOldApp":true}}
+{"dependencies":{"@bam.tech/react-native-image-resizer":"3.0.9","@react-native-async-storage/async-storage":"1.21.0","@react-native-camera-roll/camera-roll":"7.8.3","@react-native-clipboard/clipboard":"1.13.2","@react-native-community/netinfo":"11.3.2","@react-native-community/push-notification-ios":"1.11.0","@react-native-cookies/cookies":"6.2.1","@react-native-oh/react-native-harmony":"0.72.38","@react-native-picker/picker":"2.6.1","@sdcx/pull-to-refresh":"0.21.0","@sentry/react-native":"4.15.2","@xrnjs/core":"0.0.2-beta.33","@yidun/quickpass-plugin-rn":"1.3.4","lottie-react-native":"6.4.1","react":"18.2.0","react-native":"0.72.5","react-native-adjust":"4.38.0","react-native-blob-util":"0.19.11","react-native-config":"1.5.3","react-native-device-info":"11.1.0","react-native-document-picker":"9.2.0","react-native-fast-image":"8.6.3","react-native-fs":"2.20.0","react-native-gesture-handler":"2.14.1","react-native-get-random-values":"1.11.0","react-native-image-picker":"7.0.3","react-native-keyboard-manager":"6.5.16-0","react-native-keychain":"8.1.2","react-native-linear-gradient":"3.0.0-alpha.1","react-native-localize":"3.1.0","react-native-modpow":"1.1.1-0","react-native-orientation-locker":"1.7.0","react-native-pdf":"6.7.4","react-native-permissions":"4.1.2","react-native-place-module":"0.1.1","react-native-reanimated":"3.6.0","react-native-safe-area-context":"4.7.4","react-native-screens":"3.33.0","react-native-svg":"15.0.0","react-native-touch-id":"4.4.1","react-native-update-in-app-xt":"1.0.5","react-native-video":"6.0.0-alpha.9","react-native-vision-camera":"4.0.1","react-native-webview":"13.10.2"},"commonBaseLine":{"modules":{},"id":0,"hash":"","useOldApp":true}}

package/android/app/src/main/java/com/xrn/template/MainActivity.kt

@@ -2,6 +2,8 @@ package com.xrn.template
 
 import android.animation.Animator
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatActivity
 import com.blankj.utilcode.util.LogUtils
@@ -18,24 +20,9 @@ class MainActivity : AppCompatActivity() {
             )
         )
         setContentView(binding.root)
-        initViews(binding)
-    }
-
-    private fun initViews(binding: ActivitySplashBinding) {
-        binding.lavSplashLottie.addAnimatorListener(object : Animator.AnimatorListener {
-            override fun onAnimationStart(animation: Animator) {
-            }
-
-            override fun onAnimationEnd(animation: Animator) {
-                startXMainActivity()
-            }
-
-            override fun onAnimationCancel(animation: Animator) {
-            }
-
-            override fun onAnimationRepeat(animation: Animator) {
-            }
-        })
+        Handler(Looper.getMainLooper()).postDelayed({
+            startXMainActivity()
+        }, 500)
     }
 
     private fun startXMainActivity() {

package/android/app/src/main/java/com/xrn/template/MainApplication.kt

@@ -53,7 +53,7 @@ class MainApplication : MultiDexApplication(), ReactApplication {
             e.printStackTrace()
             Unit
         }
-        init(this, params, !BuildConfig.DEBUG, BuildConfig.DEBUG)
+        init(this, params)
     }
 
     private fun initNavigation() {

package/android/app/src/main/res/layout/activity_splash.xml

@@ -4,13 +4,11 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <com.airbnb.lottie.LottieAnimationView
-        android:id="@+id/lav_splash_lottie"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:lottie_autoPlay="true"
-        app:lottie_loop="false"
-        android:scaleType="centerCrop"
-        app:lottie_rawRes="@raw/launch_screen" />
+    <ImageView
+        android:id="@+id/iv_logo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:src="@drawable/ic_logo_bg"/>
 
 </RelativeLayout>

package/android/settings.gradle

@@ -4,11 +4,11 @@ apply from: file("../node_modules/@react-native-community/cli-platform-android/n
 include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')
 
-include ':xrn_react-native-code-push'
-project(':xrn_react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/@xrn/react-native-code-push/android/app')
+include ':xrnjs_react-native-code-push'
+project(':xrnjs_react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/@xrnjs/react-native-code-push/android/app')
 
-include(':xrn_multi-bundle')
-project(':xrn_multi-bundle').projectDir = new File(rootProject.projectDir, '../node_modules/@xrn/multi-bundle/android')
+ include(':xrnjs_multi-bundle')
+ project(':xrnjs_multi-bundle').projectDir = new File(rootProject.projectDir, '../node_modules/@xrnjs/multi-bundle/android')
 
 if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
     include(":ReactAndroid")

package/harmony/build-profile.json5

@@ -61,31 +61,35 @@
     },
     {
       name: 'xrn_loading',
-      srcPath: '../node_modules/@xrn/loading/harmony/xrn_loading',
+      srcPath: '../node_modules/@xrnjs/loading/harmony/xrn_loading',
     },
     {
       name: 'xrn_native_storage',
-      srcPath: '../node_modules/@xrn/native-storage/harmony/xrn_native_storage',
+      srcPath: '../node_modules/@xrnjs/native-storage/harmony/xrn_native_storage',
     },
     {
       name: 'xrn_multi_bundle',
-      srcPath: '../node_modules/@xrn/multi-bundle/harmony/xrn_multi_bundle',
+      srcPath: '../node_modules/@xrnjs/multi-bundle/harmony/xrn_multi_bundle',
     },
     {
       name: 'xrn_bundle',
-      srcPath: '../node_modules/@xrn/bundle/harmony/xrn_bundle',
+      srcPath: '../node_modules/@xrnjs/bundle/harmony/xrn_bundle',
     },
     {
       name: 'xrn_app_utils',
-      srcPath: '../node_modules/@xrn/app-utils/harmony/xrn_app_utils',
+      srcPath: '../node_modules/@xrnjs/app-utils/harmony/xrn_app_utils',
     },
     {
       name: 'xrn_navigation',
-      srcPath: '../node_modules/@xrn/navigation/harmony/xrn_navigation',
+      srcPath: '../node_modules/@xrnjs/navigation/harmony/xrn_navigation',
     },
     {
       name: 'xrn_debug_tools',
-      srcPath: '../node_modules/@xrn/debug-tools/harmony/xrn_debug_tools',
+      srcPath: '../node_modules/@xrnjs/debug-tools/harmony/xrn_debug_tools',
+    },
+    {
+      name: 'codePush',
+      srcPath: '../node_modules/@xrnjs/react-native-code-push/harmony/codePush',
     }
   ],
 }

package/harmony/entry/oh-package-lock.json5

@@ -47,14 +47,14 @@
     "@wolfx/json5@^2.2.3-rc.1": "@wolfx/json5@2.2.3-rc.1",
     "libcommon.so@../oh_modules/.ohpm/@umeng+common@1.1.3/oh_modules/@umeng/common/src/main/cpp/types/libcommon": "libcommon.so@../oh_modules/.ohpm/@umeng+common@1.1.3/oh_modules/@umeng/common/src/main/cpp/types/libcommon",
     "mime@^3.0.0": "mime@3.0.0",
-    "xrn-app-utils@../../node_modules/@xrn/app-utils/harmony/xrn_app_utils": "xrn-app-utils@../../node_modules/@xrn/app-utils/harmony/xrn_app_utils",
-    "xrn-bundle@../../node_modules/@xrn/bundle/harmony/xrn_bundle": "xrn-bundle@../../node_modules/@xrn/bundle/harmony/xrn_bundle",
-    "xrn-code-push@../../node_modules/@xrn/react-native-code-push/harmony/codePush": "xrn-code-push@../../node_modules/@xrn/react-native-code-push/harmony/codePush",
-    "xrn-debug-tools@../../node_modules/@xrn/debug-tools/harmony/xrn_debug_tools": "xrn-debug-tools@../../node_modules/@xrn/debug-tools/harmony/xrn_debug_tools",
-    "xrn-loading@../../node_modules/@xrn/loading/harmony/xrn_loading": "xrn-loading@../../node_modules/@xrn/loading/harmony/xrn_loading",
-    "xrn-multi-bundle@../../node_modules/@xrn/multi-bundle/harmony/xrn_multi_bundle": "xrn-multi-bundle@../../node_modules/@xrn/multi-bundle/harmony/xrn_multi_bundle",
-    "xrn-native-storage@../../node_modules/@xrn/native-storage/harmony/xrn_native_storage": "xrn-native-storage@../../node_modules/@xrn/native-storage/harmony/xrn_native_storage",
-    "xrn-navigation@../../node_modules/@xrn/navigation/harmony/xrn_navigation": "xrn-navigation@../../node_modules/@xrn/navigation/harmony/xrn_navigation"
+    "xrn-app-utils@../../node_modules/@xrnjs/app-utils/harmony/xrn_app_utils": "xrn-app-utils@../../node_modules/@xrnjs/app-utils/harmony/xrn_app_utils",
+    "xrn-bundle@../../node_modules/@xrnjs/bundle/harmony/xrn_bundle": "xrn-bundle@../../node_modules/@xrnjs/bundle/harmony/xrn_bundle",
+    "xrn-code-push@../../node_modules/@xrnjs/react-native-code-push/harmony/codePush": "xrn-code-push@../../node_modules/@xrnjs/react-native-code-push/harmony/codePush",
+    "xrn-debug-tools@../../node_modules/@xrnjs/debug-tools/harmony/xrn_debug_tools": "xrn-debug-tools@../../node_modules/@xrnjs/debug-tools/harmony/xrn_debug_tools",
+    "xrn-loading@../../node_modules/@xrnjs/loading/harmony/xrn_loading": "xrn-loading@../../node_modules/@xrnjs/loading/harmony/xrn_loading",
+    "xrn-multi-bundle@../../node_modules/@xrnjs/multi-bundle/harmony/xrn_multi_bundle": "xrn-multi-bundle@../../node_modules/@xrnjs/multi-bundle/harmony/xrn_multi_bundle",
+    "xrn-native-storage@../../node_modules/@xrnjs/native-storage/harmony/xrn_native_storage": "xrn-native-storage@../../node_modules/@xrnjs/native-storage/harmony/xrn_native_storage",
+    "xrn-navigation@../../node_modules/@xrnjs/navigation/harmony/xrn_navigation": "xrn-navigation@../../node_modules/@xrnjs/navigation/harmony/xrn_navigation"
   },
   "packages": {
     "@jxt/xt_hud@3.3.0": {
@@ -398,52 +398,52 @@
       "shasum": "b374550dca3a0c18443b0c950a6a58f1931cf7a7",
       "registryType": "ohpm"
     },
-    "xrn-app-utils@../../node_modules/@xrn/app-utils/harmony/xrn_app_utils": {
+    "xrn-app-utils@../../node_modules/@xrnjs/app-utils/harmony/xrn_app_utils": {
       "name": "xrn-app-utils",
       "version": "1.0.0",
-      "resolved": "../../node_modules/@xrn/app-utils/harmony/xrn_app_utils",
+      "resolved": "../../node_modules/@xrnjs/app-utils/harmony/xrn_app_utils",
       "registryType": "local",
       "dependencies": {
         "@rnoh/react-native-openharmony": "../../node_modules/@react-native-oh/react-native-harmony/react_native_openharmony.har",
         "@pura/harmony-utils": "1.2.6"
       }
     },
-    "xrn-bundle@../../node_modules/@xrn/bundle/harmony/xrn_bundle": {
+    "xrn-bundle@../../node_modules/@xrnjs/bundle/harmony/xrn_bundle": {
       "name": "xrn-bundle",
       "version": "1.0.0",
-      "resolved": "../../node_modules/@xrn/bundle/harmony/xrn_bundle",
+      "resolved": "../../node_modules/@xrnjs/bundle/harmony/xrn_bundle",
       "registryType": "local",
       "dependencies": {
         "@rnoh/react-native-openharmony": "../../node_modules/@react-native-oh/react-native-harmony/react_native_openharmony.har",
-        "xrn-multi-bundle": "../../../../packages/@xrn/multi-bundle/harmony/xrn_multi_bundle",
-        "xrn-code-push": "../../../../node_modules/@xrn/react-native-code-push/harmony/codePush"
+        "xrn-multi-bundle": "../../../../packages/@xrnjs/multi-bundle/harmony/xrn_multi_bundle",
+        "xrn-code-push": "../../../../node_modules/@xrnjs/react-native-code-push/harmony/codePush"
       }
     },
-    "xrn-code-push@../../node_modules/@xrn/react-native-code-push/harmony/codePush": {
+    "xrn-code-push@../../node_modules/@xrnjs/react-native-code-push/harmony/codePush": {
       "name": "xrn-code-push",
       "version": "8.2.2-0.0.10",
-      "resolved": "../../node_modules/@xrn/react-native-code-push/harmony/codePush",
+      "resolved": "../../node_modules/@xrnjs/react-native-code-push/harmony/codePush",
       "registryType": "local",
       "dependencies": {
         "@rnoh/react-native-openharmony": "file:../react_native_openharmony",
         "xrn-multi-bundle": "file:../xrn_multi_bundle"
       }
     },
-    "xrn-debug-tools@../../node_modules/@xrn/debug-tools/harmony/xrn_debug_tools": {
+    "xrn-debug-tools@../../node_modules/@xrnjs/debug-tools/harmony/xrn_debug_tools": {
       "name": "xrn-debug-tools",
       "version": "1.0.0",
-      "resolved": "../../node_modules/@xrn/debug-tools/harmony/xrn_debug_tools",
+      "resolved": "../../node_modules/@xrnjs/debug-tools/harmony/xrn_debug_tools",
       "registryType": "local",
       "dependencies": {
         "@rnoh/react-native-openharmony": "../../node_modules/@react-native-oh/react-native-harmony/react_native_openharmony.har",
-        "xrn-multi-bundle": "../../node_modules/@xrn/multi-bundle/harmony/xrn_multi_bundle",
-        "xrn-navigation": "../../node_modules/@xrn/navigation/harmony/xrn_navigation"
+        "xrn-multi-bundle": "../../node_modules/@xrnjs/multi-bundle/harmony/xrn_multi_bundle",
+        "xrn-navigation": "../../node_modules/@xrnjs/navigation/harmony/xrn_navigation"
       }
     },
-    "xrn-loading@../../node_modules/@xrn/loading/harmony/xrn_loading": {
+    "xrn-loading@../../node_modules/@xrnjs/loading/harmony/xrn_loading": {
       "name": "xrn-loading",
       "version": "1.0.0",
-      "resolved": "../../node_modules/@xrn/loading/harmony/xrn_loading",
+      "resolved": "../../node_modules/@xrnjs/loading/harmony/xrn_loading",
       "registryType": "local",
       "dependencies": {
         "@rnoh/react-native-openharmony": "../../node_modules/@react-native-oh/react-native-harmony/react_native_openharmony.har",
@@ -451,10 +451,10 @@
         "@jxt/xt_hud": "3.3.0"
       }
     },
-    "xrn-multi-bundle@../../node_modules/@xrn/multi-bundle/harmony/xrn_multi_bundle": {
+    "xrn-multi-bundle@../../node_modules/@xrnjs/multi-bundle/harmony/xrn_multi_bundle": {
       "name": "xrn-multi-bundle",
       "version": "1.0.0",
-      "resolved": "../../node_modules/@xrn/multi-bundle/harmony/xrn_multi_bundle",
+      "resolved": "../../node_modules/@xrnjs/multi-bundle/harmony/xrn_multi_bundle",
       "registryType": "local",
       "dependencies": {
         "@rnoh/react-native-openharmony": "../../node_modules/@react-native-oh/react-native-harmony/react_native_openharmony.har",
@@ -462,19 +462,19 @@
         "@pura/harmony-utils": "1.2.6"
       }
     },
-    "xrn-native-storage@../../node_modules/@xrn/native-storage/harmony/xrn_native_storage": {
+    "xrn-native-storage@../../node_modules/@xrnjs/native-storage/harmony/xrn_native_storage": {
       "name": "xrn-native-storage",
       "version": "1.0.0",
-      "resolved": "../../node_modules/@xrn/native-storage/harmony/xrn_native_storage",
+      "resolved": "../../node_modules/@xrnjs/native-storage/harmony/xrn_native_storage",
       "registryType": "local",
       "dependencies": {
         "@rnoh/react-native-openharmony": "../../node_modules/@react-native-oh/react-native-harmony/react_native_openharmony.har"
       }
     },
-    "xrn-navigation@../../node_modules/@xrn/navigation/harmony/xrn_navigation": {
+    "xrn-navigation@../../node_modules/@xrnjs/navigation/harmony/xrn_navigation": {
       "name": "xrn-navigation",
       "version": "1.0.0",
-      "resolved": "../../node_modules/@xrn/navigation/harmony/xrn_navigation",
+      "resolved": "../../node_modules/@xrnjs/navigation/harmony/xrn_navigation",
       "registryType": "local",
       "dependencies": {
         "@rnoh/react-native-openharmony": "../../node_modules/@react-native-oh/react-native-harmony/react_native_openharmony.har",

package/harmony/entry/oh-package.json5

@@ -16,7 +16,6 @@
     '@react-native-oh-tpl/clipboard': '../../node_modules/@react-native-oh-tpl/clipboard/harmony/clipboard.har',
     '@react-native-oh-tpl/netinfo': '../../node_modules/@react-native-oh-tpl/netinfo/harmony/netinfo.har',
     '@react-native-oh-tpl/cookies': '../../node_modules/@react-native-oh-tpl/cookies/harmony/rn_cookies.har',
-//    '@react-native-oh-tpl/picker': '../../node_modules/@react-native-oh-tpl/picker/harmony/picker.har',
     '@react-native-oh-tpl/lottie-react-native': '../../node_modules/@react-native-oh-tpl/lottie-react-native/harmony/lottie.har',
     '@react-native-oh-tpl/react-native-config': '../../node_modules/@react-native-oh-tpl/react-native-config/harmony/config',
     '@react-native-oh-tpl/react-native-device-info': 'file:../../node_modules/@react-native-oh-tpl/react-native-device-info/harmony/device_info',
@@ -36,20 +35,17 @@
     '@react-native-oh-tpl/camera-roll': '../../node_modules/@react-native-oh-tpl/camera-roll/harmony/camera_roll.har',
     '@react-native-oh-tpl/react-native-pdf': '../../node_modules/@react-native-oh-tpl/react-native-pdf/harmony/pdfview.har',
     '@react-native-oh-tpl/react-native-webview': '../../node_modules/@react-native-oh-tpl/react-native-webview/harmony/rn_webview.har',
-//    '@react-native-oh-tpl/react-native-background-timer': '../../node_modules/@react-native-oh-tpl/react-native-background-timer/harmony/background_timer.har',
     '@react-native-oh-tpl/react-native-document-picker': '../../node_modules/@react-native-oh-tpl/react-native-document-picker/harmony/document_picker.har',
     '@react-native-oh-tpl/react-native-image-resizer': '../../node_modules/@react-native-oh-tpl/react-native-image-resizer/harmony/image_resizer.har',
     '@ohos/lottie': '^2.0.15',
-    //以下是源码依赖Demo
-//    'xrn-loading': '../../../../packages/@xrn/loading/harmony/xrn_loading',
-    'xrn-loading': '../../node_modules/@xrn/loading/harmony/xrn_loading',
-    'xrn-native-storage': '../../node_modules/@xrn/native-storage/harmony/xrn_native_storage',
-    'xrn-navigation': '../../node_modules/@xrn/navigation/harmony/xrn_navigation',
-    'xrn-code-push': '../../node_modules/@xrn/react-native-code-push/harmony/codePush',
-    'xrn-multi-bundle': '../../node_modules/@xrn/multi-bundle/harmony/xrn_multi_bundle',
-    'xrn-bundle': '../../node_modules/@xrn/bundle/harmony/xrn_bundle',
-    'xrn-app-utils': '../../node_modules/@xrn/app-utils/harmony/xrn_app_utils',
-    'xrn-debug-tools': '../../node_modules/@xrn/debug-tools/harmony/xrn_debug_tools',
+    'xrn-loading': '../../node_modules/@xrnjs/loading/harmony/xrn_loading',
+    'xrn-native-storage': '../../node_modules/@xrnjs/native-storage/harmony/xrn_native_storage',
+    'xrn-navigation': '../../node_modules/@xrnjs/navigation/harmony/xrn_navigation',
+    'xrn-code-push': '../../node_modules/@xrnjs/react-native-code-push/harmony/codePush',
+    'xrn-multi-bundle': '../../node_modules/@xrnjs/multi-bundle/harmony/xrn_multi_bundle',
+    'xrn-bundle': '../../node_modules/@xrnjs/bundle/harmony/xrn_bundle',
+    'xrn-app-utils': '../../node_modules/@xrnjs/app-utils/harmony/xrn_app_utils',
+    'xrn-debug-tools': '../../node_modules/@xrnjs/debug-tools/harmony/xrn_debug_tools',
     '@umeng/common': '^1.1.3',
     '@umeng/analytics': '^1.2.4',
     '@umeng/apm': '^1.1.1',

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

@@ -131,6 +131,33 @@ RNDeviceInfo::RNDeviceInfo(const ArkTSTurboModule::Context ctx, const std::strin
         ARK_METHOD_METADATA(supportedAbisSync, 0),
         ARK_ASYNC_METHOD_METADATA(getSupportedMediaTypeList, 0),
         ARK_METHOD_METADATA(getSupportedMediaTypeListSync, 0),
+        ARK_METHOD_METADATA(isPinOrFingerprintSetSync, 0),
+        ARK_METHOD_METADATA(getMacAddressSync, 0),
+        ARK_METHOD_METADATA(getUsedMemorySync, 0),
+        ARK_ASYNC_METHOD_METADATA(isEmulator, 0),
+        ARK_METHOD_METADATA(isEmulatorSync, 0),
+        ARK_ASYNC_METHOD_METADATA(hasSystemFeature, 1),
+        ARK_METHOD_METADATA(hasSystemFeatureSync, 1),
+        ARK_ASYNC_METHOD_METADATA(getSystemAvailableFeatures, 0),
+        ARK_METHOD_METADATA(getSystemAvailableFeaturesSync, 0),
+        ARK_ASYNC_METHOD_METADATA(getInstallReferrer, 0),
+        ARK_METHOD_METADATA(getInstallReferrerSync, 0),
+        ARK_ASYNC_METHOD_METADATA(getTags, 0),
+        ARK_METHOD_METADATA(getTagsSync, 0),
+        ARK_ASYNC_METHOD_METADATA(getSystemManufacturer, 0),
+        ARK_METHOD_METADATA(getSystemManufacturerSync, 0),
+        ARK_ASYNC_METHOD_METADATA(getAndroidId, 0),
+        ARK_METHOD_METADATA(getAndroidIdSync, 0),
+        ARK_ASYNC_METHOD_METADATA(getMaxMemory, 0),
+        ARK_METHOD_METADATA(getMaxMemorySync, 0),
+        ARK_ASYNC_METHOD_METADATA(getPreviewSdkInt, 0),
+        ARK_METHOD_METADATA(getPreviewSdkIntSync, 0),
+        ARK_ASYNC_METHOD_METADATA(getSupportedAbis, 0),
+        ARK_METHOD_METADATA(getSupportedAbisSync, 0),
+        ARK_ASYNC_METHOD_METADATA(getSupported32BitAbis, 0),
+        ARK_METHOD_METADATA(getSupported32BitAbisSync, 0),
+        ARK_ASYNC_METHOD_METADATA(getSupported64BitAbis, 0),
+        ARK_METHOD_METADATA(getSupported64BitAbisSync, 0),
     };
 }
 

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

@@ -1,15 +1,8 @@
-import lottie, { AnimationItem } from "@ohos/lottie"
 import { NavPath, replaceToMain } from "xrn-navigation"
 
 @Component
 export struct Splash {
   @Consume('navigation') navigation: NavPathStack
-  private renderingSettings: RenderingContextSettings = new RenderingContextSettings(true)
-  private canvasRenderingContext: CanvasRenderingContext2D = new CanvasRenderingContext2D(this.renderingSettings)
-  private animateItem: AnimationItem | null = null;
-  private animateName: string = "animation"; // name
-  @State
-  private showLottie: boolean = false
 
   aboutToAppear(): void {
     // 特殊场景处理
@@ -17,57 +10,23 @@ export struct Splash {
       this.navigation.popToName(NavPath.Main)
       return
     }
-    this.showLottie = true
-  }
-
-  loadAnimation() {
-    this.animateItem = lottie.loadAnimation({
-      container: this.canvasRenderingContext,
-      renderer: 'canvas', // canvas renderer
-      loop: false,
-      autoplay: false,
-      name: this.animateName,
-      contentMode: 'Contain',
-      path: "lottie/launch_screen.json",
-    })
-    this.animateItem?.addEventListener('DOMLoaded', (args: Object): void => {
-      this.animateItem?.play()
-    });
-    this.animateItem?.addEventListener('complete', (args: object): void => {
-      replaceToMain()
-    })
   }
 
   aboutToDisappear(): void {
     console.debug(`Splash.aboutToDisappear`)
-    this.animateItem?.removeEventListener("DOMLoaded");
-    this.animateItem?.removeEventListener("complete")
-    lottie.destroy(this.animateName);
-    this.animateItem = null;
   }
 
   build() {
     NavDestination() {
-      Column() {
-        if (this.showLottie) {
-          // Configure a canvas.
-          Canvas(this.canvasRenderingContext)
-            .width('100%')
-            .height('100%')
-            .backgroundColor(Color.Gray)
-            .onReady(() => {
-              // Load the animation.
-              if (this.animateItem != null) {
-                // Load animations during canvas onReady, ensure that the animation size is correct.
-                this.animateItem?.resize();
-              } else {
-                // Anti-aliasing settings.
-                this.canvasRenderingContext.imageSmoothingEnabled = true;
-                this.canvasRenderingContext.imageSmoothingQuality = 'medium'
-                this.loadAnimation();
-              }
-            })
-        }
+      RelativeContainer() {
+        Image($r('app.media.ic_logo_bg')).onAppear(() => {
+          setTimeout(() => {
+            replaceToMain()
+          }, 500)
+        })
+          .width(194)
+          .height(122)
+          .alignRules({middle: {anchor: '__container__', align: HorizontalAlign.Center}, center: {anchor: '__container__', align: VerticalAlign.Center}})
       }
       .width('100%')
       .height('100%')

package/harmony/oh-package.json5

@@ -10,8 +10,8 @@
   "overrides": {
   //  "@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/@xrn/multi-bundle/harmony/xrn_multi_bundle",
-    "xrn-navigation": "../node_modules/@xrn/navigation/harmony/xrn_navigation",
-    "xrn-code-push": "../node_modules/@xrn/react-native-code-push/harmony/codePush"
+    "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"
   }
 }

package/ios/BundleEventCenter/XTBundleProvider.m

@@ -88,14 +88,13 @@
   if (localBundleDebug) {
     self.isDebug = [localBundleDebug boolValue];
   }
-  self.isDebug = YES;
+  
   if (self.isDebug) {
     BOOL supportCommon = [bridge.delegate supportCommonBundle];
     NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
     NSString *appVersion = [infoDictionary objectForKey:@"CFBundleShortVersionString"];
     NSString *appVersionParam = supportCommon ? [NSString stringWithFormat:@"&appVersion=%@", appVersion] : @"";
     NSString *host = [[XTPluginManage shareInstance] getLocalHost];
-    host = @"192.168.68.131";
     NSURL *bundleUrl = [NSURL URLWithString:[NSString stringWithFormat:@"http://%@:%@/index.bundle?platform=ios&dev=true&minify=false&modulesOnly=false&runModule=true&app=XRNTemplate%@", host, bundleData.portNum, appVersionParam]];
     bizBundleURL = bundleUrl;
     self.bizBundleURL = bizBundleURL;

package/ios/Podfile

@@ -101,10 +101,10 @@ target 'XRNTemplate' do
 	pod 'swiftScan', '1.2.1', :configurations => ['Debug']
 	
 	# 二方包
-	pod 'CodePush', :path => '../node_modules/@xrn/react-native-code-push'
-	pod 'react-native-xrn-app-utils', :path => '../node_modules/@xrn/app-utils'
-	pod 'react-native-xrn-multi-bundle', :path => '../node_modules/@xrn/multi-bundle', :modular_headers => true
-	pod 'react-native-xrn-navigation', :path => '../node_modules/@xrn/navigation', :modular_headers => true
+	pod 'CodePush', :path => '../node_modules/@xrnjs/react-native-code-push'
+	pod 'react-native-xrn-app-utils', :path => '../node_modules/@xrnjs/app-utils'
+	pod 'react-native-xrn-multi-bundle', :path => '../node_modules/@xrnjs/multi-bundle', :modular_headers => true
+	pod 'react-native-xrn-navigation', :path => '../node_modules/@xrnjs/navigation', :modular_headers => true
 	
 	setup_permissions([
 	 'AppTrackingTransparency',