增加跟随配置的appkey、appsecret

neilyhe · neilyhe · commit a93f8d0a6a8b · 2025-08-25T15:41:10.000+08:00
diff --git a/sdk/video-link-android/src/main/java/com/tencent/iot/video/link/consts/VideoConst.kt b/sdk/video-link-android/src/main/java/com/tencent/iot/video/link/consts/VideoConst.kt
@@ -26,5 +26,7 @@ object VideoConst {
     const val VIDEO_WLAN_PARAMS = "params"
     const val VIDEO_WLAN_DEV_NAMES = "deviceName"
     const val MULTI_VIDEO_P2P_INFO = "p2pInfo"
+    const val VIDEO_APP_KEY = "appKey"
+    const val VIDEO_APP_SECRET = "appSecret"
     const val VIDEO_DEV_CHANNELS = "VideoDevChannels"
 }
diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoTestInputActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoTestInputActivity.kt
@@ -2,11 +2,11 @@ package com.tencent.iot.explorer.link.demo.video
 
 import android.content.ClipboardManager
 import android.content.Intent
-import android.os.Bundle
 import android.text.InputType
 import android.view.View
 import android.widget.RadioButton
 import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
 import com.tencent.iot.explorer.link.core.utils.SharePreferenceUtil
 import com.tencent.iot.explorer.link.demo.R
 import com.tencent.iot.explorer.link.demo.VideoBaseActivity
@@ -16,12 +16,14 @@ import com.tencent.iot.video.link.consts.VideoConst
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.MainScope
 
