fix: 增加日志

lib/mine/addLock/saveLock/saveLock_logic.dart

@@ -31,8 +31,7 @@ class SaveLockLogic extends BaseGetXController {
   late StreamSubscription<Reply> _replySubscription;
 
   void _initReplySubscription() {
-    _replySubscription =
+    _replySubscription = EventBusManager().eventBus!.on<Reply>().listen((Reply reply) {
-        EventBusManager().eventBus!.on<Reply>().listen((Reply reply) {
       if (reply is AddUserReply && state.ifCurrentScreen.value == true) {
         _replyAddUserKey(reply);
       }
@@ -66,15 +65,11 @@ class SaveLockLogic extends BaseGetXController {
         break;
       case 0x06:
         //无权限
-        final List<String>? privateKey =
+        final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-            await Storage.getStringList(saveBluePrivateKey);
+        final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
-        final List<int> getPrivateKeyList =
-            changeStringListToIntList(privateKey!);
 
-        final List<String>? publicKey =
+        final List<String>? publicKey = await Storage.getStringList(saveBluePublicKey);
-            await Storage.getStringList(saveBluePublicKey);
+        final List<int> publicKeyDataList = changeStringListToIntList(publicKey!);
-        final List<int> publicKeyDataList =
-            changeStringListToIntList(publicKey!);
 
         IoSenderManage.senderAddUser(
             lockID: BlueManage().connectDeviceName,
@@ -215,19 +210,14 @@ class SaveLockLogic extends BaseGetXController {
         showBlueConnetctToast();
       }
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName,
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async {
-        (BluetoothConnectionState deviceConnectionState) async {
       if (deviceConnectionState == BluetoothConnectionState.connected) {
         // 私钥
-        final List<String>? privateKey =
+        final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-            await Storage.getStringList(saveBluePrivateKey);
+        final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
-        final List<int> getPrivateKeyList =
-            changeStringListToIntList(privateKey!);
 
-        final List<String>? publicKey =
+        final List<String>? publicKey = await Storage.getStringList(saveBluePublicKey);
-            await Storage.getStringList(saveBluePublicKey);
+        final List<int> publicKeyDataList = changeStringListToIntList(publicKey!);
-        final List<int> publicKeyDataList =
-            changeStringListToIntList(publicKey!);
 
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         List<int> getTokenList = <int>[0, 0, 0, 0];
@@ -257,8 +247,7 @@ class SaveLockLogic extends BaseGetXController {
             privateKey: getPrivateKeyList,
             token: getTokenList,
             isBeforeAddUser: true);
-      } else if (deviceConnectionState ==
+      } else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
-          BluetoothConnectionState.disconnected) {
         dismissEasyLoading();
         cancelBlueConnetctToastTimer();
         state.sureBtnState.value = 0;
@@ -376,16 +365,14 @@ class SaveLockLogic extends BaseGetXController {
     // positionMap['address'] = state.addressInfo['address'];
 
     final Map<String, dynamic> bluetooth = <String, dynamic>{};
-    bluetooth['bluetoothDeviceId'] = BlueManage().connectDeviceMacAddress;
+    bluetooth['bluetoothDeviceId'] = state.lockInfo['mac'];
     bluetooth['bluetoothDeviceName'] = BlueManage().connectDeviceName;
 
-    final List<String>? publicKey =
+    final List<String>? publicKey = await Storage.getStringList(saveBluePublicKey);
-        await Storage.getStringList(saveBluePublicKey);
     final List<int> publicKeyDataList = changeStringListToIntList(publicKey!);
     bluetooth['publicKey'] = publicKeyDataList;
 
-    final List<String>? privateKey =
+    final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-        await Storage.getStringList(saveBluePrivateKey);
     final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
     bluetooth['privateKey'] = getPrivateKeyList;
 
@@ -410,8 +397,7 @@ class SaveLockLogic extends BaseGetXController {
       final String getMobile = (await Storage.getMobile())!;
       ApmHelper.instance.trackEvent('save_lock_result', {
         'lock_name': BlueManage().connectDeviceName,
-        'account':
+        'account': getMobile.isNotEmpty ? getMobile : (await Storage.getEmail())!,
-            getMobile.isNotEmpty ? getMobile : (await Storage.getEmail())!,
         'date': DateTool().getNowDateWithType(1),
         'save_lock_result': '成功',
       });
@@ -427,8 +413,7 @@ class SaveLockLogic extends BaseGetXController {
       final String getMobile = (await Storage.getMobile())!;
       ApmHelper.instance.trackEvent('save_lock_result', {
         'lock_name': BlueManage().connectDeviceName,
-        'account':
+        'account': getMobile.isNotEmpty ? getMobile : (await Storage.getEmail())!,
-            getMobile.isNotEmpty ? getMobile : (await Storage.getEmail())!,
         'date': DateTool().getNowDateWithType(1),
         'save_lock_result': '${entity.errorCode}--${entity.errorMsg}',
       });
@@ -489,26 +474,18 @@ class SaveLockLogic extends BaseGetXController {
     // BlueManage().disconnect();
 
     // 查询锁设置信息
-    final LockSetInfoEntity entity =
+    final LockSetInfoEntity entity = await ApiRepository.to.getLockSettingInfoData(
-        await ApiRepository.to.getLockSettingInfoData(
       lockId: state.lockId.toString(),
     );
     if (entity.errorCode!.codeIsSuccessful) {
       state.lockSetInfoData.value = entity.data!;
       if (state.lockSetInfoData.value.lockFeature?.wifi == 1) {
         // 如果是wifi锁，需要配置WIFI
-        Get.toNamed(Routers.wifiListPage, arguments: {
+        Get.toNamed(Routers.wifiListPage, arguments: {'lockSetInfoData': state.lockSetInfoData.value, 'pageName': 'saveLock'});
-          'lockSetInfoData': state.lockSetInfoData.value,
-          'pageName': 'saveLock'
-        });
       } else if (state.lockSetInfoData.value.lockFeature?.languageSpeech == 1) {
-        Get.toNamed(Routers.lockVoiceSettingPage, arguments: {
+        Get.toNamed(Routers.lockVoiceSettingPage, arguments: {'lockSetInfoData': state.lockSetInfoData.value, 'pageName': 'saveLock'});
-          'lockSetInfoData': state.lockSetInfoData.value,
-          'pageName': 'saveLock'
-        });
       } else {
-        eventBus.fire(RefreshLockListInfoDataEvent(
+        eventBus.fire(RefreshLockListInfoDataEvent(clearScanDevices: true, isUnShowLoading: true));
-            clearScanDevices: true, isUnShowLoading: true));
         Future<void>.delayed(const Duration(seconds: 1), () {
           // Get.close(state.isFromMap == 1
           //     ? (CommonDataManage().seletLockType == 0 ? 4 : 5)
@@ -518,15 +495,12 @@ class SaveLockLogic extends BaseGetXController {
         //刚刚配对完，需要对开锁页锁死 2 秒
         Future<void>.delayed(const Duration(milliseconds: 200), () {
           if (Get.isRegistered<LockDetailLogic>()) {
-            Get.find<LockDetailLogic>()
+            Get.find<LockDetailLogic>().functionBlocker.countdownProhibited(duration: const Duration(seconds: 2));
-                .functionBlocker
-                .countdownProhibited(duration: const Duration(seconds: 2));
           }
         });
       }
     } else {
-      eventBus.fire(RefreshLockListInfoDataEvent(
+      eventBus.fire(RefreshLockListInfoDataEvent(clearScanDevices: true, isUnShowLoading: true));
-          clearScanDevices: true, isUnShowLoading: true));
       Future<void>.delayed(const Duration(seconds: 1), () {
         // Get.close(state.isFromMap == 1
         //     ? (CommonDataManage().seletLockType == 0 ? 4 : 5)
@@ -536,9 +510,7 @@ class SaveLockLogic extends BaseGetXController {
       //刚刚配对完，需要对开锁页锁死 2 秒
       Future<void>.delayed(const Duration(milliseconds: 200), () {
         if (Get.isRegistered<LockDetailLogic>()) {
-          Get.find<LockDetailLogic>()
+          Get.find<LockDetailLogic>().functionBlocker.countdownProhibited(duration: const Duration(seconds: 2));
-              .functionBlocker
-              .countdownProhibited(duration: const Duration(seconds: 2));
         }
       });
     }

lib/talk/starChart/handle/impl/udp_talk_request_handler.dart

@@ -62,8 +62,6 @@ class UdpTalkRequestHandler extends ScpMessageBaseHandle implements ScpMessageHa
       _handleResponseSendExpect(
         lockPeerID: scpMessage.FromPeerId!,
       );
-      // 发送预期数据
-      startChartManage.startTalkExpectTimer();
       // 停止发送对讲请求
       startChartManage.stopCallRequestMessageTimer();
       // 收到应答后取消超时判断

lib/talk/starChart/star_chart_manage.dart

@@ -282,7 +282,9 @@ class StartChartManage {
   // 发送RbcuInfo 地址交换消息
   void _sendRbcuInfoMessage({required String ToPeerId, bool isResp = false}) async {
     final uuid = _uuid.v1();
-    final int timestamp = DateTime.now().millisecondsSinceEpoch;
+    final int timestamp = DateTime
+        .now()
+        .millisecondsSinceEpoch;
     final Int64 int64Timestamp = Int64(timestamp); // 使用构造函数
 
     // 获取本机所有ip地址和中继返回的外网地址
@@ -301,7 +303,7 @@ class StartChartManage {
         .where((addr) => addr != null) // 过滤掉 null 值
         .map(
           (addr) => addr!.replaceAll(IpConstant.udpUrl, ''),
-        ) // 去除 "udp://" 前缀
+    ) // 去除 "udp://" 前缀
         .cast<String>(); // 转换为 Iterable<String>// 将 Iterable<String?> 转换为 Iterable<String>
     _rbcuSessionId = uuid;
     final RbcuInfo rbcuInfo = RbcuInfo(
@@ -457,7 +459,7 @@ class StartChartManage {
       Duration(
         seconds: _defaultIntervalTime,
       ),
-      (Timer timer) async {
+          (Timer timer) async {
         AppLog.log('发送对讲请求：${ToPeerId}');
         await sendCallRequestMessage(ToPeerId: ToPeerId);
       },
@@ -533,7 +535,7 @@ class StartChartManage {
       Duration(
         seconds: heartbeatIntervalTime,
       ),
-      (Timer timer) async {
+          (Timer timer) async {
         final List<int> message = MessageCommand.heartbeatMessage(
           FromPeerId: FromPeerId,
           ToPeerId: relayPeerId,
@@ -583,7 +585,9 @@ class StartChartManage {
       ToPeerId: ToPeerId,
       FromPeerId: FromPeerId,
       gatewayId: gatewayId,
-      time: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+      time: DateTime
+          .now()
+          .millisecondsSinceEpoch ~/ 1000,
       MessageId: MessageCommand.getNextMessageId(ToPeerId, increment: true),
     );
     await _sendMessage(message: message);
@@ -617,7 +621,7 @@ class StartChartManage {
 
       talkRejectTimer ??= Timer.periodic(
         Duration(seconds: _defaultIntervalTime),
-        (Timer timer) async {
+            (Timer timer) async {
           _sendTalkRejectMessage();
           count++;
           if (count >= maxCount) {
@@ -723,7 +727,7 @@ class StartChartManage {
   void startTalkHangupMessageTimer() {
     talkHangupTimer ??= Timer.periodic(
       Duration(seconds: _defaultIntervalTime),
-      (Timer timer) async {
+          (Timer timer) async {
         _sendTalkHangupMessage();
       },
     );
@@ -767,7 +771,7 @@ class StartChartManage {
       Duration(
         seconds: _defaultIntervalTime,
       ),
-      (Timer timer) async {
+          (Timer timer) async {
         // 重新发送上线消息
         await _sendOnlineMessage();
       },
@@ -937,7 +941,9 @@ class StartChartManage {
           String ipAddress = address.address;
           // 移除 IPv6 地址中的接口标识符（如果有）
           if (ipAddress.contains('%')) {
-            ipAddress = ipAddress.split('%').first;
+            ipAddress = ipAddress
+                .split('%')
+                .first;
           }
           // 确保 IP 地址不为空且不在排除列表中
           if (ipAddress.isNotEmpty && !IpConstant.reportExcludeIp.contains(ipAddress)) {
@@ -1060,7 +1066,7 @@ class StartChartManage {
       Duration(
         seconds: _defaultIntervalTime,
       ),
-      (Timer timer) async {
+          (Timer timer) async {
         await sendTalkPingMessage(
           ToPeerId: ToPeerId,
           FromPeerId: FromPeerId,
@@ -1081,7 +1087,7 @@ class StartChartManage {
       Duration(
         seconds: _defaultIntervalTime,
       ),
-      (Timer timer) {
+          (Timer timer) {
         // 发送期望接受消息
         sendTalkExpectMessage(
           talkExpect: _defaultTalkExpect,
@@ -1096,7 +1102,7 @@ class StartChartManage {
       Duration(
         seconds: _defaultIntervalTime,
       ),
-      (Timer timer) {
+          (Timer timer) {
         sendTalkAcceptMessage();
       },
     );
@@ -1128,7 +1134,16 @@ class StartChartManage {
   /// 修改预期接收到的数据
   void changeTalkExpectDataTypeAndReStartTalkExpectMessageTimer({required TalkExpectReq talkExpect}) {
     _defaultTalkExpect = talkExpect;
-    reStartTalkExpectMessageTimer();
+    sendTalkExpectMessage(
+      talkExpect: _defaultTalkExpect,
+    );
+    sendTalkExpectMessage(
+      talkExpect: _defaultTalkExpect,
+    );
+    sendTalkExpectMessage(
+      talkExpect: _defaultTalkExpect,
+    );
+    // reStartTalkExpectMessageTimer();
   }
 
   void reSetDefaultTalkExpect() {

lib/talk/starChart/views/guide/permission_guidance_page.dart

@@ -18,7 +18,7 @@ class _PermissionGuidancePageState extends State<PermissionGuidancePage> {
 
   final List<Map<String, String>> _stepsData = [
     {
-      'image': 'images/guide/matter.png',
+      'image': 'images/guide/1.png',
       'text': '步骤1：打开应用信息，点击通知管理选项',
     },
     {
@@ -26,7 +26,7 @@ class _PermissionGuidancePageState extends State<PermissionGuidancePage> {
       'text': '步骤2：下滑点击呼叫提醒的通知选项',
     },
     {
-      'image': 'images/guide/tuya.png',
+      'image': 'images/guide/3.png',
       'text': '步骤3：选择在锁定屏幕上的选项设置',
     },
     {

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

@@ -104,8 +104,6 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
         codecType: 'h264',
       );
       // 初始化解码器并获取textureId
-      AppLog.log('StartChartManage().videoWidth:${StartChartManage().videoWidth}');
-      AppLog.log('StartChartManage().videoHeight:${StartChartManage().videoHeight}');
       final textureId = await VideoDecodePlugin.initDecoder(config);
       if (textureId != null) {
         Future.microtask(() => state.textureId.value = textureId);
@@ -258,8 +256,11 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
     AppLog.log('启动帧处理定时器，目标帧率: ${state.targetFps}fps，间隔: ${intervalMs}ms');
   }
 
+  /// 从缓冲区处理下一帧
   /// 从缓冲区处理下一帧
   void _processNextFrameFromBuffer() async {
+    final startTime = DateTime.now().microsecondsSinceEpoch;
+
     // 避免重复处理
     if (state.isProcessingFrame) {
       return;
@@ -270,61 +271,16 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
       return;
     }
 
-    // 优先查找I帧，按frameSeq最小的I帧消费
+    try {
-    final iFrames = state.h264FrameBuffer.where((f) => f['frameType'] == TalkDataH264Frame_FrameTypeE.I).toList();
+      // 优先查找I帧，按frameSeq最小的I帧消费
-    iFrames.sort((a, b) => (a['frameSeq'] as int).compareTo(b['frameSeq'] as int));
+      final iFrames = state.h264FrameBuffer.where((f) => f['frameType'] == TalkDataH264Frame_FrameTypeE.I).toList();
+      iFrames.sort((a, b) => (a['frameSeq'] as int).compareTo(b['frameSeq'] as int));
 
-    if (iFrames.isNotEmpty) {
+      if (iFrames.isNotEmpty) {
-      // 有I帧，消费最小的I帧，并记录其frameSeq
+        final minIFrame = iFrames.first;
-      final minIFrame = iFrames.first;
+        final minIFrameSeq = minIFrame['frameSeq'];
-      final minIFrameSeq = minIFrame['frameSeq'];
-      final targetIndex = state.h264FrameBuffer.indexWhere(
-        (f) => f['frameType'] == TalkDataH264Frame_FrameTypeE.I && f['frameSeq'] == minIFrameSeq,
-      );
-      state.isProcessingFrame = true;
-      final Map<String, dynamic>? frameMap = state.h264FrameBuffer.removeAt(targetIndex);
-      if (frameMap == null) {
-        state.isProcessingFrame = false;
-        return;
-      }
-      final List<int>? frameData = frameMap['frameData'];
-      final TalkDataH264Frame_FrameTypeE? frameType = frameMap['frameType'];
-      final int? frameSeq = frameMap['frameSeq'];
-      final int? frameSeqI = frameMap['frameSeqI'];
-      final int? pts = frameMap['pts'];
-      final ScpMessage? scpMessage = frameMap['scpMessage'];
-      if (frameData == null || frameType == null || frameSeq == null || frameSeqI == null || pts == null) {
-        state.isProcessingFrame = false;
-        return;
-      }
-      if (state.textureId.value == null) {
-        state.isProcessingFrame = false;
-        return;
-      }
-      lastDecodedIFrameSeq = minIFrameSeq;
-      AppLog.log('送入解码器的P帧数据frameSeq:${frameSeq},frameSeqI:${frameSeqI},'
-          'frameType:${frameType},messageId:${scpMessage!.MessageId}');
-      await VideoDecodePlugin.sendFrame(
-        frameData: frameData,
-        frameType: 0,
-        frameSeq: frameSeq,
-        timestamp: pts,
-        splitNalFromIFrame: true,
-        refIFrameSeq: frameSeqI,
-      );
-      state.isProcessingFrame = false;
-      return;
-    }
-
-    // 没有I帧时，只消费refIFrameSeq等于lastDecodedIFrameSeq的P帧
-    if (lastDecodedIFrameSeq != null) {
-      final validPFrames =
-          state.h264FrameBuffer.where((f) => f['frameType'] == TalkDataH264Frame_FrameTypeE.P && f['frameSeqI'] == lastDecodedIFrameSeq).toList();
-      if (validPFrames.isNotEmpty) {
-        validPFrames.sort((a, b) => (a['frameSeq'] as int).compareTo(b['frameSeq'] as int));
-        final minPFrame = validPFrames.first;
         final targetIndex = state.h264FrameBuffer.indexWhere(
-          (f) => f['frameType'] == TalkDataH264Frame_FrameTypeE.P && f['frameSeq'] == minPFrame['frameSeq'] && f['frameSeqI'] == lastDecodedIFrameSeq,
+          (f) => f['frameType'] == TalkDataH264Frame_FrameTypeE.I && f['frameSeq'] == minIFrameSeq,
         );
         state.isProcessingFrame = true;
         final Map<String, dynamic>? frameMap = state.h264FrameBuffer.removeAt(targetIndex);
@@ -337,7 +293,6 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
         final int? frameSeq = frameMap['frameSeq'];
         final int? frameSeqI = frameMap['frameSeqI'];
         final int? pts = frameMap['pts'];
-        final ScpMessage? scpMessage = frameMap['scpMessage'];
         if (frameData == null || frameType == null || frameSeq == null || frameSeqI == null || pts == null) {
           state.isProcessingFrame = false;
           return;
@@ -346,12 +301,11 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
           state.isProcessingFrame = false;
           return;
         }
-        // AppLog.log('送入解码器的I帧数据frameSeq:${frameSeq},frameSeqI:${frameSeqI},'
+        lastDecodedIFrameSeq = minIFrameSeq;
-        //     'frameType:${frameType},messageId:${scpMessage!.MessageId}');
 
         await VideoDecodePlugin.sendFrame(
           frameData: frameData,
-          frameType: 1,
+          frameType: 0,
           frameSeq: frameSeq,
           timestamp: pts,
           splitNalFromIFrame: true,
@@ -360,8 +314,61 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
         state.isProcessingFrame = false;
         return;
       }
+
+      // 没有I帧时，只消费refIFrameSeq等于lastDecodedIFrameSeq的P帧
+      if (lastDecodedIFrameSeq != null) {
+        final validPFrames =
+            state.h264FrameBuffer.where((f) => f['frameType'] == TalkDataH264Frame_FrameTypeE.P && f['frameSeqI'] == lastDecodedIFrameSeq).toList();
+        if (validPFrames.isNotEmpty) {
+          validPFrames.sort((a, b) => (a['frameSeq'] as int).compareTo(b['frameSeq'] as int));
+          final minPFrame = validPFrames.first;
+          final targetIndex = state.h264FrameBuffer.indexWhere(
+            (f) =>
+                f['frameType'] == TalkDataH264Frame_FrameTypeE.P && f['frameSeq'] == minPFrame['frameSeq'] && f['frameSeqI'] == lastDecodedIFrameSeq,
+          );
+          state.isProcessingFrame = true;
+          final Map<String, dynamic>? frameMap = state.h264FrameBuffer.removeAt(targetIndex);
+          if (frameMap == null) {
+            state.isProcessingFrame = false;
+            return;
+          }
+          final List<int>? frameData = frameMap['frameData'];
+          final TalkDataH264Frame_FrameTypeE? frameType = frameMap['frameType'];
+          final int? frameSeq = frameMap['frameSeq'];
+          final int? frameSeqI = frameMap['frameSeqI'];
+          final int? pts = frameMap['pts'];
+          if (frameData == null || frameType == null || frameSeq == null || frameSeqI == null || pts == null) {
+            state.isProcessingFrame = false;
+            return;
+          }
+          if (state.textureId.value == null) {
+            state.isProcessingFrame = false;
+            return;
+          }
+
+          await VideoDecodePlugin.sendFrame(
+            frameData: frameData,
+            frameType: 1,
+            frameSeq: frameSeq,
+            timestamp: pts,
+            splitNalFromIFrame: true,
+            refIFrameSeq: frameSeqI,
+          );
+          state.isProcessingFrame = false;
+          return;
+        }
+      }
+      // 其他情况不消费，等待I帧到来
+    } finally {
+      final endTime = DateTime.now().microsecondsSinceEpoch;
+      final durationMs = (endTime - startTime) / 1000.0;
+      // 可选：只在耗时较长时打印（例如 > 5ms）
+      if (durationMs > 5) {
+        debugPrint('[_processNextFrameFromBuffer] 耗时: ${durationMs.toStringAsFixed(2)} ms');
+        // 或使用你的日志系统，如：
+        // AppLog.log('Frame processing took ${durationMs.toStringAsFixed(2)} ms');
+      }
     }
-    // 其他情况不消费，等待I帧到来
   }
 
   /// 停止帧处理定时器

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

@@ -29,15 +29,12 @@ class TalkViewNativeDecodePage extends StatefulWidget {
   const TalkViewNativeDecodePage({Key? key}) : super(key: key);
 
   @override
-  State<TalkViewNativeDecodePage> createState() =>
+  State<TalkViewNativeDecodePage> createState() => _TalkViewNativeDecodePageState();
-      _TalkViewNativeDecodePageState();
 }
 
-class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
+class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage> with TickerProviderStateMixin {
-    with TickerProviderStateMixin {
   final TalkViewNativeDecodeLogic logic = Get.put(TalkViewNativeDecodeLogic());
-  final TalkViewNativeDecodeState state =
+  final TalkViewNativeDecodeState state = Get.find<TalkViewNativeDecodeLogic>().state;
-      Get.find<TalkViewNativeDecodeLogic>().state;
   final startChartManage = StartChartManage();
 
   @override
@@ -69,66 +66,48 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
         // 返回 false 表示禁止退出
         return false;
       },
-      child: SizedBox(
+      child: Container(
         width: 1.sw,
         height: 1.sh,
+        color: Colors.black.withOpacity(0.7),
         child: Stack(
           alignment: Alignment.center,
           children: <Widget>[
             // 悬浮帧率统计信息条
             Obx(
               () {
-                final double screenWidth = MediaQuery.of(context).size.width;
-                final double screenHeight = MediaQuery.of(context).size.height;
-
-                final double logicalWidth = MediaQuery.of(context).size.width;
-                final double logicalHeight = MediaQuery.of(context).size.height;
-                final double devicePixelRatio =
-                    MediaQuery.of(context).devicePixelRatio;
-
-                // 计算物理像素值
-                final double physicalWidth = logicalWidth * devicePixelRatio;
-                final double physicalHeight = logicalHeight * devicePixelRatio;
-
-                // 旋转后的图片尺寸
-                const int rotatedImageWidth = 480; // 原始高度
-                const int rotatedImageHeight = 864; // 原始宽度
-
-                // 计算缩放比例
-                final double scaleWidth = physicalWidth / rotatedImageWidth;
-                final double scaleHeight = physicalHeight / rotatedImageHeight;
-                max(scaleWidth, scaleHeight); // 选择较大的缩放比例
                 // 防御性处理：只要loading中或textureId为null，优先渲染loading/占位
                 if (state.isLoading.isTrue || state.textureId.value == null) {
                   return Image.asset(
                     'images/main/monitorBg.png',
-                    width: screenWidth,
+                    width: 1.sw,
-                    height: screenHeight,
+                    height: 1.sh,
                     fit: BoxFit.cover,
                   );
                 } else {
-                  return Positioned.fill(
+                  return Positioned(
+                    top: 0,
+                    left: 0,
+                    right: 0,
                     child: PopScope(
                       canPop: false,
                       child: RepaintBoundary(
                         key: state.globalKey,
-                        child: SizedBox.expand(
+                        child: RotatedBox(
-                          child: RotatedBox(
+                          // 解码器不支持硬件旋转，使用RotatedBox
-                              // 解码器不支持硬件旋转，使用RotatedBox
+                          quarterTurns: startChartManage.rotateAngle ~/ 90,
-                              quarterTurns: startChartManage.rotateAngle ~/ 90,
+                          child: state.isFullScreen.isFalse
-                              child: Platform.isIOS
+                              ? AspectRatio(
-                                  ? Transform.scale(
+                                  aspectRatio: StartChartManage().videoWidth / StartChartManage().videoHeight,
-                                      scale: 1.008, // 轻微放大，消除iOS白边
+                                  child: Texture(
-                                      child: Texture(
-                                        textureId: state.textureId.value!,
-                                        filterQuality: FilterQuality.medium,
-                                      ),
-                                    )
-                                : Texture(
                                     textureId: state.textureId.value!,
                                     filterQuality: FilterQuality.medium,
                                   ),
-                          ),
+                                )
+                              : Texture(
+                                  textureId: state.textureId.value!,
+                                  filterQuality: FilterQuality.medium,
+                                ),
                         ),
                       ),
                     ),
@@ -151,19 +130,14 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
                     width: 1.sw,
                     child: Obx(
                       () {
-                        final String sec = (state.oneMinuteTime.value % 60)
+                        final String sec = (state.oneMinuteTime.value % 60).toString().padLeft(2, '0');
-                            .toString()
+                        final String min = (state.oneMinuteTime.value ~/ 60).toString().padLeft(2, '0');
-                            .padLeft(2, '0');
-                        final String min = (state.oneMinuteTime.value ~/ 60)
-                            .toString()
-                            .padLeft(2, '0');
                         return Row(
                           mainAxisAlignment: MainAxisAlignment.center,
                           children: <Widget>[
                             Text(
                               '$min:$sec',
-                              style: TextStyle(
+                              style: TextStyle(fontSize: 26.sp, color: Colors.white),
-                                  fontSize: 26.sp, color: Colors.white),
                             ),
                           ],
                         );
@@ -177,9 +151,7 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
                 width: 1.sw - 30.w * 2,
                 // height: 300.h,
                 margin: EdgeInsets.all(30.w),
-                decoration: BoxDecoration(
+                decoration: BoxDecoration(color: Colors.black.withOpacity(0.2), borderRadius: BorderRadius.circular(20.h)),
-                    color: Colors.black.withOpacity(0.2),
-                    borderRadius: BorderRadius.circular(20.h)),
                 child: Column(
                   children: <Widget>[
                     SizedBox(height: 20.h),
@@ -191,9 +163,7 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
                 ),
               ),
             ),
-            Obx(() => state.isLoading.isTrue
+            Obx(() => state.isLoading.isTrue ? buildRotationTransition() : Container()),
-                ? buildRotationTransition()
-                : Container()),
             Obx(() => state.isLongPressing.value
                 ? Positioned(
                     top: 80.h,
@@ -213,8 +183,7 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
                             SizedBox(width: 10.w),
                             Text(
                               '正在说话...'.tr,
-                              style: TextStyle(
+                              style: TextStyle(fontSize: 20.sp, color: Colors.white),
-                                  fontSize: 20.sp, color: Colors.white),
                             ),
                           ],
                         ),
@@ -246,10 +215,8 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
               width: 40.w,
               height: 40.w,
               image: state.isOpenVoice.value
-                  ? const AssetImage(
+                  ? const AssetImage('images/main/icon_lockDetail_monitoringOpenVoice.png')
-                      'images/main/icon_lockDetail_monitoringOpenVoice.png')
+                  : const AssetImage('images/main/icon_lockDetail_monitoringCloseVoice.png'))),
-                  : const AssetImage(
-                      'images/main/icon_lockDetail_monitoringCloseVoice.png'))),
         ),
       ),
       SizedBox(width: 50.w),
@@ -264,11 +231,7 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
           width: 50.w,
           height: 50.w,
           padding: EdgeInsets.all(5.w),
-          child: Image(
+          child: Image(width: 40.w, height: 40.w, image: const AssetImage('images/main/icon_lockDetail_monitoringScreenshot.png')),
-              width: 40.w,
-              height: 40.w,
-              image: const AssetImage(
-                  'images/main/icon_lockDetail_monitoringScreenshot.png')),
         ),
       ),
       SizedBox(width: 50.w),
@@ -293,8 +256,7 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
             width: 40.w,
             height: 40.w,
             fit: BoxFit.fill,
-            image: const AssetImage(
+            image: const AssetImage('images/main/icon_lockDetail_monitoringScreenRecording.png'),
-                'images/main/icon_lockDetail_monitoringScreenRecording.png'),
           ),
         ),
       ),
@@ -330,13 +292,8 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
                                   Text(
                                     q,
                                     style: TextStyle(
-                                      color: state.currentQuality.value == q
+                                      color: state.currentQuality.value == q ? AppColors.mainColor : Colors.black,
-                                          ? AppColors.mainColor
+                                      fontWeight: state.currentQuality.value == q ? FontWeight.bold : FontWeight.normal,
-                                          : Colors.black,
-                                      fontWeight:
-                                          state.currentQuality.value == q
-                                              ? FontWeight.bold
-                                              : FontWeight.normal,
                                       fontSize: 28.sp,
                                     ),
                                   ),
@@ -352,8 +309,7 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
           );
         },
         child: Container(
-          child: Icon(Icons.high_quality_outlined,
+          child: Icon(Icons.high_quality_outlined, color: Colors.white, size: 38.w),
-              color: Colors.white, size: 38.w),
         ),
       ),
       Visibility(
@@ -377,61 +333,56 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
   }
 
   Widget bottomBottomBtnWidget() {
-    return Row(
+    return Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: <Widget>[
-        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+      // 接听
-        children: <Widget>[
+      Obx(
-          // 接听
+        () => bottomBtnItemWidget(
-          Obx(
+          getAnswerBtnImg(),
-            () => bottomBtnItemWidget(
+          getAnswerBtnName(),
-              getAnswerBtnImg(),
+          Colors.white,
-              getAnswerBtnName(),
+          longPress: () async {
-              Colors.white,
+            if (state.talkStatus.value == TalkStatus.answeredSuccessfully) {
-              longPress: () async {
+              // 启动录音
-                if (state.talkStatus.value == TalkStatus.answeredSuccessfully) {
+              logic.startProcessingAudio();
-                  // 启动录音
+              state.isLongPressing.value = true;
-                  logic.startProcessingAudio();
+            }
-                  state.isLongPressing.value = true;
+          },
-                }
+          longPressUp: () async {
-              },
+            // 停止录音
-              longPressUp: () async {
+            logic.stopProcessingAudio();
-                // 停止录音
+            state.isLongPressing.value = false;
-                logic.stopProcessingAudio();
+          },
-                state.isLongPressing.value = false;
+          onClick: () async {
-              },
+            if (state.talkStatus.value == TalkStatus.passiveCallWaitingAnswer) {
-              onClick: () async {
+              // 接听
-                if (state.talkStatus.value ==
+              logic.initiateAnswerCommand();
-                    TalkStatus.passiveCallWaitingAnswer) {
+            }
-                  // 接听
+          },
-                  logic.initiateAnswerCommand();
+        ),
-                }
+      ),
-              },
+      bottomBtnItemWidget('images/main/icon_lockDetail_hangUp.png', '挂断'.tr, Colors.red, onClick: () {
-            ),
+        // 挂断
-          ),
+        logic.udpHangUpAction();
-          bottomBtnItemWidget(
+      }),
-              'images/main/icon_lockDetail_hangUp.png', '挂断'.tr, Colors.red,
+      bottomBtnItemWidget(
-              onClick: () {
+        'images/main/icon_lockDetail_monitoringUnlock.png',
-            // 挂断
+        '开锁'.tr,
-            logic.udpHangUpAction();
+        AppColors.mainColor,
-          }),
+        onClick: () {
-          bottomBtnItemWidget(
+          // if (state.talkStatus.value == TalkStatus.answeredSuccessfully &&
-            'images/main/icon_lockDetail_monitoringUnlock.png',
+          //     state.listData.value.length > 0) {
-            '开锁'.tr,
+          // logic.udpOpenDoorAction();
-            AppColors.mainColor,
+          // }
-            onClick: () {
+          // if (UDPManage().remoteUnlock == 1) {
-              // if (state.talkStatus.value == TalkStatus.answeredSuccessfully &&
+          // logic.udpOpenDoorAction();
-              //     state.listData.value.length > 0) {
+          // showDeletPasswordAlertDialog(context);
-              // logic.udpOpenDoorAction();
+          // } else {
-              // }
+          //   logic.showToast('请在锁设置中开启远程开锁'.tr);
-              // if (UDPManage().remoteUnlock == 1) {
+          // }
-              // logic.udpOpenDoorAction();
+          logic.remoteOpenLock();
-              // showDeletPasswordAlertDialog(context);
+        },
-              // } else {
+      )
-              //   logic.showToast('请在锁设置中开启远程开锁'.tr);
+    ]);
-              // }
-              logic.remoteOpenLock();
-            },
-          )
-        ]);
   }
 
   String getAnswerBtnImg() {

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

@@ -69,7 +69,7 @@ class _TalkViewNativeDecodePageDebugState extends State<TalkViewNativeDecodePage
       child: Container(
         width: 1.sw,
         height: 1.sh,
-        color: Colors.blue,
+        color: Colors.black.withOpacity(0.7),
         child: Stack(
           alignment: Alignment.center,
           children: <Widget>[
@@ -92,33 +92,29 @@ class _TalkViewNativeDecodePageDebugState extends State<TalkViewNativeDecodePage
                     canPop: false,
                     child: RepaintBoundary(
                       key: state.globalKey,
-                      child: SizedBox(
+                      child: RotatedBox(
-                        width: StartChartManage().videoHeight.w,
+                        // 解码器不支持硬件旋转，使用RotatedBox
-                        height: StartChartManage().videoWidth.h,
+                        quarterTurns: startChartManage.rotateAngle ~/ 90,
-                        child: RotatedBox(
+                        child: Platform.isIOS
-                          // 解码器不支持硬件旋转，使用RotatedBox
+                            ? Transform.scale(
-                          quarterTurns: startChartManage.rotateAngle ~/ 90,
+                                scale: 1.008, // 轻微放大，消除iOS白边
-                          child: Platform.isIOS
+                                child: Texture(
-                              ? Transform.scale(
+                                  textureId: state.textureId.value!,
-                                  scale: 1.008, // 轻微放大，消除iOS白边
+                                  filterQuality: FilterQuality.medium,
-                                  child: Texture(
+                                ),
-                                    textureId: state.textureId.value!,
+                              )
-                                    filterQuality: FilterQuality.medium,
+                            : state.isFullScreen.isFalse
-                                  ),
+                                ? AspectRatio(
-                                )
+                                    aspectRatio: StartChartManage().videoWidth / StartChartManage().videoHeight,
-                              : state.isFullScreen.isFalse
+                                    child: Texture(
-                                  ? AspectRatio(
-                                      aspectRatio: StartChartManage().videoWidth / StartChartManage().videoHeight,
-                                      child: Texture(
-                                        textureId: state.textureId.value!,
-                                        filterQuality: FilterQuality.medium,
-                                      ),
-                                    )
-                                  : Texture(
                                       textureId: state.textureId.value!,
                                       filterQuality: FilterQuality.medium,
                                     ),
-                        ),
+                                  )
+                                : Texture(
+                                    textureId: state.textureId.value!,
+                                    filterQuality: FilterQuality.medium,
+                                  ),
                       ),
                     ),
                   );
@@ -130,7 +126,7 @@ class _TalkViewNativeDecodePageDebugState extends State<TalkViewNativeDecodePage
                 state.isFullScreen.value = !state.isFullScreen.value;
               },
               child: Obx(
-                    () => Text(state.isFullScreen.isTrue ? '退出全屏' : '全屏'),
+                () => Text(state.isFullScreen.isTrue ? '退出全屏' : '全屏'),
               ),
             ),
             Obx(() => state.isLoading.isTrue
@@ -168,8 +164,7 @@ class _TalkViewNativeDecodePageDebugState extends State<TalkViewNativeDecodePage
                 width: 1.sw - 30.w * 2,
                 // height: 300.h,
                 margin: EdgeInsets.all(30.w),
-                decoration:
+                decoration: BoxDecoration(color: Colors.black.withOpacity(0.2), borderRadius: BorderRadius.circular(20.h)),
-                    BoxDecoration(color: Colors.black.withOpacity(0.2), borderRadius: BorderRadius.circular(20.h)),
                 child: Column(
                   children: <Widget>[
                     SizedBox(height: 20.h),
@@ -249,10 +244,7 @@ class _TalkViewNativeDecodePageDebugState extends State<TalkViewNativeDecodePage
           width: 50.w,
           height: 50.w,
           padding: EdgeInsets.all(5.w),
-          child: Image(
+          child: Image(width: 40.w, height: 40.w, image: const AssetImage('images/main/icon_lockDetail_monitoringScreenshot.png')),
-              width: 40.w,
-              height: 40.w,
-              image: const AssetImage('images/main/icon_lockDetail_monitoringScreenshot.png')),
         ),
       ),
       SizedBox(width: 50.w),

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

@@ -67,7 +67,7 @@ class TalkViewNativeDecodeState {
   // 通话数据流的单例流数据处理类
   final TalkDataRepository talkDataRepository = TalkDataRepository.instance;
 
-  RxBool isOpenVoice = true.obs; // 是否打开声音
+  RxBool isOpenVoice = false.obs; // 是否打开声音
   RxBool isRecordingScreen = false.obs; // 是否录屏中
   RxBool isRecordingAudio = false.obs; // 是否录音中
   Rx<DateTime> startRecordingAudioTime = DateTime.now().obs; // 开始录音时间
@@ -109,8 +109,8 @@ class TalkViewNativeDecodeState {
 
   // H264帧缓冲区相关
   final List<Map<String, dynamic>> h264FrameBuffer = <Map<String, dynamic>>[]; // H264帧缓冲区，存储帧数据和类型
-  final int maxFrameBufferSize = 50; // 最大缓冲区大小
+  final int maxFrameBufferSize = 25; // 最大缓冲区大小
-  final int targetFps = 60; // 目标解码帧率,只是为了快速填充native的缓冲区
+  final int targetFps = 25; // 目标解码帧率,只是为了快速填充native的缓冲区
   Timer? frameProcessTimer; // 帧处理定时器
   bool isProcessingFrame = false; // 是否正在处理帧
   int lastProcessedTimestamp = 0; // 上次处理帧的时间戳