提示xx被预订，请选择其他桌位！的时候不重复提示预订失败！

wdn127929
1 parent 143dbe8c
Showing 5 changed files with 76 additions and 58 deletions
android/app/build.gradle
ios/Podfile.lock
ios/Runner.xcodeproj/project.pbxproj
lib/pages/table/table_manager_page.dart
lib/provider/table_manager_model.dart
--- a/android/app/build.gradle
View file @0915ccf
+++ b/android/app/build.gradle
View file @0915ccf
@@ -66,7 +66,7 @@ android {
         ndk {
             //选择要添加的对应 cpu 类型的 .so 库。
-            abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a'
+            abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64'
         }
         manifestPlaceholders = [
--- a/ios/Podfile.lock
View file @0915ccf
+++ b/ios/Podfile.lock
View file @0915ccf
@@ -30,10 +30,6 @@ PODS:
     - SwiftProtobuf
   - BIJKPlayer (0.7.16)
   - Bugly (2.5.93)
-  - cached_video_player (0.0.2):
-    - Flutter
-    - KTVHTTPCache (~> 2.0.0)
-  - CocoaAsyncSocket (7.6.5)
   - connectivity (0.0.1):
     - Flutter
     - Reachability
@@ -97,10 +93,6 @@ PODS:
     - Flutter
   - install_plugin (2.0.0):
     - Flutter
-  - KTVCocoaHTTPServer (1.0.0):
-    - CocoaAsyncSocket
-  - KTVHTTPCache (2.0.1):
-    - KTVCocoaHTTPServer
   - libwebp (1.3.1):
     - libwebp/demux (= 1.3.1)
     - libwebp/mux (= 1.3.1)
@@ -157,6 +149,9 @@ PODS:
     - Flutter
   - video_player_avfoundation (0.0.1):
     - Flutter
+  - video_thumbnail (0.0.1):
+    - Flutter
+    - libwebp
   - wakelock (0.0.1):
     - Flutter
   - webview_flutter (0.0.1):
@@ -170,7 +165,6 @@ DEPENDENCIES:
   - amap_search_fluttify (from `.symlinks/plugins/amap_search_fluttify/ios`)
   - audioplayers_darwin (from `.symlinks/plugins/audioplayers_darwin/ios`)
   - barcode_scan2 (from `.symlinks/plugins/barcode_scan2/ios`)
-  - cached_video_player (from `.symlinks/plugins/cached_video_player/ios`)
   - connectivity (from `.symlinks/plugins/connectivity/ios`)
   - contacts_service (from `.symlinks/plugins/contacts_service/ios`)
   - core_location_fluttify (from `.symlinks/plugins/core_location_fluttify/ios`)
@@ -206,6 +200,7 @@ DEPENDENCIES:
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - video_compress (from `.symlinks/plugins/video_compress/ios`)
   - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
+  - video_thumbnail (from `.symlinks/plugins/video_thumbnail/ios`)
   - wakelock (from `.symlinks/plugins/wakelock/ios`)
   - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
@@ -217,10 +212,7 @@ SPEC REPOS:
     - AMapSearch-NO-IDFA
     - BIJKPlayer
     - Bugly
-    - CocoaAsyncSocket
     - FMDB
-    - KTVCocoaHTTPServer
-    - KTVHTTPCache
     - libwebp
     - Mantle
     - MTBBarcodeScanner
@@ -247,8 +239,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/audioplayers_darwin/ios"
   barcode_scan2:
     :path: ".symlinks/plugins/barcode_scan2/ios"
-  cached_video_player:
-    :path: ".symlinks/plugins/cached_video_player/ios"
   connectivity:
     :path: ".symlinks/plugins/connectivity/ios"
   contacts_service:
@@ -319,6 +309,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/video_compress/ios"
   video_player_avfoundation:
     :path: ".symlinks/plugins/video_player_avfoundation/ios"
+  video_thumbnail:
+    :path: ".symlinks/plugins/video_thumbnail/ios"
   wakelock:
     :path: ".symlinks/plugins/wakelock/ios"
   webview_flutter:
@@ -337,8 +329,6 @@ SPEC CHECKSUMS:
   barcode_scan2: 0af2bb63c81b4565aab6cd78278e4c0fa136dbb0
   BIJKPlayer: 4c5d66e5cb99ae5bade6f22a4fcc031722a81c64
   Bugly: b8715e6ec4004b7f7fbffab0643ba80545aee3da
-  cached_video_player: 9f225ed1c46bda0fe287b8288742329d441e2cc5
-  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467
   contacts_service: 849e1f84281804c8bfbec1b4c3eedcb23c5d3eca
   core_location_fluttify: 9466a411ea7d22c6349c7e6a767ae4623f01eb1d
@@ -363,8 +353,6 @@ SPEC CHECKSUMS:
   image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
   image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb
   install_plugin: b52f81470a1f37b006607bdf7ffc6031df43fe76
-  KTVCocoaHTTPServer: df8d7b861e603ff8037e9b2138aca2563a6b768d
-  KTVHTTPCache: 588c3eb16f6bd1e6fde1e230dabfb7bd4e490a4d
   libwebp: 33dc822fbbf4503668d09f7885bbfedc76c45e96
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
@@ -388,6 +376,7 @@ SPEC CHECKSUMS:
   url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
   video_compress: fce97e4fb1dfd88175aa07d2ffc8a2f297f87fbe
   video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff
+  video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1
   wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
   webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b
   WechatOpenSDK-XCFramework: acdeeda129efbef9532bca8a10c24e1b4b8c7d69
--- a/ios/Runner.xcodeproj/project.pbxproj
View file @0915ccf
+++ b/ios/Runner.xcodeproj/project.pbxproj
View file @0915ccf
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 46;
 	objects = {
 /* Begin PBXBuildFile section */
@@ -300,10 +300,7 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/CocoaAsyncSocket/CocoaAsyncSocket.framework",
 				"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
-				"${BUILT_PRODUCTS_DIR}/KTVCocoaHTTPServer/KTVCocoaHTTPServer.framework",
-				"${BUILT_PRODUCTS_DIR}/KTVHTTPCache/KTVHTTPCache.framework",
 				"${BUILT_PRODUCTS_DIR}/MTBBarcodeScanner/MTBBarcodeScanner.framework",
 				"${BUILT_PRODUCTS_DIR}/Mantle/Mantle.framework",
 				"${BUILT_PRODUCTS_DIR}/OrderedSet/OrderedSet.framework",
@@ -315,7 +312,6 @@
 				"${BUILT_PRODUCTS_DIR}/Toast/Toast.framework",
 				"${BUILT_PRODUCTS_DIR}/audioplayers_darwin/audioplayers_darwin.framework",
 				"${BUILT_PRODUCTS_DIR}/barcode_scan2/barcode_scan2.framework",
-				"${BUILT_PRODUCTS_DIR}/cached_video_player/cached_video_player.framework",
 				"${BUILT_PRODUCTS_DIR}/connectivity/connectivity.framework",
 				"${BUILT_PRODUCTS_DIR}/contacts_service/contacts_service.framework",
 				"${BUILT_PRODUCTS_DIR}/device_info/device_info.framework",
@@ -344,15 +340,13 @@
 				"${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework",
 				"${BUILT_PRODUCTS_DIR}/video_compress/video_compress.framework",
 				"${BUILT_PRODUCTS_DIR}/video_player_avfoundation/video_player_avfoundation.framework",
+				"${BUILT_PRODUCTS_DIR}/video_thumbnail/video_thumbnail.framework",
 				"${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework",
 				"${BUILT_PRODUCTS_DIR}/webview_flutter/webview_flutter.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaAsyncSocket.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KTVCocoaHTTPServer.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KTVHTTPCache.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MTBBarcodeScanner.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mantle.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OrderedSet.framework",
@@ -364,7 +358,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/audioplayers_darwin.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/barcode_scan2.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/cached_video_player.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/contacts_service.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework",
@@ -393,6 +386,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_compress.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player_avfoundation.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_thumbnail.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter.framework",
 			);
@@ -518,7 +512,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 512;
+				CURRENT_PROJECT_VERSION = 5130;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -533,7 +527,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 5.1.2;
+				MARKETING_VERSION = 5.1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -664,7 +658,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 512;
+				CURRENT_PROJECT_VERSION = 5130;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -679,7 +673,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 5.1.2;
+				MARKETING_VERSION = 5.1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -700,7 +694,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 512;
+				CURRENT_PROJECT_VERSION = 5130;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -715,7 +709,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 5.1.2;
+				MARKETING_VERSION = 5.1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
--- a/lib/pages/table/table_manager_page.dart
View file @0915ccf
+++ b/lib/pages/table/table_manager_page.dart
View file @0915ccf
@@ -485,7 +485,7 @@ class TableManagerPageState extends State<TableManagerPage> {
                 if (table.sign == '10') {
                   //宴会订单
                   NavigatorUtil.goFeastDetailPage(context, table.notebookId,
-                      canEdit: false,needChange: true);
+                      canEdit: false, needChange: true);
                 } else {
                   //进入订座详情页面
                   NavigatorUtil.goNotebookDetailPage(
@@ -1901,9 +1901,15 @@ class TableManagerPageState extends State<TableManagerPage> {
                           radius: ScreenUtil().setWidth(8),
                           isBold: false,
                           onPressed: () async {
-                            SunReserveInfoModel _model =
-                                await tableManagerModel.setReserveInfo(context,
-                                    needKeep: true, guest: widget.guest);
+                            bool isShow = true; //是否需要弹窗 “预订失败!”
+                            SunReserveInfoModel _model = await tableManagerModel
+                                .setReserveInfo(context, (v) {
+                              if (v) {
+                                isShow = true;
+                              } else {
+                                isShow = false;
+                              }
+                            }, needKeep: true, guest: widget.guest);
                             if (_model != null &&
                                 ObjectUtil.isNotEmpty(_model.row) &&
                                 ObjectUtil.isNotEmpty(_model.row.id)) {
@@ -1993,7 +1999,9 @@ class TableManagerPageState extends State<TableManagerPage> {
                               // EventBus().emit("refresh_tablemanager"); //刷新桌位
                             } else {
-                              Utils.showToast("预订失败！");
+                              if (isShow) {
+                                Utils.showToast("预订失败！");
+                              }
                             }
                           }),
                       HEmptyView(22),
@@ -2024,9 +2032,15 @@ class TableManagerPageState extends State<TableManagerPage> {
                         radius: ScreenUtil().setWidth(8),
                         isBold: false,
                         onPressed: () async {
-                          SunReserveInfoModel _model =
-                              await tableManagerModel.setReserveInfo(context,
-                                  needKeep: true, guest: widget.guest);
+                          bool isShow = true; //是否需要弹窗 “预订失败!”
+                          SunReserveInfoModel _model = await tableManagerModel
+                              .setReserveInfo(context, (v) {
+                            if (v) {
+                              isShow = true;
+                            } else {
+                              isShow = false;
+                            }
+                          }, needKeep: true, guest: widget.guest);
                           if (_model != null &&
                               ObjectUtil.isNotEmpty(_model.row) &&
                               ObjectUtil.isNotEmpty(_model.row.id)) {
@@ -2079,7 +2093,9 @@ class TableManagerPageState extends State<TableManagerPage> {
                             // }
                           } else {
                             //失败
-                            Utils.showToast("预订失败！");
+                            if (isShow) {
+                              Utils.showToast("预订失败！");
+                            }
                           }
                         },
                       )),
@@ -2448,15 +2464,22 @@ class TableManagerPageState extends State<TableManagerPage> {
                               if (customController.text.trim().length > 0) {
                                 cusdem = customController.text;
                               }
+                              bool isShow = true; //是否需要弹窗 “预订失败!”
                               SunReserveInfoModel _model =
-                                  await tableManagerModel.setReserveInfo(
-                                      context,
-                                      needKeep: true,
-                                      pnum: pnum,
-                                      cusdem: cusdem,
-                                      tempTime:
-                                          ddateHm == '选填' ? null : ddateHm,
-                                      guest: guest);
+                                  await tableManagerModel
+                                      .setReserveInfo(context, (v) {
+                                if (v) {
+                                  isShow = true;
+                                } else {
+                                  isShow = false;
+                                }
+                              },
+                                          needKeep: true,
+                                          pnum: pnum,
+                                          cusdem: cusdem,
+                                          tempTime:
+                                              ddateHm == '选填' ? null : ddateHm,
+                                          guest: guest);
                               if (_model != null &&
                                   ObjectUtil.isNotEmpty(_model.row) &&
                                   ObjectUtil.isNotEmpty(_model.row.id)) {
@@ -2602,7 +2625,9 @@ class TableManagerPageState extends State<TableManagerPage> {
                                 // // EventBus().emit("refresh_tablemanager"); //刷新桌位
                               } else {
-                                Utils.showToast("预订失败！");
+                                if (isShow) {
+                                  Utils.showToast("预订失败！");
+                                }
                               }
                             },
                           )),
--- a/lib/provider/table_manager_model.dart
View file @0915ccf
+++ b/lib/provider/table_manager_model.dart
View file @0915ccf
@@ -21,6 +21,7 @@ import 'package:one_key/provider/store_base_info_provider.dart';
 import 'package:one_key/provider/user_model.dart';
 import 'package:one_key/route/navigator_util.dart';
 import 'package:one_key/utils/lunar_calendar.dart';
+import 'package:one_key/utils/pick_date_nonli_gongli/pick_calendar_month.dart';
 import 'package:one_key/utils/utils.dart';
 import 'package:provider/provider.dart';
@@ -413,12 +414,15 @@ class TableManagerModel with ChangeNotifier {
   }
   ///录入更改内部预订
-  Future<SunReserveInfoModel> setReserveInfo(BuildContext context,
-      {needKeep = false,
-      Guest guest,
-      String pnum,
-      String tempTime,
-      String cusdem}) async {
+  Future<SunReserveInfoModel> setReserveInfo(
+    BuildContext context,
+    CustomCallBack callback, {
+    needKeep = false,
+    Guest guest,
+    String pnum,
+    String tempTime,
+    String cusdem,
+  }) async {
     if (selectTables.length == 0) {
       Utils.showToast('请选择桌位');
       return null;
@@ -430,6 +434,12 @@ class TableManagerModel with ChangeNotifier {
       needKeep: true,
       showloading: true,
     );
+    if (sucess) {
+      callback(true);
+    } else {
+      //提示过了,不需要提示
+      callback(false);
+    }
     if (sucess) {
       UserModel userModel = Provider.of<UserModel>(context, listen: false);