From fd6a6f4e32ded8f766276a6673c7a9fb39d05666 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?whalensun=28=E5=AD=99=E4=BC=9F=29?= <532125505@qq.com>
Date: Thu, 16 Sep 2021 19:55:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=89=88=E6=9C=AC=E5=8F=B7?=
=?UTF-8?q?=E5=8C=B9=E9=85=8DUI=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: I9d1f1fd037682b1a91f7b383126898b9cb1f56ac
---
.../link/demo/video/preview/VideoPreviewActivity.kt | 7 ++++++-
sdkdemo/src/main/res/values/strings.xml | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoPreviewActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoPreviewActivity.kt
index 373b12a83..ea9f5d7d9 100644
--- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoPreviewActivity.kt
+++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoPreviewActivity.kt
@@ -149,7 +149,12 @@ class VideoPreviewActivity : VideoBaseActivity(), EventView, TextureView.Surface
App.data.accessInfo!!.productId, presenter.getDeviceName(), "")
if (started != 0) {
launch(Dispatchers.Main) {
- var errInfo = getString(R.string.error_with_code, id, started.toString())
+ var errInfo = ""
+ if (started.toString() == "-1007") {
+ errInfo = getString(R.string.xp2p_err_version)
+ } else {
+ errInfo = getString(R.string.error_with_code, id, started.toString())
+ }
Toast.makeText(this@VideoPreviewActivity, errInfo, Toast.LENGTH_SHORT).show()
}
return@Runnable
diff --git a/sdkdemo/src/main/res/values/strings.xml b/sdkdemo/src/main/res/values/strings.xml
index 5487eb558..6919e1c69 100644
--- a/sdkdemo/src/main/res/values/strings.xml
+++ b/sdkdemo/src/main/res/values/strings.xml
@@ -98,6 +98,7 @@
%s 通道断开,正在重连
%s 通道建立成功
%s 连接错误码 %s,通道断开
+ APP SDK 版本与设备端 SDK 版本号不匹配,版本号需前两位保持一致
执行信令 %s 不成功
加载中