TRTC-'通话过程中，设备端断网，应用端过一段时间需提示对方设备已离线'

archurtan · archurtan · commit d3820cc2b42a · 2021-08-17T19:43:12.000+08:00
https://docs.qq.com/sheet/DQVNJZmZXaWx1RVRV?tab=grnvqb Change-Id: I98970eb2542992e7e995f57b222d2e44ed883e28
diff --git a/app/src/main/java/com/tencent/iot/explorer/link/App.kt b/app/src/main/java/com/tencent/iot/explorer/link/App.kt
@@ -202,21 +202,17 @@ class App : Application(), Application.ActivityLifecycleCallbacks, PayloadMessag
                 override fun success(response: BaseResponse, reqCode: Int) {
                     if (response.isSuccess()) {
                         response.parse(DeviceListResponse::class.java)?.run {
-                            val deviceList = DeviceList
-                            val productIdList = ArrayList<String>()
                             // TRTC: 轮询在线的trtc设备的call_status
                             for (device in DeviceList) {
                                 val deviceIds = ArrayList<String>()
                                 deviceIds.add(device.DeviceId)
-                                productIdList.add(device.ProductId)
                                 getDeviceOnlineStatus(device.ProductId, deviceIds, device)
                             }
                             // TRTC：轮询在线的trtc共享设备的call_status
                             for (device in data.shareDeviceList) {
                                 val deviceIds = ArrayList<String>()
                                 if (!device.DeviceId.isNullOrEmpty() && !device.ProductId.isNullOrEmpty()) {
                                     deviceIds.add(device.DeviceId)
-                                    productIdList.add(device.ProductId)
                                     getDeviceOnlineStatus(device.ProductId, deviceIds, device)
                                 }
                             }
@@ -527,6 +523,9 @@ class App : Application(), Application.ActivityLifecycleCallbacks, PayloadMessag
                         TRTCUIManager.getInstance().exitRoom()
                     }
                 }
+            } else if (subType == MessageConst.OFFLINE) {
+                val deviceId = paramsObject.getString(MessageConst.DEVICE_ID)
+                TRTCUIManager.getInstance().userOffline(deviceId)
             }
         }
     }
diff --git a/sdk/explorer-link-rtc/src/main/java/com/tencent/iot/explorer/link/rtc/model/TRTCCallingParamsCallback.java b/sdk/explorer-link-rtc/src/main/java/com/tencent/iot/explorer/link/rtc/model/TRTCCallingParamsCallback.java
@@ -9,4 +9,6 @@ public interface TRTCCallingParamsCallback {
     void userBusy();
 
     void otherUserAccept();
+
+    void userOffline(String deviceId);
 }
diff --git a/sdk/explorer-link-rtc/src/main/java/com/tencent/iot/explorer/link/rtc/model/TRTCUIManager.java b/sdk/explorer-link-rtc/src/main/java/com/tencent/iot/explorer/link/rtc/model/TRTCUIManager.java
@@ -68,4 +68,10 @@ public void otherUserAccept() {
             callingParamsCallback.otherUserAccept();
         }
     }
+
+    public void userOffline(String deviceId) {
+        if (callingParamsCallback != null) {
+            callingParamsCallback.userOffline(deviceId);
+        }
+    }
 }
diff --git a/sdk/explorer-link-rtc/src/main/java/com/tencent/iot/explorer/link/rtc/ui/audiocall/TRTCAudioCallActivity.java b/sdk/explorer-link-rtc/src/main/java/com/tencent/iot/explorer/link/rtc/ui/audiocall/TRTCAudioCallActivity.java
@@ -88,6 +88,7 @@ public class TRTCAudioCallActivity extends AppCompatActivity implements NetWorkS
     private boolean               isHandsFree       = true;
     private boolean               isMuteMic         = false;
     private volatile boolean      mIsEnterRoom      = false;
+    private Map<String, Boolean> mUserOfflineMap = new HashMap<>();
 
     private TimerTask otherEnterRoomTask = null;
     private TimerTask enterRoomTask = null;
@@ -145,7 +146,12 @@ public void run() {
                     if (userInfo != null) {
                         mCallUserInfoList.remove(userInfo);
                     }
-                    mStatusView.setText(R.string.trtccalling_customer_hand_up);
+                    Boolean offline = mUserOfflineMap.get(userId);
+                    if (offline != null && offline) {
+                        Toast.makeText(TRTCAudioCallActivity.this, R.string.trtccalling_customer_offline, Toast.LENGTH_SHORT).show();
+                    } else {
+                        mStatusView.setText(R.string.trtccalling_customer_hand_up);
+                    }
                     removeCallbackAndFinish();
                 }
             });
@@ -394,6 +400,11 @@ public void run() {
 
                 removeCallbackAndFinish();
             }
+
+            @Override
+            public void userOffline(String deviceId) {
+                mUserOfflineMap.put(deviceId, true);
+            }
         });
 
         initView();
diff --git a/sdk/explorer-link-rtc/src/main/java/com/tencent/iot/explorer/link/rtc/ui/videocall/TRTCVideoCallActivity.java b/sdk/explorer-link-rtc/src/main/java/com/tencent/iot/explorer/link/rtc/ui/videocall/TRTCVideoCallActivity.java
@@ -97,6 +97,7 @@ public class TRTCVideoCallActivity extends AppCompatActivity implements NetWorkS
     private boolean               isHandsFree       = true;
     private boolean               isMuteMic         = false;
     private volatile boolean      mIsEnterRoom      = false;
