ipanel-rnapp-ajb-base 1.0.3 → 1.0.4

package/app/.local_dev/polyfill.js

@@ -3,51 +3,6 @@ import {AppRegistry, NativeModules} from 'react-native';
 // isMultiBundle：是否为分包加载方式（不是的话就是不分包方式，用于本地调试）
 const isLocalDev = !NativeModules.RNToNativeEmitter?.isMultiBundle;
 
-/**
- * 动态加载业务包
- * @param {object} data 要加载的业务包列表对象，格式如: { packages: [...] }
- * @param {*} packageLoadCallback 每次一个业务包处理（加载成功或失败）完成时触发该回调函数
- * @returns 全部业务包处理完成的promise，全部加载完成时promise返回true，否则返回加载失败的模块数组
- */
-function loadPackages(data, packageLoadCallback) {
-  return new Promise((resolve, reject) => {
-    if (!isLocalDev) {
-      const load = pack => {
-        return new Promise(_reslove => {
-          NativeModules.RNToNativeEmitter.loadPackage(
-            {
-              package: pack,
-            },
-            function (error, packageName) {
-              console.log(error, packageName);
-
-              typeof packageLoadCallback === 'function' &&
-                packageLoadCallback(error, packageName);
-
-              _reslove({
-                error,
-                packageName,
-              });
-            },
-          );
-        });
-      };
-
-      Promise.all(data.packages.map(pack => load(pack))).then(datas => {
-        const errors = datas.filter(item => !!item.error);
-        if (errors.length > 0) {
-          reject(errors);
-        } else {
-          resolve(true);
-        }
-      });
-    } else {
-      // 本地开发环境直接resolve
-      resolve(true);
-    }
-  });
-}
-
 // 根据业务包的组件名异步获取业务包组件，返回一个promise
 async function getRemoteComponentByName(componentName) {
   if (!isLocalDev) {
@@ -80,4 +35,4 @@ async function getRemoteComponentByName(componentName) {
   }
 }
 
-export {loadPackages, getRemoteComponentByName};
+export {getRemoteComponentByName};

package/app/App.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useMemo } from "react";
+import React, {useState, useEffect, useMemo} from 'react';
 import {
   View,
   LogBox,
@@ -11,57 +11,57 @@ import {
   AppState,
   NativeEventEmitter,
   DeviceEventEmitter,
-} from "react-native";
-import { NavigationContainer } from "@react-navigation/native";
-import { createStackNavigator } from "@react-navigation/stack";
-import { SheetProvider } from "react-native-actions-sheet";
-import DeviceInfo from "react-native-device-info";
-import { SafeAreaProvider, SafeAreaView } from "react-native-safe-area-context";
-import VersionUpdateConfirm from "./components/VersionUpdateConfirm";
+} from 'react-native';
+import {NavigationContainer} from '@react-navigation/native';
+import {createStackNavigator} from '@react-navigation/stack';
+import {SheetProvider} from 'react-native-actions-sheet';
+import DeviceInfo from 'react-native-device-info';
+import {SafeAreaProvider, SafeAreaView} from 'react-native-safe-area-context';
+import VersionUpdateConfirm from './components/VersionUpdateConfirm';
 // import NetInfo from '@react-native-community/netinfo';
 
 // 重要：base.js需放在一切自定义代码之前初始化
-import "./base.js";
+import './base.js';
 // 版本升级相关代码
-import "./utils/bundleUpdater";
+import './utils/bundleUpdater';
 // 对接声必可屏幕
-import "./utils/SBK_plugin";
+import './utils/SBK_plugin';
 
 // 注册actionSheet组件
-import "./components/sheets.js";
+import './components/sheets.js';
 
-import Loading from "./components/common/Loading";
-import Toast from "./components/common/Toast";
-import Dialog from "./components/common/Dialog";
-import Notify from "./components/common/Notify";
-import storage from "./storage";
+import Loading from './components/common/Loading';
+import Toast from './components/common/Toast';
+import Dialog from './components/common/Dialog';
+import Notify from './components/common/Notify';
+import storage from './storage';
 
