Update Flutter and dependencies

3003h · Mar 19, 2024 · 7cc345f · 7cc345f
1 parent f028ace
commit 7cc345f
Show file tree

Hide file tree

Showing 7 changed files with 331 additions and 238 deletions.
diff --git a/lib/pages/login/view/web_login_in.dart b/lib/pages/login/view/web_login_in.dart
@@ -40,7 +40,7 @@ class WebLoginViewIn extends StatelessWidget {
  ),
  child: SafeArea(
  child: InAppWebView(
- initialUrlRequest: URLRequest(url: Uri.parse(EHConst.URL_SIGN_IN)),
+ initialUrlRequest: URLRequest(url: WebUri(EHConst.URL_SIGN_IN)),
  initialOptions: options,
  onWebViewCreated: (InAppWebViewController webViewController) {
  _controller = webViewController;
@@ -88,7 +88,9 @@ class WebLoginViewIn extends StatelessWidget {
  if (uri.path == '/index.php' && uri.queryParameters.isEmpty) {
  // final Map<String, String> cookieMap = <String, String>{};
  // 返回 cookie
- _cookieManager.getCookies(url: uri).then((List<Cookie> cookies) {
+ _cookieManager
+ .getCookies(url: WebUri.uri(uri))
+ .then((List<Cookie> cookies) {
  logger.d(' $cookies');
  // value.forEach((Cookie cookie) =>
  // cookieMap[cookie.name] = cookie.value as String);

diff --git a/lib/pages/setting/controller/web_setting_controller.dart b/lib/pages/setting/controller/web_setting_controller.dart
@@ -22,7 +22,7 @@ class WebSettingController extends GetxController {
  for (final io.Cookie cookie in Global.profile.user.cookies) {
  logger.t('name:${cookie.name} value:${cookie.value}');
  _cookieManager.setCookie(
- url: Uri.parse(Api.getBaseUrl()),
+ url: WebUri(Api.getBaseUrl()),
  name: cookie.name,
  value: cookie.value);
  }

diff --git a/lib/pages/setting/webview/mytags_in.dart b/lib/pages/setting/webview/mytags_in.dart
@@ -51,7 +51,7 @@ class InWebMyTags extends StatelessWidget {
  child: SafeArea(
  child: InAppWebView(
  initialUrlRequest:
- URLRequest(url: Uri.parse('${Api.getBaseUrl()}/mytags')),
+ URLRequest(url: WebUri('${Api.getBaseUrl()}/mytags')),
  onWebViewCreated: (InAppWebViewController controller) {
  _controller = controller;
  },

diff --git a/lib/pages/setting/webview/web_mysetting_in.dart b/lib/pages/setting/webview/web_mysetting_in.dart
@@ -65,7 +65,7 @@ class InWebMySetting extends StatelessWidget {
  child: SafeArea(
  child: InAppWebView(
  initialUrlRequest: URLRequest(
- url: Uri.parse(
+ url: WebUri(
  '$baseUrl/uconfig.php',
  ),
  // headers: _httpHeaders,
@@ -96,7 +96,8 @@ class InWebMySetting extends StatelessWidget {
  }
 
  // 写入cookie到dio
- final _cookies = await _cookieManager.getCookies(url: url);
+ final _cookies =
+ await _cookieManager.getCookies(url: WebUri.uri(url));
 
  final ioCookies = _cookies
  .map((e) => io.Cookie(e.name, e.value as String)

diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -10,6 +10,7 @@ import device_info_plus
 import firebase_analytics
 import firebase_core
 import firebase_crashlytics
+import flutter_inappwebview_macos
 import isar_flutter_libs
 import package_info
 import package_info_plus
@@ -28,6 +29,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  FLTFirebaseAnalyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAnalyticsPlugin"))
  FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
  FLTFirebaseCrashlyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCrashlyticsPlugin"))
+ InAppWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "InAppWebViewFlutterPlugin"))
  IsarFlutterLibsPlugin.register(with: registry.registrar(forPlugin: "IsarFlutterLibsPlugin"))
  FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin"))
  FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))