ipanel-rnapp-ajb-base 1.0.33 → 1.0.34

package/app/App.js

@@ -111,6 +111,7 @@ if (Platform.OS === "android") {
   // ----yusm：安卓使用DeviceEventEmitter
   eventEmitter = DeviceEventEmitter;
 } else {
+  // 走这个的话需要IOS对事件进行枚举定义
   eventEmitter = new NativeEventEmitter(NativeModules.NativeToRNEmitter);
 }
 // 公共 栈路由页面
@@ -353,7 +354,7 @@ const App = () => {
       }
     );
 
-    const homedLogOutListener = eventEmitter.addListener(
+    const homedLogOutListener = DeviceEventEmitter.addListener(
       "HomedLogout",
       async (data) => {
         console.log("HomedLogout", data);

package/app/api/ipanelCloudApi.js

@@ -13,7 +13,7 @@ export const ACCOUNT_SERVICE = `${config.IPANEL_CLOUD_BASE_URI}/s/account`;
 
 export const ADG_SERVICE = `${config.IPANEL_CLOUD_BASE_ADG_URI}/s/install_ea`;
 
-export const APARTMENT_SERVICE = "http://192.168.22.194:47070/smartapartment";
+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) => {
@@ -35,11 +35,14 @@ export const baiduAsr = (cuid, len, speechBase64) => {
 };
 
 export const getAreaOperatorModules = async (params) => {
-  let url = `${
-    ["禺乐慧家", "悦慧家", "吉柿果"].includes(appName)
-      ? config.PANYU_MODULE_VERSION_URI
-      : config.IPANEL_CLOUD_BASE_URI
-  }/jshomeapp/api/getAreaOperatorModules`;
+  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`
+  }
 
   // todo 本地调试测试临时处理，本地调试时模块列表暂时对接的是dev集群
   if (!NativeModules?.RNToNativeEmitter?.serverCluster) {
@@ -62,15 +65,19 @@ export const getAreaOperatorModules = async (params) => {
         : "",
       ...params,
     },
+    timeout: 10 * 1000
   });
 };
 
 export const getModuleVersionInfo = async (params) => {
-  let url = `${
-    ["禺乐慧家", "悦慧家", "吉柿果"].includes(appName)
-      ? config.PANYU_MODULE_VERSION_URI
-      : config.IPANEL_CLOUD_BASE_URI
-  }/jshomeapp/api/moduleVersionInfo`;
+  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`
+  }
 
   // todo 本地调试测试临时处理，本地调试时模块列表暂时对接的是dev集群
   if (!NativeModules?.RNToNativeEmitter?.serverCluster) {
@@ -108,37 +115,49 @@ export const getUserInfo = (data) => {
 };
 
 export const obtainSmscode = (data, type) => {
+  const params = {
+    action: "obtain_smscode",
+    ...data,
+  };
+  if (["吉柿果"].includes(appName)) {
+    params.operator_id = "061aa081306a455da811639160763190";
+  }
   return request({
     url: type === "adg" ? ADG_SERVICE : ACCOUNT_SERVICE,
     method: "POST",
-    data: {
-      action: "obtain_smscode",
-      ...data,
-    },
+    data: params,
   });
 };
 
 export const smscodeLogin = (data, type) => {
+  const params = {
+    action: "smscode_regist", // 未注册的手机号会注册并登录，已注册的则直接登录
+    // action: 'smscode_login',
+    ...data,
+  };
+  if (["吉柿果"].includes(appName)) {
+    params.operator_id = "061aa081306a455da811639160763190";
+  }
   return request({
     url: type === "adg" ? ADG_SERVICE : ACCOUNT_SERVICE,
     method: "POST",
-    data: {
-      action: "smscode_regist", // 未注册的手机号会注册并登录，已注册的则直接登录
-      // action: 'smscode_login',
-      ...data,
-    },
+    data: params,
   });
 };
 
 // 账号密码登录的方式
 export const accountLogin = (data, type) => {
+  const params = {
+    action: "account_login",
+    ...data,
+  };
+  if (["吉柿果"].includes(appName)) {
+    params.operator_id = "061aa081306a455da811639160763190";
+  }
   return request({
     url: type === "adg" ? ADG_SERVICE : ACCOUNT_SERVICE,
     method: "POST",
-    data: {
-      action: "account_login",
-      ...data,
-    },
+    data: params,
   });
 };
 
@@ -790,8 +809,23 @@ export const getDeviceStatusReportHistory = async (data) => {
 // 获取公寓token
 export const switchToken = async (params) => {
   return request({
-    url: `${APARTMENT_SERVICE}/switch_token`,
-    method: "GET",
+    url: `${APARTMENT_SERVICE}/house/account/login`,
+    method: "POST",
+    data: params,
+  });
+};
+// 获取用户类型-用于切换角色
+export const getHouseType = async () => {
+  return request({
+    url: `${APARTMENT_SERVICE}/house/account/getType`,
+    method: 'GET',
+  });
+};
+// 通过用户类型登录
+export const loginByType = async (id, params) => {
+  return request({
+    url: `${APARTMENT_SERVICE}/house/account/loginByType?userType=${id}`,
+    method: 'POST',
     data: params,
   });
 };

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

@@ -1,13 +1,13 @@
-import React, {useEffect, useRef, useState} from 'react';
-import {Text, View, TouchableHighlight} from 'react-native';
-import styles from './styles';
-import useLatest from '../../../hooks/useLatest';
+import React, { useEffect, useRef, useState } from "react";
+import { Text, View, TouchableHighlight } from "react-native";
+import styles from "./styles";
+import useLatest from "../../../hooks/useLatest";
 
-import {Divider} from '@rneui/themed';
+import { Divider } from "@rneui/themed";
 
 let timer = null;
 
-const BaseDialog = ({modelRef, setModalVisible, type}) => {
+const BaseDialog = ({ modelRef, setModalVisible, type }) => {
   // confirm组件和custom组件
 
   // confirm组件component传string
@@ -18,6 +18,7 @@ const BaseDialog = ({modelRef, setModalVisible, type}) => {
       console.log(111, value)
     },
     confirmButtonStyle: {},        (右边按钮样式)可选
+    cancelButtonStyle: {},         (左边按钮样式)可选
     cancelButtonText: string,      (左边按钮文字)可选
     cancelCallback: () => {},      (左边触发事件)可选
     title: string,                 (标题)可选
@@ -48,7 +49,7 @@ const BaseDialog = ({modelRef, setModalVisible, type}) => {
   }, []);
 
   const autoClose =
-    typeof modelRef?.autoClose === 'undefined' ? true : modelRef?.autoClose;
+    typeof modelRef?.autoClose === "undefined" ? true : modelRef?.autoClose;
 
   // modelRef?.content;
   const component = useRef(modelRef?.component);
@@ -70,9 +71,10 @@ const BaseDialog = ({modelRef, setModalVisible, type}) => {
       style={{
         ...styles.contentView,
         paddingHorizontal: 0,
-        alignItems: component.current ? 'stretch' : 'center',
+        alignItems: component.current ? "stretch" : "center",
         ...(modelRef.containerStyle || {}),
-      }}>
+      }}
+    >
       {!!modelRef?.title && (
         <View style={[styles.title, modelRef?.titleBoxStyle]}>
           <Text style={[styles.titleText, modelRef?.titleStyle]}>
@@ -81,9 +83,9 @@ const BaseDialog = ({modelRef, setModalVisible, type}) => {
         </View>
       )}
       {/* 内容区 */}
-      {typeof modelRef?.component === 'string' ? (
+      {typeof modelRef?.component === "string" ? (
         <View style={[modelRef?.contentStyle]}>
-          <Text style={[{textAlign: 'center'}, modelRef?.contentTextStyle]}>
+          <Text style={[{ textAlign: "center" }, modelRef?.contentTextStyle]}>
             {modelRef?.component}
           </Text>
         </View>
@@ -100,8 +102,9 @@ const BaseDialog = ({modelRef, setModalVisible, type}) => {
             style={[styles.cancelStyle, styles.buttonStyle]}
             onPress={() => {
               onCannel();
-            }}>
-            <Text style={styles.cancelTextStyle}>
+            }}
+          >
+            <Text style={[styles.cancelTextStyle, modelRef?.cancelButtonStyle]}>
               {modelRef?.cancelButtonText}
             </Text>
           </TouchableHighlight>
@@ -116,10 +119,11 @@ const BaseDialog = ({modelRef, setModalVisible, type}) => {
           ]}
           onPress={() => {
             onConfirm();
-          }}>
+          }}
+        >
           <Text style={[styles.confirmTextStyle, modelRef?.confirmButtonStyle]}>
             {modelRef?.confirmButtonText}
-            {modelRef?.timeout ? `(${timeCount}s)` : ''}
+            {modelRef?.timeout ? `(${timeCount}s)` : ""}
           </Text>
         </TouchableHighlight>
       </View>
@@ -127,7 +131,7 @@ const BaseDialog = ({modelRef, setModalVisible, type}) => {
   );
 };
 
-const Confirm = ({content}) => {
+const Confirm = ({ content }) => {
   return (
     <View style={styles.modalContent}>
       <Text style={styles.confirmText}>{content}</Text>
@@ -135,10 +139,10 @@ const Confirm = ({content}) => {
   );
 };
 
-const CustomComponent = ({component, modelRef}) => {
+const CustomComponent = ({ component, modelRef }) => {
   return (
     <View style={[styles.modalContent, modelRef?.contentStyle]}>
-      {typeof component === 'string' ? <Text>{component}</Text> : component}
+      {typeof component === "string" ? <Text>{component}</Text> : component}
     </View>
   );
 };

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

@@ -22,32 +22,38 @@ const Home = ({steps, active, onRef}) => {
   //const [defaultIndex,setDefaultIndex] = useState(0)
   const [pickedIndex, setPickedIndex] = useState();
   const [dataLength,setDataLength] = useState(0)
+  const columns = useRef([])
   useImperativeHandle(onRef, () => {
     return {
       show: (str,data) => {
         setDataLength(data?.payload?.columns.length||0)
         if(data?.payload?.columns.length){
+          columns.current = data?.payload?.columns || []
           setPickerTitle(data?.payload?.title)
-          setPickerData(data?.payload?.columns.map((item)=>{
-            if(data?.payload?.nameProp){
-              item.label = item[data?.payload?.nameProp]
-              item.value = item?.label;
-            }else if(typeof item !== 'object'){
+
+          setPickerData(columns.current.map((item, index) => {
+            if (data?.payload?.nameProp) {
+              return {
+                ...item,
+                label: item[data?.payload?.nameProp],
+                value: index
+              }
+            } else if(typeof item !== 'object') {
               return {
-                label:item,
-                value:item,
+                label: item,
+                value: index,
                 tag:'noNameProp'
               }
             }
-            return item})||[]);
+          }));
           // console.log(data)
           setPickedIndex(data?.payload?.defaultIndex||0)
           setPickerVisible(true);
           //////animatedStartValue.value = 0;
-         return new Promise((resolve,reject)=>{
+          return new Promise((resolve,reject)=>{
             backResult.current = (res)=>{
               if(res?.data?.tag === 'noNameProp'){
-                 res.data = res?.data.value
+                res.data = res?.data.value
               }
               resolve(res)
             }
@@ -65,31 +71,31 @@ const Home = ({steps, active, onRef}) => {
     setPickerVisible(false);
     setPickedIndex(0);
     // console.log(value);
-    const data = pickerData.find(item => {
-      return value[0] === item.value;
-    });
-    const index = pickerData.findIndex(item => {
-      return value[0] === item.value;
-    })
-    backResult.current({data,index})
+    // const data = pickerData.find(item => {
+    //   return value[0] === item.value;
+    // });
+    // const index = pickerData.findIndex(item => {
+    //   return value[0] === item.value;
+    // })
+    backResult.current({data: columns.current[value[0]],index: value[0]})
   }
   return <PickerV2
-      dataLength={dataLength}
-      pickerData={pickerData}
-      visible={visible}
-      // defaultValue={[pickerData[defaultIndex]?.value]}
-      title={pickerTitle}
-      pickedIndex={pickedIndex}
-      changePickedIndex={index => changePickedIndex(index)}
-      dealPickerCommit={item => dealPickerCommit(item)}
-      dealPickerCancel={() => {
-       ////// animatedStartValue.value = 700;
-        setPickerTitle()
-        setPickerVisible(false);
-        setPickedIndex(0);
-      }}
-      //////animatedStartValue={animatedStartValue.value}
-    />
+    dataLength={dataLength}
+    pickerData={pickerData}
+    visible={visible}
+    // defaultValue={[pickerData[defaultIndex]?.value]}
+    title={pickerTitle}
+    pickedIndex={pickedIndex}
+    changePickedIndex={index => changePickedIndex(index)}
+    dealPickerCommit={item => dealPickerCommit(item)}
+    dealPickerCancel={() => {
+      ////// animatedStartValue.value = 700;
+      setPickerTitle()
+      setPickerVisible(false);
+      setPickedIndex(0);
+    }}
+    //////animatedStartValue={animatedStartValue.value}
+  />
 };
 const styles = StyleSheet.create({});
 export default Home;

package/app/hooks/shopMessageManager.js

@@ -1,5 +1,5 @@
 import {useEffect, useCallback, useRef, useState} from 'react';
-// import {PermissionsAndroid, Platform} from 'react-native';
+import { NativeModules } from 'react-native';
 
 // import {format} from 'date-fns';
 
@@ -7,7 +7,7 @@ import storage from '../storage';
 import eventBus, {EVENTS} from '../eventBus';
 import config from '../utils/config';
 import {shopGenMsg} from '../utils/common';
-
+const appName = NativeModules?.RNToNativeEmitter?.appName;
 let connectStatus = -1; // -1 连接中  0 连接成功  1连接失败
 let tryConnectTimes = 0;
 let seq_id = 0;
@@ -92,7 +92,10 @@ const ShopMessageManager = () => {
   const connectMsgServer = async connectCallback => {
     const token = await storage.get('accessToken');
     const accountData = await storage.get('accountData');
-    const wsUrl = 'ws://192.168.36.241:9100/imchat';
+    let wsUrl = "wss://dev.ipanelcloud2.ipanel.cn:50443/s/ishopim/imchat";
+    if(["吉柿果"].includes(appName)) {
+      wsUrl = 'wss://icloud.homed.jishimedia.com:50443/s/ishopim/imchat';
+    }
     const connectParams = [
       `accesstoken=${token}`,
       `nick_name=${accountData?.user?.nickname}`,

package/app/hooks/useAddress.js

@@ -25,6 +25,7 @@ const Hook = (addressId, roomId) => {
 
   const updateAddrList = async addrList => {
     await storage.set('addressList', addrList);
+    await storage.set('ordinaryAddressList', addrList);
     setAddressList(addrList);
 
     const oldActiveAddr = await storage.get('activeAddr');
@@ -44,6 +45,7 @@ const Hook = (addressId, roomId) => {
   const updateActiveAddr = addr => {
     setActiveAddr(addr);
     storage.set('activeAddr', addr);
+    storage.set('ordinaryActiveAddr', addr);
   };
 
   const mapModel = (brand, model) => {

package/app/hooks/useAddress2.js

@@ -40,6 +40,7 @@ const Hook = () => {
 
   const updateAddrList = async addrList => {
     await storage.set('addressList', addrList);
+    await storage.set('ordinaryAddressList', addrList);
     setAddressList(addrList);
 
     const oldActiveAddr = await storage.get('activeAddr');
@@ -61,6 +62,7 @@ const Hook = () => {
   const updateActiveAddr = addr => {
     setActiveAddr(addr);
     storage.set('activeAddr', addr);
+    storage.set('ordinaryActiveAddr', addr);
   };
 
   const mapModel = (brand, model) => {
@@ -315,6 +317,7 @@ const Hook = () => {
       });
       addrList = addrInfoRes?.result?.address_list || [];
       await storage.set('addressList', addrList);
+      await storage.set('ordinaryAddressList', addrList);
       const newActiveAddr = addrList.find(
         addr => oldActiveAddr && addr.address_id === oldActiveAddr.address_id,
       );
@@ -324,6 +327,7 @@ const Hook = () => {
         actualActiveAddr = addrList[0];
       }
       await storage.set('activeAddr', actualActiveAddr || {});
+      await storage.set('ordinaryActiveAddr', actualActiveAddr || {});
     }
 
     // 获取家庭下房间列表
@@ -554,6 +558,7 @@ const Hook = () => {
       };
     });
     await storage.set('addressList', newAddrList);
+    await storage.set('ordinaryAddressList', newAddrList);
     global.base.addressRoomMap = newAddressRoomMap;
     global.base.roomDeviceMap = newRoomDeviceMap;
     setAddressList(newAddrList);