+    private Map<String, Boolean> mUserOfflineMap = new HashMap<>();
 
     private TimerTask otherEnterRoomTask = null;
     private TimerTask enterRoomTask = null;
@@ -155,13 +156,18 @@ public void run() {
                     if (userInfo != null) {
                         mCallUserInfoList.remove(userInfo);
                     }
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            mStatusView.setText(R.string.trtccalling_customer_hand_up);
-                            mStatusView.setVisibility(View.VISIBLE);
-                        }
-                    });
+                    Boolean offline = mUserOfflineMap.get(userId);
+                    if (offline != null && offline) {
+                        Toast.makeText(TRTCVideoCallActivity.this, R.string.trtccalling_customer_offline, Toast.LENGTH_SHORT).show();
+                    } else {
+                        runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                mStatusView.setText(R.string.trtccalling_customer_hand_up);
+                                mStatusView.setVisibility(View.VISIBLE);
+                            }
+                        });
+                    }
                     stopCameraAndFinish();
                 }
             });
@@ -425,6 +431,11 @@ public void run() {
                 });
                 stopCameraAndFinish();
             }
+
+            @Override
+            public void userOffline(String deviceId) {
+                mUserOfflineMap.put(deviceId, true);
+            }
         });
 
         initView();
diff --git a/sdk/explorer-link-rtc/src/main/res/values/strings.xml b/sdk/explorer-link-rtc/src/main/res/values/strings.xml
@@ -8,6 +8,7 @@
     <string name="trtccalling_dialed_is_busy_audio">"语音通话中..."</string>
     <string name="trtccalling_dialed_is_busy_vedio">"视频通话中..."</string>
     <string name="trtccalling_customer_hand_up">"对方已挂断..."</string>
+    <string name="trtccalling_customer_offline">"对方设备已离线，请稍后再试"</string>
     <string name="trtccalling_customer_no_resp">"对方无人接听..."</string>
     <string name="trtccalling_customer_no_net">"网络异常，请稍后重试"</string>
     <string name="trtccalling_customer_busy">"对方正忙..."</string>

Original file line number	Diff line number	Diff line change
`@@ -202,21 +202,17 @@ class App : Application(), Application.ActivityLifecycleCallbacks, PayloadMessag`
`202`	`202`	`override fun success(response: BaseResponse, reqCode: Int) {`
`203`	`203`	`if (response.isSuccess()) {`
`204`	`204`	`response.parse(DeviceListResponse::class.java)?.run {`
`205`		`- val deviceList = DeviceList`
`206`		`- val productIdList = ArrayList<String>()`
`207`	`205`	`// TRTC: 轮询在线的trtc设备的call_status`
`208`	`206`	`for (device in DeviceList) {`
`209`	`207`	`val deviceIds = ArrayList<String>()`
`210`	`208`	`deviceIds.add(device.DeviceId)`
`211`		`- productIdList.add(device.ProductId)`
`212`	`209`	`getDeviceOnlineStatus(device.ProductId, deviceIds, device)`
`213`	`210`	`}`
`214`	`211`	`// TRTC：轮询在线的trtc共享设备的call_status`
`215`	`212`	`for (device in data.shareDeviceList) {`
`216`	`213`	`val deviceIds = ArrayList<String>()`
`217`	`214`	`if (!device.DeviceId.isNullOrEmpty() && !device.ProductId.isNullOrEmpty()) {`
`218`	`215`	`deviceIds.add(device.DeviceId)`
`219`		`- productIdList.add(device.ProductId)`
`220`	`216`	`getDeviceOnlineStatus(device.ProductId, deviceIds, device)`
`221`	`217`	`}`
`222`	`218`	`}`
`@@ -527,6 +523,9 @@ class App : Application(), Application.ActivityLifecycleCallbacks, PayloadMessag`
`527`	`523`	`TRTCUIManager.getInstance().exitRoom()`
`528`	`524`	`}`
`529`	`525`	`}`
	`526`	`+ } else if (subType == MessageConst.OFFLINE) {`
	`527`	`+ val deviceId = paramsObject.getString(MessageConst.DEVICE_ID)`
	`528`	`+ TRTCUIManager.getInstance().userOffline(deviceId)`
`530`	`529`	`}`
`531`	`530`	`}`
`532`	`531`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,6 @@ public interface TRTCCallingParamsCallback {`
`9`	`9`	`void userBusy();`
`10`	`10`
`11`	`11`	`void otherUserAccept();`
	`12`	`+`
	`13`	`+ void userOffline(String deviceId);`
`12`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,4 +68,10 @@ public void otherUserAccept() {`
`68`	`68`	`callingParamsCallback.otherUserAccept();`
`69`	`69`	`}`
`70`	`70`	`}`
	`71`	`+`
	`72`	`+ public void userOffline(String deviceId) {`
	`73`	`+ if (callingParamsCallback != null) {`
	`74`	`+ callingParamsCallback.userOffline(deviceId);`
	`75`	`+ }`
	`76`	`+ }`
`71`	`77`	`}`