ipanel-rnapp-ajb-base 1.0.9 → 1.0.11

package/README.md

@@ -0,0 +1,3 @@
+# ipanel-rnapp-ajb-base
+
+ipanel-rnapp-ajb-base npm仓库

package/app/.local_dev/DemoPage.js

@@ -18,7 +18,7 @@ const TestPage = ({navigation}) => {
   const onPress = () => {
     global.base.navigateModule({
       operatorId: 'ipanel',
-      moduleName: 'app',
+      moduleName: '__BASE_SINGLETON_MODE_APP__',
     });
   };
 

package/app/.local_dev/env.js

@@ -1 +1,2 @@
 export default 'production';
+// export default '__BASE_SINGLETON_MODE__'; // 单业务包开发模式时，启用该注释，注意，提交时不要提交该改动！！！

package/app/.local_dev/polyfill.js

@@ -1,4 +1,5 @@
-import {AppRegistry, NativeModules} from 'react-native';
+import React from 'react';
+import {AppRegistry, NativeModules, View, Text} from 'react-native';
 
 // isMultiBundle：是否为分包加载方式（不是的话就是不分包方式，用于本地调试）
 const isLocalDev = !NativeModules.RNToNativeEmitter?.isMultiBundle;
@@ -12,21 +13,29 @@ async function getRemoteComponentByName(componentName) {
       // 用于本地开发测试，每加一个业务包这里都需要加一下
       switch (componentName) {
         case 'tvShare':
-          return (await import('../app_tvShare/App.js')).default;
+          return (await import('../../app_tvShare/App.js')).default;
         case 'smartHome':
-          return (await import('../app_smartHome/App.js')).default;
+          return (await import('../../app_smartHome/App.js')).default;
         case 'shop':
-          return (await import('../app_shop/App.js')).default;
+          return (await import('../../app_shop/App.js')).default;
         case 'panYuGovData':
-          return (await import('../app_panYuGovData/App.js')).default;
+          return (await import('../../app_panYuGovData/App.js')).default;
         case 'myProfile':
-          return (await import('../app_myProfile/App.js')).default;
+          return (await import('../../app_myProfile/App.js')).default;
         case 'adg':
-          return (await import('../app_adg/App.js')).default;
+          return (await import('../../app_adg/App.js')).default;
         case 'orderFood':
-          return (await import('../app_orderFood/App.js')).default;
+          return (await import('../../app_orderFood/App.js')).default;
         case 'apartment':
-          return (await import('../app_apartment/App.js')).default;
+          return (await import('../../app_apartment/App.js')).default;
+        // __BASE_SINGLETON_MODE_APP__
+        default:
+          return () => {
+            return (
+            <View>
+              <Text>__BASE_SINGLETON_MODE_APP__</Text>
+            </View>)
+          };
       }
     } catch (e) {
       console.log(componentName, e);

package/app/base.js

@@ -102,6 +102,8 @@ global.base.shopMessageManager = {
   wsRef: null,
 };
 
+console.log("NODE_ENV:", process.env.NODE_ENV);
+
 // isMultiBundle：是否为分包加载方式（不是的话就是不分包方式，用于本地调试）
 const isLocalDev = !NativeModules.RNToNativeEmitter?.isMultiBundle;
 /**
@@ -314,7 +316,7 @@ global.base.navigateModule = async ({
   }
   console.log('模块未被加载过，先加载注册再跳转');
 
-  if (env !== '__LOCAL_DEV__') {
+  if (env !== '__BASE_SINGLETON_MODE__') {
     const result = await getModuleVersionInfo({
       platform: Platform.OS,
       operatorId,

package/app/screens/BaseScreen.js

@@ -123,7 +123,7 @@ function HomeTabScreen({navigation, route}) {
 
     console.log('env:', env);
 
-    if (env !== '__LOCAL_DEV__') {
+    if (env !== '__BASE_SINGLETON_MODE__') {
       let packages = await getNavigationPackages();
 
       const flag = await global.base
@@ -167,7 +167,7 @@ function HomeTabScreen({navigation, route}) {
       });
     } else {
       // 单业务包开发调试环境
-      const component = await global.base.getRemoteComponentByName('app');
+      const component = await global.base.getRemoteComponentByName('__BASE_SINGLETON_MODE_APP__');
       typeof component?.registerStackScreens === 'function' &&
         component.registerStackScreens();
       tabs = [
@@ -219,11 +219,11 @@ function HomeTabScreen({navigation, route}) {
         await checkToken();
       }
 
-      if (env === '__LOCAL_DEV__') {
+      if (env === '__BASE_SINGLETON_MODE__') {
         // 单业务包开发调试环境
         global.base.navigateModule({
           operatorId: 'ipanel',
-          moduleName: 'app',
+          moduleName: '__BASE_SINGLETON_MODE_APP__',
         });
       }
 

package/app/screens/LoginScreen/indexNew.js

@@ -67,6 +67,8 @@ const appName =
 
 const envVersion = NativeModules?.RNToNativeEmitter?.serverCluster || 'alpha';
 
+const packageName = NativeModules?.RNToNativeEmitter?.packageName;
+
 // const appName = '遥控键码库';
 
 function LoginScreen({navigation, route}) {
@@ -154,7 +156,10 @@ function LoginScreen({navigation, route}) {
           await global.base.navigateModule({
             operatorId: 'ipanel',
             moduleName: 'adg',
-            screenName: 'EntranceSelectScreen',
+            screenName:
+              packageName === 'com.ipanel.rnApp.abp2'
+                ? 'IstickUpdate3Screen'
+                : 'EntranceSelectScreen',
             isReplace: true,
           });
           global.loading.hideLoading();
@@ -536,7 +541,10 @@ function LoginScreen({navigation, route}) {
         await global.base.navigateModule({
           operatorId: 'ipanel',
           moduleName: 'adg',
-          screenName: 'EntranceSelectScreen',
+          screenName:
+            packageName === 'com.ipanel.rnApp.abp2'
+              ? 'IstickUpdate3Screen'
+              : 'EntranceSelectScreen',
           isReplace: true,
         });
         global.loading.hideLoading();
@@ -575,7 +583,7 @@ function LoginScreen({navigation, route}) {
         currentOperator ||
         appName.includes('安电工') ||
         activeType === 'adg' ||
-        env === '__LOCAL_DEV__'
+        env === '__BASE_SINGLETON_MODE__'
       ) {
         replace('Home', {
           redirect: false,

package/app/utils/config.js

@@ -4,10 +4,11 @@ import {NativeModules} from 'react-native';
 const envVersion = NativeModules?.RNToNativeEmitter?.serverCluster || 'alpha';
 // NativeModules?.RNToNativeEmitter?.serverCluster || 'dev'; /*本地测试*/
 // `ipanelcloud`域名（因APP是`开发版`、`测试版`或`正式版`而不同）
-
 const appName = NativeModules?.RNToNativeEmitter?.appName;
+const packageName = NativeModules?.RNToNativeEmitter?.packageName;
 
 console.log('当前app名称', appName);
+console.log('当前app包名', packageName);
 
 let IPANEL_CLOUD_DOMAIN;
 if (appName === '禺乐慧家') {

package/bin/local-dev.js

@@ -63,7 +63,7 @@ var exists = function (src, dst, callback) {
   // 重写.local_dev/env.js
   fs.writeFileSync(
     path.resolve(__dirname, "../app/.local_dev/env.js"),
-    `export default '__LOCAL_DEV__';`
+    `export default '__BASE_SINGLETON_MODE__';`
   );
 
   // 重写.local_dev/polyfill.js

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "ipanel-rnapp-ajb-base",
-  "version": "1.0.9",
+  "version": "1.0.11",
+  "ipanelVersion": "1.0.294",
   "description": "",
   "main": "index.js",
   "bin": {

package/tmpl/polyfill.js

@@ -11,7 +11,7 @@ async function getRemoteComponentByName(componentName) {
     try {
       // 用于本地开发测试，每加一个业务包这里都需要加一下
       switch (componentName) {
-        case "app":
+        case "__BASE_SINGLETON_MODE_APP__":
           return (await import("../../../../app/App.js")).default;
       }
     } catch (e) {