提交

@@ -11,14 +11,14 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
-def flutterVersionCode = "220"
+def flutterVersionCode = "222"
 if (flutterVersionCode == null) {
-    flutterVersionCode = '220'
+    flutterVersionCode = '222'
 }
 
-def flutterVersionName = "2.2.0"
+def flutterVersionName = "2.2.2"
 if (flutterVersionName == null) {
-    flutterVersionName = '2.2.0'
+    flutterVersionName = '2.2.2'
 }
 
 apply plugin: 'com.android.application'

-0feb5fcd550157bc1a24916743cf7132
\ No newline at end of file
+34f4f21cec574b3cdb36b590374022c6
\ No newline at end of file

@@ -46,12 +46,8 @@ PODS:
   - flutter_bugly (0.0.1):
     - Bugly
     - Flutter
-  - flutter_ijkplayer (0.0.1):
-    - Flutter
-    - FlutterIJK (~> 0.1.0)
   - flutter_statusbarcolor (0.0.1):
     - Flutter
-  - FlutterIJK (0.1.1)
   - fluttertoast (0.0.2):
     - Flutter
   - fluwx (0.0.1):
@@ -112,7 +108,6 @@ DEPENDENCIES:
   - Flutter (from `Flutter`)
   - flutter_app_badger (from `.symlinks/plugins/flutter_app_badger/ios`)
   - flutter_bugly (from `.symlinks/plugins/flutter_bugly/ios`)
