update login & webview fix #764 #763

CarGuo · Jun 29, 2021 · 3e06175 · 3e06175
1 parent 64a4c47
commit 3e06175
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 18 deletions.
diff --git a/lib/common/dao/user_dao.dart b/lib/common/dao/user_dao.dart
@@ -23,19 +23,18 @@ import 'package:gsy_github_app_flutter/common/utils/common_utils.dart';
 import 'package:redux/redux.dart';
 
 class UserDao {
-
   static oauth(code, store) async {
-
     httpManager.clearAuthorization();
 
     var res = await httpManager.netFetch(
-        "https://github.com/login/oauth/access_token?"
-            "client_id=${NetConfig.CLIENT_ID}"
-            "&client_secret=${NetConfig.CLIENT_SECRET}"
-            "&code=${code}",
-        null,
-        null,
-        null);
+      "https://github.com/login/oauth/access_token?"
+      "client_id=${NetConfig.CLIENT_ID}"
+      "&client_secret=${NetConfig.CLIENT_SECRET}"
+      "&code=${code}",
+      null,
+      null,
+      new Options(method: "POST"),
+    );
     dynamic resultData = null;
     if (res != null && res.result) {
       print("#### ${res.data}");
@@ -44,14 +43,13 @@ class UserDao {
       var _token = 'token ' + token;
       await LocalStorage.save(Config.TOKEN_KEY, _token);
 
-
       resultData = await getUserInfo(null);
-      if (Config.DEBUG! ) {
+      if (Config.DEBUG!) {
         print("user result " + resultData.result.toString());
         print(resultData.data);
         print(res.data.toString());
       }
-      if(resultData.result == true) {
+      if (resultData.result == true) {
         store.dispatch(new UpdateUserAction(resultData.data));
       }
     }
@@ -333,7 +331,7 @@ class UserDao {
    */
   static checkFollowDao(name) async {
     String url = Address.doFollow(name);
-    var res = await httpManager.netFetch(url, null, null, null, noTip: true) ;
+    var res = await httpManager.netFetch(url, null, null, null, noTip: true);
     return new DataResult(res!.data, res.result);
   }
 

diff --git a/lib/page/code_detail_page_web.dart b/lib/page/code_detail_page_web.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
@@ -46,6 +47,14 @@ class CodeDetailPageWeb extends StatefulWidget {
 class _CodeDetailPageState extends State<CodeDetailPageWeb> {
   bool isLand = false;
 
+  @override
+  void initState() {
+    super.initState();
+    if (Platform.isAndroid) {
+      WebView.platform = SurfaceAndroidWebView();
+    }
+  }
+
   Future<String?> _getData() async {
     if (widget.data != null) {
       return widget.data;
@@ -63,11 +72,6 @@ class _CodeDetailPageState extends State<CodeDetailPageWeb> {
     return "";
   }
 
-  @override
-  void initState() {
-    super.initState();
-  }
-
   @override
   void dispose() {
     SystemChrome.setPreferredOrientations([

diff --git a/lib/page/gsy_webview.dart b/lib/page/gsy_webview.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
@@ -44,6 +46,14 @@ class _GSYWebViewState extends State<GSYWebView> {
 
   bool isLoading = true;
 
+  @override
+  void initState() {
+    super.initState();
+    if (Platform.isAndroid) {
+      WebView.platform = SurfaceAndroidWebView();
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(

diff --git a/lib/page/login/login_webview.dart b/lib/page/login/login_webview.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
@@ -18,6 +20,15 @@ class LoginWebView extends StatefulWidget {
 }
 
 class _LoginWebViewState extends State<LoginWebView> {
+
+  @override
+  void initState() {
+    super.initState();
+    if(Platform.isAndroid) {
+      WebView.platform = SurfaceAndroidWebView();
+    }
+  }
+
   _renderTitle() {
     if (widget.url.length == 0) {
       return new Text(widget.title);