ipanel-rnapp-ajb-base 1.0.21 → 1.0.24

package/app/base.js

@@ -1,10 +1,10 @@
-import {NativeModules, Platform} from 'react-native';
+import { NativeModules, Platform } from "react-native";
 // 引入兼容本地运行开发测试的额外处理
-import {getRemoteComponentByName} from './.local_dev/polyfill';
+import { getRemoteComponentByName } from "./.local_dev/polyfill";
 
-import eventBus, {EVENTS} from './eventBus';
-import storage from './storage';
-import http, {homedHttp} from './utils/http';
+import eventBus, { EVENTS } from "./eventBus";
+import storage from "./storage";
+import http, { homedHttp } from "./utils/http";
 import {
   navigate,
   push,
@@ -12,13 +12,13 @@ import {
   goBack,
   pop,
   popToTop,
-} from './utils/RootNavigation';
-import scaleSize from './utils/scaleSize';
-import * as styles from './utils/StyleComposite';
-import config from './utils/config';
-import * as commonComponents from './components/index';
-import {getModuleVersionInfo} from './api';
-import applyPermissions from './utils/applyPermissions';
+} from "./utils/RootNavigation";
+import scaleSize from "./utils/scaleSize";
+import * as styles from "./utils/StyleComposite";
+import config from "./utils/config";
+import * as commonComponents from "./components/index";
+import { getModuleVersionInfo } from "./api";
+import applyPermissions from "./utils/applyPermissions";
 import {
   getUserLocation,
   genMsg,
@@ -27,10 +27,10 @@ import {
   appReport,
   updateHomedToken,
   checkToken,
-} from './utils/common';
-import * as dialogs from './utils/registerDialog';
+} from "./utils/common";
+import * as dialogs from "./utils/registerDialog";
 
-import env from './.local_dev/env';
+import env from "./.local_dev/env";
 
 // 注册全局命名空间 base
 global.base = {};
