revert: 暂时回退guozhigq关于直播的分支feature-liveRoomRender修改

orz12 · Feb 14, 2024 · 251d098 · 251d098
1 parent 63481ab
commit 251d098
Show file tree

Hide file tree

Showing 11 changed files with 118 additions and 328 deletions.
diff --git a/assets/images/live/default_bg.webp b/assets/images/live/default_bg.webp
diff --git a/lib/http/api.dart b/lib/http/api.dart
@@ -233,10 +233,6 @@ class Api {
   static const String liveRoomInfo =
       '${HttpString.liveBaseUrl}/xlive/web-room/v2/index/getRoomPlayInfo';
 
-  // 直播间详情 H5
-  static const String liveRoomInfoH5 =
-      '${HttpString.liveBaseUrl}/xlive/web-room/v1/index/getH5InfoByRoom';
-
   // 用户信息 需要Wbi签名
   // https://api.bilibili.com/x/space/wbi/acc/info?mid=503427686&token=&platform=web&web_location=1550101&w_rid=d709892496ce93e3d94d6d37c95bde91&wts=1689301482
   static const String memberInfo = '/x/space/wbi/acc/info';

diff --git a/lib/http/live.dart b/lib/http/live.dart
@@ -1,6 +1,5 @@
 import '../models/live/item.dart';
 import '../models/live/room_info.dart';
-import '../models/live/room_info_h5.dart';
 import 'api.dart';
 import 'init.dart';
 
@@ -47,22 +46,4 @@ class LiveHttp {
       };
     }
   }
-
-  static Future liveRoomInfoH5({roomId, qn}) async {
-    var res = await Request().get(Api.liveRoomInfoH5, data: {
-      'room_id': roomId,
-    });
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': RoomInfoH5Model.fromJson(res.data['data'])
-      };
-    } else {
-      return {
-        'status': false,
-        'data': [],
-        'msg': res.data['message'],
-      };
-    }
-  }
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -25,6 +25,7 @@ import 'package:pilipala/utils/recommend_filter.dart';
 import 'package:catcher_2/catcher_2.dart';
 import './services/loggeer.dart';
 
+
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   MediaKit.ensureInitialized();
@@ -77,15 +78,17 @@ void main() async {
     },
   );
 
-  // 小白条、导航栏沉浸
-  SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-  SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
-    systemNavigationBarColor: Colors.transparent,
-    systemNavigationBarDividerColor: Colors.transparent,
-    statusBarColor: Colors.transparent,
-  ));
-  Data.init();
-  PiliSchame.init();
+
+    // 小白条、导航栏沉浸
+    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+    SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
+      systemNavigationBarColor: Colors.transparent,
+      systemNavigationBarDividerColor: Colors.transparent,
+      statusBarColor: Colors.transparent,
+    ));
+    Data.init();
+    GStrorage.lazyInit();
+    PiliSchame.init();
 }
 
 class MyApp extends StatelessWidget {

diff --git a/lib/models/live/room_info_h5.dart b/lib/models/live/room_info_h5.dart
diff --git a/lib/pages/live/widgets/live_item.dart b/lib/pages/live/widgets/live_item.dart
@@ -159,32 +159,18 @@ class VideoStat extends StatelessWidget {
           tileMode: TileMode.mirror,
         ),
       ),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          Text(
-            liveItem!.areaName!,
-            style: const TextStyle(fontSize: 11, color: Colors.white),
-          ),
-          Text(
-            liveItem!.watchedShow!['text_small'],
-            style: const TextStyle(fontSize: 11, color: Colors.white),
-          ),
-        ],
+      child: RichText(
+        maxLines: 1,
+        textAlign: TextAlign.justify,
+        softWrap: false,
+        text: TextSpan(
+          style: const TextStyle(fontSize: 11, color: Colors.white),
+          children: [
+            TextSpan(text: liveItem!.areaName!),
+            TextSpan(text: liveItem!.watchedShow!['text_small']),
+          ],
+        ),
       ),
-
-      // child: RichText(
-      //   maxLines: 1,
-      //   textAlign: TextAlign.justify,
-      //   softWrap: false,
-      //   text: TextSpan(
-      //     style: const TextStyle(fontSize: 11, color: Colors.white),
-      //     children: [
-      //       TextSpan(text: liveItem!.areaName!),
-      //       TextSpan(text: liveItem!.watchedShow!['text_small']),
-      //     ],
-      //   ),
-      // ),
     );
   }
 }
diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart
@@ -4,8 +4,6 @@ import 'package:pilipala/http/live.dart';
 import 'package:pilipala/models/live/room_info.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 
-import '../../models/live/room_info_h5.dart';
-
 class LiveRoomController extends GetxController {
   String cover = '';
   late int roomId;
@@ -23,7 +21,6 @@ class LiveRoomController extends GetxController {
   //   controlsStyle: ControlsStyle.live,
   //   enabledButtons: const EnabledButtons(pip: true),
   // );
-  Rx<RoomInfoH5Model> roomInfoH5 = RoomInfoH5Model().obs;
 
   @override
   void onInit() {
@@ -40,11 +37,10 @@ class LiveRoomController extends GetxController {
       }
     }
     queryLiveInfo();
-    queryLiveInfoH5();
   }
 
-  playerInit(source) async {
-    await plPlayerController.setDataSource(
+  playerInit(source) {
+    plPlayerController.setDataSource(
       DataSource(
         videoSource: source,
         audioSource: null,
@@ -70,8 +66,7 @@ class LiveRoomController extends GetxController {
       String videoUrl = (item.urlInfo?.first.host)! +
           item.baseUrl! +
           item.urlInfo!.first.extra!;
-      await playerInit(videoUrl);
-      return res;
+      playerInit(videoUrl);
     }
   }
 
@@ -85,12 +80,4 @@ class LiveRoomController extends GetxController {
       volumeOff.value = true;
     }
   }
-
-  Future queryLiveInfoH5() async {
-    var res = await LiveHttp.liveRoomInfoH5(roomId: roomId);
-    if (res['status']) {
-      roomInfoH5.value = res['data'];
-    }
-    return res;
-  }
 }