ipanel-rnapp-ajb-base 1.0.15 → 1.0.17

package/app/App.js

@@ -35,6 +35,7 @@ import Loading from './components/common/Loading';
 import Toast from './components/common/Toast';
 import Dialog from './components/common/Dialog';
 import Notify from './components/common/Notify';
+// import SheetManage from './components/common/SheetManage';
 import storage from './storage';
 
 import {navigationRef} from './utils/RootNavigation';
@@ -439,6 +440,7 @@ const App = () => {
         <Toast onRef={ref => (global.toast = ref)} />
         <Notify onRef={ref => (global.notify = ref)} />
         <Dialog onRef={ref => (global.dialog = ref)} />
+          {/* <SheetManage onRef={ref => (global.sheetManager = ref)} /> */}
         {versionUpdateConfirmVisible && (
           <VersionUpdateConfirm
             onVisibleChange={setVersionUpdateConfirmVisible}

package/app/api/ipanelCloudApi.js

@@ -666,7 +666,7 @@ export const getAddressUser = data => {
 
 export const getCloudInfo = async data => {
   return homedHttp({
-    url: `http://izone.${await global.base.getHomedDomain()}/account/cloud/get_info`,
+    url: `http://izone.${appName === '禺乐慧家' ? await global.base.getHomedDomain() : 'homed.tv'}/account/cloud/get_info`,
     method: 'GET',
     data,
   });
@@ -674,7 +674,7 @@ export const getCloudInfo = async data => {
 
 export const getCloudFileList = async data => {
   return homedHttp({
-    url: `http://izone.${await global.base.getHomedDomain()}/account/cloud/file/get_list`,
+    url: `http://izone.${appName === '禺乐慧家' ? await global.base.getHomedDomain() : 'homed.tv'}/account/cloud/file/get_list`,
     method: 'GET',
     data,
   });
@@ -682,7 +682,7 @@ export const getCloudFileList = async data => {
 
 export const openCloudService = async data => {
   return homedHttp({
-    url: `http://izone.${await global.base.getHomedDomain()}/account/cloud/open`,
+    url: `http://izone.${appName === '禺乐慧家' ? await global.base.getHomedDomain() : 'homed.tv'}/account/cloud/open`,
     method: 'POST',
     data,
   });
@@ -690,7 +690,7 @@ export const openCloudService = async data => {
 
 export const deleteCloudFile = async data => {
   return homedHttp({
-    url: `http://izone.${await global.base.getHomedDomain()}/account/cloud/file/delete`,
+    url: `http://izone.${appName === '禺乐慧家' ? await global.base.getHomedDomain() : 'homed.tv'}/account/cloud/file/delete`,
     method: 'POST',
     data,
   });

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

@@ -1,11 +1,15 @@
-import React,{useState} from 'react';
+import React,{useEffect, useState} from 'react';
 import {View, Text, StyleSheet} from 'react-native';
 import Picker from '../PickerV2Base/picker';
 import px from '../../../utils/scaleSize';
+// import {
+//   useAnimatedStyle,
+//   withSpring,
+// } from 'react-native-reanimated';
 const pickerStyles = {
-okView:{borderLeftColor:'#F0F0F0',borderLeftWidth:1},  
+okView:{borderLeftColor:'#F0F0F0',borderLeftWidth:1},
 okText: {color: '#E86003',width:px(500)}, 
-dismissText: {color: '#666666',width:px(500),},
+dismissText: {color: '#666',width:px(500),},
 container:{borderTopLeftRadius:px(20),borderTopRightRadius:px(20)},
 wrappper:{borderTopLeftRadius:px(20),borderTopRightRadius:px(20)},
 headerItem:{flex:0},
@@ -16,9 +20,23 @@ header:{
   backgroundColor: '#fff' 
 },
 maskMiddle:{borderColor:'transparent'},
+ titleBox:{
+  width:'100%',
+  height:px(205),
+  backgroundColor:'#fff',
+  top:px(15),
+  borderTopRightRadius:px(20),borderTopLeftRadius:px(20)
+ },
+ titleContent:{
+  width:'100%',height:px(190),borderBottomColor:'#f0f0f0',borderBottomWidth:1
+ },
+ titleText:{
+  fontSize:px(48),color:'#333',textAlign:'center',lineHeight:px(190)
+ }
 }
 const pickerStyle = {height:px(700)}
 
+
 const PickerV2 = ({
     renderMaskTop=()=>{return <View></View>},
     renderMaskBottom=()=>{return <View></View>},
@@ -32,8 +50,28 @@ const PickerV2 = ({
     renderItem,
     defaultValue = [],
     pickedIndex=0,
-    changePickedIndex=()=>{}
+    changePickedIndex=()=>{},
+    animatedStartValue,
+    animationEffects = {},
+    title
 }) => {
+  
+
+  // console.log(title)
+  // const customSpringStyles = useAnimatedStyle(() => {
+  //   return {
+  //     transform: [
+  //       {
+  //         translateY: withSpring(animatedStartValue, {...{
+  //           damping: 20,
+  //           stiffness: 100,
+  //           mass:0.5
+  //         },...animationEffects}),
+  //       },
+  //     ],
+  //   };
+  // });
+
   // console.log(defaultValue)
   const handlePickerChange=(item)=>{
     // console.log(item)
@@ -44,12 +82,14 @@ const PickerV2 = ({
       changePickedIndex(index)
   }
   const handlePikerCommit = (item) => {
+    // console.log(item)
     dealPickerCommit(item)
   } 
   const handlePickerCancel = () => {
     dealPickerCancel()
   }
   const renderLabel = (item, index) => {
+    // console.log(item)
     return (
       <Text
         key={index}
@@ -58,7 +98,7 @@ const PickerV2 = ({
             {fontSize: px(50),color:Math.abs(index-pickedIndex)===1?'#999':'#eee'},
         ]}
         >
-        {item.value}
+        {item.label}
       </Text>
     );
   };
@@ -67,6 +107,7 @@ const PickerV2 = ({
       <Picker
         data={pickerData}
         visible={visible}
+        title={title}
         renderMaskTop={renderMaskTop}
         renderMaskBottom={renderMaskBottom}
         styles={{...pickerStyles,...styles}}
@@ -78,6 +119,7 @@ const PickerV2 = ({
         onOk={handlePikerCommit}
         onDismiss={handlePickerCancel}
         onClose={handlePickerCancel}
+        customSpringStyles={typeof animatedStartValue !== 'undefined'?customSpringStyles:{}}
         >
         </Picker>
     </View>

package/app/components/common/PickerV2Base/picker/Picker.tsx

@@ -10,7 +10,7 @@ import React, {
 } from 'react'
 import { Omit } from 'utility-types'
 
-import { Keyboard } from 'react-native'
+import { Keyboard,View,Text } from 'react-native'
 import { getComponentLocale } from '../_util/getLocale'
 import DisabledContext from '../config-provider/DisabledContext'
 import { LocaleContext } from '../locale-provider'
@@ -35,6 +35,7 @@ export interface RMCPickerProps
   innerValue: PickerValue[]
   columns: PickerColumn[]
   handleSelect: (value: PickerValue, index: number) => void
+  customSpringStyles?:any
 }
 
 const RMCPicker = forwardRef<PickerRef, RMCPickerProps>((props, ref) => {
@@ -59,6 +60,7 @@ const RMCPicker = forwardRef<PickerRef, RMCPickerProps>((props, ref) => {
     innerValue,
     columns,
     handleSelect,
+    customSpringStyles,
     ...restProps
   } = props
 
@@ -177,22 +179,29 @@ const RMCPicker = forwardRef<PickerRef, RMCPickerProps>((props, ref) => {
     styles: props.styles,
     themeStyles: PickerStyles,
   })
+  // console.log(props.styles)
 
   return (
     <>
       <PopupPicker
         styles={styles}
         visible={innerVisible}
-        title={title}
         okText={okText || _locale.okText}
         onOk={handleOk}
         dismissText={dismissText || _locale.dismissText}
         onDismiss={handleDismiss}
         onClose={actions.close}
         okButtonProps={okButtonProps}
-        dismissButtonProps={dismissButtonProps}>
+        dismissButtonProps={dismissButtonProps}
+        customSpringStyles={customSpringStyles}
+        >
         {/* TODO: 组件卸载是在visible更新fasle之后,需要前置 */}
         {/* 否则会无效执行onPickerChange */}
+        {typeof title !== 'undefined'&&<View style={props.styles.titleBox}>
+        <View style={props.styles.titleContent}>
+           <Text style={props.styles.titleText}>{title}</Text>
+        </View>
+        </View>}
         {innerVisible && (
           <RMCPickerView
             {...restProps}

package/app/components/common/PickerV2Base/picker/Popup.tsx

@@ -2,6 +2,7 @@ import React, { memo } from 'react'
 import { Text, TouchableHighlight, View,Modal,TouchableOpacity } from 'react-native'
 // import Modal from '../modal/ModalView'
 import { PopupPickerProps } from './PopupPickerTypes'
+import Animated from 'react-native-reanimated';
 
 const PopupPicker = memo((props: PopupPickerProps) => {
   const {
@@ -14,6 +15,7 @@ const PopupPicker = memo((props: PopupPickerProps) => {
     onOk,
     onClose,
     children,
+    customSpringStyles={},
   } = props
 
   const titleEl =
@@ -49,7 +51,7 @@ const PopupPicker = memo((props: PopupPickerProps) => {
         style={[{position:'absolute',top:0,left:0,right:0,bottom:0,zIndex:999},styles.maskColor]}
         onPress={onClose}
         ></TouchableOpacity>
-        <View style={{position:'absolute',left:0,right:0,bottom:0,zIndex:1000}}>
+        <Animated.View style={[{position:'absolute',left:0,right:0,bottom:0,zIndex:1000},customSpringStyles]}>
         {children}
       <View style={[styles.header]}>
         <TouchableHighlight
@@ -70,7 +72,7 @@ const PopupPicker = memo((props: PopupPickerProps) => {
           {okEl}
         </TouchableHighlight>
       </View>
-        </View>
+        </Animated.View>
     </Modal>
   )
 })

package/app/components/common/PickerV2Base/picker/PopupPickerTypes.tsx

@@ -13,4 +13,5 @@ export type PopupPickerProps = {
   dismissButtonProps?: TouchableHighlightProps
   children?: ReactNode
   styles: any
+  customSpringStyles?:any
 }

package/app/components/common/PickerV2Base/picker/style/index.tsx

@@ -12,6 +12,9 @@ export interface PickerStyle {
   maskColor:ViewStyle
   okView:ViewStyle
   dismissView:ViewStyle
+  titleBox:ViewStyle
+  titleContent:ViewStyle
+  titleText:TextStyle
 }
 
 export default () =>
@@ -53,5 +56,8 @@ export default () =>
     },
     maskColor:{
      backgroundColor: 'rgba(0,0,0,.6)' 
-    }
+    },
+     titleBox:{},
+     titleContent:{},
+     titleText:{}
   })

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

@@ -0,0 +1,82 @@
+import React from 'react';
+import { View, Text, StyleSheet } from 'react-native';
+
+const Home = () => {
+return <View><Text>Home</Text></View>
+}
+const styles = StyleSheet.create({});
+export default Home;
+
+
+// import React,{useState,useImperativeHandle,useRef} from 'react';
+// import {View, Text, StyleSheet} from 'react-native';
+// import PickerV2 from '../PickerV2';
+// import {useSharedValue} from 'react-native-reanimated';
+
+// const Home = ({steps, active, onRef}) => {
+//   let backResult = useRef()
+//   const animatedStartValue = useSharedValue(700);
+//   const [visible, setPickerVisible] = useState(false);
+//   const [pickerData, setPickerData] = useState([]);
+//   const [pickerTitle,setPickerTitle] = useState()
+//   const [defaultIndex,setDefaultIndex] = useState(0)
+//   const [pickedIndex, setPickedIndex] = useState(() => {
+//     return defaultIndex;
+//   });
+//   useImperativeHandle(onRef, () => {
+//     return {
+//       show: (str,data) => {
+//         if(data?.payload?.columns.length){
+//           setPickerTitle(data?.payload?.title)
+//           setPickerData(data?.payload?.columns.map(item=>{
+//             item.label = item[data?.payload?.nameProp]
+//             item.value = item?.label;
+//             return item})||[]);
+//           // console.log(data)
+//           setPickerVisible(true);
+//           animatedStartValue.value = 0;
+//          return new Promise((resolve,reject)=>{
+//             backResult.current = (res)=>{
+//               resolve(res)
+//             }
+//           })
+//         }
+//       },
+//     };
+//   });
+//   const changePickedIndex = index => {
+//     setPickedIndex(index);
+//   };
+//   const dealPickerCommit = (value) =>{
+//     animatedStartValue.value = 700;
+//     setPickerTitle()
+//     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})
+//   }
+//   return <PickerV2
+//       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/components/index.js

@@ -6,5 +6,5 @@ export ActionPicker from './common/ActionPicker';
 export ScreenBackHeader from './common/ScreenBackHeader';
 export CustomDialog from './common/CustomDialog';
 export OnceTouchable from './common/OnceTouchable';
-export PickerV2 from './common/PickerV2';
-export PickerV1 from "./common/PickerV1";
+// export PickerV2 from './common/PickerV2';
+// export PickerV1 from "./common/PickerV1";

package/app/hooks/shopMessageManager.js

@@ -34,13 +34,6 @@ let seq_id = 0;
 //   global.base.shopMessageManager.messages = msgList || [];
 // });
 
-// 当前是否处于智能客服转人工
-// let isManualCustomServiceActive = false;
-// // 当前人工客服
-// let currentCustomStaff = {};
-// // 用户长时间没有发送消息后自动退出转人工的定时器
-// let manualCustomServiceTimer;
-
 // TODO 定期轮询检查消息过期
 
 const ShopMessageManager = () => {
@@ -111,17 +104,18 @@ const ShopMessageManager = () => {
     ];
 
     // 缓存全局商城客服websocket连接
-    global.shopMessageWebsocketRef = ws;
     global.base.shopMessageManager.wsRef = ws;
+    global.base.shopMessageManager.connectMsgServer = connectMsgServer;
+    global.base.shopMessageManager.closeMsgConnection = closeMsgConnection;
     ws.current = new WebSocket(
       encodeURI(`${wsUrl}?${connectParams.join('&')}`),
     );
     ws.current.onopen = () => {
       console.log('商城客服已连接ws shop open');
-      connectCallback && connectCallback(null); // success
       connectStatus = 0;
       eventBus.emit(EVENTS.SHOPMESSAGE.CONNECT_STATUS_CHANGE, connectStatus);
       getUserUid();
+      connectCallback && connectCallback(null); // success
     };
     ws.current.onmessage = ({data}) => {
       const msgData = JSON.parse(data);
@@ -162,14 +156,29 @@ const ShopMessageManager = () => {
       }
     };
     ws.current.onerror = err => {
-      console.log('onerror', err);
+      console.log('shopMessageManager ws onerror', err);
+      connectStatus = 1;
+      eventBus.emit(EVENTS.SHOPMESSAGE.CONNECT_STATUS_CHANGE, connectStatus);
     };
     ws.current.onclose = event => {
-      console.log('onclose', event);
+      console.log('shopMessageManager ws onclose', event);
+      global.base.shopMessageManager.wsRef.current = null;
+      connectStatus = 1;
+      eventBus.emit(EVENTS.SHOPMESSAGE.CONNECT_STATUS_CHANGE, connectStatus);
       reConnect(connectCallback);
     };
   };
 
+  const closeMsgConnection = () => {
+    console.log('shopMessageManager closeMsgConnection');
+
+    // 正常主动关闭连接，重置重连次数
+    tryConnectTimes = 5;
+
+    global.base.shopMessageManager.wsRef.current &&
+      global.base.shopMessageManager.wsRef.current.close();
+  };
+
   const reConnect = async callback => {
     if (tryConnectTimes < 5) {
       // 重连ws
@@ -184,75 +193,6 @@ const ShopMessageManager = () => {
     }
   };
 
-  // const [onlineUser, setOnlineUser] = useState([]); // 在线用户列表
-  // const nameRef = useRef('');
-  // // 请求到客服列表的回调
-  // const handleGetOnlineUserList = async data => {
-  //   if (isManualCustomServiceActive) {
-  //     return;
-  //   }
-  //   const accountData = await storage.get('accountData');
-  //   console.log('handleGetOnlineUserList', data);
-  //   let dataList = data?.list.filter(val => {
-  //     return val.nick_name !== nameRef.current;
-  //   });
-  //   // // console.log(dataList, nameRef.current);
-  //   setOnlineUser(dataList);
-
-  //   if (dataList.length === 0) {
-  //     global.toast.showToast('当前没有人工客服在线，请稍候再试！');
-  //     return;
-  //   }
-
-  //   console.log('当前商城客服列表：', dataList);
-  //   // 分配一个人工客服
-  //   currentCustomStaff =
-  //     dataList.find(user => user.nick_name === '壮壮') || dataList[0];
-  //   console.log('已分配商城智能客服人工客服：', currentCustomStaff.nick_name);
-
-  //   // 设置当前处于人工客服的标志
-  //   isManualCustomServiceActive = true;
-  //   eventBus.emit(EVENTS.SHOPMESSAGE.CUSTOM_SERVICE_CONNECT_CHANGE, true);
-
-  //   // 显示消息
-  //   handleShopTextSubmit(
-  //     `您好，客服“${currentCustomStaff.nick_name}”为您服务！`,
-  //     currentCustomStaff?.user_id,
-  //     `${accountData.user?.user_id}-${currentCustomStaff.user_id}-shop`,
-  //   );
-
-  //   resetManualCustomServiceExitTimer();
-  // };
-  // const resetManualCustomServiceExitTimer = () => {
-  //   // 10分钟没发消息后自动退出人工
-  //   clearTimeout(manualCustomServiceTimer);
-  //   manualCustomServiceTimer = setTimeout(() => {
-  //     exitShopManualCustomService(true);
-  //   }, 600000);
-  // };
-  // // 请求转人工
-  // const requestShopManualCustomService = async () => {
-  //   const user = await storage.get('accountData');
-  //   nameRef.current = user.user?.nickname;
-  //   // 发送获取客服列表消息，在EVENTS.SHOPMESSAGE.ONLINE_LIST事件回调中处理获取到的客服列表数据
-  //   getOnlineUser();
-  // };
-  // const exitShopManualCustomService = async timeout => {
-  //   isManualCustomServiceActive = false;
-  //   eventBus.emit(EVENTS.SHOPMESSAGE.CUSTOM_SERVICE_CONNECT_CHANGE, false);
-  //   console.log('退出商城智能客服人工客服');
-
-  //   // 显示消息
-  //   const accountData = await storage.get('accountData');
-  //   handleShopTextSubmit(
-  //     timeout
-  //       ? '您已经很长时间没说话了，已自动退出人工客服，如有需要请再次联系'
-  //       : '您已退出人工客服。',
-  //     currentCustomStaff?.user_id,
-  //     `${accountData.user?.user_id}-${currentCustomStaff.user_id}-shop`,
-  //   );
-  // };
-
   useEffect(() => {
     const onMessageAdd = msg => {
       msg.MsgId =
@@ -335,18 +275,15 @@ const ShopMessageManager = () => {
     [],
   );
 
-  // const getShopManualCustomServiceActiveFlag = () =>
-  //   isManualCustomServiceActive;
+  const getConnectStatus = () => connectStatus;
 
   return {
     sendMessage,
     sendShopImMessage,
     getOnlineUser,
-    // requestShopManualCustomService,
-    // exitShopManualCustomService,
-    // getShopManualCustomServiceActiveFlag,
     handleShopTextSubmit,
     handleShopMediaSelect,
+    getConnectStatus,
   };
 };
 

package/app/screens/BaseScreen.js

@@ -300,11 +300,13 @@ function HomeTabScreen({navigation, route}) {
     handleShopMediaSelect,
     getOnlineUser,
     sendShopImMessage,
+    getConnectStatus,
   } = ShopMessageManager();
   global.base.shopMessageManager.handleShopTextSubmit = handleShopTextSubmit;
   global.base.shopMessageManager.handleShopMediaSelect = handleShopMediaSelect;
   global.base.shopMessageManager.getOnlineUser = getOnlineUser;
   global.base.shopMessageManager.sendShopImMessage = sendShopImMessage;
+  global.base.shopMessageManager.getConnectStatus = getConnectStatus;
   const renderCustomTabBar = props => {
     return <CustomTabBar {...props} />;
   };

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

@@ -7,7 +7,7 @@ import {
   Modal,
   FlatList,
   TouchableOpacity,
-  Platform,
+  Platform, NativeModules,
 } from 'react-native';
 import {CheckBox, Icon, Text} from '@rneui/themed';
 import {
@@ -24,6 +24,8 @@ import {showLoading, hideLoading} from '../../../utils/notice';
 
 const {storage} = global.base;
 
+const appName = NativeModules?.RNToNativeEmitter?.appName;
+
 function TvAlbumScreen() {
   const [cloudInfo, setCloudInfo] = useState({});
   const [cloudServiceOpened, setCloudServiceOpened] = useState(true);
@@ -46,7 +48,7 @@ function TvAlbumScreen() {
 
   useEffect(() => {
     (async () => {
-      domain.current = await global.base.getHomedDomain();
+      domain.current = appName === '禺乐慧家' ? await global.base.getHomedDomain() : 'homed.tv';
       await getToken();
       checkCloudService();
     })();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ipanel-rnapp-ajb-base",
-  "version": "1.0.15",
-  "ipanelVersion": "1.0.309",
+  "version": "1.0.17",
+  "ipanelVersion": "1.0.321",
   "description": "",
   "main": "index.js",
   "bin": {