Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

config/dev.js

     // WSS_HOST: '"wss://dev.pawoma.cn"',
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
-    HOST: '"https://lt.pawoma.cn"',
-    WSS_HOST: '"wss://lt.pawoma.cn"',
-    // HOST: '"http://127.0.0.1:8080"',
-    // WSS_HOST: '"ws://127.0.0.1:8080"',
+    // HOST: '"https://lt.pawoma.cn"',
+    // WSS_HOST: '"wss://lt.pawoma.cn"',
+    HOST: '"http://127.0.0.1:8080"',
+    WSS_HOST: '"ws://127.0.0.1:8080"',
     Version: 'V3.5.9'
   },
   weapp: {},

project.config.json

 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
 	"description": "知与行联调",
-	"appid": "wxd6f47a9bb3052175",
+	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/app.js

             const { unReadNum } = info
             store.dispatch({ type: ASSIGN_UNREADNUM, payload: { unReadNum } });
             socket.createSocket({ id: personId });
-            socket.wss.onMessage(data => {
+            socket.onMessage(data => {
               store.dispatch({ type: INCREASE_UNREADNUM })
             })
           })

src/pages/im/index.js

   }
 
   originList = []
+
+  unSubscribeMessage = () => {}
+
   componentWillMount() {
     savePoint({
       event: 'detail',
       })
       console.log('在线咨询')
     })
+
+    this.unSubscribeMessage = () => {}
   }
 
   componentDidMount() {
         });
       })
 
-      socket.wss.onMessage(res => {
+      this.unSubscribeMessage = socket.onMessage(res => {
         const data = JSON.parse(res.data)
 
         console.log('receive message ==>', data)
         } else {
           this.handlerRecive(data)
         }
-      })
+      }, true)
     })
   }
 
     // socket.closeSocket()
     const { recordId } = this.state
     recordId && updatePoint(recordId)
+    this.unSubscribeMessage()
   }
 
   sendCardMsg = () => {

src/utils/im.js

     this.lockReconnect = false
     this.limit = 12
     this.selfClose = false
+    this.timeTicker = undefined
+    this.messageListeners = []
+    this.imMessageListener = undefined
   }
 
   reconnect() {
       success && success(res)
     })
 
+    this.wss.onMessage((data) => {
+      if (data.data === 'ping') {
+        this.wss.send({ data: 'pong'  })
+      } else if (data.data === 'pong') {
+        console.log('[websocket]: 接收心跳')
+      } else {
+        if (this.imMessageListener) {
+          this.imMessageListener(data)
+        } else {
+          this.messageListeners.forEach(fn => fn(data))
+        }
+      }
+    })
+
     this.wss.onClose(res => {
       console.log('已关闭', res)
       close && close(res)
         this.reconnect()
       }
     })
+
+    this.timeTicker = setInterval(() => {
+      if (this.limit <= 0) {
+        clearInterval(this.timeTicker)
+      }
+
+      if (this.socketOpen) {
+        this.wss.send({ data: 'ping', success: () => console.log('[websocket]: 发送心跳') })
+      }
+    }, 60000)
   };
 
   //组装消息
           })
     }
   }
+
+  onMessage(callback, isIMPage) {
+    if (isIMPage) {
+      this.messageListeners = [callback]
+    } else {
+      this.imMessageListener = callback
+
+      // 取消订阅
+      return () => this.imMessageListener = undefined
+    }
+  }
 }
 
 export default new IMManager()