xt / Flutter-ReserveApp · Commits

Go to a project

Commit b3dd72adba6a2729ead6e188d0f6ae93ecad5264

Authored by wdn127929
1 parent 71d6dd5f
build: skipped

方硕bug修复和推送声音添加

Inline Side-by-side
Showing 27 changed files with 253 additions and 131 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 = "170" 14 +def flutterVersionCode = "180"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '170' 16 + flutterVersionCode = '180'
17 } 17 }
18 18
19 -def flutterVersionName = "1.7.0" 19 +def flutterVersionName = "1.8.0"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '1.7.0' 21 + flutterVersionName = '1.8.0'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
1 -7babc7873f8d177769b987ba4c6c2911  
  1 +0feb5fcd550157bc1a24916743cf7132
@@ -27,6 +27,8 @@ PODS: @@ -27,6 +27,8 @@ PODS:
27 - FMDB (2.7.5): 27 - FMDB (2.7.5):
28 - FMDB/standard (= 2.7.5) 28 - FMDB/standard (= 2.7.5)
29 - FMDB/standard (2.7.5) 29 - FMDB/standard (2.7.5)
  30 + - image_picker (0.0.1):
  31 + - Flutter
30 - install_plugin (0.0.1): 32 - install_plugin (0.0.1):
31 - Flutter 33 - Flutter
32 - package_info (0.0.1): 34 - package_info (0.0.1):
@@ -35,12 +37,14 @@ PODS: @@ -35,12 +37,14 @@ PODS:
35 - Flutter 37 - Flutter
36 - "permission_handler (4.4.0+hotfix.4)": 38 - "permission_handler (4.4.0+hotfix.4)":
37 - Flutter 39 - Flutter
  40 + - photo_manager (0.0.1):
  41 + - Flutter
38 - Reachability (3.2) 42 - Reachability (3.2)
39 - shared_preferences (0.0.1): 43 - shared_preferences (0.0.1):
40 - Flutter 44 - Flutter
41 - - sqflite (0.0.1): 45 + - sqflite (0.0.2):
42 - Flutter 46 - Flutter
43 - - FMDB (~> 2.7.2) 47 + - FMDB (>= 2.7.5)
44 - TPNS-iOS (1.2.7.2) 48 - TPNS-iOS (1.2.7.2)
45 - tpns_flutter_plugin (1.0.4): 49 - tpns_flutter_plugin (1.0.4):
46 - Flutter 50 - Flutter
@@ -63,10 +67,12 @@ DEPENDENCIES: @@ -63,10 +67,12 @@ DEPENDENCIES:
63 - flutter_statusbarcolor (from `.symlinks/plugins/flutter_statusbarcolor/ios`) 67 - flutter_statusbarcolor (from `.symlinks/plugins/flutter_statusbarcolor/ios`)
64 - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) 68 - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
65 - fluwx (from `.symlinks/plugins/fluwx/ios`) 69 - fluwx (from `.symlinks/plugins/fluwx/ios`)
  70 + - image_picker (from `.symlinks/plugins/image_picker/ios`)
66 - install_plugin (from `.symlinks/plugins/install_plugin/ios`) 71 - install_plugin (from `.symlinks/plugins/install_plugin/ios`)
67 - package_info (from `.symlinks/plugins/package_info/ios`) 72 - package_info (from `.symlinks/plugins/package_info/ios`)
68 - path_provider (from `.symlinks/plugins/path_provider/ios`) 73 - path_provider (from `.symlinks/plugins/path_provider/ios`)
69 - permission_handler (from `.symlinks/plugins/permission_handler/ios`) 74 - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
  75 + - photo_manager (from `.symlinks/plugins/photo_manager/ios`)
