ipanel-rnapp-ajb-base 1.0.21 → 1.0.23

package/app/screens/SbkScreen.js

@@ -1,19 +1,161 @@
-import React from 'react';
-import {View, Text, StyleSheet} from 'react-native';
+import React, { useState, useEffect } from "react";
+import {
+  StyleSheet,
+  View,
+  Text,
+  ScrollView,
+  TouchableOpacity,
+} from "react-native";
+import { Icon, Button } from "@rneui/themed";
+
+const { storage, replace } = global.base;
+
+const SbkPage = ({ navigation }) => {
+  const [activeAddr, setActiveAddr] = useState({});
+  const [addressList, setAddressList] = useState([]);
+  const [addrSelectorVisible, setAddrSelectorVisible] = useState(false);
+
+  useEffect(() => {
+    initAddressList();
+  }, []);
+
+  const initAddressList = async () => {
+    const activeAddr = await storage.get("activeAddr");
+    const addressList = await storage.get("addressList");
+
+    setActiveAddr(activeAddr);
+    setAddressList(addressList);
+  };
+
+  const handleSwitchAddr = () => {
+    setAddrSelectorVisible(true);
+  };
+
+  const handleSelectAddr = async (addr) => {
+    console.log(addr);
+    setActiveAddr(addr);
+    await storage.set("activeAddr", addr);
+    setAddrSelectorVisible(false);
+  };
+  const handleLogout = async () => {
+    await storage.set("accessToken", null);
+    await storage.set("refreshToken", null);
+    await storage.set("homedAccessToken", null);
+    replace("Login", {
+      skip: true,
+    });
+  };
 
-const SbkScreen = () => {
   return (
     <View style={styles.container}>
-      <Text>声必可专用页面</Text>
+      <View style={styles.container}>
+        <View
+          style={{
+            marginBottom: 20,
+          }}
+        >
+          <Text style={[styles.welcomeText, { color: "orange" }]}>
+            声必可专用页面
+          </Text>
+        </View>
+        {addressList.length > 0 ? (
+          <View>
+            <Text style={styles.welcomeText}>
+              当前家庭：{activeAddr.address_name}{" "}
+              <Text
+                style={[styles.switchAddrBtn, styles.welcomeText]}
+                onPress={handleSwitchAddr}
+              >
+                切换
+              </Text>
+            </Text>
+          </View>
+        ) : (
+          <Text>暂无家庭</Text>
+        )}
+      </View>
+      {addrSelectorVisible ? (
+        <View style={styles.addrSelector}>
+          <ScrollView style={styles.addrSelectorScrollView}>
+            {addressList.map((item, index) => (
+              <TouchableOpacity
+                key={index}
+                onPress={() => handleSelectAddr(item)}
+              >
+                <Text
+                  style={[
+                    styles.addrSelectorText,
+                    item.address_id === activeAddr.address_id &&
+                      styles.activeAddrText,
+                  ]}
+                >
+                  {item.address_name}
+                </Text>
+              </TouchableOpacity>
+            ))}
+          </ScrollView>
+        </View>
+      ) : null}
+
+      <Icon
+        containerStyle={styles.exitBtn}
+        type="ionicon"
+        name="exit-outline"
+        color="#00aced"
+        size={30}
+        onPress={handleLogout}
+      />
     </View>
   );
 };
 
 const styles = StyleSheet.create({
   container: {
-    backgroundColor: 'red',
-    height: '100%',
+    flex: 1,
+    alignItems: "center",
+    justifyContent: "center",
+    backgroundColor: "#F2F2F2",
+  },
+  previewBtn: {
+    height: 70,
+  },
+  previewBtnStyle: {
+    fontSize: 18,
+  },
+  welcomeText: {
+    fontSize: 26,
+  },
+  switchAddrBtn: {
+    // 蓝色文本样式
+    color: "#00aced",
+  },
+  exitBtn: {
+    position: "absolute",
+    top: 40,
+    right: 20,
+  },
+  addrSelector: {
+    position: "absolute",
+    top: 0,
+    bottom: 0,
+    left: 0,
+    right: 0,
+    alignItems: "center",
+    justifyContent: "center",
+    backgroundColor: "#fff",
+    zIndex: 2,
+  },
+  addrSelectorScrollView: {
+    marginVertical: 30,
+    paddingHorizontal: 30,
+  },
+  addrSelectorText: {
+    fontSize: 30,
+    lineHeight: 50,
+  },
+  activeAddrText: {
+    color: "#00aced",
   },
 });
 
-export default SbkScreen;
+export default SbkPage;

package/app/utils/applyPermissions.js

@@ -78,15 +78,17 @@ const requestPermissions = async (
     const permissionsMap = await PermissionsAndroid.requestMultiple(
       permissions,
     );
+    console.log(permissionsMap)
     const permissionsResults = Object.values(permissionsMap);
+    console.log(permissionsResults)
     if (
       permissionsResults.every(
         item => item === PermissionsAndroid.RESULTS.GRANTED,
       )
     ) {
       console.log('成功申请权限');
-      await storage.set(`neverAskAgainPermission${type}`, null);
-      return true;
+      await storage.set(`neverAskAgainPermission${type}`, type==='audio'?true:null);
+      return type==='audio'?'getRight':true;
     } else if (
       permissionsResults.some(
         item => item === PermissionsAndroid.RESULTS.NEVER_ASK_AGAIN,

package/app/utils/common.js

@@ -1,8 +1,8 @@
-import {Alert, NativeModules, Platform} from 'react-native';
-import Geolocation from 'react-native-geolocation-service';
-import UUIDGenerator from 'react-native-uuid-generator';
+import { Alert, NativeModules, Platform } from "react-native";
+import Geolocation from "react-native-geolocation-service";
+import UUIDGenerator from "react-native-uuid-generator";
 
-const appName = NativeModules?.RNToNativeEmitter?.appName
+const appName = NativeModules?.RNToNativeEmitter?.appName;
 
 import {
   homedGet,
@@ -13,55 +13,55 @@ import {
   getUserInfo,
   getAccessToken,
   refreshToken,
-} from '../api';
-import storage from '../storage';
-import eventBus, {EVENTS} from '../eventBus';
-import applyPermissions from './applyPermissions';
-import {replace} from './RootNavigation';
+} from "../api";
+import storage from "../storage";
+import eventBus, { EVENTS } from "../eventBus";
+import applyPermissions from "./applyPermissions";
+import { replace } from "./RootNavigation";
 
 async function updateHomedToken() {
-  const accountData = await storage.get('accountData');
-  const activeAddr = await storage.get('activeAddr');
+  const accountData = await storage.get("accountData");
+  const activeAddr = await storage.get("activeAddr");
   const res = await getUserInfo();
   const userList = res.result?.user_list || [];
   const currentUser = userList.find(
-    item => item.user_id === accountData?.user.user_id,
+    (item) => item.user_id === accountData?.user.user_id
   );
   const bindList = currentUser?.bind_list || [];
-  console.log(bindList, 'bindList');
-  const homedConfig = bindList.find(item => item.third_type === 'homed');
-  let domain = activeAddr?.domain || 'homed.tv'
-  // if (appName !== '禺乐慧家') {
+  console.log(bindList, "bindList");
+  const homedConfig = bindList.find((item) => item.third_type === "homed");
+  let domain = activeAddr?.domain || "homed.tv";
+  // if (!["禺乐慧家", "悦慧家"].includes(appName)) {
   //   domain = 'homed.tv'
   // }
-  console.log(domain, 'domain');
+  console.log(domain, "domain");
   if (homedConfig && domain) {
     const tokenRes = await getAccessToken(
       {
         userName: homedConfig.third_id,
         deviceType: 1,
       },
-      domain,
-    ).catch(err => {});
-    console.log(tokenRes, 'tokenRes');
+      domain
+    ).catch((err) => {});
+    console.log(tokenRes, "tokenRes");
     if (tokenRes && tokenRes.ret === 0) {
       // 如果能获取到homed token，说明当前登录的家庭成员开通（绑定）了homed业务
-      await storage.set('homedAccessToken', tokenRes.access_token);
+      await storage.set("homedAccessToken", tokenRes.access_token);
       const userListRes = await getUserList({}).catch(() => {});
       if (userListRes?.ret === 0) {
         const list = userListRes.user_list || [];
         await storage.set(
-          'homedHomeMembers',
-          list.filter(item => item.user_id !== userListRes.bind_user_id),
+          "homedHomeMembers",
+          list.filter((item) => item.user_id !== userListRes.bind_user_id)
         );
       }
     } else {
       // global.toast.showToast(tokenRes?.ret_message || '获取homedtoken失败');
       // 置空
-      await storage.set('homedAccessToken', '');
+      await storage.set("homedAccessToken", "");
     }
   } else {
-    await storage.set('homedAccessToken', '');
+    await storage.set("homedAccessToken", "");
   }
 
   // const params = {
@@ -95,7 +95,7 @@ async function updateHomedToken() {
 // 初始化当前运营商对应的homed游客账号
 // TODO 在用户个人信息切换运营商后需要同步调用该函数初始化新的运营商的homed游客账号及token
 async function initOperatorHomedTouristAccount(opHomedConfig) {
-  await storage.set('operatorHomedConfig', opHomedConfig);
+  await storage.set("operatorHomedConfig", opHomedConfig);
 
   await homedGet(
     `https://access.${opHomedConfig.domain}/account/user/register`,
@@ -104,10 +104,10 @@ async function initOperatorHomedTouristAccount(opHomedConfig) {
       groupid: opHomedConfig.touristGroupId,
       accounttype: 1,
       iconid: 1,
-      pwd: '1bbd886460827015e5d605ed44252251', // md5("11111111")
-    },
-  ).catch(e => {
-    console.log('Error: homed游客注册请求失败', e);
+      pwd: "1bbd886460827015e5d605ed44252251", // md5("11111111")
+    }
+  ).catch((e) => {
+    console.log("Error: homed游客注册请求失败", e);
   });
 
   await updateHomedTouristToken();
@@ -115,7 +115,7 @@ async function initOperatorHomedTouristAccount(opHomedConfig) {
 
 // 更新homed游客token
 async function updateHomedTouristToken() {
-  const opHomedConfig = await storage.get('operatorHomedConfig');
+  const opHomedConfig = await storage.get("operatorHomedConfig");
 
   const result = await homedGet(
     `https://access.${opHomedConfig.domain}/account/login`,
@@ -124,17 +124,17 @@ async function updateHomedTouristToken() {
       account: opHomedConfig.touristUsername,
       devicetype: 3,
       accounttype: 2,
-      pwd: '1bbd886460827015e5d605ed44252251', // md5("11111111")
-    },
-  ).catch(e => {
-    console.log('Error: homed游客登录请求失败', e);
+      pwd: "1bbd886460827015e5d605ed44252251", // md5("11111111")
+    }
+  ).catch((e) => {
+    console.log("Error: homed游客登录请求失败", e);
   });
 
   if (result && result.ret === 0) {
-    console.log('homedTouristAccessToken:', result.access_token);
-    await storage.set('homedTouristAccessToken', result.access_token);
+    console.log("homedTouristAccessToken:", result.access_token);
+    await storage.set("homedTouristAccessToken", result.access_token);
   } else {
-    await storage.set('homedTouristAccessToken', '');
+    await storage.set("homedTouristAccessToken", "");
   }
 }
 
@@ -150,8 +150,8 @@ async function getCurrentPosition() {
 }
 
 async function getUserLocation() {
-  if (Platform.OS === 'ios') {
-    await Geolocation.requestAuthorization('whenInUse');
+  if (Platform.OS === "ios") {
+    await Geolocation.requestAuthorization("whenInUse");
     return getCurrentPosition();
   } else {
     // try {
@@ -175,28 +175,28 @@ async function getUserLocation() {
       try {
         return getCurrentPosition();
       } catch (e) {
-        throw new Error('Location permission not granted!!!!');
+        throw new Error("Location permission not granted!!!!");
       }
     } else {
-      throw new Error('Location permission not granted!!!!');
+      throw new Error("Location permission not granted!!!!");
     }
   }
 }
 
 const MSG_TYPES = {
-  TEXT: 'text',
-  IMAGE: 'image',
-  VOICE: 'voice',
-  VIDEO: 'video',
-  EVENT: 'event',
-  TEMPLATE: 'template',
+  TEXT: "text",
+  IMAGE: "image",
+  VOICE: "voice",
+  VIDEO: "video",
+  EVENT: "event",
+  TEMPLATE: "template",
 };
 
 const MSG_EVENT_TYPES = {
-  GEO: 'geo', // 上报地理位置信息
-  PUSH_WEATHER: 'push_weather', // 请求云端推送天气消息
-  SET_DEVICE_TIMING_CONTROL: 'set_device_timing_control', // 设置一个设备控制任务（notify task）
-  CANCEL_DEVICE_TIMING_CONTROL: 'cancel_device_timing_control', // 取消某个设备控制任务（delete task）
+  GEO: "geo", // 上报地理位置信息
+  PUSH_WEATHER: "push_weather", // 请求云端推送天气消息
+  SET_DEVICE_TIMING_CONTROL: "set_device_timing_control", // 设置一个设备控制任务（notify task）
+  CANCEL_DEVICE_TIMING_CONTROL: "cancel_device_timing_control", // 取消某个设备控制任务（delete task）
 };
 
 // 快速构成智能客服消息对象
@@ -210,20 +210,21 @@ async function genMsg(type, msgType, payload) {
   const baseMsg = {
     MsgType: msgType,
     [payloadKey]: payload,
-    MsgId: id.replace(/-/g, ''),
+    MsgId: id.replace(/-/g, ""),
+    SessionId: global.base.messageManager.sessionId,
   };
-  const activeAddr = await storage.get('activeAddr');
-  const accountData = await storage.get('accountData');
+  const activeAddr = await storage.get("activeAddr");
+  const accountData = await storage.get("accountData");
 
-  if (type === 'send') {
+  if (type === "send") {
     // 当前用户发出
     baseMsg.FromUserId = accountData.user.user_id;
     baseMsg.FromAddrId = activeAddr.address_id;
-    baseMsg.ToUserId = 'client';
+    baseMsg.ToUserId = "client";
     baseMsg.ToAddrId = activeAddr.address_id;
-  } else if (type === 'get') {
+  } else if (type === "get") {
     // 当前用户收到
-    baseMsg.FromUserId = 'client';
+    baseMsg.FromUserId = "client";
     baseMsg.FromAddrId = activeAddr.address_id;
     baseMsg.ToUserId = accountData.user.user_id;
     baseMsg.ToAddrId = activeAddr.address_id;
@@ -235,13 +236,13 @@ async function genMsg(type, msgType, payload) {
 function preZero(num, digit = 2) {
   num = num.toString();
   while (num.length < digit) {
-    num = '0' + num;
+    num = "0" + num;
   }
   return num;
 }
 
 function isDef(val) {
-  return typeof val !== 'undefined';
+  return typeof val !== "undefined";
 }
 
 // 商城客服消息对象
@@ -251,10 +252,10 @@ async function shopGenMsg(
   inputText,
   seq_id,
   recver_id,
-  conversation_id = 'ipanel',
+  conversation_id = "ipanel"
 ) {
   // todo  检查入参格式
-  const accountData = await storage.get('accountData');
+  const accountData = await storage.get("accountData");
   if (type === 1000) {
     // 发消息
     const client_msg_id = generate_uuid();
@@ -266,9 +267,9 @@ async function shopGenMsg(
       nick_name: accountData?.user?.nickname, // 发送方  zhanghaoyy
       face_url: accountData?.user?.icon_url
         ? `${ACCOUNT_SERVICE}/icon?file=${
-          accountData?.user?.icon_url
-        }&time=${new Date().getTime()}`
-        : '',
+            accountData?.user?.icon_url
+          }&time=${new Date().getTime()}`
+        : "",
       message_prop: message_prop,
       message_data: inputText,
     };
@@ -276,8 +277,8 @@ async function shopGenMsg(
       id: seq_id,
       type: 1000, // 1000 request 2000 response
       ecode: 0,
-      emessage: '',
-      route: 'message_post',
+      emessage: "",
+      route: "message_post",
       data: JSON.stringify(params),
     };
     return proto;
@@ -286,16 +287,16 @@ async function shopGenMsg(
 
 // 协议
 const generate_uuid = () => {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
     var r = (Math.random() * 16) | 0,
-      v = c === 'x' ? r : (r & 0x3) | 0x8;
+      v = c === "x" ? r : (r & 0x3) | 0x8;
     return v.toString(16);
   });
 };
 
 // APP大数据上报：https://git.ipanel.cn/1/wdoc/?p=YjM4MmY1MW.2【iPanelCloud后台管理工作组/ipanel_collect_report_data_doc】
 async function appReport(tag, extraData = {}) {
-  const token = await storage.get('accessToken');
+  const token = await storage.get("accessToken");
   if (!token) {
     return;
   }
@@ -304,7 +305,7 @@ async function appReport(tag, extraData = {}) {
     return;
   }
 
-  const accountData = await storage.get('accountData');
+  const accountData = await storage.get("accountData");
 
   const data = {
     upTime: Date.now(),
@@ -312,52 +313,52 @@ async function appReport(tag, extraData = {}) {
     userId: accountData?.user?.user_id,
     accountId: accountData?.account?.account_id,
     appTermType:
-      Platform.OS === 'ios'
+      Platform.OS === "ios"
         ? 2020 // IOS设备应用
-        : Platform.OS === 'android'
-          ? 2010 // Android设备应用
-          : 2000, // 无法确定Android还是IOS，报2000
+        : Platform.OS === "android"
+        ? 2010 // Android设备应用
+        : 2000, // 无法确定Android还是IOS，报2000
     ...extraData,
   };
 
-  const res = await reportBigData(tag, appID, data).catch(err => {
-    console.log('reportBigData', err);
+  const res = await reportBigData(tag, appID, data).catch((err) => {
+    console.log("reportBigData", err);
   });
-  console.log('reportBigData', tag, res);
+  console.log("reportBigData", tag, res);
 }
 
 const checkToken = async () => {
-  const access_token = await storage.get('accessToken');
-  const refresh_token = await storage.get('refreshToken');
+  const access_token = await storage.get("accessToken");
+  const refresh_token = await storage.get("refreshToken");
 
   const logout = () => {
-    Alert.alert('登录过期，请重新登录！', '', [
+    Alert.alert("登录过期，请重新登录！", "", [
       {
-        text: '好',
+        text: "好",
         onPress: async () => {
-          await storage.set('accessToken', null);
-          await storage.set('refreshToken', null);
-          await storage.set('homedAccessToken', null);
-          replace('Login');
+          await storage.set("accessToken", null);
+          await storage.set("refreshToken", null);
+          await storage.set("homedAccessToken", null);
+          replace("Login");
         },
       },
     ]);
   };
 
-  return new Promise(async resolve => {
+  return new Promise(async (resolve) => {
     try {
-      const accountType = await storage.get('accountType');
+      const accountType = await storage.get("accountType");
       const res = await refreshToken(
         {
           access_token,
           refresh_token,
         },
-        accountType,
+        accountType
       );
       if (res.code === 0) {
-        console.log('刷新token', res);
-        await storage.set('accessToken', res.result.access_token);
-        await storage.set('refreshToken', res.result.refresh_token);
+        console.log("刷新token", res);
+        await storage.set("accessToken", res.result.access_token);
+        await storage.set("refreshToken", res.result.refresh_token);
         resolve(true);
       } else {
         resolve(false);

package/app/utils/config.js

@@ -1,29 +1,29 @@
-import {NativeModules} from 'react-native';
+import { NativeModules } from "react-native";
 
 // dev/alpha/release
-const envVersion = NativeModules?.RNToNativeEmitter?.serverCluster || 'alpha';
+const envVersion = NativeModules?.RNToNativeEmitter?.serverCluster || "alpha";
 // NativeModules?.RNToNativeEmitter?.serverCluster || 'dev'; /*本地测试*/
 // `ipanelcloud`域名（因APP是`开发版`、`测试版`或`正式版`而不同）
 // NativeModules.RNToNativeEmitter.appName = '禺乐慧家'
 const appName = NativeModules?.RNToNativeEmitter?.appName;
 const packageName = NativeModules?.RNToNativeEmitter?.packageName;
 
-console.log('当前app名称', appName);
-console.log('当前app包名', packageName);
+console.log("当前app名称", appName);
+console.log("当前app包名", packageName);
 
 let IPANEL_CLOUD_DOMAIN;
-if (appName === '禺乐慧家') {
-  IPANEL_CLOUD_DOMAIN = 'szjtyfw.panyu.gd.cn';
+if (["禺乐慧家", "悦慧家"].includes(appName)) {
+  IPANEL_CLOUD_DOMAIN = "szjtyfw.panyu.gd.cn";
 } else {
   switch (envVersion) {
-    case 'release':
-      IPANEL_CLOUD_DOMAIN = 'ipanelcloud.ipanel.cn'; // 正式集群
+    case "release":
+      IPANEL_CLOUD_DOMAIN = "ipanelcloud.ipanel.cn"; // 正式集群
       break;
-    case 'dev':
-      IPANEL_CLOUD_DOMAIN = 'dev.ipanelcloud2.ipanel.cn'; // 开发集群
+    case "dev":
+      IPANEL_CLOUD_DOMAIN = "dev.ipanelcloud2.ipanel.cn"; // 开发集群
       break;
     default: // alpha
-      IPANEL_CLOUD_DOMAIN = 'ipanelcloud2.ipanel.cn'; // 测试集群
+      IPANEL_CLOUD_DOMAIN = "ipanelcloud2.ipanel.cn"; // 测试集群
       break;
   }
 }
@@ -33,17 +33,17 @@ const config = {
   IPANEL_CLOUD_BASE_URI: `https://${IPANEL_CLOUD_DOMAIN}:50443`,
   IPANEL_CLOUD_WSS_URI: `wss://${IPANEL_CLOUD_DOMAIN}:50443`,
   IPANEL_CLOUD_BASE_ADG_URI:
-    envVersion === 'dev'
+    envVersion === "dev"
       ? `http://${IPANEL_CLOUD_DOMAIN}:50080`
       : `https://${IPANEL_CLOUD_DOMAIN}:50443`,
   // 禺乐慧家模块版本相关api跟着公司alpha走
-  PANYU_MODULE_VERSION_URI: 'https://ipanelcloud2.ipanel.cn:50443',
+  PANYU_MODULE_VERSION_URI: "https://ipanelcloud2.ipanel.cn:50443",
 
   // 模拟配置本地测试用的app版本号，用于模拟执行一些依赖app版本的逻辑
-  LOCALTEST_APP_VERSION: '9.9.9',
+  LOCALTEST_APP_VERSION: "9.9.9",
 
   // 模拟配置本地测试用的appName，用于模拟加载不同APP的模块，当前支持"爱家宝"、"安电工"
-  LOCALTEST_APP_NAME: '禺乐慧家',
+  LOCALTEST_APP_NAME: "禺乐慧家",
 };
 
 export default config;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ipanel-rnapp-ajb-base",
-  "version": "1.0.21",
-  "ipanelVersion": "1.0.348",
+  "version": "1.0.23",
+  "ipanelVersion": "1.0.361",
   "description": "",
   "main": "index.js",
   "bin": {