Showing
26 changed files
with
379 additions
and
49 deletions
| @@ -2,25 +2,25 @@ | @@ -2,25 +2,25 @@ | ||
| 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>CFBundleDevelopmentRegion</key> | ||
| 6 | - <string>$(DEVELOPMENT_LANGUAGE)</string> | ||
| 7 | - <key>CFBundleExecutable</key> | ||
| 8 | - <string>App</string> | ||
| 9 | - <key>CFBundleIdentifier</key> | ||
| 10 | - <string>io.flutter.flutter.app</string> | ||
| 11 | - <key>CFBundleInfoDictionaryVersion</key> | ||
| 12 | - <string>6.0</string> | ||
| 13 | - <key>CFBundleName</key> | ||
| 14 | - <string>App</string> | ||
| 15 | - <key>CFBundlePackageType</key> | ||
| 16 | - <string>FMWK</string> | ||
| 17 | - <key>CFBundleShortVersionString</key> | ||
| 18 | - <string>1.0</string> | ||
| 19 | - <key>CFBundleSignature</key> | ||
| 20 | - <string>????</string> | ||
| 21 | - <key>CFBundleVersion</key> | ||
| 22 | - <string>1.0</string> | ||
| 23 | - <key>MinimumOSVersion</key> | ||
| 24 | - <string>8.0</string> | 5 | + <key>CFBundleDevelopmentRegion</key> |
| 6 | + <string>$(DEVELOPMENT_LANGUAGE)</string> | ||
| 7 | + <key>CFBundleExecutable</key> | ||
| 8 | + <string>App</string> | ||
| 9 | + <key>CFBundleIdentifier</key> | ||
| 10 | + <string>io.flutter.flutter.app</string> | ||
| 11 | + <key>CFBundleInfoDictionaryVersion</key> | ||
| 12 | + <string>6.0</string> | ||
| 13 | + <key>CFBundleName</key> | ||
| 14 | + <string>App</string> | ||
| 15 | + <key>CFBundlePackageType</key> | ||
| 16 | + <string>FMWK</string> | ||
| 17 | + <key>CFBundleShortVersionString</key> | ||
| 18 | + <string>1.0</string> | ||
| 19 | + <key>CFBundleSignature</key> | ||
| 20 | + <string>????</string> | ||
| 21 | + <key>CFBundleVersion</key> | ||
| 22 | + <string>1.0</string> | ||
| 23 | + <key>MinimumOSVersion</key> | ||
| 24 | + <string>8.0</string> | ||
| 25 | </dict> | 25 | </dict> |
| 26 | </plist> | 26 | </plist> |
ios/Podfile
0 → 100644
| 1 | +# Uncomment this line to define a global platform for your project | ||
| 2 | + source 'https://github.com/CocoaPods/Specs.git' | ||
| 3 | + platform :ios, '8.0' | ||
| 4 | + | ||
| 5 | +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. | ||
| 6 | +ENV['COCOAPODS_DISABLE_STATS'] = 'true' | ||
| 7 | + | ||
| 8 | +project 'Runner', { | ||
| 9 | + 'Debug' => :debug, | ||
| 10 | + 'Profile' => :release, | ||
| 11 | + 'Release' => :release, | ||
| 12 | +} | ||
| 13 | + | ||
| 14 | +def parse_KV_file(file, separator='=') | ||
| 15 | + file_abs_path = File.expand_path(file) | ||
| 16 | + if !File.exists? file_abs_path | ||
| 17 | + return []; | ||
| 18 | + end | ||
| 19 | + generated_key_values = {} | ||
| 20 | + skip_line_start_symbols = ["#", "/"] | ||
| 21 | + File.foreach(file_abs_path) do |line| | ||
| 22 | + next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ } | ||
| 23 | + plugin = line.split(pattern=separator) | ||
| 24 | + if plugin.length == 2 | ||
| 25 | + podname = plugin[0].strip() | ||
| 26 | + path = plugin[1].strip() | ||
| 27 | + podpath = File.expand_path("#{path}", file_abs_path) | ||
| 28 | + generated_key_values[podname] = podpath | ||
| 29 | + else | ||
| 30 | + puts "Invalid plugin specification: #{line}" | ||
| 31 | + end | ||
| 32 | + end | ||
| 33 | + generated_key_values | ||
| 34 | +end | ||
| 35 | + | ||
| 36 | +target 'Runner' do | ||
| 37 | + use_frameworks! | ||
| 38 | + use_modular_headers! | ||
| 39 | + | ||
| 40 | + # Flutter Pod | ||
| 41 | + | ||
| 42 | + copied_flutter_dir = File.join(__dir__, 'Flutter') | ||
| 43 | + copied_framework_path = File.join(copied_flutter_dir, 'Flutter.framework') | ||
| 44 | + copied_podspec_path = File.join(copied_flutter_dir, 'Flutter.podspec') | ||
| 45 | + unless File.exist?(copied_framework_path) && File.exist?(copied_podspec_path) | ||
| 46 | + # Copy Flutter.framework and Flutter.podspec to Flutter/ to have something to link against if the xcode backend script has not run yet. | ||
| 47 | + # That script will copy the correct debug/profile/release version of the framework based on the currently selected Xcode configuration. | ||
| 48 | + # CocoaPods will not embed the framework on pod install (before any build phases can generate) if the dylib does not exist. | ||
| 49 | + | ||
| 50 | + generated_xcode_build_settings_path = File.join(copied_flutter_dir, 'Generated.xcconfig') | ||
| 51 | + unless File.exist?(generated_xcode_build_settings_path) | ||
| 52 | + raise "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter pub get is executed first" | ||
| 53 | + end | ||
| 54 | + generated_xcode_build_settings = parse_KV_file(generated_xcode_build_settings_path) | ||
| 55 | + cached_framework_dir = generated_xcode_build_settings['FLUTTER_FRAMEWORK_DIR']; | ||
| 56 | + | ||
| 57 | + unless File.exist?(copied_framework_path) | ||
| 58 | + FileUtils.cp_r(File.join(cached_framework_dir, 'Flutter.framework'), copied_flutter_dir) | ||
| 59 | + end | ||
| 60 | + unless File.exist?(copied_podspec_path) | ||
| 61 | + FileUtils.cp(File.join(cached_framework_dir, 'Flutter.podspec'), copied_flutter_dir) | ||
| 62 | + end | ||
| 63 | + end | ||
| 64 | + | ||
| 65 | + # Keep pod path relative so it can be checked into Podfile.lock. | ||
| 66 | + pod 'Flutter', :path => 'Flutter' | ||
| 67 | + | ||
| 68 | + # Plugin Pods | ||
| 69 | + | ||
| 70 | + # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock | ||
| 71 | + # referring to absolute paths on developers' machines. | ||
| 72 | + system('rm -rf .symlinks') | ||
| 73 | + system('mkdir -p .symlinks/plugins') | ||
| 74 | + plugin_pods = parse_KV_file('../.flutter-plugins') | ||
| 75 | + plugin_pods.each do |name, path| | ||
| 76 | + symlink = File.join('.symlinks', 'plugins', name) | ||
| 77 | + File.symlink(path, symlink) | ||
| 78 | + pod name, :path => File.join(symlink, 'ios') | ||
| 79 | + end | ||
| 80 | +end | ||
| 81 | + | ||
| 82 | +# Prevent Cocoapods from embedding a second Flutter framework and causing an error with the new Xcode build system. | ||
| 83 | +install! 'cocoapods', :disable_input_output_paths => true | ||
| 84 | + | ||
| 85 | +post_install do |installer| | ||
| 86 | + installer.pods_project.targets.each do |target| | ||
| 87 | + target.build_configurations.each do |config| | ||
| 88 | + config.build_settings['ENABLE_BITCODE'] = 'NO' | ||
| 89 | + end | ||
| 90 | + end | ||
| 91 | +end |
ios/Podfile.lock
0 → 100644
| 1 | +PODS: | ||
| 2 | + - audioplayers (0.0.1): | ||
| 3 | + - Flutter | ||
| 4 | + - connectivity (0.0.1): | ||
| 5 | + - Flutter | ||
| 6 | + - Reachability | ||
| 7 | + - connectivity_macos (0.0.1): | ||
| 8 | + - Flutter | ||
| 9 | + - Flutter (1.0.0) | ||
| 10 | + - flutter_statusbarcolor (0.0.1): | ||
| 11 | + - Flutter | ||
| 12 | + - fluttertoast (0.0.2): | ||
| 13 | + - Flutter | ||
| 14 | + - fluwx (0.0.1): | ||
| 15 | + - Flutter | ||
| 16 | + - WechatOpenSDK (= 1.8.6.2) | ||
| 17 | + - FMDB (2.7.5): | ||
| 18 | + - FMDB/standard (= 2.7.5) | ||
| 19 | + - FMDB/standard (2.7.5) | ||
| 20 | + - JCore (2.2.5) | ||
| 21 | + - JPush (3.3.2): | ||
| 22 | + - JCore (< 3.0.0, >= 2.0.0) | ||
| 23 | + - jpush_flutter (0.0.2): | ||
| 24 | + - Flutter | ||
| 25 | + - JPush | ||
| 26 | + - path_provider (0.0.1): | ||
| 27 | + - Flutter | ||
| 28 | + - path_provider_macos (0.0.1): | ||
| 29 | + - Flutter | ||
| 30 | + - permission_handler (4.4.0): | ||
| 31 | + - Flutter | ||
| 32 | + - Reachability (3.2) | ||
| 33 | + - shared_preferences (0.0.1): | ||
| 34 | + - Flutter | ||
| 35 | + - shared_preferences_macos (0.0.1): | ||
| 36 | + - Flutter | ||
| 37 | + - shared_preferences_web (0.0.1): | ||
| 38 | + - Flutter | ||
| 39 | + - sqflite (0.0.1): | ||
| 40 | + - Flutter | ||
| 41 | + - FMDB (~> 2.7.2) | ||
| 42 | + - url_launcher (0.0.1): | ||
| 43 | + - Flutter | ||
| 44 | + - url_launcher_macos (0.0.1): | ||
| 45 | + - Flutter | ||
| 46 | + - url_launcher_web (0.0.1): | ||
| 47 | + - Flutter | ||
| 48 | + - WechatOpenSDK (1.8.6.2) | ||
| 49 | + | ||
| 50 | +DEPENDENCIES: | ||
| 51 | + - audioplayers (from `.symlinks/plugins/audioplayers/ios`) | ||
| 52 | + - connectivity (from `.symlinks/plugins/connectivity/ios`) | ||
| 53 | + - connectivity_macos (from `.symlinks/plugins/connectivity_macos/ios`) | ||
| 54 | + - Flutter (from `Flutter`) | ||
| 55 | + - flutter_statusbarcolor (from `.symlinks/plugins/flutter_statusbarcolor/ios`) | ||
| 56 | + - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) | ||
| 57 | + - fluwx (from `.symlinks/plugins/fluwx/ios`) | ||
| 58 | + - jpush_flutter (from `.symlinks/plugins/jpush_flutter/ios`) | ||
| 59 | + - path_provider (from `.symlinks/plugins/path_provider/ios`) | ||
| 60 | + - path_provider_macos (from `.symlinks/plugins/path_provider_macos/ios`) | ||
| 61 | + - permission_handler (from `.symlinks/plugins/permission_handler/ios`) | ||
| 62 | + - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) | ||
| 63 | + - shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`) | ||
| 64 | + - shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`) | ||
| 65 | + - sqflite (from `.symlinks/plugins/sqflite/ios`) | ||
| 66 | + - url_launcher (from `.symlinks/plugins/url_launcher/ios`) | ||
| 67 | + - url_launcher_macos (from `.symlinks/plugins/url_launcher_macos/ios`) | ||
| 68 | + - url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`) | ||
| 69 | + | ||
| 70 | +SPEC REPOS: | ||
| 71 | + https://github.com/CocoaPods/Specs.git: | ||
| 72 | + - FMDB | ||
| 73 | + - JCore | ||
| 74 | + - JPush | ||
| 75 | + - Reachability | ||
| 76 | + - WechatOpenSDK | ||
| 77 | + | ||
| 78 | +EXTERNAL SOURCES: | ||
| 79 | + audioplayers: | ||
| 80 | + :path: ".symlinks/plugins/audioplayers/ios" | ||
| 81 | + connectivity: | ||
| 82 | + :path: ".symlinks/plugins/connectivity/ios" | ||
| 83 | + connectivity_macos: | ||
| 84 | + :path: ".symlinks/plugins/connectivity_macos/ios" | ||
| 85 | + Flutter: | ||
| 86 | + :path: Flutter | ||
| 87 | + flutter_statusbarcolor: | ||
| 88 | + :path: ".symlinks/plugins/flutter_statusbarcolor/ios" | ||
| 89 | + fluttertoast: | ||
| 90 | + :path: ".symlinks/plugins/fluttertoast/ios" | ||
| 91 | + fluwx: | ||
| 92 | + :path: ".symlinks/plugins/fluwx/ios" | ||
| 93 | + jpush_flutter: | ||
| 94 | + :path: ".symlinks/plugins/jpush_flutter/ios" | ||
| 95 | + path_provider: | ||
| 96 | + :path: ".symlinks/plugins/path_provider/ios" | ||
| 97 | + path_provider_macos: | ||
| 98 | + :path: ".symlinks/plugins/path_provider_macos/ios" | ||
| 99 | + permission_handler: | ||
| 100 | + :path: ".symlinks/plugins/permission_handler/ios" | ||
| 101 | + shared_preferences: | ||
| 102 | + :path: ".symlinks/plugins/shared_preferences/ios" | ||
| 103 | + shared_preferences_macos: | ||
| 104 | + :path: ".symlinks/plugins/shared_preferences_macos/ios" | ||
| 105 | + shared_preferences_web: | ||
| 106 | + :path: ".symlinks/plugins/shared_preferences_web/ios" | ||
| 107 | + sqflite: | ||
| 108 | + :path: ".symlinks/plugins/sqflite/ios" | ||
| 109 | + url_launcher: | ||
| 110 | + :path: ".symlinks/plugins/url_launcher/ios" | ||
| 111 | + url_launcher_macos: | ||
| 112 | + :path: ".symlinks/plugins/url_launcher_macos/ios" | ||
| 113 | + url_launcher_web: | ||
| 114 | + :path: ".symlinks/plugins/url_launcher_web/ios" | ||
| 115 | + | ||
| 116 | +SPEC CHECKSUMS: | ||
| 117 | + audioplayers: 84f968cea3f2deab00ec4f8ff53358b3c0b3992c | ||
| 118 | + connectivity: 6e94255659cc86dcbef1d452ad3e0491bb1b3e75 | ||
| 119 | + connectivity_macos: e2e9731b6b22dda39eb1b128f6969d574460e191 | ||
| 120 | + Flutter: 0e3d915762c693b495b44d77113d4970485de6ec | ||
| 121 | + flutter_statusbarcolor: 8afb1071ed8c58be929f1e32b36c629771fd2259 | ||
| 122 | + fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b | ||
| 123 | + fluwx: 03e098a7284c556d7b197e0b82984eb0b25183af | ||
| 124 | + FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a | ||
| 125 | + JCore: d75c0306dc99875d323d23e5a063b3a3ef22335a | ||
| 126 | + JPush: 9468c84a3809dc3ac2fc1c89c6d1d6c858a91bf5 | ||
| 127 | + jpush_flutter: 69133df35eaf9135e540549b154d992c44f8ee44 | ||
| 128 | + path_provider: fb74bd0465e96b594bb3b5088ee4a4e7bb1f2a9d | ||
| 129 | + path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0 | ||
| 130 | + permission_handler: f615215121f43c1640d2b8500d4ad749512828a8 | ||
| 131 | + Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 | ||
| 132 | + shared_preferences: 430726339841afefe5142b9c1f50cb6bd7793e01 | ||
| 133 | + shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087 | ||
| 134 | + shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9 | ||
| 135 | + sqflite: 4001a31ff81d210346b500c55b17f4d6c7589dd0 | ||
| 136 | + url_launcher: a1c0cc845906122c4784c542523d8cacbded5626 | ||
| 137 | + url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313 | ||
| 138 | + url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c | ||
| 139 | + WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a | ||
| 140 | + | ||
| 141 | +PODFILE CHECKSUM: a5c9f5cbedb217afa5108d75ed888500ab689803 | ||
| 142 | + | ||
| 143 | +COCOAPODS: 1.9.1 |
| @@ -55,6 +55,8 @@ | @@ -55,6 +55,8 @@ | ||
| 55 | 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; | 55 | 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; |
| 56 | 9F11082C59A1D00E83E0934D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; | 56 | 9F11082C59A1D00E83E0934D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; |
| 57 | CC19436D18202E6CAD07F931 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; }; | 57 | CC19436D18202E6CAD07F931 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; }; |
| 58 | + EE6AF8FF2457DB720005E3B9 /* RunnerProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerProfile.entitlements; sourceTree = "<group>"; }; | ||
| 59 | + EE6AF9002457DC0C0005E3B9 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; }; | ||
| 58 | /* End PBXFileReference section */ | 60 | /* End PBXFileReference section */ |
| 59 | 61 | ||
| 60 | /* Begin PBXFrameworksBuildPhase section */ | 62 | /* Begin PBXFrameworksBuildPhase section */ |
| @@ -78,7 +80,6 @@ | @@ -78,7 +80,6 @@ | ||
| 78 | 2DCAB49DF131E02F3BAF38E1 /* Pods-Runner.release.xcconfig */, | 80 | 2DCAB49DF131E02F3BAF38E1 /* Pods-Runner.release.xcconfig */, |
| 79 | CC19436D18202E6CAD07F931 /* Pods-Runner.profile.xcconfig */, | 81 | CC19436D18202E6CAD07F931 /* Pods-Runner.profile.xcconfig */, |
| 80 | ); | 82 | ); |
| 81 | - name = Pods; | ||
| 82 | path = Pods; | 83 | path = Pods; |
| 83 | sourceTree = "<group>"; | 84 | sourceTree = "<group>"; |
| 84 | }; | 85 | }; |
| @@ -125,6 +126,8 @@ | @@ -125,6 +126,8 @@ | ||
| 125 | 97C146F01CF9000F007C117D /* Runner */ = { | 126 | 97C146F01CF9000F007C117D /* Runner */ = { |
| 126 | isa = PBXGroup; | 127 | isa = PBXGroup; |
| 127 | children = ( | 128 | children = ( |
| 129 | + EE6AF9002457DC0C0005E3B9 /* Runner.entitlements */, | ||
| 130 | + EE6AF8FF2457DB720005E3B9 /* RunnerProfile.entitlements */, | ||
| 128 | 97C146FA1CF9000F007C117D /* Main.storyboard */, | 131 | 97C146FA1CF9000F007C117D /* Main.storyboard */, |
| 129 | 97C146FD1CF9000F007C117D /* Assets.xcassets */, | 132 | 97C146FD1CF9000F007C117D /* Assets.xcassets */, |
| 130 | 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, | 133 | 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, |
| @@ -181,8 +184,9 @@ | @@ -181,8 +184,9 @@ | ||
| 181 | TargetAttributes = { | 184 | TargetAttributes = { |
| 182 | 97C146ED1CF9000F007C117D = { | 185 | 97C146ED1CF9000F007C117D = { |
| 183 | CreatedOnToolsVersion = 7.3.1; | 186 | CreatedOnToolsVersion = 7.3.1; |
| 184 | - DevelopmentTeam = 6H8CJ2S8L4; | 187 | + DevelopmentTeam = 8J59HM8B82; |
| 185 | LastSwiftMigration = 1100; | 188 | LastSwiftMigration = 1100; |
| 189 | + ProvisioningStyle = Manual; | ||
| 186 | }; | 190 | }; |
| 187 | }; | 191 | }; |
| 188 | }; | 192 | }; |
| @@ -347,7 +351,8 @@ | @@ -347,7 +351,8 @@ | ||
| 347 | CLANG_WARN_SUSPICIOUS_MOVE = YES; | 351 | CLANG_WARN_SUSPICIOUS_MOVE = YES; |
| 348 | CLANG_WARN_UNREACHABLE_CODE = YES; | 352 | CLANG_WARN_UNREACHABLE_CODE = YES; |
| 349 | CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; | 353 | CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; |
| 350 | - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; | 354 | + CODE_SIGN_IDENTITY = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)"; |
| 355 | + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)"; | ||
| 351 | COPY_PHASE_STRIP = NO; | 356 | COPY_PHASE_STRIP = NO; |
| 352 | DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; | 357 | DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; |
| 353 | ENABLE_NS_ASSERTIONS = NO; | 358 | ENABLE_NS_ASSERTIONS = NO; |
| @@ -362,6 +367,7 @@ | @@ -362,6 +367,7 @@ | ||
| 362 | GCC_WARN_UNUSED_VARIABLE = YES; | 367 | GCC_WARN_UNUSED_VARIABLE = YES; |
| 363 | IPHONEOS_DEPLOYMENT_TARGET = 8.0; | 368 | IPHONEOS_DEPLOYMENT_TARGET = 8.0; |
| 364 | MTL_ENABLE_DEBUG_INFO = NO; | 369 | MTL_ENABLE_DEBUG_INFO = NO; |
| 370 | + PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile"; | ||
| 365 | SDKROOT = iphoneos; | 371 | SDKROOT = iphoneos; |
| 366 | SUPPORTED_PLATFORMS = iphoneos; | 372 | SUPPORTED_PLATFORMS = iphoneos; |
| 367 | TARGETED_DEVICE_FAMILY = "1,2"; | 373 | TARGETED_DEVICE_FAMILY = "1,2"; |
| @@ -375,8 +381,10 @@ | @@ -375,8 +381,10 @@ | ||
| 375 | buildSettings = { | 381 | buildSettings = { |
| 376 | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | 382 | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; |
| 377 | CLANG_ENABLE_MODULES = YES; | 383 | CLANG_ENABLE_MODULES = YES; |
| 378 | - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; | ||
| 379 | - DEVELOPMENT_TEAM = 6H8CJ2S8L4; | 384 | + CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; |
| 385 | + CODE_SIGN_STYLE = Manual; | ||
| 386 | + CURRENT_PROJECT_VERSION = 2; | ||
| 387 | + DEVELOPMENT_TEAM = 8J59HM8B82; | ||
| 380 | ENABLE_BITCODE = NO; | 388 | ENABLE_BITCODE = NO; |
| 381 | FRAMEWORK_SEARCH_PATHS = ( | 389 | FRAMEWORK_SEARCH_PATHS = ( |
| 382 | "$(inherited)", | 390 | "$(inherited)", |
| @@ -388,8 +396,10 @@ | @@ -388,8 +396,10 @@ | ||
| 388 | "$(inherited)", | 396 | "$(inherited)", |
| 389 | "$(PROJECT_DIR)/Flutter", | 397 | "$(PROJECT_DIR)/Flutter", |
| 390 | ); | 398 | ); |
| 391 | - PRODUCT_BUNDLE_IDENTIFIER = com.naji.oneKey; | 399 | + MARKETING_VERSION = 1.0.2; |
| 400 | + PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; | ||
| 392 | PRODUCT_NAME = "$(TARGET_NAME)"; | 401 | PRODUCT_NAME = "$(TARGET_NAME)"; |
| 402 | + PROVISIONING_PROFILE_SPECIFIER = "OneKey Distribution Profile"; | ||
| 393 | SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; | 403 | SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; |
| 394 | SWIFT_VERSION = 5.0; | 404 | SWIFT_VERSION = 5.0; |
| 395 | VERSIONING_SYSTEM = "apple-generic"; | 405 | VERSIONING_SYSTEM = "apple-generic"; |
| @@ -425,7 +435,8 @@ | @@ -425,7 +435,8 @@ | ||
| 425 | CLANG_WARN_SUSPICIOUS_MOVE = YES; | 435 | CLANG_WARN_SUSPICIOUS_MOVE = YES; |
| 426 | CLANG_WARN_UNREACHABLE_CODE = YES; | 436 | CLANG_WARN_UNREACHABLE_CODE = YES; |
| 427 | CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; | 437 | CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; |
| 428 | - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; | 438 | + CODE_SIGN_IDENTITY = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)"; |
| 439 | + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)"; | ||
| 429 | COPY_PHASE_STRIP = NO; | 440 | COPY_PHASE_STRIP = NO; |
| 430 | DEBUG_INFORMATION_FORMAT = dwarf; | 441 | DEBUG_INFORMATION_FORMAT = dwarf; |
| 431 | ENABLE_STRICT_OBJC_MSGSEND = YES; | 442 | ENABLE_STRICT_OBJC_MSGSEND = YES; |
| @@ -447,6 +458,7 @@ | @@ -447,6 +458,7 @@ | ||
| 447 | IPHONEOS_DEPLOYMENT_TARGET = 8.0; | 458 | IPHONEOS_DEPLOYMENT_TARGET = 8.0; |
| 448 | MTL_ENABLE_DEBUG_INFO = YES; | 459 | MTL_ENABLE_DEBUG_INFO = YES; |
| 449 | ONLY_ACTIVE_ARCH = YES; | 460 | ONLY_ACTIVE_ARCH = YES; |
| 461 | + PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile"; | ||
| 450 | SDKROOT = iphoneos; | 462 | SDKROOT = iphoneos; |
| 451 | TARGETED_DEVICE_FAMILY = "1,2"; | 463 | TARGETED_DEVICE_FAMILY = "1,2"; |
| 452 | }; | 464 | }; |
| @@ -481,7 +493,8 @@ | @@ -481,7 +493,8 @@ | ||
| 481 | CLANG_WARN_SUSPICIOUS_MOVE = YES; | 493 | CLANG_WARN_SUSPICIOUS_MOVE = YES; |
| 482 | CLANG_WARN_UNREACHABLE_CODE = YES; | 494 | CLANG_WARN_UNREACHABLE_CODE = YES; |
| 483 | CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; | 495 | CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; |
| 484 | - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; | 496 | + CODE_SIGN_IDENTITY = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)"; |
| 497 | + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)"; | ||
| 485 | COPY_PHASE_STRIP = NO; | 498 | COPY_PHASE_STRIP = NO; |
| 486 | DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; | 499 | DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; |
| 487 | ENABLE_NS_ASSERTIONS = NO; | 500 | ENABLE_NS_ASSERTIONS = NO; |
| @@ -496,6 +509,7 @@ | @@ -496,6 +509,7 @@ | ||
| 496 | GCC_WARN_UNUSED_VARIABLE = YES; | 509 | GCC_WARN_UNUSED_VARIABLE = YES; |
| 497 | IPHONEOS_DEPLOYMENT_TARGET = 8.0; | 510 | IPHONEOS_DEPLOYMENT_TARGET = 8.0; |
| 498 | MTL_ENABLE_DEBUG_INFO = NO; | 511 | MTL_ENABLE_DEBUG_INFO = NO; |
| 512 | + PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile"; | ||
| 499 | SDKROOT = iphoneos; | 513 | SDKROOT = iphoneos; |
| 500 | SUPPORTED_PLATFORMS = iphoneos; | 514 | SUPPORTED_PLATFORMS = iphoneos; |
| 501 | SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; | 515 | SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; |
| @@ -510,8 +524,10 @@ | @@ -510,8 +524,10 @@ | ||
| 510 | buildSettings = { | 524 | buildSettings = { |
| 511 | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | 525 | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; |
| 512 | CLANG_ENABLE_MODULES = YES; | 526 | CLANG_ENABLE_MODULES = YES; |
| 513 | - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; | ||
| 514 | - DEVELOPMENT_TEAM = 6H8CJ2S8L4; | 527 | + CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; |
| 528 | + CODE_SIGN_STYLE = Manual; | ||
| 529 | + CURRENT_PROJECT_VERSION = 2; | ||
| 530 | + DEVELOPMENT_TEAM = 8J59HM8B82; | ||
| 515 | ENABLE_BITCODE = NO; | 531 | ENABLE_BITCODE = NO; |
| 516 | FRAMEWORK_SEARCH_PATHS = ( | 532 | FRAMEWORK_SEARCH_PATHS = ( |
| 517 | "$(inherited)", | 533 | "$(inherited)", |
| @@ -523,8 +539,10 @@ | @@ -523,8 +539,10 @@ | ||
| 523 | "$(inherited)", | 539 | "$(inherited)", |
| 524 | "$(PROJECT_DIR)/Flutter", | 540 | "$(PROJECT_DIR)/Flutter", |
| 525 | ); | 541 | ); |
| 526 | - PRODUCT_BUNDLE_IDENTIFIER = com.naji.oneKey; | 542 | + MARKETING_VERSION = 1.0.2; |
| 543 | + PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; | ||
| 527 | PRODUCT_NAME = "$(TARGET_NAME)"; | 544 | PRODUCT_NAME = "$(TARGET_NAME)"; |
| 545 | + PROVISIONING_PROFILE_SPECIFIER = "OneKey Distribution Profile"; | ||
| 528 | SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; | 546 | SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; |
| 529 | SWIFT_OPTIMIZATION_LEVEL = "-Onone"; | 547 | SWIFT_OPTIMIZATION_LEVEL = "-Onone"; |
| 530 | SWIFT_VERSION = 5.0; | 548 | SWIFT_VERSION = 5.0; |
| @@ -538,8 +556,10 @@ | @@ -538,8 +556,10 @@ | ||
| 538 | buildSettings = { | 556 | buildSettings = { |
| 539 | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | 557 | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; |
| 540 | CLANG_ENABLE_MODULES = YES; | 558 | CLANG_ENABLE_MODULES = YES; |
| 541 | - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; | ||
| 542 | - DEVELOPMENT_TEAM = 6H8CJ2S8L4; | 559 | + CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; |
| 560 | + CODE_SIGN_STYLE = Manual; | ||
| 561 | + CURRENT_PROJECT_VERSION = 2; | ||
| 562 | + DEVELOPMENT_TEAM = 8J59HM8B82; | ||
| 543 | ENABLE_BITCODE = NO; | 563 | ENABLE_BITCODE = NO; |
| 544 | FRAMEWORK_SEARCH_PATHS = ( | 564 | FRAMEWORK_SEARCH_PATHS = ( |
| 545 | "$(inherited)", | 565 | "$(inherited)", |
| @@ -551,8 +571,10 @@ | @@ -551,8 +571,10 @@ | ||
| 551 | "$(inherited)", | 571 | "$(inherited)", |
| 552 | "$(PROJECT_DIR)/Flutter", | 572 | "$(PROJECT_DIR)/Flutter", |
| 553 | ); | 573 | ); |
| 554 | - PRODUCT_BUNDLE_IDENTIFIER = com.naji.oneKey; | 574 | + MARKETING_VERSION = 1.0.2; |
| 575 | + PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; | ||
| 555 | PRODUCT_NAME = "$(TARGET_NAME)"; | 576 | PRODUCT_NAME = "$(TARGET_NAME)"; |
| 577 | + PROVISIONING_PROFILE_SPECIFIER = "OneKey Distribution Profile"; | ||
| 556 | SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; | 578 | SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; |
| 557 | SWIFT_VERSION = 5.0; | 579 | SWIFT_VERSION = 5.0; |
| 558 | VERSIONING_SYSTEM = "apple-generic"; | 580 | VERSIONING_SYSTEM = "apple-generic"; |
1.85 KB
2.65 KB
3.74 KB
| @@ -2,12 +2,16 @@ | @@ -2,12 +2,16 @@ | ||
| 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></key> | ||
| 6 | + <string></string> | ||
| 5 | <key>CFBundleDevelopmentRegion</key> | 7 | <key>CFBundleDevelopmentRegion</key> |
| 6 | <string>$(DEVELOPMENT_LANGUAGE)</string> | 8 | <string>$(DEVELOPMENT_LANGUAGE)</string> |
| 9 | + <key>CFBundleDisplayName</key> | ||
| 10 | + <string></string> | ||
| 7 | <key>CFBundleExecutable</key> | 11 | <key>CFBundleExecutable</key> |
| 8 | <string>$(EXECUTABLE_NAME)</string> | 12 | <string>$(EXECUTABLE_NAME)</string> |
| 9 | <key>CFBundleIdentifier</key> | 13 | <key>CFBundleIdentifier</key> |
| 10 | - <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> | 14 | + <string>com.naji.reserveLine</string> |
| 11 | <key>CFBundleInfoDictionaryVersion</key> | 15 | <key>CFBundleInfoDictionaryVersion</key> |
| 12 | <string>6.0</string> | 16 | <string>6.0</string> |
| 13 | <key>CFBundleName</key> | 17 | <key>CFBundleName</key> |
| @@ -15,13 +19,53 @@ | @@ -15,13 +19,53 @@ | ||
| 15 | <key>CFBundlePackageType</key> | 19 | <key>CFBundlePackageType</key> |
| 16 | <string>APPL</string> | 20 | <string>APPL</string> |
| 17 | <key>CFBundleShortVersionString</key> | 21 | <key>CFBundleShortVersionString</key> |
| 18 | - <string>$(FLUTTER_BUILD_NAME)</string> | 22 | + <string>$(MARKETING_VERSION)</string> |
| 19 | <key>CFBundleSignature</key> | 23 | <key>CFBundleSignature</key> |
| 20 | <string>????</string> | 24 | <string>????</string> |
| 25 | + <key>CFBundleURLTypes</key> | ||
| 26 | + <array> | ||
| 27 | + <dict> | ||
| 28 | + <key>CFBundleTypeRole</key> | ||
| 29 | + <string>Editor</string> | ||
| 30 | + <key>CFBundleURLName</key> | ||
| 31 | + <string>weixin</string> | ||
| 32 | + <key>CFBundleURLSchemes</key> | ||
| 33 | + <array> | ||
| 34 | + <string>wx85aa3cdd0f791e65</string> | ||
| 35 | + </array> | ||
| 36 | + </dict> | ||
| 37 | + </array> | ||
| 21 | <key>CFBundleVersion</key> | 38 | <key>CFBundleVersion</key> |
| 22 | - <string>$(FLUTTER_BUILD_NUMBER)</string> | 39 | + <string>$(CURRENT_PROJECT_VERSION)</string> |
| 40 | + <key>LSApplicationCategoryType</key> | ||
| 41 | + <string></string> | ||
| 42 | + <key>LSApplicationQueriesSchemes</key> | ||
| 43 | + <array> | ||
| 44 | + <string>weixinULAPI</string> | ||
| 45 | + <string>wechat</string> | ||
| 46 | + <string>weixin</string> | ||
| 47 | + </array> | ||
| 23 | <key>LSRequiresIPhoneOS</key> | 48 | <key>LSRequiresIPhoneOS</key> |
| 24 | <true/> | 49 | <true/> |
| 50 | + <key>NSAppTransportSecurity</key> | ||
| 51 | + <dict> | ||
| 52 | + <key>NSAllowsArbitraryLoads</key> | ||
| 53 | + <true/> | ||
| 54 | + </dict> | ||
| 55 | + <key>NSAppleMusicUsageDescription</key> | ||
| 56 | + <string>需要您的同意,APP才能访问媒体资料库</string> | ||
| 57 | + <key>NSCalendarsUsageDescription</key> | ||
| 58 | + <string>需要您的同意,APP才能访问日历</string> | ||
| 59 | + <key>NSContactsUsageDescription</key> | ||
| 60 | + <string>需要您的同意,APP才能访问通讯录</string> | ||
| 61 | + <key>NSLocationAlwaysUsageDescription</key> | ||
| 62 | + <string>需要您的同意,APP才能始终访问位置</string> | ||
| 63 | + <key>NSLocationWhenInUseUsageDescription</key> | ||
| 64 | + <string>需要您的同意,APP才能在使用期间访问位置</string> | ||
| 65 | + <key>NSMotionUsageDescription</key> | ||
| 66 | + <string>需要您的同意,APP才能访问运动与健身</string> | ||
| 67 | + <key>NSSpeechRecognitionUsageDescription</key> | ||
| 68 | + <string>需要您的同意,APP才能访问语音识别</string> | ||
| 25 | <key>UILaunchStoryboardName</key> | 69 | <key>UILaunchStoryboardName</key> |
| 26 | <string>LaunchScreen</string> | 70 | <string>LaunchScreen</string> |
| 27 | <key>UIMainStoryboardFile</key> | 71 | <key>UIMainStoryboardFile</key> |
| @@ -29,8 +73,6 @@ | @@ -29,8 +73,6 @@ | ||
| 29 | <key>UISupportedInterfaceOrientations</key> | 73 | <key>UISupportedInterfaceOrientations</key> |
| 30 | <array> | 74 | <array> |
| 31 | <string>UIInterfaceOrientationPortrait</string> | 75 | <string>UIInterfaceOrientationPortrait</string> |
| 32 | - <string>UIInterfaceOrientationLandscapeLeft</string> | ||
| 33 | - <string>UIInterfaceOrientationLandscapeRight</string> | ||
| 34 | </array> | 76 | </array> |
| 35 | <key>UISupportedInterfaceOrientations~ipad</key> | 77 | <key>UISupportedInterfaceOrientations~ipad</key> |
| 36 | <array> | 78 | <array> |
ios/Runner/Runner.entitlements
0 → 100644
| 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>aps-environment</key> | ||
| 6 | + <string>development</string> | ||
| 7 | + <key>com.apple.developer.associated-domains</key> | ||
| 8 | + <array> | ||
| 9 | + <string>applinks:xt04.colorcun.com</string> | ||
| 10 | + </array> | ||
| 11 | +</dict> | ||
| 12 | +</plist> |
ios/Runner/RunnerProfile.entitlements
0 → 100644
| 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>aps-environment</key> | ||
| 6 | + <string>development</string> | ||
| 7 | + <key>com.apple.developer.associated-domains</key> | ||
| 8 | + <array> | ||
| 9 | + <string>applinks:xt04.colorcun.com</string> | ||
| 10 | + </array> | ||
| 11 | +</dict> | ||
| 12 | +</plist> |
| @@ -70,7 +70,7 @@ class MyAppState extends State<MyApp>{ | @@ -70,7 +70,7 @@ class MyAppState extends State<MyApp>{ | ||
| 70 | appId: "wx85aa3cdd0f791e65", | 70 | appId: "wx85aa3cdd0f791e65", |
| 71 | doOnAndroid: true, | 71 | doOnAndroid: true, |
| 72 | doOnIOS: true, | 72 | doOnIOS: true, |
| 73 | - universalLink: "https://your.univerallink.com/link/"); | 73 | + universalLink: "https://xt04.colorcun.com/link/"); |
| 74 | var result = await isWeChatInstalled; | 74 | var result = await isWeChatInstalled; |
| 75 | LogUtil.v("is installed $result"); | 75 | LogUtil.v("is installed $result"); |
| 76 | } | 76 | } |
| @@ -133,7 +133,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ | @@ -133,7 +133,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ | ||
| 133 | children: <Widget>[ | 133 | children: <Widget>[ |
| 134 | Image.asset("assets/icon_sellercode.png",width: prefixIconWidth,), | 134 | Image.asset("assets/icon_sellercode.png",width: prefixIconWidth,), |
| 135 | HEmptyView(26), | 135 | HEmptyView(26), |
| 136 | - Text("商户编号",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(26)),), | 136 | + Text("商户编号",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28)),), |
| 137 | Expanded( | 137 | Expanded( |
| 138 | child: TextField( | 138 | child: TextField( |
| 139 | controller: _sellerCodeController, | 139 | controller: _sellerCodeController, |
| @@ -141,9 +141,9 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ | @@ -141,9 +141,9 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ | ||
| 141 | autofocus: _sellerCodeController.text.isEmpty, | 141 | autofocus: _sellerCodeController.text.isEmpty, |
| 142 | decoration: InputDecoration( | 142 | decoration: InputDecoration( |
| 143 | hintText: "请输入6位商户编码", | 143 | hintText: "请输入6位商户编码", |
| 144 | - hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(26)), | 144 | + hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(28)), |
| 145 | border: InputBorder.none, | 145 | border: InputBorder.none, |
| 146 | - contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(30),horizontal: ScreenUtil().setWidth(10)) | 146 | + contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setWidth(30),horizontal: ScreenUtil().setWidth(10)) |
| 147 | ), | 147 | ), |
| 148 | onChanged: (_){ | 148 | onChanged: (_){ |
| 149 | setActivate(); | 149 | setActivate(); |
| @@ -169,16 +169,16 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ | @@ -169,16 +169,16 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ | ||
| 169 | children: <Widget>[ | 169 | children: <Widget>[ |
| 170 | Image.asset("assets/icon_account.png",width: prefixIconWidth,), | 170 | Image.asset("assets/icon_account.png",width: prefixIconWidth,), |
| 171 | HEmptyView(26), | 171 | HEmptyView(26), |
| 172 | - Text("工 号",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(26)),), | 172 | + Text("工 号",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28)),), |
| 173 | Expanded( | 173 | Expanded( |
| 174 | child: TextField( | 174 | child: TextField( |
| 175 | controller: _accountController, | 175 | controller: _accountController, |
| 176 | focusNode: _accountFocusNode, | 176 | focusNode: _accountFocusNode, |
| 177 | decoration: InputDecoration( | 177 | decoration: InputDecoration( |
| 178 | hintText: "请输入4位工号", | 178 | hintText: "请输入4位工号", |
| 179 | - hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(26)), | 179 | + hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(28)), |
| 180 | border: InputBorder.none, | 180 | border: InputBorder.none, |
| 181 | - contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(30),horizontal: ScreenUtil().setWidth(10)) | 181 | + contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setWidth(30),horizontal: ScreenUtil().setWidth(10)) |
| 182 | ), | 182 | ), |
| 183 | onChanged: (_){ | 183 | onChanged: (_){ |
| 184 | setActivate(); | 184 | setActivate(); |
| @@ -204,7 +204,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ | @@ -204,7 +204,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ | ||
| 204 | children: <Widget>[ | 204 | children: <Widget>[ |
| 205 | Image.asset("assets/icon_pwd.png",width: prefixIconWidth,), | 205 | Image.asset("assets/icon_pwd.png",width: prefixIconWidth,), |
| 206 | HEmptyView(26), | 206 | HEmptyView(26), |
| 207 | - Text("密 码",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(26)),), | 207 | + Text("密 码",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28)),), |
| 208 | Expanded( | 208 | Expanded( |
| 209 | child: TextField( | 209 | child: TextField( |
| 210 | controller: _pwdController, | 210 | controller: _pwdController, |
| @@ -212,9 +212,9 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ | @@ -212,9 +212,9 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ | ||
| 212 | autofocus: _sellerCodeController.text.isNotEmpty&&_accountController.text.isNotEmpty&&_pwdController.text.isEmpty, | 212 | autofocus: _sellerCodeController.text.isNotEmpty&&_accountController.text.isNotEmpty&&_pwdController.text.isEmpty, |
| 213 | decoration: InputDecoration( | 213 | decoration: InputDecoration( |
| 214 | hintText: "请输入密码", | 214 | hintText: "请输入密码", |
| 215 | - hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(26)), | 215 | + hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(28)), |
| 216 | border: InputBorder.none, | 216 | border: InputBorder.none, |
| 217 | - contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(30),horizontal: ScreenUtil().setWidth(10)) | 217 | + contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setWidth(30),horizontal: ScreenUtil().setWidth(10)) |
| 218 | ), | 218 | ), |
| 219 | onChanged: (_){ | 219 | onChanged: (_){ |
| 220 | setActivate(); | 220 | setActivate(); |
-
Please register or login to post a comment