diff --git a/lib/src/network/eh_cache_manager.dart b/lib/src/network/eh_cache_manager.dart index 95d36d40..ba57b6c1 100644 --- a/lib/src/network/eh_cache_manager.dart +++ b/lib/src/network/eh_cache_manager.dart @@ -38,9 +38,9 @@ class EHCacheManager extends Interceptor { @override void onRequest(RequestOptions options, RequestInterceptorHandler handler) async { CacheOptions cacheOptions = _getCacheOptions(options); - + options.extra[realUriExtraKey] = options.uri.toString(); - + if (_shouldSkipRequest(options, cacheOptions)) { handler.next(options); return; @@ -286,7 +286,11 @@ class SqliteCacheStore { final AppDb appDb; SqliteCacheStore({required this.appDb}) { - cleanExpired(); + try { + cleanExpired(); + } catch (e) { + log.error('cleanExpired failed', e); + } } Future cleanExpired() { diff --git a/lib/src/pages/layout/tablet_v2/tablet_layout_page_v2.dart b/lib/src/pages/layout/tablet_v2/tablet_layout_page_v2.dart index 49fafb7d..0dce61d0 100644 --- a/lib/src/pages/layout/tablet_v2/tablet_layout_page_v2.dart +++ b/lib/src/pages/layout/tablet_v2/tablet_layout_page_v2.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_resizable_container/flutter_resizable_container.dart'; import 'package:get/get.dart'; import 'package:jhentai/src/pages/layout/mobile_v2/mobile_layout_page_v2.dart'; +import 'package:jhentai/src/widget/will_pop_interceptor.dart'; import '../../../config/ui_config.dart'; import '../../../routes/routes.dart'; @@ -38,27 +39,29 @@ class _TabletLayoutPageV2State extends State { @override Widget build(BuildContext context) { - return Scaffold( - backgroundColor: UIConfig.backGroundColor(context), - body: ResizableContainer( - direction: Axis.horizontal, - controller: resizableController, - children: [ - ResizableChild( - child: _leftColumn(), - size: ResizableSize.ratio(windowService.leftColumnWidthRatio), - minSize: 100, + return WillPopInterceptor( + child: Scaffold( + backgroundColor: UIConfig.backGroundColor(context), + body: ResizableContainer( + direction: Axis.horizontal, + controller: resizableController, + children: [ + ResizableChild( + child: _leftColumn(), + size: ResizableSize.ratio(windowService.leftColumnWidthRatio), + minSize: 100, + ), + ResizableChild( + child: _rightColumn(), + size: ResizableSize.ratio(1 - windowService.leftColumnWidthRatio), + minSize: 100, + ), + ], + divider: ResizableDivider( + thickness: 1.5, + size: 7.5, + color: UIConfig.layoutDividerColor(context), ), - ResizableChild( - child: _rightColumn(), - size: ResizableSize.ratio(1 - windowService.leftColumnWidthRatio), - minSize: 100, - ), - ], - divider: ResizableDivider( - thickness: 1.5, - size: 7.5, - color: UIConfig.layoutDividerColor(context), ), ), );