Skip to content

O
Opple-iOS
Commit 47a783ae authored by 曹云霄's avatar 曹云霄
Browse files
Options

修改项说明：合并代码

parent 484d92e1
Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 15 deletions
Class/OrderdetailsViewController.m
View file @ 47a783ae
...@@ -358,7 +358,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -358,7 +358,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
if (resultModel.award) { if (resultModel.award) {
weakSelf.customerDrawModel = [PromotionLuckDrawResultModel initializeWith:resultModel]; weakSelf.customerDrawModel = [PromotionLuckDrawResultModel initializeWith:resultModel];
} }
PromotionChooseNavigationController *promotionChooseNav = [[weakSelf getStoryboardWithName] instantiateViewControllerWithIdentifier:@"PromotionChooseNavigationController"]; PromotionChooseNavigationController *promotionChooseNav = [[[weakSelf class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"PromotionChooseNavigationController"];
PromotionChooseViewController *promotionChoose = (PromotionChooseViewController *)promotionChooseNav.visibleViewController; PromotionChooseViewController *promotionChoose = (PromotionChooseViewController *)promotionChooseNav.visibleViewController;
promotionChoose.promotionDelegate = self; promotionChoose.promotionDelegate = self;
promotionChoose.promotionDatasArray = weakSelf.customerPromotionArray; promotionChoose.promotionDatasArray = weakSelf.customerPromotionArray;
...@@ -545,7 +545,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -545,7 +545,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
#pragma mark - 卡劵领取成功 #pragma mark - 卡劵领取成功
- (void)rebateApplySuccess:(NSString *)message - (void)rebateApplySuccess:(NSString *)message
{ {
RebateSuccessTableViewController *success = [self.getStoryboardWithName instantiateViewControllerWithIdentifier:@"RebateSuccessTableViewController"]; RebateSuccessTableViewController *success = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"RebateSuccessTableViewController"];
success.titleArray = @[message,@"查看账户",@"我知道了"]; success.titleArray = @[message,@"查看账户",@"我知道了"];
[success setClickEvent:^(NSIndexPath *indexPath) { [success setClickEvent:^(NSIndexPath *indexPath) {
if (indexPath.row == 1) { if (indexPath.row == 1) {
...@@ -567,7 +567,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -567,7 +567,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
- (void)showJDECard - (void)showJDECard
{ {
WS(weakSelf); WS(weakSelf);
JDEcardViewController *jdeCard = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"JDEcardViewController"]; JDEcardViewController *jdeCard = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"JDEcardViewController"];
[jdeCard setDismissJDECardBlock:^{ [jdeCard setDismissJDECardBlock:^{
[weakSelf.settingsPopoverController dismissPopoverAnimated:YES]; [weakSelf.settingsPopoverController dismissPopoverAnimated:YES];
}]; }];
......
Lighting.xcodeproj/project.pbxproj
View file @ 47a783ae
...@@ -115,6 +115,14 @@ ...@@ -115,6 +115,14 @@
2985AEA11CE72F1500704C91 /* NSArray+ ZXPUnicode.m in Sources */ = {isa = PBXBuildFile; fileRef = 2985AE9B1CE72F1500704C91 /* NSArray+ ZXPUnicode.m */; }; 2985AEA11CE72F1500704C91 /* NSArray+ ZXPUnicode.m in Sources */ = {isa = PBXBuildFile; fileRef = 2985AE9B1CE72F1500704C91 /* NSArray+ ZXPUnicode.m */; };
2985AEA21CE72F1500704C91 /* NSDictionary+ZXPUnicode.m in Sources */ = {isa = PBXBuildFile; fileRef = 2985AE9E1CE72F1500704C91 /* NSDictionary+ZXPUnicode.m */; }; 2985AEA21CE72F1500704C91 /* NSDictionary+ZXPUnicode.m in Sources */ = {isa = PBXBuildFile; fileRef = 2985AE9E1CE72F1500704C91 /* NSDictionary+ZXPUnicode.m */; };
2985AEA31CE72F1500704C91 /* NSObject+ZXPUnicode.m in Sources */ = {isa = PBXBuildFile; fileRef = 2985AEA01CE72F1500704C91 /* NSObject+ZXPUnicode.m */; }; 2985AEA31CE72F1500704C91 /* NSObject+ZXPUnicode.m in Sources */ = {isa = PBXBuildFile; fileRef = 2985AEA01CE72F1500704C91 /* NSObject+ZXPUnicode.m */; };
2986B9A31DE1D30700F4A1CF /* PromotionChooseNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2986B9961DE1D30600F4A1CF /* PromotionChooseNavigationController.m */; };
2986B9A41DE1D30700F4A1CF /* PromotionChooseTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2986B9981DE1D30600F4A1CF /* PromotionChooseTableViewCell.m */; };
2986B9A51DE1D30700F4A1CF /* PromotionChooseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2986B99A1DE1D30600F4A1CF /* PromotionChooseViewController.m */; };
2986B9A61DE1D30700F4A1CF /* PromotionJDECardModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2986B99C1DE1D30600F4A1CF /* PromotionJDECardModel.m */; };
2986B9A71DE1D30700F4A1CF /* PromotionLuckDrawResultModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2986B99E1DE1D30600F4A1CF /* PromotionLuckDrawResultModel.m */; };
2986B9A81DE1D30700F4A1CF /* PromotionLuckyDrawModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2986B9A01DE1D30600F4A1CF /* PromotionLuckyDrawModel.m */; };
2986B9A91DE1D30700F4A1CF /* PromotionWeChatCardModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2986B9A21DE1D30700F4A1CF /* PromotionWeChatCardModel.m */; };
2986B9AC1DE1D32C00F4A1CF /* CustomPromotionModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2986B9AB1DE1D32C00F4A1CF /* CustomPromotionModel.m */; };
299249371CDB3C6500786B1E /* GenerateOrdersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 299249361CDB3C6500786B1E /* GenerateOrdersViewController.m */; }; 299249371CDB3C6500786B1E /* GenerateOrdersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 299249361CDB3C6500786B1E /* GenerateOrdersViewController.m */; };
2992493A1CDB3E4500786B1E /* GenerateOrdersTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 299249391CDB3E4500786B1E /* GenerateOrdersTableViewCell.m */; }; 2992493A1CDB3E4500786B1E /* GenerateOrdersTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 299249391CDB3E4500786B1E /* GenerateOrdersTableViewCell.m */; };
2992493D1CDB3E8900786B1E /* GenerateOrdersModifyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2992493C1CDB3E8800786B1E /* GenerateOrdersModifyTableViewCell.m */; }; 2992493D1CDB3E8900786B1E /* GenerateOrdersModifyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2992493C1CDB3E8800786B1E /* GenerateOrdersModifyTableViewCell.m */; };
...@@ -137,7 +145,6 @@ ...@@ -137,7 +145,6 @@
29A938271CDAE31B00F21E54 /* ProductDetailsHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29A938261CDAE31B00F21E54 /* ProductDetailsHeaderView.xib */; }; 29A938271CDAE31B00F21E54 /* ProductDetailsHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29A938261CDAE31B00F21E54 /* ProductDetailsHeaderView.xib */; };
29A974CA1D72F9C80012AFA1 /* RebateSuccessTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A974C91D72F9C80012AFA1 /* RebateSuccessTableViewController.m */; }; 29A974CA1D72F9C80012AFA1 /* RebateSuccessTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A974C91D72F9C80012AFA1 /* RebateSuccessTableViewController.m */; };
29A9DCAE1CEB643C00A7567A /* CustomWKWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A9DCAC1CEB643C00A7567A /* CustomWKWebViewController.m */; }; 29A9DCAE1CEB643C00A7567A /* CustomWKWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A9DCAC1CEB643C00A7567A /* CustomWKWebViewController.m */; };
29B3EE6D1DCE0B390065FCCF /* LuckDrawResultModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B3EE6C1DCE0B390065FCCF /* LuckDrawResultModel.m */; };
29B3EE711DCE16130065FCCF /* LuckyDrawViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B3EE701DCE16130065FCCF /* LuckyDrawViewController.m */; }; 29B3EE711DCE16130065FCCF /* LuckyDrawViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B3EE701DCE16130065FCCF /* LuckyDrawViewController.m */; };
29BAA3AB1DC9FB5B00927D04 /* PromptTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BAA3AA1DC9FB5B00927D04 /* PromptTableViewCell.m */; }; 29BAA3AB1DC9FB5B00927D04 /* PromptTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BAA3AA1DC9FB5B00927D04 /* PromptTableViewCell.m */; };
29BB27681CD9D38E009A0813 /* AllpriceTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BB27671CD9D38E009A0813 /* AllpriceTableViewCell.m */; }; 29BB27681CD9D38E009A0813 /* AllpriceTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BB27671CD9D38E009A0813 /* AllpriceTableViewCell.m */; };
...@@ -164,7 +171,6 @@ ...@@ -164,7 +171,6 @@
29D260FB1CEECDFF00A9787D /* goodsDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D260FA1CEECDFF00A9787D /* goodsDetailsTableViewCell.m */; }; 29D260FB1CEECDFF00A9787D /* goodsDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D260FA1CEECDFF00A9787D /* goodsDetailsTableViewCell.m */; };
29D260FD1CEED53400A9787D /* goodsDetailsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29D260FC1CEED53400A9787D /* goodsDetailsTableViewCell.xib */; }; 29D260FD1CEED53400A9787D /* goodsDetailsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29D260FC1CEED53400A9787D /* goodsDetailsTableViewCell.xib */; };
29D261001CEEF16D00A9787D /* MjRefreshHeaderCustom.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D260FF1CEEF16D00A9787D /* MjRefreshHeaderCustom.m */; }; 29D261001CEEF16D00A9787D /* MjRefreshHeaderCustom.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D260FF1CEEF16D00A9787D /* MjRefreshHeaderCustom.m */; };
29D991DF1DCAE5B700840776 /* LuckyDrawModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D991DE1DCAE5B700840776 /* LuckyDrawModel.m */; };
29E28CE81CE0B91B00812A55 /* HENLENSONG.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E28CE71CE0B91B00812A55 /* HENLENSONG.m */; }; 29E28CE81CE0B91B00812A55 /* HENLENSONG.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E28CE71CE0B91B00812A55 /* HENLENSONG.m */; };
29E2D3201DB8737000443170 /* CardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E2D31F1DB8737000443170 /* CardViewController.m */; }; 29E2D3201DB8737000443170 /* CardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E2D31F1DB8737000443170 /* CardViewController.m */; };
29E2D3241DB878F200443170 /* XLPlainFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E2D3231DB878F200443170 /* XLPlainFlowLayout.m */; }; 29E2D3241DB878F200443170 /* XLPlainFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E2D3231DB878F200443170 /* XLPlainFlowLayout.m */; };
...@@ -406,6 +412,22 @@ ...@@ -406,6 +412,22 @@
2985AE9E1CE72F1500704C91 /* NSDictionary+ZXPUnicode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+ZXPUnicode.m"; sourceTree = "<group>"; }; 2985AE9E1CE72F1500704C91 /* NSDictionary+ZXPUnicode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+ZXPUnicode.m"; sourceTree = "<group>"; };
2985AE9F1CE72F1500704C91 /* NSObject+ZXPUnicode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+ZXPUnicode.h"; sourceTree = "<group>"; }; 2985AE9F1CE72F1500704C91 /* NSObject+ZXPUnicode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+ZXPUnicode.h"; sourceTree = "<group>"; };
2985AEA01CE72F1500704C91 /* NSObject+ZXPUnicode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+ZXPUnicode.m"; sourceTree = "<group>"; }; 2985AEA01CE72F1500704C91 /* NSObject+ZXPUnicode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+ZXPUnicode.m"; sourceTree = "<group>"; };
2986B9951DE1D30600F4A1CF /* PromotionChooseNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromotionChooseNavigationController.h; sourceTree = "<group>"; };
2986B9961DE1D30600F4A1CF /* PromotionChooseNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PromotionChooseNavigationController.m; sourceTree = "<group>"; };
2986B9971DE1D30600F4A1CF /* PromotionChooseTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromotionChooseTableViewCell.h; sourceTree = "<group>"; };
2986B9981DE1D30600F4A1CF /* PromotionChooseTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PromotionChooseTableViewCell.m; sourceTree = "<group>"; };
2986B9991DE1D30600F4A1CF /* PromotionChooseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromotionChooseViewController.h; sourceTree = "<group>"; };
2986B99A1DE1D30600F4A1CF /* PromotionChooseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PromotionChooseViewController.m; sourceTree = "<group>"; };
2986B99B1DE1D30600F4A1CF /* PromotionJDECardModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromotionJDECardModel.h; sourceTree = "<group>"; };
2986B99C1DE1D30600F4A1CF /* PromotionJDECardModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PromotionJDECardModel.m; sourceTree = "<group>"; };
2986B99D1DE1D30600F4A1CF /* PromotionLuckDrawResultModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromotionLuckDrawResultModel.h; sourceTree = "<group>"; };
2986B99E1DE1D30600F4A1CF /* PromotionLuckDrawResultModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PromotionLuckDrawResultModel.m; sourceTree = "<group>"; };
2986B99F1DE1D30600F4A1CF /* PromotionLuckyDrawModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromotionLuckyDrawModel.h; sourceTree = "<group>"; };
2986B9A01DE1D30600F4A1CF /* PromotionLuckyDrawModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PromotionLuckyDrawModel.m; sourceTree = "<group>"; };
2986B9A11DE1D30600F4A1CF /* PromotionWeChatCardModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromotionWeChatCardModel.h; sourceTree = "<group>"; };
2986B9A21DE1D30700F4A1CF /* PromotionWeChatCardModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PromotionWeChatCardModel.m; sourceTree = "<group>"; };
2986B9AA1DE1D32C00F4A1CF /* CustomPromotionModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomPromotionModel.h; sourceTree = "<group>"; };
2986B9AB1DE1D32C00F4A1CF /* CustomPromotionModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomPromotionModel.m; sourceTree = "<group>"; };
299249351CDB3C6500786B1E /* GenerateOrdersViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenerateOrdersViewController.h; sourceTree = "<group>"; }; 299249351CDB3C6500786B1E /* GenerateOrdersViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenerateOrdersViewController.h; sourceTree = "<group>"; };
299249361CDB3C6500786B1E /* GenerateOrdersViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GenerateOrdersViewController.m; sourceTree = "<group>"; }; 299249361CDB3C6500786B1E /* GenerateOrdersViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GenerateOrdersViewController.m; sourceTree = "<group>"; };
299249381CDB3E4500786B1E /* GenerateOrdersTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenerateOrdersTableViewCell.h; sourceTree = "<group>"; }; 299249381CDB3E4500786B1E /* GenerateOrdersTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenerateOrdersTableViewCell.h; sourceTree = "<group>"; };
...@@ -446,8 +468,6 @@ ...@@ -446,8 +468,6 @@
29A974C91D72F9C80012AFA1 /* RebateSuccessTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RebateSuccessTableViewController.m; sourceTree = "<group>"; }; 29A974C91D72F9C80012AFA1 /* RebateSuccessTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RebateSuccessTableViewController.m; sourceTree = "<group>"; };
29A9DCAB1CEB643C00A7567A /* CustomWKWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomWKWebViewController.h; sourceTree = "<group>"; }; 29A9DCAB1CEB643C00A7567A /* CustomWKWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomWKWebViewController.h; sourceTree = "<group>"; };
29A9DCAC1CEB643C00A7567A /* CustomWKWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomWKWebViewController.m; sourceTree = "<group>"; }; 29A9DCAC1CEB643C00A7567A /* CustomWKWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomWKWebViewController.m; sourceTree = "<group>"; };
29B3EE6B1DCE0B390065FCCF /* LuckDrawResultModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuckDrawResultModel.h; sourceTree = "<group>"; };
29B3EE6C1DCE0B390065FCCF /* LuckDrawResultModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LuckDrawResultModel.m; sourceTree = "<group>"; };
29B3EE6F1DCE16130065FCCF /* LuckyDrawViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuckyDrawViewController.h; sourceTree = "<group>"; }; 29B3EE6F1DCE16130065FCCF /* LuckyDrawViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuckyDrawViewController.h; sourceTree = "<group>"; };
29B3EE701DCE16130065FCCF /* LuckyDrawViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LuckyDrawViewController.m; sourceTree = "<group>"; }; 29B3EE701DCE16130065FCCF /* LuckyDrawViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LuckyDrawViewController.m; sourceTree = "<group>"; };
29BAA3A91DC9FB5B00927D04 /* PromptTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromptTableViewCell.h; sourceTree = "<group>"; }; 29BAA3A91DC9FB5B00927D04 /* PromptTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromptTableViewCell.h; sourceTree = "<group>"; };
...@@ -495,8 +515,6 @@ ...@@ -495,8 +515,6 @@
29D260FC1CEED53400A9787D /* goodsDetailsTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = goodsDetailsTableViewCell.xib; sourceTree = "<group>"; }; 29D260FC1CEED53400A9787D /* goodsDetailsTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = goodsDetailsTableViewCell.xib; sourceTree = "<group>"; };
29D260FE1CEEF16D00A9787D /* MjRefreshHeaderCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MjRefreshHeaderCustom.h; sourceTree = "<group>"; }; 29D260FE1CEEF16D00A9787D /* MjRefreshHeaderCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MjRefreshHeaderCustom.h; sourceTree = "<group>"; };
29D260FF1CEEF16D00A9787D /* MjRefreshHeaderCustom.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MjRefreshHeaderCustom.m; sourceTree = "<group>"; }; 29D260FF1CEEF16D00A9787D /* MjRefreshHeaderCustom.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MjRefreshHeaderCustom.m; sourceTree = "<group>"; };
29D991DD1DCAE5B700840776 /* LuckyDrawModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuckyDrawModel.h; sourceTree = "<group>"; };
29D991DE1DCAE5B700840776 /* LuckyDrawModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LuckyDrawModel.m; sourceTree = "<group>"; };
29E28CE61CE0B91B00812A55 /* HENLENSONG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HENLENSONG.h; sourceTree = "<group>"; }; 29E28CE61CE0B91B00812A55 /* HENLENSONG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HENLENSONG.h; sourceTree = "<group>"; };
29E28CE71CE0B91B00812A55 /* HENLENSONG.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HENLENSONG.m; sourceTree = "<group>"; }; 29E28CE71CE0B91B00812A55 /* HENLENSONG.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HENLENSONG.m; sourceTree = "<group>"; };
29E2D31E1DB8737000443170 /* CardViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CardViewController.h; sourceTree = "<group>"; }; 29E2D31E1DB8737000443170 /* CardViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CardViewController.h; sourceTree = "<group>"; };
...@@ -758,10 +776,22 @@ ...@@ -758,10 +776,22 @@
2921F2FB1DB5E75300D6439B /* PromotionalGoodsModel.m */, 2921F2FB1DB5E75300D6439B /* PromotionalGoodsModel.m */,
2921F3011DB5EBD600D6439B /* PromotionalDeductionModel.h */, 2921F3011DB5EBD600D6439B /* PromotionalDeductionModel.h */,
2921F3021DB5EBD600D6439B /* PromotionalDeductionModel.m */, 2921F3021DB5EBD600D6439B /* PromotionalDeductionModel.m */,
29D991DD1DCAE5B700840776 /* LuckyDrawModel.h */, 2986B9951DE1D30600F4A1CF /* PromotionChooseNavigationController.h */,
29D991DE1DCAE5B700840776 /* LuckyDrawModel.m */, 2986B9961DE1D30600F4A1CF /* PromotionChooseNavigationController.m */,
29B3EE6B1DCE0B390065FCCF /* LuckDrawResultModel.h */, 2986B9971DE1D30600F4A1CF /* PromotionChooseTableViewCell.h */,
29B3EE6C1DCE0B390065FCCF /* LuckDrawResultModel.m */, 2986B9981DE1D30600F4A1CF /* PromotionChooseTableViewCell.m */,
2986B9991DE1D30600F4A1CF /* PromotionChooseViewController.h */,
2986B99A1DE1D30600F4A1CF /* PromotionChooseViewController.m */,
2986B99B1DE1D30600F4A1CF /* PromotionJDECardModel.h */,
2986B99C1DE1D30600F4A1CF /* PromotionJDECardModel.m */,
2986B99D1DE1D30600F4A1CF /* PromotionLuckDrawResultModel.h */,
2986B99E1DE1D30600F4A1CF /* PromotionLuckDrawResultModel.m */,
2986B99F1DE1D30600F4A1CF /* PromotionLuckyDrawModel.h */,
2986B9A01DE1D30600F4A1CF /* PromotionLuckyDrawModel.m */,
2986B9A11DE1D30600F4A1CF /* PromotionWeChatCardModel.h */,
2986B9A21DE1D30700F4A1CF /* PromotionWeChatCardModel.m */,
2986B9AA1DE1D32C00F4A1CF /* CustomPromotionModel.h */,
2986B9AB1DE1D32C00F4A1CF /* CustomPromotionModel.m */,
); );
name = model; name = model;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1991,6 +2021,7 @@ ...@@ -1991,6 +2021,7 @@
files = ( files = (
293163FA1DCE3CBA0075129D /* LuckyDrawDetailsViewController.m in Sources */, 293163FA1DCE3CBA0075129D /* LuckyDrawDetailsViewController.m in Sources */,
29045F321DCA192700E42A86 /* PromptHeaderTableViewCell.m in Sources */, 29045F321DCA192700E42A86 /* PromptHeaderTableViewCell.m in Sources */,
2986B9A31DE1D30700F4A1CF /* PromotionChooseNavigationController.m in Sources */,
2980AEC51D0D0B10001AA4A3 /* opple_objc_json_client.m in Sources */, 2980AEC51D0D0B10001AA4A3 /* opple_objc_json_client.m in Sources */,
2916A7521D70557400644C8C /* PaymentsDetailsTableViewController.m in Sources */, 2916A7521D70557400644C8C /* PaymentsDetailsTableViewController.m in Sources */,
29E2D3241DB878F200443170 /* XLPlainFlowLayout.m in Sources */, 29E2D3241DB878F200443170 /* XLPlainFlowLayout.m in Sources */,
...@@ -2011,6 +2042,7 @@ ...@@ -2011,6 +2042,7 @@
29EAAE951CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m in Sources */, 29EAAE951CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m in Sources */,
2949BAC21CD3055A0049385A /* MMExampleDrawerVisualStateManager.m in Sources */, 2949BAC21CD3055A0049385A /* MMExampleDrawerVisualStateManager.m in Sources */,
29E2D3301DB8AFD500443170 /* MDScratchImageView.mm in Sources */, 29E2D3301DB8AFD500443170 /* MDScratchImageView.mm in Sources */,
2986B9A81DE1D30700F4A1CF /* PromotionLuckyDrawModel.m in Sources */,
29D261001CEEF16D00A9787D /* MjRefreshHeaderCustom.m in Sources */, 29D261001CEEF16D00A9787D /* MjRefreshHeaderCustom.m in Sources */,
292A14311CE81D1D00EB4430 /* AddressModel.m in Sources */, 292A14311CE81D1D00EB4430 /* AddressModel.m in Sources */,
29A938221CDADE4700F21E54 /* ProductDetailsTableViewCell.m in Sources */, 29A938221CDADE4700F21E54 /* ProductDetailsTableViewCell.m in Sources */,
...@@ -2046,10 +2078,12 @@ ...@@ -2046,10 +2078,12 @@
29F14BA91CF6B60D0005D3E5 /* QRUtil.m in Sources */, 29F14BA91CF6B60D0005D3E5 /* QRUtil.m in Sources */,
29EAAEA01CDC79DC00C4DBA2 /* CustomerOrderViewController.m in Sources */, 29EAAEA01CDC79DC00C4DBA2 /* CustomerOrderViewController.m in Sources */,
2904BA431DBEF3A200FB473A /* OrderRecordViewController.m in Sources */, 2904BA431DBEF3A200FB473A /* OrderRecordViewController.m in Sources */,
2986B9A41DE1D30700F4A1CF /* PromotionChooseTableViewCell.m in Sources */,
2928F8321CD09E320036D761 /* Toolview.m in Sources */, 2928F8321CD09E320036D761 /* Toolview.m in Sources */,
2936F28C1D014147007CA67C /* sceneScreeningCollectionViewCell.m in Sources */, 2936F28C1D014147007CA67C /* sceneScreeningCollectionViewCell.m in Sources */,
2942F8A61CDD80C2005B377E /* authenticateView.m in Sources */, 2942F8A61CDD80C2005B377E /* authenticateView.m in Sources */,
291D6A581CFFD45F007891AE /* SceneSectionHeaderView.m in Sources */, 291D6A581CFFD45F007891AE /* SceneSectionHeaderView.m in Sources */,
2986B9A71DE1D30700F4A1CF /* PromotionLuckDrawResultModel.m in Sources */,
29BFBD8F1CE44BA900C238FB /* goodsDetailsSectionview.m in Sources */, 29BFBD8F1CE44BA900C238FB /* goodsDetailsSectionview.m in Sources */,
29CCA43C1CF7ED6100BC19DD /* SelectedTableViewCell.m in Sources */, 29CCA43C1CF7ED6100BC19DD /* SelectedTableViewCell.m in Sources */,
29E2D3201DB8737000443170 /* CardViewController.m in Sources */, 29E2D3201DB8737000443170 /* CardViewController.m in Sources */,
...@@ -2078,7 +2112,7 @@ ...@@ -2078,7 +2112,7 @@
2921F2F81DB5C7E400D6439B /* OrderDetailsSectionHeaderView.m in Sources */, 2921F2F81DB5C7E400D6439B /* OrderDetailsSectionHeaderView.m in Sources */,
295DEAAA1DB77572006ED4A6 /* CardDetailsViewController.m in Sources */, 295DEAAA1DB77572006ED4A6 /* CardDetailsViewController.m in Sources */,
2962D0711CD1A58B0058829D /* RightViewController.m in Sources */, 2962D0711CD1A58B0058829D /* RightViewController.m in Sources */,
29B3EE6D1DCE0B390065FCCF /* LuckDrawResultModel.m in Sources */, 2986B9A61DE1D30700F4A1CF /* PromotionJDECardModel.m in Sources */,
29EAAEA51CDC7F7000C4DBA2 /* CustomerOrderTableViewCell.m in Sources */, 29EAAEA51CDC7F7000C4DBA2 /* CustomerOrderTableViewCell.m in Sources */,
29706DA91CD082990003C412 /* AppDelegate.m in Sources */, 29706DA91CD082990003C412 /* AppDelegate.m in Sources */,
29834EB41CDF1EAA001A484F /* screeningSecondView.m in Sources */, 29834EB41CDF1EAA001A484F /* screeningSecondView.m in Sources */,
...@@ -2101,9 +2135,9 @@ ...@@ -2101,9 +2135,9 @@
29706DB21CD082990003C412 /* Lighting.xcdatamodeld in Sources */, 29706DB21CD082990003C412 /* Lighting.xcdatamodeld in Sources */,
2916A74C1D703DFF00644C8C /* PaymentsTableViewCell.m in Sources */, 2916A74C1D703DFF00644C8C /* PaymentsTableViewCell.m in Sources */,
29E384CB1CE9B0BB00888199 /* HotCollectionViewCell.m in Sources */, 29E384CB1CE9B0BB00888199 /* HotCollectionViewCell.m in Sources */,
2986B9A51DE1D30700F4A1CF /* PromotionChooseViewController.m in Sources */,
29C30BE41DDC3B1300CA3E29 /* OnlineLearningViewController.m in Sources */, 29C30BE41DDC3B1300CA3E29 /* OnlineLearningViewController.m in Sources */,
29834EB91CDF1FB3001A484F /* screeningFirstView.m in Sources */, 29834EB91CDF1FB3001A484F /* screeningFirstView.m in Sources */,
29D991DF1DCAE5B700840776 /* LuckyDrawModel.m in Sources */,
299249401CDB4D1D00786B1E /* AddaddressViewController.m in Sources */, 299249401CDB4D1D00786B1E /* AddaddressViewController.m in Sources */,
299249371CDB3C6500786B1E /* GenerateOrdersViewController.m in Sources */, 299249371CDB3C6500786B1E /* GenerateOrdersViewController.m in Sources */,
291A37771DBA58CC00299F0D /* GetJDCardView.m in Sources */, 291A37771DBA58CC00299F0D /* GetJDCardView.m in Sources */,
...@@ -2132,7 +2166,9 @@ ...@@ -2132,7 +2166,9 @@
29BB27801CD9DFD7009A0813 /* AboutViewController.m in Sources */, 29BB27801CD9DFD7009A0813 /* AboutViewController.m in Sources */,
2903F93D1DBE57F4003CC6B1 /* JDEcardViewController.m in Sources */, 2903F93D1DBE57F4003CC6B1 /* JDEcardViewController.m in Sources */,
29F14BAA1CF6B60D0005D3E5 /* QRView.m in Sources */, 29F14BAA1CF6B60D0005D3E5 /* QRView.m in Sources */,
2986B9A91DE1D30700F4A1CF /* PromotionWeChatCardModel.m in Sources */,
2936F29A1D01868E007CA67C /* ShareGoodsViewController.m in Sources */, 2936F29A1D01868E007CA67C /* ShareGoodsViewController.m in Sources */,
2986B9AC1DE1D32C00F4A1CF /* CustomPromotionModel.m in Sources */,
29834EC01CDF5E4E001A484F /* ScreeningFirstCollectionViewCell.m in Sources */, 29834EC01CDF5E4E001A484F /* ScreeningFirstCollectionViewCell.m in Sources */,
29834EC51CDF76C1001A484F /* UserViewController.m in Sources */, 29834EC51CDF76C1001A484F /* UserViewController.m in Sources */,
29A974CA1D72F9C80012AFA1 /* RebateSuccessTableViewController.m in Sources */, 29A974CA1D72F9C80012AFA1 /* RebateSuccessTableViewController.m in Sources */,
......
Tools/BaseViewController.h
View file @ 47a783ae
...@@ -62,6 +62,11 @@ ...@@ -62,6 +62,11 @@
- (void)callAirprintWithdata:(NSString *)PDFpath SuccessBlock:(void(^)())success ErrorBlock:(void(^)())failed; - (void)callAirprintWithdata:(NSString *)PDFpath SuccessBlock:(void(^)())success ErrorBlock:(void(^)())failed;
/**
提示框
*/
- (void)promptCustomerTitle:(NSString *)title withMessage:(NSString *)message finish:(void (^)())complete;
+ (BOOL)determineCameraPermissions;
/** /**
* 成功等待视图 * 成功等待视图
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment