fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改

null_safety
哈哈哈 3 years ago
parent
cddcebf4af
commit
7ebc20bc97
5 changed files with 37 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      ios/Runner.xcodeproj/project.pbxproj
  2. 29
      ios/Runner/AppDelegate.mm
  3. 6
      lib/order/order_history_page.dart
  4. 8
      lib/retrofit/retrofit_api.dart
  5. 8
      pubspec.lock

12
ios/Runner.xcodeproj/project.pbxproj
Unescape View File

@ -874,7 +874,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 34; CURRENT_PROJECT_VERSION = 35;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -924,7 +924,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 1.0.34; MARKETING_VERSION = 1.0.35;
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
@ -1110,7 +1110,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 34; CURRENT_PROJECT_VERSION = 35;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -1160,7 +1160,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 1.0.34; MARKETING_VERSION = 1.0.35;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
@ -1239,7 +1239,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 34; CURRENT_PROJECT_VERSION = 35;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -1289,7 +1289,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 1.0.34; MARKETING_VERSION = 1.0.35;
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",

29
ios/Runner/AppDelegate.mm
Unescape View File

@ -85,7 +85,7 @@
} }
result(@""); result(@"");
} }
if (condition[method isEqual:@"toAppStore"]) { if ([method isEqual:@"toAppStore"]) {
NSString *appURL = @"https://itunes.apple.com/cn/app/1575124838?action=write-review"; NSString *appURL = @"https://itunes.apple.com/cn/app/1575124838?action=write-review";
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:appURL]]; [[UIApplication sharedApplication] openURL:[NSURL URLWithString:appURL]];
result(@""); result(@"");
@ -97,22 +97,33 @@
} }
- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler { - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler {
NSLog(@"%@", userActivity.webpageURL); NSLog(@"userActivity%@", userActivity.webpageURL);
NSLog(@"%@", [userActivity.webpageURL.query componentsSeparatedByString:@"="][0]);
NSLog(@"%@", [userActivity.webpageURL.query componentsSeparatedByString:@"="][1]); NSArray *params = [userActivity.webpageURL.query componentsSeparatedByString:@"&"];
__block NSString *custom = [userActivity.webpageURL.query componentsSeparatedByString:@"="][1];
__block NSString *customParam = @"";
for (NSString *string in params) {
NSLog(@"userActivity%@", string);
NSArray *array =[string componentsSeparatedByString:@"="];
if ([array[0] isEqual:@"id"]) {
customParam = [NSString stringWithFormat:@"{\"typed\":1,\"info\":\"%@\"}", array[1]];
}
}
NSLog(@"userActivity%@", customParam);
FlutterViewController* controller = (FlutterViewController*)self.window.rootViewController; FlutterViewController* controller = (FlutterViewController*)self.window.rootViewController;
FlutterMethodChannel* bridgeAppChannel = [FlutterMethodChannel methodChannelWithName:@"bridge" binaryMessenger:(NSObject<FlutterBinaryMessenger> *)controller]; FlutterMethodChannel* bridgeAppChannel = [FlutterMethodChannel methodChannelWithName:@"bridge" binaryMessenger:(NSObject<FlutterBinaryMessenger> *)controller];
[bridgeAppChannel setMethodCallHandler:^(FlutterMethodCall * _Nonnull call, FlutterResult _Nonnull result) { [bridgeAppChannel setMethodCallHandler:^(FlutterMethodCall * _Nonnull call, FlutterResult _Nonnull result) {
NSString * method = call.method; NSString * method = call.method;
if ([method isEqual:@"action"]) { if ([method isEqual:@"action"]) {
if (custom != NULL) { if (customParam != NULL) {
result(custom); result(customParam);
custom = @""; customParam = @"";
} }
result(@""); result(@"");
} }
if (condition[method isEqual:@"toAppStore"]) { if ([method isEqual:@"toAppStore"]) {
NSString *appURL = @"https://itunes.apple.com/cn/app/1575124838?action=write-review"; NSString *appURL = @"https://itunes.apple.com/cn/app/1575124838?action=write-review";
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:appURL]]; [[UIApplication sharedApplication] openURL:[NSURL URLWithString:appURL]];
result(@""); result(@"");

6
lib/order/order_history_page.dart
Unescape View File

@ -473,9 +473,9 @@ class _OrderHistoryList extends State<OrderHistoryList>
children: [ children: [
MImage( MImage(
e.skuImg, e.skuImg,
width: 75, width: 75.w,
height: 75, height: 75.w,
fit: BoxFit.contain, fit: BoxFit.cover,
errorSrc: "assets/image/default_1.png", errorSrc: "assets/image/default_1.png",
fadeSrc: "assets/image/default_1.png", fadeSrc: "assets/image/default_1.png",
), ),

8
lib/retrofit/retrofit_api.dart
Unescape View File

@ -14,11 +14,11 @@ import 'package:shared_preferences/shared_preferences.dart';
part 'retrofit_api.g.dart'; part 'retrofit_api.g.dart';
// const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式 const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
// const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式 const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式
const base_url = "http://192.168.10.236:8766/app/"; // const base_url = "http://192.168.10.236:8766/app/";
const baseUrl = "http://192.168.10.236:8766/app/"; // const baseUrl = "http://192.168.10.236:8766/app/";
/// 本地 /// 本地

8
pubspec.lock
Unescape View File

@ -35,7 +35,7 @@ packages:
name: async name: async
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.6.1" version: "2.5.0"
barcode: barcode:
dependency: transitive dependency: transitive
description: description:
@ -900,7 +900,7 @@ packages:
name: test_api name: test_api
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.3.0" version: "0.2.19"
timing: timing:
dependency: transitive dependency: transitive
description: description:
@ -1063,7 +1063,7 @@ packages:
name: win32 name: win32
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.2.5" version: "2.0.5"
xdg_directories: xdg_directories:
dependency: transitive dependency: transitive
description: description:
@ -1086,5 +1086,5 @@ packages:
source: hosted source: hosted
version: "3.1.0" version: "3.1.0"
sdks: sdks:
dart: ">=2.13.0 <3.0.0" dart: ">=2.12.0 <3.0.0"
flutter: ">=2.0.0" flutter: ">=2.0.0"

Write Preview
Loading…
Cancel
Save