Fix web login

3003h · Apr 3, 2024 · 98ea42d · 98ea42d
1 parent 4efc7ad
commit 98ea42d
Show file tree

Hide file tree

Showing 12 changed files with 160 additions and 213 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -41,11 +41,15 @@ def _storePassword = System.getenv("KEYSTORE_PASSWORD") ?: keystoreProperties.ge
 android {
     ndkVersion "25.2.9519653"
     compileSdkVersion 34
+    namespace 'com.honjow.fehviewer'
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
+//    kotlin {
+//        jvmToolchain(8)
+//    }
 
     defaultConfig {
         applicationId "com.honjow.fehviewer"
@@ -100,7 +104,7 @@ android {
             shrinkResources true
         }
     }
-    namespace 'com.honjow.fehviewer'
+
     lint {
         disable 'InvalidPackage'
     }

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.4.2" apply false
+    id "com.android.application" version '7.4.2' apply false
     id "org.jetbrains.kotlin.android" version "1.7.20" apply false
     id "com.google.gms.google-services" version "4.4.0" apply false
     id "com.google.firebase.crashlytics" version "2.9.9" apply false

diff --git a/changelog/v1.6.1+541.md b/changelog/v1.6.1+541.md
@@ -0,0 +1,13 @@
+
+## 🐛 修正
+
+- 修复 Web 登陆页中无法跳转 recapture 的问题 #357
+
+---
+
+
+## 🐛 Fixes
+
+- Fix the issue of unable to redirect to recapture on the web login page.
+
+
diff --git a/lib/common/global.dart b/lib/common/global.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:collection/collection.dart';
 import 'package:cookie_jar/cookie_jar.dart';
-import 'package:device_info/device_info.dart';
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:dio_cookie_manager/dio_cookie_manager.dart';
 import 'package:eros_fe/common/service/ehsetting_service.dart';
 import 'package:eros_fe/const/storages.dart';

diff --git a/lib/const/const.dart b/lib/const/const.dart
@@ -378,6 +378,7 @@ class EHConst {
 
   static const int sumCats = 1023;
   static const Map<String, int> cats = {
+    'Misc': 1,
     'Doujinshi': 2,
     'Manga': 4,
     'Artist CG': 8,
@@ -387,7 +388,6 @@ class EHConst {
     'Image Set': 32,
     'Cosplay': 64,
     'Asian Porn': 128,
-    'Misc': 1,
   };
 
   static List<String> catList = <String>[

diff --git a/lib/extension.dart b/lib/extension.dart
@@ -118,7 +118,7 @@ extension ExtGalleryProvider on GalleryProvider {
       favcat: item.favcat?.oN,
       localFav: item.localFav?.oN,
       simpleTags: item.simpleTags?.oN,
-      tagsFromApi: item.tagsFromApi?.toList()?.oN,
+      tagsFromApi: item.tagsFromApi?.toList().oN,
       translated: item.translated?.oN,
       tagGroup: item.tagGroup?.oN,
       galleryComment: item.galleryComment?.oN,

diff --git a/lib/pages/login/view/web_login_in.dart b/lib/pages/login/view/web_login_in.dart
@@ -6,20 +6,17 @@ import 'package:eros_fe/utils/logger.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:get/get.dart';
-import 'package:webview_cookie_manager/webview_cookie_manager.dart';
 
 class WebLoginViewIn extends StatelessWidget {
   WebLoginViewIn({
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   final CookieManager _cookieManager = CookieManager.instance();
 
   @override
   Widget build(BuildContext context) {
     final String title = L10n.of(context).login_web;
-    InAppWebViewController _controller;
-    final WebviewCookieManager cookieManager = WebviewCookieManager();
 
     final InAppWebViewSettings settings = InAppWebViewSettings(
         useShouldOverrideUrlLoading: true,
@@ -36,39 +33,26 @@ class WebLoginViewIn extends StatelessWidget {
         child: InAppWebView(
           initialUrlRequest: URLRequest(url: WebUri(EHConst.URL_SIGN_IN)),
           initialSettings: settings,
-          onWebViewCreated: (InAppWebViewController webViewController) {
-            _controller = webViewController;
-          },
+          onWebViewCreated: (InAppWebViewController webViewController) {},
           onPermissionRequest: (controller, permissionRequest) async {
             return PermissionResponse(action: PermissionResponseAction.GRANT);
           },
-          // onLoadStart: (InAppWebViewController controller, Uri? url) {
-          //   logger.d('Page started loading: $url');
-          //
-          //   if (url == null) {
-          //     return;
-          //   }
-          //
-          //   if (!(url.path == '/uconfig.php') && !(url.path == '/index.php')) {
-          //     logger.d('阻止打开 $url');
-          //     controller.stopLoading();
-          //   }
-          // },
           shouldOverrideUrlLoading: (controller, navigationAction) async {
             final uri = navigationAction.request.url!;
 
-            final act = uri.queryParameters['act'];
+            // final act = uri.queryParameters['act'];
 
             logger.d('to $uri');
-            if (uri.path == '/index.php' && act != null && act != 'Login') {
-              logger.d('阻止打开 $uri');
-              return NavigationActionPolicy.CANCEL;
-            } else if (uri.path == '/uconfig.php' || uri.path == '/index.php') {
-              return NavigationActionPolicy.ALLOW;
-            }
-
-            logger.d('阻止打开 $uri');
-            return NavigationActionPolicy.CANCEL;
+            // if (uri.path == '/index.php' && act != null && act != 'Login') {
+            //   logger.d('阻止打开 $uri');
+            //   return NavigationActionPolicy.CANCEL;
+            // } else if (uri.path == '/uconfig.php' || uri.path == '/index.php') {
+            //   return NavigationActionPolicy.ALLOW;
+            // }
+            //
+            // logger.d('阻止打开 $uri');
+            // return NavigationActionPolicy.CANCEL;
+            return NavigationActionPolicy.ALLOW;
           },
           onLoadStop: (InAppWebViewController controller, Uri? uri) async {
             logger.d('Page Finished loading: $uri');

diff --git a/lib/pages/setting/webview/eh_webview.dart b/lib/pages/setting/webview/eh_webview.dart
@@ -1,13 +1,7 @@
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
-final InAppWebViewGroupOptions inAppWebViewOptions = InAppWebViewGroupOptions(
-    crossPlatform: InAppWebViewOptions(
-      useShouldOverrideUrlLoading: true,
-      mediaPlaybackRequiresUserGesture: false,
-    ),
-    android: AndroidInAppWebViewOptions(
-      useHybridComposition: true,
-    ),
-    ios: IOSInAppWebViewOptions(
-      allowsInlineMediaPlayback: true,
-    ));
+final InAppWebViewSettings inAppWebViewSettings = InAppWebViewSettings(
+    useShouldOverrideUrlLoading: true,
+    mediaPlaybackRequiresUserGesture: false,
+    useHybridComposition: true,
+    allowsInlineMediaPlayback: true);
diff --git a/lib/pages/setting/webview/mytags_in.dart b/lib/pages/setting/webview/mytags_in.dart
@@ -3,26 +3,14 @@ import 'package:eros_fe/network/api.dart';
 import 'package:eros_fe/pages/setting/controller/web_setting_controller.dart';
 import 'package:eros_fe/utils/logger.dart';
 import 'package:flutter/cupertino.dart';
-import 'package:flutter_inappwebview/flutter_inappwebview.dart' hide WebView;
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
 
 import 'eh_webview.dart';
 
 class InWebMyTags extends StatelessWidget {
-  // final CookieManager _cookieManager = CookieManager.instance();
-  //
-  // Future<void> _setCookie() async {
-  //   final List<io.Cookie>? cookies =
-  //       await Global.cookieJar?.loadForRequest(Uri.parse(Api.getBaseUrl()));
-  //
-  //   for (final io.Cookie cookie in cookies ?? []) {
-  //     _cookieManager.setCookie(
-  //         url: Uri.parse(Api.getBaseUrl()),
-  //         name: cookie.name,
-  //         value: cookie.value);
-  //   }
-  // }
+  const InWebMyTags({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -38,7 +26,7 @@ class InWebMyTags extends StatelessWidget {
             CupertinoButton(
               padding: const EdgeInsets.all(0),
               child: const Icon(
-                FontAwesomeIcons.redoAlt,
+                FontAwesomeIcons.rotateRight,
                 size: 22,
               ),
               onPressed: () async {
@@ -55,15 +43,7 @@ class InWebMyTags extends StatelessWidget {
           onWebViewCreated: (InAppWebViewController controller) {
             _controller = controller;
           },
-          initialOptions: inAppWebViewOptions,
-          // onLoadStart: (InAppWebViewController controller, Uri? url) {
-          //   logger.d('Page started loading: $url');
-          //
-          //   if (!url.toString().endsWith('/mytags')) {
-          //     logger.d('阻止打开 $url');
-          //     controller.stopLoading();
-          //   }
-          // },
+          initialSettings: inAppWebViewSettings,
           shouldOverrideUrlLoading: (controller, navigationAction) async {
             final uri = navigationAction.request.url!;
 

diff --git a/lib/pages/setting/webview/web_mysetting_in.dart b/lib/pages/setting/webview/web_mysetting_in.dart
@@ -8,19 +8,21 @@ import 'package:eros_fe/network/api.dart';
 import 'package:eros_fe/pages/setting/controller/web_setting_controller.dart';
 import 'package:eros_fe/utils/logger.dart';
 import 'package:flutter/cupertino.dart';
-import 'package:flutter_inappwebview/flutter_inappwebview.dart' hide WebView;
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
 
 import 'eh_webview.dart';
 
 class InWebMySetting extends StatelessWidget {
-  final CookieManager _cookieManager = CookieManager.instance();
-  final EhSettingService ehSettingService = Get.find();
+  const InWebMySetting({super.key});
 
   @override
   Widget build(BuildContext context) {
-    InAppWebViewController? _controller;
+    final CookieManager cookieManager = CookieManager.instance();
+    final EhSettingService ehSettingService = Get.find();
+
+    InAppWebViewController? controller;
 
     final baseUrl = Api.getBaseUrl();
 
@@ -43,7 +45,7 @@ class InWebMySetting extends StatelessWidget {
                 size: 22,
               ),
               onPressed: () async {
-                _controller?.reload();
+                controller?.reload();
               },
             ),
             CupertinoButton(
@@ -54,7 +56,7 @@ class InWebMySetting extends StatelessWidget {
               ),
               onPressed: () async {
                 // 保存配置
-                _controller?.evaluateJavascript(
+                controller?.evaluateJavascript(
                     source:
                         'document.querySelector("#apply > input[type=submit]").click();');
               },
@@ -70,18 +72,14 @@ class InWebMySetting extends StatelessWidget {
             ),
             // headers: _httpHeaders,
           ),
-          initialOptions: inAppWebViewOptions,
+          initialSettings: inAppWebViewSettings,
           onWebViewCreated: (InAppWebViewController controller) {
-            _controller = controller;
+            controller = controller;
           },
           shouldOverrideUrlLoading: (controller, navigationAction) async {
             final uri = navigationAction.request.url!;
 
             logger.d('to $uri');
-            // if (!(uri.path == '/uconfig.php')) {
-            //   logger.d('阻止打开 $uri');
-            //   return NavigationActionPolicy.CANCEL;
-            // }
             if (uri.host != Api.getBaseHost()) {
               logger.d('阻止打开 $uri');
               return NavigationActionPolicy.CANCEL;
@@ -96,10 +94,10 @@ class InWebMySetting extends StatelessWidget {
             }
 
             // 写入cookie到dio
-            final _cookies =
-                await _cookieManager.getCookies(url: WebUri.uri(url));
+            final cookies =
+                await cookieManager.getCookies(url: WebUri.uri(url));
 
-            final ioCookies = _cookies
+            final ioCookies = cookies
                 .map((e) => io.Cookie(e.name, e.value as String)
                   ..domain = e.domain
                   ..path = e.path
@@ -114,24 +112,6 @@ class InWebMySetting extends StatelessWidget {
                     .firstWhereOrNull((element) => element.name == 'sp')
                     ?.value ??
                 '';
-
-            // _cookieManager.getCookies(url: url).then((value) {
-            //   final List<io.Cookie> _cookies = value
-            //       .map((Cookie e) =>
-            //           io.Cookie(e.name, e.value as String)..domain = e.domain)
-            //       .toList();
-            //
-            //   logger.d('${_cookies.map((e) => e.toString()).join('\n')} ');
-            //
-            //   Global.cookieJar.delete(Uri.parse(Api.getBaseUrl()), true);
-            //   Global.cookieJar
-            //       .saveFromResponse(Uri.parse(Api.getBaseUrl()), _cookies);
-            //
-            //   ehSettingService.selectProfile = _cookies
-            //           .firstWhereOrNull((element) => element.name == 'sp')
-            //           ?.value ??
-            //       '';
-            // });
           },
         ),
       ),