删除无用代码

star_lock/ios/Podfile.lock

@@ -27,6 +27,10 @@ PODS:
   - AMapFoundation (1.8.2)
   - AMapLocation (2.10.0):
     - AMapFoundation (>= 1.8.0)
+  - audio_session (0.0.1):
+    - Flutter
+  - audioplayers_darwin (0.0.1):
+    - Flutter
   - auto_orientation (0.0.1):
     - Flutter
   - camera_avfoundation (0.0.1):
@@ -37,12 +41,18 @@ PODS:
   - Flutter (1.0.0)
   - flutter_native_contact_picker (0.0.1):
     - Flutter
+  - flutter_sound (9.2.13):
+    - Flutter
+    - flutter_sound_core (= 9.2.13)
+  - flutter_sound_core (9.2.13)
   - fluttertoast (0.0.2):
     - Flutter
     - Toast
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
+  - g711_flutter (0.0.1):
+    - Flutter
   - google_maps_flutter_ios (0.0.1):
     - Flutter
     - GoogleMaps (< 8.0)
@@ -51,8 +61,12 @@ PODS:
   - GoogleMaps/Base (5.2.0)
   - GoogleMaps/Maps (5.2.0):
     - GoogleMaps/Base
+  - image_gallery_saver (2.0.2):
+    - Flutter
   - image_picker_ios (0.0.1):
     - Flutter
+  - just_audio (0.0.1):
+    - Flutter
   - network_info_plus (0.0.1):
     - Flutter
   - package_info_plus (0.4.5):
@@ -62,7 +76,7 @@ PODS:
     - FlutterMacOS
   - permission_handler_apple (9.1.1):
     - Flutter
-  - Protobuf (3.25.1)
+  - Protobuf (3.25.0)
   - reactive_ble_mobile (0.0.1):
     - Flutter
     - Protobuf (~> 3.5)
@@ -88,14 +102,20 @@ DEPENDENCIES:
   - aliyun_push (from `.symlinks/plugins/aliyun_push/ios`)
   - amap_flutter_location (from `.symlinks/plugins/amap_flutter_location/ios`)
   - amap_flutter_map (from `.symlinks/plugins/amap_flutter_map/ios`)
+  - audio_session (from `.symlinks/plugins/audio_session/ios`)
+  - audioplayers_darwin (from `.symlinks/plugins/audioplayers_darwin/ios`)
   - auto_orientation (from `.symlinks/plugins/auto_orientation/ios`)
   - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
   - flutter_native_contact_picker (from `.symlinks/plugins/flutter_native_contact_picker/ios`)
