ipanel-rnapp-ajb-base 1.0.38 → 1.0.40

package/app/base.js

@@ -51,12 +51,75 @@ global.base.homedHttp = homedHttp;
 global.base.scaleSize = scaleSize;
 global.base.px = scaleSize;
 global.base.messageManager = {
-  messages: [],
-  wsRef: null,
+  messages: [], // deprecated，等addrMsgData使用起来之后废弃
+  addrMsgData: {
+    /**
+     * "addressId": {
+     *  messages: [],
+     *  latestReadedMsgId: "" // 最新一条已读的消息id。 latestReadedMsgId到最后一条消息之间的云端消息条数即为未读消息数
+     * }
+     */
+  },
+  addrMsgDataUpdateTimer: null,
+  ws: null,
+  connectStatus: undefined,
   sessionId: "",
 
+  getAddrMsgList: function (addrId) {
+    return global.base.messageManager.addrMsgData[addrId]
+      ? global.base.messageManager.addrMsgData[addrId].messages
+      : [];
+  },
+
+  // 用户读取的最新一条消息
+  readLatestMsg: function (msg) {
+    if (msg.FromUserId !== "cloud") {
+      // 只针对云端消息设置已读
+      return;
+    }
+    if (global.base.messageManager.addrMsgData[msg.FromAddrId]) {
+      if (
+        global.base.messageManager.addrMsgData[msg.FromAddrId]
+          .latestReadedMsgId === msg.MsgId
+      ) {
+        return;
+      }
+      global.base.messageManager.addrMsgData[msg.FromAddrId].latestReadedMsgId =
+        msg.MsgId;
+
+      // 更新本地存储
+      clearTimeout(global.base.messageManager.addrMsgDataUpdateTimer);
+      global.base.messageManager.addrMsgDataUpdateTimer = setTimeout(() => {
+        storage.set("addrMsgData", global.base.messageManager.addrMsgData);
+      }, 300);
+
+      eventBus.emit(EVENTS.MESSAGE.UNREAD_COUNT_UPDATE);
+    }
+  },
+
+  // 获取未读消息数量
+  getUnreadMsgCount: function (addressId) {
+    const msgData = global.base.messageManager.addrMsgData[addressId];
+
+    if (!msgData || !msgData.latestReadedMsgId) {
+      return 0;
+    }
+    const readedMsgIndex = msgData.messages.findIndex(
+      (msg) => msg.MsgId === msgData.latestReadedMsgId
+    );
+    let unreadMsgs =
+      readedMsgIndex === -1
+        ? msgData.messages
+        : msgData.messages.slice(readedMsgIndex + 1);
+
+    // 来自云端的消息才计入未读消息
+    unreadMsgs = unreadMsgs.filter((msg) => msg.FromUserId === "cloud");
+
+    return unreadMsgs.length;
+  },
+
   isConnected: function () {
-    return !!global.base.messageManager.wsRef.current;
+    return !!global.base.messageManager.ws;
   },
 
   setSessionId: function (sid) {
@@ -65,24 +128,46 @@ global.base.messageManager = {
 
   sendMessage: async function (message) {
     console.log("ws.send", message);
-    global.base.messageManager.wsRef.current &&
-      global.base.messageManager.wsRef.current.send(JSON.stringify(message));
+    global.base.messageManager.ws &&
+      global.base.messageManager.ws.send(JSON.stringify(message));
     eventBus.emit(EVENTS.MESSAGE.ADD, message);
   },
 
   updateMessageToStorage: async function (message) {
-    const oldMsgIndex = global.base.messageManager.messages.findIndex(
+    const data = global.base.messageManager.addrMsgData[message.FromAddrId] || {
+      messages: [],
+      latestMsgId: "",
+    };
+
+    const oldMsgIndex = data.messages.findIndex(
       (msg) => msg.MsgId === message.MsgId
     );
     if (oldMsgIndex === -1) {
-      console.error("不存在的消息，msgId=", message.MsgId);
+      console.log("不存在的消息，msgId=", message.MsgId);
       return;
     }
 
-    global.base.messageManager.messages.splice(oldMsgIndex, 1, message);
+    data.messages.splice(oldMsgIndex, 1, message);
+
+    await storage.set("addrMsgData", global.base.messageManager.addrMsgData);
+  },
 
-    // save to local
-    await storage.set("messageList", global.base.messageManager.messages);
+  removeMsg(msgId) {
+    const addrMsgData = global.base.messageManager.addrMsgData;
+
+    for (let addrId in addrMsgData) {
+      const msgData = addrMsgData[addrId];
+      const msgIdx = msgData.messages.findIndex((msg) => msg.MsgId === msgId);
+      if (msgIdx !== -1) {
+        msgData.messages.splice(msgIdx, 1);
+        // 更新本地存储
+        clearTimeout(global.base.messageManager.addrMsgDataUpdateTimer);
+        global.base.messageManager.addrMsgDataUpdateTimer = setTimeout(() => {
+          storage.set("addrMsgData", addrMsgData);
+        }, 300);
+        break;
+      }
+    }
   },
 
   genMsg,

package/app/eventBus/index.js

@@ -1,4 +1,4 @@
-import EventEmitter from 'events';
+import EventEmitter from "events";
 
 // 全局事件总线
 // 事件名规范：
@@ -11,45 +11,46 @@ export default eventBus;
 export const EVENTS = {
   // 智能客服聊天界面
   MESSAGE: {
-    ADD: 'message.add', // 新增消息事件
-    RENDER: 'message.render', // 渲染消息UI
-    CONNECT_STATUS_CHANGE: 'message.connectStatusChange', // websocket连接状态变更事件
-    RECONNECT: 'message.reconnect', // 触发websocket重连事件
-    CUSTOM_SERVICE_CONNECT_CHANGE: 'message.customServiceConnectChange', // 智能客服转人工的进入和退出事件
+    ADD: "message.add", // 新增消息事件
+    RENDER: "message.render", // 渲染消息UI
+    CONNECT_STATUS_CHANGE: "message.connectStatusChange", // websocket连接状态变更事件
+    RECONNECT: "message.reconnect", // 触发websocket重连事件
+    CUSTOM_SERVICE_CONNECT_CHANGE: "message.customServiceConnectChange", // 智能客服转人工的进入和退出事件
+    UNREAD_COUNT_UPDATE: "message.unreadCountUpdate",
   },
   // 底部自定义导航栏
   CUSTOM_TAB_BAR: {
-    HIDE_MORE_AREA: 'CustomTabBar.hideMoreArea', // 隐藏更多按钮区域事件
+    HIDE_MORE_AREA: "CustomTabBar.hideMoreArea", // 隐藏更多按钮区域事件
   },
   // 我的家庭
   FAMILY: {
-    CHANGE: 'family.change', // 当前家庭切换事件
+    CHANGE: "family.change", // 当前家庭切换事件
   },
   HOMED: {
-    TOKEN_CHANGE: 'homed.tokenChange',
+    TOKEN_CHANGE: "homed.tokenChange",
   },
   TV: {
-    SHARE_TIME_LIMIT: 'tv.shareTimeLimit',
-    HOME_DATA_CHANGE: 'tv.homeDataChange',
+    SHARE_TIME_LIMIT: "tv.shareTimeLimit",
+    HOME_DATA_CHANGE: "tv.homeDataChange",
   },
   SMART_HOME: {
-    BLE_MESH_ADD: 'smartHome.bleMeshAdd',
+    BLE_MESH_ADD: "smartHome.bleMeshAdd",
   },
   IOT: {
-    DEVICE_STATUS_UPDATE: 'device.status.update',
-    ITEE_NETWORK_CHANGE: 'itee.network.change',
+    DEVICE_STATUS_UPDATE: "device.status.update",
+    ITEE_NETWORK_CHANGE: "itee.network.change",
   },
   ACCOUNT: {
-    AVATAR_CHANGE: 'avatar.change',
+    AVATAR_CHANGE: "avatar.change",
   },
   // 商城客服聊天界面
   SHOPMESSAGE: {
-    ADD: 'shop.message.add', // 新增消息事件
-    RENDER: 'shop.message.render', // 渲染消息UI
-    CONNECT_STATUS_CHANGE: 'shop.message.connectStatusChange', // websocket连接状态变更事件
-    RECONNECT: 'shop.message.reconnect', // 触发websocket重连事件
-    ONLINE_LIST: 'shop.message.online', // 商城在线用户
-    CUSTOM_SERVICE_CONNECT_CHANGE: 'shop.message.customServiceConnectChange', // 智能客服转人工的进入和退出事件
-    HISTORY_MESSAGE_LIST: 'shop.message.history', //  获取历史消息
+    ADD: "shop.message.add", // 新增消息事件
+    RENDER: "shop.message.render", // 渲染消息UI
+    CONNECT_STATUS_CHANGE: "shop.message.connectStatusChange", // websocket连接状态变更事件
+    RECONNECT: "shop.message.reconnect", // 触发websocket重连事件
+    ONLINE_LIST: "shop.message.online", // 商城在线用户
+    CUSTOM_SERVICE_CONNECT_CHANGE: "shop.message.customServiceConnectChange", // 智能客服转人工的进入和退出事件
+    HISTORY_MESSAGE_LIST: "shop.message.history", //  获取历史消息
   },
 };

package/app/hooks/useMessageManager.js

@@ -1,34 +1,69 @@
 import React, { useState, useEffect, useCallback, useRef } from "react";
-import { PermissionsAndroid, Platform } from "react-native";
-
-import { format } from "date-fns";
-
 import storage from "../storage";
 import eventBus, { EVENTS } from "../eventBus";
 import config from "../utils/config";
-import { MSG_TYPES, genMsg } from "../utils/common";
+import { MSG_TYPES, genMsg, CONNECT_STATUS } from "../utils/common";
 import applyPermissions from "../utils/applyPermissions";
 
-let connectStatus = -1; // -1 连接中  0 连接成功  1连接失败
+let wsInstance = null;
 
 let tryConnectTimes = 0;
+let isReConnecting = false;
+const MAX_CONNECT_TIMES = 7;
 
 /**
  * 智能客服中心JS
  */
 
+// storage.set('addrMsgData', {}); // 这是测试代码，如果要清空本地消息，则临时放开这段运行一下
 // storage.set('messageList', []); // 这是测试代码，如果要清空本地消息，则临时放开这段运行一下
-// get local messageList
-storage.get("messageList").then((msgList) => {
-  if (typeof msgList === "string") {
-    try {
-      msgList = JSON.parse(msgList);
-    } catch (e) {
-      console.log("msgList error", e, msgList);
-      msgList = [];
+// 将持久化的消息列表数据恢复到内存中
+storage.get("addrMsgData").then((data) => {
+  if (data) {
+    if (typeof data === "string") {
+      try {
+        data = JSON.parse(data);
+      } catch (e) {
+        console.log("data error", e, data);
+        data = {};
+      }
     }
+    global.base.messageManager.addrMsgData = data || {};
+    eventBus.emit(EVENTS.MESSAGE.UNREAD_COUNT_UPDATE);
+  } else {
+    // deprecated，等addrMsgData使用起来之后废弃
+    // 将持久化的消息列表数据恢复到内存中
+    storage.get("messageList").then((msgList) => {
+      if (typeof msgList === "string") {
+        try {
+          msgList = JSON.parse(msgList);
+        } catch (e) {
+          console.log("msgList error", e, msgList);
+          msgList = [];
+        }
+      }
+      global.base.messageManager.messages = msgList || [];
+
+      // 将废弃的旧格式字段转成新格式字段，再恢复到内存中
+      const addrMsgData = {};
+      global.base.messageManager.messages.forEach((msg) => {
+        if (addrMsgData[msg.FromAddrId]) {
+          addrMsgData[msg.FromAddrId].messages.push(msg);
+          addrMsgData[msg.FromAddrId].latestReadedMsgId = msg.MsgId;
+        } else {
+          addrMsgData[msg.FromAddrId] = {
+            messages: [msg],
+            latestReadedMsgId: msg.MsgId,
+          };
+        }
+      });
+      global.base.messageManager.addrMsgData = addrMsgData;
+      eventBus.emit(EVENTS.MESSAGE.UNREAD_COUNT_UPDATE);
+      storage.set("addrMsgData", addrMsgData);
+      // 移除旧格式字段
+      storage.remove("messageList");
+    });
   }
-  global.base.messageManager.messages = msgList || [];
 });
 
 // 当前是否处于智能客服转人工
@@ -43,32 +78,75 @@ let manualCustomServiceTimer;
 // 智能客服聊天AI模型: CUSTOMER_SERVICE=客服智能体
 let aiModel = "CUSTOMER_SERVICE";
 
+let storageTimer;
+
+// 缓存正在发送中的消息，MsgId->Msg，当消息发送成功或发送失败时，需要将其从缓存中删除
+const pendingMsgMap = {};
+
 const UseMessageManager = () => {
-  const ws = useRef(null);
+  const connectedAddressId = useRef(null);
 
   const sendMessage = useCallback((msg) => {
-    if (ws.current) {
+    // 给用户发送的消息追加Status字段，此时消息是“未发送态”，如果未连接且重连失败，则将状态改为“发送失败态”
+    // 然后先直接把正在发送的消息显示出来，待消息发送成功或失败时再更新消息状态
+    msg.Status = "pending";
+    eventBus.emit(EVENTS.MESSAGE.ADD, msg);
+
+    if (wsInstance) {
       console.log("ws.send");
-      ws.current.send(JSON.stringify(msg));
-      eventBus.emit(EVENTS.MESSAGE.ADD, msg);
+      wsInstance.send(JSON.stringify(msg));
+    } else {
+      // 未连接，触发重连
+      reConnect(() => {
+        console.log("ws.send");
+        wsInstance.send(JSON.stringify(msg));
+      });
     }
   }, []);
 
   const connectMsgServer = async (connectSuccessCallback) => {
+    if (
+      global.base.messageManager.connectStatus === CONNECT_STATUS.CONNECTING ||
+      (global.base.messageManager.connectStatus === CONNECT_STATUS.CONNECTED &&
+        wsInstance &&
+        wsInstance.readyState < 2)
+    ) {
+      console.log(
+        `useMessageManager connectMsgServer skipped, connectStatus=${global.base.messageManager.connectStatus}, ws.readyState=${wsInstance?.readyState}`
+      );
+      return;
+    }
+    global.base.messageManager.connectStatus = CONNECT_STATUS.CONNECTING;
+    eventBus.emit(
+      EVENTS.MESSAGE.CONNECT_STATUS_CHANGE,
+      global.base.messageManager.connectStatus
+    );
+
     console.log("connectMsgServer start");
     const token = await storage.get("accessToken");
     const accountData = await storage.get("accountData");
     const activeAddr = await storage.get("activeAddr");
+    connectedAddressId.current = activeAddr?.address_id;
     let wsUrl = `${
       config.IPANEL_CLOUD_WSS_URI
     }/s/ch/${await global.base.getHomeCloudServiceInstanceName()}/common/msgcenter/websocket`;
 
+    // 获取最新一条消息的id
+    const addrMsgData = await storage.get("addrMsgData");
+    const messages =
+      addrMsgData && addrMsgData[activeAddr?.address_id]
+        ? addrMsgData[activeAddr?.address_id].messages
+        : [];
+
     const connectParams = [
       `user_id=${accountData.user.user_id}`, // 用户id
       `address_id=${activeAddr.address_id}`, // 用户当前选中的家庭地址id
       `token=${token}`,
       "lon=",
       "lat=",
+      `latest_msg_id=${
+        messages.length > 0 ? messages[messages.length - 1].MsgId : ""
+      }`,
     ];
 
     // 设置智能客服AI大模型
@@ -77,30 +155,71 @@ const UseMessageManager = () => {
     }
 
     // 缓存全局智能客服websocket连接
-    global.base.messageManager.wsRef = ws;
     global.base.messageManager.connectMsgServer = connectMsgServer;
 
     const url = `${wsUrl}?${connectParams.join("&")}`;
     console.log("useMessageManager ws url:", url);
 
-    ws.current = new WebSocket(url);
-    ws.current.onopen = () => {
+    wsInstance = new WebSocket(url);
+    global.base.messageManager.ws = wsInstance;
+    wsInstance.onopen = () => {
       console.log("useMessageManager ws open");
-      connectStatus = 0;
+      global.base.messageManager.connectStatus = CONNECT_STATUS.CONNECTED;
       tryConnectTimes = 0;
-      eventBus.emit(EVENTS.MESSAGE.CONNECT_STATUS_CHANGE, connectStatus);
+      isReConnecting = false;
+      eventBus.emit(
+        EVENTS.MESSAGE.CONNECT_STATUS_CHANGE,
+        global.base.messageManager.connectStatus
+      );
+      eventBus.emit(EVENTS.MESSAGE.UNREAD_COUNT_UPDATE);
 
       connectSuccessCallback && connectSuccessCallback();
     };
-    ws.current.onmessage = ({ data }) => {
+    wsInstance.onmessage = ({ data }) => {
+      // 处理来自云端的消息
       try {
         const msg = JSON.parse(data);
-        if (msg.MsgType === "chat" && msg.Chat.type === "tool_call_begin") {
+
+        const messages = global.base.messageManager.getAddrMsgList(
+          activeAddr.address_id
+        );
+
+        // 用户每发送一条消息到云端，云端都会响应一条确认事件消息，用于更新该消息的本地MsgId为服务器生成的ID
+        if (
+          msg.MsgType === MSG_TYPES.EVENT &&
+          msg.Event.Type === "user_msg_received"
+        ) {
+          const targetMsg = messages.find(
+            (item) => item.MsgId === msg.Event.Data.MsgId // 本地产生的ID
+          );
+          if (targetMsg) {
+            targetMsg.MsgId = msg.MsgId; // 服务器产生的ID
+            targetMsg.CreateTime = msg.CreateTime;
+            // 将消息从“未发送态”修改为“已发送态”(即删除Status字段)
+            delete targetMsg.Status;
+            delete pendingMsgMap[msg.Event.Data.MsgId];
+
+            // 避免频繁写入本地存储，在ios可能会导致闪退
+            clearTimeout(storageTimer);
+            storageTimer = setTimeout(() => {
+              storage.set(
+                "addrMsgData",
+                global.base.messageManager.addrMsgData
+              );
+            }, 300);
+          }
+          return;
+        }
+        // AI大模型工具消息合并处理
+        if (
+          msg.MsgType === MSG_TYPES.CHAT &&
+          msg.Chat.type === "tool_call_begin"
+        ) {
           const toolCallId = msg.Chat.payload.tool_calls[0].id;
           if (
-            global.base.messageManager.messages.find(
+            messages.find(
               (msg) =>
-                msg.MsgType === "chat" &&
+                msg.MsgType === MSG_TYPES.CHAT &&
                 msg.Chat.type === "end" &&
                 msg.Chat.payload.message.tool_calls &&
                 msg.Chat.payload.message.tool_calls[0].id === toolCallId
@@ -115,18 +234,30 @@ const UseMessageManager = () => {
         console.log("msg不合法", e);
       }
     };
-    ws.current.onerror = (err) => {
+    wsInstance.onerror = (err) => {
       console.log("useMessageManager ws onerror", err);
-      connectStatus = 1;
-      eventBus.emit(EVENTS.MESSAGE.CONNECT_STATUS_CHANGE, connectStatus);
+      global.base.messageManager.connectStatus = CONNECT_STATUS.DISCONNECTED;
+      eventBus.emit(
+        EVENTS.MESSAGE.CONNECT_STATUS_CHANGE,
+        global.base.messageManager.connectStatus
+      );
     };
-    ws.current.onclose = (event) => {
+    wsInstance.onclose = (event) => {
       console.log("useMessageManager ws onclose", event);
 
-      global.base.messageManager.wsRef.current = null;
-      connectStatus = 1;
-      eventBus.emit(EVENTS.MESSAGE.CONNECT_STATUS_CHANGE, connectStatus);
-      reConnect(connectSuccessCallback);
+      wsInstance = null;
+      global.base.messageManager.ws = null;
+      global.base.messageManager.connectStatus = CONNECT_STATUS.DISCONNECTED;
+      eventBus.emit(
+        EVENTS.MESSAGE.CONNECT_STATUS_CHANGE,
+        global.base.messageManager.connectStatus
+      );
+
+      // 触发重连
+      setTimeout(() => {
+        isReConnecting = false;
+        reConnect(connectSuccessCallback);
+      }, 1000);
     };
   };
 
@@ -135,22 +266,38 @@ const UseMessageManager = () => {
 
     // 正常主动关闭连接，重置重连次数
     tryConnectTimes = 0;
+    isReConnecting = false;
 
-    global.base.messageManager.wsRef.current &&
-      global.base.messageManager.wsRef.current.close();
+    if (wsInstance) {
+      wsInstance.close();
+    }
   };
 
   const reConnect = async (connectSuccessCallback) => {
+    if (isReConnecting) {
+      return;
+    }
+    isReConnecting = true;
     console.log("useMessageManager reConnect", tryConnectTimes);
-    if (tryConnectTimes < 7) {
+    if (tryConnectTimes < MAX_CONNECT_TIMES) {
       // 重连ws
       tryConnectTimes++;
       connectMsgServer(connectSuccessCallback);
     } else {
-      // 重连N次ws失败，不再重试。等用户自己进入智能客服页面时触发重连
+      // 重连N次ws失败，不再重试。等用户自己进入智能客服页面或者发送消息时触发重连
       tryConnectTimes = 0;
-      connectStatus = 1;
-      eventBus.emit(EVENTS.MESSAGE.CONNECT_STATUS_CHANGE, connectStatus);
+      global.base.messageManager.connectStatus = CONNECT_STATUS.DISCONNECTED;
+      isReConnecting = false;
+      eventBus.emit(
+        EVENTS.MESSAGE.CONNECT_STATUS_CHANGE,
+        global.base.messageManager.connectStatus
+      );
+
+      // 所有正在发送的消息全部失败，然后清空pendingMsgMap缓存
+      Object.keys(pendingMsgMap).forEach((MsgId) => {
+        pendingMsgMap[MsgId].Status = "fail";
+        delete pendingMsgMap[MsgId];
+      });
     }
   };
 
@@ -228,31 +375,62 @@ const UseMessageManager = () => {
   useEffect(() => {
     // 新增并显示一条消息
     const onMessageAdd = (msg) => {
+      if (msg.MsgType === MSG_TYPES.EVENT) {
+        // 事件消息不持久化保存，也不渲染
+        return;
+      }
+
+      if (!global.base.messageManager.addrMsgData[msg.FromAddrId]) {
+        global.base.messageManager.addrMsgData[msg.FromAddrId] = {
+          messages: [],
+          latestReadedMsgId: "",
+        };
+      }
+      const msgData = global.base.messageManager.addrMsgData[msg.FromAddrId];
+
+      const messages = msgData.messages;
       // 如果msg.MsgId已存在，则直接更新，而不是push
-      const oldMsgIndex = global.base.messageManager.messages.findIndex(
-        (m) => m.MsgId === msg.MsgId
-      );
+      const oldMsgIndex = messages.findIndex((m) => m.MsgId === msg.MsgId);
       if (oldMsgIndex === -1) {
-        global.base.messageManager.messages.push(msg);
+        messages.push(msg);
+        eventBus.emit(EVENTS.MESSAGE.UNREAD_COUNT_UPDATE);
       } else {
-        global.base.messageManager.messages.splice(oldMsgIndex, 1, msg);
+        messages.splice(oldMsgIndex, 1, msg);
       }
-      // save to local
-      storage.set(
-        "messageList",
-        global.base.messageManager.messages.slice(-500)
-      );
+      // 每个家庭只保留近100条消息
+      if (messages.length > 100) {
+        msgData.messages = messages.slice(-100);
+      }
+
+      // 避免频繁写入本地存储，在ios可能会导致闪退
+      clearTimeout(storageTimer);
+      storageTimer = setTimeout(() => {
+        storage.set("addrMsgData", global.base.messageManager.addrMsgData);
+      }, 300);
 
       eventBus.emit(EVENTS.MESSAGE.RENDER, msg);
     };
 
-    connectStatus = -1;
-    eventBus.emit(EVENTS.MESSAGE.CONNECT_STATUS_CHANGE, connectStatus);
+    const onFamilyChange = async () => {
+      const activeAddr = await storage.get("activeAddr");
+
+      if (activeAddr && activeAddr.address_id !== connectedAddressId.current) {
+        console.log(
+          `Family changed from ${connectedAddressId.current} to ${activeAddr.address_id}, reconnecting...`
+        );
+        closeMsgConnection();
+      } else {
+        console.log(
+          `Family not changed (${connectedAddressId.current}), skipping reconnect.`
+        );
+      }
+    };
+
     // requestCameraPermission();
     connectMsgServer();
 
     // 监听家庭切换事件，切换websocket上下文
-    eventBus.on(EVENTS.FAMILY.CHANGE, closeMsgConnection);
+    eventBus.on(EVENTS.FAMILY.CHANGE, onFamilyChange);
     eventBus.on(EVENTS.MESSAGE.ADD, onMessageAdd);
     eventBus.on(EVENTS.MESSAGE.RECONNECT, reConnect);
 
@@ -287,7 +465,7 @@ const UseMessageManager = () => {
     eventBus.on(EVENTS.SHOPMESSAGE.ONLINE_LIST, handleGetOnlineUserList);
 
     return () => {
-      eventBus.off(EVENTS.FAMILY.CHANGE, closeMsgConnection);
+      eventBus.off(EVENTS.FAMILY.CHANGE, onFamilyChange);
       eventBus.off(EVENTS.MESSAGE.ADD, onMessageAdd);
       eventBus.off(EVENTS.MESSAGE.RECONNECT, reConnect);
 
@@ -375,8 +553,9 @@ const UseMessageManager = () => {
     aiModel = model;
 
     // 触发重新连接
-    global.base.messageManager.wsRef.current &&
-      global.base.messageManager.wsRef.current.close();
+    if (wsInstance) {
+      wsInstance.close();
+    }
   };
 
   return {

package/app/screens/CommonScreens/BossScreen/index.js

@@ -1,44 +1,48 @@
-import React, { useEffect, useState } from 'react';
-import { View } from 'react-native';
-import { WebView } from 'react-native-webview';
-import { bindBossAccount, getUserInfo, getAssets } from '../../../api';
+import React, { useEffect, useState } from "react";
+import { View } from "react-native";
+import { WebView } from "react-native-webview";
+import { bindBossAccount, getUserInfo, getAssets } from "../../../api";
 const { ScreenBackHeader } = global.base.commonComponents;
 const { storage } = global.base;
 
 export default ({ navigation, route }) => {
   const module = route?.params?.module;
-  const [uri, setUri] = useState('');
-  const [state, setState] = useState('');
+  const [uri, setUri] = useState("");
+  const [state, setState] = useState("");
   useEffect(() => {
     init();
-    global.loading.showLoading('加载中...');
+    global.loading.showLoading("加载中...");
   }, []);
   const init = async () => {
-    const accountData = await storage.get('accountData');
+    const accountData = await storage.get("accountData");
+    console.log("init", accountData, "accountData");
     const binding = 1; // 1：绑定，0：解绑.
     const redirect_uri =
-      'https://ipanelcloud2.ipanel.cn:50443/iapp/ajbstatic/bind_boss_account/'; // 绑定后跳转地址
+      "https://ipanelcloud2.ipanel.cn:50443/iapp/ajbstatic/bind_boss_account/"; // 绑定后跳转地址
     const state2 = generateRandomString(8);
     setState(state2);
+    console.log(
+      `https://boss.ipanel.cn/ipanelTask/api/cas_open/isport/Isport_cloud_mall_c/binding?agentid=133&oauth2_id=72d2453f689fc99548187dca4b922a5b&redirect_uri=${redirect_uri}&open_id=${accountData.user?.user_id}&binding=${binding}&scope=snsapi_privateinfo&response_type=code&state=${state2}`
+    );
     setUri(
-      `https://boss.ipanel.cn/ipanelTask/api/cas_open/isport/Isport_cloud_mall_c/binding?agentid=133&oauth2_id=72d2453f689fc99548187dca4b922a5b&redirect_uri=${redirect_uri}&open_id=${accountData.user?.user_id}&binding=${binding}&scope=snsapi_base&response_type=code&state=${state2}`
+      `https://boss.ipanel.cn/ipanelTask/api/cas_open/isport/Isport_cloud_mall_c/binding?agentid=133&oauth2_id=72d2453f689fc99548187dca4b922a5b&redirect_uri=${redirect_uri}&open_id=${accountData.user?.user_id}&binding=${binding}&scope=snsapi_privateinfo&response_type=code&state=${state2}`
     );
   };
 
-  const onMessage = async (e) => {
+  const onMessage = async e => {
     const data = JSON.parse(e.nativeEvent.data);
-    console.log('onMessage', data);
+    console.log("onMessage", data);
     if (data.ret === 0 && data.code && data.state === state) {
-      global.loading.showLoading('正在绑定...');
+      global.loading.showLoading("正在绑定...");
       const res = await bindBossAccount({
         code: data.code,
-        oauth2: '72d2453f689fc99548187dca4b922a5b',
+        oauth2: "72d2453f689fc99548187dca4b922a5b",
       });
-      console.log(res, 'bindBossAccount');
-      global.loading.hideLoading('正在绑定...');
+      console.log(res, "bindBossAccount");
+      global.loading.hideLoading("正在绑定...");
       if (res.code === 0) {
-        global.toast.showToast('绑定成功');
-        get_user_info();
+        global.toast.showToast("绑定成功");
+        await get_user_info();
         // navigation.goBack();
       } else {
         navigation.goBack();
@@ -49,28 +53,33 @@ export default ({ navigation, route }) => {
   };
 
   const get_user_info = async () => {
-    const res = await getUserInfo();
-    console.log(res, 'getUserInfo');
-    if (
-      res?.code === 0 &&
-      res.result?.user_list &&
-      res.result?.user_list.length
-    ) {
-      // const accountData = await storage.get('accountData');
-      // accountData.user.bind_list = res.result?.user_list[0].bind_list;
-      // await storage.set('accountData', accountData);
-      // const bossData = accountData.user.bind_list
-      const bossData = res.result?.user_list[0].bind_list.filter((item) => {
-        return item.third_type === 'boss';
-      });
-      console.log(bossData[0]);
-      if (bossData[0]) {
-        await storage.set('bossData', bossData[0]);
+    try {
+      const res = await getUserInfo();
+      console.log(res, "getUserInfo");
+      if (
+        res?.code === 0 &&
+        res.result?.user_list &&
+        res.result?.user_list.length
+      ) {
+        // const accountData = await storage.get('accountData');
+        // accountData.user.bind_list = res.result?.user_list[0].bind_list;
+        // await storage.set('accountData', accountData);
+        // const bossData = accountData.user.bind_list
+        const bossData = res.result?.user_list[0].bind_list.filter(item => {
+          return item.third_type === "boss";
+        });
+        console.log(bossData[0]);
+        if (bossData[0]) {
+          await storage.set("bossData", bossData[0]);
+        }
       }
-    }
-    if (module === 'shop') {
-      get_assets();
-    } else {
+      if (module === "shop") {
+        await get_assets();
+      } else {
+        navigation.goBack();
+      }
+    } catch (error) {
+      console.error("get_user_info error:", error);
       navigation.goBack();
     }
   };
@@ -80,35 +89,39 @@ export default ({ navigation, route }) => {
     // 获取iSport积分。如果我的模块需要显示积分则应该在登录之后去获取这接口
     const appID = await global.base.getAppId();
     const params = {
-      action: 'get_assets',
+      action: "get_assets",
       currency: 0, // 0是获取全部，20000是获取iSport积分
     };
     if (appID) {
       params.appid = appID;
     }
-    getAssets(params).then((res) => {
+    try {
+      const res = await getAssets(params);
       if (res?.code === 0) {
         if (
           res?.result &&
           res?.result?.asset_list &&
           res?.result?.asset_list?.length
         ) {
-          const current = res.result?.asset_list.filter((item) => {
+          const current = res.result?.asset_list.filter(item => {
             return item.currency === 20000;
           });
           if (current.length) {
-            storage.set('isportData', current[0]);
+            await storage.set("isportData", current[0]);
           }
         }
       }
+    } catch (error) {
+      console.error("get_assets error:", error);
+    } finally {
       navigation.goBack();
-    });
+    }
   };
 
-  const generateRandomString = (length) => {
+  const generateRandomString = length => {
     const characters =
-      'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; // Add any additional special characters you want to include
-    let result = '';
+      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; // Add any additional special characters you want to include
+    let result = "";
     for (let i = 0; i < length; i++) {
       const randomIndex = Math.floor(Math.random() * characters.length);
       result += characters.charAt(randomIndex);
@@ -120,20 +133,32 @@ export default ({ navigation, route }) => {
     <View style={{ flex: 1 }}>
       <ScreenBackHeader title="BOSS登录" />
       <View style={{ flex: 1 }}>
-        <WebView
-          bounces={false}
-          // domStorageEnabled={false}
-          javaScriptEnabled
-          useWebKit
-          source={{
-            uri: uri,
-            headers: { 'Cache-Control': 'no-store' },
-          }}
-          incognito={true}
-          onMessage={onMessage}
-          onLoadEnd={() => global.loading.hideLoading()}
-          onError={() => global.loading.hideLoading()}
-        />
+        {!!uri && (
+          <WebView
+            bounces={false}
+            javaScriptEnabled={true}
+            useWebKit={true}
+            source={{
+              uri: uri,
+              headers: { "Cache-Control": "no-store" },
+            }}
+            incognito={true}
+            onMessage={onMessage}
+            onLoadStart={() => global.loading.showLoading()}
+            onLoadEnd={() => global.loading.hideLoading()}
+            onError={e => {
+              console.log("加载错误:", e.nativeEvent.description);
+              global.loading.hideLoading();
+            }}
+            // iOS 特定修复
+            // onShouldStartLoadWithRequest={request => {
+            //   if (request.url.startsWith('file://')) {
+            //     return true; // 允许加载本地文件
+            //   }
+            //   return true;
+            // }}
+          />
+        )}
       </View>
     </View>
   );

package/app/utils/common.js

@@ -29,11 +29,11 @@ async function updateHomedToken() {
   console.log(accountData?.user, "accountData?.user");
   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");
+  const homedConfig = bindList.find((item) => item.third_type === "homed");
   let domain = activeAddr?.domain || (await global.base.getHomedDomain());
   // if (!["禺乐慧家", "悦慧家"].includes(appName)) {
   //   domain = 'homed.tv'
@@ -44,9 +44,10 @@ async function updateHomedToken() {
     let homedToken = "";
 
     if (
-      homedConfig.extend.deviceno &&
-      homedConfig.extend.deviceid &&
-      homedConfig.extend.userid
+      homedConfig?.extend &&
+      homedConfig?.extend?.deviceno &&
+      homedConfig?.extend?.deviceid &&
+      homedConfig?.extend?.userid
     ) {
       const mobileRelationLoginParams = {
         deviceno: homedConfig.extend.deviceno,
@@ -63,7 +64,7 @@ async function updateHomedToken() {
         const homedLoginResult = await mobileRelationLogin(
           mobileRelationLoginParams,
           domain
-        ).catch(err => {});
+        ).catch((err) => {});
         if (homedLoginResult && homedLoginResult.ret === 0) {
           homedToken = homedLoginResult.access_token;
           await storage.set("homedLoginResult", homedLoginResult);
@@ -79,7 +80,7 @@ async function updateHomedToken() {
           deviceType: 1,
         },
         domain
-      ).catch(err => {});
+      ).catch((err) => {});
       console.log(tokenRes, "tokenRes");
       if (tokenRes && tokenRes.ret === 0) {
         homedToken = tokenRes.access_token;
@@ -94,7 +95,7 @@ async function updateHomedToken() {
         const list = userListRes.user_list || [];
         await storage.set(
           "homedHomeMembers",
-          list.filter(item => item.user_id !== userListRes.bind_user_id)
+          list.filter((item) => item.user_id !== userListRes.bind_user_id)
         );
       }
     } else {
@@ -153,7 +154,7 @@ async function initOperatorHomedTouristAccount(opHomedConfig) {
     accounttype: 1,
     iconid: 1,
     pwd: "1bbd886460827015e5d605ed44252251", // md5("11111111")
-  }).catch(e => {
+  }).catch((e) => {
     console.log("Error: homed游客注册请求失败", e);
   });
 
@@ -177,7 +178,7 @@ async function updateHomedTouristToken() {
     devicetype: 3,
     accounttype: 2,
     pwd: "1bbd886460827015e5d605ed44252251", // md5("11111111")
-  }).catch(e => {
+  }).catch((e) => {
     console.log("Error: homed游客登录请求失败", e);
   });
 
@@ -262,6 +263,7 @@ const MSG_TYPES = {
   VIDEO: "video",
   EVENT: "event",
   TEMPLATE: "template",
+  CHAT: "chat",
 };
 
 const MSG_EVENT_TYPES = {
@@ -284,6 +286,7 @@ async function genMsg(type, msgType, payload) {
     [payloadKey]: payload,
     MsgId: id.replace(/-/g, ""),
     SessionId: global.base.messageManager.sessionId,
+    CreateTime: new Date().getTime(),
   };
   const activeAddr = await storage.get("activeAddr");
   const accountData = await storage.get("accountData");
@@ -292,11 +295,11 @@ async function genMsg(type, msgType, payload) {
     // 当前用户发出
     baseMsg.FromUserId = accountData.user.user_id;
     baseMsg.FromAddrId = activeAddr.address_id;
-    baseMsg.ToUserId = "client";
+    baseMsg.ToUserId = "cloud";
     baseMsg.ToAddrId = activeAddr.address_id;
   } else if (type === "get") {
     // 当前用户收到
-    baseMsg.FromUserId = "client";
+    baseMsg.FromUserId = "cloud";
     baseMsg.FromAddrId = activeAddr.address_id;
     baseMsg.ToUserId = accountData.user.user_id;
     baseMsg.ToAddrId = activeAddr.address_id;
@@ -393,7 +396,7 @@ async function appReport(tag, extraData = {}) {
     ...extraData,
   };
 
-  const res = await reportBigData(tag, appID, data).catch(err => {
+  const res = await reportBigData(tag, appID, data).catch((err) => {
     console.log("reportBigData", err);
   });
   console.log("reportBigData", tag, res);
@@ -424,7 +427,7 @@ const checkToken = async () => {
     ]);
   };
 
-  return new Promise(async resolve => {
+  return new Promise(async (resolve) => {
     try {
       const accountType = await storage.get("accountType");
       const res = await refreshToken(
@@ -450,6 +453,12 @@ const checkToken = async () => {
   });
 };
 
+const CONNECT_STATUS = {
+  CONNECTING: -1,
+  CONNECTED: 0,
+  DISCONNECTED: 1,
+};
+
 export {
   updateHomedToken,
   initOperatorHomedTouristAccount,
@@ -463,4 +472,5 @@ export {
   appReport,
   checkToken,
   updateApartmentToken,
+  CONNECT_STATUS,
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ipanel-rnapp-ajb-base",
-  "version": "1.0.38",
-  "ipanelVersion": "1.0.515",
+  "version": "1.0.40",
+  "ipanelVersion": "1.0.529",
   "description": "",
   "main": "index.js",
   "keywords": [
@@ -13,4 +13,4 @@
   "scripts": {
     "postinstall": "node bin/local-dev.js"
   }
-}
+}