v1.3.9

niuhuan · Jan 28, 2023 · f530613 · f530613
1 parent c2a66c0
commit f530613
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 11 deletions.
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -58,31 +58,31 @@ jobs:
         config:
           - target: linux
             host: ubuntu-latest
-            flutter_version: '3.3.5'
+            flutter_version: '3.3.10'
             flutter_channel: 'stable'
           - target: windows
             host: windows-latest
-            flutter_version: '3.3.5'
+            flutter_version: '3.3.10'
             flutter_channel: 'stable'
           - target: macos
             host: macos-latest
-            flutter_version: '3.3.5'
+            flutter_version: '3.3.10'
             flutter_channel: 'stable'
           - target: ios
             host: macos-latest
-            flutter_version: '3.3.5'
+            flutter_version: '3.3.10'
             flutter_channel: 'stable'
           - target: android-arm32
             host: ubuntu-latest
-            flutter_version: '3.3.5'
+            flutter_version: '3.3.10'
             flutter_channel: 'stable'
           - target: android-arm64
             host: ubuntu-latest
-            flutter_version: '3.3.5'
+            flutter_version: '3.3.10'
             flutter_channel: 'stable'
           - target: android-x86_64
             host: ubuntu-latest
-            flutter_version: '3.3.5'
+            flutter_version: '3.3.10'
             flutter_channel: 'stable'
           - target: android-arm32
             host: ubuntu-latest

diff --git a/ci/version.code.txt b/ci/version.code.txt
@@ -1 +1 @@
-v1.3.8
+v1.3.9
diff --git a/ci/version.info.txt b/ci/version.info.txt
@@ -12,6 +12,13 @@
 
 ## !! WARNING !!
 
+v1.3.9
+
+- [x] 🐛修复jasmine不能追加下载章节
+- [x] 🐛Jasmine下载总数超过图片总数
+- [x] ✨支持搜索jm代码(之前搜索过的话,需要清除缓存)
+- [x] 🚀升级flutter引擎
+
 v1.3.8
 
 - [x] 🚀功能:音量或者键盘翻页时不显示翻页动画(设置项)
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -74,7 +74,7 @@ SPEC CHECKSUMS:
   permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
   SDWebImage: e5cc87bf736e60f49592f307bdf9e157189298a3
   SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780
-  url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
+  url_launcher_ios: ae1517e5e344f5544fb090b079e11f399dfbe4d2
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 

diff --git a/lib/basic/entities.dart b/lib/basic/entities.dart
@@ -61,16 +61,19 @@ class SearchPage {
 
   late final String searchQuery;
   late final int total;
+  late final int? redirectAid;
 
   SearchPage.fromJson(Map<String, dynamic> json) {
     searchQuery = json['search_query'];
     total = json['total'];
+    redirectAid = json['redirect_aid'];
   }
 
   Map<String, dynamic> toJson() {
     final _data = <String, dynamic>{};
     _data['search_query'] = searchQuery;
     _data['total'] = total;
+    _data['redirect_aid'] = redirectAid;
     return _data;
   }
 }
@@ -774,10 +777,12 @@ class ActionResponse {
 class InnerComicPage {
   final int total;
   final List<ComicSimple> list;
+  final int? redirectAid;
 
   InnerComicPage({
     required this.total,
     required this.list,
+    this.redirectAid,
   });
 }
 

diff --git a/lib/screens/comic_search_screen.dart b/lib/screens/comic_search_screen.dart
@@ -66,6 +66,7 @@ class _ComicSearchScreenState extends State<ComicSearchScreen> {
             return InnerComicPage(
               total: response.total,
               list: response.content,
+              redirectAid: response.redirectAid,
             );
           },
         ),

diff --git a/lib/screens/components/comic_pager.dart b/lib/screens/components/comic_pager.dart
@@ -1,10 +1,11 @@
-import 'package:event/src/eventargs.dart';
+import 'package:event/event.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:jasmine/basic/commons.dart';
 import 'package:jasmine/basic/methods.dart';
 import 'package:jasmine/configs/pager_controller_mode.dart';
+import 'package:jasmine/screens/comic_info_screen.dart';
 import 'package:jasmine/screens/components/content_builder.dart';
 
 import '../../configs/is_pro.dart';
@@ -75,6 +76,9 @@ class _StreamPagerState extends State<_StreamPager> {
       });
       var response = await widget.onPage(_nextPage);
       if (_nextPage == 1) {
+        if (_redirectAid(response.redirectAid, context)) {
+          return;
+        }
         if (response.total == 0) {
           _maxPage = 1;
         } else {
@@ -312,6 +316,9 @@ class _PagerPagerState extends State<_PagerPager> {
     var response = await widget.onPage(_currentPage);
     setState(() {
       if (_currentPage == 1) {
+        if (_redirectAid(response.redirectAid, context)) {
+          return;
+        }
         if (response.total == 0) {
           _maxPage = 1;
         } else {
@@ -476,3 +483,14 @@ class _PagerPagerState extends State<_PagerPager> {
     );
   }
 }
+
+bool _redirectAid(int? redirectAid, BuildContext context) {
+  if (redirectAid != null) {
+    Navigator.of(context)
+        .pushReplacement(MaterialPageRoute(builder: (BuildContext context) {
+      return ComicInfoScreen(redirectAid, null);
+    }));
+    return true;
+  }
+  return false;
+}
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ description: jasmine comic browser
 
 publish_to: 'none'
 
-version: 1.3.7+9
+version: 1.3.9+10
 
 environment:
   sdk: ">=2.15.1 <3.0.0"