Skip to content

C
colorfulSchoolReconsitution
Commit 80ef91a1 by 刘卓鑫
Options

提交新老系统分流接口代码

parent 65a068ef
Showing with 876 additions and 1199 deletions
ColorfulSchool/ColorfulSchool.xcodeproj/xcuserdata/liuzhuoxin.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,7 +7,7 @@
<key>ColorfulSchool.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>19</integer>
<integer>20</integer>
</dict>
</dict>
</dict>
......
ColorfulSchool/ColorfulSchool/AppDelegate+Extension.m
......@@ -84,8 +84,8 @@
[userDefaults setObject:@"http://192.168.1.33:8080" forKey:@"Ad"];
[userDefaults setObject:@"http://192.168.1.173:9091" forKey:@"BOOK"];
// [userDefaults setObject:@"http://ex-dev-dcxy-customer-app.168cad.top" forKey:@"NEW_PAY"];
[userDefaults setObject:@"http://192.168.1.33:8333" forKey:@"NEW_PAY"];
[userDefaults setObject:@"http://ex-dev-dcxy-customer-app.168cad.top" forKey:@"NEW_PAY"];
// [userDefaults setObject:@"http://192.168.1.145:8080" forKey:@"NEW_PAY"];
[userDefaults setObject:@"http://ex-dev-dcxy-base-app.168cad.top" forKey:@"SX_MONEY"]; //授信保证金
[userDefaults setValue:@"http://121.15.180.66:801/netpayment/BaseHttp.dll?MB_EUserPay" forKey:@"YWT_PAY"];
......
ColorfulSchool/ColorfulSchool/AppDelegate.m
......@@ -15,6 +15,7 @@
#import "ViewController.h"
#import "UIView+ABExtras.h"
#import "JDPAuthSDK.h"
#import <JJException/JJException.h>
#import "YWPrintViewController.h"
#import "XMGFileTool.h"
#import "LoginJump.h"
......@@ -59,11 +60,15 @@
_isPlaying = NO;
[self defaultConfig];
//启动环境
[self configSystemAPIByEnvironment:ZXColorfulSchoolEnvironmentDevelop];
[self configSystemAPIByEnvironment:ZXColorfulSchoolEnvironmentTest];
//极光推送
[self initPushWithOptions:launchOptions isProduct:kJPushIsProduct];
//网络监测
[self checkNetworkingStatus];
//防止crash
// [JJException configExceptionCategory:JJExceptionGuardAll];
// [JJException startGuardException];
//获取外网ip
[self deviceWANIPAdress];
//异常捕获
......@@ -72,6 +77,9 @@
[self createWindow];
//token登录
[self tokenLogin];
//创建开屏广告
//[[ZXTXAdTool sharedZXTXAdTool] createLauchAdByPlacmentId:kTXAdLauchPLACEMENTID];
return YES;
}
......@@ -86,7 +94,7 @@
if (CacheToken&&![CacheToken isEqualToString:@""])//如果登录了
{
[ZXTool loginSuccessJump:^(NSString *jump) {
if ([jump isEqualToString:@"NONE"]) {
//先读取缓存
......@@ -130,8 +138,7 @@
- (void)applicationDidEnterBackground:(UIApplication *)application {
if ([[ZXTool getCurrentVC] isKindOfClass:NSClassFromString(@"ZXSelfHelpViewController")] || [[ZXTool getCurrentVC] isKindOfClass:NSClassFromString(@"ZXDrinkViewController")]) {
CGFloat defaultBright = [[[NSUserDefaults standardUserDefaults] objectForKey:@"defaultBright"] floatValue];
[[UIScreen mainScreen] setBrightness:defaultBright];
[[NSNotificationCenter defaultCenter] postNotificationName:kSelf_help_destory_timer object:nil];
}
}
......@@ -140,22 +147,17 @@
- (void)applicationWillEnterForeground:(UIApplication *)application {
[kUserDefaults setObject:[ZXTool getCurrentTimeStamp] forKey:@"uploadBatch"];
if ([[ZXTool getCurrentVC] isKindOfClass:NSClassFromString(@"ZXSelfHelpViewController")] || [[ZXTool getCurrentVC] isKindOfClass:NSClassFromString(@"ZXDrinkViewController")]) {
[[NSNotificationCenter defaultCenter] postNotificationName:kSelf_help_start_timer object:nil];
}
//请求最新的是否需要曝光配置
[ZXTool requestIsNeedExposure];
}
- (void)applicationDidBecomeActive:(UIApplication *)application {
//请求最新的是否需要曝光配置
[ZXTool requestIsNeedExposure];
//创建开屏广告
[[ZXTXAdTool sharedZXTXAdTool] createLauchAdByPlacmentId:@"9090758636743260"];
[kUserDefaults setObject:[ZXTool getCurrentTimeStamp] forKey:@"uploadBatch"];
if ([[ZXTool getCurrentVC] isKindOfClass:NSClassFromString(@"ZXSelfHelpViewController")]) {
[kUserDefaults setObject:@([UIScreen mainScreen].brightness) forKey:@"defaultBright"];
[[UIScreen mainScreen] setBrightness:1];
if ([[ZXTool getCurrentVC] isKindOfClass:NSClassFromString(@"ZXSelfHelpViewController")] || [[ZXTool getCurrentVC] isKindOfClass:NSClassFromString(@"ZXDrinkViewController")]) {
[[NSNotificationCenter defaultCenter] postNotificationName:kSelf_help_start_timer object:nil];
}
}
......
ColorfulSchool/ColorfulSchool/Classes/11.20SimpleApp(极简版)/HomePage/ZXSimpleHomeController.m
//
//
......@@ -36,7 +36,6 @@
#import "JudgeFirstTopUpModel.h"
#import "AnnounceModel.h"
#import "AnnouceNoMentionModel.h"
#import "PerfectInformation.h"
#import <JPUSHService.h>
#import "UserCenterModel.h"
#import "AimiWalletViewController.h"
......@@ -65,10 +64,6 @@
*/
@property (nonatomic, assign) BOOL isComeFromPerfectInfo;
/**
完善个人信息界面
*/
@property (nonatomic, strong)PerfectInformation * infoView;
//强弹公告
@property (nonatomic, strong)ZXAnnouncementView * announce;
@property (nonatomic, strong)CampasVersionUpdateModel * updateModel;
......@@ -106,6 +101,7 @@ static NSInteger seq = 0;
[self setAlias];
//注册观察者
[self registNotificationAndKVO];
}
- (ZXUserModel *)user {
if (_user == nil) {
......@@ -155,7 +151,7 @@ static NSInteger seq = 0;
}
- (void) loadNewData {
[self oldVersion];
dispatch_async(dispatch_get_global_queue(0, 0), ^{
@weakify(self);
......@@ -328,15 +324,14 @@ static NSInteger seq = 0;
[UIApplication sharedApplication].statusBarHidden = NO; self.navigationController.navigationBar.hidden = YES;
self.navigationController.navigationBar.translucent = YES;
self.tabBarController.tabBar.hidden = NO;
[self oldVersion];
//查询一下最新的公告列表
[self loadIsHasNewAd];
//查询一下最新的回复
[self loadIsHasNewReplay];
[self refreshUserAccountInfo];
[self fetchFirstChargeConfig];
[ZXTool firstPageRefreshAddNotPayView:self.view];
}
#pragma mark - ========== 是否有新的公告 ==========
......@@ -409,13 +404,51 @@ static NSInteger seq = 0;
} onFinished:^(id responseObject, NSError *error) {
}];
}
#pragma mark - ========== 老版本部分内容 ==========
- (void) oldVersion {
dispatch_async(dispatch_get_global_queue(0, 0), ^{
if ([CacherechargeStatus isEqualToString:@"0"]) {
[self.firstTopupModel JudgeFirstTopUp];
- (void) fetchFirstChargeConfig {
[ZXTool checkCurrentUserModeCompleted:^(BOOL isOld) {
if (isOld) {
dispatch_async(dispatch_get_global_queue(0, 0), ^{
if ([CacherechargeStatus isEqualToString:@"0"]) {
[self.firstTopupModel JudgeFirstTopUp];
}
});
} else {
dispatch_async(dispatch_get_global_queue(0, 0), ^{
@weakify(self);
[XMCenter sendRequest:^(XMRequest *request) {
request.url = [[NSString stringWithFormat:@"%@/dcxy/api/paymentAndActiveConf/getFirstRechargeConfContent?areaId=%@", [kUserDefaults objectForKey:@"SX_MONEY"], CacheCampusId] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
request.httpMethod = kXMHTTPMethodGET;
request.headers = @{@"token": CacheToken,@"reqSource":@"app", @"Content-Type":@"application/json"};
} onSuccess:^(id responseObject) {
CommonModel *common = [CommonModel mj_objectWithKeyValues:responseObject];
@strongify(self);
if (common.code == 1000) {
[self showFirstRechargeAlertByMsg:common.data];
} else if (common.code == -2) {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool showText:common.msg];
[ZXTool backToLogin];
});
}
} onFailure:^(NSError *error) {
} onFinished:^(id responseObject, NSError *error) {
}];
});
}
}];
}
#pragma mark - ==========显示首充弹窗==========
- (void) showFirstRechargeAlertByMsg:(NSString *) msg {
dispatch_async(dispatch_get_main_queue(), ^{
firstTopupAlert=nil;
firstTopupAlert= [[UIAlertView alloc]initWithTitle:nil message:msg delegate:self cancelButtonTitle:@"去充值" otherButtonTitles:@"退出",nil];
[firstTopupAlert show];
self.isShow = YES;
});
}
#pragma mark 别名
......@@ -470,11 +503,7 @@ static NSInteger seq = 0;
dispatch_async(dispatch_get_main_queue(), ^{
if ([self.firstTopupModel.firstTopUpItem.forceType isEqualToString:@"1"] && self.isShow == NO) {
//1表示学校要求要首充，给予首充提示；
firstTopupAlert=nil;
firstTopupAlert= [[UIAlertView alloc]initWithTitle:nil message:self.firstTopupModel.firstTopUpItem.rechargeNotice delegate:self cancelButtonTitle:@"去充值" otherButtonTitles:@"退出",nil];
[firstTopupAlert show];
self.isShow = YES;
[self showFirstRechargeAlertByMsg:self.firstTopupModel.firstTopUpItem.rechargeNotice];
}
});
}
......@@ -528,41 +557,7 @@ static NSInteger seq = 0;
[[UIApplication sharedApplication]openURL:[NSURL URLWithString:url]];
}
//判断是否完善信息
-(void)judgePerfectInfoOrNot{
//当没得校区的时候就判定为个人信息没有完善
NSLog(@"====%@",CacheCampusId);
if ([CacheCampusId isEqualToString:@""] || [CacheCampusId isEqualToString:@"0"]){
_infoView = [[PerfectInformation alloc]initWithFrame:CGRectMake(0, 0, kWidth, kHeight)];
@weakify(self);
_infoView.saveSuccess=^{
@strongify(self);
AppDelegate * appDelegate=(AppDelegate *)[UIApplication sharedApplication].delegate;
[appDelegate tokenLogin];
[self.infoView removeFromSuperview];
self.isComeFromPerfectInfo=YES;
if ([CacherechargeStatus isEqualToString:@"0"]) {
//判断是否进行首充（解决当界面完善信息返回后没有判断首充的问题）
//再次获取个人信息将CacherechargeStatus进行缓存；
[self refreshUserInfo];
}
};
AppDelegate * app = (AppDelegate*)[UIApplication sharedApplication].delegate;
[app.window addSubview:_infoView];
}else{
//当用户信息完善后判断是否UpdateVersionForApp;
NSString * vertionStr=[NSString stringWithFormat:@"%@",APPversion];
NSLog(@"vertionStr:%@",vertionStr);
[self.updateModel CampasVersionUpdateWithCurrentVersion:vertionStr];
}
}
-(void)afterVersionJuge{
......@@ -669,6 +664,11 @@ static NSInteger seq = 0;
}];
[pop show];
}
- (void)newmoreAction:(ZXSections *)sec {
}
- (void) firstPageJumpActionWithInfo:(ZXInformation *) info {
if ([info.linkType isEqualToString:@"DEFAULT"]) {
NSString *jumpUrl = [NSString stringWithFormat:@"%@/Content/%ld?title=%@", [kUserDefaults valueForKey:@"h5FirstPage"], (long)info.id, info.suffix];
......@@ -681,7 +681,7 @@ static NSInteger seq = 0;
[self jumpNativeMenu:op];
} else if ([info.linkType isEqualToString:@"NONE"]) {
//什么都不处理
}else {
//直接使用jumpUrl跳转
[self jumpWebViewByInfo:info.jumpUrl];
......@@ -689,7 +689,7 @@ static NSInteger seq = 0;
}
#pragma mark - ========== 跳转外联 ==========
- (void) jumpWebViewByInfo:(NSString *) url {
if([url isEqualToString:@""] || [url isKindOfClass:[NSNull class]] || url == nil) {
return;
}
......@@ -703,11 +703,11 @@ static NSInteger seq = 0;
if ([version isEqualToString:@"1"]) {
//1.0
if ([operation.defaultValue isEqualToString:@"7"]) {
[ZXPreOrderModel clearTable];
ZXWashTabbarViewController *tabbarVC = [[ZXWashTabbarViewController alloc] init];
[self.navigationController pushViewController:tabbarVC animated:YES];
} else if ([operation.defaultValue isEqualToString:@"999"]) {
UIViewController *vc= [[NSClassFromString(@"ZXColorfulBookController") alloc] init];
[self.navigationController pushViewController:vc animated:YES];
......@@ -736,7 +736,7 @@ static NSInteger seq = 0;
} else {
//2.0
if ([operation.defaultValue isEqualToString:@"7"]) {
[ZXPreOrderModel clearTable];
ZXWashTabbarViewController *tabbarVC = [[ZXWashTabbarViewController alloc] init];
[self.navigationController pushViewController:tabbarVC animated:YES];
......@@ -756,7 +756,7 @@ static NSInteger seq = 0;
} else if ([operation.defaultValue isEqualToString:@"9"]) {
[self jumpDrinkByOperation:operation];
} else {
ZXSelfHelpViewController *vc = [[ZXSelfHelpViewController alloc] init];
vc.adUrl = [NSString stringWithFormat:@"%@/static/outlink.html", [kUserDefaults valueForKey:@"h5FirstPage"]];
vc.selfHelpTitle = operation.remark;
......@@ -820,7 +820,7 @@ static NSInteger seq = 0;
break;
}
case 2: {
ZXDrinkViewController *vc= [[ZXDrinkViewController alloc] init];
vc.model = model;
vc.defaltValue = @"09";
......
ColorfulSchool/ColorfulSchool/Classes/Config(配置)/Macros.h
//
//
......@@ -54,6 +54,13 @@ static NSString *kFailurMsg = @"数据加载失败,请检查一下当前网络
#define kSelf_help_destory_timer @"kSelf_help_destory_timer"
//自助服务页面 定时器开启 (app进入前台)
#define kSelf_help_start_timer @"kSelf_help_start_timer"
//app是否打开系统系扣显示开关
#define kAPP_IS_OPEN_JK @"isOpenFreePay"
//app新版本充值项和充值方式是否显示
#define kAPP_QB_SHOW @"AimiQianBaoIsShow"
/*首页的key和value--对应rootUrl*/
......
ColorfulSchool/ColorfulSchool/Classes/CustomViews(自定义)/ADTool/MulityAdCell.m
//
//
......@@ -55,7 +55,7 @@
_model.isRender = YES;
if ([_model.adSource isEqualToString:@"TXAD"]) {
if (self.nativeAd == nil) {
self.nativeAd = [[GDTNativeExpressAd alloc] initWithAppId:kTXAdAPPID placementId:kTXAdPLACEMENTID adSize:CGSizeMake(kScreenWidth, kScreenWidth * 0.56)];
self.nativeAd = [[GDTNativeExpressAd alloc] initWithAppId:kTXAdAPPID placementId:kTXAdNativePLACEMENTID adSize:CGSizeMake(kScreenWidth, kScreenWidth * 0.56)];
self.nativeAd.delegate = self;
}
[self.nativeAd loadAd:1];
......
ColorfulSchool/ColorfulSchool/Classes/CustomViews(自定义)/GraphicsCode.m
//
//
......@@ -41,6 +41,8 @@
}
return self;
}
/*
设置界面
*/
......@@ -128,22 +130,53 @@
}
#pragma mark - ========== 刷新图形验证码 ==========
- (void)refreshCode {
NSString *url = [NSString stringWithFormat:@"%@/common/getCode?loginName=%@&codeNum=4",[kUserDefaults valueForKey:@"SX_MONEY"], _phoneNum];
[ZXTool checkCurrentUserModeCompleted:^(BOOL isOld) {
if (isOld) {
[self oldRefreshCode];
} else {
NSString *url = [NSString stringWithFormat:@"%@/common/getCode?loginName=%@&codeNum=4",[kUserDefaults valueForKey:@"SX_MONEY"], _phoneNum];
@weakify(self);
[ZXTool requestDataWithType:kXMHTTPMethodPOST url:url para:nil completed:^(CommonModel *common, NSString *error) {
@strongify(self);
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool hideLoadingAnimation];
if (error) {
[ZXTool showText:error];
} else {
self.currentVioCode = common.data;
[self.graphCodeView refreshVerCodeByStr:common.data];
}
});
}];
}
}];
}
#pragma mark - ==========老版本刷新条码==========
- (void) oldRefreshCode {
NSString * url = [NSString stringWithFormat:@"%@/dcxy/app/homepage/campus/getDynamicCode?account=%@",[kUserDefaults valueForKey:@"h5FirstPageAPI"],_phoneNum];
@weakify(self);
[ZXTool requestDataWithType:kXMHTTPMethodPOST url:url para:nil completed:^(CommonModel *common, NSString *error) {
[XMCenter sendRequest:^(XMRequest *request) {
request.url = url;
request.httpMethod = kXMHTTPMethodGET;
request.headers = @{@"reqSource":@"app", @"Content-Type":@"application/json"};
} onSuccess:^(id responseObject) {
@strongify(self);
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool hideLoadingAnimation];
if (error) {
[ZXTool showText:error];
} else {
self.currentVioCode = common.data;
[self.graphCodeView refreshVerCodeByStr:common.data];
}
});
CommonModel *common = [CommonModel mj_objectWithKeyValues:responseObject];
NSString *s = common.data;
if(s== nil || s.length == 0) {
[ZXTool showText:common.msg];
} else {
[self.graphCodeView refreshVerCodeByStr:s];
}
} onFailure:^(NSError *error) {
[ZXTool showText:error.userInfo[@"NSLocalizedDescription"]];
} onFinished:^(id responseObject, NSError *error) {
}];
}
/*
确定按钮
*/
......
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/ForgetPassword/Controller/forgetPasswordViewController.m
//
//
......@@ -28,7 +28,6 @@
@property (strong, nonatomic) IBOutlet UITextField *passwordFeild2;
@property (strong, nonatomic) IBOutlet UIButton *showBtn2;
@property (strong, nonatomic) FetchCheckCodeModel *fetchCheckCodeModel;
@property (strong, nonatomic) forgetPasswordModel * forgetPwdModel;
@end
......@@ -39,66 +38,42 @@
-(void)registNotificationAndKVO{
[_fetchCheckCodeModel addObserver:self forKeyPath:@"isLoaded" options:NSKeyValueObservingOptionNew context:nil];
[_fetchCheckCodeModel addObserver:self forKeyPath:@"error" options:NSKeyValueObservingOptionNew context:nil];
[_forgetPwdModel addObserver:self forKeyPath:@"isLoaded" options:NSKeyValueObservingOptionNew context:nil];
[_forgetPwdModel addObserver:self forKeyPath:@"error" options:NSKeyValueObservingOptionNew context:nil];
}
-(void)removeNotificationAndKVO{
[_fetchCheckCodeModel removeObserver:self forKeyPath:@"isLoaded"];
[_fetchCheckCodeModel removeObserver:self forKeyPath:@"error"];
[_forgetPwdModel removeObserver:self forKeyPath:@"isLoaded"];
[_forgetPwdModel removeObserver:self forKeyPath:@"error"];
//
}
-(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
if (object==_forgetPwdModel) {
if ([keyPath isEqualToString:@"isLoaded"]) {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool showText:@"找回密码成功"];
[ZXTool backToLogin];
});
}
}
}
//-(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
// if (object == _fetchCheckCodeModel) {
// if ([keyPath isEqualToString:@"isLoaded"]) {
//
//
//// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
//// [timer invalidate];
//// timer = nil;
//// });
//
//
// }
// else{
//
//
// }
// }
// if (object==_forgetPwdModel) {
// if ([keyPath isEqualToString:@"isLoaded"]) {
//
// LoginView * VC=[LoginView new];
// [self.navigationController pushViewController:VC animated:YES];
// }
// else{
//
//
// }
//
// }
//
//}
- (void)viewDidLoad {
[super viewDidLoad];
[self.scrollerView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.equalTo(self.view);
make.top.equalTo(self.view.mas_top).offset(kTopHeight);
}];
self.title = @"找回App登录密码";
self.fetchCheckCodeModel=[FetchCheckCodeModel new];
self.forgetPwdModel=[forgetPasswordModel new];
[self registNotificationAndKVO];
self.phoneNumTextFeild.delegate=self;
self.passwordFeild.delegate=self;
self.passwordFeild2.delegate=self;
......@@ -108,12 +83,12 @@
-(void)viewWillAppear:(BOOL)animated{
[super viewWillAppear:animated];
[[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:NO];
// self.navigationController.navigationBar.translucent = NO;
// self.navigationController.navigationBar.translucent = NO;
self.navigationController.navigationBar.hidden = NO;
}
- (void)viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
// self.navigationController.navigationBar.translucent = YES;
// self.navigationController.navigationBar.translucent = YES;
if (self.backBlock) {
self.backBlock();
}
......@@ -139,8 +114,8 @@
[weakSelf initTimer];
};
[codeView show:self];
}
-(void) initTimer {
if (timer==nil) {
......@@ -148,9 +123,9 @@
//当计时器开始计时时按钮点击是无效的；
self.fetchCodeBtn.userInteractionEnabled=NO;
[self.fetchCodeBtn setTitle:@"(60)重新获取" forState:UIControlStateNormal];
timer = [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(changTimeShow) userInfo:nil repeats:YES];
}
}
#pragma mark 计时器调用事件；
......@@ -213,26 +188,36 @@
return;
}
if (![self.passwordFeild.text isEqualToString:self.passwordFeild2.text])
{
[SVProgressHUD showErrorWithStatus:@"两次输入的密码不一致哦！"];
return;
}
//找回密码
// [self.forgetPwdModel forgetPasswordWithPhoneNum:_phoneNumTextFeild.text NewPwd:_passwordFeild.text checkCode:_checkCodeField.text];
[ZXTool requestDataWithType:kXMHTTPMethodPOST url:[NSString stringWithFormat:@"%@/app/customer/forget/pwd", [kUserDefaults valueForKey:@"NEW_PAY"]] para:@{@"loginAccount": _phoneNumTextFeild.text,@"password": _passwordFeild.text,
@"verification": _checkCodeField.text} completed:^(CommonModel *common, NSString *error) {
@weakify(self);
[ZXTool checkCurrentUserIsOldCustomerByPhone:_phoneNumTextFeild.text completed:^(BOOL isOld) {
@strongify(self);
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool hideLoadingAnimation];
if (error) {
[ZXTool showText:error];
if (isOld) {
[self.forgetPwdModel forgetPasswordWithPhoneNum:_phoneNumTextFeild.text NewPwd:_passwordFeild.text checkCode:_checkCodeField.text];
} else {
[ZXTool showText:@"找回密码成功"];
[ZXTool backToLogin];
//调用新街口
[ZXTool requestDataWithType:kXMHTTPMethodPOST url:[NSString stringWithFormat:@"%@/app/customer/forget/pwd", [kUserDefaults valueForKey:@"NEW_PAY"]] para:@{@"loginAccount": _phoneNumTextFeild.text,@"password": _passwordFeild.text,
@"verification": _checkCodeField.text} completed:^(CommonModel *common, NSString *error) {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool hideLoadingAnimation];
if (error) {
[ZXTool showText:error];
} else {
[ZXTool showText:@"找回密码成功"];
[ZXTool backToLogin];
}
});
}];
}
});
}];
......@@ -240,7 +225,7 @@
-(void)showBtnFucWithShowBtn:(UIButton*)btn textField:(UITextField *)textfeild {
textfeild.secureTextEntry = !textfeild.secureTextEntry;
if (textfeild.secureTextEntry)
{
[btn setImage:[UIImage imageNamed:@"Not-showtwo.png"] forState:UIControlStateNormal];
......@@ -280,17 +265,17 @@
return YES;
}
}
return YES;
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Login/Controller/LoginView.m
//
//
......@@ -9,7 +9,6 @@
#import "LoginView.h"
#import "LoginModel.h"
#import "MyTabViewController.h"
#import "RegisterViewController.h"
#import "forgetPasswordViewController.h"
#import "ZXSimpleRootTabbarController.h"
#import "LoginJump.h"
......@@ -22,8 +21,32 @@
@implementation LoginView
- (void)dealloc{
[self removeNotificationAndKVO];
}
-(void)removeNotificationAndKVO{
[self.loginModel removeObserver:self forKeyPath:@"isLoaded"];
[self.loginModel removeObserver:self forKeyPath:@"error"];
}
-(void)registNotificationAndKVO{
[self.loginModel addObserver:self forKeyPath:@"isLoaded" options:NSKeyValueObservingOptionNew context:nil];
[self.loginModel addObserver:self forKeyPath:@"error" options:NSKeyValueObservingOptionNew context:nil];
}
-(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
if (object == self.loginModel) {
if ([keyPath isEqualToString:@"isLoaded"]) {
[self loginSuccess];
}
else{
}
}
}
- (void)viewDidLoad {
[super viewDidLoad];
[self setViews];
......@@ -34,7 +57,7 @@
// self.passWorldTF.text = CachePassWord;
self.userTF.delegate=self;
self.passWorldTF.delegate=self;
// Do any additional setup after loading the view from its nib.
[self registNotificationAndKVO];
}
-(void)viewWillAppear:(BOOL)animated{
[super viewWillAppear:animated];
......@@ -108,8 +131,23 @@
return;
}
[[UIApplication sharedApplication].keyWindow endEditing:YES];
[SVProgressHUD showWithStatus:@" 正在登录 ,请稍后 "];
[self startLoginByAccount:self.userTF.text password:self.passWorldTF.text];
@weakify(self);
[ZXTool checkCurrentUserIsOldCustomerByPhone:self.userTF.text completed:^(BOOL isOld) {
@strongify(self);
dispatch_async(dispatch_get_main_queue(), ^{
if (isOld) {
[self.loginModel loginWithPhoneNum:self.userTF.text password:self.passWorldTF.text];
} else {
//调用新街口登录
[self startLoginByAccount:self.userTF.text password:self.passWorldTF.text];
}
});
}];
}
- (void) startLoginByAccount:(NSString *) accoun password:(NSString *) password {
NSString *token = [kUserDefaults valueForKey:@"token"];
......@@ -132,29 +170,7 @@
[user save];
[self saveUserInfo:user];
[ZXTool requestIsNeedExposure];//请求书否需要曝光
[ZXTool loginSuccessJump:^(NSString *jump) {
[SVProgressHUD dismiss];
if ([jump isEqualToString:@"NONE"]) {
//先读取缓存
NSArray *list = [LoginJump findAll];
if (list.count == 0) {
jump = @"DC_01";
} else {
LoginJump *m = list.lastObject;
jump = m.modelCode;
}
}
if ([jump isEqualToString:@"DC_02"]) {
//跳转简单版
ZXSimpleRootTabbarController *simpleRoot = [[ZXSimpleRootTabbarController alloc] init];
[UIApplication sharedApplication].keyWindow.rootViewController = simpleRoot;
} else {
//跳转复杂版
MyTabViewController * tabRoot = [[MyTabViewController alloc]init];
[UIApplication sharedApplication].keyWindow.rootViewController = tabRoot;
}
}];
[self loginSuccess];
} else {
dispatch_async(dispatch_get_main_queue(), ^{
[SVProgressHUD dismiss];
......@@ -171,6 +187,32 @@
}];
});
}
#pragma mark - ==========登录成功action==========
- (void) loginSuccess {
[ZXTool loginSuccessJump:^(NSString *jump) {
[SVProgressHUD dismiss];
if ([jump isEqualToString:@"NONE"]) {
//先读取缓存
NSArray *list = [LoginJump findAll];
if (list.count == 0) {
jump = @"DC_01";
} else {
LoginJump *m = list.lastObject;
jump = m.modelCode;
}
}
if ([jump isEqualToString:@"DC_02"]) {
//跳转简单版
ZXSimpleRootTabbarController *simpleRoot = [[ZXSimpleRootTabbarController alloc] init];
[UIApplication sharedApplication].keyWindow.rootViewController = simpleRoot;
} else {
//跳转复杂版
MyTabViewController * tabRoot = [[MyTabViewController alloc]init];
[UIApplication sharedApplication].keyWindow.rootViewController = tabRoot;
}
}];
}
- (void) saveUserInfo:(ZXUserModel *) user {
[[LoginModel new] removeCache];
NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
......
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Login/Modle/LoginModel.m
//
//
......@@ -92,7 +92,10 @@
if ([kUserDefaults objectForKey:@"token"]) {
[kUserDefaults removeObjectForKey:@"token"];
}
[kUserDefaults removeObjectForKey:@"isOpenFreePay"];
if ([kUserDefaults objectForKey:@"campusId"]) {
[kUserDefaults removeObjectForKey:@"campusId"];
}
[kUserDefaults removeObjectForKey:kAPP_IS_OPEN_JK];
[kUserDefaults removeObjectForKey:@"currentUserIsOpenJPush"];
[XMGFileTool removeDirectoryPath:CachePath];
[LoginJump clearTable];
......
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Register/Controller/ZXChooseSchoolViewController.h 0 → 100644
//
//
// ZXChooseSchoolViewController.h
// ColorfulSchool
//
// Created by liuZX on 2018/7/25.
// Copyright © 2018年 Colorful Any Door. All rights reserved.
//
#import <UIKit/UIKit.h>
#import "ZXNewSchool.h"
typedef void(^selectSchool)(ZXNewCampus *campus);
@interface ZXChooseSchoolViewController : UIViewController
@property (nonatomic, copy) selectSchool select;
- (instancetype) initWithSchoolName:(selectSchool) selectSchool;
@end
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Register/Controller/RegisterViewController.h → ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Register/Controller/ZXRegistorViewController.h
//
//
//
// RegisterViewController.h
// ZXRegistorViewController.h
// ColorfulSchool
//
// Created by Listen on 2017/8/9.
// Copyright © 2017年 Colorful Any Door. All rights reserved.
// Created by liuZX on 2018/7/25.
// Copyright © 2018年 Colorful Any Door. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface RegisterViewController : UIViewController
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *contentHeight;
@property (weak, nonatomic) IBOutlet UIScrollView *scrollerView;
@interface ZXRegistorViewController : UIViewController
@end
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/AboutUs/Controller/AboutUs.m
//
//
......@@ -9,7 +9,6 @@
#import "AboutUs.h"
#import <WebKit/WebKit.h>
#import "AboutUsModel.h"
#import "ServerViewController.h"
#import "enlargeClickRegionBtn.h"
@interface AboutUs ()<WKNavigationDelegate,WKUIDelegate,UIGestureRecognizerDelegate>
@property (nonatomic,strong) WKWebView* webView;
......@@ -140,16 +139,7 @@
[UIApplication sharedApplication].statusBarStyle = 0;
}
}
-(void)tap{
// self.tapCount++;
// if (_tapCount==5) {
//
// _tapCount=0;
// ServerViewController * server=[ServerViewController new];
// [self.navigationController pushViewController:server animated:YES];
//
// }
}
-(void)viewWillAppear:(BOOL)animated{
[super viewWillAppear:animated];
if (self.isFromSimple) {
......@@ -179,16 +169,7 @@
backgroundColor:[UIColor clearColor] font:[UIFont boldSystemFontOfSize:MC_NAVBAR_TITLE_FONT_SIZE] textColor:[UIColor colorWithHexString:@"#f3f3f3"] textAlignment:NSTextAlignmentCenter lineBreakMode:NSLineBreakByWordWrapping];
self.navigationItem.titleView = titleLabel;
UIButton * backBtn1 = [UIButton buttonWithType:UIButtonTypeCustom];
backBtn1.frame = CGRectMake(0, 0, 100, 40);
backBtn1.backgroundColor = [UIColor clearColor];
[backBtn1 setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[backBtn1 setImage:[UIImage imageNamed:@""] forState:UIControlStateNormal];
[backBtn1 addTarget:self action:@selector(tap) forControlEvents:UIControlEventTouchUpInside];
UIBarButtonItem *item1 = [[UIBarButtonItem alloc] initWithCustomView:backBtn1];
[self.navigationItem setRightBarButtonItems:[NSArray arrayWithObjects:item1, nil]];
}
/*
......
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/AboutUs/Controller/ServerViewController.h deleted 100644 → 0
//
++ /dev/null
//
// ServerViewController.h
// ColorfulSchool
//
// Created by rym on 2017/11/14.
// Copyright © 2017年 Colorful Any Door. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface ServerViewController : UIViewController
@property (weak, nonatomic) IBOutlet UITextView *schoolIp;
@property (weak, nonatomic) IBOutlet UITextView *squreIp;
@property (weak, nonatomic) IBOutlet UITextView *weiXinIp;
@property (weak, nonatomic) IBOutlet UITextView *zfbIp;
@property (weak, nonatomic) IBOutlet UITextView *imageIp;
@property (weak, nonatomic) IBOutlet UITextView *htmlIP;
@property (weak, nonatomic) IBOutlet UITextField *duocaiTF;
@property (weak, nonatomic) IBOutlet UITextField *gzTF;
@end
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/AboutUs/Controller/ServerViewController.m deleted 100644 → 0
//
++ /dev/null
//
// ServerViewController.m
// ColorfulSchool
//
// Created by rym on 2017/11/14.
// Copyright © 2017年 Colorful Any Door. All rights reserved.
//
#import "ServerViewController.h"
@interface ServerViewController ()<UITextFieldDelegate>
@end
@implementation ServerViewController
- (void)viewDidLoad {
[super viewDidLoad];
self.duocaiTF.delegate=self;
self.gzTF.delegate=self;
self.schoolIp.text=requestUrlStr;
self.weiXinIp.text=requestWeiXinUrlStr;
self.zfbIp.text=requestAliUrlStr;
self.squreIp.text=SqurerequestUrlStr;
self.imageIp.text=SqureImageUploadUrlStr;
self.htmlIP.text=squreIP;
// Do any additional setup after loading the view from its nib.
}
- (IBAction)btnClick:(id)sender {
NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
//校园
if (self.schoolIp.text!=nil&&self.schoolIp.text.length>0) {
[userDefaults setObject:self.schoolIp.text forKey:@"schoolIp"];
}
if (self.weiXinIp.text!=nil&&self.weiXinIp.text.length>0) {
[userDefaults setObject:self.weiXinIp.text forKey:@"weiXin"];
}
if (self.zfbIp.text!=nil&&self.zfbIp.text.length>0) {
[userDefaults setObject:self.zfbIp.text forKey:@"Ali"];
}
//格子
if (self.squreIp.text!=nil&&self.squreIp.text.length>0) {
[userDefaults setObject:self.squreIp.text forKey:@"squreIp"];
}
if (self.imageIp.text!=nil&&self.imageIp.text.length>0) {
[userDefaults setObject:self.imageIp.text forKey:@"imageUpload"];
}
if (self.htmlIP.text!=nil&&self.htmlIP.text.length>0) {
[userDefaults setObject:self.htmlIP.text forKey:@"Html5"];
}
[userDefaults synchronize];
}
-(void)textFieldDidEndEditing:(UITextField *)textField{
if (textField==_duocaiTF) {
NSString *school=[self.schoolIp.text substringFromIndex:7];
NSString * school1=[[school componentsSeparatedByString:@"/"] firstObject];
NSMutableString * school2=[[NSMutableString alloc]initWithString:self.schoolIp.text];
[school2 replaceCharactersInRange:NSMakeRange(7, school1.length) withString:_duocaiTF.text];
NSLog(@"school2%@",school2);
NSString *weiXin=[self.weiXinIp.text substringFromIndex:7];
NSString *weiXin1=[[weiXin componentsSeparatedByString:@"/"] firstObject];
NSMutableString * weiXin2=[[NSMutableString alloc]initWithString:self.weiXinIp.text];
[weiXin2 replaceCharactersInRange:NSMakeRange(7, weiXin1.length) withString:_duocaiTF.text];
NSLog(@"weiXin2%@",weiXin2);
NSString *zfbIp=[self.zfbIp.text substringFromIndex:7];
NSString *zfbIp1=[[zfbIp componentsSeparatedByString:@"/"] firstObject];
NSMutableString * zfbIp2=[[NSMutableString alloc]initWithString:self.zfbIp.text];
[zfbIp2 replaceCharactersInRange:NSMakeRange(7, zfbIp1.length) withString:_duocaiTF.text];
NSLog(@"zfbIp2%@",zfbIp2);
self.schoolIp.text=school2;
self.weiXinIp.text=weiXin2;
self.zfbIp.text=zfbIp2;
}
else if (textField==_gzTF){
// self.schoolIp.text=requestUrlStr;
// self.weiXinIp.text=requestWeiXinUrlStr;
// self.zfbIp.text=requestAliUrlStr;
// self.squreIp.text=SqurerequestUrlStr;
// self.imageIp.text=SqureImageUploadUrlStr;
// self.htmlIP.text=squreIP;
NSString *squreIp=[self.squreIp.text substringFromIndex:7];
NSString *squreIp1=[[squreIp componentsSeparatedByString:@"/"] firstObject];
NSMutableString * squreIp2=[[NSMutableString alloc]initWithString:self.squreIp.text];
[squreIp2 replaceCharactersInRange:NSMakeRange(7, squreIp1.length) withString:_gzTF.text];
NSLog(@"weiXin2%@",squreIp2);
NSString *imageIp=[self.imageIp.text substringFromIndex:7];
NSString *imageIp1=[[imageIp componentsSeparatedByString:@"/"] firstObject];
NSMutableString * imageIp2=[[NSMutableString alloc]initWithString:self.imageIp.text];
[imageIp2 replaceCharactersInRange:NSMakeRange(7, imageIp1.length) withString:_gzTF.text];
NSLog(@"zfbIp2%@",imageIp2);
NSString *htmlIP=[self.htmlIP.text substringFromIndex:7];
NSMutableString * htmlIP2=[[NSMutableString alloc]initWithString:self.htmlIP.text];
[htmlIP2 replaceCharactersInRange:NSMakeRange(7, htmlIP.length) withString:_gzTF.text];
NSLog(@"zfbIp2%@",htmlIP2);
self.squreIp.text=squreIp2;
self.imageIp.text=imageIp2;
self.htmlIP.text=htmlIP2;
}
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/AimiWallet/Controller/AimiWalletViewController.m
//
//
......@@ -50,7 +50,7 @@ static NSString * const ID = @"CollectionCell";
@property (nonatomic)FetchAccoutDataModel * accountDataModel;
@property (nonatomic)FetchWalletTopUpDataModel * topUpDataModel;
@property (nonatomic)PayModel * payModel;
@property (nonatomic, assign) BOOL isNeedOld;//是否需要调x老版本接口获取账户信息
/**
正常充
......@@ -90,8 +90,9 @@ static NSString * const ID = @"CollectionCell";
-(void)registNotificationAndKVO {
[self.accountDataModel addObserver:self forKeyPath:@"isLoaded" options:NSKeyValueObservingOptionNew context:nil];
[self.accountDataModel addObserver:self forKeyPath:@"error" options:NSKeyValueObservingOptionNew context:nil];
[self.payModel addObserver:self forKeyPath:@"isLoaded" options:NSKeyValueObservingOptionNew context:nil];
[self.payModel addObserver:self forKeyPath:@"error" options:NSKeyValueObservingOptionNew context:nil];
[self.topUpDataModel addObserver:self forKeyPath:@"isLoaded" options:NSKeyValueObservingOptionNew context:nil];
[self.topUpDataModel addObserver:self forKeyPath:@"error" options:NSKeyValueObservingOptionNew context:nil];
}
......@@ -99,41 +100,117 @@ static NSString * const ID = @"CollectionCell";
[self.accountDataModel removeObserver:self forKeyPath:@"isLoaded"];
[self.accountDataModel removeObserver:self forKeyPath:@"error"];
[self.payModel removeObserver:self forKeyPath:@"isLoaded"];
[self.payModel removeObserver:self forKeyPath:@"error"];
[self.topUpDataModel removeObserver:self forKeyPath:@"isLoaded"];
[self.topUpDataModel removeObserver:self forKeyPath:@"error"];
}
-(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
if (object == self.accountDataModel) {
if ([keyPath isEqualToString:@"isLoaded"]) {
[self.moneyArray removeAllObjects];
[self oldSettingPayType:self.accountDataModel.accountDataModelItem.attached];
for (servicePeasListItem *item in self.accountDataModel.accountDataModelItem.servicePeasList) {
item.money = [item.peasNumber floatValue];
[self.moneyArray addObject:item];
}
[beanCollectionView reloadData];
self.moneyLabel.text=self.accountDataModel.accountDataModelItem.aimiMoney;
self.aimiLabel.text = @"我的艾米币";
} else { }
}
if (object == self.payModel) {
}
} else if (object == self.topUpDataModel) {
if ([keyPath isEqualToString:@"isLoaded"]) {
[SVProgressHUD dismiss];
if (self.topUpDataModel.ListArray==nil || self.topUpDataModel.ListArray.count==0) {
/*是否已经首冲**/
self.comeFrom = @"firstTopUp";
[self.rechargeList removeAllObjects];
for (int i = 0; i < self.topUpDataModel.FirstListArray.count; i++) {
TopUpDataItem *old_item = self.topUpDataModel.FirstListArray[i];
ZX_recharge_item *item = [[ZX_recharge_item alloc] init];
item.rechargeMoney = old_item.rechargeVal;
item.id = old_item.rechargeId;
item.giveId = old_item.serviceId;
item.giveName = old_item.giveName;
item.giveMoney = old_item.giveVal;
item.isSelect = NO;
if (i == 0) {
item.isSelect = YES;
self.selectTopUpItem = item;
}
[self.rechargeList addObject:item];
}
dispatch_async(dispatch_get_main_queue(), ^{
if (self.rechargeList.count && self.dataArray.count) {
[self createFooter];
}
[self.tableView reloadData];
});
} else {
[SVProgressHUD dismiss];
confirmBtn.enabled = YES;
} else {
self.comeFrom = @"";
[self.rechargeList removeAllObjects];
for (int i = 0; i < self.topUpDataModel.ListArray.count; i++) {
TopUpDataItem *old_item = self.topUpDataModel.ListArray[i];
ZX_recharge_item *item = [[ZX_recharge_item alloc] init];
item.rechargeMoney = old_item.rechargeVal;
item.id = old_item.rechargeId;
item.giveId = old_item.serviceId;
item.giveName = old_item.giveName;
item.giveMoney = old_item.giveVal;
item.isSelect = NO;
if (i == 0) {
item.isSelect = YES;
self.selectTopUpItem = item;
}
[self.rechargeList addObject:item];
}
dispatch_async(dispatch_get_main_queue(), ^{
if (self.rechargeList.count) {
[self createFooter];
}
[self.tableView reloadData];
});
}
}
}
}
#pragma mark - ==========老版本支付方式==========
- (void) oldSettingPayType:(JDPayItem *) item {
[self.dataArray removeAllObjects];
if (item.supportWxPay==1) {
ZXPayTypeModel *m = [[ZXPayTypeModel alloc] init];
m.icon = @"weixin";
m.topic = @"微信充值";
m.payType = @"2";
[self.dataArray addObject:m];
} else if (item.supportAliPay==1) {
ZXPayTypeModel *m = [[ZXPayTypeModel alloc] init];
m.icon = @"zhifubao";
m.topic = @"支付宝充值";
m.payType = @"3";
[self.dataArray addObject:m];
} else if (item.supportJdPay==1) {
ZXPayTypeModel *m = [[ZXPayTypeModel alloc] init];
m.icon = @"JD";
m.topic = @"京东充值";
m.payType = @"4";
[self.dataArray addObject:m];
}
ZXPayTypeModel *m = self.dataArray.firstObject;
m.isSelect = YES;
self.payTypeStr = m.payType;
dispatch_async(dispatch_get_main_queue(), ^{
[self.tableView reloadData];
});
}
- (void)viewDidLoad {
[super viewDidLoad];
self.accountDataModel=[FetchAccoutDataModel new];
self.payModel=[PayModel new];
self.topUpDataModel= [FetchWalletTopUpDataModel new];
[self registNotificationAndKVO];
self.isNeedOld = YES;
[ZXTool requestDataWithType:kXMHTTPMethodGET url:[NSString stringWithFormat:@"%@/dcxy/api/operationModeConf?areaId=%@", [kUserDefaults objectForKey:@"SX_MONEY"], CacheCampusId] para:nil completed:^(CommonModel *common, NSString *error) {
......@@ -159,7 +236,7 @@ static NSString * const ID = @"CollectionCell";
}
});
}];
[self.topUpDataModel fetchTopUpeData];
self.tableView.delegate=self;
self.tableView.dataSource=self;
self.tableView.tableFooterView=[UIView new];
......@@ -172,8 +249,7 @@ static NSString * const ID = @"CollectionCell";
[self creatBeanCollectionView];
/*获取最新的充值祥和充值方式*/
[self zx_new_get_recharge_info];
}
- (void) getSXBZJ {
//获取授信-保证金
......@@ -227,8 +303,13 @@ static NSString * const ID = @"CollectionCell";
-(void)FetchAccountDataFromSerVer:(BOOL) isOld {
if (isOld) {
///老版本获取支付方式 账户信息 充值项
[self.accountDataModel fetchAcountData];
[self.topUpDataModel fetchTopUpeData];
} else {
/*获取最新的充值祥和充值方式*/
[self zx_new_get_recharge_info];
//获取账户信息
[ZXTool requestDataWithType:kXMHTTPMethodPOST url:[NSString stringWithFormat:@"%@/customerAccount/queryAccount", [kUserDefaults objectForKey:@"NEW_PAY"]] para:@{@"areaId":CacheCampusId, @"customerPhone":CacheAccount, @"id":CacheUserId} completed:^(CommonModel *common, NSString *error) {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool hideLoadingAnimation];
......@@ -457,10 +538,12 @@ heightForFooterInSection:(NSInteger)section {
}
#pragma mark - ========== 重构部分内容 ==========
#pragma mark - ========== 重构部分内容 新版本对应内容入口 ==========
/*获取最新的充值项和充值方式*/
- (void) zx_new_get_recharge_info {
if (![[kUserDefaults objectForKey:kAPP_QB_SHOW] isEqualToString:@"yes"]) {
return;
}
[ZXTool requestDataWithType:kXMHTTPMethodGET url:[NSString stringWithFormat:@"%@/dcxy/api/paymentAndActiveConf/getRechargeConf?areaId=%@&customerId=%@", [kUserDefaults valueForKey:@"SX_MONEY"], [kUserDefaults valueForKey:@"campusId"], CacheUserId] para:nil completed:^(CommonModel *common, NSString *error) {
if (error) {
......
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/FeedBack/Controller/FeedBackView.m
//
//
......@@ -136,18 +136,64 @@
confirmBtn.enabled=YES;
return;
}
[ZXTool requestDataWithType:kXMHTTPMethodPOST url:[NSString stringWithFormat:@"%@/dcxy/customerFeedback/customerFeedback", [kUserDefaults valueForKey:@"NEW_PAY"]] para:@{@"customerId":CacheUserId,@"content":contentEnter.text} completed:^(CommonModel *common, NSString *error) {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool hideLoadingAnimation];
if (error) {
[SVProgressHUD showSuccessWithStatus:@" 反馈成功 "];
[self performSelector:@selector(delayMethod) withObject:nil afterDelay:1.0f];
}else{
[SVProgressHUD showErrorWithStatus:@"反馈失败"];
confirmBtn.enabled=YES;
[ZXTool checkCurrentUserModeCompleted:^(BOOL isOld) {
if (isOld) {
NSDictionary * dataDic = [[NSDictionary alloc]initWithObjectsAndKeys:CacheAccount,@"account",CacheUserId,@"userId",CacheCampusId,@"campusId",contentEnter.text,@"content",nil];
NSString * json=[self dictionaryToJson:dataDic];
NSString * postStr = [NSString stringWithFormat:@"%@%@%@",@"dc2017",@"MT_MOB_00037",json];
NSString * md5Str = [self md5:postStr];
NSString * dicstr=[BYHelp DataTOjsonString:dataDic];
NSString * token=CacheToken;
if (token==nil) {
token=@"";
}
});
NSDictionary * parametersDic = [[NSDictionary alloc]initWithObjectsAndKeys:@"MT_MOB_00037",@"sid",reqSource,@"reqSource",md5Str,@"key",token,@"token",dicstr,@"data",nil];
NSString * urlStr = [NSString stringWithFormat:@"%@",requestUrlStr];
NSLog(@"完善信息上传的是：%@",parametersDic);
[GetData request:urlStr type:@"POST" timer:10 parameters:parametersDic success:^(AFHTTPRequestOperation *operation, id responseObject)
{
NSString * code = [NSString stringWithFormat:@"%@",[responseObject objectForKey:@"code"]];
if ([code isEqualToString:@"0"])
{
[SVProgressHUD showSuccessWithStatus:@" 反馈成功 "];
[self performSelector:@selector(delayMethod) withObject:nil afterDelay:1.0f];
}
else
{
[SVProgressHUD showErrorWithStatus:@"反馈失败"];
confirmBtn.enabled=YES;
}
} failure:^(AFHTTPRequestOperation *operation, NSError *error)
{
confirmBtn.userInteractionEnabled = YES;
[SVProgressHUD showErrorWithStatus:@" 网络错误 "];
NSLog(@"输出接口错误：%@",error);
confirmBtn.enabled=YES;
}];
} else {
[ZXTool requestDataWithType:kXMHTTPMethodPOST url:[NSString stringWithFormat:@"%@/dcxy/customerFeedback/customerFeedback", [kUserDefaults valueForKey:@"NEW_PAY"]] para:@{@"customerId":CacheUserId,@"content":contentEnter.text} completed:^(CommonModel *common, NSString *error) {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool hideLoadingAnimation];
if (error) {
[SVProgressHUD showSuccessWithStatus:@" 反馈成功 "];
[self performSelector:@selector(delayMethod) withObject:nil afterDelay:1.0f];
}else{
[SVProgressHUD showErrorWithStatus:@"反馈失败"];
confirmBtn.enabled=YES;
}
});
}];
}
}];
}
-(void)delayMethod
{
......
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/UserCenter/Controller/MineViewController.m
//
//
......@@ -10,6 +10,7 @@
#import "ZXSettingViewController.h"
#import "UserCenterModel.h"
#import "UserInfoViewController.h"
#import "Old_UserInfoViewController.h"
#import "FeedBackView.h"
#import "AboutUs.h"
#import "AimiWalletViewController.h"
......@@ -27,20 +28,56 @@
@property (strong, nonatomic) NSArray * imageArray;
@property (strong, nonatomic) ZXUserModel * user;
@property (strong, nonatomic) UserCenterModel * userCenterModel;
@end
@implementation MineViewController
- (void)dealloc{
[self removeNotificationAndKVO];
}
-(void)registNotificationAndKVO{
[_userCenterModel addObserver:self forKeyPath:@"isLoaded" options:NSKeyValueObservingOptionNew context:nil];
[_userCenterModel addObserver:self forKeyPath:@"error" options:NSKeyValueObservingOptionNew context:nil];
}
-(void)removeNotificationAndKVO{
[_userCenterModel removeObserver:self forKeyPath:@"isLoaded"];
[_userCenterModel removeObserver:self forKeyPath:@"error"];
}
-(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
if (object == _userCenterModel) {
if ([keyPath isEqualToString:@"isLoaded"]) {
self.nameLabel.text= _userCenterModel.userCenterItem.username;
self.countLabel.text=_userCenterModel.userCenterItem.account;
}
else{
}
}
}
- (void)viewDidLoad {
[super viewDidLoad];
[self loadData];
[self loadDataByIsNew:NO];
self.userCenterModel=[UserCenterModel new];
[self registNotificationAndKVO];
self.tableView.delegate=self;
self.tableView.dataSource=self;
self.tableView.tableFooterView = [UIView new];
......@@ -55,8 +92,20 @@
self.navigationController.navigationBar.hidden=YES;
[ZXTool loadAdInfoByAdId:@"2" topView:self.tableView superView:self.view fromVc:self];
[self refreshUserInfo];
@weakify(self);
[ZXTool checkCurrentUserModeCompleted:^(BOOL isOld) {
@strongify(self);
dispatch_async(dispatch_get_main_queue(), ^{
[self loadDataByIsNew:!isOld];
[self.tableView reloadData];
});
if (isOld) {
[self.userCenterModel fetchUserCenterData];
} else {
[self refreshUserInfo];
}
}];
}
- (void) refreshUserInfo {
NSString *token = [kUserDefaults valueForKey:@"token"];
......@@ -83,6 +132,11 @@
self.nameLabel.text= self.user.customerName;
self.countLabel.text=self.user.customerPhone;
});
} else if (common.code == -2) {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool showText:common.msg];
[ZXTool backToLogin];
});
}
} onFailure:^(NSError *error) {
} onFinished:^(id responseObject, NSError *error) {
......@@ -122,11 +176,16 @@
UILabel* titleLabel = [MCCustomizeControl customizeLabel:@"个人中心" backgroundColor:[UIColor clearColor] font:[UIFont boldSystemFontOfSize:MC_NAVBAR_TITLE_FONT_SIZE] textColor:[UIColor colorWithHexString:@"#f3f3f3"] textAlignment:NSTextAlignmentCenter lineBreakMode:NSLineBreakByWordWrapping];
self.navigationItem.titleView = titleLabel;
}
-(void)loadData
-(void)loadDataByIsNew:(BOOL) isNew
{
_dataArray= @[@"艾米钱包",@"我的订单",@"个人设置",@"意见反馈",@"关于多彩"];
_imageArray = @[@"wallet.png",@"mine_dingdan_icon",@"Setup.png",@"Opinion.png",@"about-1.png"];
if (isNew) {
_dataArray= @[@"艾米钱包",@"我的订单",@"个人设置",@"意见反馈",@"关于多彩"];
_imageArray = @[@"wallet.png",@"mine_dingdan_icon",@"Setup.png",@"Opinion.png",@"about-1.png"];
} else {
_dataArray= @[@"艾米钱包",@"个人设置",@"意见反馈",@"关于多彩"];
_imageArray = @[@"wallet.png",@"Setup.png",@"Opinion.png",@"about-1.png"];
}
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
......@@ -136,7 +195,7 @@
//
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
return 45;
}
-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
......@@ -162,14 +221,12 @@
if (indexPath.row<_imageArray.count) {
UIImage * image=[UIImage imageNamed:_imageArray[indexPath.row]];
// UIImage *scaleImage=[BYHelp OriginImage:image scaleToSize:CGSizeMake(image.size.width/2.0, image.size.height/2.0)];
cell.imageView.image=image;
}
if (indexPath.row<_dataArray.count) {
cell.textLabel.text=_dataArray[indexPath.row];
}
if (indexPath.row == 4) {
if (indexPath.row == 4 && self.dataArray.count==5) {
UILabel *vvv = [[UILabel alloc] init];
[cell.contentView addSubview:vvv];
vvv.textColor = [UIColor colorWithHexString:@"#999999"];
......@@ -190,10 +247,17 @@
}
- (IBAction)gotoUserCenterClick:(id)sender {
UserInfoViewController * VC=[UserInfoViewController new];
VC.hidesBottomBarWhenPushed=YES;
VC.user=self.user;
[self.navigationController pushViewController:VC animated:YES];
if (self.user) {
UserInfoViewController * VC=[UserInfoViewController new];
VC.hidesBottomBarWhenPushed=YES;
VC.user=self.user;
[self.navigationController pushViewController:VC animated:YES];
} else {
Old_UserInfoViewController * VC=[Old_UserInfoViewController new];
VC.hidesBottomBarWhenPushed=YES;
VC.userCenterItem=self.userCenterModel.userCenterItem;
[self.navigationController pushViewController:VC animated:YES];
}
}
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
......@@ -201,22 +265,22 @@
AimiWalletViewController * VC=[AimiWalletViewController new];
VC.hidesBottomBarWhenPushed=YES;
[self.navigationController pushViewController:VC animated:YES];
}else if (indexPath.row==1){
}else if (indexPath.row==1 && self.dataArray.count==5){
UIViewController * VC=[NSClassFromString(@"ZXNewPayOrderListViewController") new];
VC.hidesBottomBarWhenPushed=YES;
[self.navigationController pushViewController:VC animated:YES];
}else if (indexPath.row==2){
}else if (indexPath.row==(self.dataArray.count==5)?2:1){
ZXSettingViewController * VC=[ZXSettingViewController new];
VC.hidesBottomBarWhenPushed=YES;
[self.navigationController pushViewController:VC animated:YES];
}
else if (indexPath.row==3){
else if (indexPath.row==(self.dataArray.count==5)?3:2){
FeedBackView * VC=[FeedBackView new];
VC.hidesBottomBarWhenPushed=YES;
[self.navigationController pushViewController:VC animated:YES];
}
else if (indexPath.row==4){
else if (indexPath.row==(self.dataArray.count==5)?4:3){
AboutUs * VC=[AboutUs new];
VC.hidesBottomBarWhenPushed=YES;
[self.navigationController pushViewController:VC animated:YES];
......
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/UserSetting/UserSet/Controller/ZXSettingViewController.m
//
//
......@@ -37,8 +37,8 @@ typedef void(^isCanChange)(BOOL iCan);
[self createUI];
[self.view addSubview:self.myTableView];
if ([[kUserDefaults valueForKey:@"isOpenFreePay"] isEqualToString:@"yes"] && [CacheVersion isEqualToString:@"2"]) {
if ([[kUserDefaults valueForKey:kAPP_IS_OPEN_JK] isEqualToString:@"yes"] && ([CacheVersion isEqualToString:@"2.0"] || [CacheVersion isEqualToString:@"2"])) {
[self loadIsOpenFreePay];
[self checkCurrentUserIsOpenJPush];
}
......@@ -47,8 +47,8 @@ typedef void(^isCanChange)(BOOL iCan);
if (_sections1 == nil) {
_sections1 = [[NSMutableArray alloc] init];
if ([CacheVersion isEqualToString:@"2"]) {
if ([[kUserDefaults valueForKey:@"isOpenFreePay"] isEqualToString:@"yes"]) {
if ([CacheVersion isEqualToString:@"2.0"] || [CacheVersion isEqualToString:@"2"]) {
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];
......@@ -95,7 +95,9 @@ typedef void(^isCanChange)(BOOL iCan);
m4.imageName = imagegroup1[3];
m4.name = group1[3];
m4.isHasSwitch = YES;
m4.switchIsOn = [CacheDevPassSwitch isEqualToString:@"0"];
if ([CacheDevPassSwitch isKindOfClass:[NSString class]]) {
m4.switchIsOn = [CacheDevPassSwitch isEqualToString:@"0"];
}
m4.switchType = 1;
[_sections1 addObjectsFromArray:@[m1,m2,m3,m4]];
}
......@@ -395,8 +397,19 @@ typedef void(^isCanChange)(BOOL iCan);
return isEnable;
}
- (NSString *) tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
return section?@"其他":@"密码与安全";
-(UIView *) tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
UIView *header = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 35 * k6Scale)];
header.backgroundColor = RGB(243, 243, 243);
UILabel *label = [[UILabel alloc] init];
label.textColor = [UIColor colorWithHexString:@"#333333"];
label.font = kFontSize(18 * k6Scale);
[header addSubview:label];
label.text = section?@"其他":@"密码与安全";
[label mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(header.mas_left).offset(15 * k6Scale);
make.centerY.equalTo(header);
}];
return header;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
......@@ -416,7 +429,7 @@ typedef void(^isCanChange)(BOOL iCan);
break;
}
} else {
if (indexPath.row <= 2) {
if (indexPath.row <= ([CacheVersion isEqualToString:@"2.0"] || [CacheVersion isEqualToString:@"2"])?2:1) {
//app登录密码
updateViewController * VC=[[updateViewController alloc] init];
VC.titleStr=[self.sections1[indexPath.row] valueForKey:@"name"];
......
ColorfulSchool/ColorfulSchool/Classes/NewFirstPage(新版首页)/Controllers/ZTHomeViewController+Extension.m
//
//
......@@ -32,7 +32,7 @@
#pragma mark - ========== 条码展示 ==========
- (void)jumpNativeMenu:(ZXOperation *)operation {
NSString *version = [kUserDefaults valueForKey:@"version"];
if ([version isEqualToString:@"1"]) {
if ([version isEqualToString:@"1"] || [version isEqualToString:@"1.0"]) {
//1.0
if ([operation.defaultValue isEqualToString:@"7"]) {
......
ColorfulSchool/ColorfulSchool/Classes/NewFirstPage(新版首页)/Views/ZXBDADTableViewCell.m
//
//
......@@ -123,7 +123,7 @@
// request.url = [[NSString stringWithFormat:@"%@/app/adsenseCollectData/adsenseCollectData4Add", [kUserDefaults valueForKey:@"Ad"]] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
// request.httpMethod = kXMHTTPMethodPOST;
// request.headers = @{@"token": CacheToken,@"reqSource":@"app", @"Content-Type":@"application/json"};
// request.HttpBody = [[ZXTool dictionaryToJson:@{@"adsenseName":title.length>30?[title substringToIndex:29]:title,@"advertType":@"曝光",@"advertTitle":title.length>30?[title substringToIndex:29]:title, @"advertImg":imageUrl, @"customerId":[kUserDefaults valueForKey:@"userId"], @"advertId":kTXAdPLACEMENTID,@"platformCode":@"TXAD_iOS"}] mj_JSONData];
// request.HttpBody = [[ZXTool dictionaryToJson:@{@"adsenseName":title.length>30?[title substringToIndex:29]:title,@"advertType":@"曝光",@"advertTitle":title.length>30?[title substringToIndex:29]:title, @"advertImg":imageUrl, @"customerId":[kUserDefaults valueForKey:@"userId"], @"advertId":kTXAdNativePLACEMENTID,@"platformCode":@"TXAD_iOS"}] mj_JSONData];
// } onSuccess:^(id responseObject) {
//
// } onFailure:^(NSError *error) {
......@@ -143,7 +143,7 @@
// request.url = [[NSString stringWithFormat:@"%@/app/adsenseCollectData/adsenseCollectData4Add", [kUserDefaults valueForKey:@"Ad"]] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
// request.httpMethod = kXMHTTPMethodPOST;
// request.headers = @{@"token": CacheToken,@"reqSource":@"app", @"Content-Type":@"application/json"};
// request.HttpBody = [[ZXTool dictionaryToJson:@{@"adsenseName":title.length>30?[title substringToIndex:29]:title,@"advertType":@"点击",@"advertTitle":title.length>30?[title substringToIndex:29]:title, @"advertImg":imageUrl, @"customerId":[kUserDefaults valueForKey:@"userId"], @"advertId":kTXAdPLACEMENTID,@"platformCode":@"TXAD_iOS"}] mj_JSONData];
// request.HttpBody = [[ZXTool dictionaryToJson:@{@"adsenseName":title.length>30?[title substringToIndex:29]:title,@"advertType":@"点击",@"advertTitle":title.length>30?[title substringToIndex:29]:title, @"advertImg":imageUrl, @"customerId":[kUserDefaults valueForKey:@"userId"], @"advertId":kTXAdNativePLACEMENTID,@"platformCode":@"TXAD_iOS"}] mj_JSONData];
// } onSuccess:^(id responseObject) {
//
// } onFailure:^(NSError *error) {
......
ColorfulSchool/ColorfulSchool/Classes/NewFirstPage(新版首页)/Views/ZXTXADTableViewCell.m
//
//
......@@ -29,7 +29,7 @@
if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
self.selectionStyle = UITableViewCellSelectionStyleNone;
if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) {
self.nativeAd = [[GDTNativeExpressAd alloc] initWithAppId:kTXAdAPPID placementId:kTXAdPLACEMENTID adSize:CGSizeMake(kScreenWidth, kScreenWidth * 0.56)];
self.nativeAd = [[GDTNativeExpressAd alloc] initWithAppId:kTXAdAPPID placementId:kTXAdNativePLACEMENTID adSize:CGSizeMake(kScreenWidth, kScreenWidth * 0.56)];
self.nativeAd.delegate = self;
[self createRemoveAdView];
}
......@@ -120,7 +120,7 @@
request.url = [[NSString stringWithFormat:@"%@/app/adsenseCollectData/adsenseCollectData4Add", [kUserDefaults valueForKey:@"Ad"]] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
request.httpMethod = kXMHTTPMethodPOST;
request.headers = @{@"token": CacheToken,@"reqSource":@"app", @"Content-Type":@"application/json"};
request.HttpBody = [[ZXTool dictionaryToJson:@{@"adsenseName":title.length>30?[title substringToIndex:29]:title,@"advertType":@"曝光",@"advertTitle":title.length>30?[title substringToIndex:29]:title, @"advertImg":imageUrl, @"customerId":[kUserDefaults valueForKey:@"userId"], @"advertId":kTXAdPLACEMENTID,@"platformCode":@"TXAD_iOS"}] mj_JSONData];
request.HttpBody = [[ZXTool dictionaryToJson:@{@"adsenseName":title.length>30?[title substringToIndex:29]:title,@"advertType":@"曝光",@"advertTitle":title.length>30?[title substringToIndex:29]:title, @"advertImg":imageUrl, @"customerId":[kUserDefaults valueForKey:@"userId"], @"advertId":kTXAdNativePLACEMENTID,@"platformCode":@"TXAD_iOS"}] mj_JSONData];
} onSuccess:^(id responseObject) {
} onFailure:^(NSError *error) {
......@@ -140,7 +140,7 @@
request.url = [[NSString stringWithFormat:@"%@/app/adsenseCollectData/adsenseCollectData4Add", [kUserDefaults valueForKey:@"Ad"]] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
request.httpMethod = kXMHTTPMethodPOST;
request.headers = @{@"token": CacheToken,@"reqSource":@"app", @"Content-Type":@"application/json"};
request.HttpBody = [[ZXTool dictionaryToJson:@{@"adsenseName":title.length>30?[title substringToIndex:29]:title,@"advertType":@"点击",@"advertTitle":title.length>30?[title substringToIndex:29]:title, @"advertImg":imageUrl, @"customerId":[kUserDefaults valueForKey:@"userId"], @"advertId":kTXAdPLACEMENTID,@"platformCode":@"TXAD_iOS"}] mj_JSONData];
request.HttpBody = [[ZXTool dictionaryToJson:@{@"adsenseName":title.length>30?[title substringToIndex:29]:title,@"advertType":@"点击",@"advertTitle":title.length>30?[title substringToIndex:29]:title, @"advertImg":imageUrl, @"customerId":[kUserDefaults valueForKey:@"userId"], @"advertId":kTXAdNativePLACEMENTID,@"platformCode":@"TXAD_iOS"}] mj_JSONData];
} onSuccess:^(id responseObject) {
} onFailure:^(NSError *error) {
......
ColorfulSchool/ColorfulSchool/Classes/Operation(自助服务)/1.0Version(1.0购券)/PersonalInfo/Modle/personalInfoModel.h deleted 100644 → 0
//
++ /dev/null
//
// personalInfoModel.h
// ColorfulSchool
//
// Created by rym on 2017/8/15.
// Copyright © 2017年 Colorful Any Door. All rights reserved.
//
#import <Foundation/Foundation.h>
@interface personalInfoModel : NSObject
/**
数据是否成功加载
*/
@property (nonatomic) BOOL isLoaded;
/**
数据加载错误
*/
@property (nonatomic) BOOL error;
-(void)savePersonalInfo;
@end
ColorfulSchool/ColorfulSchool/Classes/Operation(自助服务)/1.0Version(1.0购券)/PersonalInfo/Modle/personalInfoModel.m deleted 100644 → 0
//
++ /dev/null
//
// personalInfoModel.m
// ColorfulSchool
//
// Created by rym on 2017/8/15.
// Copyright © 2017年 Colorful Any Door. All rights reserved.
//
#import "personalInfoModel.h"
@implementation personalInfoModel
-(void)savePersonalInfo{
GetData * data=[GetData shareData];
__weak typeof(self) WeakSelf=self;
[data savePersonalInfoSuccess:^(AFHTTPRequestOperation *operation, id responseObject) {
NSDictionary * dic=responseObject;
if ([dic[@"code"] isEqualToString:@"0"]) {
[dic[@"data"] createPropertyCode];
[SVProgressHUD dismiss];
WeakSelf.isLoaded=YES;
}
else{
WeakSelf.error=YES;
}
} failure:^(AFHTTPRequestOperation *operation, NSError *error) {
WeakSelf.error=YES;
}];
}
@end
ColorfulSchool/ColorfulSchool/Classes/Operation(自助服务)/1.0Version(1.0购券)/PersonalInfo/View/PerfectInformation.h deleted 100644 → 0
//
++ /dev/null
//
// PerfectInformation.h
// ColorfulSchool
//
// Created by rym on 2017/8/19.
// Copyright © 2017年 Colorful Any Door. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface PerfectInformation : UIView
@property (weak, nonatomic) IBOutlet UITableView *tableView;
@property (weak, nonatomic) IBOutlet UIView *bgView;
@property (nonatomic, strong)void(^saveSuccess)();
@end
ColorfulSchool/ColorfulSchool/Classes/Operation(自助服务)/1.0Version(1.0购券)/PersonalInfo/View/SureSchoolView.h deleted 100644 → 0
//
++ /dev/null
//
// SureSchoolView.h
// ColorfulSchool
//
// Created by rym on 2017/8/14.
// Copyright © 2017年 rym. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface SureSchoolView : UIView
@property (nonatomic, strong) UIButton *okBtn;//确定按
- (instancetype)initWithFrame:(CGRect)frame schoolStr:(NSString *)schoolStr campusStr:(NSString *)campusStr;
@end
ColorfulSchool/ColorfulSchool/Classes/Operation(自助服务)/1.0Version(1.0购券)/PersonalInfo/View/SureSchoolView.m deleted 100644 → 0
//
++ /dev/null
//
// SureSchoolView.m
// ColorfulSchool
//
// Created by rym on 2017/8/14.
// Copyright © 2017年 rym. All rights reserved.
//
#import "SureSchoolView.h"
@implementation SureSchoolView
- (instancetype)initWithFrame:(CGRect)frame schoolStr:(NSString *)schoolStr campusStr:(NSString *)campusStr{
self = [super initWithFrame:frame];
if (self)
{
self.backgroundColor = [UIColor clearColor];
//黑色透明背景
UIView * blackView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, frame.size.width, frame.size.height)];
blackView.backgroundColor = [UIColor blackColor];
blackView.alpha = 0.4;
[self addSubview:blackView];
//背景图
UIImageView * backGroundImage = [[UIImageView alloc]initWithFrame:CGRectMake((frame.size.width-245)/2,(frame.size.height-240)/2, 245,246)];
backGroundImage.image = [UIImage imageNamed:@"0弹框-确定校区.png"];
backGroundImage.userInteractionEnabled = YES;
[self addSubview:backGroundImage];
//提示框
UILabel * promptLabel = [[UILabel alloc]initWithFrame:CGRectMake(30, 120, 185, 70)];
promptLabel.text = [NSString stringWithFormat:@"请确定你选择的校区\n %@ 是否正确",campusStr];
promptLabel.textAlignment = NSTextAlignmentCenter;
promptLabel.numberOfLines=0;
promptLabel.textColor = [UIColor blackColor];
promptLabel.font = [UIFont boldSystemFontOfSize:13];
[backGroundImage addSubview:promptLabel];
//提示内容
UILabel * contentLabel = [[UILabel alloc]initWithFrame:CGRectMake(0, 170, 245, 20)];
contentLabel.text = @"*校区一旦选错只能通过管理员修改";
contentLabel.textAlignment = NSTextAlignmentCenter;
contentLabel.textColor = [UIColor colorWithHexString:@"#fe2626"];
contentLabel.font = [UIFont boldSystemFontOfSize:11];
[backGroundImage addSubview:contentLabel];
//取消按钮
UIButton *cancleBtn = [[UIButton alloc]initWithFrame:CGRectMake(10, 195, 108, 35)];
[cancleBtn addTarget:self action:@selector(cancleBtnFuc) forControlEvents:UIControlEventTouchUpInside];
cancleBtn.layer.cornerRadius = 4.0;
cancleBtn.layer.masksToBounds = YES;
[cancleBtn setTitle:@"再次确认" forState:UIControlStateNormal];
[cancleBtn setTitleColor:[UIColor colorWithRed:245/255.0 green:173/255.0 blue:61/255.0 alpha:1.0] forState:UIControlStateNormal];
cancleBtn.titleLabel.font = [UIFont systemFontOfSize:12.0];
cancleBtn.backgroundColor = [UIColor colorWithRed:255/255.0 green:255/255.0 blue:253/255.0 alpha:1.0];
[backGroundImage addSubview:cancleBtn];
//确定按钮
_okBtn = [[UIButton alloc]initWithFrame:CGRectMake(CGRectGetMaxX(cancleBtn.frame)+9, 195, 108, 35)];
[_okBtn addTarget:self action:@selector(cancleBtnFuc) forControlEvents:UIControlEventTouchUpInside];
_okBtn.layer.cornerRadius = 4.0;
_okBtn.layer.masksToBounds = YES;
[_okBtn setTitle:@"提交" forState:UIControlStateNormal];
[_okBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
_okBtn.titleLabel.font = [UIFont systemFontOfSize:12.0];
_okBtn.backgroundColor = [UIColor colorWithRed:245/255.0 green:173/255.0 blue:61/255.0 alpha:1.0];
[backGroundImage addSubview:_okBtn];
}
return self;
}
//取消按钮方法
-(void)cancleBtnFuc
{
[self removeFromSuperview];
}
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
@end
ColorfulSchool/ColorfulSchool/Classes/RSAD(瑞狮)/ZXRSNewViewController.m
//
//
......@@ -30,7 +30,6 @@
#import "JudgeFirstTopUpModel.h"
#import "AnnounceModel.h"
#import "AnnouceNoMentionModel.h"
#import "PerfectInformation.h"
#import <JPUSHService.h>
#import "UserCenterModel.h"
#import "AimiWalletViewController.h"
......@@ -56,21 +55,12 @@
院校是否首充
*/
@property (strong, nonatomic) JudgeFirstTopUpModel * firstTopupModel;
/**
用户信息
*/
@property (strong, nonatomic) UserCenterModel * userCenterModel;
/**
是否来自完善信息
*/
@property (nonatomic, assign) BOOL isComeFromPerfectInfo;
/**
完善个人信息界面
*/
@property (nonatomic, strong)PerfectInformation * infoView;
//强弹公告
@property (nonatomic, strong)ZXAnnouncementView * announce;
@property (nonatomic, strong)CampasVersionUpdateModel * updateModel;
......@@ -90,7 +80,7 @@ static NSInteger seq = 0;
self.isHasAd = [jum.modelCode isEqualToString:@"RS_01"];
self.modelCode = jum.modelCode;
[self loadNewData];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(scrollToTopAction:) name:@"ZXScrollToTop" object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(getNewFromManager:) name:@"RS_FIRST_PAGE_DATA_FORM_MANAGER" object:nil];
......@@ -102,7 +92,6 @@ static NSInteger seq = 0;
[ZXTool loadAdInfoByAdId:@"1" topView:nil superView:self.view fromVc:self];
//老版本部分数据
self.userCenterModel=[UserCenterModel new];
self.firstTopupModel=[JudgeFirstTopUpModel new];
self.updateModel=[CampasVersionUpdateModel new];
[self setAlias];
......@@ -165,9 +154,8 @@ static NSInteger seq = 0;
//发送通知
[[NSNotificationCenter defaultCenter] postNotificationName:@"RS_SHOWMANAGERVIEWCONROLLER" object:nil];
}
[ZXTool firstPageRefreshAddNotPayView:self.view];
//老版本部分
[self oldVersion];
[ZXTool firstPageRefreshAddNotPayView:self.view];
[self fetchFirstChargeConfig];
}
#pragma mark - ========== UITableView/Delegate/Datasource ==========
- (UITableView *)myTableView {
......@@ -561,15 +549,50 @@ static NSInteger seq = 0;
}
#pragma mark - ========== 老版本部分内容 ==========
- (void) oldVersion {
dispatch_async(dispatch_get_global_queue(0, 0), ^{
if ([CacherechargeStatus isEqualToString:@"0"]) {
[self.firstTopupModel JudgeFirstTopUp];
- (void) fetchFirstChargeConfig {
[ZXTool checkCurrentUserModeCompleted:^(BOOL isOld) {
if (isOld) {
dispatch_async(dispatch_get_global_queue(0, 0), ^{
if ([CacherechargeStatus isEqualToString:@"0"]) {
[self.firstTopupModel JudgeFirstTopUp];
}
});
} else {
dispatch_async(dispatch_get_global_queue(0, 0), ^{
@weakify(self);
[XMCenter sendRequest:^(XMRequest *request) {
request.url = [[NSString stringWithFormat:@"%@/dcxy/api/paymentAndActiveConf/getFirstRechargeConfContent?areaId=%@", [kUserDefaults objectForKey:@"SX_MONEY"], CacheCampusId] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
request.httpMethod = kXMHTTPMethodGET;
request.headers = @{@"token": CacheToken,@"reqSource":@"app", @"Content-Type":@"application/json"};
} onSuccess:^(id responseObject) {
CommonModel *common = [CommonModel mj_objectWithKeyValues:responseObject];
@strongify(self);
if (common.code == 1000) {
[self showFirstRechargeAlertByMsg:common.data];
} else if (common.code == -2) {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool showText:common.msg];
[ZXTool backToLogin];
});
}
} onFailure:^(NSError *error) {
} onFinished:^(id responseObject, NSError *error) {
}];
});
}
//获取最新的用户数据
[self.userCenterModel fetchUserCenterData];
}];
}
#pragma mark - ==========显示首充弹窗==========
- (void) showFirstRechargeAlertByMsg:(NSString *) msg {
dispatch_async(dispatch_get_main_queue(), ^{
firstTopupAlert=nil;
firstTopupAlert= [[UIAlertView alloc]initWithTitle:nil message:msg delegate:self cancelButtonTitle:@"去充值" otherButtonTitles:@"退出",nil];
[firstTopupAlert show];
self.isShow = YES;
});
}
#pragma mark 别名
......@@ -595,8 +618,6 @@ static NSInteger seq = 0;
[_firstTopupModel addObserver:self forKeyPath:@"isLoaded" options:NSKeyValueObservingOptionNew context:nil];
[_firstTopupModel addObserver:self forKeyPath:@"error" options:NSKeyValueObservingOptionNew context:nil];
[_userCenterModel addObserver:self forKeyPath:@"isLoaded" options:NSKeyValueObservingOptionNew context:nil];
[_userCenterModel addObserver:self forKeyPath:@"error" options:NSKeyValueObservingOptionNew context:nil];
[self.updateModel addObserver:self forKeyPath:@"isLoaded" options:NSKeyValueObservingOptionNew context:nil];
[self.updateModel addObserver:self forKeyPath:@"error" options:NSKeyValueObservingOptionNew context:nil];
}
......@@ -619,36 +640,15 @@ static NSInteger seq = 0;
}
-(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
if (object == _userCenterModel) {
if ([keyPath isEqualToString:@"isLoaded"]) {
dispatch_async(dispatch_get_main_queue(), ^{
//获取个人信息后判断用户是否有有完善信息；
[self judgePerfectInfoOrNot];
});
} else {
dispatch_async(dispatch_get_main_queue(), ^{
//无网络状态将首页条码显示出来；
[self judgePerfectInfoOrNot];
});
}
}
if (object == _firstTopupModel) {
if ([keyPath isEqualToString:@"isLoaded"]) {
dispatch_async(dispatch_get_main_queue(), ^{
if ([self.firstTopupModel.firstTopUpItem.forceType isEqualToString:@"1"] && self.isShow == NO) {
//1表示学校要求要首充，给予首充提示；
firstTopupAlert=nil;
firstTopupAlert= [[UIAlertView alloc]initWithTitle:nil message:self.firstTopupModel.firstTopUpItem.rechargeNotice delegate:self cancelButtonTitle:@"去充值" otherButtonTitles:@"退出",nil];
[firstTopupAlert show];
self.isShow = YES;
}
});
}
else{
if ([self.firstTopupModel.firstTopUpItem.forceType isEqualToString:@"1"] && self.isShow == NO) {
//1表示学校要求要首充，给予首充提示；
[self showFirstRechargeAlertByMsg:self.firstTopupModel.firstTopUpItem.rechargeNotice];
}
}
}
......@@ -696,47 +696,7 @@ static NSInteger seq = 0;
[[UIApplication sharedApplication]openURL:[NSURL URLWithString:url]];
}
//判断是否完善信息
-(void)judgePerfectInfoOrNot{
//当没得校区的时候就判定为个人信息没有完善
NSLog(@"====%@",CacheCampusId);
if ([CacheCampusId isEqualToString:@""] || [CacheCampusId isEqualToString:@"0"]){
_infoView = [[PerfectInformation alloc]initWithFrame:CGRectMake(0, 0, kWidth, kHeight)];
__weak typeof (self) weakSelf=self;
_infoView.saveSuccess=^{
AppDelegate * appDelegate=(AppDelegate *)[UIApplication sharedApplication].delegate;
[appDelegate tokenLogin];
[weakSelf.infoView removeFromSuperview];
weakSelf.isComeFromPerfectInfo=YES;
NSLog(@"dddd%@",CacherechargeStatus);
if ([CacherechargeStatus isEqualToString:@"0"]) {
//判断是否进行首充（解决当界面完善信息返回后没有判断首充的问题）
//再次获取个人信息将CacherechargeStatus进行缓存；
[weakSelf.userCenterModel fetchUserCenterData];
}
};
AppDelegate * app = (AppDelegate*)[UIApplication sharedApplication].delegate;
[app.window addSubview:_infoView];
}else{
//当用户信息完善后判断是否UpdateVersionForApp;
NSString * vertionStr=[NSString stringWithFormat:@"%@",APPversion];
NSLog(@"vertionStr:%@",vertionStr);
[self.updateModel CampasVersionUpdateWithCurrentVersion:vertionStr];
}
}
-(void)afterVersionJuge{
......
ColorfulSchool/ColorfulSchool/Classes/TX广告/TXADHeader.h
//
//
......@@ -10,7 +10,8 @@
#define TXADHeader_h
#define kTXAdAPPID @"1108089964"
#define kTXAdPLACEMENTID @"8030751158735005"
#define kTXAdNativePLACEMENTID @"8030751158735005" //原生广告id
#define kTXAdLauchPLACEMENTID @"9090758636743260" //开屏广告id
#endif /* TXADHeader_h */
ColorfulSchool/ColorfulSchool/Classes/TX广告/ZXTXAdTool.m
//
//
......@@ -108,7 +108,7 @@ kSINGLETON_FOR_CLASS(ZXTXAdTool)
if (self.gcdTimer) {
return;
}
self.nativeAd = [[GDTNativeExpressAd alloc] initWithAppId:kTXAdAPPID placementId:kTXAdPLACEMENTID adSize:CGSizeMake(kScreenWidth, kScreenWidth * 0.56)];
self.nativeAd = [[GDTNativeExpressAd alloc] initWithAppId:kTXAdAPPID placementId:kTXAdNativePLACEMENTID adSize:CGSizeMake(kScreenWidth, kScreenWidth * 0.56)];
self.nativeAd.delegate = self;
self.adView = view;
self.topView = topView;
......@@ -282,7 +282,7 @@ kSINGLETON_FOR_CLASS(ZXTXAdTool)
return ;
}
request.headers = @{@"token": CacheToken,@"reqSource":@"app", @"Content-Type":@"application/json"};
request.HttpBody = [[ZXTool dictionaryToJson:@{@"adsenseName":title.length>30?[title substringToIndex:29]:title,@"advertType":@"曝光",@"advertTitle":title.length>30?[title substringToIndex:29]:title, @"advertImg":imageUrl, @"customerId":[kUserDefaults valueForKey:@"userId"], @"advertId":kTXAdPLACEMENTID,@"platformCode":@"TXAD_iOS"}] mj_JSONData];
request.HttpBody = [[ZXTool dictionaryToJson:@{@"adsenseName":title.length>30?[title substringToIndex:29]:title,@"advertType":@"曝光",@"advertTitle":title.length>30?[title substringToIndex:29]:title, @"advertImg":imageUrl, @"customerId":[kUserDefaults valueForKey:@"userId"], @"advertId":kTXAdNativePLACEMENTID,@"platformCode":@"TXAD_iOS"}] mj_JSONData];
} onSuccess:^(id responseObject) {
} onFailure:^(NSError *error) {
......@@ -302,7 +302,7 @@ kSINGLETON_FOR_CLASS(ZXTXAdTool)
request.url = [[NSString stringWithFormat:@"%@/app/adsenseCollectData/adsenseCollectData4Add", [kUserDefaults valueForKey:@"Ad"]] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
request.httpMethod = kXMHTTPMethodPOST;
request.headers = @{@"token": CacheToken,@"reqSource":@"app", @"Content-Type":@"application/json"};
request.HttpBody = [[ZXTool dictionaryToJson:@{@"adsenseName":title.length>30?[title substringToIndex:29]:title,@"advertType":@"点击",@"advertTitle":title.length>30?[title substringToIndex:29]:title, @"advertImg":imageUrl, @"customerId":[kUserDefaults valueForKey:@"userId"], @"advertId":kTXAdPLACEMENTID,@"platformCode":@"TXAD_iOS"}] mj_JSONData];
request.HttpBody = [[ZXTool dictionaryToJson:@{@"adsenseName":title.length>30?[title substringToIndex:29]:title,@"advertType":@"点击",@"advertTitle":title.length>30?[title substringToIndex:29]:title, @"advertImg":imageUrl, @"customerId":[kUserDefaults valueForKey:@"userId"], @"advertId":kTXAdNativePLACEMENTID,@"platformCode":@"TXAD_iOS"}] mj_JSONData];
} onSuccess:^(id responseObject) {
} onFailure:^(NSError *error) {
......
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/NullSafe.m deleted 100755 → 0
//
++ /dev/null
//
// NullSafe.m
//
// Version 2.0
//
// Created by Nick Lockwood on 19/12/2012.
// Copyright 2012 Charcoal Design
//
// Distributed under the permissive zlib License
// Get the latest version from here:
//
// https://github.com/nicklockwood/NullSafe
//
// This software is provided 'as-is', without any express or implied
// warranty. In no event will the authors be held liable for any damages
// arising from the use of this software.
//
// Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it
// freely, subject to the following restrictions:
//
// 1. The origin of this software must not be misrepresented; you must not
// claim that you wrote the original software. If you use this software
// in a product, an acknowledgment in the product documentation would be
// appreciated but is not required.
//
// 2. Altered source versions must be plainly marked as such, and must not be
// misrepresented as being the original software.
//
// 3. This notice may not be removed or altered from any source distribution.
//
#import <objc/runtime.h>
#import <Foundation/Foundation.h>
#ifndef NULLSAFE_ENABLED
#define NULLSAFE_ENABLED 1
#endif
#pragma clang diagnostic ignored "-Wgnu-conditional-omitted-operand"
@implementation NSNull (NullSafe)
#if NULLSAFE_ENABLED
- (NSMethodSignature *)methodSignatureForSelector:(SEL)selector
{
//look up method signature
NSMethodSignature *signature = [super methodSignatureForSelector:selector];
if (!signature)
{
for (Class someClass in @[
[NSMutableArray class],
[NSMutableDictionary class],
[NSMutableString class],
[NSNumber class],
[NSDate class],
[NSData class]
])
{
@try
{
if ([someClass instancesRespondToSelector:selector])
{
signature = [someClass instanceMethodSignatureForSelector:selector];
break;
}
}
@catch (__unused NSException *unused) {}
}
}
return signature;
}
- (void)forwardInvocation:(NSInvocation *)invocation
{
invocation.target = nil;
[invocation invoke];
}
#endif
@end
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/ZXTool.h
//
//
......@@ -14,6 +14,7 @@ typedef void(^imagePath)(NSString *path);
typedef void(^completed)(CommonModel *common, NSString *error);
typedef void(^RSCompletedBlock)(id response);
typedef void(^loginSuccessJump)(NSString *jump);
typedef void(^checkIsOldCustomer)(BOOL isOld);
@interface ZXTool : NSObject
......@@ -152,4 +153,18 @@ typedef void(^loginSuccessJump)(NSString *jump);
isHasBottomMargin:(BOOL) isHasBottomMargin;
+(void) codePageIsNeedCheckNotPayOrder:(dispatch_block_t) completed;
//查询当前用户是否是老用户 yes 是 no否
/*
* phone 电话号码
* completd 回调
*/
+(void) checkCurrentUserIsOldCustomerByPhone:(NSString *) phone completed:(checkIsOldCustomer) completd;
//查询当前用户模式
/*
* completd 回调 yes 老模式 no新模式
*/
+(void) checkCurrentUserModeCompleted:(checkIsOldCustomer) completed;
@end
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/ZXTool.m
//
//
......@@ -587,12 +587,14 @@ void ProviderReleaseData (void *info, const void *data, size_t size){
+(void) backToLogin {
LoginModel * loginModel=[LoginModel new];
[loginModel loginOut];
LoginView * loginView= [LoginView new];
AppDelegate *delegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
delegate.window.rootViewController = [[XMGNavigationViewController alloc] initWithRootViewController:loginView];
[delegate.window endEditing:YES];
dispatch_async(dispatch_get_main_queue(), ^{
LoginModel * loginModel=[LoginModel new];
[loginModel loginOut];
LoginView * loginView= [LoginView new];
AppDelegate *delegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
delegate.window.rootViewController = [[XMGNavigationViewController alloc] initWithRootViewController:loginView];
[delegate.window endEditing:YES];
});
}
+(UIWindow *) returnKeyWindow {
AppDelegate *delegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
......@@ -1771,16 +1773,6 @@ void ProviderReleaseData (void *info, const void *data, size_t size){
#pragma mark - ==========是否需要在条码页轮训待支付订单==========
+(void) codePageIsNeedCheckNotPayOrder:(dispatch_block_t) completed {
[ZXTool requestDataWithType:kXMHTTPMethodGET url:[NSString stringWithFormat:@"%@/dcxy/api/operationModeConf?areaId=%@", [kUserDefaults objectForKey:@"SX_MONEY"], CacheCampusId] para:nil completed:^(CommonModel *common, NSString *error) {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool hideLoadingAnimation];
if (error==nil) {
}
});
}];
NSString *url = [NSString stringWithFormat:@"%@/dcxy/api/operationModeConf?areaId=%@", [kUserDefaults objectForKey:@"SX_MONEY"], CacheCampusId];
[XMCenter sendRequest:^(XMRequest *request) {
request.url = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
......@@ -1789,7 +1781,10 @@ void ProviderReleaseData (void *info, const void *data, size_t size){
} onSuccess:^(id responseObject) {
if ([responseObject[@"code"] integerValue] == 1000) {
if (responseObject[@"data"]) {
if (responseObject[@"data"] && ![responseObject[@"data"] isKindOfClass:[NSNull class]]) {
if (responseObject[@"data"][@"mode"] == nil || [responseObject[@"data"][@"mode"] isKindOfClass:[NSNull class]]) {
return ;
}
if ([responseObject[@"data"][@"mode"] integerValue] == 1 || [responseObject[@"data"][@"mode"] integerValue] == 2) {
//单独加载是否是订单模式
NSString *url2 = [NSString stringWithFormat:@"%@/app/customer/balance/state?customerId=%@", [kUserDefaults valueForKey:@"NEW_PAY"],CacheUserId];
......@@ -1816,4 +1811,65 @@ void ProviderReleaseData (void *info, const void *data, size_t size){
} onFinished:^(id responseObject, NSError *error) {
}];
}
#pragma mark - ==========查询当前用户是老用户还是新用户==========
+(void) checkCurrentUserIsOldCustomerByPhone:(NSString *) phone completed:(checkIsOldCustomer) completd {
dispatch_async(dispatch_get_global_queue(0, 0), ^{
[XMCenter sendRequest:^(XMRequest *request) {
request.url = [[NSString stringWithFormat:@"%@/dcxy/customerInfo/operation/mode?customerPhone=%@", [kUserDefaults objectForKey:@"NEW_PAY"], phone] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
request.httpMethod = kXMHTTPMethodGET;
request.headers = @{@"token": @"",@"reqSource":@"app", @"Content-Type":@"application/json"};
} onSuccess:^(id responseObject) {
CommonModel *common = [CommonModel mj_objectWithKeyValues:responseObject];
if (common.code == 1000) {
completd([common.data integerValue]);
} else {
dispatch_async(dispatch_get_main_queue(), ^{
[SVProgressHUD dismiss];
[SVProgressHUD showErrorWithStatus:common.msg];
});
}
} onFailure:^(NSError *error) {
dispatch_async(dispatch_get_main_queue(), ^{
[SVProgressHUD dismiss];
[SVProgressHUD showErrorWithStatus:error.userInfo[@"NSLocalizedDescription"]];
});
} onFinished:^(id responseObject, NSError *error) {
}];
});
}
#pragma mark - ==========当前模式==========
+(void) checkCurrentUserModeCompleted:(checkIsOldCustomer) completed {
if (![CacheCampusId isKindOfClass:[NSString class]]) {
completed(NO);
return;
}
NSString *url = [NSString stringWithFormat:@"%@/dcxy/api/operationModeConf?areaId=%@", [kUserDefaults objectForKey:@"SX_MONEY"], CacheCampusId];
[XMCenter sendRequest:^(XMRequest *request) {
request.url = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
request.httpMethod = kXMHTTPMethodGET;
request.headers = @{@"token": CacheToken,@"reqSource":@"app", @"Content-Type":@"application/json"};
} onSuccess:^(id responseObject) {
if ([responseObject[@"code"] integerValue] == 1000) {
if (responseObject[@"data"] && ![responseObject[@"data"] isKindOfClass:[NSNull class]]) {
if (responseObject[@"data"][@"mode"] == nil || [responseObject[@"data"][@"mode"] isKindOfClass:[NSNull class]]) {
completed(YES);
return ;
}
completed(NO);
} else {
completed(YES);
}
} else {
completed(YES);
}
} onFailure:^(NSError *error) {
completed(YES);
} onFinished:^(id responseObject, NSError *error) {
}];
}
@end
ColorfulSchool/ColorfulSchool/Info.plist
......@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.7.1</string>
<string>3.7.4</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
......
ColorfulSchool/ColorfulSchool/Main(入口)/Controller/MyTabViewController.m
//
//
......@@ -83,7 +83,8 @@
- (void)viewDidLoad {
[super viewDidLoad];
[kUserDefaults setValue:@"no" forKey:@"isOpenFreePay"];//默认是no
[kUserDefaults setValue:@"no" forKey:kAPP_IS_OPEN_JK];//默认是no
[kUserDefaults setValue:@"no" forKey:kAPP_QB_SHOW];//默认是no
NSString *url = [NSString stringWithFormat:@"%@/area/switchs?areaId=%@", [kUserDefaults objectForKey:@"SX_MONEY"], CacheCampusId];
@weakify(self);
[XMCenter sendRequest:^(XMRequest *request) {
......@@ -95,12 +96,18 @@
if ([responseObject[@"code"] integerValue] == 1000) {
NSArray *arr = responseObject[@"areaSwitchs"];
NSMutableArray *arr_type = [[NSMutableArray alloc] init];
//type 1资讯 2商城 3支付配置 4免密开关 5小程序(app不需要)
for (NSDictionary *dic in arr) {
if ([dic[@"isEnabled"] integerValue] == 1 && ![dic[@"type"] isEqualToString:@"4"]) {
[arr_type addObject:dic];
if ([dic[@"type"] isEqualToString:@"1"] || [dic[@"type"] isEqualToString:@"2"]) {
if ([dic[@"isEnabled"] integerValue] == 1) {
[arr_type addObject:dic];
}
}
if ([dic[@"type"] isEqualToString:@"4"] && [dic[@"isEnabled"] integerValue] == 1) {
[kUserDefaults setValue:@"yes" forKey:@"isOpenFreePay"];//默认是no
[kUserDefaults setValue:@"yes" forKey:kAPP_IS_OPEN_JK];//默认是no
}
if ([dic[@"type"] isEqualToString:@"3"] && [dic[@"isEnabled"] integerValue] == 1) {
[kUserDefaults setValue:@"yes" forKey:kAPP_QB_SHOW];//默认是no
}
}
if (arr_type.count == 2) {
......
ColorfulSchool/Podfile
......@@ -16,4 +16,5 @@ target 'ColorfulSchool' do
pod 'DTCoreText'
pod 'JXCategoryView'
pod 'GDTMobSDK', '~> 4.8.4'
pod 'JJException'
end
ColorfulSchool/Podfile.lock
......@@ -46,6 +46,24 @@ PODS:
- HappyDNS (0.3.14)
- IQKeyboardManager (6.2.0)
- JCore (1.2.5)
- JJException (0.2.1):
- JJException/All (= 0.2.1)
- JJException/All (0.2.1):
- JJException/ARC
- JJException/DeallocBlock
- JJException/Main
- JJException/MRC
- JJException/Swizzle
- JJException/ARC (0.2.1):
- JJException/DeallocBlock
- JJException/Main
- JJException/Swizzle
- JJException/DeallocBlock (0.2.1)
- JJException/Main (0.2.1)
- JJException/MRC (0.2.1):
- JJException/Main
- JJException/Swizzle
- JJException/Swizzle (0.2.1)
- JPush (3.1.1.1):
- JCore (~> 1.2.5)
- JXCategoryView (1.1.1)
......@@ -73,6 +91,7 @@ DEPENDENCIES:
- FMDB
- GDTMobSDK (~> 4.8.4)
- IQKeyboardManager
- JJException
- JPush
- JXCategoryView
- Masonry
......@@ -94,6 +113,7 @@ SPEC REPOS:
- HappyDNS
- IQKeyboardManager
- JCore
- JJException
- JPush
- JXCategoryView
- Masonry
......@@ -123,6 +143,7 @@ SPEC CHECKSUMS:
HappyDNS: dc6a164ee81979093123c241c6353bcf0218add6
IQKeyboardManager: 6194101620b73af5e67900b8f89707a99de0b804
JCore: 14706de2640b25fb77dbd02332696491407f37c9
JJException: 21e7415973adfb21d4b786e00e7bb8f6b7a7042b
JPush: 25dd9013fbe106082c14f9f30a82364ee98852fb
JXCategoryView: ff95fa1969519eee5344faac69c10a9cf0c59aea
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
......@@ -134,6 +155,6 @@ SPEC CHECKSUMS:
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
XRCarouselView: d3f949d1601e7de51604cdabd6e2f35a770e0f99
PODFILE CHECKSUM: 4d65c1b9d6ebab94bb2916a8dace0cf2c6f91cef
PODFILE CHECKSUM: 71a5b726636e0bf8e3ac45a110f209246877c965
COCOAPODS: 1.6.1
ColorfulSchool/Pods/Manifest.lock
......@@ -46,6 +46,24 @@ PODS:
- HappyDNS (0.3.14)
- IQKeyboardManager (6.2.0)
- JCore (1.2.5)
- JJException (0.2.1):
- JJException/All (= 0.2.1)
- JJException/All (0.2.1):
- JJException/ARC
- JJException/DeallocBlock
- JJException/Main
- JJException/MRC
- JJException/Swizzle
- JJException/ARC (0.2.1):
- JJException/DeallocBlock
- JJException/Main
- JJException/Swizzle
- JJException/DeallocBlock (0.2.1)
- JJException/Main (0.2.1)
- JJException/MRC (0.2.1):
- JJException/Main
- JJException/Swizzle
- JJException/Swizzle (0.2.1)
- JPush (3.1.1.1):
- JCore (~> 1.2.5)
- JXCategoryView (1.1.1)
......@@ -73,6 +91,7 @@ DEPENDENCIES:
- FMDB
- GDTMobSDK (~> 4.8.4)
- IQKeyboardManager
- JJException
- JPush
- JXCategoryView
- Masonry
......@@ -94,6 +113,7 @@ SPEC REPOS:
- HappyDNS
- IQKeyboardManager
- JCore
- JJException
- JPush
- JXCategoryView
- Masonry
......@@ -123,6 +143,7 @@ SPEC CHECKSUMS:
HappyDNS: dc6a164ee81979093123c241c6353bcf0218add6
IQKeyboardManager: 6194101620b73af5e67900b8f89707a99de0b804
JCore: 14706de2640b25fb77dbd02332696491407f37c9
JJException: 21e7415973adfb21d4b786e00e7bb8f6b7a7042b
JPush: 25dd9013fbe106082c14f9f30a82364ee98852fb
JXCategoryView: ff95fa1969519eee5344faac69c10a9cf0c59aea
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
......@@ -134,6 +155,6 @@ SPEC CHECKSUMS:
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
XRCarouselView: d3f949d1601e7de51604cdabd6e2f35a770e0f99
PODFILE CHECKSUM: 4d65c1b9d6ebab94bb2916a8dace0cf2c6f91cef
PODFILE CHECKSUM: 71a5b726636e0bf8e3ac45a110f209246877c965
COCOAPODS: 1.6.1
ColorfulSchool/Pods/Pods.xcodeproj/project.pbxproj
This source diff could not be displayed because it is too large. You can view the blob instead.
ColorfulSchool/Pods/Pods.xcodeproj/xcuserdata/liuzhuoxin.xcuserdatad/xcschemes/Pods-ColorfulSchool.xcscheme
......@@ -14,7 +14,7 @@
buildForArchiving = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DDC7926C870C4770529FFD32FB156927"
BlueprintIdentifier = "46430CFBD36A509A075C621B2768E2F9"
BuildableName = "libPods-ColorfulSchool.a"
BlueprintName = "Pods-ColorfulSchool"
ReferencedContainer = "container:Pods.xcodeproj">
......
ColorfulSchool/Pods/Pods.xcodeproj/xcuserdata/liuzhuoxin.xcuserdatad/xcschemes/Qiniu.xcscheme
......@@ -14,7 +14,7 @@
buildForArchiving = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5472EEAC8C3B55E383AD40139A1D06D3"
BlueprintIdentifier = "78105DBB1104B0D73215491EF64A11E5"
BuildableName = "libQiniu.a"
BlueprintName = "Qiniu"
ReferencedContainer = "container:Pods.xcodeproj">
......
ColorfulSchool/Pods/Pods.xcodeproj/xcuserdata/liuzhuoxin.xcuserdatad/xcschemes/ReactiveCocoa.xcscheme
......@@ -14,7 +14,7 @@
buildForArchiving = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "957CECD0BB152773227988ADE2FBC138"
BlueprintIdentifier = "C05278BA93CFB15ABD8335431AE5FEF1"
BuildableName = "libReactiveCocoa.a"
BlueprintName = "ReactiveCocoa"
ReferencedContainer = "container:Pods.xcodeproj">
......
ColorfulSchool/Pods/Pods.xcodeproj/xcuserdata/liuzhuoxin.xcuserdatad/xcschemes/SDWebImage.xcscheme
......@@ -14,7 +14,7 @@
buildForArchiving = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2BC26300B6C44E34944EBA8071984AC2"
BlueprintIdentifier = "4C739D26C5C685CF4CF18FCC73A92511"
BuildableName = "libSDWebImage.a"
BlueprintName = "SDWebImage"
ReferencedContainer = "container:Pods.xcodeproj">
......
ColorfulSchool/Pods/Pods.xcodeproj/xcuserdata/liuzhuoxin.xcuserdatad/xcschemes/SVProgressHUD.xcscheme
......@@ -14,7 +14,7 @@
buildForArchiving = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DA2786E07A0F575C81BBBFFDBC0B9021"
BlueprintIdentifier = "A2722A58701D1D75348571B7A6EDDFA3"
BuildableName = "libSVProgressHUD.a"
BlueprintName = "SVProgressHUD"
ReferencedContainer = "container:Pods.xcodeproj">
......
ColorfulSchool/Pods/Pods.xcodeproj/xcuserdata/liuzhuoxin.xcuserdatad/xcschemes/XRCarouselView.xcscheme
......@@ -14,7 +14,7 @@
buildForArchiving = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "75758959506C5D18CDA5AF567DE6BD34"
BlueprintIdentifier = "44FE8D361012B1D2056AB0BF1D33832A"
BuildableName = "libXRCarouselView.a"
BlueprintName = "XRCarouselView"
ReferencedContainer = "container:Pods.xcodeproj">
......
ColorfulSchool/Pods/Pods.xcodeproj/xcuserdata/liuzhuoxin.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -60,82 +60,89 @@
<key>orderHint</key>
<integer>7</integer>
</dict>
<key>JPush.xcscheme</key>
<key>JJException.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>8</integer>
</dict>
<key>JXCategoryView.xcscheme</key>
<key>JPush.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>9</integer>
</dict>
<key>JXCategoryView.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>10</integer>
</dict>
<key>MJExtension.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>11</integer>
<integer>12</integer>
</dict>
<key>MJRefresh.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>12</integer>
<integer>13</integer>
</dict>
<key>Masonry.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>10</integer>
<integer>11</integer>
</dict>
<key>Pods-ColorfulSchool.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>13</integer>
<integer>14</integer>
</dict>
<key>Qiniu.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>14</integer>
<integer>15</integer>
</dict>
<key>ReactiveCocoa.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>15</integer>
<integer>16</integer>
</dict>
<key>SDWebImage.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>16</integer>
<integer>17</integer>
</dict>
<key>SVProgressHUD.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>17</integer>
<integer>18</integer>
</dict>
<key>XRCarouselView.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>18</integer>
<integer>19</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
......
ColorfulSchool/Pods/Target Support Files/Pods-ColorfulSchool/Pods-ColorfulSchool-acknowledgements.markdown
......@@ -165,6 +165,31 @@ SOFTWARE.
Copyright jpush.cn
## JJException
MIT License
Copyright (c) 2018 jezz
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
## JPush
Copyright jiguang.cn
......
ColorfulSchool/Pods/Target Support Files/Pods-ColorfulSchool/Pods-ColorfulSchool-acknowledgements.plist
......@@ -226,6 +226,37 @@ SOFTWARE.
</dict>
<dict>
<key>FooterText</key>
<string>MIT License
Copyright (c) 2018 jezz
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
</string>
<key>License</key>
<string>MIT</string>
<key>Title</key>
<string>JJException</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>FooterText</key>
<string>Copyright jiguang.cn</string>
<key>License</key>
<string>Copyright</string>
......
ColorfulSchool/Pods/Target Support Files/Pods-ColorfulSchool/Pods-ColorfulSchool.adhot.xcconfig
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/DTCoreText" "${PODS_ROOT}/Headers/Public/DTFoundation" "${PODS_ROOT}/Headers/Public/FMDB" "${PODS_ROOT}/Headers/Public/GDTMobSDK" "${PODS_ROOT}/Headers/Public/HappyDNS" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JPush" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJExtension" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/Qiniu" "${PODS_ROOT}/Headers/Public/ReactiveCocoa" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/SVProgressHUD" "${PODS_ROOT}/Headers/Public/XRCarouselView" "$(SDKROOT)/usr/include/libxml2" $(SDKROOT)/usr/include/libxml2
LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/DTCoreText" "${PODS_CONFIGURATION_BUILD_DIR}/DTFoundation" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/HappyDNS" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/JXCategoryView" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/Qiniu" "${PODS_CONFIGURATION_BUILD_DIR}/ReactiveCocoa" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/XRCarouselView" "${PODS_ROOT}/GDTMobSDK/lib" "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush"
OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"DTCoreText" -l"DTFoundation" -l"FMDB" -l"GDTMobSDK" -l"HappyDNS" -l"IQKeyboardManager" -l"JXCategoryView" -l"MJExtension" -l"MJRefresh" -l"Masonry" -l"Qiniu" -l"ReactiveCocoa" -l"SDWebImage" -l"SVProgressHUD" -l"XRCarouselView" -l"jcore-ios-1.2.5" -l"jpush-ios-3.1.1" -l"resolv" -l"sqlite3" -l"xml2" -l"z" -framework "AVFoundation" -framework "AdSupport" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreLocation" -framework "CoreTelephony" -framework "CoreText" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Security" -framework "StoreKit" -framework "SystemConfiguration" -framework "UIKit" -weak_framework "UserNotifications" -weak_framework "WebKit"
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/DTCoreText" "${PODS_ROOT}/Headers/Public/DTFoundation" "${PODS_ROOT}/Headers/Public/FMDB" "${PODS_ROOT}/Headers/Public/GDTMobSDK" "${PODS_ROOT}/Headers/Public/HappyDNS" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JJException" "${PODS_ROOT}/Headers/Public/JPush" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJExtension" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/Qiniu" "${PODS_ROOT}/Headers/Public/ReactiveCocoa" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/SVProgressHUD" "${PODS_ROOT}/Headers/Public/XRCarouselView" "$(SDKROOT)/usr/include/libxml2" $(SDKROOT)/usr/include/libxml2
LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/DTCoreText" "${PODS_CONFIGURATION_BUILD_DIR}/DTFoundation" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/HappyDNS" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/JJException" "${PODS_CONFIGURATION_BUILD_DIR}/JXCategoryView" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/Qiniu" "${PODS_CONFIGURATION_BUILD_DIR}/ReactiveCocoa" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/XRCarouselView" "${PODS_ROOT}/GDTMobSDK/lib" "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush"
OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"DTCoreText" -l"DTFoundation" -l"FMDB" -l"GDTMobSDK" -l"HappyDNS" -l"IQKeyboardManager" -l"JJException" -l"JXCategoryView" -l"MJExtension" -l"MJRefresh" -l"Masonry" -l"Qiniu" -l"ReactiveCocoa" -l"SDWebImage" -l"SVProgressHUD" -l"XRCarouselView" -l"jcore-ios-1.2.5" -l"jpush-ios-3.1.1" -l"resolv" -l"sqlite3" -l"xml2" -l"z" -framework "AVFoundation" -framework "AdSupport" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreLocation" -framework "CoreTelephony" -framework "CoreText" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Security" -framework "StoreKit" -framework "SystemConfiguration" -framework "UIKit" -weak_framework "UserNotifications" -weak_framework "WebKit"
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
......
ColorfulSchool/Pods/Target Support Files/Pods-ColorfulSchool/Pods-ColorfulSchool.debug.xcconfig
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/DTCoreText" "${PODS_ROOT}/Headers/Public/DTFoundation" "${PODS_ROOT}/Headers/Public/FMDB" "${PODS_ROOT}/Headers/Public/GDTMobSDK" "${PODS_ROOT}/Headers/Public/HappyDNS" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JPush" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJExtension" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/Qiniu" "${PODS_ROOT}/Headers/Public/ReactiveCocoa" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/SVProgressHUD" "${PODS_ROOT}/Headers/Public/XRCarouselView" "$(SDKROOT)/usr/include/libxml2" $(SDKROOT)/usr/include/libxml2
LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/DTCoreText" "${PODS_CONFIGURATION_BUILD_DIR}/DTFoundation" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/HappyDNS" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/JXCategoryView" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/Qiniu" "${PODS_CONFIGURATION_BUILD_DIR}/ReactiveCocoa" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/XRCarouselView" "${PODS_ROOT}/GDTMobSDK/lib" "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush"
OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"DTCoreText" -l"DTFoundation" -l"FMDB" -l"GDTMobSDK" -l"HappyDNS" -l"IQKeyboardManager" -l"JXCategoryView" -l"MJExtension" -l"MJRefresh" -l"Masonry" -l"Qiniu" -l"ReactiveCocoa" -l"SDWebImage" -l"SVProgressHUD" -l"XRCarouselView" -l"jcore-ios-1.2.5" -l"jpush-ios-3.1.1" -l"resolv" -l"sqlite3" -l"xml2" -l"z" -framework "AVFoundation" -framework "AdSupport" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreLocation" -framework "CoreTelephony" -framework "CoreText" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Security" -framework "StoreKit" -framework "SystemConfiguration" -framework "UIKit" -weak_framework "UserNotifications" -weak_framework "WebKit"
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/DTCoreText" "${PODS_ROOT}/Headers/Public/DTFoundation" "${PODS_ROOT}/Headers/Public/FMDB" "${PODS_ROOT}/Headers/Public/GDTMobSDK" "${PODS_ROOT}/Headers/Public/HappyDNS" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JJException" "${PODS_ROOT}/Headers/Public/JPush" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJExtension" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/Qiniu" "${PODS_ROOT}/Headers/Public/ReactiveCocoa" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/SVProgressHUD" "${PODS_ROOT}/Headers/Public/XRCarouselView" "$(SDKROOT)/usr/include/libxml2" $(SDKROOT)/usr/include/libxml2
LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/DTCoreText" "${PODS_CONFIGURATION_BUILD_DIR}/DTFoundation" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/HappyDNS" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/JJException" "${PODS_CONFIGURATION_BUILD_DIR}/JXCategoryView" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/Qiniu" "${PODS_CONFIGURATION_BUILD_DIR}/ReactiveCocoa" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/XRCarouselView" "${PODS_ROOT}/GDTMobSDK/lib" "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush"
OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"DTCoreText" -l"DTFoundation" -l"FMDB" -l"GDTMobSDK" -l"HappyDNS" -l"IQKeyboardManager" -l"JJException" -l"JXCategoryView" -l"MJExtension" -l"MJRefresh" -l"Masonry" -l"Qiniu" -l"ReactiveCocoa" -l"SDWebImage" -l"SVProgressHUD" -l"XRCarouselView" -l"jcore-ios-1.2.5" -l"jpush-ios-3.1.1" -l"resolv" -l"sqlite3" -l"xml2" -l"z" -framework "AVFoundation" -framework "AdSupport" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreLocation" -framework "CoreTelephony" -framework "CoreText" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Security" -framework "StoreKit" -framework "SystemConfiguration" -framework "UIKit" -weak_framework "UserNotifications" -weak_framework "WebKit"
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
......
ColorfulSchool/Pods/Target Support Files/Pods-ColorfulSchool/Pods-ColorfulSchool.release.xcconfig
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/DTCoreText" "${PODS_ROOT}/Headers/Public/DTFoundation" "${PODS_ROOT}/Headers/Public/FMDB" "${PODS_ROOT}/Headers/Public/GDTMobSDK" "${PODS_ROOT}/Headers/Public/HappyDNS" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JPush" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJExtension" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/Qiniu" "${PODS_ROOT}/Headers/Public/ReactiveCocoa" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/SVProgressHUD" "${PODS_ROOT}/Headers/Public/XRCarouselView" "$(SDKROOT)/usr/include/libxml2" $(SDKROOT)/usr/include/libxml2
LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/DTCoreText" "${PODS_CONFIGURATION_BUILD_DIR}/DTFoundation" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/HappyDNS" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/JXCategoryView" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/Qiniu" "${PODS_CONFIGURATION_BUILD_DIR}/ReactiveCocoa" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/XRCarouselView" "${PODS_ROOT}/GDTMobSDK/lib" "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush"
OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"DTCoreText" -l"DTFoundation" -l"FMDB" -l"GDTMobSDK" -l"HappyDNS" -l"IQKeyboardManager" -l"JXCategoryView" -l"MJExtension" -l"MJRefresh" -l"Masonry" -l"Qiniu" -l"ReactiveCocoa" -l"SDWebImage" -l"SVProgressHUD" -l"XRCarouselView" -l"jcore-ios-1.2.5" -l"jpush-ios-3.1.1" -l"resolv" -l"sqlite3" -l"xml2" -l"z" -framework "AVFoundation" -framework "AdSupport" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreLocation" -framework "CoreTelephony" -framework "CoreText" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Security" -framework "StoreKit" -framework "SystemConfiguration" -framework "UIKit" -weak_framework "UserNotifications" -weak_framework "WebKit"
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/DTCoreText" "${PODS_ROOT}/Headers/Public/DTFoundation" "${PODS_ROOT}/Headers/Public/FMDB" "${PODS_ROOT}/Headers/Public/GDTMobSDK" "${PODS_ROOT}/Headers/Public/HappyDNS" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JJException" "${PODS_ROOT}/Headers/Public/JPush" "${PODS_ROOT}/Headers/Public/JXCategoryView" "${PODS_ROOT}/Headers/Public/MJExtension" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/Qiniu" "${PODS_ROOT}/Headers/Public/ReactiveCocoa" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/SVProgressHUD" "${PODS_ROOT}/Headers/Public/XRCarouselView" "$(SDKROOT)/usr/include/libxml2" $(SDKROOT)/usr/include/libxml2
LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/DTCoreText" "${PODS_CONFIGURATION_BUILD_DIR}/DTFoundation" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/HappyDNS" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/JJException" "${PODS_CONFIGURATION_BUILD_DIR}/JXCategoryView" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/Qiniu" "${PODS_CONFIGURATION_BUILD_DIR}/ReactiveCocoa" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/XRCarouselView" "${PODS_ROOT}/GDTMobSDK/lib" "${PODS_ROOT}/JCore" "${PODS_ROOT}/JPush"
OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"DTCoreText" -l"DTFoundation" -l"FMDB" -l"GDTMobSDK" -l"HappyDNS" -l"IQKeyboardManager" -l"JJException" -l"JXCategoryView" -l"MJExtension" -l"MJRefresh" -l"Masonry" -l"Qiniu" -l"ReactiveCocoa" -l"SDWebImage" -l"SVProgressHUD" -l"XRCarouselView" -l"jcore-ios-1.2.5" -l"jpush-ios-3.1.1" -l"resolv" -l"sqlite3" -l"xml2" -l"z" -framework "AVFoundation" -framework "AdSupport" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreLocation" -framework "CoreTelephony" -framework "CoreText" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Security" -framework "StoreKit" -framework "SystemConfiguration" -framework "UIKit" -weak_framework "UserNotifications" -weak_framework "WebKit"
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
......
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