Merge branch 'develop_sky' into 'master_sky'

Develop sky

See merge request StarlockTeam/app-starlock!68

.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:

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}');
     }
   }
 }

lib/talk/starChart/views/native/talk_view_native_decode_logic.dart

@@ -576,17 +576,25 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
 
   /// 更新发送预期数据
   void updateTalkExpect() {
+    // 清晰度与VideoTypeE的映射
+    final Map<String, VideoTypeE> 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],
       );
     }