-class VideoTestInputActivity : VideoBaseActivity<ActivityVideoTestInputBinding>(), CoroutineScope by MainScope() {
+class VideoTestInputActivity : VideoBaseActivity<ActivityVideoTestInputBinding>(),
+    CoroutineScope by MainScope() {
 
     private var isStartCross = false
     private var protocol = "auto"
 
-    override fun getViewBinding(): ActivityVideoTestInputBinding = ActivityVideoTestInputBinding.inflate(layoutInflater)
+    override fun getViewBinding(): ActivityVideoTestInputBinding =
+        ActivityVideoTestInputBinding.inflate(layoutInflater)
 
     override fun initView() {
         with(binding) {
@@ -40,10 +42,22 @@ class VideoTestInputActivity : VideoBaseActivity<ActivityVideoTestInputBinding>(
                 VideoConst.VIDEO_CONFIG,
                 VideoConst.MULTI_VIDEO_P2P_INFO
             )
+            val appKey = SharePreferenceUtil.getString(
+                this@VideoTestInputActivity,
+                VideoConst.VIDEO_CONFIG,
+                VideoConst.VIDEO_APP_KEY
+            )
+            val appSecret = SharePreferenceUtil.getString(
+                this@VideoTestInputActivity,
+                VideoConst.VIDEO_CONFIG,
+                VideoConst.VIDEO_APP_SECRET
+            )
             vTitle.tvTitle.setText(R.string.iot_test_demo_name)
-            productIdLayout.tvTip.setText(R.string.product_id)
-            deviceNameLayout.tvTip.setText(R.string.device_name)
-            p2pInfoLayout.tvTip.setText(R.string.p2p_info)
+            productIdLayout.tvTip.setText(R.string.product_id_text)
+            deviceNameLayout.tvTip.setText(R.string.device_name_text)
+            p2pInfoLayout.tvTip.setText(R.string.p2p_info_text)
+            appKeyLayout.tvTip.setText(R.string.app_key_text)
+            appSecretLayout.tvTip.setText(R.string.app_secret)
             if (productId.isNotEmpty()) {
                 productIdLayout.evContent.setText(productId)
             }
@@ -59,6 +73,16 @@ class VideoTestInputActivity : VideoBaseActivity<ActivityVideoTestInputBinding>(
             }
             p2pInfoLayout.evContent.setHint(R.string.hint_p2p_info)
             p2pInfoLayout.evContent.inputType = InputType.TYPE_CLASS_TEXT
+            if (appKey.isNotEmpty()) {
+                appKeyLayout.evContent.setText(appKey)
+            }
+            appKeyLayout.evContent.setHint(R.string.hint_app_key)
+            appKeyLayout.evContent.inputType = InputType.TYPE_CLASS_TEXT
+            if (appSecret.isNotEmpty()) {
+                appSecretLayout.evContent.setText(appSecret)
+            }
+            appSecretLayout.evContent.setHint(R.string.hint_app_secret)
+            appSecretLayout.evContent.inputType = InputType.TYPE_CLASS_TEXT
         }
     }
 
@@ -67,20 +91,43 @@ class VideoTestInputActivity : VideoBaseActivity<ActivityVideoTestInputBinding>(
             vTitle.ivBack.setOnClickListener { finish() }
             btnLogin.setOnClickListener(loginClickedListener)
             btnPaste.setOnClickListener {
-                val clipboard = ContextCompat.getSystemService(this@VideoTestInputActivity, ClipboardManager::class.java);
+                val clipboard = ContextCompat.getSystemService(
+                    this@VideoTestInputActivity,
+                    ClipboardManager::class.java
+                )
                 if (clipboard != null && clipboard.hasPrimaryClip()) {
                     clipboard.primaryClip?.getItemAt(0)?.text.toString().split("\n")
                         .forEachIndexed { index, s ->
                             when (index) {
                                 0 -> productIdLayout.evContent.setText(s)
                                 1 -> deviceNameLayout.evContent.setText(s)
                                 2 -> p2pInfoLayout.evContent.setText(s)
+                                3 -> appKeyLayout.evContent.setText(s)
+                                4 -> appSecretLayout.evContent.setText(s)
+                            }
+                        }
+                }
+            }
+            btnAppPaste.setOnClickListener {
+                val clipboard = ContextCompat.getSystemService(
+                    this@VideoTestInputActivity,
+                    ClipboardManager::class.java
+                )
+                if (clipboard != null && clipboard.hasPrimaryClip()) {
+                    clipboard.primaryClip?.getItemAt(0)?.text.toString().split("\n")
+                        .forEachIndexed { index, s ->
+                            when (index) {
+                                0 -> appKeyLayout.evContent.setText(s)
+                                1 -> appSecretLayout.evContent.setText(s)
                             }
                         }
                 }
             }
             swtCross.setOnCheckedChangeListener { _, checked ->
                 isStartCross = checked
+                btnAppPaste.isVisible = checked
+                appKeyLayout.root.isVisible = checked
+                appSecretLayout.root.isVisible = checked
             }
             rgProtocol.setOnCheckedChangeListener { group, checkedId ->
                 protocol = group.findViewById<RadioButton>(checkedId).tag.toString()
@@ -115,6 +162,30 @@ class VideoTestInputActivity : VideoBaseActivity<ActivityVideoTestInputBinding>(
                     show(getString(R.string.hint_p2p_info))
                     return
                 }
+                if (isStartCross) {
+                    if (appKeyLayout.evContent.text.isNullOrEmpty()) {
+                        show(getString(R.string.hint_app_key))
+                        return
+                    }
+                    SharePreferenceUtil.saveString(
+                        this@VideoTestInputActivity,
+                        VideoConst.VIDEO_CONFIG,
+                        VideoConst.VIDEO_APP_KEY,
+                        appKeyLayout.evContent.text.toString()
+                    )
+                    if (appSecretLayout.evContent.text.isNullOrEmpty()) {
+                        show(getString(R.string.hint_app_secret))
+                        return
+                    }
+                    if (appSecretLayout.evContent.text.isNotEmpty()) {
+                        SharePreferenceUtil.saveString(
+                            this@VideoTestInputActivity,
+                            VideoConst.VIDEO_CONFIG,
+                            VideoConst.VIDEO_APP_SECRET,
+                            appSecretLayout.evContent.text.toString()
+                        )
+                    }
+                }
                 SharePreferenceUtil.saveString(
                     this@VideoTestInputActivity,
                     VideoConst.VIDEO_CONFIG,
@@ -125,6 +196,8 @@ class VideoTestInputActivity : VideoBaseActivity<ActivityVideoTestInputBinding>(
                 intent.putExtra("productId", productIdLayout.evContent.text.toString())
                 intent.putExtra("deviceName", deviceNameLayout.evContent.text.toString())
                 intent.putExtra("p2pInfo", p2pInfoLayout.evContent.text.toString())
+                intent.putExtra("appKey", appKeyLayout.evContent.text.toString())
+                intent.putExtra("appSecret", appSecretLayout.evContent.text.toString())
                 intent.putExtra("isStartCross", isStartCross)
                 intent.putExtra("protocol", protocol)
                 startActivity(intent)
diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoTestActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoTestActivity.kt
@@ -32,6 +32,7 @@ import com.tencent.iot.explorer.link.demo.video.utils.ListOptionsDialog
 import com.tencent.iot.explorer.link.demo.video.utils.TipToastDialog
 import com.tencent.iot.explorer.link.demo.video.utils.ToastDialog
 import com.tencent.iot.video.link.entity.DeviceStatus
+import com.tencent.iot.video.link.util.JsonManager
 import com.tencent.iot.video.link.util.audio.AudioRecordUtil
 import com.tencent.xnet.XP2P
 import com.tencent.xnet.XP2PAppConfig
@@ -98,6 +99,10 @@ class VideoTestActivity : VideoBaseActivity<ActivityVideoTestBinding>(), XP2PCal
         productId = intent.getStringExtra("productId")?.toString() ?: ""
         deviceName = intent.getStringExtra("deviceName")?.toString() ?: ""
         xp2pInfo = intent.getStringExtra("p2pInfo")?.toString() ?: ""
+        val appKey = intent.getStringExtra("appKey")?.toString() ?: ""
+        val appSecret = intent.getStringExtra("appSecret")?.toString() ?: ""
+        xP2PAppConfig.appKey = appKey
+        xP2PAppConfig.appSecret = appSecret
         xP2PAppConfig.autoConfigFromDevice = intent.getBooleanExtra("isStartCross", false)
         val protocol = intent.getStringExtra("protocol")?.toString() ?: "auto"
         if (protocol == "udp") {
@@ -107,7 +112,7 @@ class VideoTestActivity : VideoBaseActivity<ActivityVideoTestBinding>(), XP2PCal
         } else {
             xP2PAppConfig.type = XP2PProtocolType.XP2P_PROTOCOL_AUTO
         }
-
+        Log.d(TAG, "init params productId:${productId} deviceName:${deviceName} xp2pInfo:${xp2pInfo} xP2PAppConfig:${JsonManager.toJson(xP2PAppConfig)}")
         binding.vTitle.tvTitle.text = deviceName
         binding.tvVideoQuality.text = getString(R.string.video_quality_medium_str)
 
diff --git a/sdkdemo/src/main/res/layout/activity_video_test_input.xml b/sdkdemo/src/main/res/layout/activity_video_test_input.xml
@@ -55,10 +55,11 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:text="是否开启双中转:"
+        android:text="是否开启跟随设备配置:"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/p2p_info_layout" />
 
+
     <Switch
         android:id="@+id/swt_cross"
         android:layout_width="wrap_content"
@@ -68,6 +69,35 @@
         app:layout_constraintTop_toTopOf="@+id/tv_cross"
         tools:ignore="UseSwitchCompatOrMaterialXml" />
 
+    <Button
+        android:id="@+id/btn_app_paste"
+        android:layout_width="60dp"
+        android:layout_height="30dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/background_blue_cell"
+        android:text="粘贴"
+        android:textColor="@color/blue_0052D9"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_cross" />
+
+    <include
+        android:id="@+id/app_key_layout"
+        layout="@layout/input_item_layout"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:visibility="gone"
+        app:layout_constraintTop_toBottomOf="@id/btn_app_paste" />
+
+    <include
+        android:id="@+id/app_Secret_layout"
+        layout="@layout/input_item_layout"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:visibility="gone"
+        app:layout_constraintTop_toBottomOf="@id/app_key_layout" />
+
     <TextView
         android:id="@+id/textView"
         android:layout_width="wrap_content"
@@ -76,7 +106,7 @@
         android:layout_marginTop="8dp"
         android:text="选择协议："
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_cross" />
+        app:layout_constraintTop_toBottomOf="@+id/app_Secret_layout" />
 
     <RadioGroup
         android:id="@+id/rg_protocol"
@@ -115,15 +145,15 @@
         android:layout_width="match_parent"
         android:layout_height="45dp"
         android:layout_marginStart="16dp"
-        android:layout_marginTop="50dp"
+        android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
         android:background="@drawable/background_blue_btn"
         android:text="@string/login"
         android:textColor="@color/white"
         android:textSize="@dimen/ts_17"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_cross" />
+        app:layout_constraintTop_toBottomOf="@id/rg_protocol" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sdkdemo/src/main/res/values/strings.xml b/sdkdemo/src/main/res/values/strings.xml
@@ -204,4 +204,12 @@
     <string name="multiple_channel_choose">多通道选择</string>
     <string name="channel_choose">通道选择: </string>
 
+    <string name="product_id_text">Product ID *</string>
+    <string name="device_name_text">Device Name *</string>
+    <string name="p2p_info_text">P2P INFO *</string>
+    <string name="app_key_text">App Key *</string>
+    <string name="hint_app_key">请输入App Key</string>
+    <string name="app_secret">App Secret *</string>
+    <string name="hint_app_secret">请输入App Secret</string>
+
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,7 @@ object VideoConst {`
`26`	`26`	`const val VIDEO_WLAN_PARAMS = "params"`
`27`	`27`	`const val VIDEO_WLAN_DEV_NAMES = "deviceName"`
`28`	`28`	`const val MULTI_VIDEO_P2P_INFO = "p2pInfo"`
	`29`	`+ const val VIDEO_APP_KEY = "appKey"`
	`30`	`+ const val VIDEO_APP_SECRET = "appSecret"`
`29`	`31`	`const val VIDEO_DEV_CHANNELS = "VideoDevChannels"`
`30`	`32`	`}`