xt / Flutter-ReserveApp · Commits

Go to a project

Commit 97dc0b7f2af49d077db76ecfb716a78ecf9a4927

Authored by wdn127929
1 parent 3dd6dd5a
build: skipped

提交

Inline Side-by-side
Showing 14 changed files with 34 additions and 47 deletions
@@ -11,14 +11,14 @@ if (flutterRoot == null) { @@ -11,14 +11,14 @@ if (flutterRoot == null) {
11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") 11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12 } 12 }
13 13
14 -def flutterVersionCode = "220" 14 +def flutterVersionCode = "222"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '220' 16 + flutterVersionCode = '222'
17 } 17 }
18 18
19 -def flutterVersionName = "2.2.0" 19 +def flutterVersionName = "2.2.2"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '2.2.0' 21 + flutterVersionName = '2.2.2'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
1 -0feb5fcd550157bc1a24916743cf7132  
  1 +34f4f21cec574b3cdb36b590374022c6
@@ -46,12 +46,8 @@ PODS: @@ -46,12 +46,8 @@ PODS:
46 - flutter_bugly (0.0.1): 46 - flutter_bugly (0.0.1):
47 - Bugly 47 - Bugly
48 - Flutter 48 - Flutter
49 - - flutter_ijkplayer (0.0.1):  
50 - - Flutter  
51 - - FlutterIJK (~> 0.1.0)  
52 - flutter_statusbarcolor (0.0.1): 49 - flutter_statusbarcolor (0.0.1):
53 - Flutter 50 - Flutter
54 - - FlutterIJK (0.1.1)  
55 - fluttertoast (0.0.2): 51 - fluttertoast (0.0.2):
56 - Flutter 52 - Flutter
57 - fluwx (0.0.1): 53 - fluwx (0.0.1):
@@ -112,7 +108,6 @@ DEPENDENCIES: @@ -112,7 +108,6 @@ DEPENDENCIES:
112 - Flutter (from `Flutter`) 108 - Flutter (from `Flutter`)
113 - flutter_app_badger (from `.symlinks/plugins/flutter_app_badger/ios`) 109 - flutter_app_badger (from `.symlinks/plugins/flutter_app_badger/ios`)
114 - flutter_bugly (from `.symlinks/plugins/flutter_bugly/ios`) 110 - flutter_bugly (from `.symlinks/plugins/flutter_bugly/ios`)
115 - - flutter_ijkplayer (from `.symlinks/plugins/flutter_ijkplayer/ios`)  
116 - flutter_statusbarcolor (from `.symlinks/plugins/flutter_statusbarcolor/ios`) 111 - flutter_statusbarcolor (from `.symlinks/plugins/flutter_statusbarcolor/ios`)
117 - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) 112 - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
118 - fluwx (from `.symlinks/plugins/fluwx/ios`) 113 - fluwx (from `.symlinks/plugins/fluwx/ios`)
@@ -140,7 +135,6 @@ SPEC REPOS: @@ -140,7 +135,6 @@ SPEC REPOS:
140 - AMapLocation 135 - AMapLocation
141 - AMapSearch 136 - AMapSearch
142 - Bugly 137 - Bugly
143 - - FlutterIJK  
144 - FMDB 138 - FMDB
145 - Reachability 139 - Reachability
146 - TPNS-iOS 140 - TPNS-iOS
@@ -173,8 +167,6 @@ EXTERNAL SOURCES: @@ -173,8 +167,6 @@ EXTERNAL SOURCES:
173 :path: ".symlinks/plugins/flutter_app_badger/ios" 167 :path: ".symlinks/plugins/flutter_app_badger/ios"
174 flutter_bugly: 168 flutter_bugly:
175 :path: ".symlinks/plugins/flutter_bugly/ios" 169 :path: ".symlinks/plugins/flutter_bugly/ios"
176 - flutter_ijkplayer:  
177 - :path: ".symlinks/plugins/flutter_ijkplayer/ios"  
178 flutter_statusbarcolor: 170 flutter_statusbarcolor:
179 :path: ".symlinks/plugins/flutter_statusbarcolor/ios" 171 :path: ".symlinks/plugins/flutter_statusbarcolor/ios"
180 fluttertoast: 172 fluttertoast:
@@ -233,9 +225,7 @@ SPEC CHECKSUMS: @@ -233,9 +225,7 @@ SPEC CHECKSUMS:
233 Flutter: 0e3d915762c693b495b44d77113d4970485de6ec 225 Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
234 flutter_app_badger: 65de4d6f0c34a891df49e6cfb8a1c0496426fa68 226 flutter_app_badger: 65de4d6f0c34a891df49e6cfb8a1c0496426fa68
235 flutter_bugly: c9800f4d5bc5bdc27ffdde3417a26ba44266e0c3 227 flutter_bugly: c9800f4d5bc5bdc27ffdde3417a26ba44266e0c3
236 - flutter_ijkplayer: ef9006131553deb6d8ae6d7fbd3bcbf93b135930  
237 flutter_statusbarcolor: 8afb1071ed8c58be929f1e32b36c629771fd2259 228 flutter_statusbarcolor: 8afb1071ed8c58be929f1e32b36c629771fd2259
238 - FlutterIJK: f3c0ead9ca31b93d993d46dda53156fdc7b22d2c  
239 fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b 229 fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b
240 fluwx: 07a55ed66bf3a4961e836a2a411b02dcada32902 230 fluwx: 07a55ed66bf3a4961e836a2a411b02dcada32902
241 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a 231 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
@@ -474,7 +474,7 @@ @@ -474,7 +474,7 @@
474 CODE_SIGN_IDENTITY = "iPhone Developer"; 474 CODE_SIGN_IDENTITY = "iPhone Developer";
475 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 475 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
476 CODE_SIGN_STYLE = Automatic; 476 CODE_SIGN_STYLE = Automatic;
477 - CURRENT_PROJECT_VERSION = 170; 477 + CURRENT_PROJECT_VERSION = 222;
478 DEVELOPMENT_TEAM = 8J59HM8B82; 478 DEVELOPMENT_TEAM = 8J59HM8B82;
479 ENABLE_BITCODE = NO; 479 ENABLE_BITCODE = NO;
480 FRAMEWORK_SEARCH_PATHS = ( 480 FRAMEWORK_SEARCH_PATHS = (
@@ -487,7 +487,7 @@ @@ -487,7 +487,7 @@
487 "$(inherited)", 487 "$(inherited)",
488 "$(PROJECT_DIR)/Flutter", 488 "$(PROJECT_DIR)/Flutter",
489 ); 489 );
490 - MARKETING_VERSION = 1.8.0; 490 + MARKETING_VERSION = 2.2.2;
491 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 491 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
492 PRODUCT_NAME = "一键订"; 492 PRODUCT_NAME = "一键订";
493 PROVISIONING_PROFILE_SPECIFIER = ""; 493 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -616,7 +616,7 @@ @@ -616,7 +616,7 @@
616 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 616 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
617 CODE_SIGN_IDENTITY = "iPhone Developer"; 617 CODE_SIGN_IDENTITY = "iPhone Developer";
618 CODE_SIGN_STYLE = Automatic; 618 CODE_SIGN_STYLE = Automatic;
619 - CURRENT_PROJECT_VERSION = 170; 619 + CURRENT_PROJECT_VERSION = 222;
620 DEVELOPMENT_TEAM = 8J59HM8B82; 620 DEVELOPMENT_TEAM = 8J59HM8B82;
621 ENABLE_BITCODE = NO; 621 ENABLE_BITCODE = NO;
622 FRAMEWORK_SEARCH_PATHS = ( 622 FRAMEWORK_SEARCH_PATHS = (
@@ -629,7 +629,7 @@ @@ -629,7 +629,7 @@
629 "$(inherited)", 629 "$(inherited)",
630 "$(PROJECT_DIR)/Flutter", 630 "$(PROJECT_DIR)/Flutter",
631 ); 631 );
632 - MARKETING_VERSION = 1.8.0; 632 + MARKETING_VERSION = 2.2.2;
633 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 633 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
634 PRODUCT_NAME = "一键订"; 634 PRODUCT_NAME = "一键订";
635 PROVISIONING_PROFILE_SPECIFIER = ""; 635 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -649,7 +649,7 @@ @@ -649,7 +649,7 @@
649 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 649 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
650 CODE_SIGN_IDENTITY = "iPhone Developer"; 650 CODE_SIGN_IDENTITY = "iPhone Developer";
651 CODE_SIGN_STYLE = Automatic; 651 CODE_SIGN_STYLE = Automatic;
652 - CURRENT_PROJECT_VERSION = 170; 652 + CURRENT_PROJECT_VERSION = 222;
653 DEVELOPMENT_TEAM = 8J59HM8B82; 653 DEVELOPMENT_TEAM = 8J59HM8B82;
654 ENABLE_BITCODE = NO; 654 ENABLE_BITCODE = NO;
655 FRAMEWORK_SEARCH_PATHS = ( 655 FRAMEWORK_SEARCH_PATHS = (
@@ -662,7 +662,7 @@ @@ -662,7 +662,7 @@
662 "$(inherited)", 662 "$(inherited)",
663 "$(PROJECT_DIR)/Flutter", 663 "$(PROJECT_DIR)/Flutter",
664 ); 664 );
665 - MARKETING_VERSION = 1.8.0; 665 + MARKETING_VERSION = 2.2.2;
666 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 666 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
667 PRODUCT_NAME = "一键订"; 667 PRODUCT_NAME = "一键订";
668 PROVISIONING_PROFILE_SPECIFIER = ""; 668 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 <string>wechat</string> 43 <string>wechat</string>
44 <string>weixin</string> 44 <string>weixin</string>
45 <string>iosamap</string> 45 <string>iosamap</string>
46 - <string>amapuri</string> 46 + <string>amapuri</string>
47 </array> 47 </array>
48 <key>LSRequiresIPhoneOS</key> 48 <key>LSRequiresIPhoneOS</key>
49 <true/> 49 <true/>
@@ -52,7 +52,6 @@ @@ -52,7 +52,6 @@
52 <key>NSAllowsArbitraryLoads</key> 52 <key>NSAllowsArbitraryLoads</key>
53 <true/> 53 <true/>
54 </dict> 54 </dict>
55 -  
56 <key>NSAppleMusicUsageDescription</key> 55 <key>NSAppleMusicUsageDescription</key>
57 <string>需要您的同意,APP才能访问媒体资料库</string> 56 <string>需要您的同意,APP才能访问媒体资料库</string>
58 <key>NSCalendarsUsageDescription</key> 57 <key>NSCalendarsUsageDescription</key>
@@ -2,8 +2,6 @@ import 'dart:convert'; @@ -2,8 +2,6 @@ import 'dart:convert';
2 import 'dart:io'; 2 import 'dart:io';
3 3
4 import 'package:dio/dio.dart'; 4 import 'package:dio/dio.dart';
5 -import 'package:dio/dio.dart';  
6 -import 'package:dio/dio.dart';  
7 import 'package:flutter/material.dart'; 5 import 'package:flutter/material.dart';
8 import 'package:one_key/app.dart'; 6 import 'package:one_key/app.dart';
9 import 'package:one_key/constant/error.dart'; 7 import 'package:one_key/constant/error.dart';
@@ -177,7 +175,8 @@ class DioUtil { @@ -177,7 +175,8 @@ class DioUtil {
177 {data, 175 {data,
178 Options options, 176 Options options,
179 CancelToken cancelToken, 177 CancelToken cancelToken,
180 - bool showLoading = true}) async { 178 + bool showLoading = true,
  179 + bool needHeader = true}) async {
181 bool connectivity = await Utils.checkConnectiviy(); 180 bool connectivity = await Utils.checkConnectiviy();
182 if (!connectivity) { 181 if (!connectivity) {
183 Utils.showToast("网络错误，请稍后重试"); 182 Utils.showToast("网络错误，请稍后重试");
@@ -188,7 +187,7 @@ class DioUtil { @@ -188,7 +187,7 @@ class DioUtil {
188 print('--------' + path + '---------'); 187 print('--------' + path + '---------');
189 Response response = await _dio.request(path, 188 Response response = await _dio.request(path,
190 queryParameters: data, 189 queryParameters: data,
191 - options: _checkOptions(method, options), 190 + options: _checkOptions(method, options, needHeader: needHeader),
192 cancelToken: cancelToken); 191 cancelToken: cancelToken);
193 _printHttpLog(response); 192 _printHttpLog(response);
194 String _status; 193 String _status;
@@ -338,16 +337,19 @@ class DioUtil { @@ -338,16 +337,19 @@ class DioUtil {
338 } 337 }
339 338
340 /// check Options. 339 /// check Options.
341 - Options _checkOptions(method, options) { 340 + Options _checkOptions(method, options, {bool needHeader = true}) {
342 if (options == null) { 341 if (options == null) {
343 options = new Options(); 342 options = new Options();
344 } 343 }
345 options.method = method; 344 options.method = method;
346 options.contentType = Headers.formUrlEncodedContentType; 345 options.contentType = Headers.formUrlEncodedContentType;
347 - if (App.sp?.getString("unionid") != null &&  
348 - App.sp?.getString("unionid").isNotEmpty) {  
349 - options.headers = {"unionid": App.sp.getString("unionid")}; 346 + if (needHeader) {
  347 + if (App.sp?.getString("unionid") != null &&
  348 + App.sp?.getString("unionid").isNotEmpty) {
  349 + options.headers = {"unionid": App.sp.getString("unionid")};
  350 + }
350 } 351 }
  352 +
351 return options; 353 return options;
352 } 354 }
353 355
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 -import 'package:flutter_ijkplayer/flutter_ijkplayer.dart';  
3 -import 'package:one_key/pages/online_check/progress.dart';  
4 -import 'package:one_key/utils/navigator_util.dart'; 2 +
5 import 'package:one_key/widgets/system_app_bar.dart'; 3 import 'package:one_key/widgets/system_app_bar.dart';
6 import 'package:video_player/video_player.dart'; 4 import 'package:video_player/video_player.dart';
7 5
@@ -3,7 +3,6 @@ import 'dart:async'; @@ -3,7 +3,6 @@ import 'dart:async';
3 3
4 import 'package:flutter/material.dart'; 4 import 'package:flutter/material.dart';
5 import 'package:flutter/rendering.dart'; 5 import 'package:flutter/rendering.dart';
6 -import 'package:flutter_ijkplayer/flutter_ijkplayer.dart';  
7 import 'package:flutter_screenutil/flutter_screenutil.dart'; 6 import 'package:flutter_screenutil/flutter_screenutil.dart';
8 import 'package:one_key/models/upload_img_model.dart'; 7 import 'package:one_key/models/upload_img_model.dart';
9 import 'package:one_key/pages/online_check/photo_view_wiget.dart'; 8 import 'package:one_key/pages/online_check/photo_view_wiget.dart';
@@ -754,6 +754,11 @@ class InvicationPageState extends State<InvicationPage> { @@ -754,6 +754,11 @@ class InvicationPageState extends State<InvicationPage> {
754 } 754 }
755 if (!couponProvider.sendSMS) { 755 if (!couponProvider.sendSMS) {
756 Map<String, String> params = { 756 Map<String, String> params = {
  757 + "id": widget.rid,
  758 + "uid": Provider.of<UserModel>(context,
  759 + listen: false)
  760 + .user
  761 + .openid,
757 "phone": widget.phone, 762 "phone": widget.phone,
758 "Strtext": user.sellername + 763 "Strtext": user.sellername +
759 _baseIndoProvider.baseInfoSunModel.name 764 _baseIndoProvider.baseInfoSunModel.name
@@ -52,6 +52,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver { @@ -52,6 +52,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
52 bool _check = true; 52 bool _check = true;
53 StreamSubscription<BaseWeChatResponse> _wxlogin; 53 StreamSubscription<BaseWeChatResponse> _wxlogin;
54 OtherLoginProvider otherLoginProvider; 54 OtherLoginProvider otherLoginProvider;
  55 + CreateStoreModel createStoreModel;
55 56
56 @override 57 @override
57 void initState() { 58 void initState() {
@@ -178,11 +179,10 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver { @@ -178,11 +179,10 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
178 Map<String, String> params = { 179 Map<String, String> params = {
179 "unionid": responseData["unionid"], 180 "unionid": responseData["unionid"],
180 }; 181 };
  182 +
181 CheckbindPhoneSunModel model = 183 CheckbindPhoneSunModel model =
182 await otherLoginProvider.checkbindPhone(context, params); 184 await otherLoginProvider.checkbindPhone(context, params);
183 if (model != null) { 185 if (model != null) {
184 - CreateStoreModel createStoreModel =  
185 - Provider.of<CreateStoreModel>(context, listen: false);  
186 createStoreModel.storeInfo = StoreInfo(); 186 createStoreModel.storeInfo = StoreInfo();
187 createStoreModel.storeInfo.phone = model.phone; 187 createStoreModel.storeInfo.phone = model.phone;
188 NavigatorUtil.goIfNeedCreateStorePage(context); 188 NavigatorUtil.goIfNeedCreateStorePage(context);
@@ -340,6 +340,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver { @@ -340,6 +340,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
340 ScreenUtil.init(context, width: 750, height: 1334); 340 ScreenUtil.init(context, width: 750, height: 1334);
341 otherLoginProvider = 341 otherLoginProvider =
342 Provider.of<OtherLoginProvider>(context, listen: false); 342 Provider.of<OtherLoginProvider>(context, listen: false);
  343 + createStoreModel = Provider.of<CreateStoreModel>(context, listen: false);
343 final Size size = MediaQuery.of(context).size; 344 final Size size = MediaQuery.of(context).size;
344 App.screenWidth = size.width; 345 App.screenWidth = size.width;
345 App.screenHeight = size.height; 346 App.screenHeight = size.height;
@@ -67,7 +67,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -67,7 +67,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
67 super.didChangeAppLifecycleState(state); 67 super.didChangeAppLifecycleState(state);
68 switch (state) { 68 switch (state) {
69 case AppLifecycleState.resumed: //应用前台可见 69 case AppLifecycleState.resumed: //应用前台可见
70 - _getSmsInfo(context); 70 + // _getSmsInfo(context);
71 break; 71 break;
72 case AppLifecycleState.inactive: 72 case AppLifecycleState.inactive:
73 print('inactive'); 73 print('inactive');
@@ -341,7 +341,7 @@ class CouponProvider with ChangeNotifier { @@ -341,7 +341,7 @@ class CouponProvider with ChangeNotifier {
341 {isShowLoading = true}) async { 341 {isShowLoading = true}) async {
342 BaseResp<dynamic> baseResp = await DioUtil() 342 BaseResp<dynamic> baseResp = await DioUtil()
343 .request<dynamic>(context, Method.get, HttpUrl.set_activity_as_reserve, 343 .request<dynamic>(context, Method.get, HttpUrl.set_activity_as_reserve,
344 - data: params, showLoading: isShowLoading) 344 + data: params, showLoading: isShowLoading, needHeader: false)
345 .catchError((error) { 345 .catchError((error) {
346 print(error.toString()); 346 print(error.toString());
347 if (error is MyError) {} 347 if (error is MyError) {}
@@ -377,13 +377,6 @@ packages: @@ -377,13 +377,6 @@ packages:
377 url: "https://pub.flutter-io.cn" 377 url: "https://pub.flutter-io.cn"
378 source: hosted 378 source: hosted
379 version: "2.1.6" 379 version: "2.1.6"
380 - flutter_ijkplayer:  
381 - dependency: "direct main"  
382 - description:  
383 - name: flutter_ijkplayer  
384 - url: "https://pub.flutter-io.cn"  
385 - source: hosted  
386 - version: "0.3.5+1"  
387 flutter_picker: 380 flutter_picker:
388 dependency: "direct main" 381 dependency: "direct main"
389 description: 382 description:
@@ -105,7 +105,7 @@ dependencies: @@ -105,7 +105,7 @@ dependencies:
105 video_player: ^1.0.1 105 video_player: ^1.0.1
106 chewie: 106 chewie:
107 # 视频播放 107 # 视频播放
108 - flutter_ijkplayer: 0.3.5+1 108 + # flutter_ijkplayer: 0.3.5+1
109 # 视频信息获取 109 # 视频信息获取
110 video_compress: ^2.1.1 110 video_compress: ^2.1.1
111 #高德地图 111 #高德地图