Merge branch 'dev' of https://github.com/xiaoyaocz/dart_simple_live into dev

Author: xiaoyaocz

.gitignore

@@ -1,2 +1,5 @@
 simple_live_app/.vscode/settings.json
 simple_live_tv_app/.vscode/settings.json
+
+# macOS Spotlight Search index file
+*.DS_Store

README.md

@@ -1,4 +1,4 @@
-
+> ### ⚠ 本项目不提供Release安装包，请自行编译后运行测试。
 
 
 <p align="center">
@@ -31,14 +31,7 @@
 - [x] Windows `BETA`
 - [x] MacOS `BETA`
 - [x] Linux `BETA`
-- [x] Android TV `BETA` [说明](https://github.com/xiaoyaocz/dart_simple_live/issues/338)
-
-请到[Releases](https://github.com/xiaoyaocz/dart_simple_live/releases)下载最新版本，iOS请下载ipa文件自行签名安装
-
-如果想体验最新功能，可前往[Actions](https://github.com/xiaoyaocz/dart_simple_live/actions)下载自动打包的开发版本
-
-Windows建议下载UWP版[聚合直播](https://apps.microsoft.com/detail/9n1twg2g84vd)，体验会更好
-
+- [x] Android TV `BETA`
 
 ## 项目结构
 
@@ -47,6 +40,10 @@ Windows建议下载UWP版[聚合直播](https://apps.microsoft.com/detail/9n1twg
 - `simple_live_app` 基于核心库实现的Flutter APP客户端。
 - `simple_live_tv_app` 基于核心库实现的Flutter Android TV客户端。
 
+## 环境
+
+Flutter : `3.22`
+
 ## 参考及引用
 
 [AllLive](https://github.com/xiaoyaocz/AllLive) `本项目的C#版，有兴趣可以看看`

assets/play_config.json

@@ -1,5 +1,5 @@
 {
     "huya": {
-        "user_agent": "HYSDK(Windows, 30000002)_APP(pc_exe&6080100&official)_SDK(trans&2.23.0.4969)"
+        "user_agent": "HYSDK(Windows, 30000002)_APP(pc_exe&6090007&official)_SDK(trans&2.24.0.5157)"
     }
 }

simple_live_app/lib/modules/live_room/live_room_controller.dart

@@ -423,15 +423,15 @@ class LiveRoomController extends PlayerController with WidgetsBindingObserver {
       playurl = playurl.replaceAll("http://", "https://");
     }
 
- // 初始化播放器并设置 ao 参数
-  await initializePlayer();
-
-  await player.open(
-    Media(
-      playurl,
-      httpHeaders: playHeaders,
-    ),
-  );
+    // 初始化播放器并设置 ao 参数
+    await initializePlayer();
+
+    await player.open(
+      Media(
+        playurl,
+        httpHeaders: playHeaders,
+      ),
+    );
     Log.d("播放链接\r\n：$playurl");
   }
 
@@ -1028,7 +1028,6 @@ ${error?.stackTrace}''');
     }
   }
 
-  
   // 用于启动开播时长计算和更新的函数
   void startLiveDurationTimer() {
     // 如果不是直播状态或者 showTime 为空，则不启动定时器
@@ -1051,7 +1050,8 @@ ${error?.stackTrace}''');
         int minutes = (durationInSeconds % 3600) ~/ 60;
         int seconds = durationInSeconds % 60;
 
-        String formattedDuration = '${hours.toString().padLeft(2, '0')}:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}';
+        String formattedDuration =
+            '${hours.toString().padLeft(2, '0')}:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}';
         liveDuration.value = formattedDuration;
       });
     } catch (e) {

simple_live_app/lib/modules/live_room/live_room_page.dart

@@ -234,7 +234,6 @@ class LiveRoomPage extends GetView<LiveRoomController> {
             ],
           ),
         ),
-        //buildBottomActions(context),
       ],
     );
   }

simple_live_app/lib/services/follow_service.dart

