Skip to content

C
colorfulSchoolReconsitution
Commit 838485bc by 刘卓鑫
Options

最新提交-定版

parent 9f6a5161
Showing with 87 additions and 55 deletions
ColorfulSchool/ColorfulSchool.xcodeproj/project.pbxproj
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
1C0210BA23176B3F0074D691 /* ZXChangeMsgViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C0210B923176B3F0074D691 /* ZXChangeMsgViewController.m */; }; 1C0210BA23176B3F0074D691 /* ZXChangeMsgViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C0210B923176B3F0074D691 /* ZXChangeMsgViewController.m */; };
1C0210BD2317736B0074D691 /* ZXChangeCommonView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C0210BC2317736B0074D691 /* ZXChangeCommonView.m */; }; 1C0210BD2317736B0074D691 /* ZXChangeCommonView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C0210BC2317736B0074D691 /* ZXChangeCommonView.m */; };
1C0210C12318AF730074D691 /* ZXOpenBlueToothView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C0210C02318AF730074D691 /* ZXOpenBlueToothView.m */; }; 1C0210C12318AF730074D691 /* ZXOpenBlueToothView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C0210C02318AF730074D691 /* ZXOpenBlueToothView.m */; };
1C0210C32318B00C0074D691 /* openBluetooth.gif in Resources */ = {isa = PBXBuildFile; fileRef = 1C0210C22318B00C0074D691 /* openBluetooth.gif */; };
1C03A9F62269BDBA00D39B93 /* APIManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C03A9F52269BDBA00D39B93 /* APIManager.m */; }; 1C03A9F62269BDBA00D39B93 /* APIManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C03A9F52269BDBA00D39B93 /* APIManager.m */; };
1C3940FA230A7BDC005048EB /* run.gif in Resources */ = {isa = PBXBuildFile; fileRef = 1C3940F9230A7BDC005048EB /* run.gif */; }; 1C3940FA230A7BDC005048EB /* run.gif in Resources */ = {isa = PBXBuildFile; fileRef = 1C3940F9230A7BDC005048EB /* run.gif */; };
1C39411C230BC9D5005048EB /* ZXRSReportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C3940FD230BC9D5005048EB /* ZXRSReportViewController.m */; }; 1C39411C230BC9D5005048EB /* ZXRSReportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C3940FD230BC9D5005048EB /* ZXRSReportViewController.m */; };
...@@ -47,6 +46,7 @@ ...@@ -47,6 +46,7 @@
1C3AE80122F276440045C969 /* ZXHomePageViewController+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C3AE80022F276440045C969 /* ZXHomePageViewController+Extension.m */; }; 1C3AE80122F276440045C969 /* ZXHomePageViewController+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C3AE80022F276440045C969 /* ZXHomePageViewController+Extension.m */; };
1C3AE80422F288710045C969 /* ZXHomePageSingleNewsCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C3AE80322F288710045C969 /* ZXHomePageSingleNewsCell.m */; }; 1C3AE80422F288710045C969 /* ZXHomePageSingleNewsCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C3AE80322F288710045C969 /* ZXHomePageSingleNewsCell.m */; };
1C3AE80722F2C2B20045C969 /* ZXHomePageAnnouce.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C3AE80622F2C2B20045C969 /* ZXHomePageAnnouce.m */; }; 1C3AE80722F2C2B20045C969 /* ZXHomePageAnnouce.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C3AE80622F2C2B20045C969 /* ZXHomePageAnnouce.m */; };
1C3C238D23264187006D6F7D /* openBluetooth.gif in Resources */ = {isa = PBXBuildFile; fileRef = 1C3C238C23264187006D6F7D /* openBluetooth.gif */; };
1C5B26B8225B3B7B001B0E1B /* ZXSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C5B26B7225B3B7B001B0E1B /* ZXSettingViewController.m */; }; 1C5B26B8225B3B7B001B0E1B /* ZXSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C5B26B7225B3B7B001B0E1B /* ZXSettingViewController.m */; };
1C5B26BB225B3B85001B0E1B /* ZXUserSettingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C5B26B9225B3B83001B0E1B /* ZXUserSettingTableViewCell.m */; }; 1C5B26BB225B3B85001B0E1B /* ZXUserSettingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C5B26B9225B3B83001B0E1B /* ZXUserSettingTableViewCell.m */; };
1C5B26BE225B3B8F001B0E1B /* ZXUserSettingModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C5B26BC225B3B8E001B0E1B /* ZXUserSettingModel.m */; }; 1C5B26BE225B3B8F001B0E1B /* ZXUserSettingModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C5B26BC225B3B8E001B0E1B /* ZXUserSettingModel.m */; };
...@@ -705,7 +705,6 @@ ...@@ -705,7 +705,6 @@
1C0210BC2317736B0074D691 /* ZXChangeCommonView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXChangeCommonView.m; sourceTree = "<group>"; }; 1C0210BC2317736B0074D691 /* ZXChangeCommonView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXChangeCommonView.m; sourceTree = "<group>"; };
1C0210BF2318AF730074D691 /* ZXOpenBlueToothView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXOpenBlueToothView.h; sourceTree = "<group>"; }; 1C0210BF2318AF730074D691 /* ZXOpenBlueToothView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXOpenBlueToothView.h; sourceTree = "<group>"; };
1C0210C02318AF730074D691 /* ZXOpenBlueToothView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXOpenBlueToothView.m; sourceTree = "<group>"; }; 1C0210C02318AF730074D691 /* ZXOpenBlueToothView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXOpenBlueToothView.m; sourceTree = "<group>"; };
1C0210C22318B00C0074D691 /* openBluetooth.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = openBluetooth.gif; sourceTree = "<group>"; };
1C03A9F42269BDBA00D39B93 /* APIManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = APIManager.h; sourceTree = "<group>"; }; 1C03A9F42269BDBA00D39B93 /* APIManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = APIManager.h; sourceTree = "<group>"; };
1C03A9F52269BDBA00D39B93 /* APIManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = APIManager.m; sourceTree = "<group>"; }; 1C03A9F52269BDBA00D39B93 /* APIManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = APIManager.m; sourceTree = "<group>"; };
1C3940F7230A712F005048EB /* libjpush-ios-3.1.1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libjpush-ios-3.1.1.a"; path = "Pods/JPush/libjpush-ios-3.1.1.a"; sourceTree = "<group>"; }; 1C3940F7230A712F005048EB /* libjpush-ios-3.1.1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libjpush-ios-3.1.1.a"; path = "Pods/JPush/libjpush-ios-3.1.1.a"; sourceTree = "<group>"; };
...@@ -777,6 +776,7 @@ ...@@ -777,6 +776,7 @@
1C3AE80322F288710045C969 /* ZXHomePageSingleNewsCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXHomePageSingleNewsCell.m; sourceTree = "<group>"; }; 1C3AE80322F288710045C969 /* ZXHomePageSingleNewsCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXHomePageSingleNewsCell.m; sourceTree = "<group>"; };
1C3AE80522F2C2B20045C969 /* ZXHomePageAnnouce.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXHomePageAnnouce.h; sourceTree = "<group>"; }; 1C3AE80522F2C2B20045C969 /* ZXHomePageAnnouce.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXHomePageAnnouce.h; sourceTree = "<group>"; };
1C3AE80622F2C2B20045C969 /* ZXHomePageAnnouce.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXHomePageAnnouce.m; sourceTree = "<group>"; }; 1C3AE80622F2C2B20045C969 /* ZXHomePageAnnouce.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXHomePageAnnouce.m; sourceTree = "<group>"; };
1C3C238C23264187006D6F7D /* openBluetooth.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = openBluetooth.gif; sourceTree = "<group>"; };
1C5B26B6225B3B7B001B0E1B /* ZXSettingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZXSettingViewController.h; sourceTree = "<group>"; }; 1C5B26B6225B3B7B001B0E1B /* ZXSettingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZXSettingViewController.h; sourceTree = "<group>"; };
1C5B26B7225B3B7B001B0E1B /* ZXSettingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZXSettingViewController.m; sourceTree = "<group>"; }; 1C5B26B7225B3B7B001B0E1B /* ZXSettingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZXSettingViewController.m; sourceTree = "<group>"; };
1C5B26B9225B3B83001B0E1B /* ZXUserSettingTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZXUserSettingTableViewCell.m; sourceTree = "<group>"; }; 1C5B26B9225B3B83001B0E1B /* ZXUserSettingTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZXUserSettingTableViewCell.m; sourceTree = "<group>"; };
...@@ -3447,9 +3447,9 @@ ...@@ -3447,9 +3447,9 @@
9194202D1F38000E0023BD5D /* like.caf */, 9194202D1F38000E0023BD5D /* like.caf */,
A7A858DB20BBA480001917F2 /* holder_index.png */, A7A858DB20BBA480001917F2 /* holder_index.png */,
1C3940F9230A7BDC005048EB /* run.gif */, 1C3940F9230A7BDC005048EB /* run.gif */,
1C0210C22318B00C0074D691 /* openBluetooth.gif */,
A7BE8C3721C89AE200B77C47 /* home_quanyuan_def_pic.png */, A7BE8C3721C89AE200B77C47 /* home_quanyuan_def_pic.png */,
A78A3F3F21952EE6001558A5 /* orderSound.wav */, A78A3F3F21952EE6001558A5 /* orderSound.wav */,
1C3C238C23264187006D6F7D /* openBluetooth.gif */,
A7DECC642079F0E20039EC22 /* loadingBG.png */, A7DECC642079F0E20039EC22 /* loadingBG.png */,
1CC1543A230E2FB200582EC1 /* img_lauch.png */, 1CC1543A230E2FB200582EC1 /* img_lauch.png */,
A77DE2C920DB4ACC002FB903 /* washingsss.gif */, A77DE2C920DB4ACC002FB903 /* washingsss.gif */,
...@@ -4962,7 +4962,6 @@ ...@@ -4962,7 +4962,6 @@
22E36C981F558D1B00073AC2 /* PayTypeCell.xib in Resources */, 22E36C981F558D1B00073AC2 /* PayTypeCell.xib in Resources */,
22E36CD11F55975500073AC2 /* TicketCell.xib in Resources */, 22E36CD11F55975500073AC2 /* TicketCell.xib in Resources */,
1CA7E88B229E8E310014E95F /* JDSDK.bundle in Resources */, 1CA7E88B229E8E310014E95F /* JDSDK.bundle in Resources */,
1C0210C32318B00C0074D691 /* openBluetooth.gif in Resources */,
A7F3E18221B5330F00010E23 /* upload.html in Resources */, A7F3E18221B5330F00010E23 /* upload.html in Resources */,
A705C00D21D4B067004F1628 /* PlayButtonOverlayLarge@3x.png in Resources */, A705C00D21D4B067004F1628 /* PlayButtonOverlayLarge@3x.png in Resources */,
A72BE4B721D5CD030069C0E1 /* AlertStyleDefault.xib in Resources */, A72BE4B721D5CD030069C0E1 /* AlertStyleDefault.xib in Resources */,
...@@ -4977,6 +4976,7 @@ ...@@ -4977,6 +4976,7 @@
A7DECCAB2079F0E30039EC22 /* README.mdown in Resources */, A7DECCAB2079F0E30039EC22 /* README.mdown in Resources */,
A705C00021D4B067004F1628 /* ImageSelectedOff@2x.png in Resources */, A705C00021D4B067004F1628 /* ImageSelectedOff@2x.png in Resources */,
A754367421D331EA005584CC /* BuyCouponsViewController.xib in Resources */, A754367421D331EA005584CC /* BuyCouponsViewController.xib in Resources */,
1C3C238D23264187006D6F7D /* openBluetooth.gif in Resources */,
A7F3E1AF21B5330F00010E23 /* XDSNoDataView.xib in Resources */, A7F3E1AF21B5330F00010E23 /* XDSNoDataView.xib in Resources */,
A72BE4B821D5CD030069C0E1 /* AlertStyleSimple.xib in Resources */, A72BE4B821D5CD030069C0E1 /* AlertStyleSimple.xib in Resources */,
A705C00221D4B067004F1628 /* ImageSelectedOn.png in Resources */, A705C00221D4B067004F1628 /* ImageSelectedOn.png in Resources */,
......
ColorfulSchool/ColorfulSchool/AppDelegate.m
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
_isPlaying = NO; _isPlaying = NO;
//启动环境 //启动环境
[APIManager sharedAPIManager].lauchEnvironment = ZXColorfulSchoolEnvironmentTest; [APIManager sharedAPIManager].lauchEnvironment = ZXColorfulSchoolEnvironmentProduct;
//极光推送 //极光推送
[self initPushWithOptions:launchOptions isProduct:YES]; [self initPushWithOptions:launchOptions isProduct:YES];
...@@ -80,11 +80,11 @@ ...@@ -80,11 +80,11 @@
//版本检测 //版本检测
[self checkVersion]; [self checkVersion];
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:NO]; [self defaultLauchConfigAndIsOpenPreventCrashManager:YES];
//防止蓝牙洗浴后台运行被系统中断 //防止蓝牙洗浴后台运行被系统中断
......
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXFullScreenAdView.m
// //
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
#import "ZXFullScreenAdView.h" #import "ZXFullScreenAdView.h"
#import "SDWebImageManager.h" #import "SDWebImageManager.h"
#import "enlargeClickRegionBtn.h"
#define MainScreenWidth [UIScreen mainScreen].bounds.size.width #define MainScreenWidth [UIScreen mainScreen].bounds.size.width
@interface ZXFullScreenAdView () @interface ZXFullScreenAdView ()
@property (nonatomic, strong) UIButton *skipButton; //跳过按钮 @property (nonatomic, strong) enlargeClickRegionBtn *skipButton; //跳过按钮
@property (nonatomic, strong) dispatch_source_t timer; //显示计时器 @property (nonatomic, strong) dispatch_source_t timer; //显示计时器
@property (nonatomic, strong) dispatch_source_t timerWait; //等待计时器 @property (nonatomic, strong) dispatch_source_t timerWait; //等待计时器
@property (nonatomic, assign) BOOL flag; //是否将要消失 @property (nonatomic, assign) BOOL flag; //是否将要消失
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
- (UIButton *)skipButton - (UIButton *)skipButton
{ {
if (!_skipButton) { if (!_skipButton) {
_skipButton = [UIButton buttonWithType:UIButtonTypeCustom]; _skipButton = [enlargeClickRegionBtn buttonWithType:UIButtonTypeCustom];
_skipButton.frame = CGRectMake(MainScreenWidth - 70, 30, 60, 30); _skipButton.frame = CGRectMake(MainScreenWidth - 70, 30, 60, 30);
_skipButton.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.4]; _skipButton.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.4];
_skipButton.layer.cornerRadius = 15; _skipButton.layer.cornerRadius = 15;
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/Controller/ZXHomePageViewController.m
// //
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
} }
#pragma mark - 顶部用户信息栏 #pragma mark - 顶部用户信息栏
- (void) createUserHeader { - (void) createUserHeader {
self.naHeader = [[ZXHomePageUserInfoHeader alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kTopHeight + 40 * k6Scale)]; self.naHeader = [[ZXHomePageUserInfoHeader alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kTopHeight + 13 * k6Scale)];
self.naHeader.fromVc = self; self.naHeader.fromVc = self;
kWeakSelf(self); kWeakSelf(self);
self.naHeader.changeIconBlock = ^{ self.naHeader.changeIconBlock = ^{
...@@ -166,9 +166,10 @@ ...@@ -166,9 +166,10 @@
if (iPhoneX) { if (iPhoneX) {
bottomH = 34; bottomH = 34;
} }
_myTableView = [[UITableView alloc] initWithFrame:CGRectMake(0, kTopHeight + 35, kScreenWidth, kScreenHeight - bottomH - 49 - kTopHeight - 35 * k6Scale) style:UITableViewStyleGrouped]; _myTableView = [[UITableView alloc] initWithFrame:CGRectMake(0, kTopHeight + 13 * k6Scale, kScreenWidth, kScreenHeight - bottomH - 49 - kTopHeight - 35 * k6Scale) style:UITableViewStyleGrouped];
_myTableView.delegate = self; _myTableView.delegate = self;
_myTableView.dataSource = self; _myTableView.dataSource = self;
_myTableView.backgroundColor = [UIColor whiteColor]; _myTableView.backgroundColor = [UIColor whiteColor];
_myTableView.tableFooterView = [UIView new]; _myTableView.tableFooterView = [UIView new];
if (@available(iOS 11.0, *)) { if (@available(iOS 11.0, *)) {
...@@ -265,6 +266,7 @@ ...@@ -265,6 +266,7 @@
@strongify(self); @strongify(self);
[self functionClickJump:info]; [self functionClickJump:info];
}; };
return cell; return cell;
} }
...@@ -429,7 +431,7 @@ ...@@ -429,7 +431,7 @@
} }
case 6: { //单图资讯 case 6: { //单图资讯
ZXHomeSecondChildInfo *secondChild = child.itemData.firstObject; ZXHomeSecondChildInfo *secondChild = child.itemData.firstObject;
return ([secondChild.imgPosition isEqualToString:@"1"] || [secondChild.imgPosition isEqualToString:@"3"])?120 * k6Scale:155 * k6Scale; return ([secondChild.imgPosition isEqualToString:@"1"] || [secondChild.imgPosition isEqualToString:@"3"])?120 * k6Scale:145 * k6Scale;
break; break;
} }
case 7: { //三图资讯 case 7: { //三图资讯
...@@ -449,7 +451,10 @@ ...@@ -449,7 +451,10 @@
} }
- (CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - (CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
ZXHomeSectionInfo *sec = self.service.dataSource[section]; ZXHomeSectionInfo *sec = self.service.dataSource[section];
return section==0?0:(sec.isShow?50.0f:15.0f); return section==0?0:(sec.isShow?35.0f:15.0f);
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
[tableView deselectRowAtIndexPath:indexPath animated:YES];
} }
- (UIView *) tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - (UIView *) tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
ZXHomeSectionInfo *sec = self.service.dataSource[section]; ZXHomeSectionInfo *sec = self.service.dataSource[section];
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/Cells/ZXHomePageMulityNewsCell.m
// //
...@@ -33,12 +33,13 @@ ...@@ -33,12 +33,13 @@
- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{ - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
self.selectionStyle = UITableViewCellSelectionStyleNone; self.selectionStyle = UITableViewCellSelectionStyleGray;
UITapGestureRecognizer *tap2 = [[UITapGestureRecognizer alloc] init]; UITapGestureRecognizer *tap2 = [[UITapGestureRecognizer alloc] init];
[self.contentView addGestureRecognizer:tap2]; [self.contentView addGestureRecognizer:tap2];
@weakify(self); @weakify(self);
[[tap2 rac_gestureSignal] subscribeNext:^(id x) { [[tap2 rac_gestureSignal] subscribeNext:^(id x) {
@strongify(self); @strongify(self);
if (self.clickOther) { if (self.clickOther) {
self.clickOther(self.info); self.clickOther(self.info);
} }
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/Cells/ZXHomePageSingleCell.m
// //
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
} }
- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
self.selectionStyle = UITableViewCellSelectionStyleGray;
self.topicImageView = [[UIImageView alloc] initWithFrame:CGRectMake(20 * k6Scale, 5 * k6Scale, kScreenWidth - 40 * k6Scale, 95 * k6Scale)]; self.topicImageView = [[UIImageView alloc] initWithFrame:CGRectMake(20 * k6Scale, 5 * k6Scale, kScreenWidth - 40 * k6Scale, 95 * k6Scale)];
[self.contentView addSubview:self.topicImageView]; [self.contentView addSubview:self.topicImageView];
self.topicImageView.contentMode = UIViewContentModeScaleAspectFill; self.topicImageView.contentMode = UIViewContentModeScaleAspectFill;
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
@weakify(self); @weakify(self);
[[tap1 rac_gestureSignal] subscribeNext:^(id x) { [[tap1 rac_gestureSignal] subscribeNext:^(id x) {
@strongify(self); @strongify(self);
if (self.clickOther) { if (self.clickOther) {
self.clickOther(self.info); self.clickOther(self.info);
} }
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/Cells/ZXHomePageSingleNewsCell.m
// //
...@@ -36,12 +36,13 @@ ...@@ -36,12 +36,13 @@
- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
self.selectionStyle = UITableViewCellSelectionStyleNone; self.selectionStyle = UITableViewCellSelectionStyleGray;
UITapGestureRecognizer *tap2 = [[UITapGestureRecognizer alloc] init]; UITapGestureRecognizer *tap2 = [[UITapGestureRecognizer alloc] init];
[self.contentView addGestureRecognizer:tap2]; [self.contentView addGestureRecognizer:tap2];
@weakify(self); @weakify(self);
[[tap2 rac_gestureSignal] subscribeNext:^(id x) { [[tap2 rac_gestureSignal] subscribeNext:^(id x) {
@strongify(self); @strongify(self);
if (self.clickOther) { if (self.clickOther) {
self.clickOther(self.child); self.clickOther(self.child);
} }
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/customViews/ZXHomePaeFirstRecahrgeView.m
// //
...@@ -95,7 +95,8 @@ ...@@ -95,7 +95,8 @@
make.left.equalTo(columLine.mas_right); make.left.equalTo(columLine.mas_right);
make.top.equalTo(bottomLine.mas_bottom); make.top.equalTo(bottomLine.mas_bottom);
}]; }];
[[rightBtn rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(id x) { [[rightBtn rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(UIButton *x) {
x.enabled = NO;
self.hidden = YES; self.hidden = YES;
[self removeFromSuperview]; [self removeFromSuperview];
rightAction(); rightAction();
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/customViews/ZXHomePageHeader.m
// //
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
/** 标题 */ /** 标题 */
@property (nonatomic, strong) UILabel *titleLabel; @property (nonatomic, strong) UILabel *titleLabel;
@end @end
...@@ -31,17 +32,30 @@ ...@@ -31,17 +32,30 @@
self.titleLabel = [[UILabel alloc] init]; self.titleLabel = [[UILabel alloc] init];
[self.contentView addSubview:self.titleLabel]; [self.contentView addSubview:self.titleLabel];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self.contentView).insets(UIEdgeInsetsMake(0, 20 * k6Scale, 0, 20 * k6Scale)); make.left.equalTo(self.contentView.mas_left).offset(20 * k6Scale);
make.top.equalTo(self.contentView.mas_top).offset(10 * k6Scale);
}]; }];
self.titleLabel.font = [UIFont boldSystemFontOfSize:17 * k6Scale]; self.titleLabel.font = [UIFont boldSystemFontOfSize:15 * k6Scale];
self.titleLabel.textColor = [UIColor blackColor]; self.titleLabel.textColor = [UIColor blackColor];
UIView *holder = [[UIView alloc] init];
holder.backgroundColor = RGB(243, 243, 243);
[self.contentView addSubview:holder];
[holder mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.titleLabel.mas_right).offset(10 * k6Scale);
make.right.equalTo(self.contentView.mas_right).offset(-20 * k6Scale);
make.centerY.equalTo(self.titleLabel);
make.height.mas_equalTo(1);
}];
} }
return self; return self;
} }
- (void)setTitle:(NSString *)title { - (void)setTitle:(NSString *)title {
_title = title; _title = title;
self.titleLabel.text = _title; self.titleLabel.text = _title;
} }
@end @end
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/ViewModel/ZXHomePageService.m
// //
...@@ -212,7 +212,9 @@ ...@@ -212,7 +212,9 @@
}]; }];
//外部曝光 //外部曝光
[ZXTool requestDataHideLoadingToastWithType:kXMHTTPMethodGET url:[ZXTool formatJumpUrl:info.showAddressIos] para:nil completed:nil]; [ZXTool requestDataHideLoadingToastWithType:kXMHTTPMethodGET url:[ZXTool formatJumpUrl:info.showAddressIos] para:nil completed:^(CommonModel *common, NSString *error) {
}];
} }
} }
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/bath(洗浴)/ZXOpenBlueToothView.m
// //
...@@ -27,18 +27,19 @@ ...@@ -27,18 +27,19 @@
self.imageView = [[YYAnimatedImageView alloc] initWithFrame:[UIScreen mainScreen].bounds]; self.imageView = [[YYAnimatedImageView alloc] initWithFrame:[UIScreen mainScreen].bounds];
self.imageView.image = image; self.imageView.image = image;
[self addSubview:self.imageView]; [self addSubview:self.imageView];
// @weakify(self);
// [RACObserve(self.imageView, currentAnimatedImageIndex) subscribeNext:^(id _Nullable x) { @weakify(self);
// @strongify(self); [RACObserve(self.imageView, currentAnimatedImageIndex) subscribeNext:^(id _Nullable x) {
// if ([x integerValue] == self.imageView.animationImages.count) { @strongify(self);
// [self.imageView stopAnimating]; if ([x integerValue] == 50) {
// self.imageView.hidden = YES; [self.imageView stopAnimating];
// self.imageView.hidden = YES;
// [self.imageView removeFromSuperview];
// self.hidden = YES; [self.imageView removeFromSuperview];
// [self removeFromSuperview]; self.hidden = YES;
// } [self removeFromSuperview];
// }]; }
}];
} }
return self; return self;
} }
......
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Login/Controller/ZXLoginViewController.m
// //
...@@ -106,8 +106,10 @@ ...@@ -106,8 +106,10 @@
} }
- (void) keyboardWillHide:(NSNotification *) nof { - (void) keyboardWillHide:(NSNotification *) nof {
dispatch_async(dispatch_get_main_queue(), ^{
self.usernameAnView.hidden = [self.usernameField.text isEqualToString:@""]; self.usernameAnView.hidden = [self.usernameField.text isEqualToString:@""];
self.passwordAnView.hidden = [self.passwordField.text isEqualToString:@""]; self.passwordAnView.hidden = [self.passwordField.text isEqualToString:@""];
});
} }
- (void) keyboardWillShow:(NSNotification *) nof { - (void) keyboardWillShow:(NSNotification *) nof {
if (self.usernameField.editing) { if (self.usernameField.editing) {
......
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Register/Controller/ZXRegistorViewController.m
// //
...@@ -396,7 +396,7 @@ ...@@ -396,7 +396,7 @@
make.left.equalTo(line6.mas_left); make.left.equalTo(line6.mas_left);
make.bottom.equalTo(line6.mas_bottom); make.bottom.equalTo(line6.mas_bottom);
make.height.mas_equalTo(25 * k6Scale); make.height.mas_equalTo(25 * k6Scale);
make.width.mas_equalTo(180 * k6Scale); make.right.equalTo(bg.mas_right).offset(-10 * k6Scale);
}]; }];
// self.schoolAreaNameField = [[UITextField alloc] init]; // self.schoolAreaNameField = [[UITextField alloc] init];
......
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/UserSetting/UserSet/Controller/ZXSettingViewController.m
// //
...@@ -120,8 +120,8 @@ typedef void(^isCanChange)(BOOL iCan); ...@@ -120,8 +120,8 @@ typedef void(^isCanChange)(BOOL iCan);
m4.switchIsOn = [CacheDevPassSwitch integerValue]; m4.switchIsOn = [CacheDevPassSwitch integerValue];
m4.switchType = 1; m4.switchType = 1;
m5.imageName = imagegroup1[5]; m5.imageName = imagegroup1[4];
m5.name = group1[5]; m5.name = group1[4];
m5.isHasSwitch = YES; m5.isHasSwitch = YES;
m5.switchIsOn = [[kUserDefaults valueForKey:@"currentUserIsOpenJPush"] isEqualToString:@"yes"];; m5.switchIsOn = [[kUserDefaults valueForKey:@"currentUserIsOpenJPush"] isEqualToString:@"yes"];;
m5.switchType = 3; m5.switchType = 3;
......
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/ZXTool.h
// //
...@@ -167,4 +167,6 @@ typedef void(^checkIsOldCustomer)(BOOL isOld); ...@@ -167,4 +167,6 @@ typedef void(^checkIsOldCustomer)(BOOL isOld);
+ (NSString *) formatJumpUrl:(NSString *) jumpUrl; + (NSString *) formatJumpUrl:(NSString *) jumpUrl;
@end @end
ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/ZXTool.m
// //
...@@ -714,7 +714,7 @@ void ProviderReleaseData (void *info, const void *data, size_t size){ ...@@ -714,7 +714,7 @@ void ProviderReleaseData (void *info, const void *data, size_t size){
//退出登录 并l调用接口 //退出登录 并l调用接口
+(void) backToLoginAndOperationInterface { +(void) backToLoginAndOperationInterface {
[ZXTool requestDataHideLoadingToastWithType:kXMHTTPMethodGET url:[NSString stringWithFormat:@"%@/app/customer/login/out?token=%@", [kUserDefaults objectForKey:@"NEW_PAY"], [kUserDefaults valueForKey:@"token"]] para:nil completed:^(CommonModel *common, NSString *error) { [ZXTool requestDataWithType:kXMHTTPMethodGET url:[NSString stringWithFormat:@"%@/app/customer/login/out?token=%@", [kUserDefaults objectForKey:@"NEW_PAY"], [kUserDefaults valueForKey:@"token"]] para:nil completed:^(CommonModel *common, NSString *error) {
}]; }];
[self backToLogin]; [self backToLogin];
...@@ -1718,4 +1718,6 @@ void ProviderReleaseData (void *info, const void *data, size_t size){ ...@@ -1718,4 +1718,6 @@ void ProviderReleaseData (void *info, const void *data, size_t size){
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:@""]; 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/Tool(工具)/ZXUMStatisticsManager.m
// //
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
//友盟统计 //友盟统计
[UMConfigure initWithAppkey:@"5d71c1514ca3579831000c32" channel:@"App Store"]; [UMConfigure initWithAppkey:@"5d71c1514ca3579831000c32" channel:@"App Store"];
[UMCommonLogManager setUpUMCommonLogManager]; [UMCommonLogManager setUpUMCommonLogManager];
[UMConfigure setLogEnabled:YES]; [UMConfigure setLogEnabled:NO];
[MobClick setScenarioType:E_UM_NORMAL]; //普通统计 [MobClick setScenarioType:E_UM_NORMAL]; //普通统计
[MobClick setCrashReportEnabled:NO]; //关闭异常统计 [MobClick setCrashReportEnabled:NO]; //关闭异常统计
......
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