Skip to content

C
colorfulSchoolReconsitution
Commit b611ce6c by 刘卓鑫
Options

任务bug修改

parent cdbeba74
Showing with 391 additions and 197 deletions
ColorfulSchool/ColorfulSchool.xcodeproj/project.pbxproj
......@@ -123,6 +123,7 @@
1CB9AF72237102B500ED0434 /* DC_ZXWashOrderListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CB9AF50237102B400ED0434 /* DC_ZXWashOrderListModel.m */; };
1CB9AF73237102B500ED0434 /* DC_ZXWashMerthinModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CB9AF51237102B400ED0434 /* DC_ZXWashMerthinModel.m */; };
1CB9AF74237102B500ED0434 /* DC_ZXWashLocationModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CB9AF56237102B400ED0434 /* DC_ZXWashLocationModel.m */; };
1CBB66172390C11D00351692 /* ad_close.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CBB66162390C11D00351692 /* ad_close.png */; };
1CBDE2C6238D0436006DA46E /* ZXTaskManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CBDE2C5238D0435006DA46E /* ZXTaskManager.m */; };
1CC15429230D5B7400582EC1 /* ZXAimiWalletAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CC15428230D5B7400582EC1 /* ZXAimiWalletAlertView.m */; };
1CC1542D230D6E3600582EC1 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1CC1542C230D6E3600582EC1 /* LaunchScreen.storyboard */; };
......@@ -956,6 +957,7 @@
1CB9AF55237102B400ED0434 /* DC_ZXWashOrderListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DC_ZXWashOrderListModel.h; sourceTree = "<group>"; };
1CB9AF56237102B400ED0434 /* DC_ZXWashLocationModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DC_ZXWashLocationModel.m; sourceTree = "<group>"; };
1CB9AF57237102B400ED0434 /* DC_ZXWashMerthinModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DC_ZXWashMerthinModel.h; sourceTree = "<group>"; };
1CBB66162390C11D00351692 /* ad_close.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ad_close.png; sourceTree = "<group>"; };
1CBDE2C4238D0435006DA46E /* ZXTaskManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXTaskManager.h; sourceTree = "<group>"; };
1CBDE2C5238D0435006DA46E /* ZXTaskManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXTaskManager.m; sourceTree = "<group>"; };
1CC15427230D5B7400582EC1 /* ZXAimiWalletAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXAimiWalletAlertView.h; sourceTree = "<group>"; };
......@@ -3627,6 +3629,7 @@
A7200868210EF6A600BE2DC6 /* ssssaaaaff.png */,
A7DECC652079F0E20039EC22 /* ss.gif */,
A7BFF1D620D115A300CE350A /* 查看全部@2x.png */,
1CBB66162390C11D00351692 /* ad_close.png */,
A7265BEC20CA3FAE0084B814 /* close-operation.png */,
A7265BE720CA3AEE0084B814 /* menu-holder@2x.png */,
);
......@@ -5161,6 +5164,7 @@
A72BE4B821D5CD030069C0E1 /* AlertStyleSimple.xib in Resources */,
A705C00221D4B067004F1628 /* ImageSelectedOn.png in Resources */,
A7B058A5211AD1AF00304B38 /* README.txt in Resources */,
1CBB66172390C11D00351692 /* ad_close.png in Resources */,
A705C01421D4B067004F1628 /* UIBarButtonItemGrid@2x.png in Resources */,
A78A3F4021952EE7001558A5 /* orderSound.wav in Resources */,
);
......
ColorfulSchool/ColorfulSchool.xcworkspace/xcuserdata/liuzhuoxin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -34,38 +34,6 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "F38EFD70-E808-4913-87DE-8931053D77E1"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "93"
endingLineNumber = "93"
landmarkName = "-nativeExpressRewardedVideoAdDidLoad:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "7CDAC643-8501-4CA2-81EA-23162966F16C"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "97"
endingLineNumber = "97"
landmarkName = "-nativeExpressRewardedVideoAd:didFailWithError:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "6EDFFD59-E444-4924-805F-44A7B75E56A5"
shouldBeEnabled = "Yes"
ignoreCount = "0"
......@@ -73,9 +41,9 @@
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "101"
endingLineNumber = "101"
landmarkName = "-nativeExpressRewardedVideoAdDidDownLoadVideo:"
startingLineNumber = "102"
endingLineNumber = "102"
landmarkName = "-createRewardedVideoAdWithController:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -89,9 +57,9 @@
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "105"
endingLineNumber = "105"
landmarkName = "-nativeExpressRewardedVideoAdViewRenderSuccess:"
startingLineNumber = "106"
endingLineNumber = "106"
landmarkName = "-createRewardedVideoAdWithController:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -105,9 +73,9 @@
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "109"
endingLineNumber = "109"
landmarkName = "-nativeExpressRewardedVideoAdViewRenderFail:error:"
startingLineNumber = "110"
endingLineNumber = "110"
landmarkName = "-nativeExpressRewardedVideoAdDidLoad:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -121,9 +89,9 @@
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "113"
endingLineNumber = "113"
landmarkName = "-nativeExpressRewardedVideoAdWillVisible:"
startingLineNumber = "114"
endingLineNumber = "114"
landmarkName = "-nativeExpressRewardedVideoAd:didFailWithError:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -137,9 +105,9 @@
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "117"
endingLineNumber = "117"
landmarkName = "-nativeExpressRewardedVideoAdDidVisible:"
startingLineNumber = "118"
endingLineNumber = "118"
landmarkName = "-nativeExpressRewardedVideoAdDidDownLoadVideo:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -153,9 +121,9 @@
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "121"
endingLineNumber = "121"
landmarkName = "-nativeExpressRewardedVideoAdWillClose:"
startingLineNumber = "122"
endingLineNumber = "122"
landmarkName = "-nativeExpressRewardedVideoAdViewRenderSuccess:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -169,9 +137,9 @@
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "130"
endingLineNumber = "130"
landmarkName = "-nativeExpressRewardedVideoAdDidClick:"
startingLineNumber = "131"
endingLineNumber = "131"
landmarkName = "-nativeExpressRewardedVideoAdWillVisible:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -185,9 +153,9 @@
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "126"
endingLineNumber = "126"
landmarkName = "-nativeExpressRewardedVideoAdDidClose:"
startingLineNumber = "127"
endingLineNumber = "127"
landmarkName = "-nativeExpressRewardedVideoAdViewRenderFail:error:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -201,9 +169,9 @@
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "134"
endingLineNumber = "134"
landmarkName = "-nativeExpressRewardedVideoAdDidClickSkip:"
startingLineNumber = "135"
endingLineNumber = "135"
landmarkName = "-nativeExpressRewardedVideoAdDidVisible:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -217,9 +185,9 @@
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "142"
endingLineNumber = "142"
landmarkName = "-nativeExpressRewardedVideoAdServerRewardDidSucceed:verify:"
startingLineNumber = "143"
endingLineNumber = "143"
landmarkName = "-nativeExpressRewardedVideoAdDidClose:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -233,9 +201,9 @@
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/BUAD/BUADTool.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "146"
endingLineNumber = "146"
landmarkName = "-nativeExpressRewardedVideoAdServerRewardDidFail:"
startingLineNumber = "147"
endingLineNumber = "147"
landmarkName = "-nativeExpressRewardedVideoAdDidClick:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......
ColorfulSchool/ColorfulSchool/AppDelegate.m
......@@ -73,7 +73,7 @@
_isPlaying = NO;
//启动环境
[APIManager sharedAPIManager].lauchEnvironment = ZXColorfulSchoolEnvironmentDevelop;
[APIManager sharedAPIManager].lauchEnvironment = ZXColorfulSchoolEnvironmentTest;
//极光推送
[self initPushWithOptions:launchOptions isProduct:YES];
......
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/BUAD/BUADTool.h
//
//
......@@ -16,9 +16,9 @@ NS_ASSUME_NONNULL_BEGIN
- (void) loadLauchAdByDelegate:(id) delagte;
- (void) loadBannerAdWithController:(UIViewController *) viewController superView:(UIView *) superView;
- (void) loadBannerAdWithController:(UIViewController *) viewController superView:(UIView *) superView isFirstPage:(BOOL) isFirst;
- (void) loadBannerAdWithController:(UIViewController *) viewController superView:(UIView *) superView ;
//创建激励视频
- (void) createRewardedVideoAdWithController:(UIViewController *) viewController;
......
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/BUAD/BUADTool.m
//
//
......@@ -59,19 +59,37 @@
NSLog(@"穿山甲开屏广告加载失败");
}
- (void) loadBannerAdWithController:(UIViewController *) viewController superView:(UIView *) superView {
- (void) loadBannerAdWithController:(UIViewController *) viewController superView:(UIView *) superView isFirstPage:(BOOL) isFirst {
// splash AD demo
BUSize *imgSize = [BUSize sizeBy:BUProposalSize_Banner600_90];
CGFloat bannerHeigh = kScreenWidth/600*90;
if (self.bannerView == nil) {
self.bannerView = [[BUNativeExpressBannerView alloc] initWithSlotID:@"933112579" rootViewController:viewController imgSize:imgSize adSize:CGSizeMake(kScreenWidth, bannerHeigh) IsSupportDeepLink:YES];
self.bannerView.frame = CGRectMake(0, kScreenWidth * 0.3 + 10 * k6Scale - bannerHeigh, kScreenWidth, bannerHeigh);
self.bannerView.delegate = self;
[superView addSubview:self.bannerView];
[self.bannerView mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.equalTo(superView.mas_bottom).offset(isFirst?-kTabBarHeight:0);
make.left.right.equalTo(superView);
make.height.mas_equalTo(bannerHeigh);
}];
}
[self.bannerView loadAdData];
}
- (void) loadBannerAdWithController:(UIViewController *) viewController superView:(UIView *) superView {
// splash AD demo
BUSize *imgSize = [BUSize sizeBy:BUProposalSize_Banner600_90];
CGFloat bannerHeigh = kScreenWidth/600*90;
if (self.bannerView == nil) {
self.bannerView = [[BUNativeExpressBannerView alloc] initWithSlotID:@"933112579" rootViewController:viewController imgSize:imgSize adSize:CGSizeMake(kScreenWidth, bannerHeigh) IsSupportDeepLink:YES];
self.bannerView.delegate = self;
[superView insertSubview:self.bannerView atIndex:0];
[self.bannerView mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.left.right.equalTo(superView);
make.height.mas_equalTo(bannerHeigh);
}];
}
[self.bannerView loadAdData];
}
- (void)createRewardedVideoAdWithController:(UIViewController *)viewController {
......
ColorfulSchool/ColorfulSchool/Classes/Config(配置)/Macros.h
//
//
......@@ -73,7 +73,8 @@ static NSString *kFailurMsg = @"数据加载失败,请检查一下当前网络
#define kAPP_SELP_ADVIEW_SHOW @"selfhelpQrcodeSwitch"
//app我的页面刷新广告时间
#define kAPP_ME_REFRESHAD @"kAPP_ME_REFRESHAD"
//app是否开启了任务
#define kAPP_IS_OPENB_TASK @"kAPP_IS_OPENB_TASK"
/*首页的key和value--对应rootUrl*/
......
ColorfulSchool/ColorfulSchool/Classes/CustomViews(自定义)/CustomerTabbar.m
//
//
......@@ -19,6 +19,19 @@
@implementation CustomerTabbar
- (void)setSwitchs:(NSArray *)switchs {
_switchs = switchs;
NSDictionary *task;
for (NSDictionary *dic in _switchs) {
if ([dic[@"type"] isEqualToString:@"14"]) {
task = dic;
}
}
if (task) {
NSMutableArray *arrr = [[NSMutableArray alloc] initWithArray:_switchs];
[arrr removeObject:task];
[arrr addObject:task];
switchs = arrr.copy;
}
self.layer.shadowColor = RGB(210, 210, 210).CGColor;
self.layer.shadowOffset = CGSizeMake(0, -6);
self.layer.shadowOpacity = 0.3;
......@@ -38,10 +51,12 @@
[titleArray addObject:@"多彩"];
[imagesArray addObject:@"ic_duocai_nor"];
[selectImagesArray addObject:@"ic_duocai_sel"];
BOOL isHasSc = NO;
for (NSDictionary *dic in switchs) {
if ([dic[@"type"] isEqualToString:@"2"]) {
isHasSc = YES;
[titleArray addObject:@"商城"];
[imagesArray addObject:@"ic_shequ_nor"];
[selectImagesArray addObject:@"ic_shequ_sel"];
} else if ([dic[@"type"] isEqualToString:@"1"]) {
[titleArray addObject:@"发现"];
[imagesArray addObject:@"ic_faxian_nor"];
......@@ -54,21 +69,26 @@
[titleArray addObject:@"短视频"];
[imagesArray addObject:@"nav_video_nor"];
[selectImagesArray addObject:@"nav_video_sel"];
} else if ([dic[@"type"] isEqualToString:@"14"]) {
} if ([dic[@"type"] isEqualToString:@"14"]) {
[titleArray addObject:@"任务"];
[imagesArray addObject:@"nav_video_nor"];
[selectImagesArray addObject:@"nav_video_sel"];
[imagesArray addObject:@"nav_renwu_nor"];
[selectImagesArray addObject:@"nav_renwu_sel"];
}
}
if (isHasSc) {
[titleArray addObject:@"商城"];
[imagesArray addObject:@"ic_shequ_nor"];
[selectImagesArray addObject:@"ic_shequ_sel"];
}
// if (isHasSc) {
// // [titleArray insertObject:@"商城" atIndex:titleArray.count-1];
// // [imagesArray insertObject:@"ic_shequ_nor" atIndex:titleArray.count-1];
// // [selectImagesArray insertObject:@"ic_shequ_sel" atIndex:titleArray.count-1];
//
//
// }
//添加我的
[titleArray addObject:@"我的"];
[imagesArray addObject:@"ic_wode_nor"];
[selectImagesArray addObject:@"ic_wode_sel"];
CGFloat count = titleArray.count;
CGFloat W = kScreenWidth / count;
for (int i = 0; i < count; i++) {
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/Controller/ZXHomePageViewController+Extension.m
//
//
......@@ -498,10 +498,10 @@
#pragma mark - 淘宝
- (void) taobaoWithDic:(NSDictionary *) dic {
if ([dic[@"type"] isEqualToString:@"taobao"]) {
NSString *item_id = dic[@"item_id"];
NSString *jumpUrl = dic[@"jump_url"];
if ([dic[@"type"] isEqualToString:@"taobao"]) {
NSString *code = dic[@"pwd"];
if (code) {
UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
......@@ -564,6 +564,16 @@
}
});
}];
} else if ([dic[@"type"] isEqualToString:@"wxmini"]) {
//跳转微信小程序
NSString *appID = dic[@"appId"];
[WXApi registerApp:appID?appID:@"wx41cd01f1eb664e21"];
WXLaunchMiniProgramReq *req = [[WXLaunchMiniProgramReq alloc] init];
req.userName = dic[@"id"];
req.path = dic[@"url"];
req.miniProgramType = WXMiniProgramTypePreview;
[WXApi sendReq:req];
}
}
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/Controller/ZXHomePageViewController.m
//
//
......@@ -107,7 +107,20 @@
// }];
if ([[kUserDefaults objectForKey:@"kAPP_IS_OPENB_TASK"] isEqualToString:@"yes"]) {
//查看任务相关内容
@weakify(self);
[ZXTool requestDataHideLoadingToastWithType:kXMHTTPMethodPOST url:[NSString stringWithFormat:@"%@/dcxy/api/tasks/homePage", [kUserDefaults objectForKey:@"Task"]] para:nil completed:^(CommonModel *common, NSString *error) {
@strongify(self);
if ([common.data boolValue]) {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool hideLoadingAnimation];
[self showTaskDialog];
});
}
}];
}
}
- (void)viewWillLayoutSubviews {
[super viewWillLayoutSubviews];
......@@ -168,18 +181,7 @@
}
//查看任务相关内容
@weakify(self);
[ZXTool requestDataHideLoadingToastWithType:kXMHTTPMethodPOST url:[NSString stringWithFormat:@"%@/dcxy/api/tasks/homePage", [kUserDefaults objectForKey:@"Task"]] para:nil completed:^(CommonModel *common, NSString *error) {
@strongify(self);
if ([common.data boolValue]) {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool hideLoadingAnimation];
[self showTaskDialog];
});
}
}];
}
#pragma mark - 显示领券弹窗
......@@ -194,28 +196,30 @@
imageV.userInteractionEnabled = YES;
[taskBgView addSubview:imageV];
[imageV mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(taskBgView.mas_centerX);
make.top.equalTo(taskBgView.mas_top).offset(kTopHeight + 70 * k6Scale);
make.width.mas_equalTo(355 * k6Scale);
make.height.mas_equalTo(355 * k6Scale * image.size.height / image.size.width);
make.center.equalTo(taskBgView);
make.width.mas_equalTo(307 * k6Scale);
make.height.mas_equalTo(307 * k6Scale * image.size.height / image.size.width);
}];
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] init];
[imageV addGestureRecognizer:tap];
@weakify(self);
[[tap rac_gestureSignal] subscribeNext:^(id x) {
@strongify(self);
taskBgView.hidden = YES;
[taskBgView removeFromSuperview];
ZXTaskViewController *taskVc = [[ZXTaskViewController alloc] init];
taskVc.jumpUrl = [NSString stringWithFormat:@"%@/taskApp/coupon.html?token=%@", [kUserDefaults objectForKey:@"TaskH5"], CacheToken];
taskVc.hidesBottomBarWhenPushed = YES;
[self.navigationController pushViewController:taskVc animated:YES];
}];
enlargeClickRegionBtn *closeButton = [[enlargeClickRegionBtn alloc] init];
UIButton *closeButton = [[UIButton alloc] init];
[taskBgView addSubview:closeButton];
[closeButton setBackgroundImage:[UIImage imageNamed:@"task_close"] forState:UIControlStateNormal];
[closeButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(31 * k6Scale);
make.centerX.equalTo(taskBgView);
make.top.equalTo(imageV.mas_bottom);
make.width.mas_equalTo(150 * k6Scale);
make.height.mas_equalTo(200 * k6Scale);
make.right.equalTo(imageV);
make.top.equalTo(imageV);
}];
[[closeButton rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(id x) {
taskBgView.hidden = YES;
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/NewFirstPage(新版首页)/Models/CommonModel.h
//
//
......@@ -31,7 +31,7 @@
/** 推送开关描述 */
@property (nonatomic, copy) NSString *des;
@property (nonatomic, strong) NSArray *consumeRefundOrders;
@end
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/2.0条码/ZXSelfHelpViewController.m
//
//
......@@ -84,27 +84,28 @@
if ([[kUserDefaults objectForKey:kAPP_SELP_ADVIEW_SHOW] isEqualToString:@"yes"]) {
UIView *adSuperView = [[UIView alloc] init];
[self.view addSubview:adSuperView];
adSuperView.backgroundColor = UIColor.whiteColor;
[adSuperView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.equalTo(self.view);
make.height.mas_equalTo(kScreenWidth * 0.3 + 10 * k6Scale);
}];
enlargeClickRegionBtn *closeButton = [[enlargeClickRegionBtn alloc] init];
[closeButton setBackgroundImage:[UIImage imageNamed:@"task_close"] forState:UIControlStateNormal];
[adSuperView addSubview:closeButton];
[closeButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.top.equalTo(adSuperView);
make.width.height.mas_equalTo(20 * k6Scale);
}];
[adSuperView bringSubviewToFront:closeButton];
[[closeButton rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(id x) {
adSuperView.hidden = YES;
[adSuperView removeFromSuperview];
}];
[[ZXBDTool new] createNativie20_3AdByView:adSuperView];
[[[BUADTool alloc] init] loadBannerAdWithController:self superView:adSuperView];
[[[BUADTool alloc] init] loadBannerAdWithController:self superView:self.view isFirstPage:NO];
// UIView *adSuperView = [[UIView alloc] init];
// [self.view addSubview:adSuperView];
// adSuperView.backgroundColor = UIColor.whiteColor;
// [adSuperView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.left.right.bottom.equalTo(self.view);
// make.height.mas_equalTo(kScreenWidth * 0.3 + 10 * k6Scale);
// }];
// enlargeClickRegionBtn *closeButton = [[enlargeClickRegionBtn alloc] init];
// [closeButton setBackgroundImage:[UIImage imageNamed:@"task_close"] forState:UIControlStateNormal];
// [adSuperView addSubview:closeButton];
// [closeButton mas_makeConstraints:^(MASConstraintMaker *make) {
// make.right.top.equalTo(adSuperView);
// make.width.height.mas_equalTo(20 * k6Scale);
// }];
// [adSuperView bringSubviewToFront:closeButton];
// [[closeButton rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(id x) {
// adSuperView.hidden = YES;
// [adSuperView removeFromSuperview];
// }];
// [[ZXBDTool new] createNativie20_3AdByView:adSuperView];
// [[[BUADTool alloc] init] loadBannerAdWithController:self superView:adSuperView];
}
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/YWTPay(新版支付)/Controller/ZXNewOrderDetailViewController.m
//
//
......@@ -31,6 +31,7 @@
[ZXTool showErrorMsg:error];
} else {
ZXNewPayOrder *order = [ZXNewPayOrder mj_objectWithKeyValues:common.data];
order.tkData = common.consumeRefundOrders;
self.order = order;
[self.myTableView reloadData];
}
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/YWTPay(新版支付)/Model/ZXNewPayOrder.h
//
//
......@@ -40,6 +40,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, copy) NSString *groupName;
@property (nonatomic, assign) NSInteger paymentConfId;
/** 自定义字段 退款数据 */
@property (nonatomic, strong) NSArray *tkData;
@property (nonatomic, assign) CGFloat actualAmount;//金额
......
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/UserSetting/UserSet/Controller/ZXSettingViewController.m
//
//
......@@ -38,6 +38,11 @@ typedef void(^isCanChange)(BOOL iCan);
[self.view addSubview:self.myTableView];
if ([[UserManager sharedUserManager].user.version isEqualToString:@"1"] || [[UserManager sharedUserManager].user.version isEqualToString:@"1.0"]) {
[kUserDefaults setObject:@"notShow" forKey:@"devPassSwitch"];
[self operationSectionsIs2_0System:NO];
} else {
[ZXTool requestDataWithType:kXMHTTPMethodGET url:[NSString stringWithFormat:@"%@/dcxy/hardware/info/forcustomer/loginState?customerId=%@", [kUserDefaults objectForKey:@"NEW_PAY"], CacheUserId] para:nil completed:^(CommonModel *common, NSString *error) {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool hideLoadingAnimation];
......@@ -47,9 +52,11 @@ typedef void(^isCanChange)(BOOL iCan);
} else {
[kUserDefaults setObject:common.data forKey:@"devPassSwitch"];
}
[self operationSections];
[self operationSectionsIs2_0System:YES];
});
}];
}
}
- (NSMutableArray *)sections1 {
......@@ -58,9 +65,10 @@ typedef void(^isCanChange)(BOOL iCan);
}
return _sections1;
}
- (void) operationSections {
- (void) operationSectionsIs2_0System:(BOOL) isVersion {
[self.sections1 removeAllObjects];
if (isVersion) {
if ([[kUserDefaults valueForKey:kAPP_IS_OPEN_JK] isEqualToString:@"yes"]) {
NSArray *group1=@[@"app登录密码",@"设备密码",@"更换手机账户",@"开启设备登录密码",@"开启系统自动扣费", @"推送接收开关"];
NSArray *imagegroup1=@[@"Passwordtwo.png",@"设备.png",@"app.png",@"set_bar_code",@"icon_mianmi",@"icon-push"];
......@@ -132,6 +140,72 @@ typedef void(^isCanChange)(BOOL iCan);
}
}
} else {
if ([[kUserDefaults valueForKey:kAPP_IS_OPEN_JK] isEqualToString:@"yes"]) {
NSArray *group1=@[@"app登录密码",@"设备密码",@"更换手机账户",@"开启设备登录密码",@"开启系统自动扣费", @"推送接收开关"];
NSArray *imagegroup1=@[@"Passwordtwo.png",@"设备.png",@"app.png",@"set_bar_code",@"icon_mianmi",@"icon-push"];
ZXUserSettingModel *m1 = [[ZXUserSettingModel alloc] init];
ZXUserSettingModel *m2 = [[ZXUserSettingModel alloc] init];
ZXUserSettingModel *m3 = [[ZXUserSettingModel alloc] init];
ZXUserSettingModel *m4 = [[ZXUserSettingModel alloc] init];
ZXUserSettingModel *m5 = [[ZXUserSettingModel alloc] init];
ZXUserSettingModel *m6 = [[ZXUserSettingModel alloc] init];
m1.imageName = imagegroup1[0];
m1.name = group1[0];
m2.imageName = imagegroup1[1];
m2.name = group1[1];
m3.imageName = imagegroup1[2];
m3.name = group1[2];
m4.imageName = imagegroup1[3];
m4.name = group1[3];
m4.isHasSwitch = YES;
m4.switchIsOn = [CacheDevPassSwitch integerValue];
m5.imageName = imagegroup1[4];
m5.name = group1[4];
m5.isHasSwitch = YES;
m5.switchIsOn = NO;
m6.imageName = imagegroup1[5];
m6.name = group1[5];
m6.isHasSwitch = YES;
m6.switchIsOn = [[kUserDefaults valueForKey:@"currentUserIsOpenJPush"] isEqualToString:@"yes"];;
m4.switchType = 1;
m5.switchType = 2;
m6.switchType = 3;
[self.sections1 addObjectsFromArray:@[m1,m3,m5,m6]];
[self loadIsOpenFreePay];
} else {
NSArray *group1=@[@"app登录密码",@"设备密码",@"更换手机账户",@"开启设备登录密码", @"推送接收开关"];
NSArray *imagegroup1=@[@"Passwordtwo.png",@"设备.png",@"app.png",@"set_bar_code",@"icon-push"];
ZXUserSettingModel *m1 = [[ZXUserSettingModel alloc] init];
ZXUserSettingModel *m2 = [[ZXUserSettingModel alloc] init];
ZXUserSettingModel *m3 = [[ZXUserSettingModel alloc] init];
ZXUserSettingModel *m4 = [[ZXUserSettingModel alloc] init];
ZXUserSettingModel *m5 = [[ZXUserSettingModel alloc] init];
m1.imageName = imagegroup1[0];
m1.name = group1[0];
m2.imageName = imagegroup1[1];
m2.name = group1[1];
m3.imageName = imagegroup1[2];
m3.name = group1[2];
m4.imageName = imagegroup1[3];
m4.name = group1[3];
m4.isHasSwitch = YES;
m4.switchIsOn = [CacheDevPassSwitch integerValue];
m4.switchType = 1;
m5.imageName = imagegroup1[4];
m5.name = group1[4];
m5.isHasSwitch = YES;
m5.switchIsOn = [[kUserDefaults valueForKey:@"currentUserIsOpenJPush"] isEqualToString:@"yes"];;
m5.switchType = 3;
[self.sections1 addObjectsFromArray:@[m1,m3,m5]];
}
}
if ([UserManager sharedUserManager].user.isWXAuthLogin) {
ZXUserSettingModel *mm = [[ZXUserSettingModel alloc] init];
mm.name = @"微信解绑";
......
ColorfulSchool/ColorfulSchool/Main(入口)/Controller/MyTabViewController.m
//
//
......@@ -75,7 +75,7 @@
[kUserDefaults setValue:@"no" forKey:kAPP_IS_OPEN_JK];//默认是no
[kUserDefaults setValue:@"no" forKey:kAPP_QB_SHOW];//默认是no
[kUserDefaults setValue:@"no" forKey:kAPP_SELP_ADVIEW_SHOW];//默认是no
[kUserDefaults setValue:@"no" forKey:kAPP_IS_OPENB_TASK];//默认是no
if (CacheToken==nil || ![CacheToken isKindOfClass:[NSString class]]) {
return;
}
......@@ -91,11 +91,14 @@
if ([responseObject[@"code"] integerValue] == 1000) {
NSArray *arr = responseObject[@"areaSwitchs"];
//type 1资讯 2商城 3支付配置 4免密开关 5小程序(app不需要) 10阿里妈妈 11百青藤
//type 1资讯 2商城 3支付配置 4免密开关 5小程序(app不需要) 10阿里妈妈 11百青藤 14任务
[self.switchs removeAllObjects];
for (NSDictionary *dic in arr) {
if ([dic[@"type"] isEqualToString:@"1"] || [dic[@"type"] isEqualToString:@"2"] || [dic[@"type"] isEqualToString:@"10"] || [dic[@"type"] isEqualToString:@"11"] || [dic[@"type"] isEqualToString:@"14"]) {
if ([dic[@"isEnabled"] integerValue] == 1) {
if ([dic[@"type"] isEqualToString:@"14"]) {
[kUserDefaults setObject:@"yes" forKey:kAPP_IS_OPENB_TASK];
}
[self.switchs addObject:dic];
}
}
......
ColorfulSchool/ColorfulSchool/images.xcassets/Task/task_home.imageset/Contents.json
......@@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "首次登录_获得奖券.png",
"filename" : "弹窗.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "首次登录_获得奖券@2x.png",
"filename" : "弹窗@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "首次登录_获得奖券@3x.png",
"filename" : "弹窗@3x.png",
"scale" : "3x"
}
],
......
ColorfulSchool/ColorfulSchool/images.xcassets/newHomePage/nav_renwu_nor.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"filename" : "nav_renwu_nor.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "nav_renwu_nor@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "nav_renwu_nor@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
ColorfulSchool/ColorfulSchool/images.xcassets/newHomePage/nav_renwu_sel.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"filename" : "nav_renwu_sel.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "nav_renwu_sel@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "nav_renwu_sel@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
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