70 - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) 76 - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
71 - sqflite (from `.symlinks/plugins/sqflite/ios`) 77 - sqflite (from `.symlinks/plugins/sqflite/ios`)
72 - tpns_flutter_plugin (from `.symlinks/plugins/tpns_flutter_plugin/ios`) 78 - tpns_flutter_plugin (from `.symlinks/plugins/tpns_flutter_plugin/ios`)
@@ -104,6 +110,8 @@ EXTERNAL SOURCES: @@ -104,6 +110,8 @@ EXTERNAL SOURCES:
104 :path: ".symlinks/plugins/fluttertoast/ios" 110 :path: ".symlinks/plugins/fluttertoast/ios"
105 fluwx: 111 fluwx:
106 :path: ".symlinks/plugins/fluwx/ios" 112 :path: ".symlinks/plugins/fluwx/ios"
  113 + image_picker:
  114 + :path: ".symlinks/plugins/image_picker/ios"
107 install_plugin: 115 install_plugin:
108 :path: ".symlinks/plugins/install_plugin/ios" 116 :path: ".symlinks/plugins/install_plugin/ios"
109 package_info: 117 package_info:
@@ -112,6 +120,8 @@ EXTERNAL SOURCES: @@ -112,6 +120,8 @@ EXTERNAL SOURCES:
112 :path: ".symlinks/plugins/path_provider/ios" 120 :path: ".symlinks/plugins/path_provider/ios"
113 permission_handler: 121 permission_handler:
114 :path: ".symlinks/plugins/permission_handler/ios" 122 :path: ".symlinks/plugins/permission_handler/ios"
  123 + photo_manager:
  124 + :path: ".symlinks/plugins/photo_manager/ios"
115 shared_preferences: 125 shared_preferences:
116 :path: ".symlinks/plugins/shared_preferences/ios" 126 :path: ".symlinks/plugins/shared_preferences/ios"
117 sqflite: 127 sqflite:
@@ -137,13 +147,15 @@ SPEC CHECKSUMS: @@ -137,13 +147,15 @@ SPEC CHECKSUMS:
137 fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b 147 fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b
138 fluwx: 07a55ed66bf3a4961e836a2a411b02dcada32902 148 fluwx: 07a55ed66bf3a4961e836a2a411b02dcada32902
139 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a 149 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
  150 + image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09
140 install_plugin: a13e7ddd2bab0c701b48cd359c26d0394125b6fb 151 install_plugin: a13e7ddd2bab0c701b48cd359c26d0394125b6fb
141 package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 152 package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
142 path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c 153 path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
143 permission_handler: 8278954f2382902f63f00dd8828769c0bd6d511b 154 permission_handler: 8278954f2382902f63f00dd8828769c0bd6d511b
  155 + photo_manager: f7c619c2cc8c2adb8d85c63363babac477de9c67
144 Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 156 Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
145 shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d 157 shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
146 - sqflite: 4001a31ff81d210346b500c55b17f4d6c7589dd0 158 + sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
147 TPNS-iOS: 9b35473a4a0d07f2c2730ea1e66c6749c2b98095 159 TPNS-iOS: 9b35473a4a0d07f2c2730ea1e66c6749c2b98095
148 tpns_flutter_plugin: 8dbbee157aab91a878f64d056c1383726a6c5c4d 160 tpns_flutter_plugin: 8dbbee157aab91a878f64d056c1383726a6c5c4d
149 url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef 161 url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
10 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 10 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
11 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 11 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
  12 + 72CAA69425B7E2CA00753A2F /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 72CAA69325B7E2CA00753A2F /* Settings.bundle */; };
12 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 13 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
13 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 14 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
14 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 15 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -35,6 +36,7 @@ @@ -35,6 +36,7 @@
35 22513BD076488FBD50F0303F /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; }; 36 22513BD076488FBD50F0303F /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
36 2DCAB49DF131E02F3BAF38E1 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; }; 37 2DCAB49DF131E02F3BAF38E1 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
37 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; }; 38 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
  39 + 72CAA69325B7E2CA00753A2F /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
