2.0.0.243WebTRTC 2.4.2->2.7.0

lib/consultation/liveconsultation/controllers/liveconsultationcontroller.dart

@@ -81,7 +81,6 @@ class LiveConsultationController extends GetxController {
   void onReady() async {
     try {
       super.onReady();
-      _setMobilePreferredOrientationsAsync();
       await _initDataAsync();
 
       ///初始化截图列表
@@ -99,19 +98,6 @@ class LiveConsultationController extends GetxController {
     super.onClose();
   }
 
-  void _setMobilePreferredOrientationsAsync() {
-    // 手机强制横屏
-    if (FPlatform.isIOS || FPlatform.isAndroid) {
-      SystemChrome.setPreferredOrientations(
-          [DeviceOrientation.landscapeLeft, DeviceOrientation.landscapeRight]);
-      SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
-      SystemChrome.setSystemUIChangeCallback((systemOverlaysAreVisible) async {
-        await Future.delayed(const Duration(seconds: 1));
-        SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
-      });
-    }
-  }
-
   ///获取成员播放频道
   IChannel? getUserMemberPreviewChannel(ConsultationMember member) {
     return mediaController.getUserMemberPreviewChannel(member);
@@ -153,7 +139,7 @@ class LiveConsultationController extends GetxController {
     }
 
     memberListeners.addListeners();
-    await membersController.initWaitInLineForConsultationOatientsAsync();
+    await membersController.initWaitInLineForConsultationPatientsAsync();
     await mediaController.initAsync();
   }
 
@@ -477,7 +463,7 @@ class LiveConsultationController extends GetxController {
       _liveConsultationManager.consultationDetail = newConsultationDetail!;
       consultationDetail = newConsultationDetail;
       await _initConsultationInfo(isReload: true);
-      await membersController.initWaitInLineForConsultationOatientsAsync();
+      await membersController.initWaitInLineForConsultationPatientsAsync();
     } catch (ex) {
       await handlerErrorAsync(ex,
           "LiveConsultationController onSelectedPatientChangeAsync error: $ex");

lib/consultation/liveconsultation/controllers/livememberscontroller.dart

@@ -71,7 +71,7 @@ class LiveMembersController {
   }
 
   ///初始化待会诊病人列表
-  Future<void> initWaitInLineForConsultationOatientsAsync() async {
+  Future<void> initWaitInLineForConsultationPatientsAsync() async {
     try {
       if (_consultationDetail.expertUserCode != Storage.user.userCode) {
         return;

lib/services/hardwaresetting.dart

@@ -52,7 +52,8 @@ class HardwareSetting with TrtcClientGetterMixin {
 
   Future<String> _getTrtcCameraNameAsync(String deviceName) async {
     final TXDeviceManager deviceManager = client.getDeviceManager();
-    final List<dynamic>? cameras = await deviceManager.getDevicesList(2);
+    final Map<dynamic, dynamic>? cameras =
+        await deviceManager.getDevicesList(2);
     if (Storage.platform != Platform.Windows) {
       switch (deviceName.toLowerCase()) {
         case "back camera":
@@ -64,32 +65,53 @@ class HardwareSetting with TrtcClientGetterMixin {
           break;
       }
     }
+
+    String cameraLabel = '';
     if (cameras != null && cameras.isNotEmpty) {
-      for (var camera in cameras) {
-        if (camera['label']
-            .toString()
-            .toLowerCase()
-            .contains(deviceName.toLowerCase())) {
-          return camera['label'];
+      cameras.forEach((key, value) {
+        if (key == 'deviceList') {
+          // print("🔍 _trtcGetCameras $key $value");
+          if (value is List) {
+            for (var element in value) {
+              if (element is Map) {
+                if (element["label"]
+                    .toString()
+                    .toLowerCase()
+                    .contains(deviceName.toLowerCase())) {
+                  cameraLabel = element["label"];
+                }
+              }
+            }
+          }
         }
-      }
+      });
     }
-
-    return '';
+    return cameraLabel;
   }
 
   Future<String> _getTrtcMicNameAsync(String deviceName) async {
-    final List<dynamic>? microphones = await deviceManager.getDevicesList(0);
+    final Map<dynamic, dynamic>? microphones =
+        await deviceManager.getDevicesList(0);
+    String micLabel = '';
     if (microphones != null && microphones.isNotEmpty) {
-      for (var microphone in microphones) {
-        if (microphone['label']
-            .toString()
-            .toLowerCase()
-            .contains(deviceName.toLowerCase())) {
-          return microphone['label'];
+      microphones.forEach((key, value) {
+        if (key == 'deviceList') {
+          // print("🔍 _trtcGetCameras $key $value");
+          if (value is List) {
+            for (var element in value) {
+              if (element is Map) {
+                if (element["label"]
+                    .toString()
+                    .toLowerCase()
+                    .contains(deviceName.toLowerCase())) {
+                  micLabel = element["label"];
+                }
+              }
+            }
+          }
         }
-      }
+      });
     }
-    return '';
+    return micLabel;
   }
 }

pubspec.lock

@@ -183,8 +183,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "4ec9946624"
-      resolved-ref: "4ec99466242bc81d699da05b98d50c4d788d63d0"
+      ref: e4928cf57c
+      resolved-ref: e4928cf57c9357389adcab6a2c8dedec724e7f1f
       url: "http://git.ius.plus:88/Project-Wing/fis_lib_i18n.git"
     source: git
     version: "0.0.1"
@@ -201,8 +201,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: eef3b786c7
-      resolved-ref: eef3b786c77ae3bc611b449b908649468142d3c7
+      ref: "6a712b4e7f"
+      resolved-ref: "6a712b4e7f3d903841349d27b86a42a2d6b7626f"
       url: "http://git.ius.plus:88/melon.yin/fis_lib_media_rt"
     source: git
     version: "0.0.1"
@@ -693,11 +693,11 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "6b00aacb64"
-      resolved-ref: "6b00aacb64a3f80d37f337cd08e59a9a3e007425"
+      ref: b6b12aa5dd
+      resolved-ref: b6b12aa5dd57c2ccff78b54c4f89eb37e7809593
       url: "http://git.ius.plus/melon.yin/fis_trtc_magic.git"
     source: git
-    version: "2.4.2"
+    version: "2.7.0"
   term_glyph:
     dependency: transitive
     description:

pubspec.yaml

@@ -54,11 +54,11 @@ dependencies:
   tencent_trtc_cloud:
     git:
       url: http://git.ius.plus/melon.yin/fis_trtc_magic.git
-      ref: 6b00aacb64
+      ref: b6b12aa5dd
   fis_lib_media_rt:
     git:
       url: http://git.ius.plus:88/melon.yin/fis_lib_media_rt
-      ref: eef3b786c7
+      ref: 6a712b4e7f
   fis_common:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_common.git
@@ -66,7 +66,7 @@ dependencies:
   fis_i18n:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_i18n.git
-      ref: 4ec9946624
+      ref: e4928cf57c
   fis_jsonrpc:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_jsonrpc.git
@@ -89,11 +89,11 @@ dependency_overrides:
   tencent_trtc_cloud:
     git:
       url: http://git.ius.plus/melon.yin/fis_trtc_magic.git
-      ref: 6b00aacb64
+      ref: b6b12aa5dd
   fis_lib_media_rt:
     git:
       url: http://git.ius.plus:88/melon.yin/fis_lib_media_rt
-      ref: eef3b786c7
+      ref: 6a712b4e7f
   fis_common:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_common.git
@@ -101,7 +101,7 @@ dependency_overrides:
   fis_i18n:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_i18n.git
-      ref: 4ec9946624
+      ref: e4928cf57c
   fis_jsonrpc:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_jsonrpc.git