From ec079ac9d62dc74c88090ca46012b21f7f96adc5 Mon Sep 17 00:00:00 2001
From: ErBW_s <94068488+ErBWs@users.noreply.github.com>
Date: Thu, 17 Oct 2024 20:26:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=95=B0=E8=A1=A8=E7=8E=B0=E5=BD=A2?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8CmacOS=E8=A1=A8=E7=8E=B0?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 除历史记录界面表现外，其他界面均修改为原始网页表现形式
2. 优化macOS启动时界面大小
---
 lib/main.dart                         | 39 ++++++++++++++++++---------
 lib/modules/roads/road_module.dart    |  2 ++
 lib/pages/player/player_item.dart     |  2 +-
 lib/pages/video/video_controller.dart |  3 ++-
 lib/pages/video/video_page.dart       |  2 +-
 lib/plugins/plugins.dart              |  7 +++--
 6 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index ad0ab651..988794df 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -17,18 +17,33 @@ void main() async {
   if (Utils.isDesktop()) {
     await windowManager.ensureInitialized();
     bool isLowResolution = await Utils.isLowResolution();
-    WindowOptions windowOptions = WindowOptions(
-      size: isLowResolution ? const Size(800, 600) : const Size(1280, 860),
-      center: true,
-      // backgroundColor: Colors.white,
-      skipTaskbar: false,
-      titleBarStyle: TitleBarStyle.hidden,
-      windowButtonVisibility: false,
-    );
-    windowManager.waitUntilReadyToShow(windowOptions, () async {
-      await windowManager.show();
-      await windowManager.focus();
-    });
+    if (Platform.isMacOS) {
+      WindowOptions windowOptions = const WindowOptions(
+        size: Size(1400, 900),
+        center: true,
+        // backgroundColor: Colors.white,
+        skipTaskbar: false,
+        titleBarStyle: TitleBarStyle.hidden,
+        windowButtonVisibility: false,
+      );
+      windowManager.waitUntilReadyToShow(windowOptions, () async {
+        await windowManager.show();
+        await windowManager.focus();
+      });
+    } else {
+      WindowOptions windowOptions = WindowOptions(
+        size: isLowResolution ? const Size(800, 600) : const Size(1280, 860),
+        center: true,
+        // backgroundColor: Colors.white,
+        skipTaskbar: false,
+        titleBarStyle: TitleBarStyle.hidden,
+        windowButtonVisibility: false,
+      );
+      windowManager.waitUntilReadyToShow(windowOptions, () async {
+        await windowManager.show();
+        await windowManager.focus();
+      });
+    }
   }
   if (Platform.isAndroid || Platform.isIOS) {
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
diff --git a/lib/modules/roads/road_module.dart b/lib/modules/roads/road_module.dart
index 818d2214..ecc1f546 100644
--- a/lib/modules/roads/road_module.dart
+++ b/lib/modules/roads/road_module.dart
@@ -1,9 +1,11 @@
 class Road {
   String name;
   List<String> data;
+  List<String> identifier;
 
   Road({
     required this.name,
     required this.data,
+    required this.identifier,
   });
 }
\ No newline at end of file
diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dart
index 5acee186..da9021c8 100644
--- a/lib/pages/player/player_item.dart
+++ b/lib/pages/player/player_item.dart
@@ -290,7 +290,7 @@ class _PlayerItemState extends State<PlayerItem>
                   .roadList[videoPageController.currentRoad].data.length &&
           !videoPageController.loading) {
         SmartDialog.showToast(
-            '正在加载第 ${videoPageController.currentEspisode + 1} 话');
+            '正在加载${videoPageController.roadList[videoPageController.currentRoad].identifier[videoPageController.currentEspisode]}');
         try {
           playerTimer!.cancel();
         } catch (_) {}
diff --git a/lib/pages/video/video_controller.dart b/lib/pages/video/video_controller.dart
index 61a8b412..4076de29 100644
--- a/lib/pages/video/video_controller.dart
+++ b/lib/pages/video/video_controller.dart
@@ -59,7 +59,8 @@ abstract class _VideoPageController with Store {
     currentEspisode = episode;
     this.currentRoad = currentRoad;
     logLines.clear();
-    KazumiLogger().log(Level.info, '跳转到第$episode话');
+    String chapterName = roadList[currentRoad].identifier[episode - 1];
+    KazumiLogger().log(Level.info, '跳转到$chapterName');
     String urlItem = roadList[currentRoad].data[episode - 1];
     if (urlItem.contains(currentPlugin.baseUrl) ||
         urlItem.contains(currentPlugin.baseUrl.replaceAll('https', 'http'))) {
diff --git a/lib/pages/video/video_page.dart b/lib/pages/video/video_page.dart
index 539462f2..c94bb91a 100644
--- a/lib/pages/video/video_page.dart
+++ b/lib/pages/video/video_page.dart
@@ -421,7 +421,7 @@ class _VideoPageState extends State<VideoPage>
                             const SizedBox(width: 6)
                           ],
                           Text(
-                            '第$count话',
+                            road.identifier[count0 - 1],
                             style: TextStyle(
                                 fontSize: 13,
                                 color: (count0 ==
diff --git a/lib/plugins/plugins.dart b/lib/plugins/plugins.dart
index 22595a72..98d31424 100644
--- a/lib/plugins/plugins.dart
+++ b/lib/plugins/plugins.dart
@@ -186,12 +186,15 @@ class Plugin {
       htmlElement.queryXPath(chapterRoads).nodes.forEach((element) {
         try {
           List<String> chapterUrlList = [];
+          List<String> chapterNameList = [];
           element.queryXPath(chapterResult).nodes.forEach((item) {
             String itemUrl = item.node.attributes['href'] ?? '';
+            String itemName = item.node.text ?? '';
             chapterUrlList.add(itemUrl);
+            chapterNameList.add(itemName);
           });
-          if (chapterUrlList.isNotEmpty) {
-            Road road = Road(name: '播放列表$count', data: chapterUrlList);
+          if (chapterUrlList.isNotEmpty && chapterNameList.isNotEmpty) {
+            Road road = Road(name: '播放列表$count', data: chapterUrlList, identifier: chapterNameList);
             roadList.add(road);
             count++;
           }