ipanel-rnapp-ajb-base 1.0.36 → 1.0.38

package/app/api/ipanelCloudApi.js

@@ -5,9 +5,9 @@ import { homedHttp } from "../utils/http";
 
 const appName = NativeModules?.RNToNativeEmitter?.appName;
 
-
-const INVOICE_SERVICE = ["吉柿果"].includes(appName)?'https://icloud.homed.jishimedia.com:50443/s/invoice':
-`${config.IPANEL_CLOUD_BASE_URI}/s/invoice`;
+const INVOICE_SERVICE = ["吉柿果"].includes(appName)
+  ? "https://icloud.homed.jishimedia.com:50443/s/invoice"
+  : `${config.IPANEL_CLOUD_BASE_URI}/s/invoice`;
 const IOT_SERVICE = `${config.IPANEL_CLOUD_BASE_URI}/s/iot`;
 const IR_433_DISCOVER_SERVICE = `${config.IPANEL_CLOUD_BASE_URI}/s/ir433discover`;
 const JINPENG_URL = `${config.IPANEL_CLOUD_BASE_URI}/s/smart_home/jinpeng`;
@@ -18,7 +18,6 @@ export const ADG_SERVICE = `${config.IPANEL_CLOUD_BASE_ADG_URI}/s/install_ea`;
 
 export const APARTMENT_SERVICE = `${config.IPANEL_CLOUD_BASE_URI}/s/smart_home_manage/admin-api`;
 
