请求APPCallTRTCDevice接口完成

Author: neilyhe

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

@@ -68,6 +68,7 @@ object RequestCode {
     const val get_bind_device_token = 3012
     const val check_device_bind_token_state = 3013
     const val trtc_call_device = 3015
+    const val call_trtc_device_by_app = 3018
     const val all_device = 3016
     /*************设备接口结束**************/
 

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

@@ -140,6 +140,11 @@ interface DeviceImpl {
      */
     fun trtcCallDevice(deviceId: String, callback: MyCallback)
 
+    /**
+     * 手机请求加入房间
+     */
+    fun callTrtcDeviceByApp(deviceId: String, callback: MyCallback)
+
     /**
      * 获取所有设备
      */

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

@@ -386,6 +386,16 @@ internal class DeviceService : BaseService(), DeviceImpl {
         tokenPost(param, callback, RequestCode.trtc_call_device)
     }
 
+    /**
+     * 手机请求加入房间
+     */
+    override fun callTrtcDeviceByApp(deviceId: String, callback: MyCallback) {
+        val param = tokenParams("APPCallTRTCDevice")
+        param["DeviceId"] = deviceId
+        param["ClientIp"] = IPUtil.getHostIP()
+        tokenPost(param, callback, RequestCode.call_trtc_device_by_app)
+    }
+
     override fun wifiBindDevice(userId: String, bindDeviceToken: String, familyId: String,
                                 deviceInfo: DeviceInfo, callback: MyCallback) {
         val param = tokenParams("AppTokenBindDeviceFamily")

sdkdemo/src/main/AndroidManifest.xml

@@ -117,7 +117,7 @@
             android:exported="true"
             android:targetActivity=".core.wxapi.WXEntryActivity" /> <!-- picture start -->
         <activity android:name=".core.activity.EnhancedDeviceListActivity"/>
-        <activity android:name=".core.activity.CameraDetailActivity"/>
+        <activity android:name=".core.activity.DeviceDetailActivity"/>
     </application>
 
 </manifest>

sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/CameraDetailActivity.kt renamed to sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/DeviceDetailActivity.kt

@@ -1,18 +1,26 @@
 package com.tencent.iot.explorer.link.demo.core.activity
 
-import android.os.Bundle
+import android.text.TextUtils
 import android.view.View
 import android.widget.Toast
+import com.alibaba.fastjson.JSON
+import com.tencent.iot.explorer.link.core.auth.IoTAuth
+import com.tencent.iot.explorer.link.core.auth.callback.MyCallback
+import com.tencent.iot.explorer.link.core.auth.entity.DeviceEntity
+import com.tencent.iot.explorer.link.core.auth.message.MessageConst
+import com.tencent.iot.explorer.link.core.auth.response.BaseResponse
+import com.tencent.iot.explorer.link.core.auth.util.JsonManager
+import com.tencent.iot.explorer.link.core.link.entity.TRTCParamsEntity
+import com.tencent.iot.explorer.link.core.log.L
 import com.tencent.iot.explorer.link.demo.BaseActivity
 import com.tencent.iot.explorer.link.demo.R
 import com.tencent.iot.explorer.link.demo.databinding.ActivityCameraDetailBinding
 import com.tencent.iot.explorer.link.demo.video.playback.VideoPlaybackActivity
-import com.tencent.iot.explorer.link.demo.core.activity.ShareDeviceActivity
 
 /**
  * 摄像头详情页面 - 视频播放和控制界面
  */
-class CameraDetailActivity : BaseActivity<ActivityCameraDetailBinding>() {
+class DeviceDetailActivity : BaseActivity<ActivityCameraDetailBinding>(), MyCallback {
 
     private var isPlaying = false
     private var isMuted = true
@@ -26,10 +34,15 @@ class CameraDetailActivity : BaseActivity<ActivityCameraDetailBinding>() {
     override fun initView() {
 //        // 设置状态栏透明
 //        setStatusBarTransparent()
-        
+        val deviceInfo = intent.getStringExtra("deviceInfo")
+        if (deviceInfo.isNullOrEmpty()) {
+            L.e("deviceInfo is empty")
+            return
+        }
+        val deviceEntity = JsonManager.parseJson(deviceInfo, DeviceEntity::class.java)
+        IoTAuth.deviceImpl.callTrtcDeviceByApp(deviceEntity.DeviceId, this)
         // 初始化视频播放器
         initVideoPlayer()
-        
         // 更新UI状态
         updateUIState()
     }
@@ -112,9 +125,9 @@ class CameraDetailActivity : BaseActivity<ActivityCameraDetailBinding>() {
     private fun setStatusBarTransparent() {
         // TODO: 实现状态栏透明设置
         window.decorView.systemUiVisibility = (
-            View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
-            View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-        )
+                View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
+                        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                )
     }
 
     /**
@@ -123,7 +136,7 @@ class CameraDetailActivity : BaseActivity<ActivityCameraDetailBinding>() {
     private fun initVideoPlayer() {
         // TODO: 初始化视频播放器，连接摄像头流
         binding.loadingOverlay.visibility = View.VISIBLE
-        
+
         // 模拟视频加载
         binding.videoPlayer.postDelayed({
             binding.loadingOverlay.visibility = View.GONE
@@ -150,7 +163,8 @@ class CameraDetailActivity : BaseActivity<ActivityCameraDetailBinding>() {
             isPlaying = false
             updateUIState()
         }
-        Toast.makeText(this, if (isPowerOn) "摄像头已开启" else "摄像头已关闭", Toast.LENGTH_SHORT).show()
+        Toast.makeText(this, if (isPowerOn) "摄像头已开启" else "摄像头已关闭", Toast.LENGTH_SHORT)
+            .show()
     }
 
     /**
@@ -170,7 +184,7 @@ class CameraDetailActivity : BaseActivity<ActivityCameraDetailBinding>() {
         val currentIndex = qualities.indexOf(currentQuality)
         val nextIndex = (currentIndex + 1) % qualities.size
         currentQuality = qualities[nextIndex]
-        
+
         binding.btnQuality.text = currentQuality
         Toast.makeText(this, "画质切换为: $currentQuality", Toast.LENGTH_SHORT).show()
     }
@@ -224,18 +238,22 @@ class CameraDetailActivity : BaseActivity<ActivityCameraDetailBinding>() {
                 // TODO: 云台上移
                 Toast.makeText(this, "云台上移", Toast.LENGTH_SHORT).show()
             }
+
             "down" -> {
                 // TODO: 云台下移
                 Toast.makeText(this, "云台下移", Toast.LENGTH_SHORT).show()
             }
+
             "left" -> {
                 // TODO: 云台左移
                 Toast.makeText(this, "云台左移", Toast.LENGTH_SHORT).show()
             }
+
             "right" -> {
                 // TODO: 云台右移
                 Toast.makeText(this, "云台右移", Toast.LENGTH_SHORT).show()
             }
+
             "home" -> {
                 // TODO: 云台复位
                 Toast.makeText(this, "云台复位", Toast.LENGTH_SHORT).show()
@@ -284,7 +302,7 @@ class CameraDetailActivity : BaseActivity<ActivityCameraDetailBinding>() {
 
             // 更新视频播放状态
             videoPlayer.visibility = if (isPlaying && isPowerOn) View.VISIBLE else View.INVISIBLE
-            
+
             if (!isPowerOn) {
                 loadingOverlay.visibility = View.GONE
             }
@@ -297,4 +315,18 @@ class CameraDetailActivity : BaseActivity<ActivityCameraDetailBinding>() {
         isPlaying = false
         isPowerOn = false
     }
+
+    override fun fail(msg: String?, reqCode: Int) {
+        L.e("请求失败: $msg, reqCode: $reqCode")
+    }
+
+    override fun success(response: BaseResponse, reqCode: Int) {
+        if (response.isSuccess()) {
+            val data =
+                JSON.parseObject(response.data.toString()).getString(MessageConst.TRTC_PARAMS)
+            if (TextUtils.isEmpty(data)) return;
+            val params = JSON.parseObject(data, TRTCParamsEntity::class.java)
+            // TODO: 呼叫房间
+        }
+    }
 }

sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/EnhancedDeviceListActivity.kt

@@ -10,6 +10,7 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.alibaba.fastjson.JSON
 import com.tencent.iot.explorer.link.core.auth.IoTAuth
 import com.tencent.iot.explorer.link.core.auth.callback.MyCallback
 import com.tencent.iot.explorer.link.core.auth.consts.RequestCode
@@ -128,7 +129,6 @@ class EnhancedDeviceListActivity : BaseActivity<ActivityEnhancedDeviceListBindin
      * 显示用户信息页面
      */
     private fun showUserProfile() {
-        // TODO: 跳转到用户信息页面
         Toast.makeText(this, "跳转到用户信息页面", Toast.LENGTH_SHORT).show()
         jumpActivity(PersonalInfoActivity::class.java)
     }
@@ -137,9 +137,10 @@ class EnhancedDeviceListActivity : BaseActivity<ActivityEnhancedDeviceListBindin
      * 打开设备详情
      */
     private fun openDeviceDetail(device: DeviceEntity) {
-        // TODO: 跳转到设备详情页面
         Toast.makeText(this, "打开设备: ${device.DeviceName}", Toast.LENGTH_SHORT).show()
-        jumpActivity(CameraDetailActivity::class.java)
+        startActivity(Intent(this, DeviceDetailActivity::class.java).apply {
+            putExtra("deviceInfo", JSON.toJSONString(device))
+        })
     }
 
     /**