-import { navigationRef } from "./utils/RootNavigation";
-import checkLogin from "./hooks/checkLogin";
-import { getModuleVersionInfo } from "./api/";
-import { appReport } from "./utils/common";
+import {navigationRef} from './utils/RootNavigation';
+import checkLogin from './hooks/checkLogin';
+import {getModuleVersionInfo} from './api/';
+import {appReport} from './utils/common';
 
 // 基础导航页、登录页
-import BaseScreen from "./screens/BaseScreen";
-import LoginScreen from "./screens/LoginScreen";
-import NewLoginScreen from "./screens/LoginScreen/indexNew";
-import ResePasswordScreen from "./screens/ResePassword";
-import SbkScreen from "./screens/SbkScreen";
-
-import eventBus, { EVENTS } from "./eventBus";
-
-import useDynamicPackages from "./hooks/useDynamicPackages";
-import useAddress from "./hooks/useAddress";
-import useAddress2 from "./hooks/useAddress2";
-import useNavigationFocus from "./hooks/useNavigationFocus";
-import useLatest from "./hooks/useLatest";
-import useDebounceFn from "./hooks/useDebounceFn";
-import useUser from "./hooks/useUser";
-import useKeyboard from "./hooks/useKeyboard";
+import BaseScreen from './screens/BaseScreen';
+import LoginScreen from './screens/LoginScreen';
+import NewLoginScreen from './screens/LoginScreen/indexNew';
+import ResePasswordScreen from './screens/ResePassword';
+import SbkScreen from './screens/SbkScreen';
+
+import eventBus, {EVENTS} from './eventBus';
+
+import useDynamicPackages from './hooks/useDynamicPackages';
+import useAddress from './hooks/useAddress';
+import useAddress2 from './hooks/useAddress2';
+import useNavigationFocus from './hooks/useNavigationFocus';
+import useLatest from './hooks/useLatest';
+import useDebounceFn from './hooks/useDebounceFn';
+import useUser from './hooks/useUser';
+import useKeyboard from './hooks/useKeyboard';
 
 LogBox.ignoreLogs([
-  "ViewPropTypes will be removed",
-  "ColorPropType will be removed",
+  'ViewPropTypes will be removed',
+  'ColorPropType will be removed',
 ]);
 
 // base hooks, 内部可能依赖基础的base函数，因此放在基础base初始化之后
@@ -76,25 +76,25 @@ global.base.hooks = {
 };
 
 // 公共页面
-import WebviewScreen from "./screens/WebviewScreen";
-import ScanQRCodeScreen from "./screens/CommonScreens/ScanQRCodeScreen";
-import OperatorSelectScreen from "./screens/CommonScreens/OperatorSelectScreen";
-import EditInvoiceTitleScreen from "./screens/CommonScreens/EditInvoiceTitleScreen";
-import InvoiceTitleListScreen from "./screens/CommonScreens/InvoiceTitleListScreen";
-import TvAlbumScreen from "./screens/CommonScreens/TvAlbumScreen";
-import DeviceFeedbackScreen from "./screens/CommonScreens/DeviceFeedbackScreen";
-import DeviceAnswerDetailScreen from "./screens/CommonScreens/DeviceAnswerDetailScreen";
+import WebviewScreen from './screens/WebviewScreen';
+import ScanQRCodeScreen from './screens/CommonScreens/ScanQRCodeScreen';
+import OperatorSelectScreen from './screens/CommonScreens/OperatorSelectScreen';
+import EditInvoiceTitleScreen from './screens/CommonScreens/EditInvoiceTitleScreen';
+import InvoiceTitleListScreen from './screens/CommonScreens/InvoiceTitleListScreen';
+import TvAlbumScreen from './screens/CommonScreens/TvAlbumScreen';
+import DeviceFeedbackScreen from './screens/CommonScreens/DeviceFeedbackScreen';
+import DeviceAnswerDetailScreen from './screens/CommonScreens/DeviceAnswerDetailScreen';
 
 // Boss绑定页面
-import BindBossScreen from "./screens/CommonScreens/BossScreen";
+import BindBossScreen from './screens/CommonScreens/BossScreen';
 
 const Stack = createStackNavigator();
 
-const envVersion = NativeModules?.RNToNativeEmitter?.serverCluster || "alpha";
+const envVersion = NativeModules?.RNToNativeEmitter?.serverCluster || 'alpha';
 // const envVersion = 'release';
 
 let eventEmitter;
