ipanel-rnapp-ajb-base 1.0.12 → 1.0.14

package/app/eventBus/index.js

@@ -50,5 +50,6 @@ export const EVENTS = {
     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/shopMessageManager.js

@@ -12,23 +12,27 @@ let connectStatus = -1; // -1 连接中  0 连接成功  1连接失败
 let tryConnectTimes = 0;
 let seq_id = 0;
 
+// let customer_id = ''; // imchat的user_uid
+
+// const ishopcs = 'http://192.168.36.241:9101';
+
 /**
  * 商城客服中心JS
  */
 
 // 消息记录
-storage.get('shopMessageList').then(msgList => {
-  if (typeof msgList === 'string') {
-    try {
-      msgList = JSON.parse(msgList);
-    } catch (e) {
-      console.log('msgList error', e, msgList);
-      msgList = [];
-    }
-  }
-  // console.log(msgList, '商城客服消息列表msgList');
-  global.base.shopMessageManager.messages = msgList || [];
-});
+// storage.get('shopMessageList').then(msgList => {
+//   if (typeof msgList === 'string') {
+//     try {
+//       msgList = JSON.parse(msgList);
+//     } catch (e) {
+//       console.log('msgList error', e, msgList);
+//       msgList = [];
+//     }
+//   }
+//   // console.log(msgList, '商城客服消息列表msgList');
+//   global.base.shopMessageManager.messages = msgList || [];
+// });
 
 // 当前是否处于智能客服转人工
 // let isManualCustomServiceActive = false;
@@ -60,6 +64,27 @@ const ShopMessageManager = () => {
     }
   }, []);
 
