Skip to content

Commit 3e06175

Browse files
committed
update login & webview fix #764 #763
1 parent 64a4c47 commit 3e06175

File tree

4 files changed

+41
-18
lines changed

4 files changed

+41
-18
lines changed

lib/common/dao/user_dao.dart

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,18 @@ import 'package:gsy_github_app_flutter/common/utils/common_utils.dart';
2323
import 'package:redux/redux.dart';
2424

2525
class UserDao {
26-
2726
static oauth(code, store) async {
28-
2927
httpManager.clearAuthorization();
3028

3129
var res = await httpManager.netFetch(
32-
"https://github.com/login/oauth/access_token?"
33-
"client_id=${NetConfig.CLIENT_ID}"
34-
"&client_secret=${NetConfig.CLIENT_SECRET}"
35-
"&code=${code}",
36-
null,
37-
null,
38-
null);
30+
"https://github.com/login/oauth/access_token?"
31+
"client_id=${NetConfig.CLIENT_ID}"
32+
"&client_secret=${NetConfig.CLIENT_SECRET}"
33+
"&code=${code}",
34+
null,
35+
null,
36+
new Options(method: "POST"),
37+
);
3938
dynamic resultData = null;
4039
if (res != null && res.result) {
4140
print("#### ${res.data}");
@@ -44,14 +43,13 @@ class UserDao {
4443
var _token = 'token ' + token;
4544
await LocalStorage.save(Config.TOKEN_KEY, _token);
4645

47-
4846
resultData = await getUserInfo(null);
49-
if (Config.DEBUG! ) {
47+
if (Config.DEBUG!) {
5048
print("user result " + resultData.result.toString());
5149
print(resultData.data);
5250
print(res.data.toString());
5351
}
54-
if(resultData.result == true) {
52+
if (resultData.result == true) {
5553
store.dispatch(new UpdateUserAction(resultData.data));
5654
}
5755
}
@@ -333,7 +331,7 @@ class UserDao {
333331
*/
334332
static checkFollowDao(name) async {
335333
String url = Address.doFollow(name);
336-
var res = await httpManager.netFetch(url, null, null, null, noTip: true) ;
334+
var res = await httpManager.netFetch(url, null, null, null, noTip: true);
337335
return new DataResult(res!.data, res.result);
338336
}
339337

lib/page/code_detail_page_web.dart

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'dart:convert';
2+
import 'dart:io';
23
import 'package:flutter/material.dart';
34
import 'package:flutter/services.dart';
45
import 'package:flutter_spinkit/flutter_spinkit.dart';
@@ -46,6 +47,14 @@ class CodeDetailPageWeb extends StatefulWidget {
4647
class _CodeDetailPageState extends State<CodeDetailPageWeb> {
4748
bool isLand = false;
4849

50+
@override
51+
void initState() {
52+
super.initState();
53+
if (Platform.isAndroid) {
54+
WebView.platform = SurfaceAndroidWebView();
55+
}
56+
}
57+
4958
Future<String?> _getData() async {
5059
if (widget.data != null) {
5160
return widget.data;
@@ -63,11 +72,6 @@ class _CodeDetailPageState extends State<CodeDetailPageWeb> {
6372
return "";
6473
}
6574

66-
@override
67-
void initState() {
68-
super.initState();
69-
}
70-
7175
@override
7276
void dispose() {
7377
SystemChrome.setPreferredOrientations([

lib/page/gsy_webview.dart

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import 'dart:io';
2+
13
import 'package:flutter/cupertino.dart';
24
import 'package:flutter/material.dart';
35
import 'package:flutter_spinkit/flutter_spinkit.dart';
@@ -44,6 +46,14 @@ class _GSYWebViewState extends State<GSYWebView> {
4446

4547
bool isLoading = true;
4648

49+
@override
50+
void initState() {
51+
super.initState();
52+
if (Platform.isAndroid) {
53+
WebView.platform = SurfaceAndroidWebView();
54+
}
55+
}
56+
4757
@override
4858
Widget build(BuildContext context) {
4959
return Scaffold(

lib/page/login/login_webview.dart

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import 'dart:io';
2+
13
import 'package:flutter/cupertino.dart';
24
import 'package:flutter/material.dart';
35
import 'package:flutter_spinkit/flutter_spinkit.dart';
@@ -18,6 +20,15 @@ class LoginWebView extends StatefulWidget {
1820
}
1921

2022
class _LoginWebViewState extends State<LoginWebView> {
23+
24+
@override
25+
void initState() {
26+
super.initState();
27+
if(Platform.isAndroid) {
28+
WebView.platform = SurfaceAndroidWebView();
29+
}
30+
}
31+
2132
_renderTitle() {
2233
if (widget.url.length == 0) {
2334
return new Text(widget.title);

0 commit comments

Comments
 (0)