-
 // todo 云端获取token服务：https://ai.baidu.com/ai-doc/SPEECH/Mk38lxpgn
 export const baiduAsr = (cuid, len, speechBase64) => {
   return request({
@@ -39,14 +38,7 @@ export const baiduAsr = (cuid, len, speechBase64) => {
 };
 
 export const getAreaOperatorModules = async (params) => {
-  let url;
-  if (["禺乐慧家", "悦慧家"].includes(appName)) {
-    url = `${config.PANYU_MODULE_VERSION_URI}/jshomeapp/api/getAreaOperatorModules`
-  } else if ('吉柿果' === appName) {
-    url = `${config.JILIN_MODULE_VERSION_URI}/jshomeapp/api/getAreaOperatorModules`
-  } else {
-    url = `${config.IPANEL_CLOUD_BASE_URI}/jshomeapp/api/getAreaOperatorModules`
-  }
+  let url = `${config.MODULE_VERSION_URI}/jshomeapp/api/getAreaOperatorModules`;
 
   // todo 本地调试测试临时处理，本地调试时模块列表暂时对接的是dev集群
   if (!NativeModules?.RNToNativeEmitter?.serverCluster) {
@@ -69,19 +61,12 @@ export const getAreaOperatorModules = async (params) => {
         : "",
       ...params,
     },
-    timeout: 10 * 1000
+    timeout: 10 * 1000,
   });
 };
 
 export const getModuleVersionInfo = async (params) => {
-  let url;
-  if (["禺乐慧家", "悦慧家"].includes(appName)) {
-    url = `${config.PANYU_MODULE_VERSION_URI}/jshomeapp/api/moduleVersionInfo`
-  } else if ('吉柿果' === appName) {
-    url = `${config.JILIN_MODULE_VERSION_URI}/jshomeapp/api/moduleVersionInfo`
-  } else {
-    url = `${config.IPANEL_CLOUD_BASE_URI}/jshomeapp/api/moduleVersionInfo`
-  }
+  let url = `${config.MODULE_VERSION_URI}/jshomeapp/api/moduleVersionInfo`;
 
   // todo 本地调试测试临时处理，本地调试时模块列表暂时对接的是dev集群
   if (!NativeModules?.RNToNativeEmitter?.serverCluster) {
@@ -125,6 +110,8 @@ export const obtainSmscode = (data, type) => {
   };
   if (["吉柿果"].includes(appName)) {
     params.operator_id = "061aa081306a455da811639160763190";
+  } else if (["智慧中原"].includes(appName)) {
+    params.operator_id = "1478a670efb7085b0b29e7367c5c4f87";
   }
   return request({
     url: type === "adg" ? ADG_SERVICE : ACCOUNT_SERVICE,
@@ -141,6 +128,8 @@ export const smscodeLogin = (data, type) => {
   };
   if (["吉柿果"].includes(appName)) {
     params.operator_id = "061aa081306a455da811639160763190";
+  } else if (["智慧中原"].includes(appName)) {
+    params.operator_id = "1478a670efb7085b0b29e7367c5c4f87";
   }
   return request({
     url: type === "adg" ? ADG_SERVICE : ACCOUNT_SERVICE,
@@ -157,6 +146,8 @@ export const accountLogin = (data, type) => {
   };
   if (["吉柿果"].includes(appName)) {
     params.operator_id = "061aa081306a455da811639160763190";
+  } else if (["智慧中原"].includes(appName)) {
+    params.operator_id = "1478a670efb7085b0b29e7367c5c4f87";
   }
   return request({
     url: type === "adg" ? ADG_SERVICE : ACCOUNT_SERVICE,
@@ -267,7 +258,7 @@ export const delAddress = (data) => {
 };
 
 export const addRoom = async (data) => {
-  const apartmentData = await storage.get('apartmentData');
+  const apartmentData = await storage.get("apartmentData");
   return request({
     url:
       apartmentData && apartmentData?.userType
@@ -316,12 +307,13 @@ export const getAddressRooms = (data) => {
 };
 
 export const adjustRoom = async (data) => {
-  const apartmentData = await storage.get('apartmentData');
+  const apartmentData = await storage.get("apartmentData");
   return request({
-    url: apartmentData && apartmentData?.userType
-          ? `${APARTMENT_SERVICE}/houseRoom/edit`
-          : IOT_SERVICE,
-    method: apartmentData && apartmentData?.userType ? 'PUT' : 'POST',
+    url:
+      apartmentData && apartmentData?.userType
+        ? `${APARTMENT_SERVICE}/houseRoom/edit`
+        : IOT_SERVICE,
+    method: apartmentData && apartmentData?.userType ? "PUT" : "POST",
     data: {
       action: "adjust_room",
       ...data,
@@ -330,11 +322,12 @@ export const adjustRoom = async (data) => {
 };
 
 export const delRoom = async (data) => {
-  const apartmentData = await storage.get('apartmentData');
+  const apartmentData = await storage.get("apartmentData");
   return request({
-    url: apartmentData && apartmentData?.userType
-          ? `${APARTMENT_SERVICE}/houseRoom/del`
-          : IOT_SERVICE,
+    url:
+      apartmentData && apartmentData?.userType
+        ? `${APARTMENT_SERVICE}/houseRoom/del`
+        : IOT_SERVICE,
     method: "POST",
     data: {
       action: "del_room",
@@ -426,18 +419,18 @@ export const adjustDevice = async (data) => {
   //     ...data,
   //   },
   // });
-  const apartmentData = await storage.get('apartmentData');
-  let url = '';
+  const apartmentData = await storage.get("apartmentData");
+  let url = "";
   let params = {
-    path: 'device/adjust_device',
+    path: "device/adjust_device",
     ...data,
   };
-  let method = 'POST';
+  let method = "POST";
   // 公寓的设备
   if (apartmentData && apartmentData?.userType) {
     url = `${APARTMENT_SERVICE}/houseFamilyDevice/edit`;
     params.instanceName = await global.base.getHomeCloudServiceInstanceName();
-    method = 'PUT';
+    method = "PUT";
   } else {
     url = await getCurrentAddrRoomkeeperServiceBaseUri();
   }
@@ -449,10 +442,10 @@ export const adjustDevice = async (data) => {
 };
 
 export const addDevice = async (data) => {
-  const apartmentData = await storage.get('apartmentData');
-  let url = '';
+  const apartmentData = await storage.get("apartmentData");
+  let url = "";
   let params = {
-    path: 'device/add_device',
+    path: "device/add_device",
     ...data,
   };
   // 公寓的设备添加调志豪的接口
@@ -464,25 +457,25 @@ export const addDevice = async (data) => {
   }
   return request({
     url: url,
-    method: 'POST',
+    method: "POST",
     data: params,
   });
 };
 
 export const moveDevice = async (data) => {
-  const apartmentData = await storage.get('apartmentData');
-  let url = '';
+  const apartmentData = await storage.get("apartmentData");
+  let url = "";
   let params = {
-    path: 'device/move_device',
+    path: "device/move_device",
     ...data,
   };
-  let method = 'POST';
+  let method = "POST";
   // const ROOMKEEPER_SERVICE = await getCurrentAddrRoomkeeperServiceBaseUri();
   // 公寓的设备添加调志豪的接口
   if (apartmentData && apartmentData?.userType) {
     url = `${APARTMENT_SERVICE}/houseFamilyDevice/move`;
     params.instanceName = await global.base.getHomeCloudServiceInstanceName();
-    method = 'PUT';
+    method = "PUT";
   } else {
     url = await getCurrentAddrRoomkeeperServiceBaseUri();
   }
@@ -502,8 +495,8 @@ export const getsn = (data) => {
 };
 
 export const delDevice = async (data) => {
-  const apartmentData = await storage.get('apartmentData');
-  let url = '';
+  const apartmentData = await storage.get("apartmentData");
+  let url = "";
   let params = {};
   // 公寓的设备添加调志豪的接口
   if (apartmentData && apartmentData?.userType) {
@@ -514,13 +507,13 @@ export const delDevice = async (data) => {
   } else {
     url = await getCurrentAddrRoomkeeperServiceBaseUri();
     params = {
-      path: 'device/delete_device',
+      path: "device/delete_device",
       ...data,
     };
   }
   return request({
     url: url,
-    method: 'POST',
+    method: "POST",
     data: params,
   });
 };
@@ -885,14 +878,14 @@ export const switchToken = async (params) => {
 export const getHouseType = async () => {
   return request({
     url: `${APARTMENT_SERVICE}/house/account/getType`,
-    method: 'GET',
+    method: "GET",
   });
 };
 // 通过用户类型登录
 export const loginByType = async (id, params) => {
   return request({
     url: `${APARTMENT_SERVICE}/house/account/loginByType?userType=${id}`,
-    method: 'POST',
+    method: "POST",
     data: params,
   });
 };
@@ -976,14 +969,14 @@ export const checkCaptcha = (data) => {
 };
 
 //查询绑定情况
-export const getJinpengBindList = async (params)=>{
-  return request({
-      url: `${JINPENG_URL}/get_bind_list`,
-      method: 'POST',
-      data: {
-        page:1,
-        page_size:100,
-        ...params
-      },
-    });
-}
+export const getJinpengBindList = async (params) => {
+  return request({
+    url: `${JINPENG_URL}/get_bind_list`,
+    method: "POST",
+    data: {
+      page: 1,
+      page_size: 100,
+      ...params,
+    },
+  });
+};

package/app/components/common/Cell/index.js

@@ -80,7 +80,7 @@ const Index = ({
               multiline={multiline}
               style={[styles.valueInput, inputStyle]}
               placeholder={placeholder}
-              placeholdertextcolor="#999"
+              placeholderTextColor="#999"
               onChangeText={onChangeText}
               editable={editable}
               keyboardType={keyboardType}
@@ -218,7 +218,7 @@ const Index = ({
                 multiline={false}
                 style={styles.valueInput}
                 placeholder={placeholder}
-                placeholdertextcolor="#999"
+                placeholderTextColor="#999"
                 onChangeText={onChangeText}
                 returnKeyType="done"
                 onSubmitEditing={({nativeEvent}) => {

package/app/components/common/Dialog/index.js

@@ -60,12 +60,13 @@ const Index = ({steps, active, onRef}) => {
 
   return (
     modalVisible && (
-      <View style={styles.backgroundView}>
-        <Modal
-          animationType="fade"
-          transparent={true}
-          visible={modalVisible}
-          onRequestClose={() => {}}>
+      <Modal
+        animationType="fade"
+        transparent={true}
+        statusBarTranslucent={modelRef.current?.statusBarTranslucent}
+        visible={modalVisible}
+        onRequestClose={() => {}}>
+        <View style={styles.backgroundView}>
           <TouchableOpacity
             style={styles.centeredView}
             activeOpacity={1}
@@ -102,8 +103,8 @@ const Index = ({steps, active, onRef}) => {
               />
             )}
           </TouchableOpacity>
-        </Modal>
-      </View>
+        </View>
+      </Modal>
     )
   );
 };

package/app/components/common/Dialog/styles.js

@@ -5,12 +5,13 @@ const { fontStyle } = global.base.styles;
 
 const styles = StyleSheet.create({
   backgroundView: {
-    position: 'absolute',
-    top: 0,
-    bottom: 0,
-    // opacity: 0.5,
-    left: 0,
-    right: 0,
+    // position: 'absolute',
+    // top: 0,
+    // bottom: 0,
+    // // opacity: 0.5,
+    // left: 0,
+    // right: 0,
+    flex:1,
     backgroundColor: 'rgba(0, 0, 0, 0.5)',
   },
   centeredView: {

package/app/hooks/useDynamicPackages.js

@@ -1,22 +1,32 @@
-import React, {useState, useCallback} from 'react';
+import React, { useState, useEffect } from "react";
 
 const useDynamicPackages = () => {
   const [DynamicStackScreens, setDynamicScreens] = useState({});
 
-  const initEvent = useCallback(() => {
-    const addDynamicScreens = screens => {
-      setDynamicScreens({
-        ...DynamicStackScreens,
-        ...screens,
+  useEffect(() => {
+    const addDynamicScreens = (screens) => {
+      // 使用函数式更新，可以确保我们总是基于最新的状态进行更新
+      setDynamicScreens((currentScreens) => {
+        const allScreens = {
+          ...currentScreens,
+          ...screens,
+        };
+        return allScreens;
       });
     };
-    global.base.eventBus.removeAllListeners('addDynamicScreens');
-    global.base.eventBus.addListener('addDynamicScreens', addDynamicScreens);
-  }, [DynamicStackScreens]);
 
-  initEvent();
+    global.base.eventBus.addListener("addDynamicScreens", addDynamicScreens);
 
-  return {DynamicStackScreens};
+    // useEffect 的清理函数：在组件卸载时移除监听，防止内存泄漏
+    return () => {
+      global.base.eventBus.removeListener(
+        "addDynamicScreens",
+        addDynamicScreens
+      );
+    };
+  }, []); // 空依赖数组意味着这个 effect 只在组件挂载时运行一次
+
+  return { DynamicStackScreens };
 };
 
 export default useDynamicPackages;

package/app/hooks/useMessageManager.js

@@ -40,6 +40,9 @@ let manualCustomServiceTimer;
 
 // TODO 定期轮询检查消息过期
 
+// 智能客服聊天AI模型: CUSTOMER_SERVICE=客服智能体
+let aiModel = "CUSTOMER_SERVICE";
+
 const UseMessageManager = () => {
   const ws = useRef(null);
 
@@ -68,6 +71,11 @@ const UseMessageManager = () => {
       "lat=",
     ];
 
+    // 设置智能客服AI大模型
+    if (aiModel) {
+      connectParams.push(`model=${aiModel}`);
+    }
+
     // 缓存全局智能客服websocket连接
     global.base.messageManager.wsRef = ws;
     global.base.messageManager.connectMsgServer = connectMsgServer;
@@ -79,13 +87,33 @@ const UseMessageManager = () => {
     ws.current.onopen = () => {
       console.log("useMessageManager ws open");
       connectStatus = 0;
+      tryConnectTimes = 0;
       eventBus.emit(EVENTS.MESSAGE.CONNECT_STATUS_CHANGE, connectStatus);
 
       connectSuccessCallback && connectSuccessCallback();
     };
     ws.current.onmessage = ({ data }) => {
-      const msg = JSON.parse(data);
-      eventBus.emit(EVENTS.MESSAGE.ADD, msg);
+      try {
+        const msg = JSON.parse(data);
+        if (msg.MsgType === "chat" && msg.Chat.type === "tool_call_begin") {
+          const toolCallId = msg.Chat.payload.tool_calls[0].id;
+          if (
+            global.base.messageManager.messages.find(
+              (msg) =>
+                msg.MsgType === "chat" &&
+                msg.Chat.type === "end" &&
+                msg.Chat.payload.message.tool_calls &&
+                msg.Chat.payload.message.tool_calls[0].id === toolCallId
+            )
+          ) {
+            // 如果前面已经有AI返回相同id的 tool_calls 了（正常来说都会有），则忽略当前 tool_call_begin 消息，避免业务处理两次"开始调用工具"消息
+            return;
+          }
+        }
+        eventBus.emit(EVENTS.MESSAGE.ADD, msg);
+      } catch (e) {
+        console.log("msg不合法", e);
+      }
     };
     ws.current.onerror = (err) => {
       console.log("useMessageManager ws onerror", err);
@@ -200,7 +228,15 @@ const UseMessageManager = () => {
   useEffect(() => {
     // 新增并显示一条消息
     const onMessageAdd = (msg) => {
-      global.base.messageManager.messages.push(msg);
+      // 如果msg.MsgId已存在，则直接更新，而不是push
+      const oldMsgIndex = global.base.messageManager.messages.findIndex(
+        (m) => m.MsgId === msg.MsgId
+      );
+      if (oldMsgIndex === -1) {
+        global.base.messageManager.messages.push(msg);
+      } else {
+        global.base.messageManager.messages.splice(oldMsgIndex, 1, msg);
+      }
       // save to local
       storage.set(
         "messageList",
@@ -334,6 +370,15 @@ const UseMessageManager = () => {
 
   const getManualCustomServiceActiveFlag = () => isManualCustomServiceActive;
 
+  const getAiModel = () => aiModel;
+  const setAiModel = (model) => {
+    aiModel = model;
+
+    // 触发重新连接
+    global.base.messageManager.wsRef.current &&
+      global.base.messageManager.wsRef.current.close();
+  };
+
   return {
     sendMessage,
     handleTextSubmit,
@@ -341,6 +386,8 @@ const UseMessageManager = () => {
     requestManualCustomService,
     exitManualCustomService,
     getManualCustomServiceActiveFlag,
+    getAiModel,
+    setAiModel,
   };
 };
 

package/app/screens/BaseScreen.js

@@ -110,11 +110,17 @@ async function getNavigationPackages() {
     console.log("网络加载底部导航模块成功！");
     const packagesPre = res.data || [];
     if (appName.includes("悦慧家")) {
-      const params = { phone_number: accountData.user.phone };
-      const res = await getJinpengBindList(params);
-      if (res?.resultCode === 0 && res?.response_obj?.list.length > 0) {
-        packages = packagesPre;
-      } else {
+      try {
+        const params = { phone_number: accountData.user.phone };
+        const res = await getJinpengBindList(params);
+        if (res?.resultCode === 0 && res?.response_obj?.list.length > 0) {
+          packages = packagesPre;
+        } else {
+          packages = packagesPre.filter((item) => {
+            return item.moduleName !== "jinpeng";
+          });
+        }
+      } catch (e) {
         packages = packagesPre.filter((item) => {
           return item.moduleName !== "jinpeng";
         });
@@ -219,7 +225,17 @@ const HomeTabScreen = forwardRef(function ({ navigation, route }, ref) {
             global.toast.showToast("加载失败");
             console.log("加载失败");
           } else {
-            const apartmentApackage = result.data.packages;
+            // 如果家居模块有默认选中，则将默认选中传给公寓模块
+            const defaultActive = packages[index]?.defaultActive || 0;
+            let apartmentApackage = result.data.packages;
+            if (
+              apartmentApackage &&
+              apartmentApackage.length &&
+              apartmentApackage[0]?.defaultActive === undefined
+            ) {
+              apartmentApackage[0].defaultActive = defaultActive;
+            }
+            console.log(apartmentApackage, "apartmentApackage");
             packages.splice(index, 1, ...apartmentApackage);
           }
         }
@@ -552,6 +568,8 @@ const HomeTabScreen = forwardRef(function ({ navigation, route }, ref) {
     requestManualCustomService,
     exitManualCustomService,
     getManualCustomServiceActiveFlag,
+    getAiModel,
+    setAiModel,
   } = UseMessageManager();
   global.base.messageManager.handleTextSubmit = handleTextSubmit;
   global.base.messageManager.handleMediaSelect = handleMediaSelect;
@@ -560,6 +578,8 @@ const HomeTabScreen = forwardRef(function ({ navigation, route }, ref) {
   global.base.messageManager.exitManualCustomService = exitManualCustomService;
   global.base.messageManager.getManualCustomServiceActiveFlag =
     getManualCustomServiceActiveFlag;
+  global.base.messageManager.getAiModel = getAiModel;
+  global.base.messageManager.setAiModel = setAiModel;
 
   // 商城客服
   const {

package/app/screens/LoginScreen/indexNew.js

@@ -582,11 +582,11 @@ function LoginScreen({ navigation, route }) {
           console.log(defaultAddr.address_id, "defaultAddr.address_id");
           await storage.set("activeAddr", defaultAddr);
           await storage.set("addressList", addressList);
-          await updateHomedToken();
         } else {
           await storage.set("activeAddr", {});
           await storage.set("addressList", []);
         }
+        await updateHomedToken();
       }
       delete res.result.address;
       await storage.set("accountData", res.result);
@@ -832,7 +832,9 @@ function LoginScreen({ navigation, route }) {
       global.toast.showToast(message);
       if (res.code === 10430) {
         loginCaptchaToken.current = await checkGraphSmscode();
-        handleGetSmsId();
+        if(loginWay===0){//手机登录方式才需要重发送手机号
+          handleGetSmsId();
+        }
       }
     }
   };
@@ -1103,15 +1105,15 @@ function LoginScreen({ navigation, route }) {
                           styles.passBox,
                           {
                             justifyContent:
-                              appName === "吉柿果" ||
+                              /* appName === "吉柿果" ||
                               currentOperatorName === "番禺有线" ||
                               appName === "悦慧家"
-                                ? "flex-end"
-                                : "space-between",
+                                ?  */"flex-end"
+                               /*  : "space-between" */,
                           },
                         ]}
                       >
-                        {appName !== "吉柿果" &&
+                        {/* {appName !== "吉柿果" &&
                           appName !== "悦慧家" &&
                           currentOperatorName !== "番禺有线" && (
                             <TouchableOpacity
@@ -1130,7 +1132,7 @@ function LoginScreen({ navigation, route }) {
                                 注册
                               </Text>
                             </TouchableOpacity>
-                          )}
+                          )} */}
                         <TouchableOpacity
                           style={styles.forgotPassword}
                           onPress={() => {
@@ -1155,7 +1157,7 @@ function LoginScreen({ navigation, route }) {
                     </>
                   )}
 
-                  {smsCodeResendTime !== 0 && (
+                  {loginWay===0&&smsCodeResendTime !== 0 && (
                     <TouchableOpacity
                       style={{
                         alignSelf: "flex-end",

package/app/screens/SbkScreen.js

@@ -7,6 +7,7 @@ import {
   TouchableOpacity,
 } from "react-native";
 import { Icon, Button } from "@rneui/themed";
+import { checkToken } from "../utils/common";
 
 const { storage, replace } = global.base;
 
@@ -17,6 +18,17 @@ const SbkPage = ({ navigation }) => {
 
   useEffect(() => {
     initAddressList();
+
+    // 定时刷新登录状态
+    checkToken();
+    clearInterval(global.SBK_CHECK_TOKEN_INTERVAL);
+    global.SBK_CHECK_TOKEN_INTERVAL = setInterval(async () => {
+      const accessToken = await storage.get("accessToken");
+      if (accessToken) {
+        console.log("SBK_CHECK_TOKEN_INTERVAL checkToken");
+        checkToken();
+      }
+    }, 1000 * 60 * 60 * 24); // 每 24 小时刷新一次登录状态
   }, []);
 
   const initAddressList = async () => {

package/app/screens/SimpleBaseScreen.js

@@ -53,15 +53,17 @@ async function getNavigationPackages() {
   const currentOperator = await storage.get(
     `${accountData?.account?.account_id || ""}currentOperator`
   );
-  let areaOperatorId =
-    currentOperator && currentOperator.id ? currentOperator.id : "common";
+  let areaOperatorId = "650ee8c59f534b189c8607f498564515";//A1-天威视讯
+    // currentOperator && currentOperator.id ? currentOperator.id : "common";
   console.log("currentOperator", currentOperator);
+  let appcode = 'jiaobian';//APK固定配置一款APP带一个appcode不能重复
 
   // 从网络加载最新导航模块
   const res = await retryAsync(() => {
     return getAreaOperatorModules({
       platform: Platform.OS,
       areaOperatorId,
+      appcode
     })
   }).catch((err) => {
     console.log(err);

package/app/utils/common.js

@@ -26,13 +26,14 @@ async function updateHomedToken() {
   const activeAddr = await storage.get("activeAddr");
   const res = await getUserInfo();
   console.log(res, "getUserInfo");
+  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'
@@ -62,7 +63,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);
@@ -78,7 +79,7 @@ async function updateHomedToken() {
           deviceType: 1,
         },
         domain
-      ).catch((err) => {});
+      ).catch(err => {});
       console.log(tokenRes, "tokenRes");
       if (tokenRes && tokenRes.ret === 0) {
         homedToken = tokenRes.access_token;
@@ -93,7 +94,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 {
@@ -152,7 +153,7 @@ async function initOperatorHomedTouristAccount(opHomedConfig) {
     accounttype: 1,
     iconid: 1,
     pwd: "1bbd886460827015e5d605ed44252251", // md5("11111111")
-  }).catch((e) => {
+  }).catch(e => {
     console.log("Error: homed游客注册请求失败", e);
   });
 
@@ -176,7 +177,7 @@ async function updateHomedTouristToken() {
     devicetype: 3,
     accounttype: 2,
     pwd: "1bbd886460827015e5d605ed44252251", // md5("11111111")
-  }).catch((e) => {
+  }).catch(e => {
     console.log("Error: homed游客登录请求失败", e);
   });
 
@@ -392,7 +393,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);
@@ -423,7 +424,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(

package/app/utils/config.js

@@ -30,19 +30,30 @@ if (["禺乐慧家", "悦慧家"].includes(appName)) {
 }
 // console.log(IPANEL_CLOUD_DOMAIN)
 
+const IPANEL_CLOUD_BASE_URI = `https://${IPANEL_CLOUD_DOMAIN}:50443`;
+
+const MODULE_VERSION_URI_MAP = {
+  悦慧家: "https://szjtyfw.panyu.gd.cn:50443",
+  吉柿果: "http://rnupgrade.homed.jishimedia.com:50080",
+  智慧中原: "https://sccloud.hnzhzy.com:50443",
+};
+
 const config = {
   IPANEL_CLOUD_DOMAIN,
-  IPANEL_CLOUD_BASE_URI: `https://${IPANEL_CLOUD_DOMAIN}:50443`,
+  IPANEL_CLOUD_BASE_URI,
   IPANEL_CLOUD_WSS_URI: `wss://${IPANEL_CLOUD_DOMAIN}:50443`,
   IPANEL_CLOUD_BASE_ADG_URI:
     envVersion === "dev"
       ? `http://${IPANEL_CLOUD_DOMAIN}:50080`
-      : `https://${IPANEL_CLOUD_DOMAIN}:50443`,
-  // 悦慧家版本 release
-  PANYU_MODULE_VERSION_URI: "https://szjtyfw.panyu.gd.cn:50443",
-  // 吉林吉柿果版本 alpha
-  // JILIN_MODULE_VERSION_URI: "http://rnupgrade.homed.jishimedia.com:50080",
-  JILIN_MODULE_VERSION_URI: "https://ipanelcloud.ipanel.cn:50443",
+      : IPANEL_CLOUD_BASE_URI,
+
+  // RN模块 API 路径
+  MODULE_VERSION_URI: MODULE_VERSION_URI_MAP[appName] || IPANEL_CLOUD_BASE_URI,
+
+  // 该配置项已废弃，请用 MODULE_VERSION_URI
+  PANYU_MODULE_VERSION_URI: MODULE_VERSION_URI_MAP["悦慧家"],
+  // 该配置项已废弃，请用 MODULE_VERSION_URI
+  JILIN_MODULE_VERSION_URI: MODULE_VERSION_URI_MAP["吉柿果"],
 
   // 模拟配置本地测试用的app版本号，用于模拟执行一些依赖app版本的逻辑
   LOCALTEST_APP_VERSION: "9.9.9",

package/app/utils/http.js

@@ -37,7 +37,7 @@ async function http(options) {
   );
   const apartmentToken = await storage.get("apartmentToken");
   const apartmentData = await storage.get("apartmentData");
-
+  const accountData = await storage.get("accountData");
   if (method === "post" || method === "put") {
     if (options.data instanceof FormData || typeof options.data !== "object") {
       config.body = options.data;
@@ -59,7 +59,8 @@ async function http(options) {
       url.includes("/admin-api/house/account/login") ||
       url.includes("/admin-api/house/account/loginByType")
     ) {
-      config.headers.homedToken = TOKEN;
+      config.headers.homedToken =
+        accountData?.account?.phone || accountData?.user?.phone || TOKEN;
     }
   } else if (method === "get" || method === "delete") {
     let query = [];
@@ -67,7 +68,7 @@ async function http(options) {
     if (TOKEN) {
       data.access_token = TOKEN;
     }
-    Object.keys(data).forEach((key) => {
+    Object.keys(data).forEach(key => {
       query.push(`${key}=${data[key]}`);
     });
     if (query.length > 0) {
@@ -75,7 +76,8 @@ async function http(options) {
     }
   }
   if (url.includes("/admin-api/house/account/getType")) {
-    config.headers.homedToken = TOKEN;
+    config.headers.homedToken =
+      accountData?.account?.phone || accountData?.user?.phone || TOKEN;
   } else if (
     url.includes("/smart_home_manage/admin-api") &&
     !url.includes("/smart_home_manage/admin-api/house/account/loginByType") &&
@@ -86,14 +88,16 @@ async function http(options) {
     config.headers.Authorization = `Bearer ${apartmentToken}`;
   }
 
-  console.log(url, config);
+  const reqid = Date.now() + "-" + Math.floor(Math.random() * 1000000);
+
+  console.log("req:", url, config, "reqid=", reqid);
 
   return fetch(url, config)
-    .then((response) => {
-      console.log(response, "url");
+    .then(response => {
+      // console.log(response, "url");
       return response.json();
     })
-    .then((json) => {
+    .then(json => {
       if (
         typeof json.error_code !== "undefined" &&
         typeof json.code === "undefined"
@@ -109,17 +113,18 @@ async function http(options) {
           // );
         }
       }
+      console.log("res:", url, config, "reqid=", reqid, "json=", json);
 
       return json;
     })
-    .catch((err) => {
-      console.log(err);
+    .catch(err => {
+      console.log("req error:", url, config, "reqid=", reqid, "error=", err);
       throw err;
       // Alert.alert('服务繁忙，请稍候重试');
     });
 }
 
-export const homedHttp = async (options) => {
+export const homedHttp = async options => {
   let url = options.url;
   const method = options.method.toLowerCase();
 
@@ -169,7 +174,7 @@ export const homedHttp = async (options) => {
     if (TOKEN) {
       data.accesstoken = TOKEN;
     }
-    Object.keys(data).forEach((key) => {
+    Object.keys(data).forEach(key => {
       query.push(`${key}=${data[key]}`);
     });
     if (query.length > 0) {
@@ -180,13 +185,13 @@ export const homedHttp = async (options) => {
   console.log(url, config);
 
   return fetch(url, config)
-    .then((response) => {
+    .then(response => {
       return response.json();
     })
-    .then((json) => {
+    .then(json => {
       return json;
     })
-    .catch((err) => {
+    .catch(err => {
       console.log(err);
       // Alert.alert('服务繁忙，请稍候重试');
       return Promise.reject(err);

package/package.json

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