38 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; }; 40 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
39 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; 41 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
40 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; }; 42 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -118,6 +120,7 @@ @@ -118,6 +120,7 @@
118 EE6AF8FF2457DB720005E3B9 /* RunnerProfile.entitlements */, 120 EE6AF8FF2457DB720005E3B9 /* RunnerProfile.entitlements */,
119 97C146FA1CF9000F007C117D /* Main.storyboard */, 121 97C146FA1CF9000F007C117D /* Main.storyboard */,
120 97C146FD1CF9000F007C117D /* Assets.xcassets */, 122 97C146FD1CF9000F007C117D /* Assets.xcassets */,
  123 + 72CAA69325B7E2CA00753A2F /* Settings.bundle */,
121 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, 124 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
122 97C147021CF9000F007C117D /* Info.plist */, 125 97C147021CF9000F007C117D /* Info.plist */,
123 97C146F11CF9000F007C117D /* Supporting Files */, 126 97C146F11CF9000F007C117D /* Supporting Files */,
@@ -203,6 +206,7 @@ @@ -203,6 +206,7 @@
203 files = ( 206 files = (
204 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, 207 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
205 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, 208 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
  209 + 72CAA69425B7E2CA00753A2F /* Settings.bundle in Resources */,
206 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, 210 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
207 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, 211 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
208 ); 212 );
@@ -257,9 +261,11 @@ @@ -257,9 +261,11 @@
257 "${BUILT_PRODUCTS_DIR}/flutter_app_badger/flutter_app_badger.framework", 261 "${BUILT_PRODUCTS_DIR}/flutter_app_badger/flutter_app_badger.framework",
258 "${BUILT_PRODUCTS_DIR}/flutter_statusbarcolor/flutter_statusbarcolor.framework", 262 "${BUILT_PRODUCTS_DIR}/flutter_statusbarcolor/flutter_statusbarcolor.framework",
259 "${BUILT_PRODUCTS_DIR}/fluttertoast/fluttertoast.framework", 263 "${BUILT_PRODUCTS_DIR}/fluttertoast/fluttertoast.framework",
  264 + "${BUILT_PRODUCTS_DIR}/image_picker/image_picker.framework",
260 "${BUILT_PRODUCTS_DIR}/install_plugin/install_plugin.framework", 265 "${BUILT_PRODUCTS_DIR}/install_plugin/install_plugin.framework",
261 "${BUILT_PRODUCTS_DIR}/package_info/package_info.framework", 266 "${BUILT_PRODUCTS_DIR}/package_info/package_info.framework",
262 "${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework", 267 "${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
  268 + "${BUILT_PRODUCTS_DIR}/photo_manager/photo_manager.framework",
263 "${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework", 269 "${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
264 "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework", 270 "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
265 "${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework", 271 "${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",
@@ -278,9 +284,11 @@ @@ -278,9 +284,11 @@
278 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_app_badger.framework", 284 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_app_badger.framework",
279 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_statusbarcolor.framework", 285 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_statusbarcolor.framework",
280 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fluttertoast.framework", 286 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fluttertoast.framework",
  287 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker.framework",
281 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/install_plugin.framework", 288 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/install_plugin.framework",
282 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info.framework", 289 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info.framework",
283 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework", 290 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
  291 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/photo_manager.framework",
284 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework", 292 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
285 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework", 293 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
286 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework", 294 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",
@@ -2,6 +2,8 @@ @@ -2,6 +2,8 @@
2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> 2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3 <plist version="1.0"> 3 <plist version="1.0">
4 <dict> 4 <dict>
  5 + <key>NSCameraUsageDescription</key>
  6 + <string>需要您的同意,APP才能访问您的相机来上传消费清单</string>
