完善TV使用流程

xiaoyaocz · Mar 8, 2024 · dc83117 · dc83117
1 parent 15ce795
commit dc83117
Show file tree

Hide file tree

Showing 20 changed files with 371 additions and 182 deletions.
diff --git a/assets/tv_app_version.json b/assets/tv_app_version.json
@@ -0,0 +1,7 @@
+{
+    "version": "1.0.1",
+    "version_num": 10001,
+    "version_desc": "- 修复虎牙播放中断问题 #317",
+    "prerelease":false,
+    "download_url": "https://github.com/xiaoyaocz/dart_simple_live/releases"
+}
diff --git a/simple_live_app/pubspec.yaml b/simple_live_app/pubspec.yaml
@@ -1,5 +1,5 @@
 name: simple_live_app
-version: 1.4.9+10409
+version: 1.5.0+10500
 publish_to: none
 description: "Simple Live APP"
 environment: 

diff --git a/simple_live_tv_app/README.md b/simple_live_tv_app/README.md
@@ -2,17 +2,3 @@
 
 Simple Live Android TV APP
 
-
-
-# 首页
-
-- 我的关注
-- 观看记录
-- 二维码
-    - 手机同步数据
-- 设置
-    - 哔哩哔哩登录
-
-
-# 播放
-    - 暂停
diff --git a/simple_live_tv_app/android/app/src/main/res/drawable-v21/launch_background.xml b/simple_live_tv_app/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -9,4 +9,14 @@
             android:gravity="center"
             android:src="@mipmap/launch_image" />
     </item> -->
+     <item>
+        <shape android:shape="rectangle">
+            <gradient
+                android:type="linear"
+                android:startColor="#141e30"
+                android:centerColor="#243b55"
+                android:endColor="#141e30"
+                android:angle="135" />
+        </shape>
+    </item>
 </layer-list>
diff --git a/simple_live_tv_app/android/app/src/main/res/drawable/launch_background.xml b/simple_live_tv_app/android/app/src/main/res/drawable/launch_background.xml
@@ -2,7 +2,16 @@
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@android:color/white" />
-
+    <item>
+        <shape android:shape="rectangle">
+            <gradient
+                android:type="linear"
+                android:startColor="#141e30"
+                android:centerColor="#243b55"
+                android:endColor="#141e30"
+                android:angle="135" />
+        </shape>
+    </item>
     <!-- You can insert your own image assets here -->
     <!-- <item>
         <bitmap