@@ -181,10 +181,20 @@ class FollowService extends GetxService {
   Future updateLiveStatus(FollowUser item) async {
     try {
       var site = Sites.allSites[item.siteId]!;
-      item.liveStatus.value =
-          (await site.liveSite.getLiveStatus(roomId: item.roomId)) ? 2 : 1;
+      // 先只查状态
+      var isLiving = await site.liveSite.getLiveStatus(roomId: item.roomId);
+      item.liveStatus.value = isLiving ? 2 : 1;
+      if (item.liveStatus.value == 2) {
+        // 只有正在直播时才查详细信息
+        var detail = await site.liveSite.getRoomDetail(roomId: item.roomId);
+        item.liveStartTime = detail.showTime;
+      } else {
+        item.liveStartTime = null;
+      }
     } catch (e) {
       Log.logPrint(e);
+      item.liveStatus.value = 0;
+      item.liveStartTime = null;
     } finally {
       updatedCount++;
       if (updatedCount >= followList.length) {

simple_live_app/lib/widgets/follow_user_item.dart

@@ -40,7 +40,7 @@ class FollowUserItem extends StatelessWidget {
             WidgetSpan(
               alignment: ui.PlaceholderAlignment.middle,
               child: Obx(
-                    () => Offstage(
+                () => Offstage(
                   offstage: item.liveStatus.value == 0,
                   child: Row(
                     mainAxisSize: MainAxisSize.min,
@@ -63,7 +63,7 @@ class FollowUserItem extends StatelessWidget {
                           fontSize: 12,
                           fontWeight: FontWeight.normal,
                           color:
-                          item.liveStatus.value == 2 ? null : Colors.grey,
+                              item.liveStatus.value == 2 ? null : Colors.grey,
                         ),
                       ),
                     ],
@@ -88,17 +88,31 @@ class FollowUserItem extends StatelessWidget {
               fontSize: 12,
               color: Colors.grey,
             ),
-          ),
-          AppStyle.hGap4,
-          Text(
-            item.tag.length > 8 ? '${item.tag.substring(0, 8)}...' : item.tag,
-            style: const TextStyle(
-              fontSize: 12,
-              color: Colors.grey,
-            ),
-            maxLines: 1,
             overflow: TextOverflow.ellipsis,
           ),
+          if (playing)
+            Padding(
+              padding: AppStyle.edgeInsetsL8,
+              child: Text(
+                "正在观看",
+                style: TextStyle(
+                  fontSize: 12,
+                  color: Theme.of(context).colorScheme.primary,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            )
+          else if (item.liveStatus.value == 2 && item.liveStartTime != null)
+            Padding(
+              padding: AppStyle.edgeInsetsL8,
+              child: Text(
+                '开播了${formatLiveDuration(item.liveStartTime)}',
+                style: const TextStyle(
+                  fontSize: 12,
+                  color: Colors.grey,
+                ),
+              ),
+            ),
         ],
       ),
       trailing: playing
@@ -132,4 +146,32 @@ class FollowUserItem extends StatelessWidget {
       return "直播中";
     }
   }
+
+  String formatLiveDuration(String? startTimeStampString) {
+    if (startTimeStampString == null ||
+        startTimeStampString.isEmpty ||
+        startTimeStampString == "0") {
+      return "";
+    }
+    try {
+      int startTimeStamp = int.parse(startTimeStampString);
+      int currentTimeStamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;
+      int durationInSeconds = currentTimeStamp - startTimeStamp;
+
+      int hours = durationInSeconds ~/ 3600;
+      int minutes = (durationInSeconds % 3600) ~/ 60;
+
+      String hourText = hours > 0 ? '${hours}小时' : '';
+      String minuteText = minutes > 0 ? '${minutes}分钟' : '';
+
+      if (hours == 0 && minutes == 0) {
+        return "不足1分钟";
+      }
+
+      return '$hourText$minuteText';
+    } catch (e) {
+      print('格式化开播时长出错: $e');
+      return "--小时--分钟";
+    }
+  }
 }