Fix: FavoriteViewController loadDataMore

Author: honjow

ios/Runner.xcodeproj/project.pbxproj

@@ -418,7 +418,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				MARKETING_VERSION = "$(FLUTTER_BUILD_NAME)";
-				PRODUCT_BUNDLE_IDENTIFIER = cn.honjow.fehv;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.cn.honjow.fehv;
 				PRODUCT_NAME = fehviewer;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -567,7 +567,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				MARKETING_VERSION = "$(FLUTTER_BUILD_NAME)";
-				PRODUCT_BUNDLE_IDENTIFIER = cn.honjow.fehv;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.cn.honjow.fehv;
 				PRODUCT_NAME = fehviewer;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -605,7 +605,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				MARKETING_VERSION = "$(FLUTTER_BUILD_NAME)";
-				PRODUCT_BUNDLE_IDENTIFIER = cn.honjow.fehv;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.cn.honjow.fehv;
 				PRODUCT_NAME = fehviewer;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

ios/Runner/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -84,7 +86,5 @@
 	<false/>
 	<key>io.flutter.embedded_views_preview</key>
 	<string>YES</string>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
 </dict>
 </plist>

ipa.sh

@@ -1 +1 @@
-flutter build ipa --release && perl zip.pl && dsym.sh
+flutter build ipa --release && sh reid.sh && perl zip.pl && sh dsym.sh

lib/pages/tab/controller/favorite_controller.dart

@@ -56,6 +56,11 @@ class FavoriteViewController extends TabViewController {
     super.onInit();
   }
 
+  @override
+  FetchListClient getFetchListClient(FetchParams fetchParams) {
+    return FavoriteFetchListClient(fetchParams: fetchParams);
+  }
+
   @override
   Future<GalleryList?> fetchData({
     bool refresh = false,
@@ -73,9 +78,6 @@ class FavoriteViewController extends TabViewController {
         refresh: refresh,
         cancelToken: _cancelToken,
         galleryListType: GalleryListType.favorite,
-        // favCatList: (List<Favcat> list) {
-        //   _favoriteSelectorController?.addAllFavList(list);
-        // },
       );
 
       _favoriteSelectorController?.addAllFavList(rult?.favList ?? []);

lib/pages/tab/controller/tabview_controller.dart

@@ -224,15 +224,6 @@ class TabViewController extends GetxController
     final String fromGid = state?.last.gid ?? '0';
     try {
       pageState = PageState.Loading;
-      // final GalleryList? rult = await fetchNormal?.call(
-      //   page: curPage.value + 1,
-      //   fromGid: fromGid,
-      //   cats: cats ?? _catNum,
-      //   refresh: true,
-      //   cancelToken: cancelToken,
-      //   favcat: curFavcat,
-      //   toplist: currToplist,
-      // );
 
       final fetchConfig = FetchParams(
         page: nextPage,
@@ -257,11 +248,8 @@ class TabViewController extends GetxController
       if (rultList.isNotEmpty &&
           state?.indexWhere((GalleryItem e) => e.gid == rultList.first.gid) ==
               -1) {
-        // state?.addAll(rultList);
         maxPage = rult.maxPage ?? 0;
         nextPage = rult.nextPage ?? 1;
-
-        // logger.d('add all to end ${state?.length}');
       }
 
       final insertIndex = state?.length ?? 0;

lib/pages/tab/fetch_list.dart

@@ -57,6 +57,26 @@ class WatchedFetchListClient extends FetchListClient {
   }
 }
 
+class FavoriteFetchListClient extends FetchListClient {
+  FavoriteFetchListClient({
+    required FetchParams fetchParams,
+  }) : super(fetchParams: fetchParams);
+
+  @override
+  Future<GalleryList?> fetch() async {
+    return await getGallery(
+      page: fetchParams.page,
+      fromGid: fetchParams.fromGid,
+      serach: fetchParams.serach,
+      cats: fetchParams.cats,
+      cancelToken: fetchParams.cancelToken,
+      refresh: fetchParams.refresh,
+      favcat: fetchParams.favcat,
+      galleryListType: GalleryListType.favorite,
+    );
+  }
+}
+
 class ToplistFetchListClient extends FetchListClient {
   ToplistFetchListClient({
     required FetchParams fetchParams,

pubspec.yaml

@@ -3,7 +3,7 @@ description: fehviewer
 
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 1.1.26+313
+version: 1.1.26+314
 
 environment:
   sdk: '>=2.14.0 <3.0.0'

reid.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+# shellcheck disable=SC2034
+releaseBundleIdentifier='cn.honjow.fehv'
+devBundleIdentifier='dev.cn.honjow.fehv'
+
+archiverPath="build/ios/archive/fehviewer.xcarchive/Products/Applications/FEhViewer.app"
+plistPath="$archiverPath/Info.plist"
+
+plistKey="CFBundleIdentifier"
+
+/usr/libexec/PlistBuddy -c "Set :$plistKey $releaseBundleIdentifier" $plistPath

zip.pl

@@ -2,6 +2,7 @@
 use strict;
 use warnings;
 
+# 解析 pubspec中的version
 open(DATA, "<pubspec.yaml") or die "pubspec.yaml 文件无法打开, $!";
 my @lines = <DATA>;
 my $lines = join('', @lines);