保存appkey、appsecrty

Author: neilyhe

sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoTestInputActivity.kt

@@ -42,6 +42,11 @@ class VideoTestInputActivity : VideoBaseActivity<ActivityVideoTestInputBinding>(
                 VideoConst.VIDEO_CONFIG,
                 VideoConst.MULTI_VIDEO_P2P_INFO
             )
+            val isStartCross = SharePreferenceUtil.getInt(
+                this@VideoTestInputActivity,
+                VideoConst.VIDEO_CONFIG,
+                "isStartCross"
+            ) == 1
             val appKey = SharePreferenceUtil.getString(
                 this@VideoTestInputActivity,
                 VideoConst.VIDEO_CONFIG,
@@ -76,6 +81,7 @@ class VideoTestInputActivity : VideoBaseActivity<ActivityVideoTestInputBinding>(
             if (appKey.isNotEmpty()) {
                 appKeyLayout.evContent.setText(appKey)
             }
+            swtCross.isChecked = isStartCross
             appKeyLayout.evContent.setHint(R.string.hint_app_key)
             appKeyLayout.evContent.inputType = InputType.TYPE_CLASS_TEXT
             if (appSecret.isNotEmpty()) {
@@ -162,6 +168,12 @@ class VideoTestInputActivity : VideoBaseActivity<ActivityVideoTestInputBinding>(
                     show(getString(R.string.hint_p2p_info))
                     return
                 }
+                SharePreferenceUtil.saveInt(
+                    this@VideoTestInputActivity,
+                    VideoConst.VIDEO_CONFIG,
+                    "isStartCross",
+                    if (isStartCross) 1 else 0
+                )
                 if (isStartCross) {
                     if (appKeyLayout.evContent.text.isNullOrEmpty()) {
                         show(getString(R.string.hint_app_key))
@@ -186,12 +198,6 @@ class VideoTestInputActivity : VideoBaseActivity<ActivityVideoTestInputBinding>(
                         )
                     }
                 }
-                SharePreferenceUtil.saveString(
-                    this@VideoTestInputActivity,
-                    VideoConst.VIDEO_CONFIG,
-                    VideoConst.MULTI_VIDEO_P2P_INFO,
-                    p2pInfoLayout.evContent.text.toString()
-                )
                 val intent = Intent(this@VideoTestInputActivity, VideoTestActivity::class.java)
                 intent.putExtra("productId", productIdLayout.evContent.text.toString())
                 intent.putExtra("deviceName", deviceNameLayout.evContent.text.toString())

sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoTestActivity.kt

@@ -97,15 +97,15 @@ class VideoTestActivity : VideoBaseActivity<ActivityVideoTestBinding>(), XP2PCal
         ActivityVideoTestBinding.inflate(layoutInflater)
 
     override fun initView() {
-        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
+        productId = (intent.getStringExtra("productId") ?: "").trim()
+        deviceName = (intent.getStringExtra("deviceName") ?: "").trim()
+        xp2pInfo = (intent.getStringExtra("p2pInfo") ?: "").trim()
+        val appKey = intent.getStringExtra("appKey") ?: ""
+        val appSecret = intent.getStringExtra("appSecret") ?: ""
+        xP2PAppConfig.appKey = appKey.trim()
+        xP2PAppConfig.appSecret = appSecret.trim()
         xP2PAppConfig.autoConfigFromDevice = intent.getBooleanExtra("isStartCross", false)
-        val protocol = intent.getStringExtra("protocol")?.toString() ?: "auto"
+        val protocol = intent.getStringExtra("protocol") ?: "auto"
         if (protocol == "udp") {
             xP2PAppConfig.type = XP2PProtocolType.XP2P_PROTOCOL_UDP
         } else if (protocol == "tcp") {
@@ -511,7 +511,7 @@ class VideoTestActivity : VideoBaseActivity<ActivityVideoTestBinding>(), XP2PCal
             if (event == 1004) {
                 Log.e(tag, "====event === 1004")
                 checkDeviceState()
-//                delegateHttpFlv()
+                delegateHttpFlv()
             }
         } else if (event == 1010) {
             Log.e(tag, "====event === 1010, 校验失败，info撞库防止串流： $msg")