fix: 直播间布局异常、控制器初始化异常、imgQuality/cover取值异常

lib/common/widgets/network_img_layer.dart

@@ -33,7 +33,11 @@ class NetworkImgLayer extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final int defaultImgQuality = GlobalDataCache().imgQuality;
+    int defaultImgQuality = 10;
+    try {
+      defaultImgQuality = GlobalDataCache().imgQuality;
+    } catch (_) {}
+
     if (src == '' || src == null) {
       return placeholder(context);
     }

lib/pages/live_room/controller.dart

@@ -64,7 +64,7 @@ class LiveRoomController extends GetxController {
             ? liveItem.pic
             : (liveItem.cover != null && liveItem.cover != '')
                 ? liveItem.cover
-                : null;
+                : '';
       }
       Request.getBuvid().then((value) => buvid = value);
     }

lib/pages/live_room/view.dart

@@ -108,6 +108,12 @@ class _LiveRoomPageState extends State<LiveRoomPage>
 
   @override
   Widget build(BuildContext context) {
+    final mediaQuery = MediaQuery.of(context);
+    final isPortrait = mediaQuery.orientation == Orientation.portrait;
+    final isLandscape = mediaQuery.orientation == Orientation.landscape;
+
+    final padding = mediaQuery.padding;
+
     Widget videoPlayerPanel = FutureBuilder(
       future: _futureBuilderFuture,
       builder: (BuildContext context, AsyncSnapshot snapshot) {
@@ -187,10 +193,8 @@ class _LiveRoomPageState extends State<LiveRoomPage>
             children: [
               Obx(
                 () => SizedBox(
-                  height: MediaQuery.of(context).padding.top +
+                  height: padding.top +
-                      (_liveRoomController.isPortrait.value ||
+                      (_liveRoomController.isPortrait.value || isLandscape
-                              MediaQuery.of(context).orientation ==
-                                  Orientation.landscape
                           ? 0
                           : kToolbarHeight),
                 ),
@@ -201,21 +205,18 @@ class _LiveRoomPageState extends State<LiveRoomPage>
                   if (plPlayerController.isFullScreen.value == true) {
                     plPlayerController.triggerFullScreen(status: false);
                   }
-                  if (MediaQuery.of(context).orientation ==
+                  if (isLandscape) {
-                      Orientation.landscape) {
                     verticalScreen();
                   }
                 },
                 child: Obx(
                   () => Container(
                     width: Get.size.width,
-                    height: MediaQuery.of(context).orientation ==
+                    height: isLandscape
-                            Orientation.landscape
                         ? Get.size.height
                         : !_liveRoomController.isPortrait.value
                             ? Get.size.width * 9 / 16
-                            : Get.size.height -
+                            : Get.size.height - padding.top,
-                                MediaQuery.of(context).padding.top,
                     clipBehavior: Clip.hardEdge,
                     decoration: const BoxDecoration(
                       borderRadius: BorderRadius.all(Radius.circular(6)),
@@ -229,7 +230,7 @@ class _LiveRoomPageState extends State<LiveRoomPage>
           // 定位 快速滑动到底部
           Positioned(
             right: 20,
-            bottom: MediaQuery.of(context).padding.bottom + 80,
+            bottom: padding.bottom + 80,
             child: SlideTransition(
               position: Tween<Offset>(
                 begin: const Offset(0, 4),
@@ -262,10 +263,7 @@ class _LiveRoomPageState extends State<LiveRoomPage>
               titleSpacing: 0,
               backgroundColor: Colors.transparent,
               foregroundColor: Colors.white,
-              toolbarHeight:
+              toolbarHeight: isPortrait ? 56 : 0,
-                  MediaQuery.of(context).orientation == Orientation.portrait
-                      ? 56
-                      : 0,
               title: FutureBuilder(
                 future: _futureBuilder,
                 builder: (context, snapshot) {
@@ -317,15 +315,20 @@ class _LiveRoomPageState extends State<LiveRoomPage>
           ),
           // 消息列表
           Obx(
-            () => Positioned(
+            () => Align(
-              top: MediaQuery.of(context).padding.top +
+              alignment: Alignment.bottomCenter,
+              child: Container(
+                margin: EdgeInsets.only(
+                  bottom: 90 + padding.bottom,
+                ),
+                height: Get.size.height -
+                    (padding.top +
                         kToolbarHeight +
                         (_liveRoomController.isPortrait.value
                             ? Get.size.width
-                      : Get.size.width * 9 / 16),
+                            : Get.size.width * 9 / 16) +
-              bottom: 90 + MediaQuery.of(context).padding.bottom,
+                        100 +
-              left: 0,
+                        padding.bottom),
-              right: 0,
                 child: buildMessageListUI(
                   context,
                   _liveRoomController,
@@ -333,19 +336,17 @@ class _LiveRoomPageState extends State<LiveRoomPage>
                 ),
               ),
             ),
+          ),
           // 消息输入框
           Visibility(
-            visible: MediaQuery.of(context).orientation == Orientation.portrait,
+            visible: isPortrait,
             child: Positioned(
               bottom: 0,
               left: 0,
               right: 0,
               child: Container(
                 padding: EdgeInsets.only(
-                    left: 14,
+                    left: 14, right: 14, top: 4, bottom: padding.bottom + 20),
-                    right: 14,
-                    top: 4,
-                    bottom: MediaQuery.of(context).padding.bottom + 20),
                 decoration: BoxDecoration(
                   color: Colors.grey.withOpacity(0.1),
                   borderRadius: const BorderRadius.all(Radius.circular(20)),
@@ -421,6 +422,7 @@ class _LiveRoomPageState extends State<LiveRoomPage>
         ],
       ),
     );
+
     if (Platform.isAndroid) {
       return PiPSwitcher(
         childWhenDisabled: childWhenDisabled,
@@ -438,8 +440,7 @@ Widget buildMessageListUI(
   LiveRoomController liveRoomController,
   ScrollController scrollController,
 ) {
-  return Expanded(
+  return Obx(
-    child: Obx(
     () => MediaQuery.removePadding(
       context: context,
       removeTop: true,
@@ -519,7 +520,6 @@ Widget buildMessageListUI(
         ),
       ),
     ),
-    ),
   );
 }
 

lib/pages/main/view.dart

@@ -24,8 +24,8 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
   final MainController _mainController = Get.put(MainController());
   late HomeController _homeController;
   RankController? _rankController;
-  DynamicsController? _dynamicController;
+  late DynamicsController _dynamicController;
-  MediaController? _mediaController;
+  late MediaController _mediaController;
 
   int? _lastSelectTime; //上次点击时间
   Box setting = GStrorage.setting;
@@ -76,28 +76,30 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
     }
 
     if (currentPage is DynamicsPage) {
-      if (_dynamicController!.flag) {
+      if (_dynamicController.flag) {
         // 单击返回顶部 双击并刷新
         if (DateTime.now().millisecondsSinceEpoch - _lastSelectTime! < 500) {
-          _dynamicController!.onRefresh();
+          _dynamicController.onRefresh();
         } else {
-          _dynamicController!.animateToTop();
+          _dynamicController.animateToTop();
         }
         _lastSelectTime = DateTime.now().millisecondsSinceEpoch;
       }
-      _dynamicController!.flag = true;
+      _dynamicController.flag = true;
       _mainController.clearUnread();
     } else {
-      _dynamicController?.flag = false;
+      _dynamicController.flag = false;
     }
 
     if (currentPage is MediaPage) {
-      _mediaController!.queryFavFolder();
+      _mediaController.queryFavFolder();
     }
   }
 
   void controllerInit() {
     _homeController = Get.put(HomeController());
+    _dynamicController = Get.put(DynamicsController());
+    _mediaController = Get.put(MediaController());
     if (_mainController.pagesIds.contains(1)) {
       _rankController = Get.put(RankController());
     }