-  - flutter_ijkplayer (from `.symlinks/plugins/flutter_ijkplayer/ios`)
   - flutter_statusbarcolor (from `.symlinks/plugins/flutter_statusbarcolor/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
   - fluwx (from `.symlinks/plugins/fluwx/ios`)
@@ -140,7 +135,6 @@ SPEC REPOS:
     - AMapLocation
     - AMapSearch
     - Bugly
-    - FlutterIJK
     - FMDB
     - Reachability
     - TPNS-iOS
@@ -173,8 +167,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_app_badger/ios"
   flutter_bugly:
     :path: ".symlinks/plugins/flutter_bugly/ios"
-  flutter_ijkplayer:
-    :path: ".symlinks/plugins/flutter_ijkplayer/ios"
   flutter_statusbarcolor:
     :path: ".symlinks/plugins/flutter_statusbarcolor/ios"
   fluttertoast:
@@ -233,9 +225,7 @@ SPEC CHECKSUMS:
   Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
   flutter_app_badger: 65de4d6f0c34a891df49e6cfb8a1c0496426fa68
   flutter_bugly: c9800f4d5bc5bdc27ffdde3417a26ba44266e0c3
-  flutter_ijkplayer: ef9006131553deb6d8ae6d7fbd3bcbf93b135930
   flutter_statusbarcolor: 8afb1071ed8c58be929f1e32b36c629771fd2259
-  FlutterIJK: f3c0ead9ca31b93d993d46dda53156fdc7b22d2c
   fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b
   fluwx: 07a55ed66bf3a4961e836a2a411b02dcada32902
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a

@@ -474,7 +474,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 170;
+				CURRENT_PROJECT_VERSION = 222;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -487,7 +487,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.8.0;
+				MARKETING_VERSION = 2.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = "一键订";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -616,7 +616,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 170;
+				CURRENT_PROJECT_VERSION = 222;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -629,7 +629,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.8.0;
+				MARKETING_VERSION = 2.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = "一键订";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -649,7 +649,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 170;
+				CURRENT_PROJECT_VERSION = 222;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -662,7 +662,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.8.0;
+				MARKETING_VERSION = 2.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = "一键订";
 				PROVISIONING_PROFILE_SPECIFIER = "";

@@ -43,7 +43,7 @@
 		<string>wechat</string>
 		<string>weixin</string>
 		<string>iosamap</string>
-	    <string>amapuri</string>
+		<string>amapuri</string>
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
@@ -52,7 +52,6 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
-
 	<key>NSAppleMusicUsageDescription</key>
 	<string>需要您的同意,APP才能访问媒体资料库</string>
 	<key>NSCalendarsUsageDescription</key>

@@ -2,8 +2,6 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:dio/dio.dart';
-import 'package:dio/dio.dart';
-import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:one_key/app.dart';
 import 'package:one_key/constant/error.dart';
@@ -177,7 +175,8 @@ class DioUtil {
       {data,
       Options options,
       CancelToken cancelToken,
-      bool showLoading = true}) async {
+      bool showLoading = true,
+      bool needHeader = true}) async {
     bool connectivity = await Utils.checkConnectiviy();
     if (!connectivity) {
       Utils.showToast("网络错误，请稍后重试");
@@ -188,7 +187,7 @@ class DioUtil {
       print('--------' + path + '---------');
       Response response = await _dio.request(path,
           queryParameters: data,
-          options: _checkOptions(method, options),
+          options: _checkOptions(method, options, needHeader: needHeader),
           cancelToken: cancelToken);
       _printHttpLog(response);
       String _status;
@@ -338,16 +337,19 @@ class DioUtil {
   }
 
   /// check Options.
-  Options _checkOptions(method, options) {
+  Options _checkOptions(method, options, {bool needHeader = true}) {
     if (options == null) {
       options = new Options();
     }
     options.method = method;
     options.contentType = Headers.formUrlEncodedContentType;
-     if (App.sp?.getString("unionid") != null &&
-        App.sp?.getString("unionid").isNotEmpty) {
-      options.headers = {"unionid": App.sp.getString("unionid")};
+    if (needHeader) {
+      if (App.sp?.getString("unionid") != null &&
+          App.sp?.getString("unionid").isNotEmpty) {
+        options.headers = {"unionid": App.sp.getString("unionid")};
+      }
     }
+
     return options;
   }
 

 import 'package:flutter/material.dart';
-import 'package:flutter_ijkplayer/flutter_ijkplayer.dart';
-import 'package:one_key/pages/online_check/progress.dart';
-import 'package:one_key/utils/navigator_util.dart';
+
 import 'package:one_key/widgets/system_app_bar.dart';
 import 'package:video_player/video_player.dart';
 

@@ -3,7 +3,6 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-import 'package:flutter_ijkplayer/flutter_ijkplayer.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:one_key/models/upload_img_model.dart';
 import 'package:one_key/pages/online_check/photo_view_wiget.dart';

@@ -754,6 +754,11 @@ class InvicationPageState extends State<InvicationPage> {
                                 }
                                 if (!couponProvider.sendSMS) {
                                   Map<String, String> params = {
+                                    "id": widget.rid,
+                                    "uid": Provider.of<UserModel>(context,
+                                            listen: false)
+                                        .user
+                                        .openid,
                                     "phone": widget.phone,
                                     "Strtext": user.sellername +
                                         _baseIndoProvider.baseInfoSunModel.name

@@ -52,6 +52,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
   bool _check = true;
   StreamSubscription<BaseWeChatResponse> _wxlogin;
   OtherLoginProvider otherLoginProvider;
+  CreateStoreModel createStoreModel;
 
   @override
   void initState() {
@@ -178,11 +179,10 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
       Map<String, String> params = {
         "unionid": responseData["unionid"],
       };
+
       CheckbindPhoneSunModel model =
           await otherLoginProvider.checkbindPhone(context, params);
       if (model != null) {
-        CreateStoreModel createStoreModel =
-            Provider.of<CreateStoreModel>(context, listen: false);
         createStoreModel.storeInfo = StoreInfo();
         createStoreModel.storeInfo.phone = model.phone;
         NavigatorUtil.goIfNeedCreateStorePage(context);
@@ -340,6 +340,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
     ScreenUtil.init(context, width: 750, height: 1334);
     otherLoginProvider =
         Provider.of<OtherLoginProvider>(context, listen: false);
+    createStoreModel = Provider.of<CreateStoreModel>(context, listen: false);
     final Size size = MediaQuery.of(context).size;
     App.screenWidth = size.width;
     App.screenHeight = size.height;

@@ -67,7 +67,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
     super.didChangeAppLifecycleState(state);
     switch (state) {
       case AppLifecycleState.resumed: //应用前台可见
-        _getSmsInfo(context);
+        // _getSmsInfo(context);
         break;
       case AppLifecycleState.inactive:
         print('inactive');

@@ -341,7 +341,7 @@ class CouponProvider with ChangeNotifier {
       {isShowLoading = true}) async {
     BaseResp<dynamic> baseResp = await DioUtil()
         .request<dynamic>(context, Method.get, HttpUrl.set_activity_as_reserve,
-            data: params, showLoading: isShowLoading)
+            data: params, showLoading: isShowLoading, needHeader: false)
         .catchError((error) {
       print(error.toString());
       if (error is MyError) {}

@@ -377,13 +377,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.6"
-  flutter_ijkplayer:
-    dependency: "direct main"
-    description:
-      name: flutter_ijkplayer
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.3.5+1"
   flutter_picker:
     dependency: "direct main"
     description:

@@ -105,7 +105,7 @@ dependencies:
   video_player: ^1.0.1
   chewie:
     # 视频播放
-  flutter_ijkplayer: 0.3.5+1
+  # flutter_ijkplayer: 0.3.5+1
   # 视频信息获取
   video_compress: ^2.1.1
   #高德地图