Skip to content

C
colorfulSchoolReconsitution
Commit f654d12d by 刘卓鑫
Options

Merge branch '3.8.7optimize' into 'Develop'

3.8.7optimize See merge request !4
parents 95ea42bd 4bb0a004
Showing with 213 additions and 595 deletions
ColorfulSchool/ColorfulSchool.xcodeproj/xcshareddata/xcschemes/ColorfulSchool.xcscheme
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</AdditionalOptions> </AdditionalOptions>
</TestAction> </TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Release" buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0" launchStyle = "0"
......
ColorfulSchool/ColorfulSchool.xcworkspace/xcuserdata/liuzhuoxin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
...@@ -11,30 +11,20 @@ ...@@ -11,30 +11,20 @@
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
scope = "1" scope = "1"
stopOnStyle = "0"> stopOnStyle = "0">
<Actions>
<BreakpointActionProxy
ActionExtensionID = "Xcode.BreakpointAction.DebuggerCommand">
<ActionContent
consoleCommand = "">
</ActionContent>
</BreakpointActionProxy>
</Actions>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
shouldBeEnabled = "Yes" shouldBeEnabled = "No"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/CustomViews(&#x81ea;&#x5b9a;&#x4e49;)/UIView+NineLayoutView.m" filePath = "ColorfulSchool/Classes/Tool(&#x5de5;&#x5177;)/ZXTool.m"
timestampString = "587641772.255725" timestampString = "588735277.853282"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "235" startingLineNumber = "1765"
endingLineNumber = "235" endingLineNumber = "1765">
landmarkName = "-touchItem:"
landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy
...@@ -43,46 +33,46 @@ ...@@ -43,46 +33,46 @@
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/MineView(&#x4e2a;&#x4eba;&#x4e2d;&#x5fc3;)/UserSetting/UserSet/Controller/ZXSettingViewController.m" filePath = "ColorfulSchool/Classes/JTJY(&#x91d1;&#x56fe;&#x6559;&#x80b2;)/ZXJTJYViewController.m"
timestampString = "588079587.052711" timestampString = "583656856.343848"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "252" startingLineNumber = "124"
endingLineNumber = "252" endingLineNumber = "124"
landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkName = "-webView:didFailNavigation:withError:"
landmarkType = "7"> landmarkType = "7">
<Locations> </BreakpointContent>
<Location </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "__59-[ZXSettingViewController tableView:cellForRowAtIndexPath:]_block_invoke_3.233" filePath = "ColorfulSchool/Classes/NewFirstPage(&#x65b0;&#x7248;&#x9996;&#x9875;)/Controllers/ZTHomeViewController+Extension.m"
moduleName = "ColorfulSchool" timestampString = "585484152.378459"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/liuzhuoxin/codeStore/colorfulSchoolReconsitution/ColorfulSchool/ColorfulSchool/Classes/MineView(%E4%B8%AA%E4%BA%BA%E4%B8%AD%E5%BF%83)/UserSetting/UserSet/Controller/ZXSettingViewController.m"
timestampString = "588079587.348212"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "252" startingLineNumber = "346"
endingLineNumber = "252" endingLineNumber = "346"
offsetFromSymbolStart = "96"> landmarkName = "-firstPageJumpActionWithInfo:"
</Location> landmarkType = "7">
<Location </BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "__59-[ZXSettingViewController tableView:cellForRowAtIndexPath:]_block_invoke_4" filePath = "ColorfulSchool/Classes/Operation(&#x81ea;&#x52a9;&#x670d;&#x52a1;)/appointmentBath(&#x9884;&#x7ea6;&#x6d17;&#x6d74;)/ViewModel/ZXAppointBathService.m"
moduleName = "ColorfulSchool" timestampString = "585499296.668223"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/liuzhuoxin/codeStore/colorfulSchoolReconsitution/ColorfulSchool/ColorfulSchool/Classes/MineView(%E4%B8%AA%E4%BA%BA%E4%B8%AD%E5%BF%83)/UserSetting/UserSet/Controller/ZXSettingViewController.m"
timestampString = "588079587.35368"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "252" startingLineNumber = "225"
endingLineNumber = "252" endingLineNumber = "225"
offsetFromSymbolStart = "32"> landmarkName = "+dealAccountActionWithOperationMode:isBlueBath:completed:"
</Location> landmarkType = "7">
</Locations>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
</Breakpoints> </Breakpoints>
......
ColorfulSchool/ColorfulSchool/AppDelegate+Extension.h
...@@ -17,8 +17,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -17,8 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
#pragma mark - ========== 开屏广告 ========== #pragma mark - ========== 开屏广告 ==========
- (void) loadLauchAd; - (void) loadLauchAd;
#pragma mark - ========== 本地版本检测 ==========
- (void) localVersionCheckCompleted:(dispatch_block_t) completed;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
ColorfulSchool/ColorfulSchool/AppDelegate+Extension.m
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#import <AdSupport/AdSupport.h> #import <AdSupport/AdSupport.h>
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>
#import <MediaPlayer/MediaPlayer.h> #import <MediaPlayer/MediaPlayer.h>
#import "LoginView.h"
#import "XMGNavigationViewController.h" #import "XMGNavigationViewController.h"
#import "XMGFileTool.h" #import "XMGFileTool.h"
#import "ZXSections.h" #import "ZXSections.h"
...@@ -22,6 +21,7 @@ ...@@ -22,6 +21,7 @@
#import <Bugly/Bugly.h> #import <Bugly/Bugly.h>
#import <IQKeyboardManager/IQKeyboardManager.h> #import <IQKeyboardManager/IQKeyboardManager.h>
#import <JJException/JJException.h> #import <JJException/JJException.h>
#import "ZXLoginViewController.h"
@implementation AppDelegate (Extension) @implementation AppDelegate (Extension)
#pragma mark - ========== 默认配置部分 ========== #pragma mark - ========== 默认配置部分 ==========
- (void) defaultLauchConfigAndIsOpenPreventCrashManager:(BOOL) open { - (void) defaultLauchConfigAndIsOpenPreventCrashManager:(BOOL) open {
...@@ -36,13 +36,6 @@ ...@@ -36,13 +36,6 @@
[[JDPAuthSDK sharedJDPay] registServiceWithAppID:@"472e3b43e32aac8711df1c7586b89a2a" merchantID:@"110979562002"]; [[JDPAuthSDK sharedJDPay] registServiceWithAppID:@"472e3b43e32aac8711df1c7586b89a2a" merchantID:@"110979562002"];
//请求最新的是否需要曝光配置 //请求最新的是否需要曝光配置
[ZXTool requestIsNeedExposure]; [ZXTool requestIsNeedExposure];
//京东cps联盟
[[KeplerApiManager sharedKPService] asyncInitSdk:@"02dda8fb6452fadc99e2a5c3c8910192" secretKey:@"9fe020c81dbd420ea3bc894d38e2d1c5" sucessCallback:^(){
NSLog(@"京东联盟sdk注册成功");
}failedCallback:^(NSError *error){
//京东联盟sdk注册失败
NSLog(@"京东联盟sdk注册失败---%@", error);
}];
//bugly //bugly
[Bugly startWithAppId:@"d3a5bd8d35"]; [Bugly startWithAppId:@"d3a5bd8d35"];
...@@ -58,7 +51,13 @@ ...@@ -58,7 +51,13 @@
[JJException configExceptionCategory:JJExceptionGuardAll]; [JJException configExceptionCategory:JJExceptionGuardAll];
[JJException startGuardException]; [JJException startGuardException];
} }
//京东cps联盟
[[KeplerApiManager sharedKPService] asyncInitSdk:@"02dda8fb6452fadc99e2a5c3c8910192" secretKey:@"9fe020c81dbd420ea3bc894d38e2d1c5" sucessCallback:^(){
NSLog(@"京东联盟sdk注册成功");
}failedCallback:^(NSError *error){
//京东联盟sdk注册失败
NSLog(@"京东联盟sdk注册失败---%@", error);
}];
//网络监测 //网络监测
[self checkNetworkingStatus]; [self checkNetworkingStatus];
} }
...@@ -121,37 +120,6 @@ ...@@ -121,37 +120,6 @@
} }
#pragma mark - ==========本地版本检测==========
-(void) localVersionCheckCompleted:(dispatch_block_t) completed {
NSString *onceVersion = [kUserDefaults valueForKey:@"onceVersion"];
NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
NSString *app_Version = [infoDictionary objectForKey:@"CFBundleShortVersionString"];
if (onceVersion == nil || (onceVersion && [onceVersion isKindOfClass:[NSString class]] && ![app_Version isEqualToString:onceVersion])) {
//不一样 说明在appstore更新了或者
[XMGFileTool removeDirectoryPath:CachePath];
[ZXNotPay clearTable];
[ExpecptionModel clearTable];
[ZXSections clearTable];
[ZXInformation clearTable];
NSString *appDomainStr = [[NSBundle mainBundle] bundleIdentifier];
[[NSUserDefaults standardUserDefaults] removePersistentDomainForName:appDomainStr];
//存储当前版本
[kUserDefaults setValue:app_Version forKey:@"onceVersion"];
[kUserDefaults synchronize];
//清空之后 重设api
[APIManager sharedAPIManager].lauchEnvironment = [APIManager sharedAPIManager].lauchEnvironment;
LoginView * rootView = [[LoginView alloc]init];
XMGNavigationViewController * rootViewNav = [[XMGNavigationViewController alloc]initWithRootViewController:rootView];
self.window.rootViewController = rootViewNav;
} else {
//没有 存储当前版本
[kUserDefaults setValue:app_Version forKey:@"onceVersion"];
[kUserDefaults synchronize];
completed();
}
}
@end @end
ColorfulSchool/ColorfulSchool/AppDelegate.m
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#import "FTUploader.h" #import "FTUploader.h"
#import "ZXNewOrderDetailViewController.h" #import "ZXNewOrderDetailViewController.h"
#import <AFNetworkReachabilityManager.h> #import <AFNetworkReachabilityManager.h>
// 引入JPush功能所需头文件 // 引入JPush功能所需头文件
#import <JPUSHService.h> #import <JPUSHService.h>
// iOS10注册APNs所需头文件 // iOS10注册APNs所需头文件
...@@ -63,11 +62,8 @@ ...@@ -63,11 +62,8 @@
_isPlaying = NO; _isPlaying = NO;
//默认配置
[self defaultLauchConfigAndIsOpenPreventCrashManager:YES];
//启动环境 //启动环境
[APIManager sharedAPIManager].lauchEnvironment = ZXColorfulSchoolEnvironmentProduct; [APIManager sharedAPIManager].lauchEnvironment = ZXColorfulSchoolEnvironmentTest;
//极光推送 //极光推送
[self initPushWithOptions:launchOptions isProduct:YES]; [self initPushWithOptions:launchOptions isProduct:YES];
...@@ -87,8 +83,11 @@ ...@@ -87,8 +83,11 @@
// YYFPSLabel *fps = [[YYFPSLabel alloc] initWithFrame:CGRectMake(kScreenWidth - 150, kScreenHeight - 100, 100, 30)]; // YYFPSLabel *fps = [[YYFPSLabel alloc] initWithFrame:CGRectMake(kScreenWidth - 150, kScreenHeight - 100, 100, 30)];
// [kAppWindow addSubview:fps]; // [kAppWindow addSubview:fps];
//默认配置
[self defaultLauchConfigAndIsOpenPreventCrashManager:YES];
//防止蓝牙洗浴后台运行被系统中断 //防止蓝牙洗浴后台运行被系统中断
NSTimer *timer = [NSTimer scheduledTimerWithTimeInterval:10 target:self selector:@selector(ccc) userInfo:nil repeats:YES]; NSTimer *timer = [NSTimer scheduledTimerWithTimeInterval:20 target:self selector:@selector(ccc) userInfo:nil repeats:YES];
[[NSRunLoop mainRunLoop] addTimer:timer forMode:NSRunLoopCommonModes]; [[NSRunLoop mainRunLoop] addTimer:timer forMode:NSRunLoopCommonModes];
return YES; return YES;
} }
...@@ -188,7 +187,6 @@ ...@@ -188,7 +187,6 @@
[[UIScreen mainScreen] setBrightness:1];//点亮 [[UIScreen mainScreen] setBrightness:1];//点亮
} }
} }
} @catch (NSException *exception) { } @catch (NSException *exception) {
} @finally { } @finally {
......
ColorfulSchool/ColorfulSchool/Classes/Config(配置)/APIManager.m
// //
...@@ -14,7 +14,7 @@ kSINGLETON_FOR_CLASS(APIManager) ...@@ -14,7 +14,7 @@ kSINGLETON_FOR_CLASS(APIManager)
- (void)setLauchEnvironment:(ZXColorfulSchoolEnvironmentType)lauchEnvironment { - (void)setLauchEnvironment:(ZXColorfulSchoolEnvironmentType)lauchEnvironment {
_lauchEnvironment = lauchEnvironment; _lauchEnvironment = lauchEnvironment;
[kUserDefaults setObject:@"0" forKey:@"schoolId"];
switch (_lauchEnvironment) { switch (_lauchEnvironment) {
case ZXColorfulSchoolEnvironmentDevelop: { case ZXColorfulSchoolEnvironmentDevelop: {
NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults]; NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
......
ColorfulSchool/ColorfulSchool/Classes/CustomViews(自定义)/AlertView/AlertStyleSimple.m
// //
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
} }
- (float) heightForString:(NSString *)value fontSize:(float)fontSize andWidth:(float)width - (float) heightForString:(NSString *)value fontSize:(float)fontSize andWidth:(float)width
{ {
CGSize sizeToFit = [value sizeWithFont:[UIFont systemFontOfSize:fontSize] constrainedToSize:CGSizeMake(width, CGFLOAT_MAX) lineBreakMode:UILineBreakModeWordWrap];//此处的换行类型（lineBreakMode）可根据自己的实际情况进行设置 CGSize sizeToFit = [value sizeWithFont:[UIFont systemFontOfSize:fontSize] constrainedToSize:CGSizeMake(width, CGFLOAT_MAX) lineBreakMode:UILineBreakModeWordWrap];//此处的换行类型（lineBreakMode）可根据自己的实际情况进行设置
return sizeToFit.height; return sizeToFit.height;
} }
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/Controller/ZXHomePageFeedBackViewController.m
// //
...@@ -247,10 +247,10 @@ ...@@ -247,10 +247,10 @@
} }
- (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
if (self.isScrollBottom == NO) { //只在初始化的时候执行 if (self.isScrollBottom == NO) { //只在初始化的时候执行
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.005 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
if (self.dataSource.count > 0) { if (self.dataSource.count > 0) {
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:([self.myTableView numberOfRowsInSection:0]-1) inSection:0]; NSIndexPath *indexPath = [NSIndexPath indexPathForRow:(self.dataSource.count-1) inSection:0];
[self.myTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:NO]; [self.myTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:NO];
} }
}); });
...@@ -365,7 +365,7 @@ ...@@ -365,7 +365,7 @@
[ZXTool hideLoadingAnimation]; [ZXTool hideLoadingAnimation];
[self.dataSource addObject:model]; [self.dataSource addObject:model];
[self.myTableView reloadData]; [self.myTableView reloadData];
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:([self.myTableView numberOfRowsInSection:0]-1) inSection:0]; NSIndexPath *indexPath = [NSIndexPath indexPathForRow:(self.dataSource.count-1) inSection:0];
[self.myTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:NO]; [self.myTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:NO];
}); });
} }
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/Controller/ZXHomePageViewController+Extension.m
// //
...@@ -406,7 +406,7 @@ ...@@ -406,7 +406,7 @@
- (NSString *) formatJumpUrl:(NSString *) jumpUrl { - (NSString *) formatJumpUrl:(NSString *) jumpUrl {
ASIdentifierManager *asIM = [[ASIdentifierManager alloc] init]; ASIdentifierManager *asIM = [[ASIdentifierManager alloc] init];
NSString *idfa = [asIM.advertisingIdentifier UUIDString]; NSString *idfa = [asIM.advertisingIdentifier UUIDString];
NSString *j_url = [[[[[[[jumpUrl stringByReplacingOccurrencesOfString:@"${schoolid}" withString:CacheCampusId] stringByReplacingOccurrencesOfString:@"${userid}" withString:CacheUserId] stringByReplacingOccurrencesOfString:@"${im}" withString:@"none"] stringByReplacingOccurrencesOfString:@"${ia}" withString:idfa] stringByReplacingOccurrencesOfString:@"${imMD5}" withString:@"none"] stringByReplacingOccurrencesOfString:@"${androidId}" withString:@"none"] stringByReplacingOccurrencesOfString:@"${versionid}" withString:APPversion]; NSString *j_url = [[[[[[[jumpUrl stringByReplacingOccurrencesOfString:@"${schoolid}" withString:CacheCampusId?CacheCampusId:@""] stringByReplacingOccurrencesOfString:@"${userid}" withString:CacheUserId?CacheUserId:@""] stringByReplacingOccurrencesOfString:@"${im}" withString:@"none"] stringByReplacingOccurrencesOfString:@"${ia}" withString:idfa?idfa:@""] stringByReplacingOccurrencesOfString:@"${imMD5}" withString:@"none"] stringByReplacingOccurrencesOfString:@"${androidId}" withString:@"none"] stringByReplacingOccurrencesOfString:@"${versionid}" withString:APPversion?APPversion:@""];
return j_url; return j_url;
} }
@end @end
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/Controller/ZXHomePageViewController.m
// //
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#import "AimiWalletViewController.h" #import "AimiWalletViewController.h"
#import "enlargeClickRegionBtn.h" #import "enlargeClickRegionBtn.h"
#import "CropImageController.h" #import "CropImageController.h"
@interface ZXHomePageViewController ()<UITableViewDelegate, UITableViewDataSource, UINavigationControllerDelegate, UIImagePickerControllerDelegate, CropImageDelegate> @interface ZXHomePageViewController ()<UITableViewDelegate, UITableViewDataSource, UINavigationControllerDelegate, UIImagePickerControllerDelegate, CropImageDelegate>
/** tableview */ /** tableview */
@property (nonatomic, strong) UITableView *myTableView; @property (nonatomic, strong) UITableView *myTableView;
...@@ -213,6 +214,8 @@ ...@@ -213,6 +214,8 @@
kWeakSelf(self); kWeakSelf(self);
self.announce = [[ZXHomePageAnnounceView alloc] initWithFrame:[UIScreen mainScreen].bounds jumpUrl:@""]; self.announce = [[ZXHomePageAnnounceView alloc] initWithFrame:[UIScreen mainScreen].bounds jumpUrl:@""];
self.announce.htmlStr = info.content; self.announce.htmlStr = info.content;
[self.tabBarController.view addSubview:self.announce];
self.announce.comfirm = ^(BOOL isNotAlert) { self.announce.comfirm = ^(BOOL isNotAlert) {
kStrongSelf(self); kStrongSelf(self);
self.announce.hidden = YES; self.announce.hidden = YES;
...@@ -222,7 +225,6 @@ ...@@ -222,7 +225,6 @@
[self.service notShowAlertAnnounceByNoticeCode:info.noticeCode]; [self.service notShowAlertAnnounceByNoticeCode:info.noticeCode];
} }
}; };
[self.tabBarController.view addSubview:self.announce];
} }
- (NSInteger) numberOfSectionsInTableView:(UITableView *)tableView { - (NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
...@@ -561,12 +563,12 @@ ...@@ -561,12 +563,12 @@
@strongify(self); @strongify(self);
self.isShowFirstRecharge = NO; self.isShowFirstRecharge = NO;
AimiWalletViewController * view = [[AimiWalletViewController alloc]init]; AimiWalletViewController * view = [[AimiWalletViewController alloc]init];
view.hidesBottomBarWhenPushed = YES; view.comeFrom = @"firstTopUp";
view.comeFrom=@"firstTopUp";
[self.navigationController pushViewController:view animated:YES]; [self.navigationController pushViewController:view animated:YES];
}]; }];
firstRechargeView.frame = [UIScreen mainScreen].bounds; firstRechargeView.frame = [UIScreen mainScreen].bounds;
[self.tabBarController.view addSubview:firstRechargeView]; [self.tabBarController.view addSubview:firstRechargeView];
} }
- (void) createNotPayAndAnnouceView { - (void) createNotPayAndAnnouceView {
//待支付订单view //待支付订单view
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/Cells/ZXHomePageAnnouceCell.m
// //
...@@ -68,12 +68,12 @@ ...@@ -68,12 +68,12 @@
make.left.equalTo(imageV).offset(10 * k6Scale); make.left.equalTo(imageV).offset(10 * k6Scale);
make.top.equalTo(imageV.mas_top); make.top.equalTo(imageV.mas_top);
make.right.equalTo(imageV).offset(-10 * k6Scale); make.right.equalTo(imageV).offset(-10 * k6Scale);
make.height.mas_equalTo(140 * k6Scale); make.height.mas_equalTo(144 * k6Scale);
}]; }];
[self.dateCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { [self.dateCountLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(imageV.mas_right).offset(-20 * k6Scale); make.right.equalTo(imageV.mas_right).offset(-20 * k6Scale);
make.top.equalTo(self.ContentImageView.mas_bottom).offset(15 * k6Scale); make.top.equalTo(self.ContentImageView.mas_bottom).offset(12 * k6Scale);
}]; }];
[self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) {
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/Cells/ZXHomePageSteamCell.m
// //
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
if (_child.iosButtAddress) { if (_child.iosButtAddress) {
ASIdentifierManager *asIM = [[ASIdentifierManager alloc] init]; ASIdentifierManager *asIM = [[ASIdentifierManager alloc] init];
NSString *idfa = [asIM.advertisingIdentifier UUIDString]; NSString *idfa = [asIM.advertisingIdentifier UUIDString];
NSString *jumpUrl = [[[[[[[_child.iosButtAddress stringByReplacingOccurrencesOfString:@"${schoolid}" withString:CacheCampusId] stringByReplacingOccurrencesOfString:@"${userid}" withString:CacheUserId] stringByReplacingOccurrencesOfString:@"${im}" withString:@"none"] stringByReplacingOccurrencesOfString:@"${ia}" withString:idfa] stringByReplacingOccurrencesOfString:@"${imMD5}" withString:@"none"] stringByReplacingOccurrencesOfString:@"${androidId}" withString:@"none"] stringByReplacingOccurrencesOfString:@"${versionid}" withString:APPversion]; NSString *jumpUrl = [[[[[[[_child.iosButtAddress stringByReplacingOccurrencesOfString:@"${schoolid}" withString:CacheCampusId?CacheCampusId:@""] stringByReplacingOccurrencesOfString:@"${userid}" withString:CacheUserId?CacheUserId:@""] stringByReplacingOccurrencesOfString:@"${im}" withString:@"none"] stringByReplacingOccurrencesOfString:@"${ia}" withString:idfa?idfa:@""] stringByReplacingOccurrencesOfString:@"${imMD5}" withString:@"none"] stringByReplacingOccurrencesOfString:@"${androidId}" withString:@"none"] stringByReplacingOccurrencesOfString:@"${versionid}" withString:APPversion?APPversion:@""];
self.webUrl = jumpUrl; self.webUrl = jumpUrl;
[self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:jumpUrl]]]; [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:jumpUrl]]];
} }
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/customViews/ZXHomePageAnnounceView.m
...@@ -115,8 +115,8 @@ ...@@ -115,8 +115,8 @@
} }
#pragma mark - ==========确定事件========== #pragma mark - ==========确定事件==========
- (void) okAction:(UIButton *) sender { - (void) okAction:(UIButton *) sender {
self.hidden =YES; // self.hidden =YES;
[self removeFromSuperview]; // [self removeFromSuperview];
if (self.comfirm) { if (self.comfirm) {
self.comfirm(self.agreedBtn.selected); self.comfirm(self.agreedBtn.selected);
} }
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/NewFirstPage(新版首页)/Controllers/ZTHomeViewController.m
// //
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
#import "UserCenterModel.h" #import "UserCenterModel.h"
#import "AimiWalletViewController.h" #import "AimiWalletViewController.h"
#import "LoginModel.h" #import "LoginModel.h"
#import "LoginView.h"
#import "ZXWashTabbarViewController.h" #import "ZXWashTabbarViewController.h"
#include "enlargeClickRegionBtn.h" #include "enlargeClickRegionBtn.h"
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/NewFirstPage(新版首页)/Controllers/ZXBannerJumpViewController+Extension.m
// //
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#import "ZXBannerJumpViewController.h" #import "ZXBannerJumpViewController.h"
#import "XMNetworking.h" #import "XMNetworking.h"
#import "ZXMallViewController.h" #import "ZXMallViewController.h"
#import "LoginView.h"
#import "LoginModel.h" #import "LoginModel.h"
#import "AppDelegate.h" #import "AppDelegate.h"
@implementation ZXBannerJumpViewController (Extension) @implementation ZXBannerJumpViewController (Extension)
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/NewFirstPage(新版首页)/ViewModel/ZXFirstPageService.m
// //
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#import "ZXSections.h" #import "ZXSections.h"
#import "ZXInformation.h" #import "ZXInformation.h"
#import "LoginModel.h" #import "LoginModel.h"
#import "LoginView.h"
#import "ZXCoverAdModel.h" #import "ZXCoverAdModel.h"
@implementation ZXFirstPageService @implementation ZXFirstPageService
- (NSMutableArray *)sections { - (NSMutableArray *)sections {
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/1.0Version(1.0购券)/UserEquipment/Controller/UseEquipmentController.m
// //
...@@ -290,23 +290,23 @@ heightForFooterInSection:(NSInteger)section ...@@ -290,23 +290,23 @@ heightForFooterInSection:(NSInteger)section
TicketItem * deltTicketItem=self.fetchTicketDeviceModel.ticketAndDevieceItem.userCouponList[deleteRow-1000]; TicketItem * deltTicketItem=self.fetchTicketDeviceModel.ticketAndDevieceItem.userCouponList[deleteRow-1000];
if (_alert!=nil) { if (self.alert!=nil) {
[_alert removeFromSuperview]; [self.alert removeFromSuperview];
_alert=nil; self.alert=nil;
} }
_alert=[[DeleteAlertView alloc]initWithFrame:CGRectMake(0, 0, kWidth, kHeight)]; self.alert=[[DeleteAlertView alloc]initWithFrame:CGRectMake(0, 0, kWidth, kHeight)];
_alert.message=[NSString stringWithFormat:@"是否确定删除%@券",self.equipItem.serviceName] ; self.alert.message=[NSString stringWithFormat:@"是否确定删除%@券",self.equipItem.serviceName] ;
__weak typeof(self) weakSelf=self; __weak typeof(self) weakSelf=self;
[_alert setOkClick:^{ [self.alert setOkClick:^{
weakSelf.isFromDeleteSV=YES; weakSelf.isFromDeleteSV=YES;
[weakSelf.delTicketModel deleteTicketWithStrNo:deltTicketItem.strNo]; [weakSelf.delTicketModel deleteTicketWithStrNo:deltTicketItem.strNo];
[weakSelf.alert removeFromSuperview]; [weakSelf.alert removeFromSuperview];
}]; }];
AppDelegate * app = (AppDelegate*)[UIApplication sharedApplication].delegate; AppDelegate * app = (AppDelegate*)[UIApplication sharedApplication].delegate;
[app.window addSubview:_alert]; [app.window addSubview:self.alert];
[_alert mas_makeConstraints:^(MASConstraintMaker *make) { [self.alert mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.bottom.mas_equalTo(@(0)); make.left.right.top.bottom.mas_equalTo(@(0));
}]; }];
}; };
...@@ -325,29 +325,31 @@ heightForFooterInSection:(NSInteger)section ...@@ -325,29 +325,31 @@ heightForFooterInSection:(NSInteger)section
[cell setUpDevice:deviceItem indexPath:indexPath]; [cell setUpDevice:deviceItem indexPath:indexPath];
} }
kWeakSelf(self);
cell.deleteDevice=^(int deleteRow){ cell.deleteDevice=^(int deleteRow){
kStrongSelf(self);
//tag+2000所以此处-2000； //tag+2000所以此处-2000；
DeviceItem * delDeviceItem=self.fetchTicketDeviceModel.ticketAndDevieceItem.equipmentList[deleteRow-2000]; DeviceItem * delDeviceItem=self.fetchTicketDeviceModel.ticketAndDevieceItem.equipmentList[deleteRow-2000];
if (_alert1!=nil) { if (self.alert1!=nil) {
[_alert1 removeFromSuperview]; [self.alert1 removeFromSuperview];
_alert1=nil; self.alert1=nil;
} }
_alert1=[[DeleteAlertView alloc]initWithFrame:CGRectMake(0, 0, kWidth, kHeight)]; self.alert1=[[DeleteAlertView alloc]initWithFrame:CGRectMake(0, 0, kWidth, kHeight)];
_alert1.message=@"是否确定删除设备"; self.alert1.message=@"是否确定删除设备";
__weak typeof(self) weakSelf=self; kWeakSelf(self);
[_alert1 setOkClick:^{ [self.alert1 setOkClick:^{
weakSelf.isFromDeleteSV=YES; kStrongSelf(self);
[weakSelf.delDeviceModel deleteDvieceWithEquipmentId:[NSString stringWithFormat:@"%ld",(long)delDeviceItem.equipmentId]]; self.isFromDeleteSV=YES;
[self.delDeviceModel deleteDvieceWithEquipmentId:[NSString stringWithFormat:@"%ld",(long)delDeviceItem.equipmentId]];
[weakSelf.alert1 removeFromSuperview];
[self.alert1 removeFromSuperview];
}]; }];
AppDelegate * app = (AppDelegate*)[UIApplication sharedApplication].delegate; AppDelegate * app = (AppDelegate*)[UIApplication sharedApplication].delegate;
[app.window addSubview:_alert1]; [app.window addSubview:self.alert1];
[_alert1 mas_makeConstraints:^(MASConstraintMaker *make) { [self.alert1 mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.bottom.mas_equalTo(@(0)); make.left.right.top.bottom.mas_equalTo(@(0));
}]; }];
}; };
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/Drink(壁挂饮水)/Controller/ZXDrinkViewController.m
// //
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
#import "enlargeClickRegionBtn.h" #import "enlargeClickRegionBtn.h"
#import "ZXDrinkCell.h" #import "ZXDrinkCell.h"
#import "ZXDrinkService.h" #import "ZXDrinkService.h"
#import "ZXWashScanViewController.h"
#import "ZXBannerJumpViewController.h"
#import "ZXSelfHelpViewController.h" #import "ZXSelfHelpViewController.h"
@interface ZXDrinkViewController ()<UITableViewDelegate, UITableViewDataSource> { @interface ZXDrinkViewController ()<UITableViewDelegate, UITableViewDataSource> {
enlargeClickRegionBtn *scan;//扫码按钮 enlargeClickRegionBtn *scan;//扫码按钮
...@@ -127,28 +125,6 @@ ...@@ -127,28 +125,6 @@
}; };
[self.navigationController pushViewController:vc animated:NO]; [self.navigationController pushViewController:vc animated:NO];
// @weakify(self);
// ZXWashScanViewController *vc =[[ZXWashScanViewController alloc] initWithCardName:@"" title:@"扫码喝水" completion:^(NSString *stringValue) {
// @strongify(self);
// //刷新设备页面
// @weakify(self);
// [self.service checkMerthinMsgByMerthinCode:stringValue completed:^(ZXDrinkMerthinModel *m) {
// @strongify(self);
// if (m.isOnline == 0) {
// [ZXTool showText:@"该设备还未上线"];
// return ;
// }
// if (m.isUsed) {
// [ZXTool showText:@"该设备正在使用"];
// return ;
// }
// self.numberLabel.text = [NSString stringWithFormat:@"设备编号: %@", m.code];
// self.addressLabel.text = [NSString stringWithFormat:@"设备地址: %@", m.position?m.position:@""];
// self.startDrink.selected = m.isCurrentUserUsed;
// self.currentMerthin = m;
// }];
// }];
// [self.navigationController pushViewController:vc animated:YES];
}]; }];
} }
- (void) createHeader { - (void) createHeader {
...@@ -435,47 +411,7 @@ ...@@ -435,47 +411,7 @@
} }
return _service; return _service;
} }
//#pragma mark - ========== 广告 ==========
//- (UIImageView *)adImageView {
// if (_adImageView == nil) {
// _adImageView = [[UIImageView alloc] init];
// [self.view addSubview:_adImageView];
// [_adImageView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.left.equalTo(self.view.mas_left).offset(15* k6Scale);
// make.right.equalTo(self.view.mas_right).offset(-15 * k6Scale);
// make.bottom.equalTo(self.view.mas_bottom).offset(-15 * k6Scale);
// make.height.mas_equalTo(110 * k6Scale);
// }];
// _adImageView.layer.cornerRadius = 5;
// _adImageView.layer.masksToBounds = YES;
// _adImageView.userInteractionEnabled = YES;
// enlargeClickRegionBtn *closeBtn = [[enlargeClickRegionBtn alloc] init];
// [closeBtn setImage:[UIImage imageNamed:@"drink-Ad-Close"] forState:UIControlStateNormal];
// [_adImageView addSubview:closeBtn];
// [closeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
// make.right.equalTo(_adImageView.mas_right).offset(-6 * k6Scale);
// make.top.equalTo(_adImageView.mas_top).offset(6 * k6Scale);
// }];
// @weakify(self);
// [[closeBtn rac_signalForControlEvents:UIControlEventTouchDown] subscribeNext:^(id x) {
// @strongify(self);
// self.adImageView.hidden = YES;
// [self.adImageView removeFromSuperview];
// }];
// UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] init];
// [_adImageView addGestureRecognizer:tap];
// [[tap rac_gestureSignal] subscribeNext:^(id x) {
// @strongify(self);
// if (self.service.adList.count) {
// ZXBannerJumpViewController *vc = [[ZXBannerJumpViewController alloc] init];
// ZXDrinkAdModel *ad = self.service.adList.firstObject;
// vc.jumpUrl = ad.jumpUrl;
// [self.navigationController pushViewController:vc animated:YES];
// }
// }];
// }
// return _adImageView;
//}
#pragma mark - 创建定时器 5s一次请求当前是否有未支付订单 #pragma mark - 创建定时器 5s一次请求当前是否有未支付订单
- (void) createTimer { - (void) createTimer {
@weakify(self); @weakify(self);
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/bath(洗浴)/ZXBathViewController.m
// //
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#import "ZXBathViewController.h" #import "ZXBathViewController.h"
#import "enlargeClickRegionBtn.h" #import "enlargeClickRegionBtn.h"
#import "ZXWashScanViewController.h"
#import "ZXBathAlert.h" #import "ZXBathAlert.h"
#import <CoreBluetooth/CoreBluetooth.h> #import <CoreBluetooth/CoreBluetooth.h>
#import "GCDAsyncSocket.h" #import "GCDAsyncSocket.h"
...@@ -192,12 +191,7 @@ ...@@ -192,12 +191,7 @@
[ZXTool showText:@"设备正在使用中,请稍后再试！"]; [ZXTool showText:@"设备正在使用中,请稍后再试！"];
return ; return ;
} }
// ZXWashScanViewController *vc =[[ZXWashScanViewController alloc] initWithCardName:@"" title:@"扫码洗浴" completion:^(NSString *stringValue) {
// [self.navigationController popViewControllerAnimated:YES];
// [self requestMerthinMsgByCode:stringValue isShowAlert:YES];//请求设备信息
// self.currentPeripheralName = stringValue;//保存设备名称
//
// }];
@weakify(self); @weakify(self);
ZXScannerViewController *vc = [[ZXScannerViewController alloc] init]; ZXScannerViewController *vc = [[ZXScannerViewController alloc] init];
//__weak typeof(vc) weakVc = vc; //__weak typeof(vc) weakVc = vc;
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/washClose(紫宇洗衣)/Controller/ZXLocationViewController.m
// //
...@@ -252,6 +252,7 @@ ...@@ -252,6 +252,7 @@
} }
- (void)viewWillAppear:(BOOL)animated { - (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated]; [super viewWillAppear:animated];
self.tabBarController.tabBar.hidden = NO;
if (@available(iOS 11, *)){ if (@available(iOS 11, *)){
[UIScrollView appearance].contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; //iOS11 解决SafeArea的问题，同时能解决pop时上级页面scrollView抖动的问题 [UIScrollView appearance].contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; //iOS11 解决SafeArea的问题，同时能解决pop时上级页面scrollView抖动的问题
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/washClose(紫宇洗衣)/Controller/ZXWashCloseViewController.m
// //
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#import "ZXChooseView.h" #import "ZXChooseView.h"
#import "ShowMsgView.h" #import "ShowMsgView.h"
#import "ZXWashOperationViewController.h" #import "ZXWashOperationViewController.h"
#import "ZXWashScanViewController.h"
#import "AppointView.h" #import "AppointView.h"
#import "ZXWashService.h" #import "ZXWashService.h"
...@@ -207,14 +206,10 @@ ...@@ -207,14 +206,10 @@
}]; }];
[[scan rac_signalForControlEvents:UIControlEventTouchDown] subscribeNext:^(id x) { [[scan rac_signalForControlEvents:UIControlEventTouchDown] subscribeNext:^(id x) {
// @strongify(self);
// ZXWashScanViewController *scanVC = [[ZXWashScanViewController alloc] initWithCardName:@"" avatar:nil completion:^(NSString *stringValue) {
// [self jumpWashWithMerthinCode:[ZXTool dencode:stringValue]];
// }];
// [self.navigationController pushViewController:scanVC animated:YES];
@weakify(self); @weakify(self);
ZXScannerViewController *vc = [[ZXScannerViewController alloc] init]; ZXScannerViewController *vc = [[ZXScannerViewController alloc] init];
vc.title = @"扫码洗衣"; vc.title = @"扫码洗衣";
vc.hidesBottomBarWhenPushed = YES;
vc.scanResult = ^(NSString *result) { vc.scanResult = ^(NSString *result) {
@strongify(self); @strongify(self);
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
...@@ -386,6 +381,7 @@ ...@@ -386,6 +381,7 @@
[self.washService checkMerthinWithMerthinCode:merthinCode completedBlock:^(ZXWashOperationModel *model) { [self.washService checkMerthinWithMerthinCode:merthinCode completedBlock:^(ZXWashOperationModel *model) {
@strongify(self); @strongify(self);
ZXWashOperationViewController *vc = [[ZXWashOperationViewController alloc] init]; ZXWashOperationViewController *vc = [[ZXWashOperationViewController alloc] init];
vc.hidesBottomBarWhenPushed = YES;
vc.model = model; vc.model = model;
[self.navigationController pushViewController:vc animated:YES]; [self.navigationController pushViewController:vc animated:YES];
}]; }];
...@@ -410,6 +406,7 @@ ...@@ -410,6 +406,7 @@
- (void)viewWillAppear:(BOOL)animated { - (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated]; [super viewWillAppear:animated];
self.navigationController.navigationBar.hidden = YES; self.navigationController.navigationBar.hidden = YES;
self.tabBarController.tabBar.hidden = NO;
// AppointView *v = [[AppointView alloc] initWithFrame:[UIScreen mainScreen].bounds preOrder:nil]; // AppointView *v = [[AppointView alloc] initWithFrame:[UIScreen mainScreen].bounds preOrder:nil];
// [[UIApplication sharedApplication].keyWindow addSubview:v]; // [[UIApplication sharedApplication].keyWindow addSubview:v];
if (@available(iOS 11, *)) { if (@available(iOS 11, *)) {
...@@ -470,6 +467,7 @@ ...@@ -470,6 +467,7 @@
@strongify(self); @strongify(self);
ZXWashOperationViewController *vc = [[ZXWashOperationViewController alloc] init]; ZXWashOperationViewController *vc = [[ZXWashOperationViewController alloc] init];
vc.model = model; vc.model = model;
vc.hidesBottomBarWhenPushed = YES;
[self.navigationController pushViewController:vc animated:YES]; [self.navigationController pushViewController:vc animated:YES];
}]; }];
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/washClose(紫宇洗衣)/Controller/ZXWashOperationViewController.m
// //
...@@ -215,14 +215,14 @@ ...@@ -215,14 +215,14 @@
CGFloat amount = 0; CGFloat amount = 0;
NSMutableArray *list = [[NSMutableArray alloc] init]; NSMutableArray *list = [[NSMutableArray alloc] init];
if (self.selectOptionModel.isSelect) { if (self.selectOptionModel.isSelect) {
NSDictionary *dic1 = @{@"alias":self.selectRequireModel.alias, @"price":[NSString stringWithFormat:@"%.2f", self.selectRequireModel.price], @"free":@(self.selectRequireModel.zx_free), @"sort":@(self.selectRequireModel.sort), @"id":@(self.selectRequireModel.programId),@"actionDevice":self.selectRequireModel.actionDevice,}; NSDictionary *dic1 = @{@"alias":self.selectRequireModel.alias?self.selectRequireModel.alias:@"", @"price":[NSString stringWithFormat:@"%.2f", self.selectRequireModel.price], @"free":@(self.selectRequireModel.zx_free), @"sort":@(self.selectRequireModel.sort), @"id":@(self.selectRequireModel.programId),@"actionDevice":self.selectRequireModel.actionDevice?self.selectRequireModel.actionDevice:@""};
amount += self.selectRequireModel.price; amount += self.selectRequireModel.price;
[list addObject:dic1]; [list addObject:dic1];
NSDictionary *dic2 = @{@"alias":self.selectOptionModel.alias, @"price":[NSString stringWithFormat:@"%.2f", self.selectOptionModel.price], @"free":@(self.selectOptionModel.zx_free), @"sort":@(self.selectOptionModel.sort), @"id":@(self.selectOptionModel.programId),@"actionDevice":self.selectOptionModel.actionDevice}; NSDictionary *dic2 = @{@"alias":self.selectOptionModel.alias?self.selectOptionModel.alias:@"", @"price":[NSString stringWithFormat:@"%.2f", self.selectOptionModel.price], @"free":@(self.selectOptionModel.zx_free), @"sort":@(self.selectOptionModel.sort), @"id":@(self.selectOptionModel.programId),@"actionDevice":self.selectOptionModel.actionDevice?self.selectOptionModel.actionDevice:@""};
amount += self.selectOptionModel.price; amount += self.selectOptionModel.price;
[list addObject:dic2]; [list addObject:dic2];
} else { } else {
NSDictionary *dic1 = @{@"alias":self.selectRequireModel.alias, @"price":[NSString stringWithFormat:@"%.2f", self.selectRequireModel.price], @"free":@(self.selectRequireModel.zx_free), @"sort":@(self.selectRequireModel.sort), @"actionDevice":self.selectRequireModel.actionDevice, @"id":@(self.selectRequireModel.programId)}; NSDictionary *dic1 = @{@"alias":self.selectRequireModel.alias?self.selectRequireModel.alias:@"", @"price":[NSString stringWithFormat:@"%.2f", self.selectRequireModel.price], @"free":@(self.selectRequireModel.zx_free), @"sort":@(self.selectRequireModel.sort), @"actionDevice":self.selectRequireModel.actionDevice?self.selectRequireModel.actionDevice:@"", @"id":@(self.selectRequireModel.programId)};
amount += self.selectRequireModel.price; amount += self.selectRequireModel.price;
[list addObject:dic1]; [list addObject:dic1];
} }
...@@ -232,10 +232,10 @@ ...@@ -232,10 +232,10 @@
NSString *campusId = [kUserDefaults valueForKey:@"campusId"]; NSString *campusId = [kUserDefaults valueForKey:@"campusId"];
NSString *account = [kUserDefaults valueForKey:@"account"]; NSString *account = [kUserDefaults valueForKey:@"account"];
NSDictionary *dic = @{@"campusId":campusId, NSDictionary *dic = @{@"campusId":campusId?campusId:@"",
@"schoolId":schoolId, @"schoolId":schoolId?schoolId:@"",
@"userId":userId, @"userId":userId?userId:@"",
@"userAccount":account, @"userAccount":account?account:@"",
@"equipmentId":@(self.model.equipmentId), @"equipmentId":@(self.model.equipmentId),
@"no":@(self.model.no), @"no":@(self.model.no),
@"location":self.model.location, @"location":self.model.location,
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/washClose(紫宇洗衣)/Controller/ZXWashTabbarViewController.m
// //
...@@ -36,6 +36,17 @@ ...@@ -36,6 +36,17 @@
recordVC.tabBarItem.selectedImage = [[UIImage imageNamed:@"tab_Laundryrecord_check"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; recordVC.tabBarItem.selectedImage = [[UIImage imageNamed:@"tab_Laundryrecord_check"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
recordVC.tabBarItem.image = [UIImage imageNamed:@"tab_Laundryrecord_default"]; recordVC.tabBarItem.image = [UIImage imageNamed:@"tab_Laundryrecord_default"];
[[UITabBarItem appearance] setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:kRGB(51, 51, 51), NSForegroundColorAttributeName, nil] forState:UIControlStateNormal]; [[UITabBarItem appearance] setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:kRGB(51, 51, 51), NSForegroundColorAttributeName, nil] forState:UIControlStateNormal];
UIView *line = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 1)];
line.backgroundColor = RGB(243, 243, 243);
[self.tabBar addSubview:line];
// self.tabBar.layer.shadowColor = [UIColor colorWithHexString:@"#FF0000"].CGColor;
// // 设置阴影偏移量
// self.tabBar.layer.shadowOffset = CGSizeMake(0,3 * k6Scale);
// // 设置阴影透明度
// self.tabBar.layer.shadowOpacity = 0.2;
// // 设置阴影半径
// self.tabBar.layer.shadowRadius = 4 * k6Scale;
[[UITabBarItem appearance] setTitleTextAttributes: [[UITabBarItem appearance] setTitleTextAttributes:
[NSDictionary dictionaryWithObjectsAndKeys:kRGB(238, 125, 31),NSForegroundColorAttributeName, nil]forState:UIControlStateSelected]; [NSDictionary dictionaryWithObjectsAndKeys:kRGB(238, 125, 31),NSForegroundColorAttributeName, nil]forState:UIControlStateSelected];
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/YWTPay(新版支付)/Controller/ZXNewConfirmPayViewController.m
// //
...@@ -127,6 +127,7 @@ ...@@ -127,6 +127,7 @@
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
sender.enabled = YES; sender.enabled = YES;
}); });
[ZXTool showLoadingAnimation];
int callType = 1; int callType = 1;
BOOL isCanOpenYWT = [kApplication canOpenURL:[NSURL URLWithString:@"cmbmobilebank://"]]; BOOL isCanOpenYWT = [kApplication canOpenURL:[NSURL URLWithString:@"cmbmobilebank://"]];
if ([self.payType.payType isEqualToString:@"5"] && !isCanOpenYWT) { if ([self.payType.payType isEqualToString:@"5"] && !isCanOpenYWT) {
......
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/ForgetPassword/Controller/forgetPasswordViewController.m
// //
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#import "FetchCheckCodeModel.h" #import "FetchCheckCodeModel.h"
#import "GraphicsCode.h" #import "GraphicsCode.h"
#import "forgetPasswordModel.h" #import "forgetPasswordModel.h"
#import "LoginView.h"
@interface forgetPasswordViewController ()<UITextFieldDelegate> @interface forgetPasswordViewController ()<UITextFieldDelegate>
{ {
//发送验证码 //发送验证码
...@@ -113,12 +113,14 @@ ...@@ -113,12 +113,14 @@
[alert show]; [alert show];
return; return;
} }
__weak typeof (self) weakSelf=self; kWeakSelf(self);
codeView = [[GraphicsCode alloc]initWithFrame:CGRectMake(0, 0, kWidth, kHeight) phoneNum:_phoneNumTextFeild.text]; codeView = [[GraphicsCode alloc]initWithFrame:CGRectMake(0, 0, kWidth, kHeight) phoneNum:_phoneNumTextFeild.text];
codeView.fetchType = 3; codeView.fetchType = 3;
codeView.checkType = @"0"; codeView.checkType = @"0";
codeView.callBack = ^(NSString * code) { codeView.callBack = ^(NSString * code) {
[weakSelf initTimer]; kStrongSelf(self);
[self initTimer];
[self.checkCodeField becomeFirstResponder];
}; };
[codeView show:self]; [codeView show:self];
...@@ -162,8 +164,12 @@ ...@@ -162,8 +164,12 @@
- (IBAction)showBtn2Click:(id)sender { - (IBAction)showBtn2Click:(id)sender {
[self showBtnFucWithShowBtn:sender textField:_passwordFeild2]; [self showBtnFucWithShowBtn:sender textField:_passwordFeild2];
} }
- (IBAction)sureBtnClick:(id)sender { - (IBAction)sureBtnClick:(UIButton *)sender {
sender.enabled = NO;
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
sender.enabled = YES;
});
[[UIApplication sharedApplication].keyWindow endEditing:YES];
if ([_phoneNumTextFeild.text length] == 0) if ([_phoneNumTextFeild.text length] == 0)
{ {
[SVProgressHUD showErrorWithStatus:@"请输入手机号"]; [SVProgressHUD showErrorWithStatus:@"请输入手机号"];
...@@ -218,7 +224,6 @@ ...@@ -218,7 +224,6 @@
[ZXTool showText:error]; [ZXTool showText:error];
} else { } else {
[ZXTool showText:@"找回密码成功"]; [ZXTool showText:@"找回密码成功"];
[ZXTool backToLoginAndOperationInterface]; [ZXTool backToLoginAndOperationInterface];
} }
}); });
......
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Login/Controller/LoginView.h deleted 100644 → 0
// ++ /dev/null
//
// LoginView.h
// ColorfulSchool
//
// Created by Listen on 2017/8/5.
// Copyright © 2017年 Colorful Any Door. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface LoginView : UIViewController
@property (strong, nonatomic) IBOutlet UITextField *userTF;
@property (strong, nonatomic) IBOutlet UIView *userTfBg;
@property (strong, nonatomic) IBOutlet UITextField *passWorldTF;
@property (strong, nonatomic) IBOutlet UIView *passWorldTFBg;
@property (strong, nonatomic) IBOutlet UIButton *showBtn;
@property (strong, nonatomic) IBOutlet UIButton *confirmBtn;
@end
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Login/Controller/LoginView.m deleted 100644 → 0
// ++ /dev/null
//
// LoginView.m
// ColorfulSchool
//
// Created by Listen on 2017/8/5.
// Copyright © 2017年 Colorful Any Door. All rights reserved.
//
#import "LoginView.h"
#import "LoginModel.h"
#import "MyTabViewController.h"
#import "forgetPasswordViewController.h"
#import "ZXUserModel.h"
#import "ZXSections.h"
#import "ZXInformation.h"
@interface LoginView ()<UITextFieldDelegate>
@property (nonatomic, strong) LoginModel * loginModel;
@end
@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"]) {
//跳转复杂版
MyTabViewController * tabRoot = [[MyTabViewController alloc]init];
[UIApplication sharedApplication].keyWindow.rootViewController = tabRoot;
}
else{
}
}
}
- (void)viewDidLoad {
[super viewDidLoad];
[self setViews];
self.loginModel=[LoginModel new];
self.userTF.text = CacheAccount;
// self.passWorldTF.text = CachePassWord;
self.userTF.delegate=self;
self.passWorldTF.delegate=self;
[self registNotificationAndKVO];
}
-(void)viewWillAppear:(BOOL)animated{
[super viewWillAppear:animated];
self.navigationController.navigationBar.hidden = YES;
[[UIApplication sharedApplication].keyWindow endEditing:YES];
[[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:NO];
[ZXInformation clearTable];
[ZXSections clearTable];
[ZXTool hideLoadingAnimation];
}
-(void)setViews
{
_userTfBg.backgroundColor = [UIColor whiteColor];
_userTfBg.alpha = 0.5;
_userTfBg.layer.cornerRadius = 5.0;
_passWorldTFBg.backgroundColor = [UIColor whiteColor];
_passWorldTFBg.alpha = 0.5;
_passWorldTFBg.layer.cornerRadius = 5.0;
_userTF.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"输入您的手机号" attributes:@{NSForegroundColorAttributeName: [UIColor colorWithHexString:@"#d9a842"]}];
_passWorldTF.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入6-20位密码" attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHexString:@"#d9a842"]}];
_showBtn.imageView.image = [UIImage imageNamed:@"Not-show-icon---Assistor.png"];
[_confirmBtn setTitleColor:[UIColor colorWithHexString:@"#fed109"] forState:UIControlStateNormal];
_confirmBtn.layer.cornerRadius = 5.0;
}
-(BOOL)prefersStatusBarHidden{
return YES;
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
- (IBAction)showBtnFuc:(id)sender {
_passWorldTF.secureTextEntry = !_passWorldTF.secureTextEntry;
// NSLog(@"===%zd",_passWorldTF.secureTextEntry);
if (_passWorldTF.secureTextEntry)
{
[_showBtn setImage:[UIImage imageNamed:@"Not-show-icon---Assistor.png"] forState:UIControlStateNormal];
} else {
[_showBtn setImage:[UIImage imageNamed:@"show.png"] forState:UIControlStateNormal];
}
}
- (IBAction)confirmBtnFuc:(id)sender {
[ZXSections clearTable];
[ZXInformation clearTable];
if (![BYHelp isMobileNumber:_userTF.text]) {
if ([_userTF.text length]==0) {
[SVProgressHUD showErrorWithStatus:@"请输入手机号"];
[_userTF becomeFirstResponder];
return;
}
[SVProgressHUD showErrorWithStatus:@"你输入的不是一个手机号"];
[_userTF becomeFirstResponder];
return;
}
if ([_passWorldTF.text length] <6)
{
if ([_passWorldTF.text length]==0) {
[SVProgressHUD showErrorWithStatus:@"密码还未填写哦！"];
[_passWorldTF becomeFirstResponder];
return;
}
[SVProgressHUD showErrorWithStatus:@"密码长度大于6位！"];
[_passWorldTF becomeFirstResponder];
return;
}
[[UIApplication sharedApplication].keyWindow endEditing:YES];
[SVProgressHUD showWithStatus:@"正在登录 ,请稍后 "];
//调用新街口登录
NSString *u = self.userTF.text;
NSString *p = self.passWorldTF.text;
[self startLoginByAccount:u password:p];
}
- (void) startLoginByAccount:(NSString *) accoun password:(NSString *) password {
NSString *token = [kUserDefaults valueForKey:@"token"];
if (token == nil) {
token = @"";
}
[ZXTool requestDataHideLoadingToastWithType:kXMHTTPMethodPOST url:[NSString stringWithFormat:@"%@/app/customer/login", [kUserDefaults objectForKey:@"NEW_PAY"]] para:@{@"loginAccount":accoun, @"password":password} completed:^(CommonModel *common, NSString *error) {
if (error) {
dispatch_async(dispatch_get_main_queue(), ^{
[SVProgressHUD dismiss];
[ZXTool showText:error];
});
} else {
ZXUserModel *user = [ZXUserModel mj_objectWithKeyValues:common.data];
[UserManager sharedUserManager].user = user;//单利存储
[ZXUserModel clearTable];
[user save];
[ZXTool saveUserInfo:user];
//跳转复杂版
MyTabViewController * tabRoot = [[MyTabViewController alloc]init];
[UIApplication sharedApplication].keyWindow.rootViewController = tabRoot;
}
}];
}
- (IBAction)registerBtnFuc:(id)sender {
UIViewController *vc = [[NSClassFromString(@"ZXRegistorViewController") alloc] init];
[self.navigationController pushViewController:vc animated:YES];
}
- (IBAction)forgotBtnFuc:(id)sender {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.005 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
forgetPasswordViewController * VC=[forgetPasswordViewController new];
self.navigationController.navigationBar.hidden = NO;
[self.navigationController pushViewController:VC animated:YES];
});
}
-(BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
{
NSLog(@"range:%@",NSStringFromRange(range));
if(textField==self.passWorldTF)
{//密码
if(range.location>=20||textField.text.length+string.length>20)
{
return NO;
}
else{return YES;
}
}
else if (textField==self.userTF)
{//手机
if(range.location>=11||textField.text.length+string.length>11)
{
return NO;
}
else{return YES;
}
}
else{
return YES;
}
}
@end
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Login/Controller/ZXBindTelViewController.m
// //
...@@ -107,6 +107,11 @@ ...@@ -107,6 +107,11 @@
}]; }];
[[reciveCodeBtn rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(id x) { [[reciveCodeBtn rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(id x) {
if (![usernameField.text isEqualToString:@""]) { if (![usernameField.text isEqualToString:@""]) {
if (![reciveCodeBtn.titleLabel.text isEqualToString:@"获取验证码"]) {
return ;
}
//开始获取验证码 //开始获取验证码
NSString *url = [NSString stringWithFormat:@"%@/app/customer/phone/message?cellphone=%@&codeNum=6&businessNum=5",[kUserDefaults valueForKey:@"NEW_PAY"], usernameField.text]; NSString *url = [NSString stringWithFormat:@"%@/app/customer/phone/message?cellphone=%@&codeNum=6&businessNum=5",[kUserDefaults valueForKey:@"NEW_PAY"], usernameField.text];
[ZXTool requestDataWithType:kXMHTTPMethodGET url:url para:nil completed:^(CommonModel *common, NSString *error) { [ZXTool requestDataWithType:kXMHTTPMethodGET url:url para:nil completed:^(CommonModel *common, NSString *error) {
...@@ -187,9 +192,9 @@ ...@@ -187,9 +192,9 @@
//得到当前时间 //得到当前时间
NSDate *nowData = [NSDate date]; NSDate *nowData = [NSDate date];
NSDate *endData=[NSDate dateWithTimeIntervalSince1970:endTime]; NSDate *endData=[NSDate dateWithTimeIntervalSince1970:endTime];
NSCalendar* chineseClendar = [ [ NSCalendar alloc ] initWithCalendarIdentifier:NSGregorianCalendar]; NSCalendar* chineseClendar = [ [ NSCalendar alloc ] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
NSUInteger unitFlags = NSUInteger unitFlags =
NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit | NSDayCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit; NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear;
NSDateComponents *cps = [chineseClendar components:unitFlags fromDate:nowData toDate: endData options:0]; NSDateComponents *cps = [chineseClendar components:unitFlags fromDate:nowData toDate: endData options:0];
// NSInteger Hour = [cps hour]; // NSInteger Hour = [cps hour];
// NSInteger Min = [cps minute]; // NSInteger Min = [cps minute];
......
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Login/Controller/ZXLoginViewController.m
// //
...@@ -275,7 +275,9 @@ ...@@ -275,7 +275,9 @@
}]; }];
// forgetPwdBtn.timeInterval = 1;
// registBtn.timeInterval = 1;
// registBtn.timeInterval = 1;
[loginBtn addTarget:self action:@selector(login:) forControlEvents:UIControlEventTouchDown]; [loginBtn addTarget:self action:@selector(login:) forControlEvents:UIControlEventTouchDown];
[forgetPwdBtn addTarget:self action:@selector(forgetPwd) forControlEvents:UIControlEventTouchUpInside]; [forgetPwdBtn addTarget:self action:@selector(forgetPwd) forControlEvents:UIControlEventTouchUpInside];
[registBtn addTarget:self action:@selector(regist) forControlEvents:UIControlEventTouchUpInside]; [registBtn addTarget:self action:@selector(regist) forControlEvents:UIControlEventTouchUpInside];
...@@ -387,7 +389,6 @@ ...@@ -387,7 +389,6 @@
self.navigationController.navigationBar.hidden = YES; self.navigationController.navigationBar.hidden = YES;
[UIApplication sharedApplication].statusBarHidden = NO; [UIApplication sharedApplication].statusBarHidden = NO;
} }
- (void)viewWillDisappear:(BOOL)animated { - (void)viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated]; [super viewWillDisappear:animated];
...@@ -400,13 +401,14 @@ ...@@ -400,13 +401,14 @@
return; return;
} }
self.wxCode = nof.object; self.wxCode = nof.object;
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
self.wxCode = @""; NSLog(@"请求微信授权登录----%@", self.wxCode);
});
AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
manager.responseSerializer.acceptableContentTypes = [NSSet setWithObject:@"text/plain"]; manager.responseSerializer.acceptableContentTypes = [NSSet setWithObject:@"text/plain"];
[manager GET:[NSString stringWithFormat:@"https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx41cd01f1eb664e21&secret=d709419cf1ba7ed33e6337bd9396bef1&code=%@&grant_type=authorization_code", nof.object] parameters:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nonnull responseObject) { [manager GET:[NSString stringWithFormat:@"https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx41cd01f1eb664e21&secret=d709419cf1ba7ed33e6337bd9396bef1&code=%@&grant_type=authorization_code", nof.object] parameters:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nonnull responseObject) {
self.wxCode = @"";
if (responseObject != nil && responseObject[@"openid"] != nil) { if (responseObject != nil && responseObject[@"openid"] != nil) {
[self openLogin:responseObject[@"openid"] thirdType:1]; [self openLogin:responseObject[@"openid"] thirdType:1];
} else { } else {
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
......
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Register/Controller/ZXRegistorViewController.m
// //
...@@ -455,6 +455,9 @@ ...@@ -455,6 +455,9 @@
[ZXTool showText:@"请输入手机号"]; [ZXTool showText:@"请输入手机号"];
return ; return ;
} }
if ([self.reciveCode.text containsString:@"重新"]) {
return;
}
[self reciveVioCode]; [self reciveVioCode];
}]; }];
...@@ -499,7 +502,10 @@ ...@@ -499,7 +502,10 @@
GraphicsCode *codeView = [[GraphicsCode alloc] initWithFrame:CGRectMake(0, 0, kWidth, kHeight) phoneNum:self.phoneField.text]; GraphicsCode *codeView = [[GraphicsCode alloc] initWithFrame:CGRectMake(0, 0, kWidth, kHeight) phoneNum:self.phoneField.text];
codeView.fetchType = 1; codeView.fetchType = 1;
codeView.checkType = @"1"; codeView.checkType = @"1";
kWeakSelf(self);
codeView.callBack = ^(NSString * code){ codeView.callBack = ^(NSString * code){
kStrongSelf(self);
[self.violaField becomeFirstResponder];
if ([code isEqualToString:@""]) { if ([code isEqualToString:@""]) {
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
NSString *S = [ZXTool getCurrentTime]; NSString *S = [ZXTool getCurrentTime];
......
ColorfulSchool/ColorfulSchool/Classes/Mall(商城)/ZXMallViewController+Extension.m
// //
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#import "ZXBannerJumpViewController.h" #import "ZXBannerJumpViewController.h"
#import "XMNetworking.h" #import "XMNetworking.h"
#import "LoginModel.h" #import "LoginModel.h"
#import "LoginView.h"
#import "JDPAuthSDK.h" #import "JDPAuthSDK.h"
#import "ZXMallViewController.h" #import "ZXMallViewController.h"
#import "NSString+MD5.h" #import "NSString+MD5.h"
......
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/AimiWallet/Controller/AimiWalletViewController.m
// //
...@@ -32,6 +32,7 @@ static NSString * const ID = @"CollectionCell"; ...@@ -32,6 +32,7 @@ static NSString * const ID = @"CollectionCell";
@property (weak, nonatomic) IBOutlet UILabel *naTItleLabel; @property (weak, nonatomic) IBOutlet UILabel *naTItleLabel;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *topViewConstant;
@property (strong, nonatomic) IBOutlet UILabel *moneyLabel; @property (strong, nonatomic) IBOutlet UILabel *moneyLabel;
@property (strong, nonatomic) IBOutlet UIView *BeanBgView; @property (strong, nonatomic) IBOutlet UIView *BeanBgView;
...@@ -60,6 +61,8 @@ static NSString * const ID = @"CollectionCell"; ...@@ -60,6 +61,8 @@ static NSString * const ID = @"CollectionCell";
@property (nonatomic)FetchWalletTopUpDataModel * topUpDataModel; @property (nonatomic)FetchWalletTopUpDataModel * topUpDataModel;
@property (nonatomic, assign) BOOL isNeedOld;//是否需要调x老版本接口获取账户信息 @property (nonatomic, assign) BOOL isNeedOld;//是否需要调x老版本接口获取账户信息
/** /**
正常充 正常充
*/ */
...@@ -233,7 +236,11 @@ static NSString * const ID = @"CollectionCell"; ...@@ -233,7 +236,11 @@ static NSString * const ID = @"CollectionCell";
[super viewDidLoad]; [super viewDidLoad];
self.accountDataModel=[FetchAccoutDataModel new]; self.accountDataModel=[FetchAccoutDataModel new];
self.topUpDataModel= [FetchWalletTopUpDataModel new]; self.topUpDataModel= [FetchWalletTopUpDataModel new];
CGFloat h = 250;
if (iPhoneX) {
h += 22;
}
self.topViewConstant.constant = h;
enlargeClickRegionBtn *showAlertBtn = [[enlargeClickRegionBtn alloc] init]; enlargeClickRegionBtn *showAlertBtn = [[enlargeClickRegionBtn alloc] init];
[self.view addSubview:showAlertBtn]; [self.view addSubview:showAlertBtn];
...@@ -346,6 +353,7 @@ static NSString * const ID = @"CollectionCell"; ...@@ -346,6 +353,7 @@ static NSString * const ID = @"CollectionCell";
-(void)viewWillAppear:(BOOL)animated { -(void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated]; [super viewWillAppear:animated];
confirmBtn.enabled = YES; confirmBtn.enabled = YES;
self.tabBarController.tabBar.hidden = YES;
self.navigationController.navigationBar.hidden = YES; self.navigationController.navigationBar.hidden = YES;
[self registNotificationAndKVO]; [self registNotificationAndKVO];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
...@@ -397,7 +405,7 @@ static NSString * const ID = @"CollectionCell"; ...@@ -397,7 +405,7 @@ static NSString * const ID = @"CollectionCell";
} else { } else {
[self.moneyArray addObject:item]; [self.moneyArray addObject:item];
} }
[beanCollectionView reloadData]; [self->beanCollectionView reloadData];
} }
} }
}); });
......
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/AimiWallet/Controller/AimiWalletViewController.xib
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<outlet property="sxLabel" destination="BUo-jT-9Dz" id="kQx-fg-fCF"/> <outlet property="sxLabel" destination="BUo-jT-9Dz" id="kQx-fg-fCF"/>
<outlet property="sxMoneyLabel" destination="wiK-uV-hbA" id="YJ6-of-CX0"/> <outlet property="sxMoneyLabel" destination="wiK-uV-hbA" id="YJ6-of-CX0"/>
<outlet property="tableView" destination="NKH-73-rTA" id="EMz-WF-LZO"/> <outlet property="tableView" destination="NKH-73-rTA" id="EMz-WF-LZO"/>
<outlet property="topViewConstant" destination="b1X-5p-jFc" id="8uY-iw-DNf"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/> <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections> </connections>
</placeholder> </placeholder>
...@@ -155,7 +156,7 @@ ...@@ -155,7 +156,7 @@
<constraint firstItem="VFn-Ry-Py4" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="opI-sl-U7b"/> <constraint firstItem="VFn-Ry-Py4" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="opI-sl-U7b"/>
<constraint firstAttribute="trailing" secondItem="NKH-73-rTA" secondAttribute="trailing" id="pT0-MJ-scw"/> <constraint firstAttribute="trailing" secondItem="NKH-73-rTA" secondAttribute="trailing" id="pT0-MJ-scw"/>
</constraints> </constraints>
<point key="canvasLocation" x="-4631" y="-616"/> <point key="canvasLocation" x="-5562" y="-609"/>
</view> </view>
</objects> </objects>
<resources> <resources>
......
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/UserSetting/ChangePasswordAndPhone/Controller/updateViewController.m
// //
...@@ -265,10 +265,12 @@ ...@@ -265,10 +265,12 @@
codeView = [[GraphicsCode alloc]initWithFrame:CGRectMake(0, 0, kWidth, kHeight) phoneNum:_phoneNumTextFeild.text]; codeView = [[GraphicsCode alloc]initWithFrame:CGRectMake(0, 0, kWidth, kHeight) phoneNum:_phoneNumTextFeild.text];
codeView.fetchType = 4; codeView.fetchType = 4;
codeView.checkType = @"1"; codeView.checkType = @"1";
__weak typeof(self) weakself = self; kWeakSelf(self);
codeView.callBack = ^(NSString * code) codeView.callBack = ^(NSString * code)
{ {
[weakself initTimer]; kStrongSelf(self);
[self initTimer];
[self.checkCodeTextFeild becomeFirstResponder];
}; };
[codeView show:self]; [codeView show:self];
......
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/UserSetting/UserSet/Controller/ZXSettingViewController.m
// //
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#import "ZXSettingViewController.h" #import "ZXSettingViewController.h"
#import "XMGFileTool.h" #import "XMGFileTool.h"
#import "LoginView.h"
#import "updateViewController.h" #import "updateViewController.h"
#import "AllowEequipCountLoginModel.h" #import "AllowEequipCountLoginModel.h"
#import "LoginModel.h" #import "LoginModel.h"
......
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/GetData.m
// //
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#import "GetData.h" #import "GetData.h"
#import <CommonCrypto/CommonDigest.h> #import <CommonCrypto/CommonDigest.h>
#import "LoginView.h"
#import "MyTabViewController.h" #import "MyTabViewController.h"
#import "XMGNavigationViewController.h" #import "XMGNavigationViewController.h"
#import "LoginModel.h" #import "LoginModel.h"
......
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/ZXTool.m
// //
...@@ -721,16 +721,14 @@ void ProviderReleaseData (void *info, const void *data, size_t size){ ...@@ -721,16 +721,14 @@ void ProviderReleaseData (void *info, const void *data, size_t size){
} }
+(void) backToLogin { +(void) backToLogin {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool showLoadingAnimation];
});
dispatch_async(dispatch_get_global_queue(0, 0), ^{ dispatch_async(dispatch_get_global_queue(0, 0), ^{
[XMGFileTool removeDirectoryPath:CachePath]; [XMGFileTool removeDirectoryPath:CachePath];
[ZXNotPay clearTable]; [ZXNotPay clearTable];
[ExpecptionModel clearTable]; [ExpecptionModel clearTable];
[ZXSections clearTable];
[ZXInformation clearTable];
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool showLoadingAnimation];
});
NSString *appDomainStr = [[NSBundle mainBundle] bundleIdentifier]; NSString *appDomainStr = [[NSBundle mainBundle] bundleIdentifier];
[[NSUserDefaults standardUserDefaults] removePersistentDomainForName:appDomainStr]; [[NSUserDefaults standardUserDefaults] removePersistentDomainForName:appDomainStr];
//清空之后 重设api //清空之后 重设api
......
ColorfulSchool/ColorfulSchool/Info.plist
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>3.8.6</string> <string>3.8.8</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
<array> <array>
<dict> <dict>
...@@ -440,7 +440,7 @@ ...@@ -440,7 +440,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.2</string> <string>1.0</string>
<key>LSApplicationQueriesSchemes</key> <key>LSApplicationQueriesSchemes</key>
<array> <array>
<string>jdlogin</string> <string>jdlogin</string>
......
ColorfulSchool/ColorfulSchool/PrefixHeader.pch
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#import "UIImageView+WebCache.h"//网络图片处理 #import "UIImageView+WebCache.h"//网络图片处理
#import "ExpecptionModel.h" #import "ExpecptionModel.h"
#import "GetData.h"//获取数据 #import "GetData.h"//获取数据
//#import "UIControl+repeatedClick.h"
#import "AppDelegate.h" #import "AppDelegate.h"
#import "Masonry.h" #import "Masonry.h"
#import "ZXJTJYViewController.h" #import "ZXJTJYViewController.h"
...@@ -59,28 +59,6 @@ ...@@ -59,28 +59,6 @@
#define uploadeUrlStr [NSString stringWithFormat:@""]//上传地址 #define uploadeUrlStr [NSString stringWithFormat:@""]//上传地址
//#define requestUrlStr [NSString stringWithFormat:@"http://api.dcrym.com/dcintsrv/mt/entrance.do"]//发布地址
//#define requestAliUrlStr [NSString stringWithFormat:@"http://api.dcrym.com/dcintsrv/pay/createAliOrder.do"]//支付宝发布接口地址
//#define requestWeiXinUrlStr [NSString stringWithFormat:@"http://api.dcrym.com/dcintsrv/pay/createWxOrder.do"]//微信接发布口地址
//#define requestUrlStr [NSString stringWithFormat:@"http://test.pxkjcn.com/dcintsrv/mt/entrance.do"]//外网测试地址
//#define requestAliUrlStr [NSString stringWithFormat:@"http://test.pxkjcn.com/dcintsrv/pay/createAliOrder.do"]//支付宝接口地址
//#define requestWeiXinUrlStr [NSString stringWithFormat:@"http://test.pxkjcn.com/dcintsrv/pay/createWxOrder.do"]//微信接口地址
//#define SqurerequestUrlStr [NSString stringWithFormat:@"http://192.168.1.193:8089/dclatintsrv/mt/entrance.do"]//格子蒋
//#define SqureImageUploadUrlStr [NSString stringWithFormat:@"http://192.168.1.193:8089/dclatintsrv/hardware/fileUpload.do"]//格子上传图片将
////数据测试
//#define requestUrlStr [NSString stringWithFormat:@"http://test.dcrym.com:8090/dcintsrv_drds/mt/entrance.do"]//外网测试地址
//#define requestAliUrlStr [NSString stringWithFormat:@"http://test.dcrym.com:8090/dcintsrv_drds/pay/createAliOrder.do"]//支付宝接口地址
//#define requestWeiXinUrlStr [NSString stringWithFormat:@"http://test.dcrym.com:8090/dcintsrv_drds/pay/createWxOrder.do"]//微信接口地址
//#define requestUrlStr [NSString stringWithFormat:@"%@/dcintsrv/mt/entrance.do",[[NSUserDefaults standardUserDefaults] objectForKey:@"schoolIp"]]//外网测试地址
//#define requestAliUrlStr [NSString stringWithFormat:@"%@/dcintsrv/pay/createAliOrder.do",[[NSUserDefaults standardUserDefaults] objectForKey:@"schoolIp"]]//支付宝接口地址
//#define requestWeiXinUrlStr [NSString stringWithFormat:@"%@/dcintsrv/pay/createWxOrder.do",[[NSUserDefaults standardUserDefaults] objectForKey:@"schoolIp"]]//微信接口地址
////
//#define SqurerequestUrlStr [NSString stringWithFormat:@"%@/dclatintsrv/mt/entrance.do",[[NSUserDefaults standardUserDefaults] objectForKey:@"squreIp"]]
//#define SqureImageUploadUrlStr [NSString stringWithFormat:@"%@/dclatintsrv/hardware/fileUpload.do",[[NSUserDefaults standardUserDefaults] objectForKey:@"squreIp"]]//格子上传图片将
#define requestUrlStr [NSString stringWithFormat:@"%@",[[NSUserDefaults standardUserDefaults] objectForKey:@"schoolIp"]]//外网测试地址 #define requestUrlStr [NSString stringWithFormat:@"%@",[[NSUserDefaults standardUserDefaults] objectForKey:@"schoolIp"]]//外网测试地址
#define requestAliUrlStr [NSString stringWithFormat:@"%@",[[NSUserDefaults standardUserDefaults] objectForKey:@"Ali"]]//支付宝接口地址 #define requestAliUrlStr [NSString stringWithFormat:@"%@",[[NSUserDefaults standardUserDefaults] objectForKey:@"Ali"]]//支付宝接口地址
......
ColorfulSchool/Podfile
platform :ios, '8.0' platform :ios, '8.0'
#use_frameworks!个别需要用到它，比如reactiveCocoa #use_frameworks!个别需要用到它，比如reactiveCocoa
inhibit_all_warnings!
target 'ColorfulSchool' do target 'ColorfulSchool' do
pod 'SDWebImage', '~>3.8' pod 'SDWebImage', '~>3.8'
pod 'MJExtension' pod 'MJExtension'
pod 'MJRefresh' pod 'MJRefresh'
pod 'SVProgressHUD' pod 'SVProgressHUD'
pod 'AFNetworking', '~> 2.6.3' pod 'AFNetworking', '~> 2.6.3'
# pod 'AFNetworking', '~> 3.2.1'
pod 'Masonry' pod 'Masonry'
pod 'XRCarouselView' pod 'XRCarouselView'
pod 'JPush' pod 'JPush'
......
ColorfulSchool/Podfile.lock
...@@ -159,6 +159,6 @@ SPEC CHECKSUMS: ...@@ -159,6 +159,6 @@ SPEC CHECKSUMS:
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
XRCarouselView: d3f949d1601e7de51604cdabd6e2f35a770e0f99 XRCarouselView: d3f949d1601e7de51604cdabd6e2f35a770e0f99
PODFILE CHECKSUM: c232ef3ab8b49acf93a507268db56b14b00c41dd PODFILE CHECKSUM: 3a8bfba3bf95c1db909001d7cff56024a71a4e23
COCOAPODS: 1.7.5 COCOAPODS: 1.7.5
ColorfulSchool/Pods/Manifest.lock
...@@ -159,6 +159,6 @@ SPEC CHECKSUMS: ...@@ -159,6 +159,6 @@ SPEC CHECKSUMS:
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
XRCarouselView: d3f949d1601e7de51604cdabd6e2f35a770e0f99 XRCarouselView: d3f949d1601e7de51604cdabd6e2f35a770e0f99
PODFILE CHECKSUM: c232ef3ab8b49acf93a507268db56b14b00c41dd PODFILE CHECKSUM: 3a8bfba3bf95c1db909001d7cff56024a71a4e23
COCOAPODS: 1.7.5 COCOAPODS: 1.7.5
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/xcschememanagement.plist
...@@ -8,155 +8,111 @@ ...@@ -8,155 +8,111 @@
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>4</integer>
</dict> </dict>
<key>Bugly.xcscheme</key> <key>Bugly.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>5</integer>
</dict> </dict>
<key>DTCoreText-Resources.xcscheme</key> <key>DTCoreText-Resources.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>7</integer>
</dict> </dict>
<key>DTCoreText.xcscheme</key> <key>DTCoreText.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>6</integer>
</dict> </dict>
<key>DTFoundation.xcscheme</key> <key>DTFoundation.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>8</integer>
</dict> </dict>
<key>FMDB.xcscheme</key> <key>FMDB.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>9</integer>
</dict> </dict>
<key>GDTMobSDK.xcscheme</key> <key>GDTMobSDK.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>10</integer>
</dict> </dict>
<key>HappyDNS.xcscheme</key> <key>HappyDNS.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>11</integer>
</dict> </dict>
<key>IQKeyboardManager.xcscheme</key> <key>IQKeyboardManager.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>12</integer>
</dict> </dict>
<key>JCore.xcscheme</key> <key>JCore.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>13</integer>
</dict> </dict>
<key>JJException.xcscheme</key> <key>JJException.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>14</integer>
</dict> </dict>
<key>JPush.xcscheme</key> <key>JPush.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>15</integer>
</dict> </dict>
<key>JXCategoryView.xcscheme</key> <key>JXCategoryView.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>16</integer>
</dict> </dict>
<key>MJExtension.xcscheme</key> <key>MJExtension.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>18</integer>
</dict> </dict>
<key>MJRefresh.xcscheme</key> <key>MJRefresh.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>19</integer>
</dict> </dict>
<key>Masonry.xcscheme</key> <key>Masonry.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>17</integer>
</dict> </dict>
<key>Pods-ColorfulSchool.xcscheme</key> <key>Pods-ColorfulSchool.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>20</integer>
</dict> </dict>
<key>Qiniu.xcscheme</key> <key>Qiniu.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>21</integer>
</dict> </dict>
<key>ReactiveCocoa.xcscheme</key> <key>ReactiveCocoa.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>22</integer>
</dict> </dict>
<key>SDWebImage.xcscheme</key> <key>SDWebImage.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>23</integer>
</dict> </dict>
<key>SVProgressHUD.xcscheme</key> <key>SVProgressHUD.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>24</integer>
</dict> </dict>
<key>XRCarouselView.xcscheme</key> <key>XRCarouselView.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>25</integer>
</dict> </dict>
</dict> </dict>
<key>SuppressBuildableAutocreation</key> <key>SuppressBuildableAutocreation</key>
......
ColorfulSchool/Pods/Target Support Files/Pods-ColorfulSchool/Pods-ColorfulSchool.adhot.xcconfig
...@@ -2,6 +2,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Bugly" ...@@ -2,6 +2,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Bugly"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 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/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 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" 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_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/DTCoreText" -isystem "${PODS_ROOT}/Headers/Public/DTFoundation" -isystem "${PODS_ROOT}/Headers/Public/FMDB" -isystem "${PODS_ROOT}/Headers/Public/GDTMobSDK" -isystem "${PODS_ROOT}/Headers/Public/HappyDNS" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/JJException" -isystem "${PODS_ROOT}/Headers/Public/JPush" -isystem "${PODS_ROOT}/Headers/Public/JXCategoryView" -isystem "${PODS_ROOT}/Headers/Public/MJExtension" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/Masonry" -isystem "${PODS_ROOT}/Headers/Public/Qiniu" -isystem "${PODS_ROOT}/Headers/Public/ReactiveCocoa" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/SVProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/XRCarouselView" -iframework "${PODS_ROOT}/Bugly"
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"c++" -l"jcore-ios-2.1.1" -l"jpush-ios-3.2.2" -l"resolv" -l"sqlite3" -l"xml2" -l"z" -framework "AVFoundation" -framework "AdSupport" -framework "Bugly" -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" 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"c++" -l"jcore-ios-2.1.1" -l"jpush-ios-3.2.2" -l"resolv" -l"sqlite3" -l"xml2" -l"z" -framework "AVFoundation" -framework "AdSupport" -framework "Bugly" -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_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
......
ColorfulSchool/Pods/Target Support Files/Pods-ColorfulSchool/Pods-ColorfulSchool.debug.xcconfig
...@@ -2,6 +2,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Bugly" ...@@ -2,6 +2,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Bugly"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 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/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 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" 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_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/DTCoreText" -isystem "${PODS_ROOT}/Headers/Public/DTFoundation" -isystem "${PODS_ROOT}/Headers/Public/FMDB" -isystem "${PODS_ROOT}/Headers/Public/GDTMobSDK" -isystem "${PODS_ROOT}/Headers/Public/HappyDNS" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/JJException" -isystem "${PODS_ROOT}/Headers/Public/JPush" -isystem "${PODS_ROOT}/Headers/Public/JXCategoryView" -isystem "${PODS_ROOT}/Headers/Public/MJExtension" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/Masonry" -isystem "${PODS_ROOT}/Headers/Public/Qiniu" -isystem "${PODS_ROOT}/Headers/Public/ReactiveCocoa" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/SVProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/XRCarouselView" -iframework "${PODS_ROOT}/Bugly"
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"c++" -l"jcore-ios-2.1.1" -l"jpush-ios-3.2.2" -l"resolv" -l"sqlite3" -l"xml2" -l"z" -framework "AVFoundation" -framework "AdSupport" -framework "Bugly" -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" 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"c++" -l"jcore-ios-2.1.1" -l"jpush-ios-3.2.2" -l"resolv" -l"sqlite3" -l"xml2" -l"z" -framework "AVFoundation" -framework "AdSupport" -framework "Bugly" -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_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
......
ColorfulSchool/Pods/Target Support Files/Pods-ColorfulSchool/Pods-ColorfulSchool.release.xcconfig
...@@ -2,6 +2,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Bugly" ...@@ -2,6 +2,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Bugly"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 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/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 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" 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_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/DTCoreText" -isystem "${PODS_ROOT}/Headers/Public/DTFoundation" -isystem "${PODS_ROOT}/Headers/Public/FMDB" -isystem "${PODS_ROOT}/Headers/Public/GDTMobSDK" -isystem "${PODS_ROOT}/Headers/Public/HappyDNS" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/JJException" -isystem "${PODS_ROOT}/Headers/Public/JPush" -isystem "${PODS_ROOT}/Headers/Public/JXCategoryView" -isystem "${PODS_ROOT}/Headers/Public/MJExtension" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/Masonry" -isystem "${PODS_ROOT}/Headers/Public/Qiniu" -isystem "${PODS_ROOT}/Headers/Public/ReactiveCocoa" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/SVProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/XRCarouselView" -iframework "${PODS_ROOT}/Bugly"
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"c++" -l"jcore-ios-2.1.1" -l"jpush-ios-3.2.2" -l"resolv" -l"sqlite3" -l"xml2" -l"z" -framework "AVFoundation" -framework "AdSupport" -framework "Bugly" -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" 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"c++" -l"jcore-ios-2.1.1" -l"jpush-ios-3.2.2" -l"resolv" -l"sqlite3" -l"xml2" -l"z" -framework "AVFoundation" -framework "AdSupport" -framework "Bugly" -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_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
......
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