合并分支 'test' 到 'sim'

lib/pages/library/view.dart

@@ -108,6 +108,8 @@ class _LibraryPageState extends State<LibraryPage>  {
         ),
         Visibility(
           visible: controller.show,
+          child: Container(
+            height: double.infinity,
             child: FilterPage(
               controller: controller,
               sureTap: (){
@@ -119,6 +121,7 @@ class _LibraryPageState extends State<LibraryPage>  {
                 controller.resetFilter();
               },),
           ),
+        ),
       ],
     );
   }

lib/pages/library/widgets/filter.dart

@@ -32,7 +32,10 @@ class _FilterPageState extends State<FilterPage> {
       },
       child: Container(
         color: const Color(0xFF000000).withOpacity(0.5),
+        // color: Colors.red,
+        child: SingleChildScrollView(
           child: Column(
+            // mainAxisSize: MainAxisSize.min,
             children: [
               GestureDetector(
                 behavior: HitTestBehavior.opaque,
@@ -106,6 +109,7 @@ class _FilterPageState extends State<FilterPage> {
             ],
           ),
         ),
+      ),
     );
   }
 

lib/pages/read_info/index.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:go_router/go_router.dart';
 
+import '../../routes/index.dart';
 import '../../utils/index.dart';
 
 part 'view.dart';
\ No newline at end of file

lib/pages/read_info/view.dart

@@ -26,7 +26,19 @@ class _ReadInfoPageState extends State<ReadInfoPage> {
           onLoadStop: (controller, url) {
             String jsonStr = jsonEncode(widget.params);
             controller.evaluateJavascript(source: 'callbackInFlutterComponent($jsonStr)');
+            // 图片预览
+            controller.addJavaScriptHandler(handlerName: 'scaleImageCallback', callback: (args){
+              String url = args.first[0].toString();
+              String title = args.first[1].toString();
+              Map<String,String> params = {
+                'url':url,
+                'title':title,
+              };
+              Console.log('监听图片预览---------------给页面传参---------------------------------$params');
+              context.pushNamed(Routes.scaleImage,queryParameters: params);
+            });
           },
+
           onConsoleMessage: (controller, consoleMessage) {
             // 接收从 WebView 发送的消息
             Console.log("画廊扩展阅读-------Received message from WebView-----------------------------: ${consoleMessage.message}");

lib/pages/splash/index.dart

@@ -7,5 +7,6 @@ import 'package:flutter_book/widgets/index.dart';
 import 'package:go_router/go_router.dart';
 
 import '../../routes/index.dart';
+import '../../utils/index.dart';
 
 part 'view.dart';
\ No newline at end of file

lib/pages/splash/view.dart

@@ -15,13 +15,20 @@ class _SplashPageState extends State<SplashPage> {
     Future.wait([
       Future.delayed(const Duration(seconds: 2))
     ]).whenComplete(() async {
+      final netStatus = await Tools.checkCurrentNetStatus();
+      if (netStatus){
         final ads = await CommonAPI.list(type: '1');
-      if (ads.isNotEmpty){
+        if (ads.isNotEmpty) {
           context.pushReplacementNamed(Routes.ad,extra: ads);
         }
         else {
           context.pushReplacementNamed(Routes.main);
         }
+      }
+      else {
+        context.pushReplacementNamed(Routes.main);
+      }
+
     });