reason

增加了第三方登录

...@@ -55,6 +55,11 @@ android { ...@@ -55,6 +55,11 @@ android {
55 versionCode flutterVersionCode.toInteger() 55 versionCode flutterVersionCode.toInteger()
56 versionName flutterVersionName 56 versionName flutterVersionName
57 multiDexEnabled true 57 multiDexEnabled true
58 + manifestPlaceholders = [
59 + JPUSH_PKGNAME : applicationId,
60 + JPUSH_APPKEY : "a3396b5bd1a399cfe5be96ed", // NOTE: JPush 上注册的包名对应的 Appkey.
61 + JPUSH_CHANNEL : "default", //暂时填写默认值即可.
62 + ]
58 } 63 }
59 64
60 signingConfigs { 65 signingConfigs {
......
...@@ -15,6 +15,7 @@ import 'package:Parlando/util/image_utils.dart'; ...@@ -15,6 +15,7 @@ import 'package:Parlando/util/image_utils.dart';
15 import 'package:Parlando/util/theme_utils.dart'; 15 import 'package:Parlando/util/theme_utils.dart';
16 import 'package:Parlando/widgets/fractionally_aligned_sized_box.dart'; 16 import 'package:Parlando/widgets/fractionally_aligned_sized_box.dart';
17 import 'package:Parlando/widgets/load_image.dart'; 17 import 'package:Parlando/widgets/load_image.dart';
18 +import 'package:jpush_flutter/jpush_flutter.dart';
18 import 'package:quick_actions/quick_actions.dart'; 19 import 'package:quick_actions/quick_actions.dart';
19 import 'package:rxdart/rxdart.dart'; 20 import 'package:rxdart/rxdart.dart';
20 import 'package:sp_util/sp_util.dart'; 21 import 'package:sp_util/sp_util.dart';
...@@ -60,6 +61,19 @@ class _SplashPageState extends State<SplashPage> { ...@@ -60,6 +61,19 @@ class _SplashPageState extends State<SplashPage> {
60 } 61 }
61 }); 62 });
62 } 63 }
64 +
65 + ///创建 JPush
66 + JPush jpush = new JPush();
67 +
68 + ///配置应用 Key
69 + jpush.setup(
70 + appKey: "a3396b5bd1a399cfe5be96ed",
71 + channel: "default",
72 + production: false,
73 +
74 + /// 设置是否打印 debug 日志
75 + debug: true,
76 + );
63 } 77 }
64 78
65 @override 79 @override
......
...@@ -329,6 +329,7 @@ class _LoginPageState extends State<LoginPage> ...@@ -329,6 +329,7 @@ class _LoginPageState extends State<LoginPage>
329 print("cancelledByUser"); 329 print("cancelledByUser");
330 break; 330 break;
331 case TwitterLoginStatus.error: 331 case TwitterLoginStatus.error:
332 + Toast.show("您老八成没有安装Chrome浏览器!");
332 print(authResult.errorMessage); 333 print(authResult.errorMessage);
333 break; 334 break;
334 default: 335 default:
......
...@@ -133,6 +133,20 @@ packages: ...@@ -133,6 +133,20 @@ packages:
133 name: camera 133 name: camera
134 url: "https://pub.flutter-io.cn" 134 url: "https://pub.flutter-io.cn"
135 source: hosted 135 source: hosted
136 + version: "0.9.8"
137 + camera_android:
138 + dependency: transitive
139 + description:
140 + name: camera_android
141 + url: "https://pub.flutter-io.cn"
142 + source: hosted
143 + version: "0.9.7+1"
144 + camera_avfoundation:
145 + dependency: transitive
146 + description:
147 + name: camera_avfoundation
148 + url: "https://pub.flutter-io.cn"
149 + source: hosted
136 version: "0.9.7+1" 150 version: "0.9.7+1"
137 camera_platform_interface: 151 camera_platform_interface:
138 dependency: transitive 152 dependency: transitive
...@@ -259,7 +273,7 @@ packages: ...@@ -259,7 +273,7 @@ packages:
259 name: device_info_plus 273 name: device_info_plus
260 url: "https://pub.flutter-io.cn" 274 url: "https://pub.flutter-io.cn"
261 source: hosted 275 source: hosted
262 - version: "3.2.3" 276 + version: "3.2.4"
263 device_info_plus_linux: 277 device_info_plus_linux:
264 dependency: transitive 278 dependency: transitive
265 description: 279 description:
...@@ -432,7 +446,7 @@ packages: ...@@ -432,7 +446,7 @@ packages:
432 name: flutter_launcher_icons 446 name: flutter_launcher_icons
433 url: "https://pub.flutter-io.cn" 447 url: "https://pub.flutter-io.cn"
434 source: hosted 448 source: hosted
435 - version: "0.9.2" 449 + version: "0.9.3"
436 flutter_lints: 450 flutter_lints:
437 dependency: "direct dev" 451 dependency: "direct dev"
438 description: 452 description:
...@@ -668,6 +682,13 @@ packages: ...@@ -668,6 +682,13 @@ packages:
668 url: "https://pub.flutter-io.cn" 682 url: "https://pub.flutter-io.cn"
669 source: hosted 683 source: hosted
670 version: "1.0.3" 684 version: "1.0.3"
685 + jpush_flutter:
686 + dependency: "direct main"
687 + description:
688 + name: jpush_flutter
689 + url: "https://pub.flutter-io.cn"
690 + source: hosted
691 + version: "2.2.9"
671 js: 692 js:
672 dependency: transitive 693 dependency: transitive
673 description: 694 description:
...@@ -800,7 +821,7 @@ packages: ...@@ -800,7 +821,7 @@ packages:
800 name: path_provider 821 name: path_provider
801 url: "https://pub.flutter-io.cn" 822 url: "https://pub.flutter-io.cn"
802 source: hosted 823 source: hosted
803 - version: "2.0.10" 824 + version: "2.0.11"
804 path_provider_android: 825 path_provider_android:
805 dependency: transitive 826 dependency: transitive
806 description: 827 description:
...@@ -961,14 +982,14 @@ packages: ...@@ -961,14 +982,14 @@ packages:
961 name: quick_actions_android 982 name: quick_actions_android
962 url: "https://pub.flutter-io.cn" 983 url: "https://pub.flutter-io.cn"
963 source: hosted 984 source: hosted
964 - version: "0.6.0+10" 985 + version: "0.6.0+11"
965 quick_actions_ios: 986 quick_actions_ios:
966 dependency: transitive 987 dependency: transitive
967 description: 988 description:
968 name: quick_actions_ios 989 name: quick_actions_ios
969 url: "https://pub.flutter-io.cn" 990 url: "https://pub.flutter-io.cn"
970 source: hosted 991 source: hosted
971 - version: "0.6.0+10" 992 + version: "0.6.0+11"
972 quick_actions_platform_interface: 993 quick_actions_platform_interface:
973 dependency: transitive 994 dependency: transitive
974 description: 995 description:
...@@ -1302,7 +1323,7 @@ packages: ...@@ -1302,7 +1323,7 @@ packages:
1302 name: url_launcher 1323 name: url_launcher
1303 url: "https://pub.flutter-io.cn" 1324 url: "https://pub.flutter-io.cn"
1304 source: hosted 1325 source: hosted
1305 - version: "6.1.2" 1326 + version: "6.1.3"
1306 url_launcher_android: 1327 url_launcher_android:
1307 dependency: transitive 1328 dependency: transitive
1308 description: 1329 description:
...@@ -1393,28 +1414,28 @@ packages: ...@@ -1393,28 +1414,28 @@ packages:
1393 name: video_player 1414 name: video_player
1394 url: "https://pub.flutter-io.cn" 1415 url: "https://pub.flutter-io.cn"
1395 source: hosted 1416 source: hosted
1396 - version: "2.4.2" 1417 + version: "2.4.4"
1397 video_player_android: 1418 video_player_android:
1398 dependency: transitive 1419 dependency: transitive
1399 description: 1420 description:
1400 name: video_player_android 1421 name: video_player_android
1401 url: "https://pub.flutter-io.cn" 1422 url: "https://pub.flutter-io.cn"
1402 source: hosted 1423 source: hosted
1403 - version: "2.3.5" 1424 + version: "2.3.6"
1404 video_player_avfoundation: 1425 video_player_avfoundation:
1405 dependency: transitive 1426 dependency: transitive
1406 description: 1427 description:
1407 name: video_player_avfoundation 1428 name: video_player_avfoundation
1408 url: "https://pub.flutter-io.cn" 1429 url: "https://pub.flutter-io.cn"
1409 source: hosted 1430 source: hosted
1410 - version: "2.3.4" 1431 + version: "2.3.5"
1411 video_player_platform_interface: 1432 video_player_platform_interface:
1412 dependency: transitive 1433 dependency: transitive
1413 description: 1434 description:
1414 name: video_player_platform_interface 1435 name: video_player_platform_interface
1415 url: "https://pub.flutter-io.cn" 1436 url: "https://pub.flutter-io.cn"
1416 source: hosted 1437 source: hosted
1417 - version: "5.1.2" 1438 + version: "5.1.3"
1418 video_player_web: 1439 video_player_web:
1419 dependency: transitive 1440 dependency: transitive
1420 description: 1441 description:
...@@ -1470,7 +1491,7 @@ packages: ...@@ -1470,7 +1491,7 @@ packages:
1470 name: webview_flutter_android 1491 name: webview_flutter_android
1471 url: "https://pub.flutter-io.cn" 1492 url: "https://pub.flutter-io.cn"
1472 source: hosted 1493 source: hosted
1473 - version: "2.8.9" 1494 + version: "2.8.11"
1474 webview_flutter_platform_interface: 1495 webview_flutter_platform_interface:
1475 dependency: transitive 1496 dependency: transitive
1476 description: 1497 description:
......
...@@ -116,9 +116,10 @@ dependencies: ...@@ -116,9 +116,10 @@ dependencies:
116 event_bus: ^2.0.0 116 event_bus: ^2.0.0
117 117
118 animated_radial_menu: ^0.0.1 118 animated_radial_menu: ^0.0.1
119 -
120 flutter_inapp_purchase: ^5.3.0 119 flutter_inapp_purchase: ^5.3.0
121 120
121 + jpush_flutter: ^2.2.9
122 +
122 dependency_overrides: 123 dependency_overrides:
123 decimal: 1.5.0 124 decimal: 1.5.0
124 125
......