diff --git a/simple_live_tv_app/lib/app/app_style.dart b/simple_live_tv_app/lib/app/app_style.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
@@ -25,6 +27,7 @@ class AppStyle {
     checkboxTheme: CheckboxThemeData(
       fillColor: MaterialStateProperty.all(AppColors.lightColorScheme.primary),
     ),
+    fontFamily: Platform.isWindows ? 'Microsoft YaHei' : null,
   );
 
   static SizedBox get vGap4 => SizedBox(

diff --git a/simple_live_tv_app/lib/app/utils.dart b/simple_live_tv_app/lib/app/utils.dart
@@ -6,6 +6,8 @@ import 'package:package_info_plus/package_info_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:simple_live_tv_app/app/app_style.dart';
+import 'package:simple_live_tv_app/app/log.dart';
+import 'package:simple_live_tv_app/requests/common_request.dart';
 
 class Utils {
   static late PackageInfo packageInfo;
@@ -215,4 +217,45 @@ class Utils {
   static void hideRightDialog() {
     SmartDialog.dismiss(status: SmartStatus.allCustom);
   }
+
+  static void checkUpdate({bool showMsg = false}) async {
+    try {
+      int currentVer = Utils.parseVersion(packageInfo.version);
+      CommonRequest request = CommonRequest();
+      var versionInfo = await request.checkUpdate();
+      if (versionInfo.versionNum > currentVer) {
+        await showAlertDialog(
+          "${versionInfo.versionDesc}\n\n请前往项目主页手动下载新版本",
+          title: "发现新版本 ${versionInfo.version}",
+          confirm: "知道了",
+          cancel: "关闭",
+        );
+      } else {
+        if (showMsg) {
+          SmartDialog.showToast("当前已经是最新版本了");
+        }
+      }
+    } catch (e) {
+      Log.logPrint(e);
+      if (showMsg) {
+        SmartDialog.showToast("检查更新失败");
+      }
+    }
+  }
+
+  static int parseVersion(String version) {
+    var sp = version.split('.');
+    var num = "";
+    for (var item in sp) {
+      num = num + item.padLeft(2, '0');
+    }
+    return int.parse(num);
+  }
+
+  static String onlineToString(int num) {
+    if (num >= 10000) {
+      return "${(num / 10000.0).toStringAsFixed(1)}万";
+    }
+    return num.toString();
+  }
 }
diff --git a/simple_live_tv_app/lib/main.dart b/simple_live_tv_app/lib/main.dart
@@ -93,7 +93,9 @@ class MyApp extends StatelessWidget {
         return GetMaterialApp(
           title: 'Simple Live TV',
           theme: AppStyle.lightTheme,
-          initialRoute: RoutePath.kHome,
+          initialRoute: AppSettingsController.instance.firstRun
+              ? RoutePath.kAgreement
+              : RoutePath.kHome,
           getPages: AppPages.routes,
           debugShowCheckedModeBanner: false,
           builder: FlutterSmartDialog.init(

diff --git a/simple_live_tv_app/lib/modules/agreement/agreement_page.dart b/simple_live_tv_app/lib/modules/agreement/agreement_page.dart
@@ -0,0 +1,92 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:simple_live_tv_app/app/app_focus_node.dart';
+import 'package:simple_live_tv_app/app/app_style.dart';
+import 'package:simple_live_tv_app/app/controller/app_settings_controller.dart';
+import 'package:simple_live_tv_app/routes/route_path.dart';
+import 'package:simple_live_tv_app/widgets/app_scaffold.dart';
+import 'package:simple_live_tv_app/widgets/button/highlight_button.dart';
+
+class AgreementPage extends StatelessWidget {
+  const AgreementPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return AppScaffold(
+      child: Center(
+        child: SizedBox(
+          width: 1000.w,
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              Text(
+                "使用须知",
+                textAlign: TextAlign.center,
+                style: AppStyle.titleStyleWhite,
+              ),
+              AppStyle.vGap24,
+              Text(
+                "欢迎使用Simple Live TV，请在使用前仔细阅读以下内容：",
+                style: AppStyle.textStyleWhite,
+              ),
+              AppStyle.vGap12,
+              Text(
+                "1. 本软件为开源软件，仅供学习交流使用，禁止用于任何商业用途。",
+                style: AppStyle.textStyleWhite,
+              ),
+              AppStyle.vGap12,
+              Text(
+                "2. 本软件不提供任何直播内容，所有直播内容均来自网络。",
+                style: AppStyle.textStyleWhite,
+              ),
+              AppStyle.vGap12,
+              Text(
+                "3. 本软件完全基于您个人意愿使用，您应该对自己的使用行为和所有结果承担全部责任。",
+                style: AppStyle.textStyleWhite,
+              ),
+              AppStyle.vGap12,
+              Text(
+                "4. 如果本软件存在侵犯您的合法权益的情况，请及时与作者联系，作者将会及时删除有关内容。",
+                style: AppStyle.textStyleWhite,
+              ),
+              AppStyle.vGap12,
+              Text(
+                "如您继续使用本软件即代表您已完全理解并同意上述内容。",
+                style: AppStyle.textStyleWhite,
+              ),
+              AppStyle.vGap32,
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  HighlightButton(
+                    text: "已阅读并同意",
+                    autofocus: true,
+                    focusNode: AppFocusNode(),
+                    onTap: () {
+                      AppSettingsController.instance.setNoFirstRun();
+                      Get.offAllNamed(RoutePath.kHome);
+                    },
+                  ),
+                  AppStyle.hGap32,
+                  HighlightButton(
+                    text: "退出应用",
+                    focusNode: AppFocusNode(),
+                    onTap: () {
+                      //退出软件
+                      exit(0);
+                    },
+                  ),
+                ],
+              )
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/simple_live_tv_app/lib/modules/category/category_page.dart b/simple_live_tv_app/lib/modules/category/category_page.dart
@@ -117,8 +117,8 @@ class CategoryPage extends GetView<CategoryController> {
                           padding: AppStyle.edgeInsetsV8,
                           physics: const NeverScrollableScrollPhysics(),
                           crossAxisCount: 8,
-                          crossAxisSpacing: 8,
-                          mainAxisSpacing: 8,
+                          crossAxisSpacing: 36.w,
+                          mainAxisSpacing: 36.w,
                           children: item.showAll.value
                               ? (item.childrenExt
                                   .map(

diff --git a/simple_live_tv_app/lib/modules/home/home_controller.dart b/simple_live_tv_app/lib/modules/home/home_controller.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:get/get.dart';
 
 import 'package:simple_live_tv_app/app/controller/base_controller.dart';
+import 'package:simple_live_tv_app/app/utils.dart';
 
 import 'package:simple_live_tv_app/routes/route_path.dart';
 
@@ -12,7 +13,7 @@ class HomeController extends BaseController {
   @override
   void onInit() {
     initTimer();
-
+    Utils.checkUpdate();
     super.onInit();
   }
 

diff --git a/simple_live_tv_app/lib/modules/home/home_page.dart b/simple_live_tv_app/lib/modules/home/home_page.dart
@@ -300,8 +300,7 @@ class HomePage extends GetView<HomeController> {
         shape: RoundedRectangleBorder(
           borderRadius: AppStyle.radius16,
         ),
-        contentPadding:
-            AppStyle.edgeInsetsA48.copyWith(left: 64.w, right: 64.w),
+        contentPadding: AppStyle.edgeInsetsA48,
         content: Column(
           mainAxisSize: MainAxisSize.min,
           children: [
@@ -336,32 +335,35 @@ class HomePage extends GetView<HomeController> {
               ],
             ),
             AppStyle.vGap48,
-            TextField(
-              controller: textController,
-              style: AppStyle.textStyleWhite,
-              textInputAction: TextInputAction.search,
-              onSubmitted: (e) {
-                Get.back();
-                if (e.isEmpty) {
-                  return;
-                }
-                if (mode.value == 0) {
-                  controller.toSearchRoom(textController.text);
-                } else {
-                  controller.toSearchAnchor(textController.text);
-                }
-              },
-              decoration: InputDecoration(
-                hintText: mode.value == 0 ? "请输入关键字" : "请输入主播昵称",
-                hintStyle: AppStyle.textStyleWhite,
-                border: OutlineInputBorder(
-                  borderRadius: AppStyle.radius16,
-                  borderSide: BorderSide(width: 4.w),
+            SizedBox(
+              width: 700.w,
+              child: TextField(
+                controller: textController,
+                style: AppStyle.textStyleWhite,
+                textInputAction: TextInputAction.search,
+                onSubmitted: (e) {
+                  Get.back();
+                  if (e.isEmpty) {
+                    return;
+                  }
+                  if (mode.value == 0) {
+                    controller.toSearchRoom(textController.text);
+                  } else {
+                    controller.toSearchAnchor(textController.text);
+                  }
+                },
+                decoration: InputDecoration(
+                  hintText: mode.value == 0 ? "点击输入关键字搜索" : "点击主播昵称搜索",
+                  hintStyle: AppStyle.textStyleWhite,
+                  border: OutlineInputBorder(
+                    borderRadius: AppStyle.radius16,
+                    borderSide: BorderSide(width: 4.w),
+                  ),
+                  filled: true,
+                  isDense: true,
+                  fillColor: Get.theme.primaryColor,
+                  contentPadding: AppStyle.edgeInsetsA32,
                 ),
-                filled: true,
-                isDense: true,
-                fillColor: Get.theme.primaryColor,
-                contentPadding: AppStyle.edgeInsetsA48,
               ),
             ),
           ],

diff --git a/simple_live_tv_app/lib/modules/settings/settings_controller.dart b/simple_live_tv_app/lib/modules/settings/settings_controller.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:simple_live_tv_app/app/app_focus_node.dart';
 import 'package:simple_live_tv_app/app/controller/base_controller.dart';
@@ -56,4 +57,9 @@ class SettingsController extends BaseController
       AppNavigator.toBiliBiliLogin();
     }
   }
+
+  void checkUpdate() {
+    SmartDialog.showToast("检查更新中...");
+    Utils.checkUpdate(showMsg: true);
+  }
 }
diff --git a/simple_live_tv_app/lib/modules/settings/settings_page.dart b/simple_live_tv_app/lib/modules/settings/settings_page.dart
@@ -398,7 +398,7 @@ class SettingsPage extends GetView<SettingsController> {
           focusNode: controller.versionFocusNode,
           title: "版本",
           subtitle: "v${Utils.packageInfo.version}",
-          onTap: () {},
+          onTap: controller.checkUpdate,
         ),
       ],
     );