From 39f9c36dc42d0794c7a65a2c3e71f01b4157c4cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?whalensun=28=E5=AD=99=E4=BC=9F=29?= <532125505@qq.com> Date: Tue, 26 Mar 2024 15:31:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1af040185a1f276635e44e1c04b0f79d7214a6b3 --- ...oSDK\346\216\245\345\205\245\350\257\264\346\230\216.md" | 5 +++++ .../playback/localPlayback/VideoLocalPlaybackFragment.kt | 2 ++ .../link/demo/video/preview/VideoMultiPreviewActivity.kt | 6 +++++- .../link/demo/video/preview/VideoPreviewActivity.kt | 2 ++ .../link/demo/video/preview/VideoPreviewMJPEGActivity.kt | 2 ++ .../link/demo/video/preview/VideoPushStreamActivity.kt | 2 ++ .../link/demo/video/preview/VideoWithoutPropertyActivity.kt | 2 ++ 7 files changed, 20 insertions(+), 1 deletion(-) diff --git "a/sdk/video-link-android/doc/VideoSDK\346\216\245\345\205\245\350\257\264\346\230\216.md" "b/sdk/video-link-android/doc/VideoSDK\346\216\245\345\205\245\350\257\264\346\230\216.md" index 3e2d69378..8db39f437 100644 --- "a/sdk/video-link-android/doc/VideoSDK\346\216\245\345\205\245\350\257\264\346\230\216.md" +++ "b/sdk/video-link-android/doc/VideoSDK\346\216\245\345\205\245\350\257\264\346\230\216.md" @@ -119,6 +119,11 @@ enum XP2PType { XP2PTypeDisconnect = 1003, //p2p链路断开 XP2PTypeDetectReady = 1004, //p2p链路初始化成功,该事件回调触发后才能进行后续操作(直播、语音对讲、信令等) XP2PTypeDetectError = 1005, //p2p链路初始化失败 + XP2PTypeDeviceMsgArrievd = 1006, //设备端向App发消息 + XP2PTypeCmdNOReturn = 1007, //设备未返回app自定义信令 + XP2PTypeStreamEnd = 1008, //设备停止推流，或者由于达到设备最大连接数，拒绝推流 + XP2PTypeDownloadEnd = 1009, //设备停止推流，下载结束 + XP2PTypeStreamRefush = 1010, //设备拒绝推流，请求的devicename不一致 XP2PTypeSaveFileOn = 8000, //获取保存音视频流开关状态 XP2PTypeSaveFileUrl = 8001 //获取音视频流保存路径 }; diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/playback/localPlayback/VideoLocalPlaybackFragment.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/playback/localPlayback/VideoLocalPlaybackFragment.kt index 5011fb2e5..9f17426a1 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/playback/localPlayback/VideoLocalPlaybackFragment.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/playback/localPlayback/VideoLocalPlaybackFragment.kt @@ -802,6 +802,8 @@ class VideoLocalPlaybackFragment : VideoPlaybackBaseFragment(), TextureView.Surf isDownloading = false ToastDialog(context, ToastDialog.Type.SUCCESS, getString(R.string.download_complete), 2000).show() } + } else if (event == 1010) { + Log.e(tag, "====event === 1010, 校验失败，info撞库防止串流： $msg") } } diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoMultiPreviewActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoMultiPreviewActivity.kt index 48fd5e60d..1c8ec0db4 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoMultiPreviewActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoMultiPreviewActivity.kt @@ -207,7 +207,11 @@ class VideoMultiPreviewActivity : VideoBaseActivity(), XP2PCallback, CoroutineSc } tryReleaseLock(id) - } else if (event == 1005) { } + } else if (event == 1005) { + + } else if (event == 1010) { + Log.e(tag, "====event === 1010, 校验失败，info撞库防止串流： $msg") + } } private fun tryReleaseLock(id: String?) { 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 c993bf13c..209d065cf 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 @@ -577,6 +577,8 @@ class VideoPreviewActivity : VideoBaseActivity(), EventView, TextureView.Surface if (event == 1004) { Log.e(tag, "====event === 1004") } + } else if (event == 1010) { + Log.e(tag, "====event === 1010, 校验失败，info撞库防止串流： $msg") } } diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoPreviewMJPEGActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoPreviewMJPEGActivity.kt index 0ee0e2afb..3de07b962 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoPreviewMJPEGActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoPreviewMJPEGActivity.kt @@ -598,6 +598,8 @@ class VideoPreviewMJPEGActivity : VideoBaseActivity(), EventView, TextureView.Su if (event == 1004) { Log.e(tag, "====event === 1004") } + } else if (event == 1010) { + Log.e(tag, "====event === 1010, 校验失败，info撞库防止串流： $msg") } } diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoPushStreamActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoPushStreamActivity.kt index c19e03d58..9022bb99f 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoPushStreamActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoPushStreamActivity.kt @@ -306,6 +306,8 @@ class VideoPushStreamActivity : VideoBaseActivity(), EventView, TextureView.Surf if (event == 1004) { Log.e(tag, "====event === 1004") } + } else if (event == 1010) { + Log.e(tag, "====event === 1010, 校验失败，info撞库防止串流： $msg") } } diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoWithoutPropertyActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoWithoutPropertyActivity.kt index a3d7a6ee2..29ff4fc95 100644 --- a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoWithoutPropertyActivity.kt +++ b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoWithoutPropertyActivity.kt @@ -406,6 +406,8 @@ class VideoWithoutPropertyActivity : VideoBaseActivity(), EventView, TextureView if (event == 1004) { Log.e(tag, "====event === 1004") } + } else if (event == 1010) { + Log.e(tag, "====event === 1010, 校验失败，info撞库防止串流： $msg") } }