-if (Platform.OS === "android") {
+if (Platform.OS === 'android') {
   // ----yusm：安卓使用DeviceEventEmitter
   eventEmitter = DeviceEventEmitter;
 } else {
@@ -105,23 +105,23 @@ const CommonScreens = {
   Home: {
     component: BaseScreen,
     screenOptions: {
-      title: "首页",
+      title: '首页',
       headerShown: false,
       includeBottom: true,
     },
   },
   Login: {
     component:
-      DeviceInfo.getBrand() === "Allwinner" ? LoginScreen : NewLoginScreen,
+      DeviceInfo.getBrand() === 'Allwinner' ? LoginScreen : NewLoginScreen,
     screenOptions: {
-      title: "登录",
+      title: '登录',
       headerShown: false,
     },
   },
   ResePasswordScreen: {
     component: ResePasswordScreen,
     screenOptions: {
-      title: "重置密码",
+      title: '重置密码',
       headerShown: false,
     },
   },
@@ -134,62 +134,62 @@ const CommonScreens = {
   OperatorSelectScreen: {
     component: OperatorSelectScreen,
     screenOptions: {
-      title: "选择运营商",
+      title: '选择运营商',
       headerShown: false,
     },
   },
   InvoiceTitleListScreen: {
     component: InvoiceTitleListScreen,
     screenOptions: {
-      title: "发票抬头",
+      title: '发票抬头',
       headerShown: false,
     },
   },
   EditInvoiceTitleScreen: {
     component: EditInvoiceTitleScreen,
     screenOptions: {
-      title: "编辑发票抬头",
+      title: '编辑发票抬头',
       headerShown: false,
     },
   },
   WebviewScreen: {
     component: WebviewScreen,
     screenOptions: {
-      title: "",
+      title: '',
       headerShown: false,
     },
   },
   TvAlbumScreen: {
     component: TvAlbumScreen,
     screenOptions: {
-      title: "电视相册",
+      title: '电视相册',
     },
   },
   DeviceFeedbackScreen: {
     component: DeviceFeedbackScreen,
     screenOptions: {
-      title: "帮助与反馈",
+      title: '帮助与反馈',
       headerShown: false,
     },
   },
   DeviceAnswerDetailScreen: {
     component: DeviceAnswerDetailScreen,
     screenOptions: {
-      title: "解答",
+      title: '解答',
       headerShown: false,
     },
   },
   SbkScreen: {
     component: SbkScreen,
     screenOptions: {
-      title: "爱家宝",
+      title: '爱家宝',
       headerShown: false,
     },
   },
   BindBossScreen: {
     component: BindBossScreen,
     screenOptions: {
-      title: "绑定boss账号",
+      title: '绑定boss账号',
       headerShown: false,
     },
   },
@@ -197,7 +197,7 @@ const CommonScreens = {
 
 // screen分组
 function StackScreenGroup(screens) {
-  return Object.entries(screens).map(([name, { component, screenOptions }]) => (
+  return Object.entries(screens).map(([name, {component, screenOptions}]) => (
     <Stack.Screen
       name={name}
       component={component}
@@ -210,24 +210,24 @@ function StackScreenGroup(screens) {
 // 兜底的底部导航模块
 const initialNavigationPackages = [
   {
-    bundleName: "index.ios.bundle",
+    bundleName: 'index.ios.bundle',
     isMain: 1,
-    md5: "7284896d821f9e206efc979590561e18",
-    moduleName: "tvShare",
-    modulePublishDesc: "电视分享ios",
-    upgradeMode: "force",
-    url: "https://dev.ipanelcloud2.ipanel.cn:50443/jshomeapp/appFiles/packFiles/ipanel/ios/tvShare/v1.0.2/20230601120633/ipanel_ios_tvShare_v1.0.2_20230601120633.zip",
-    version: "v1.0.2",
+    md5: '7284896d821f9e206efc979590561e18',
+    moduleName: 'tvShare',
+    modulePublishDesc: '电视分享ios',
+    upgradeMode: 'force',
+    url: 'https://dev.ipanelcloud2.ipanel.cn:50443/jshomeapp/appFiles/packFiles/ipanel/ios/tvShare/v1.0.2/20230601120633/ipanel_ios_tvShare_v1.0.2_20230601120633.zip',
+    version: 'v1.0.2',
   },
   {
-    bundleName: "index.ios.bundle",
+    bundleName: 'index.ios.bundle',
     isMain: 1,
-    md5: "0fd7a6212a7b70baa54ce2a9cc99698b",
-    moduleName: "smartHome",
-    modulePublishDesc: "智能家居ios",
-    upgradeMode: "force",
-    url: "https://dev.ipanelcloud2.ipanel.cn:50443/jshomeapp/appFiles/packFiles/ipanel/ios/smartHome/v1.0.2/20230601120752/ipanel_ios_smartHome_v1.0.2_20230601120752.zip",
-    version: "v1.0.2",
+    md5: '0fd7a6212a7b70baa54ce2a9cc99698b',
+    moduleName: 'smartHome',
+    modulePublishDesc: '智能家居ios',
+    upgradeMode: 'force',
+    url: 'https://dev.ipanelcloud2.ipanel.cn:50443/jshomeapp/appFiles/packFiles/ipanel/ios/smartHome/v1.0.2/20230601120752/ipanel_ios_smartHome_v1.0.2_20230601120752.zip',
+    version: 'v1.0.2',
   },
   // {
   //   bundleName: 'index.ios.bundle',
@@ -255,7 +255,7 @@ global.base.initialNavigationPackages = initialNavigationPackages;
 // updateNavigationPackagesFromStorage(1);
 
 const App = () => {
-  const { DynamicStackScreens } = useDynamicPackages();
+  const {DynamicStackScreens} = useDynamicPackages();
   // 当前页面是否需要包括底部安全区
   const [includeBottom, setIncludeBottom] = useState(false);
   const [versionUpdateConfirmVisible, setVersionUpdateConfirmVisible] =
@@ -276,16 +276,16 @@ const App = () => {
 
   // mounted
   useEffect(() => {
-    StatusBar.setBackgroundColor("transparent");
-    StatusBar.setBarStyle("dark-content");
-    storage.get("accountType").then((res) => {
-      global.base.accountType = res || "ajb";
+    StatusBar.setBackgroundColor('transparent');
+    StatusBar.setBarStyle('dark-content');
+    storage.get('accountType').then(res => {
+      global.base.accountType = res || 'ajb';
     });
 
     const rnToNative = NativeModules.RNToNativeEmitter;
     // 应用通知app可正常显示，页面正常运行了，在componentDidMount 中加
     rnToNative?.notifyApplicationReady({
-      moduleName: "base",
+      moduleName: 'base',
     }); // 不用传参数
 
     // 首次进入app登录鉴权
@@ -294,35 +294,35 @@ const App = () => {
     // 获取最新版本并通知原生平台，由平台判断后弹出升级确认提示
     checkBaseVersion();
 
-    AppState.addEventListener("change", async (nextAppState) => {
-      console.log("nextAppState", nextAppState);
-      if (nextAppState === "active") {
-        appReport("APP_STARTUP");
+    AppState.addEventListener('change', async nextAppState => {
+      console.log('nextAppState', nextAppState);
+      if (nextAppState === 'active') {
+        appReport('APP_STARTUP');
       }
     });
 
     const keyboardDidShowListener = Keyboard.addListener(
-      "keyboardDidShow",
+      'keyboardDidShow',
       () => {
         setIsKeyboardVisible(true);
-      }
+      },
     );
 
     const keyboardDidHideListener = Keyboard.addListener(
-      "keyboardDidHide",
+      'keyboardDidHide',
       () => {
         setIsKeyboardVisible(false);
-      }
+      },
     );
 
     const cellularDataStateListener = eventEmitter.addListener(
-      "CellularDataState",
-      (data) => {
-        console.log(JSON.stringify(data), "CellularDataState");
+      'CellularDataState',
+      data => {
+        console.log(JSON.stringify(data), 'CellularDataState');
         if (data?.state && data?.state !== 0) {
           checkBaseVersion();
         }
-      }
+      },
     );
 
     return () => {
@@ -341,23 +341,23 @@ const App = () => {
 
   const checkBaseVersion = async () => {
     // 当前版本
-    const baseVersionInfo = await global.base.getBundleInfo("base");
+    const baseVersionInfo = await global.base.getBundleInfo('base');
     if (!baseVersionInfo) {
       return false;
     }
     try {
       const res = await getModuleVersionInfo({
         platform: Platform.OS,
-        operatorId: "ipanel",
-        moduleName: "base",
+        operatorId: 'ipanel',
+        moduleName: 'base',
       });
       if (res.code === 0) {
         const versionInfo = res.data.packages[0];
         const newVersion = Number(
-          versionInfo.version.slice(1).replace(/\./g, "")
+          versionInfo.version.slice(1).replace(/\./g, ''),
         );
         const currentVersion = Number(
-          baseVersionInfo.version.slice(1).replace(/\./g, "")
+          baseVersionInfo.version.slice(1).replace(/\./g, ''),
         );
         if (newVersion > currentVersion) {
           setVersionUpdateConfirmVisible(true);
@@ -371,21 +371,21 @@ const App = () => {
   global.base.checkBaseVersion = checkBaseVersion;
 
   // 升级测试
-  const onUpdate = (versionInfo) => {
+  const onUpdate = versionInfo => {
     const rnToNative = NativeModules.RNToNativeEmitter;
     rnToNative?.selectedInfo({
       packages: [versionInfo],
-      operatorId: "ipanel",
+      operatorId: 'ipanel',
     });
   };
 
-  const handleStateChange = ({ routes }) => {
+  const handleStateChange = ({routes}) => {
     const routeName = routes[routes.length - 1].name;
     setIncludeBottom(
-      allStackScreens[routeName]?.screenOptions?.includeBottom || false
+      allStackScreens[routeName]?.screenOptions?.includeBottom || false,
     );
     /* 加载之后每次navigate都鉴权一把登录状态（重置密码不需要检测） */
-    if (routeName !== "ResePasswordScreen") {
+    if (routeName !== 'ResePasswordScreen') {
       checkLogin();
     }
 
@@ -399,14 +399,12 @@ const App = () => {
         <SheetProvider>
           <NavigationContainer
             ref={navigationRef}
-            onStateChange={handleStateChange}
-          >
+            onStateChange={handleStateChange}>
             <Stack.Navigator
-              initialRouteName={"Login"}
+              initialRouteName={'Login'}
               screenOptions={{
                 headerStyle: {},
-              }}
-            >
+              }}>
               {/* 首页 */}
               {/*<Stack.Screen*/}
               {/*  name="Home"*/}
@@ -435,10 +433,10 @@ const App = () => {
           </NavigationContainer>
         </SheetProvider>
 
-        <Loading onRef={(ref) => (global.loading = ref)} />
-        <Toast onRef={(ref) => (global.toast = ref)} />
-        <Notify onRef={(ref) => (global.notify = ref)} />
-        <Dialog onRef={(ref) => (global.dialog = ref)} />
+        <Loading onRef={ref => (global.loading = ref)} />
+        <Toast onRef={ref => (global.toast = ref)} />
+        <Notify onRef={ref => (global.notify = ref)} />
+        <Dialog onRef={ref => (global.dialog = ref)} />
         {versionUpdateConfirmVisible && (
           <VersionUpdateConfirm
             onVisibleChange={setVersionUpdateConfirmVisible}
@@ -446,7 +444,7 @@ const App = () => {
             onUpdate={onUpdate}
           />
         )}
-        {isKeyboardVisible && Platform.OS === "ios" && (
+        {isKeyboardVisible && Platform.OS === 'ios' && (
           <TouchableWithoutFeedback onPress={handleTouchOutside}>
             <View style={styles.touchableContainer} />
           </TouchableWithoutFeedback>
@@ -455,12 +453,11 @@ const App = () => {
     );
   };
 
-  return Platform.OS === "ios" ? (
+  return Platform.OS === 'ios' ? (
     <SafeAreaProvider>
       <SafeAreaView
-        style={{ flex: 1 }}
-        edges={includeBottom ? ["right", "left"] : ["right", "bottom", "left"]}
-      >
+        style={{flex: 1}}
+        edges={includeBottom ? ['right', 'left'] : ['right', 'bottom', 'left']}>
         {renderContent()}
       </SafeAreaView>
     </SafeAreaProvider>

package/app/base.js

@@ -1,6 +1,6 @@
 import {NativeModules, Platform} from 'react-native';
 // 引入兼容本地运行开发测试的额外处理
-import {loadPackages, getRemoteComponentByName} from './.local_dev/polyfill';
+import {getRemoteComponentByName} from './.local_dev/polyfill';
 
 import eventBus, {EVENTS} from './eventBus';
 import storage from './storage';
@@ -102,13 +102,52 @@ global.base.shopMessageManager = {
   wsRef: null,
 };
 
+// isMultiBundle：是否为分包加载方式（不是的话就是不分包方式，用于本地调试）
+const isLocalDev = !NativeModules.RNToNativeEmitter?.isMultiBundle;
 /**
  * 动态加载业务包
  * @param {object} data 要加载的业务包列表对象，格式如: { packages: [...] }
  * @param {*} packageLoadCallback 每次一个业务包处理（加载成功或失败）完成时触发该回调函数
  * @returns 全部业务包处理完成的promise，全部加载完成时promise返回true，否则返回加载失败的模块数组
  */
-global.base.loadPackages = loadPackages;
+global.base.loadPackages = function loadPackages(data, packageLoadCallback) {
+  return new Promise((resolve, reject) => {
+    if (!isLocalDev) {
+      const load = pack => {
+        return new Promise(_reslove => {
+          NativeModules.RNToNativeEmitter.loadPackage(
+            {
+              package: pack,
+            },
+            function (error, packageName) {
+              console.log(error, packageName);
+
+              typeof packageLoadCallback === 'function' &&
+                packageLoadCallback(error, packageName);
+
+              _reslove({
+                error,
+                packageName,
+              });
+            },
+          );
+        });
+      };
+
+      Promise.all(data.packages.map(pack => load(pack))).then(datas => {
+        const errors = datas.filter(item => !!item.error);
+        if (errors.length > 0) {
+          reject(errors);
+        } else {
+          resolve(true);
+        }
+      });
+    } else {
+      // 本地开发环境直接resolve
+      resolve(true);
+    }
+  });
+};
 
 // 根据业务包的组件名异步获取业务包组件，返回一个promise
 global.base.getRemoteComponentByName = getRemoteComponentByName;

package/bin/local-dev.js

@@ -6,6 +6,15 @@ const path = require("path");
 (function () {
   console.log("ipanel_rnapp_ajb_base local_dev=====");
 
-  const env = path.resolve(__dirname, "../app/.local_dev/env.js");
-  fs.writeFileSync(env, `export default '__LOCAL_DEV__';`);
+  // 重写.local_dev/env.js
+  fs.writeFileSync(
+    path.resolve(__dirname, "../app/.local_dev/env.js"),
+    `export default '__LOCAL_DEV__';`
+  );
+
+  // 重写.local_dev/polyfill.js
+  fs.writeFileSync(
+    path.resolve(__dirname, "../app/.local_dev/polyfill.js"),
+    fs.readFileSync(path.resolve(__dirname, "./polyfill.js.tmpl")).toString()
+  );
 })();

package/bin/polyfill.js.tmpl

@@ -0,0 +1,24 @@
+import { AppRegistry, NativeModules } from "react-native";
+
+// isMultiBundle：是否为分包加载方式（不是的话就是不分包方式，用于本地调试）
+const isLocalDev = !NativeModules.RNToNativeEmitter?.isMultiBundle;
+
+// 根据业务包的组件名异步获取业务包组件，返回一个promise
+async function getRemoteComponentByName(componentName) {
+  if (!isLocalDev) {
+    return AppRegistry.getRunnable(componentName).componentProvider();
+  } else {
+    try {
+      // 用于本地开发测试，每加一个业务包这里都需要加一下
+      switch (componentName) {
+        case "app":
+          return (await import("../../app/App.js")).default;
+      }
+    } catch (e) {
+      console.log(componentName, e);
+      return false;
+    }
+  }
+}
+
+export { getRemoteComponentByName };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipanel-rnapp-ajb-base",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "",
   "main": "index.js",
   "bin": {