Fix Web

Author: CodeGather

CHANGELOG-zh.md

@@ -1,5 +1,8 @@
 #  
 
+## 1.3.9
+* 修复BUG
+
 ## 1.3.8
 * 更新android sdk 为 2.14.19
 * 更新ios sdk 为 2.14.15

CHANGELOG.md

@@ -1,5 +1,8 @@
 #  
 
+## 1.3.9
+* FIX BUG
+
 ## 1.3.8
 * Update the Android SDK to version 2.14.19
 * Update iOS SDK to 2.14.15

ali_auth.iml

@@ -101,6 +101,12 @@
       <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/example/build" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Dart SDK" level="project" />

android/build.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 group 'com.sean.rao.ali_auth'
-version '1.3.8'
+version '1.3.9'
 
 buildscript {
     repositories {

example/lib/main.dart

@@ -1,4 +1,3 @@
-import 'dart:ui';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
@@ -11,7 +10,7 @@ void main() {
 }
 
 class MyApp extends StatefulWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   State<MyApp> createState() => _MyAppState();
@@ -26,7 +25,7 @@ class _MyAppState extends State<MyApp> {
 
   Widget getDefaultRouter() {
     //还记得我们上边的routerPage嘛， 这个东西就是我们传进来的字符串，我们可以根据这个字符串来决定加载那个flutter页面
-    String router = window.defaultRouteName;
+    String router = PlatformDispatcher.instance.defaultRouteName;
     if (kDebugMode) {
       print("获取到路由数据--------$router");
     }
@@ -44,19 +43,21 @@ class _MyAppState extends State<MyApp> {
 
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
-      onWillPop: () {
-        // 退出APP方法一
-        Fluttertoast.showToast(
-            msg: '您确定要退出思预云吗?',
-            toastLength: Toast.LENGTH_SHORT,
-            gravity: ToastGravity.CENTER,
-            timeInSecForIosWeb: 1,
-            backgroundColor: Colors.red,
-            textColor: Colors.white,
-            fontSize: 16.0);
-        return Future.value(false);
-      }, // look here!
+    return PopScope(
+      canPop: false,
+      onPopInvokedWithResult: (didPop, result) {
+        // 退出APP方法二
+        if (!didPop) {
+          Fluttertoast.showToast(
+              msg: '您确定要退出思预云吗?',
+              toastLength: Toast.LENGTH_SHORT,
+              gravity: ToastGravity.CENTER,
+              timeInSecForIosWeb: 1,
+              backgroundColor: Colors.red,
+              textColor: Colors.white,
+              fontSize: 16.0);
+        }
+      },// look here!
       child: MaterialApp(
         home: getDefaultRouter(),
         routes: <String, WidgetBuilder>{

example/lib/my_home_page.dart

@@ -8,7 +8,7 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 
 class MyHomePage extends StatefulWidget {
-  const MyHomePage({Key? key}) : super(key: key);
+  const MyHomePage({super.key});
 
   @override
   State<StatefulWidget> createState() {
@@ -140,6 +140,8 @@ class MyHomePageState extends State<MyHomePage> with WidgetsBindingObserver {
         break;
       case AppLifecycleState.detached: // TODO: Handle this case.
         break;
+      default:
+        break;
     }
   }
 

example/lib/my_home_page_web.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 class MyHomePageWeb extends StatefulWidget {
-  const MyHomePageWeb({Key? key}) : super(key: key);
+  const MyHomePageWeb({super.key});
 
   @override
   State<StatefulWidget> createState() {

example/lib/my_router_page.dart

@@ -2,7 +2,7 @@ import 'package:ali_auth_example/my_home_page.dart';
 import 'package:flutter/material.dart';
 
 class MyRouterPage extends StatefulWidget {
-  const MyRouterPage({Key? key}) : super(key: key);
+  const MyRouterPage({super.key});
 
   @override
   State<StatefulWidget> createState() {

example/pubspec.lock

@@ -52,10 +52,10 @@ packages:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
+      sha256: "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.8"
+    version: "1.0.9"
   fake_async:
     dependency: transitive
     description:
@@ -95,6 +95,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "9.0.0"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.7.2"
   leak_tracker:
     dependency: transitive
     description:
@@ -245,5 +253,5 @@ packages:
     source: hosted
     version: "1.1.1"
 sdks:
-  dart: ">=3.9.0-0 <4.0.0"
+  dart: ">=3.9.0 <4.0.0"
   flutter: ">=3.18.0-18.0.pre.54"

example/pubspec.yaml

@@ -28,7 +28,7 @@ dependencies:
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.8
+  cupertino_icons: ^1.0.9
   # 弹窗
   fluttertoast: ^9.0.0