@@ -52,13 +52,18 @@ global.base.px = scaleSize;
 global.base.messageManager = {
   messages: [],
   wsRef: null,
+  sessionId: "",
 
   isConnected: function () {
     return !!global.base.messageManager.wsRef.current;
   },
 
+  setSessionId: function (sid) {
+    global.base.messageManager.sessionId = sid;
+  },
+
   sendMessage: async function (message) {
-    console.log('ws.send');
+    console.log("ws.send", message);
     global.base.messageManager.wsRef.current &&
       global.base.messageManager.wsRef.current.send(JSON.stringify(message));
     eventBus.emit(EVENTS.MESSAGE.ADD, message);
@@ -66,17 +71,17 @@ global.base.messageManager = {
 
   updateMessageToStorage: async function (message) {
     const oldMsgIndex = global.base.messageManager.messages.findIndex(
-      msg => msg.MsgId === message.MsgId,
+      (msg) => msg.MsgId === message.MsgId
     );
     if (oldMsgIndex === -1) {
-      console.error('不存在的消息，msgId=', message.MsgId);
+      console.error("不存在的消息，msgId=", message.MsgId);
       return;
     }
 
     global.base.messageManager.messages.splice(oldMsgIndex, 1, message);
 
     // save to local
-    await storage.set('messageList', global.base.messageManager.messages);
+    await storage.set("messageList", global.base.messageManager.messages);
   },
 
   genMsg,
@@ -115,8 +120,8 @@ const isLocalDev = !NativeModules.RNToNativeEmitter?.isMultiBundle;
 global.base.loadPackages = function loadPackages(data, packageLoadCallback) {
   return new Promise((resolve, reject) => {
     if (!isLocalDev) {
-      const load = pack => {
-        return new Promise(_reslove => {
+      const load = (pack) => {
+        return new Promise((_reslove) => {
           NativeModules.RNToNativeEmitter.loadPackage(
             {
               package: pack,
@@ -124,20 +129,20 @@ global.base.loadPackages = function loadPackages(data, packageLoadCallback) {
             function (error, packageName) {
               console.log(error, packageName);
 
-              typeof packageLoadCallback === 'function' &&
+              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);
+      Promise.all(data.packages.map((pack) => load(pack))).then((datas) => {
+        const errors = datas.filter((item) => !!item.error);
         if (errors.length > 0) {
           reject(errors);
         } else {
@@ -156,12 +161,12 @@ global.base.getRemoteComponentByName = getRemoteComponentByName;
 
 // 各个业务包App.js中需要主动调用全局注册页面函数registerGlobalStackScreens，将该业务包中需要全屏覆盖的页面注册到全局栈路由中
 // 其中ScreenName格式要求规范为jsappName_screenName
-global.base.registerGlobalStackScreens = screens => {
+global.base.registerGlobalStackScreens = (screens) => {
   // todo 检测componentName不能为业务模块名，避免同一个模块名既被用于导航，又被用于全局独立页面动态路由注册跳转。两个路由名重复的话可能会导致跳转到导航路由，而没法跳到独立页面？
-  global.base.eventBus.emit('addDynamicScreens', {
+  global.base.eventBus.emit("addDynamicScreens", {
     ...screens,
   });
-  return new Promise(resolve => setTimeout(resolve));
+  return new Promise((resolve) => setTimeout(resolve));
 };
 
 /**
@@ -172,23 +177,23 @@ global.base.registerGlobalStackScreens = screens => {
  */
 global.base.registerRemoteComponentGlobalStackScreen = async (
   componentName,
-  screenOptions,
+  screenOptions
 ) => {
   // todo 检测componentName不能为业务模块名，避免同一个模块名既被用于导航，又被用于全局独立页面动态路由注册跳转。两个路由名重复的话可能会导致跳转到导航路由，而没法跳到独立页面？
 
   const component = await getRemoteComponentByName(componentName);
   component.registerStackScreens && component.registerStackScreens();
   if (component) {
-    global.base.eventBus.emit('addDynamicScreens', {
+    global.base.eventBus.emit("addDynamicScreens", {
       [componentName]: {
         component,
         screenOptions,
       },
     });
-    return new Promise(resolve =>
+    return new Promise((resolve) =>
       setTimeout(() => {
         resolve(true);
-      }),
+      })
     );
   } else {
     return false;
@@ -202,35 +207,37 @@ global.base.getIPanelCloudDomain = () => {
 
 // 获取当前家庭云家服务实例名(如a2)，跟当前登录的ipanelcloud用户有关
 global.base.getHomeCloudServiceInstanceName = async () => {
-  const activeAddr = await storage.get('activeAddr');
-  const sub_domain = activeAddr?.sub_domain
-  return sub_domain ? sub_domain : (NativeModules?.RNToNativeEmitter?.appName === '禺乐慧家'
-    ? 'a21'
-    : 'a2');
+  const activeAddr = await storage.get("activeAddr");
+  const sub_domain = activeAddr?.sub_domain;
+  return sub_domain
+    ? sub_domain
+    : ["禺乐慧家", "悦慧家"].includes(NativeModules?.RNToNativeEmitter?.appName)
+    ? "a21"
+    : "a2";
 };
 
 // 获取当前`homed`域名（`正式homed用户`域名优先于`homed游客`域名）
 global.base.getHomedDomain = async () => {
-  const activeAddr = await storage.get('activeAddr');
+  const activeAddr = await storage.get("activeAddr");
   if (activeAddr?.domain) {
     // console.log('正式homed用户域名', activeAddr.domain);
     return activeAddr.domain;
   }
 
-  const opHomedConfig = await storage.get('operatorHomedConfig');
+  const opHomedConfig = await storage.get("operatorHomedConfig");
   if (opHomedConfig && opHomedConfig.domain) {
     // console.log('游客homed域名', opHomedConfig.domain);
     return opHomedConfig.domain;
   }
 
-  return 'homed.tv';
+  return "homed.tv";
 };
 
 // 获取当前`homed accesstoken`（`正式homed用户accesstoken`优先于`homed游客accesstoken`）
 global.base.getHomedToken = async () => {
   return (
-    (await storage.get('homedAccessToken')) ||
-    (await storage.get('homedTouristAccessToken'))
+    (await storage.get("homedAccessToken")) ||
+    (await storage.get("homedTouristAccessToken"))
   );
 };
 
@@ -242,8 +249,8 @@ global.base.reload = async () => {
 
 // 获取app唯一标识
 global.base.getAppId = () => {
-  return new Promise(resolve => {
-    if (Platform.OS === 'ios') {
+  return new Promise((resolve) => {
+    if (Platform.OS === "ios") {
       resolve(NativeModules?.RNToNativeEmitter.appID);
     } else {
       // 安卓api
@@ -257,21 +264,21 @@ global.base.getAppId = () => {
 };
 
 // 获取当前打包的bundle信息
-global.base.getBundleInfo = moduleName => {
-  return new Promise(resolve => {
+global.base.getBundleInfo = (moduleName) => {
+  return new Promise((resolve) => {
     if (NativeModules?.RNToNativeEmitter?.getBundleInfo) {
       NativeModules.RNToNativeEmitter.getBundleInfo(
         moduleName,
         function (err, data) {
           if (err) {
-            console.log('getBundleInfo--err', err);
+            console.log("getBundleInfo--err", err);
             resolve();
             return;
           }
-          console.log('getBundleInfo--data', typeof data, data);
+          console.log("getBundleInfo--data", typeof data, data);
 
           // 兼容处理
-          if (typeof data === 'string') {
+          if (typeof data === "string") {
             try {
               data = JSON.parse(data);
               resolve(data);
@@ -283,7 +290,7 @@ global.base.getBundleInfo = moduleName => {
             // object
             resolve(data);
           }
-        },
+        }
       );
     } else {
       resolve();
@@ -302,7 +309,7 @@ global.base.navigateModule = async ({
   if (global.base.DynamicStackScreens[moduleName]) {
     const module = await getRemoteComponentByName(moduleName);
     if (module) {
-      console.log('模块已被加载并注册过，直接跳转');
+      console.log("模块已被加载并注册过，直接跳转");
       // 如果已加载并注册过，直接跳转
       if (isReplace) {
         replace(screenName || moduleName, params);
@@ -312,20 +319,20 @@ global.base.navigateModule = async ({
       return true;
     }
   }
-  console.log('模块未被加载过，先加载注册再跳转');
+  console.log("模块未被加载过，先加载注册再跳转");
 
-  if (env !== '__BASE_SINGLETON_MODE__') {
+  if (env !== "__BASE_SINGLETON_MODE__") {
     const result = await getModuleVersionInfo({
       platform: Platform.OS,
       operatorId,
       moduleName,
-    }).catch(err => {
+    }).catch((err) => {
       console.log(err);
     });
-    console.log(result, 'getModuleVersionInfo');
+    console.log(result, "getModuleVersionInfo");
     if (!result || result.code !== 0) {
-      global.toast.showToast('加载失败');
-      console.log('加载失败');
+      global.toast.showToast("加载失败");
+      console.log("加载失败");
       return false;
     }
 
@@ -335,13 +342,13 @@ global.base.navigateModule = async ({
       .loadPackages({
         packages,
       })
-      .catch(errors => {
+      .catch((errors) => {
         console.log(JSON.stringify(errors));
       });
 
     if (!flag) {
-      global.toast.showToast('网络繁忙');
-      console.log('网络繁忙');
+      global.toast.showToast("网络繁忙");
+      console.log("网络繁忙");
       return false;
     }
 
@@ -351,7 +358,7 @@ global.base.navigateModule = async ({
         headerShown: false,
       });
 
-    console.log('registerFlag', registerFlag);
+    console.log("registerFlag", registerFlag);
 
     if (registerFlag) {
       if (isReplace) {
@@ -364,7 +371,7 @@ global.base.navigateModule = async ({
     // 单业务包开发调试环境
     const registerFlag =
       await global.base.registerRemoteComponentGlobalStackScreen(moduleName, {
-        title: '',
+        title: "",
         headerShown: false,
       });
 

package/app/components/common/LoginType/protocol.js

@@ -1,14 +1,15 @@
-import React from 'react';
-import {Divider} from '@rneui/themed';
+import React from "react";
+import { Divider } from "@rneui/themed";
 import {
   View,
   Text,
   StyleSheet,
   TouchableOpacity,
   Dimensions,
-} from 'react-native';
-import {WebView} from 'react-native-webview';
-import px from '../../../utils/scaleSize';
+} from "react-native";
+import { WebView } from "react-native-webview";
+import DeviceInfo from "react-native-device-info";
+import px from "../../../utils/scaleSize";
 const ProtocolDialog = ({
   type,
   url,
@@ -16,10 +17,10 @@ const ProtocolDialog = ({
   handleOneAgree,
   dialogTitle,
 }) => {
-  const agree = type => {
+  const agree = (type) => {
     handleOneAgree(type);
   };
-  const disagree = type => {
+  const disagree = (type) => {
     handleOneDisagree(type);
   };
   return (
@@ -32,7 +33,7 @@ const ProtocolDialog = ({
         ) : (
           <></>
         )}
-        <View style={{flex: 1}}>
+        <View style={{ flex: 1 }}>
           <WebView
             style={{}}
             source={{
@@ -45,7 +46,8 @@ const ProtocolDialog = ({
           <TouchableOpacity
             style={styles.agreeBtn}
             activeOpacity={0.7}
-            onPress={() => agree(type)}>
+            onPress={() => agree(type)}
+          >
             <Text style={styles.agreeBtnText}>同意</Text>
           </TouchableOpacity>
         </View>
@@ -53,7 +55,8 @@ const ProtocolDialog = ({
           <TouchableOpacity
             style={styles.disagreeBtn}
             activeOpacity={0.7}
-            onPress={() => disagree(type)}>
+            onPress={() => disagree(type)}
+          >
             <Text style={styles.disagreeBtnText}>不同意</Text>
           </TouchableOpacity>
         </View>
@@ -62,32 +65,51 @@ const ProtocolDialog = ({
   );
 };
 
+let agreementConfirmContent = {
+  position: "absolute",
+  height: Dimensions.get("window").height * 0.85,
+  left: px(75),
+  right: px(75),
+  top: Dimensions.get("window").height * 0.1,
+  backgroundColor: "#fff",
+  paddingBottom: 0,
+  borderRadius: px(29),
+};
+let disagreeBtnHeight = px(132);
+let disagreeBtnFontSize = px(52);
+
+if (DeviceInfo.getBrand() === "Allwinner") {
+  agreementConfirmContent = {
+    position: "absolute",
+    height: Dimensions.get("window").height * 0.85,
+    left: px(75),
+    right: px(75),
+    top: Dimensions.get("window").height * 0.1,
+    backgroundColor: "#fff",
+    paddingBottom: 0,
+    borderRadius: px(29),
+  };
+  disagreeBtnHeight = px(50);
+  disagreeBtnFontSize = px(26);
+}
+
 const styles = StyleSheet.create({
   agreementMask: {
-    position: 'absolute',
+    position: "absolute",
     left: 0,
     top: 0,
     bottom: 0,
     right: 0,
     zIndex: 2,
-    backgroundColor: 'rgba(0,0,0,0.7)',
-  },
-  agreementConfirmContent: {
-    position: 'absolute',
-    height: Dimensions.get('window').height * 0.7,
-    left: px(75),
-    right: px(75),
-    top: Dimensions.get('window').height * 0.15,
-    backgroundColor: '#fff',
-    paddingBottom: 0,
-    borderRadius: px(29),
+    backgroundColor: "rgba(0,0,0,0.7)",
   },
+  agreementConfirmContent,
   agreementConfirmHead: {
     marginTop: px(52),
     marginBottom: px(34),
   },
   headerLeft: {
-    position: 'absolute',
+    position: "absolute",
     top: 15,
     left: 10,
     zIndex: 2,
@@ -98,7 +120,7 @@ const styles = StyleSheet.create({
   },
   agreementConfirmTitleBox: {
     // flex: 1,
-    position: 'absolute',
+    position: "absolute",
     top: 10,
     bottom: 0,
     left: 0,
@@ -108,22 +130,22 @@ const styles = StyleSheet.create({
   agreementConfirmTitle: {
     fontSize: 20,
     // lineHeight: 50,
-    color: '#000',
-    textAlign: 'center',
+    color: "#000",
+    textAlign: "center",
     // paddingTop: 20,
   },
   agreementConfirmText: {
     fontSize: px(40),
     lineHeight: px(69),
-    color: '#333',
+    color: "#333",
     marginHorizontal: px(40),
   },
   agreementConfirmImportantText: {
-    color: 'rgba(234, 96, 0, 1)',
+    color: "rgba(234, 96, 0, 1)",
   },
   agreementButtons: {
     // justifyContent: 'center',
-    alignItems: 'center',
+    alignItems: "center",
 
     // marginTop: px(12),
     // flexDirection: 'row',
@@ -132,29 +154,29 @@ const styles = StyleSheet.create({
   },
   disagreeBtn: {
     width: px(850),
-    height: px(132),
-    justifyContent: 'center',
-    alignItems: 'center',
+    height: disagreeBtnHeight,
+    justifyContent: "center",
+    alignItems: "center",
   },
   disagreeBtnText: {
-    color: '#666',
-    fontSize: px(52),
-    textAlign: 'center',
-    fontWeight: '400',
+    color: "#666",
+    fontSize: disagreeBtnFontSize,
+    textAlign: "center",
+    fontWeight: "400",
   },
   agreeBtn: {
     width: px(850),
-    height: px(132),
-    justifyContent: 'center',
-    alignItems: 'center',
-    backgroundColor: '#E86003',
+    height: disagreeBtnHeight,
+    justifyContent: "center",
+    alignItems: "center",
+    backgroundColor: "#E86003",
     borderRadius: px(23),
   },
   agreeBtnText: {
-    color: '#fff',
-    fontSize: px(52),
-    textAlign: 'center',
-    fontWeight: '600',
+    color: "#fff",
+    fontSize: disagreeBtnFontSize,
+    textAlign: "center",
+    fontWeight: "600",
   },
 });
 export default ProtocolDialog;