rtc添加两个新的物模型_sys_called_id和_sys_caller_id

Change-Id: I8e48f5cf93e3151908b615b811eba1615eb9ef49

Author: SundoggyNew

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

@@ -470,7 +470,16 @@ class App : Application(), Application.ActivityLifecycleCallbacks, PayloadMessag
 
         L.d("上报数据:id=$id value=$value")
         var userId = SharePreferenceUtil.getString(activity, CONFIG, CommonField.USER_ID)
-        var data = "{\"$id\":$value, \"${MessageConst.USERID}\":\"$userId\"}"
+        var callerId = ""
+        var calledId = ""
+        if (TRTCUIManager.getInstance().callingDeviceId.equals("")) { //被叫
+            callerId = deviceId
+            calledId = userId
+        } else { //主叫
+            callerId = userId
+            calledId = deviceId
+        }
+        var data = "{\"$id\":$value, \"${MessageConst.USERID}\":\"$userId\", \"${MessageConst.TRTC_CALLEDID}\":\"$calledId\", \"${MessageConst.TRTC_CALLERID}\":\"$callerId\"}"
         HttpRequest.instance.controlDevice(productId, deviceName, data, object: MyCallback {
             override fun fail(msg: String?, reqCode: Int) {
                 if (msg != null) L.e(msg)

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

@@ -103,7 +103,16 @@ class TRTCAppSessionManager : TRTCSessionManager() {
 
         L.d("上报数据:id=$id value=$value")
         val userId = SharePreferenceUtil.getString(App.activity, App.CONFIG, CommonField.USER_ID)
-        var data = "{\"$id\":$value, \"${MessageConst.USERID}\":\"$userId\"}"
+        var callerId = ""
+        var calledId = ""
+        if (TRTCUIManager.getInstance().callingDeviceId.equals("")) { //被叫
+            callerId = deviceId
+            calledId = userId
+        } else { //主叫
+            callerId = userId
+            calledId = deviceId
+        }
+        var data = "{\"$id\":$value, \"${MessageConst.USERID}\":\"$userId\", \"${MessageConst.TRTC_CALLEDID}\":\"$calledId\", \"${MessageConst.TRTC_CALLERID}\":\"$callerId\"}"
         HttpRequest.instance.controlDevice(productId, deviceName, data, object: MyCallback {
             override fun fail(msg: String?, reqCode: Int) {
                 if (msg != null) L.e(msg)

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

@@ -178,7 +178,7 @@ class ControlPanelModel(view: ControlPanelView) : ParentModel<ControlPanelView>(
                 TRTCUIManager.getInstance().callingDeviceId = "$productId/$deviceName" //保存下设备id（productId/deviceName）
                 val userId = SharePreferenceUtil.getString(App.activity, App.CONFIG, CommonField.USER_ID)
                 val agent = "android/1.4.0 (Android" + Build.VERSION.SDK_INT + ";" + Build.BRAND + " " + Build.MODEL + ";" + Locale.getDefault().language + "-" + Locale.getDefault().country + ")"
-                data = "{\"$id\":$value, \"$USERID\":\"$userId\", \"${MessageConst.AGENT}\":\"$agent\"}"
+                data = "{\"$id\":$value, \"$USERID\":\"$userId\", \"${MessageConst.AGENT}\":\"$agent\", \"${MessageConst.TRTC_CALLEDID}\":\"$deviceId\", \"${MessageConst.TRTC_CALLERID}\":\"$userId\"}"
 
             }
         }

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

@@ -46,5 +46,7 @@ object MessageConst {
     const val AGENT = "_sys_user_agent"
     const val TRTC_EXTRA_INFO = "_sys_extra_info";
     const val TRTC_REJECT_USERID = "rejectUserId";
+    const val TRTC_CALLEDID = "_sys_called_id"
+    const val TRTC_CALLERID = "_sys_caller_id"
 
 }

sdk/explorer-link-rtc/src/main/java/com/tencent/iot/explorer/link/rtc/consts/Common.java

@@ -23,6 +23,10 @@ public class Common {
 
     public static final String TRTC_EXTRA_INFO = "_sys_extra_info";
 
+    public static final String TRTC_CALLEDID = "_sys_called_id";
+
+    public static final String TRTC_CALLERID = "_sys_caller_id";
+
     public static final String TRTC_REJECT_USERID = "rejectUserId";
 
     public static final String TRTC_DEVICE_CHANGE = "DeviceChange";

sdk/explorer-link-rtc/src/main/java/com/tencent/iot/explorer/link/rtc/model/TRTCUIManager.java

@@ -117,6 +117,15 @@ public void payloadMessage(TRTCPayload trtcPayload, String userId, TRTCCallback
                     if (payloadParamsJson.has(Common.TRTC_USERID)) {
                         deviceId = payloadParamsJson.getString(Common.TRTC_USERID);
                     }
+                    if (isCalling) { //被叫
+                        if (payloadParamsJson.has(Common.TRTC_CALLEDID)) {
+                            deviceId = payloadParamsJson.getString(Common.TRTC_CALLEDID);
+                        }
+                    } else { //主叫
+                        if (payloadParamsJson.has(Common.TRTC_CALLERID)) {
+                            deviceId = payloadParamsJson.getString(Common.TRTC_CALLERID);
+                        }
+                    }
 
                     String rejectId = "";
                     if (payloadParamsJson.has(Common.TRTC_EXTRA_INFO)) {