From b99a4a99d44f99dbcc928a6dcf80b1986eb735ab Mon Sep 17 00:00:00 2001 From: liyi Date: Fri, 9 May 2025 17:52:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=E6=B5=8B=E8=AF=95ci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 85c78d24..45dfc905 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # 星锁APP -fix:测试ci + 星云项目组旗下的智能锁应用，其中锁相关数据接入星云平台，业务数据接入星锁自有后台。 基于Flutter技术架构，支持Android和iOS平台。 From c7cc02c045e947e0c2b32d4adcc36d7ca6dd9ab9 Mon Sep 17 00:00:00 2001 From: liyi Date: Fri, 9 May 2025 18:21:04 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E7=BA=BFtag=E5=88=A4=E6=96=AD=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 17a01616..b884f3a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ variables: - if: $CI_COMMIT_BRANCH == "release_sky" - if: $CI_COMMIT_BRANCH =~ /feat_[a-zA-Z]+/ - if: $CI_COMMIT_BRANCH == "canary_release" - - if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+\.[0-9]+)?$/ + - if: $CI_COMMIT_TAG =~ /^(sky_)?v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+\.[0-9]+)?$/ .notify_rule: tags: From 2f9328bd335889eb511929dc9906147cd61bed12 Mon Sep 17 00:00:00 2001 From: liyi Date: Fri, 9 May 2025 18:28:32 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=E6=B5=8B=E8=AF=95ci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 45dfc905..85c78d24 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # 星锁APP - +fix:测试ci 星云项目组旗下的智能锁应用，其中锁相关数据接入星云平台，业务数据接入星锁自有后台。 基于Flutter技术架构，支持Android和iOS平台。 From 7d4e2574040094cd1bfbe08a91e95831ab1fcb2f Mon Sep 17 00:00:00 2001 From: liyi Date: Fri, 16 May 2025 17:06:49 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E5=BC=80=E5=85=B3?= =?UTF-8?q?=E9=9D=99=E9=9F=B3=E6=97=B6=E4=BD=BF=E7=94=A8=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=9A=84=E6=B8=85=E6=99=B0=E5=BA=A6=E4=BD=9C=E4=B8=BA=E6=9C=9F?= =?UTF-8?q?=E6=9C=9B=E6=95=B0=E6=8D=AE=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/native/talk_view_native_decode_logic.dart | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/talk/starChart/views/native/talk_view_native_decode_logic.dart b/lib/talk/starChart/views/native/talk_view_native_decode_logic.dart index 606ae73c..9ddf4a57 100644 --- a/lib/talk/starChart/views/native/talk_view_native_decode_logic.dart +++ b/lib/talk/starChart/views/native/talk_view_native_decode_logic.dart @@ -576,17 +576,25 @@ class TalkViewNativeDecodeLogic extends BaseGetXController { /// 更新发送预期数据 void updateTalkExpect() { + // 清晰度与VideoTypeE的映射 + final Map qualityToVideoType = { + '标清': VideoTypeE.H264, + '高清': VideoTypeE.H264_720P, + // 可扩展更多清晰度 + }; TalkExpectReq talkExpectReq = TalkExpectReq(); state.isOpenVoice.value = !state.isOpenVoice.value; + // 根据当前清晰度动态设置videoType + VideoTypeE currentVideoType = qualityToVideoType[state.currentQuality.value] ?? VideoTypeE.H264; if (!state.isOpenVoice.value) { talkExpectReq = TalkExpectReq( - videoType: [VideoTypeE.H264], + videoType: [currentVideoType], audioType: [], ); showToast('已静音'.tr); } else { talkExpectReq = TalkExpectReq( - videoType: [VideoTypeE.H264], + videoType: [currentVideoType], audioType: [AudioTypeE.G711], ); } From 8e122e5a09b338ba48e5e98e8ae8de58d407c1e6 Mon Sep 17 00:00:00 2001 From: liyi Date: Fri, 16 May 2025 17:07:05 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E6=B7=B7mjpeg=E6=9C=9F=E6=9C=9B=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handle/impl/udp_talk_request_handler.dart | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/talk/starChart/handle/impl/udp_talk_request_handler.dart b/lib/talk/starChart/handle/impl/udp_talk_request_handler.dart index 5b72e229..195c2ab6 100644 --- a/lib/talk/starChart/handle/impl/udp_talk_request_handler.dart +++ b/lib/talk/starChart/handle/impl/udp_talk_request_handler.dart @@ -237,15 +237,18 @@ class UdpTalkRequestHandler extends ScpMessageBaseHandle if (isH264) { // 锁支持H264，发送H264视频和G711音频期望 startChartManage.sendOnlyH264VideoTalkExpectData(); - print('app收到的对讲请求后，发送的预期数据=========锁支持H264，发送H264视频格式期望数据'); + print( + 'app收到的对讲请求后，发送的预期数据=========锁支持H264，发送H264视频格式期望数据,peerID=${lockPeerID}'); } else if (isMJpeg) { // 锁只支持MJPEG，发送图像视频和G711音频期望 startChartManage.sendOnlyImageVideoTalkExpectData(); - print('app收到的对讲请求后，发送的预期数据=========锁不支持H264，支持MJPEG，发送MJPEG视频格式期望数据'); + print( + 'app收到的对讲请求后，发送的预期数据=========锁不支持H264，支持MJPEG，发送MJPEG视频格式期望数据,peerID=${lockPeerID}'); } else { // 默认使用图像视频 startChartManage.sendOnlyImageVideoTalkExpectData(); - print('app收到的对讲请求后，发送的预期数据=========锁不支持H264和MJPEG，默认发送图像视频格式期望数据'); + print( + 'app收到的对讲请求后，发送的预期数据=========锁不支持H264和MJPEG，默认发送MJPEG视频格式期望数据,peerID=${lockPeerID}'); } } @@ -281,15 +284,18 @@ class UdpTalkRequestHandler extends ScpMessageBaseHandle if (isH264) { // 锁支持H264，发送H264视频和G711音频期望 startChartManage.sendH264VideoAndG711AudioTalkExpectData(); - print('app主动发请求，收到回复后发送的预期数据=======锁支持H264，发送H264视频格式期望数据'); + AppLog.log( + 'app主动发对讲请求，收到回复后发送的预期数据=======锁支持H264，发送H264视频格式期望数据,peerID=${lockPeerID}'); } else if (isMJpeg) { // 锁只支持MJPEG，发送图像视频和G711音频期望 startChartManage.sendImageVideoAndG711AudioTalkExpectData(); - print('app主动发请求，收到回复后发送的预期数据=======锁不支持H264，支持MJPEG，发送MJPEG视频格式期望数据'); + AppLog.log( + 'app主动发对讲请求，收到回复后发送的预期数据=======锁不支持H264，支持MJPEG，发送MJPEG视频格式期望数据,peerID=${lockPeerID}'); } else { // 默认使用图像视频 startChartManage.sendImageVideoAndG711AudioTalkExpectData(); - print('app主动发请求，收到回复后发送的预期数据=======锁不支持H264和MJPEG，默认发送图像视频格式期望数据'); + AppLog.log( + 'app主动发对讲请求，收到回复后发送的预期数据=======锁不支持H264和MJPEG，默认发送MJPEG视频格式期望数据,peerID=${lockPeerID}'); } } }