TRTC-修复TRTC设备收不到websocket消息的问题

Change-Id: I6937bf7358c7a6d3377da1cfdf907298e9447cd2

Author: archurtan

app/src/main/java/com/tencent/iot/explorer/link/App.kt

@@ -18,6 +18,7 @@ import com.tencent.iot.explorer.link.core.auth.message.MessageConst
 import com.tencent.iot.explorer.link.core.auth.message.payload.Payload
 import com.tencent.iot.explorer.link.core.auth.message.upload.ArrayString
 import com.tencent.iot.explorer.link.core.auth.response.*
+import com.tencent.iot.explorer.link.core.auth.socket.callback.ConnectionCallback
 import com.tencent.iot.explorer.link.core.auth.socket.callback.PayloadMessageCallback
 import com.tencent.iot.explorer.link.core.auth.util.JsonManager
 import com.tencent.iot.explorer.link.core.auth.util.Weak
@@ -43,7 +44,8 @@ import kotlin.collections.ArrayList
 /**
  * APP
  */
-class App : Application(), Application.ActivityLifecycleCallbacks, PayloadMessageCallback {
+class App : Application(), Application.ActivityLifecycleCallbacks, PayloadMessageCallback,
+    ConnectionCallback {
 
     companion object {
         //app数据
@@ -129,6 +131,7 @@ class App : Application(), Application.ActivityLifecycleCallbacks, PayloadMessag
         super.onCreate()
         MultiDex.install(this)
         IoTAuth.setWebSocketTag(Utils.getAndroidID(this)) // 设置wss的uin
+        IoTAuth.setWebSocketCallback(this) // 设置WebSocket连接状态回调
         IoTAuth.init(BuildConfig.TencentIotLinkAppkey, BuildConfig.TencentIotLinkAppSecret)
         //初始化弹框
         T.setContext(this.applicationContext)
@@ -266,6 +269,7 @@ class App : Application(), Application.ActivityLifecycleCallbacks, PayloadMessag
                                     getDeviceCallStatus(device)
                                     // TRTC: trtc设备注册websocket监听
                                     IoTAuth.registerActivePush(trtcDeviceIdList, null)
+                                    App.data.rtcDeviceIdList = trtcDeviceIdList
                                 }
                             }
                         }
@@ -557,6 +561,20 @@ class App : Application(), Application.ActivityLifecycleCallbacks, PayloadMessag
 
         })
     }
+
+    override fun connected() {
+    }
+
+    override fun disconnected() {
+        L.e("WebSocket已断开连接")
+    }
+
+    override fun onOpen() {
+        L.e("WebSocket已连接")
+        if (data.rtcDeviceIdList != null) {
+            IoTAuth.registerActivePush(data.rtcDeviceIdList!!, null)
+        }
+    }
 }
 
 interface AppLifeCircleListener {

app/src/main/java/com/tencent/iot/explorer/link/AppData.kt

@@ -7,6 +7,7 @@ import com.tencent.iot.explorer.link.core.auth.entity.DeviceEntity
 import com.tencent.iot.explorer.link.core.auth.entity.FamilyEntity
 import com.tencent.iot.explorer.link.core.auth.entity.RoomEntity
 import com.tencent.iot.explorer.link.core.auth.entity.User
+import com.tencent.iot.explorer.link.core.auth.message.upload.ArrayString
 import com.tencent.iot.explorer.link.core.log.L
 import com.tencent.iot.explorer.link.kitlink.activity.BaseActivity
 import com.tencent.iot.explorer.link.kitlink.consts.CommonField
@@ -44,6 +45,7 @@ class AppData private constructor() {
     var isForeground = false
     var callingDeviceId = "" //主动呼叫的设备的id
     var rtcNotificationClicked = false
+    var rtcDeviceIdList: ArrayString? = null
 
     //activity列表
     val activityList = LinkedList<BaseActivity>()

app/src/main/java/com/tencent/iot/explorer/link/mvp/model/HomeFragmentModel.kt

@@ -360,6 +360,7 @@ class HomeFragmentModel(view: HomeFragmentView) : ParentModel<HomeFragmentView>(
                         }
                         // TRTC: trtc设备注册websocket监听
                         IoTAuth.registerActivePush(deviceIdList, null)
+                        App.data.rtcDeviceIdList = deviceIdList
                     }
                 }
             }
@@ -381,6 +382,7 @@ class HomeFragmentModel(view: HomeFragmentView) : ParentModel<HomeFragmentView>(
                         }
                         // TRTC: trtc设备注册websocket监听
                         IoTAuth.registerActivePush(deviceIdList, null)