5 <key>CFBundleDevelopmentRegion</key> 7 <key>CFBundleDevelopmentRegion</key>
6 <string>$(DEVELOPMENT_LANGUAGE)</string> 8 <string>$(DEVELOPMENT_LANGUAGE)</string>
7 <key>CFBundleDisplayName</key> 9 <key>CFBundleDisplayName</key>
@@ -51,7 +53,7 @@ @@ -51,7 +53,7 @@
51 <true/> 53 <true/>
52 </dict> 54 </dict>
53 <key>NSPhotoLibraryUsageDescription</key> 55 <key>NSPhotoLibraryUsageDescription</key>
54 - <string>需要您的同意,APP才能访问您的相册来上传图片</string> 56 + <string>需要您的同意,APP才能访问您的相册来上传消费清单</string>
55 <key>NSAppleMusicUsageDescription</key> 57 <key>NSAppleMusicUsageDescription</key>
56 <string>需要您的同意,APP才能访问媒体资料库</string> 58 <string>需要您的同意,APP才能访问媒体资料库</string>
57 <key>NSCalendarsUsageDescription</key> 59 <key>NSCalendarsUsageDescription</key>
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
  3 +<plist version="1.0">
  4 +<dict>
  5 + <key>StringsTable</key>
  6 + <string>Root</string>
  7 + <key>PreferenceSpecifiers</key>
  8 + <array>
  9 + <dict>
  10 + <key>Type</key>
  11 + <string>PSGroupSpecifier</string>
  12 + <key>Title</key>
  13 + <string>Group</string>
  14 + </dict>
  15 + <dict>
  16 + <key>Type</key>
  17 + <string>PSTextFieldSpecifier</string>
  18 + <key>Title</key>
  19 + <string>Name</string>
  20 + <key>Key</key>
  21 + <string>name_preference</string>
  22 + <key>DefaultValue</key>
  23 + <string></string>
  24 + <key>IsSecure</key>
  25 + <false/>
  26 + <key>KeyboardType</key>
  27 + <string>Alphabet</string>
  28 + <key>AutocapitalizationType</key>
  29 + <string>None</string>
  30 + <key>AutocorrectionType</key>
  31 + <string>No</string>
  32 + </dict>
  33 + <dict>
  34 + <key>Type</key>
  35 + <string>PSToggleSwitchSpecifier</string>
  36 + <key>Title</key>
  37 + <string>Enabled</string>
  38 + <key>Key</key>
  39 + <string>enabled_preference</string>
  40 + <key>DefaultValue</key>
  41 + <true/>
  42 + </dict>
  43 + <dict>
  44 + <key>Type</key>
  45 + <string>PSSliderSpecifier</string>
  46 + <key>Key</key>
  47 + <string>slider_preference</string>
  48 + <key>DefaultValue</key>
  49 + <real>0.5</real>
  50 + <key>MinimumValue</key>
  51 + <integer>0</integer>
  52 + <key>MaximumValue</key>
  53 + <integer>1</integer>
  54 + <key>MinimumValueImage</key>
  55 + <string></string>
  56 + <key>MaximumValueImage</key>
  57 + <string></string>
  58 + </dict>
  59 + </array>
  60 +</dict>
  61 +</plist>
