Fix: search

3003h · Sep 14, 2021 · c2348ca · c2348ca
1 parent fddaa52
commit c2348ca
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 21 deletions.
diff --git a/lib/common/controller/gallerycache_controller.dart b/lib/common/controller/gallerycache_controller.dart
@@ -29,7 +29,7 @@ class GalleryCacheController extends GetxController {
     } else {
       try {
         final remotelist = await webdavController.getRemotReadList();
-        logger.d('remotelist $remotelist');
+        logger.v('remotelist $remotelist');
         if (remotelist.contains(gid)) {
           final remote = await webdavController.downloadRead(gid);
           logger.d('remote $remote');

diff --git a/lib/common/service/depth_service.dart b/lib/common/service/depth_service.dart
@@ -30,11 +30,11 @@ class DepthService extends GetxService {
 
   void pushSearchPageCtrl() {
     searchPageCtrlDepth++;
-    logger.v('pushSearchPageCtrl to $searchPageCtrlDepth');
+    logger.d('pushSearchPageCtrl to $searchPageCtrlDepth');
   }
 
   void popSearchPageCtrl() {
     searchPageCtrlDepth--;
-    logger.v('pushSearchPageCtrl to $searchPageCtrlDepth');
+    logger.d('pushSearchPageCtrl to $searchPageCtrlDepth');
   }
 }
diff --git a/lib/pages/gallery/view/gallery_page.dart b/lib/pages/gallery/view/gallery_page.dart
@@ -48,7 +48,7 @@ class _GalleryMainPageState extends State<GalleryMainPage> {
   @override
   void initState() {
     super.initState();
-    logger.d('initState pageCtrlDepth:$pageCtrlDepth');
+    logger.v('initState pageCtrlDepth:$pageCtrlDepth');
     initPageController(tag: _tag);
     _controller = Get.put(GalleryPageController(), tag: _tag);
 

diff --git a/lib/pages/setting/eh_setting_page.dart b/lib/pages/setting/eh_setting_page.dart
@@ -94,6 +94,14 @@ class ListViewEhSetting extends StatelessWidget {
       _ehConfigService.isClipboardLink.value = val;
     }
 
+    Future<void> _forceUpdateTranslate() async {
+      if (await transController.checkUpdate(force: true)) {
+        showToast('手动更新开始');
+        await transController.updateDB();
+        showToast('更新完成');
+      }
+    }
+
     final List<Widget> _list = <Widget>[
       if (_isLogin)
         TextSwitchItem(
@@ -159,16 +167,19 @@ class ListViewEhSetting extends StatelessWidget {
               behavior: HitTestBehavior.opaque,
               onLongPress: () async {
                 vibrateUtil.light();
-                showToast('强制更新开始');
-                if (await transController.checkUpdate(force: true)) {
-                  await transController.updateDB();
-                  showToast('更新完成');
-                }
+                _forceUpdateTranslate();
               },
-              child: TextSwitchItem('显示标签中文翻译',
-                  intValue: _tagTranslat,
-                  onChanged: _handleTagTranslatChanged,
-                  desc: '当前版本:${_ehConfigService.tagTranslatVer.value}'),
+              child: TextSwitchItem(
+                '显示标签中文翻译',
+                intValue: _tagTranslat,
+                onChanged: _handleTagTranslatChanged,
+                desc: '当前版本:${_ehConfigService.tagTranslatVer.value}',
+                suffix: CupertinoButton(
+                  padding: const EdgeInsets.all(0),
+                  child: const Icon(CupertinoIcons.refresh),
+                  onPressed: _forceUpdateTranslate,
+                ),
+              ),
             )),
       Obx(() {
         // if (_ehConfigService.isTagTranslat) {

diff --git a/lib/pages/setting/setting_base.dart b/lib/pages/setting/setting_base.dart
@@ -183,6 +183,7 @@ class TextSwitchItem extends StatefulWidget {
     this.hideLine = false,
     this.icon,
     this.iconIndent = 0.0,
+    this.suffix,
   }) : super(key: key);
 
   final bool? intValue;
@@ -193,6 +194,7 @@ class TextSwitchItem extends StatefulWidget {
   final bool hideLine;
   final Widget? icon;
   final double iconIndent;
+  final Widget? suffix;
 
   @override
   _TextSwitchItemState createState() => _TextSwitchItemState();
@@ -242,9 +244,8 @@ class _TextSwitchItemState extends State<TextSwitchItem> {
                               color: CupertinoColors.systemGrey),
                         ).paddingOnly(top: 2.0),
                     ]),
-                Expanded(
-                  child: Container(),
-                ),
+                const Spacer(),
+                if (widget.suffix != null) widget.suffix!,
                 if (widget.onChanged != null)
                   CupertinoSwitch(
                     onChanged: (bool value) {

diff --git a/lib/route/navigator_util.dart b/lib/route/navigator_util.dart
@@ -9,10 +9,7 @@ import 'package:fehviewer/pages/gallery/controller/gallery_page_controller.dart'
 import 'package:fehviewer/pages/gallery/view/gallery_page.dart';
 import 'package:fehviewer/pages/image_view/common.dart';
 import 'package:fehviewer/pages/image_view/view/view_page.dart';
-import 'package:fehviewer/pages/tab/controller/gallery_controller.dart';
 import 'package:fehviewer/pages/tab/controller/search_page_controller.dart';
-import 'package:fehviewer/pages/tab/view/gallery_list_page.dart';
-import 'package:fehviewer/pages/tab/view/search_page.dart';
 import 'package:fehviewer/pages/tab/view/tab_base.dart';
 import 'package:fehviewer/route/routes.dart';
 import 'package:fehviewer/route/second_observer.dart';

diff --git a/lib/utils/cust_lib/sliver/element.dart b/lib/utils/cust_lib/sliver/element.dart
@@ -34,7 +34,7 @@ class SliverFloatingPersistentHeaderElement extends RenderObjectElement {
   @override
   void unmount() {
     super.unmount();
-    renderObject.element = null;
+    // renderObject.element = null;
   }
 
   @override

diff --git a/pubspec.yaml b/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.25+303
+version: 1.1.25+304
 
 environment:
   sdk: '>=2.14.0 <3.0.0'