+                        App.data.rtcDeviceIdList = deviceIdList
 
                         view?.showDeviceList(shareDeviceList.size, roomId, false, true)
                         //在线状态
@@ -440,6 +442,7 @@ class HomeFragmentModel(view: HomeFragmentView) : ParentModel<HomeFragmentView>(
                                     }
                                     // TRTC: trtc设备注册websocket监听
                                     IoTAuth.registerActivePush(trtcDeviceIdList, null)
+                                    App.data.rtcDeviceIdList = trtcDeviceIdList
                                 }
                             }
                             if (callingMyApp) {

sdk/explorer-link-android/src/main/java/com/tencent/iot/explorer/link/core/auth/IoTAuth.kt

@@ -10,6 +10,7 @@ import com.tencent.iot.explorer.link.core.auth.message.upload.ArrayString
 import com.tencent.iot.explorer.link.core.auth.service.*
 import com.tencent.iot.explorer.link.core.auth.socket.WSClientManager
 import com.tencent.iot.explorer.link.core.auth.socket.callback.ActivePushCallback
+import com.tencent.iot.explorer.link.core.auth.socket.callback.ConnectionCallback
 import com.tencent.iot.explorer.link.core.auth.socket.callback.PayloadMessageCallback
 import com.tencent.iot.explorer.link.core.auth.socket.callback.MessageCallback
 import com.tencent.iot.explorer.link.core.log.L
@@ -214,6 +215,13 @@ object IoTAuth {
         WSClientManager.setDebugTag(tag)
     }
 
+    /**
+     * 设置WebSocket连接状态回调
+     */
+    fun setWebSocketCallback(callback: ConnectionCallback) {
+        WSClientManager.instance.setSocketCallback(callback)
+    }
+
     /**
      * 注册监听
      * @param deviceIds 多个设备的deviceId

sdk/explorer-link-android/src/main/java/com/tencent/iot/explorer/link/core/auth/socket/JWebSocketClient.kt

@@ -12,6 +12,7 @@ class JWebSocketClient(serverUri: URI, handler: DispatchMsgHandler, connectionCa
     private val connectListener = connectionCallback
 
     override fun onOpen(handshakedata: ServerHandshake) {
+        connectListener.onOpen()
     }
 
     override fun onClose(code: Int, reason: String, remote: Boolean) {

sdk/explorer-link-android/src/main/java/com/tencent/iot/explorer/link/core/auth/socket/WSClientManager.kt

@@ -1,6 +1,7 @@
 package com.tencent.iot.explorer.link.core.auth.socket
 
 import android.text.TextUtils
+import com.tencent.iot.explorer.link.core.auth.IoTAuth
 import com.tencent.iot.explorer.link.core.auth.message.MessageConst
 import com.tencent.iot.explorer.link.core.auth.message.payload.Payload
 import com.tencent.iot.explorer.link.core.auth.message.resp.RespFailMessage
@@ -60,6 +61,7 @@ internal class WSClientManager private constructor() {
     //enterRoom监听使能参数
     public var enablePayloadMessageCallback = true
 
+    private var socketCallback: ConnectionCallback? = null
 
     /**
      * 单例
@@ -93,6 +95,13 @@ internal class WSClientManager private constructor() {
         startHeartJob()
     }
 
+    /**
+     * 设置WebSocket连接状态回调
+     */
+    fun setSocketCallback(callback: ConnectionCallback) {
+        socketCallback = callback
+    }
+
     fun setBrokerUrl(value: String) {
         host = value
     }
@@ -102,7 +111,10 @@ internal class WSClientManager private constructor() {
      */
     fun addDeviceIds(ids: ArrayString) {
         for (i in 0 until ids.size()) {
-            heartMessageList.addValue(ids.getValue(i))
+            val id = ids.getValue(i)
+            if (!heartMessageList.contains(id)) {
+                heartMessageList.addValue(id)
+            }
         }
     }
 
@@ -258,10 +270,11 @@ internal class WSClientManager private constructor() {
 
         override fun connected() {
             resend()
-            if (job != null)
+            if (job != null) {
                 activePushCallbacks.forEach {
                     it.reconnected()
                 }
+            }
             stopJob()
         }
 
@@ -270,6 +283,11 @@ internal class WSClientManager private constructor() {
             client?.destroy()
             client = null
             startJob()
+            socketCallback?.disconnected()
+        }
+
+        override fun onOpen() {
+            socketCallback?.onOpen()
         }
     }
 

sdk/explorer-link-android/src/main/java/com/tencent/iot/explorer/link/core/auth/socket/callback/ConnectionCallback.kt

@@ -4,4 +4,6 @@ interface ConnectionCallback {
     fun connected()
 
     fun disconnected()
+
+    fun onOpen()
 }