1 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */ 1 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
@@ -60,6 +60,9 @@ class CreatedOrderSunModel extends Object { @@ -60,6 +60,9 @@ class CreatedOrderSunModel extends Object {
60 @JsonKey(name: 'cdate') 60 @JsonKey(name: 'cdate')
61 String cdate; 61 String cdate;
62 62
  63 + @JsonKey(name: 'remark')
  64 + String remark;
  65 +
63 @JsonKey(name: 'cookbooklist') 66 @JsonKey(name: 'cookbooklist')
64 List<Cookbooklist> cookbooklist; 67 List<Cookbooklist> cookbooklist;
65 68
@@ -80,6 +83,8 @@ class CreatedOrderSunModel extends Object { @@ -80,6 +83,8 @@ class CreatedOrderSunModel extends Object {
80 this.cdate, 83 this.cdate,
81 this.cookbooklist, 84 this.cookbooklist,
82 this.seller, 85 this.seller,
  86 + this.remark
  87 +
83 ); 88 );
84 89
85 factory CreatedOrderSunModel.fromJson(Map<String, dynamic> srcJson) => 90 factory CreatedOrderSunModel.fromJson(Map<String, dynamic> srcJson) =>
@@ -42,7 +42,8 @@ CreatedOrderSunModel _$CreatedOrderSunModelFromJson(Map<String, dynamic> json) { @@ -42,7 +42,8 @@ CreatedOrderSunModel _$CreatedOrderSunModelFromJson(Map<String, dynamic> json) {
42 ?.toList(), 42 ?.toList(),
43 json['seller'] == null 43 json['seller'] == null
44 ? null 44 ? null
45 - : Seller.fromJson(json['seller'] as Map<String, dynamic>)); 45 + : Seller.fromJson(json['seller'] as Map<String, dynamic>),
  46 + json['remark'] as String);
46 } 47 }
47 48
48 Map<String, dynamic> _$CreatedOrderSunModelToJson( 49 Map<String, dynamic> _$CreatedOrderSunModelToJson(
@@ -59,6 +60,7 @@ Map<String, dynamic> _$CreatedOrderSunModelToJson( @@ -59,6 +60,7 @@ Map<String, dynamic> _$CreatedOrderSunModelToJson(
59 'type': instance.type, 60 'type': instance.type,
60 'behavior': instance.behavior, 61 'behavior': instance.behavior,
61 'cdate': instance.cdate, 62 'cdate': instance.cdate,
  63 + 'remark': instance.remark,
62 'cookbooklist': instance.cookbooklist, 64 'cookbooklist': instance.cookbooklist,
63 'seller': instance.seller 65 'seller': instance.seller
64 }; 66 };
@@ -53,7 +53,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ @@ -53,7 +53,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{
53 } 53 }
54 54
55 handlePostFrame(_){ 55 handlePostFrame(_){
56 - _scrollController.jumpTo(_scrollController.position.maxScrollExtent); 56 + // _scrollController.jumpTo(_scrollController.position.maxScrollExtent);
57 } 57 }
58 58
59 59
@@ -94,10 +94,16 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> { @@ -94,10 +94,16 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> {
94 style: TextStyle( 94 style: TextStyle(
95 color: MyColours.color_999999, 95 color: MyColours.color_999999,
96 fontSize: ScreenUtil().setSp(30))), 96 fontSize: ScreenUtil().setSp(30))),
97 - Text(rightTitle,  
98 - style: TextStyle(  
99 - color: MyColours.color_333333,  
100 - fontSize: ScreenUtil().setSp(30))), 97 + HEmptyView(100),
  98 + Expanded(
  99 + child: Text(rightTitle,
  100 + textAlign: TextAlign.right,
  101 + maxLines: 20,
  102 + overflow: TextOverflow.ellipsis,
  103 + style: TextStyle(
  104 + color: MyColours.color_333333,
  105 + fontSize: ScreenUtil().setSp(30))),
  106 + )
101 ], 107 ],
102 ); 108 );
103 } 109 }
@@ -140,6 +146,18 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> { @@ -140,6 +146,18 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> {
140 padding: EdgeInsets.all(ScreenUtil().setWidth(40)), 146 padding: EdgeInsets.all(ScreenUtil().setWidth(40)),
141 child: Column( 147 child: Column(
142 children: [ 148 children: [
  149 + _orderFoodProvider.createdOrderSunModel.remark == '' ||
  150 + _orderFoodProvider.createdOrderSunModel.remark ==
  151 + null
  152 + ? Container()
  153 + : Padding(
  154 + padding: EdgeInsets.only(
  155 + bottom: ScreenUtil().setWidth(30)),
  156 + child: _getRow(
  157 + '备注',
  158 + _orderFoodProvider
  159 + .createdOrderSunModel.remark),
  160 + ),
143 _getRow( 161 _getRow(
144 '人数', _orderFoodProvider.createdOrderSunModel.pnum), 162 '人数', _orderFoodProvider.createdOrderSunModel.pnum),
145 VEmptyView(30), 163 VEmptyView(30),
@@ -436,6 +436,8 @@ class _ImgPickerWidgetState extends DisposableState<ImgPickerWidget> { @@ -436,6 +436,8 @@ class _ImgPickerWidgetState extends DisposableState<ImgPickerWidget> {
436 if (index == count - 1 && index < linjie) { 436 if (index == count - 1 && index < linjie) {
437 return InkWell( 437 return InkWell(
438 onTap: () { 438 onTap: () {
  439 + // 触摸收起键盘
  440 + FocusScope.of(context).requestFocus(FocusNode());
439 _openModalBottomSheet(context); 441 _openModalBottomSheet(context);
440 }, 442 },
441 child: Container( 443 child: Container(
@@ -51,7 +51,9 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { @@ -51,7 +51,9 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> {
51 _focusNode.addListener(() { 51 _focusNode.addListener(() {
52 if (_focusNode.hasFocus) { 52 if (_focusNode.hasFocus) {
53 //有焦点 53 //有焦点
54 - _editingController.text = '¥'; 54 + if (_editingController.text.length == 0) {
  55 + _editingController.text = '¥';
  56 + }
55 } else { 57 } else {
56 //失去焦点 58 //失去焦点
57 // _editingController.text = ''; 59 // _editingController.text = '';
@@ -122,8 +124,10 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { @@ -122,8 +124,10 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> {
122 await _onlineCheckEditProvider.updateOrderInfo(context, params); 124 await _onlineCheckEditProvider.updateOrderInfo(context, params);
123 if (result) { 125 if (result) {
124 // 跳转至在线买单处理完的详情页面 126 // 跳转至在线买单处理完的详情页面
125 - NavigatorUtil.goOnlineCheckDetailPage(context,  
126 - rid: '${widget.rid}', replace: true); 127 + Future.delayed(Duration(milliseconds: 200), () {
  128 + NavigatorUtil.goOnlineCheckDetailPage(context,
  129 + rid: '${widget.rid}', replace: true);
  130 + });
127 setMessageStatus(); 131 setMessageStatus();
128 } 132 }
129 } 133 }
@@ -334,46 +338,46 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { @@ -334,46 +338,46 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> {
334 Expanded( 338 Expanded(
335 flex: 1, 339 flex: 1,
336 child: TextField( 340 child: TextField(
337 - maxLines: 1,  
338 - textAlign: TextAlign.end,  
339 - //输入文本的样式  
340 - style: TextStyle(  
341 - fontSize: ScreenUtil().setSp(34),  
342 - color: MyColours.color_353535),  
343 - controller: _editingController,  
344 - focusNode: _focusNode,  
345 - // textAlignVertical: TextAlignVertical.top,  
346 - decoration: InputDecoration(  
347 - hintText: "点击填写金额",  
348 - hintStyle: TextStyle(  
349 - color: MyColours.color_9C9C9C,  
350 - fontSize: ScreenUtil().setSp(32), 341 + maxLines: 1,
  342 + textAlign: TextAlign.end,
  343 + //输入文本的样式
  344 + style: TextStyle(
  345 + fontSize: ScreenUtil().setSp(34),
  346 + color: MyColours.color_353535),
  347 + controller: _editingController,
  348 + focusNode: _focusNode,
  349 + keyboardType:
  350 + TextInputType.numberWithOptions(decimal: true),
  351 + // textAlignVertical: TextAlignVertical.top,
  352 + decoration: InputDecoration(
  353 + hintText: "点击填写金额",
  354 + hintStyle: TextStyle(
  355 + color: MyColours.color_9C9C9C,
  356 + fontSize: ScreenUtil().setSp(32),
  357 + ),
  358 + // contentPadding:
  359 + // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
  360 + border: InputBorder.none,
351 ), 361 ),
352 - // contentPadding:  
353 - // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),  
354 - border: InputBorder.none,  
355 - ),  
356 - onChanged: (value) {  
357 - print(value);  
358 - // currentRemark = value;  
359 - // print();  
360 - setState(() {  
361 - if (value != '¥' && value.trim().length > 0) {  
362 - btnState = 1;  
363 - } else {  
364 - btnState = -1;  
365 - }  
366 - });  
367 - },  
368 - onEditingComplete: () {  
369 - print('fff');  
370 - _focusNode.unfocus(); 362 + onChanged: (value) {
  363 + print(value);
  364 + // currentRemark = value;
  365 + // print();
  366 + setState(() {
  367 + if (value != '¥' && value.trim().length > 0) {
  368 + btnState = 1;
  369 + } else {
  370 + btnState = -1;
  371 + }
  372 + });
  373 + },
  374 + onEditingComplete: () {
  375 + print('fff');
  376 + _focusNode.unfocus();
371 377
372 - // _editingController.text = '';  
373 - // _needNode.unfocus();  
374 - },  
375 - keyboardType: TextInputType.number,  
376 - )) 378 + // _editingController.text = '';
  379 + // _needNode.unfocus();
  380 + }))
377 ], 381 ],
378 ), 382 ),
379 ), 383 ),
@@ -495,79 +499,86 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { @@ -495,79 +499,86 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> {
495 } 499 }
496 }, 500 },
497 ), 501 ),
498 - body: Padding(  
499 - padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(20)),  
500 - child: Column(  
501 - children: [  
502 - Expanded(  
503 - child: SingleChildScrollView(  
504 - controller: _scrollController,  
505 - child: Column(  
506 - crossAxisAlignment: CrossAxisAlignment.start,  
507 - children: [  
508 - VEmptyView(40),  
509 - //图标  
510 - _getLogoWidget(),  
511 - VEmptyView(40),  
512 - _getTabAndMoneyInfoWidget(),  
513 - VEmptyView(10),  
514 - // 备注信息  
515 - Offstage(  
516 - offstage:  
517 - _onlineCheckEditProvider.orderInfoSunModel !=  
518 - null  
519 - ? _onlineCheckEditProvider  
520 - .orderInfoSunModel.orderRemark ==  
521 - ''  
522 - : true,  
523 - child: Container(  
524 - padding: EdgeInsets.symmetric(  
525 - horizontal: ScreenUtil().setWidth(20)),  
526 - child: Text(  
527 - _onlineCheckEditProvider.orderInfoSunModel !=  
528 - null  
529 - ? _onlineCheckEditProvider  
530 - .orderInfoSunModel.orderRemark  
531 - : '',  
532 - style: TextStyle(  
533 - fontSize: ScreenUtil().setSp(28),  
534 - color: MyColours.color_FD5656), 502 + body: InkWell(
  503 + onTap: () {
  504 + _focusNode.unfocus();
  505 + },
  506 + child: Padding(
  507 + padding:
  508 + EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(20)),
  509 + child: Column(
  510 + children: [
  511 + Expanded(
  512 + child: SingleChildScrollView(
  513 + controller: _scrollController,
  514 + child: Column(
  515 + crossAxisAlignment: CrossAxisAlignment.start,
  516 + children: [
  517 + VEmptyView(40),
  518 + //图标
  519 + _getLogoWidget(),
  520 + VEmptyView(40),
  521 + _getTabAndMoneyInfoWidget(),
  522 + VEmptyView(10),
  523 + // 备注信息
  524 + Offstage(
  525 + offstage:
  526 + _onlineCheckEditProvider.orderInfoSunModel !=
  527 + null
  528 + ? _onlineCheckEditProvider
  529 + .orderInfoSunModel.orderRemark ==
  530 + ''
  531 + : true,
  532 + child: Container(
  533 + padding: EdgeInsets.symmetric(
  534 + horizontal: ScreenUtil().setWidth(20)),
  535 + child: Text(
  536 + _onlineCheckEditProvider.orderInfoSunModel !=
  537 + null
  538 + ? _onlineCheckEditProvider
  539 + .orderInfoSunModel.orderRemark
  540 + : '',
  541 + style: TextStyle(
  542 + fontSize: ScreenUtil().setSp(28),
  543 + color: MyColours.color_FD5656),
  544 + ),
535 ), 545 ),
536 ), 546 ),
537 - ),  
538 - VEmptyView(20),  
539 - ImgPickerWidget(scrollController: _scrollController),  
540 - VEmptyView(20),  
541 - _customInfoWidget()  
542 - ],  
543 - ))),  
544 - Padding(  
545 - padding: EdgeInsets.fromLTRB(ScreenUtil().setWidth(16), 0,  
546 - ScreenUtil().setWidth(16), ScreenUtil().setWidth(40)),  
547 - child: CommonButton(  
548 - width: double.infinity,  
549 - height: 84,  
550 - fontSize: 34,  
551 - content: '发送给顾客',  
552 - state: btnState,  
553 - onPress: () async {  
554 - if (_editingController.text.startsWith('¥') &&  
555 - _editingController.text.length == 1) {  
556 - Utils.showToast('请输入金额');  
557 - setState(() {  
558 - btnState = -1; 547 + VEmptyView(20),
  548 + ImgPickerWidget(
  549 + scrollController: _scrollController),
  550 + VEmptyView(20),
  551 + _customInfoWidget()
  552 + ],
  553 + ))),
  554 + Padding(
  555 + padding: EdgeInsets.fromLTRB(ScreenUtil().setWidth(16), 0,
  556 + ScreenUtil().setWidth(16), ScreenUtil().setWidth(40)),
  557 + child: CommonButton(
  558 + width: double.infinity,
  559 + height: 84,
  560 + fontSize: 34,
  561 + content: '发送给顾客',
  562 + state: btnState,
  563 + onPress: () async {
  564 + if (_editingController.text.startsWith('¥') &&
  565 + _editingController.text.length == 1) {
  566 + Utils.showToast('请输入金额');
  567 + setState(() {
  568 + btnState = -1;
  569 + });
  570 + return;
  571 + }
  572 + DialogUtil.confirmDialog(
  573 + context, _editingController.text, 426, onTap: () {
  574 + Navigator.pop(context);
  575 + _updateOrderInfo();
559 }); 576 });
560 - return;  
561 - }  
562 - DialogUtil.confirmDialog(  
563 - context, _editingController.text, 426, onTap: () {  
564 - Navigator.pop(context);  
565 - _updateOrderInfo();  
566 - });  
567 - },  
568 - ))  
569 - ],  
570 - )), 577 + },
  578 + ))
  579 + ],
  580 + )),
  581 + ),
571 ); 582 );
572 } 583 }
573 } 584 }
@@ -6,8 +6,8 @@ import 'package:one_key/utils/utils.dart'; @@ -6,8 +6,8 @@ import 'package:one_key/utils/utils.dart';
6 class Tools { 6 class Tools {
7 static const MethodChannel _channel = MethodChannel("com.naji/book"); 7 static const MethodChannel _channel = MethodChannel("com.naji/book");
8 8
9 - Future<Map> getIntent() async {  
10 - Map result = await _channel.invokeMethod("getIntent"); 9 + Future<dynamic> getIntent() async {
  10 + dynamic result = await _channel.invokeMethod("getIntent");
11 return result; 11 return result;
12 } 12 }
13 } 13 }
@@ -77,10 +77,11 @@ class TableItemState extends State<TableItem> { @@ -77,10 +77,11 @@ class TableItemState extends State<TableItem> {
77 table.selected = !(table.selected ?? false); 77 table.selected = !(table.selected ?? false);
78 }); 78 });
79 widget.onSelected(table); 79 widget.onSelected(table);
80 - } else {  
81 - table.selected = !(table.selected ?? false);  
82 - widget.onSelected(table);  
83 } 80 }
  81 + // else {
  82 + // table.selected = !(table.selected ?? false);
  83 + // widget.onSelected(table);
  84 + // }
84 }, 85 },
85 child: Stack( 86 child: Stack(
86 children: <Widget>[ 87 children: <Widget>[