+  - flutter_sound (from `.symlinks/plugins/flutter_sound/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
+  - g711_flutter (from `.symlinks/plugins/g711_flutter/ios`)
   - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
+  - image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
+  - just_audio (from `.symlinks/plugins/just_audio/ios`)
   - network_info_plus (from `.symlinks/plugins/network_info_plus/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
@@ -119,6 +139,7 @@ SPEC REPOS:
     - AMap3DMap
     - AMapFoundation
     - AMapLocation
+    - flutter_sound_core
     - FMDB
     - GoogleMaps
     - Protobuf
@@ -134,6 +155,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/amap_flutter_location/ios"
   amap_flutter_map:
     :path: ".symlinks/plugins/amap_flutter_map/ios"
+  audio_session:
+    :path: ".symlinks/plugins/audio_session/ios"
+  audioplayers_darwin:
+    :path: ".symlinks/plugins/audioplayers_darwin/ios"
   auto_orientation:
     :path: ".symlinks/plugins/auto_orientation/ios"
   camera_avfoundation:
@@ -144,12 +169,20 @@ EXTERNAL SOURCES:
     :path: Flutter
   flutter_native_contact_picker:
     :path: ".symlinks/plugins/flutter_native_contact_picker/ios"
+  flutter_sound:
+    :path: ".symlinks/plugins/flutter_sound/ios"
   fluttertoast:
     :path: ".symlinks/plugins/fluttertoast/ios"
+  g711_flutter:
+    :path: ".symlinks/plugins/g711_flutter/ios"
   google_maps_flutter_ios:
     :path: ".symlinks/plugins/google_maps_flutter_ios/ios"
+  image_gallery_saver:
+    :path: ".symlinks/plugins/image_gallery_saver/ios"
   image_picker_ios:
     :path: ".symlinks/plugins/image_picker_ios/ios"
+  just_audio:
+    :path: ".symlinks/plugins/just_audio/ios"
   network_info_plus:
     :path: ".symlinks/plugins/network_info_plus/ios"
   package_info_plus:
@@ -184,31 +217,38 @@ SPEC CHECKSUMS:
   amap_flutter_map: 979e54d227cedac6c7504a2151bfbf3bcf96760a
   AMapFoundation: 9885c48fc3a78fdfb84a0299a2293e56ea3c9fec
   AMapLocation: 5248aec2455ebb5d104b367813c946430a2ee033
+  audio_session: 4f3e461722055d21515cf3261b64c973c062f345
+  audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40
   auto_orientation: 102ed811a5938d52c86520ddd7ecd3a126b5d39d
   camera_avfoundation: 3125e8cd1a4387f6f31c6c63abb8a55892a9eeeb
   device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
   EMASRest: 8df6f87836767a9415ad5cc4af739bc9d215b475
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_native_contact_picker: bd430ba0fbf82768bb50c2c52a69a65759a8f907
-  fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
+  flutter_sound: c60effa2a350fb977885f0db2fbc4c1ad5160900
+  flutter_sound_core: 26c10e5832e76aaacfae252d8925232281c486ae
+  fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
+  g711_flutter: 8f2769052d2cf3549f83d11e1c42d81d94441123
   google_maps_flutter_ios: abdac20d6ce8931f6ebc5f46616df241bfaa2cfd
   GoogleMaps: 025272d5876d3b32604e5c080dc25eaf68764693
+  image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
   image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
+  just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
   network_info_plus: 6d0c3eb8367b8164fa3fb0c19875e3f59d49697f
   package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
-  Protobuf: d94761c33f1239c0a43a0817ca1a5f7f7c900241
+  Protobuf: 6a4183ec1d51649eb2be7b86ccc286e5c539219c
   reactive_ble_mobile: 9ce6723d37ccf701dbffd202d487f23f5de03b4c
   shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
   sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
   SwiftProtobuf: 69f02cd54fb03201c5e6bf8b76f687c5ef7541a3
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
-  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
+  url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
   video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126
   webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a
 
 PODFILE CHECKSUM: adf6d8caf5faa9ea4ee2a2ea37f5aea37a6520d7
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.12.1

star_lock/ios/Runner.xcodeproj/project.pbxproj

@@ -666,7 +666,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

star_lock/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

star_lock/lib/talk/call/callTalk.dart

@@ -1,10 +1,6 @@
 import 'dart:typed_data';
 import 'package:flutter/material.dart';
-import 'package:convert/convert.dart';
 import 'package:flutter_sound/flutter_sound.dart';
-import 'package:get/get.dart';
-import 'package:star_lock/appRouters.dart';
-// import 'package:just_audio/just_audio.dart';
 import 'package:star_lock/main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart';
 import 'package:star_lock/talk/call/g711Decoder.dart';
 import 'package:star_lock/talk/call/iFrameInfo.dart';
@@ -26,7 +22,7 @@ class CallTalk {
   IframeInfo? iframe; // 假设有这个成员变量
   var growableList;
   LockMonitoringPage callOut = const LockMonitoringPage();
-  FlutterSoundPlayer _audioPlayer = FlutterSoundPlayer();
+  final FlutterSoundPlayer _audioPlayer = FlutterSoundPlayer();
 
   CallTalk._init() {
     iframe = IframeInfo();
@@ -53,7 +49,7 @@ class CallTalk {
 
     // 音频数据
     if (bb[61] == 1) {
-      // 如果是音频数据且状态符合条件
+      print('dinglingling音频数据来啦啦啦啦啦啦啦啦啦');
       // 用你的711音频数据替换这里的Uint8List
       Uint8List rawData = G711Decoder().decodeG711uLaw(bb);
       _playRawData(rawData);
@@ -90,8 +86,6 @@ class CallTalk {
       // 这里判断是否是同一帧，如果不是同一帧就重新创建一个 IframeInfo
       if (getIframeIndex != iframe!.iframeIndex) {
         iframe = IframeInfo();
-        // print('11111111change getIframeIndex：$getIframeIndex ');
-        // print('11111111change iframe.iframeIndex: ${iframe!.iframeIndex}');
         iframe!.iframeIndex = getIframeIndex;
         iframe!.bagNum = getBagNum;
         // iframe!.cur_len = alen;
@@ -100,56 +94,25 @@ class CallTalk {
       }
 
       iframe!.bagReceive++;
-      // int start = bagLen * (getBagIndex - FIRSTINDEX);
-      // int end = start + blen;
-
-      // 确保 iframe!.bb 不为 null，并且足够长
-      // if (iframe.bb == null || iframe.bb!.length < end) {
-      //   iframe.bb = Uint8List(end);
-      // }
-
-      // print('22222222change getIframeIndex：$getIframeIndex ');
 
       // 如果是同一帧就添加起来
       if (getIframeIndex == iframe!.iframeIndex) {
-        // print('33333333change iframe.iframeIndex: ${iframe!.iframeIndex}');
         var getList = bb.sublist(77, bb.length);
-        print('getList:${getList}');
         growableList.addAll(getList);
-        // print('growableList: $growableList');
       }
-
-      // copyBytes(iframe!.bb!, start, bb, POS_data, blen);
-      // 打印输出看看字节数组的内容
-
       print(
           'iframe.bagNum: ${iframe!.bagNum} iframe.bagReceive: ${iframe!.bagReceive}');
 
       // 如果收到的包数等于总包数，说明这一帧数据已经接收完毕
       if (iframe!.bagNum == iframe!.bagReceive) {
-        // List<int> data = iframe!.bb!.sublist(0, iframe!.cur_len);
+        print(
-        print('播放第${iframe!.iframeIndex}帧 一帧图片的Data: $growableList');
+            '播放第${iframe!.iframeIndex}帧 一帧图片的hexStringData: ${Uint8List.fromList(growableList)}');
-        String hexString =
-            uint8ListToHexString(Uint8List.fromList(growableList));
-        // print('播放第${iframe!.iframeIndex}帧 hexStringLength:${hexString.length} 一帧图片的hexStringData: $hexString'); // 输出: 0a141e28
-
-        // if (iframe!.iframeIndex == 1) {
-        print('下面就是你要的');
-        printByteArray('播放第${iframe!.iframeIndex}帧 一帧图片的hexStringData: ',
-            Uint8List.fromList(growableList));
         eventBus.fire(GetTVDataRefreshUI(growableList));
-        // }
-        // eventBus.fire(GetTVDataRefreshUI(growableList));
       }
-
-      // Get.toNamed(Routers.lockMonitoringPage, arguments: {
-      //   "lockId": "111"
-      // });
-      // 打印拷贝后的目标数据
-      // print(iframe.bb);
     }
   }
 
+//视频相关处理
   void printByteArray(String printTitle, Uint8List byteArray) {
     final int chunkSize = byteArray.length; // 每行显示的字节数
     int length = byteArray.length;
@@ -164,29 +127,7 @@ class CallTalk {
     }
   }
 
-  String uint8ListToHexString(Uint8List uint8List) {
+  //音频相关处理
-    return hex.encode(uint8List);
-  }
-
-  int getShortFromByte(Uint8List bb, int pos) {
-    ByteData byteData = ByteData.sublistView(bb, pos, pos + 2);
-    return byteData.getInt16(0, Endian.little);
-  }
-
-  void copyBytes(Uint8List destination, int destStart, Uint8List source,
-      int sourceStart, int length) {
-    if (destination.length < destStart + length ||
-        source.length < sourceStart + length) {
-      // 处理越界的情况，这里你可以抛出异常或者进行其他处理
-      print('Error: Index out of range');
-      return;
-    }
-
-    for (int i = 0; i < length; i++) {
-      destination[destStart + i] = source[sourceStart + i];
-    }
-  }
-
   Future<void> _initializeAudioPlayer() async {
     await _audioPlayer.openPlayer();
   }