+  // 获取im本人user_id
+  const getUserUid = () => {
+    let proto = {
+      id: seq_id,
+      type: 1000, // 1000 request 2000 response
+      ecode: 0,
+      emessage: '',
+      route: 'user_uid',
+      data: '',
+    };
+    sendShopImMessage(proto);
+  };
+
+  // 发送im消息，传参直接发
+  const sendShopImMessage = useCallback(params => {
+    console.log('发送im消息，传参直接发');
+    if (ws.current) {
+      ws.current.send(JSON.stringify(params));
+    }
+  }, []);
+
   // 发送消息
   const sendMessage = useCallback(msg => {
     if (ws.current) {
@@ -82,7 +107,7 @@ const ShopMessageManager = () => {
       `user_id=${accountData?.user?.user_id}`,
       'platform=web',
       'api=ipanel_test',
-      `source=${'dev.ipanelcloud2.ipanel.cn' || config.IPANEL_CLOUD_DOMAIN}`,
+      `source=${config.IPANEL_CLOUD_DOMAIN}`,
     ];
 
     // 缓存全局商城客服websocket连接
@@ -96,9 +121,11 @@ const ShopMessageManager = () => {
       connectCallback && connectCallback(null); // success
       connectStatus = 0;
       eventBus.emit(EVENTS.SHOPMESSAGE.CONNECT_STATUS_CHANGE, connectStatus);
+      getUserUid();
     };
     ws.current.onmessage = ({data}) => {
       const msgData = JSON.parse(data);
+      console.log('msgDatamessage', msgData);
       // 2000是接收自己发的消息
       if (msgData.type === 1000) {
         const msg = JSON.parse(msgData?.data);
@@ -112,6 +139,26 @@ const ShopMessageManager = () => {
         // 获取在线用户
         const msg = JSON.parse(msgData?.data);
         eventBus.emit(EVENTS.SHOPMESSAGE.ONLINE_LIST, msg);
+      } else if (msgData.type === 2000 && msgData.route === 'user_uid') {
+        // 获取user_id
+        // customer_id = msgData?.data;
+        if (msgData?.data) {
+          storage.set('shopImData', {
+            customer_id: msgData?.data,
+          });
+        }
+      } else if (
+        msgData.type === 2000 &&
+        (msgData.route === 'message_list_history' ||
+          msgData.route === 'message_list_new')
+      ) {
+        if (msgData?.data) {
+          const msgList = JSON.parse(msgData?.data);
+          global.base.shopMessageManager.messages =
+            msgList?.list || msgList || [];
+          let list = msgList?.list || msgList || [];
+          eventBus.emit(EVENTS.SHOPMESSAGE.HISTORY_MESSAGE_LIST, list);
+        }
       }
     };
     ws.current.onerror = err => {
@@ -216,13 +263,13 @@ const ShopMessageManager = () => {
       msg.CreateTime = new Date().getTime();
       console.log(msg, '商城客服msg');
       // console.log(global.base.shopMessageManager.messages, '22');
-      global.base.shopMessageManager.messages.push(msg);
+      // global.base.shopMessageManager.messages.push(msg);
 
       // // save to local 存到本地
-      storage.set(
-        'shopMessageList',
-        global.base.shopMessageManager.messages.slice(-100),
-      );
+      // storage.set(
+      //   'shopMessageList',
+      //   global.base.shopMessageManager.messages.slice(-100),
+      // );
       // storage.remove('shopMessageList');
 
       eventBus.emit(EVENTS.SHOPMESSAGE.RENDER, msg);
@@ -293,6 +340,7 @@ const ShopMessageManager = () => {
 
   return {
     sendMessage,
+    sendShopImMessage,
     getOnlineUser,
     // requestShopManualCustomService,
     // exitShopManualCustomService,

package/app/screens/BaseScreen.js

@@ -167,7 +167,9 @@ function HomeTabScreen({navigation, route}) {
       });
     } else {
       // 单业务包开发调试环境
-      const component = await global.base.getRemoteComponentByName('__BASE_SINGLETON_MODE_APP__');
+      const component = await global.base.getRemoteComponentByName(
+        '__BASE_SINGLETON_MODE_APP__',
+      );
       typeof component?.registerStackScreens === 'function' &&
         component.registerStackScreens();
       tabs = [
@@ -293,11 +295,16 @@ function HomeTabScreen({navigation, route}) {
     getManualCustomServiceActiveFlag;
 
   // 商城客服
-  const {handleShopTextSubmit, handleShopMediaSelect, getOnlineUser} =
-    ShopMessageManager();
+  const {
+    handleShopTextSubmit,
+    handleShopMediaSelect,
+    getOnlineUser,
+    sendShopImMessage,
+  } = ShopMessageManager();
   global.base.shopMessageManager.handleShopTextSubmit = handleShopTextSubmit;
   global.base.shopMessageManager.handleShopMediaSelect = handleShopMediaSelect;
   global.base.shopMessageManager.getOnlineUser = getOnlineUser;
+  global.base.shopMessageManager.sendShopImMessage = sendShopImMessage;
   const renderCustomTabBar = props => {
     return <CustomTabBar {...props} />;
   };

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

@@ -95,7 +95,35 @@ export default class ScanQRCode extends Component {
     //扫码后的操作
     if (data) {
       const routes = getState().routes;
-      if (routes[routes.length - 2]) {
+      if (data.includes('action=redirect')) {
+        /**
+         *  action=redirect  重定向APP页面
+            mop=ipanel  operatorId（模块运营商，未来有可能废弃）
+            m=shop 商城模块
+            s=detail  screenName
+            a/b/c 传给商城模块的参数
+         */
+        const querys = data.substring(data.indexOf('?') + 1).split('&');
+        const params = {};
+        for (let i = 0; i < querys.length; i++) {
+          const temp = querys[i].split('=');
+          if (temp.length < 2) {
+            params[temp[0]] = '';
+          } else {
+            params[temp[0]] = temp[1];
+          }
+        }
+        if (params.s) {
+          navigate({
+            name: params.s,
+            params,
+            merge: true,
+          });
+          this.setState({
+            scanDone: true,
+          });
+        }
+      } else if (routes[routes.length - 2]) {
         navigate({
           name: sourceRouteName || routes[routes.length - 2].name,
           params: {
@@ -148,7 +176,35 @@ export default class ScanQRCode extends Component {
       //扫码后的操作
       if (data) {
         const routes = getState().routes;
-        if (routes[routes.length - 2]) {
+        if (data.includes('action=redirect')) {
+          /**
+           *  action=redirect  重定向APP页面
+              mop=ipanel  operatorId（模块运营商，未来有可能废弃）
+              m=shop 商城模块
+              s=detail  screenName
+              a/b/c 传给商城模块的参数
+           */
+          const querys = data.substring(data.indexOf('?') + 1).split('&');
+          const params = {};
+          for (let i = 0; i < querys.length; i++) {
+            const temp = querys[i].split('=');
+            if (temp.length < 2) {
+              params[temp[0]] = '';
+            } else {
+              params[temp[0]] = temp[1];
+            }
+          }
+          if (params.s) {
+            navigate({
+              name: params.s,
+              params,
+              merge: true,
+            });
+            this.setState({
+              scanDone: true,
+            });
+          }
+        } else if (routes[routes.length - 2]) {
           navigate({
             name: sourceRouteName || routes[routes.length - 2].name,
             params: {
@@ -262,7 +318,7 @@ export default class ScanQRCode extends Component {
                     }}
                     resizeMode="contain"
                   />
-                  
+
                   <Text style={styles.albumText}>相册</Text>
                 </TouchableOpacity>
               </View>

package/app/screens/LoginScreen/OpenLogSheet.js

@@ -6,6 +6,7 @@ import {
   Text,
   NativeModules,
   FlatList,
+  Platform,
 } from 'react-native';
 import {Divider} from '@rneui/themed';
 const {px} = global.base;
@@ -29,7 +30,11 @@ export default ({setVisible}) => {
           global.toast.showToast('设置成功');
           setVisible(false);
         } else {
-          if (res === 1) {
+          // ios 值为1或者2为在线日志，安卓值为1为在线日志
+          if (
+            (Platform.OS === 'ios' && (res === 1 || res === 2)) ||
+            res === 1
+          ) {
             onOpen(1);
           } else {
             onOpen(2);

package/app/utils/common.js

@@ -256,7 +256,6 @@ async function shopGenMsg(
       client_msg_id: client_msg_id,
       server_msg_id: 0,
       conversation_id, // 会话
-      sender_id: accountData?.user?.user_id, // 802eed8f01b14c1d90a9112787ddaf49
       recver_id, // 接收消息的人
       nick_name: accountData?.user?.nickname, // 发送方  zhanghaoyy
       face_url: accountData?.user?.icon_url

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ipanel-rnapp-ajb-base",
-  "version": "1.0.12",
-  "ipanelVersion": "1.0.300",
+  "version": "1.0.14",
+  "ipanelVersion": "1.0.308",
   "description": "",
   "main": "index.js",
   "bin": {