Skip to content

C
colorfulSchoolReconsitution
Commit e7706464 by 刘卓鑫
Options

3.8.9定版

parent 838485bc
Showing with 155 additions and 70 deletions
ColorfulSchool/ColorfulSchool.xcodeproj/xcshareddata/xcschemes/ColorfulSchool.xcscheme
......@@ -62,7 +62,7 @@
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
......
ColorfulSchool/ColorfulSchool.xcworkspace/xcuserdata/liuzhuoxin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -13,5 +13,37 @@
stopOnStyle = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/HomePage(&#x9996;&#x9875;)/Operation(&#x81ea;&#x52a9;&#x670d;&#x52a1;)/1.0Version(1.0&#x8d2d;&#x5238;)/BuyCoupons/Controller/BuyCouponsViewController.m"
timestampString = "589789189.075565"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "453"
endingLineNumber = "453"
landmarkName = "-tableView:didSelectRowAtIndexPath:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ColorfulSchool/Classes/AD(&#x5e7f;&#x544a;)/ZXTXAdTool.m"
timestampString = "589796272.887374"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "86"
endingLineNumber = "86"
landmarkName = "-splashAdFailToPresent:withError:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXAdTool.m
//
//
......@@ -69,6 +69,9 @@
if (lauch.isButt) {
[[ZXTXAdTool sharedZXTXAdTool] createLauchAdByPlacmentId:kTXAdLauchPLACEMENTID];
} else {
if (lauch.advertImg == nil || [lauch.advertImg isEqualToString:@""]) {
return ;
}
ZXFullScreenAdView *adView = [[ZXFullScreenAdView alloc] initWithFrame:[UIScreen mainScreen].bounds];
adView.duration = lauch.millisecond / 1000;
adView.waitTime = 3;
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/Controller/ZXHomePageSupverViewController.m
//
//
......@@ -22,14 +22,14 @@
[self createNabar];
self.contentView = [[UIView alloc] initWithFrame:CGRectMake(0, kTopHeight + 10 * k6Scale, kScreenWidth, kScreenHeight - kTopHeight - 10 * k6Scale)];
self.contentView = [[UIView alloc] initWithFrame:CGRectMake(0, kTopHeight, kScreenWidth, kScreenHeight - kTopHeight)];
[self.view addSubview:self.contentView];
}
#pragma mark - ========== 创建导航栏 ==========
- (void) createNabar {
UIImage *image = [UIImage imageNamed:@"nav_bg"];
CGFloat height = kTopHeight + 25 * k6Scale;
CGFloat height = kTopHeight;
UIImageView *nabar = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, height)];
nabar.userInteractionEnabled = YES;
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/Cells/ZXHomePageAnnouceCell.m
//
//
......@@ -48,8 +48,8 @@
self.ContentImageView = [[UIImageView alloc] init];
self.ContentImageView.contentMode = UIViewContentModeScaleAspectFill;
self.ContentImageView.clipsToBounds = YES;
// self.ContentImageView.contentMode = UIViewContentModeScaleAspectFill;
// self.ContentImageView.clipsToBounds = YES;
[imageV addSubview:self.ContentImageView];
self.ContentImageView.layer.cornerRadius = 5 * k6Scale;
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/Cells/ZXHomePageBannerCell.m
//
//
......@@ -29,7 +29,7 @@
- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
self.cycleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectMake(20 * k6Scale, 5 * k6Scale, kScreenWidth - 40 * k6Scale, 95 * k6Scale) shouldInfiniteLoop:YES imageNamesGroup:@[]];
self.cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
// self.cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
self.cycleScrollView.autoScrollTimeInterval = 5;
self.cycleScrollView.layer.cornerRadius = 5 * k6Scale;
self.cycleScrollView.layer.masksToBounds = YES;
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/Cells/ZXHomePageSingleCell.m
//
//
......@@ -34,8 +34,8 @@
self.selectionStyle = UITableViewCellSelectionStyleGray;
self.topicImageView = [[UIImageView alloc] initWithFrame:CGRectMake(20 * k6Scale, 5 * k6Scale, kScreenWidth - 40 * k6Scale, 95 * k6Scale)];
[self.contentView addSubview:self.topicImageView];
self.topicImageView.contentMode = UIViewContentModeScaleAspectFill;
self.topicImageView.clipsToBounds = YES;
// self.topicImageView.contentMode = UIViewContentModeScaleAspectFill;
// self.topicImageView.clipsToBounds = YES;
self.topicImageView.layer.cornerRadius = 5 * k6Scale;
self.topicImageView.userInteractionEnabled = YES;
UITapGestureRecognizer *tap1 = [[UITapGestureRecognizer alloc] init];
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/Cells/ZXHomePageSingleNewsCell.m
//
//
......@@ -68,8 +68,8 @@
[self.contentView addSubview:self.titleLabel];
// [self.contentView addSubview:self.fromLabel];
// [self.contentView addSubview:self.dateLabel];
self.contentImageView.contentMode = UIViewContentModeScaleAspectFill;
self.contentImageView.clipsToBounds = YES;
// self.contentImageView.contentMode = UIViewContentModeScaleAspectFill;
// self.contentImageView.clipsToBounds = YES;
self.contentImageView.layer.cornerRadius = 5 * k6Scale;
// UIView *line = [[UIView alloc] init];
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/customViews/ZXHomeFunctionView.m
//
//
......@@ -30,7 +30,7 @@
[self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self);
}];
self.bgImageView.contentMode = UIViewContentModeScaleAspectFit;
// self.bgImageView.contentMode = UIViewContentModeScaleAspectFit;
// self.titleLabel = [[UILabel alloc] init];
// [self addSubview:_titleLabel];
// self.titleLabel.textColor = [UIColor whiteColor];
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/NewFirstPage(新版首页)/Views/HomeSectionView.m
//
//
......@@ -35,7 +35,7 @@
}];
self.contentImageView.backgroundColor = [UIColor clearColor];
self.contentLabel = [[UILabel alloc] init];
self.contentImageView.contentMode = UIViewContentModeScaleAspectFit;
// self.contentImageView.contentMode = UIViewContentModeScaleAspectFit;
[self.contentView addSubview:self.contentLabel];
[self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.contentView);
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/NewFirstPage(新版首页)/Views/New_ADCell.m
//
//
......@@ -29,8 +29,8 @@
}];
self.contentImageview.layer.cornerRadius = 5;
self.contentImageview.clipsToBounds = YES;
self.contentImageview.contentMode = UIViewContentModeScaleAspectFill;
self.contentImageview.clipsToBounds = YES;
// self.contentImageview.contentMode = UIViewContentModeScaleAspectFill;
// self.contentImageview.clipsToBounds = YES;
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] init];
self.contentImageview.userInteractionEnabled = YES;
[self.contentImageview addGestureRecognizer:tap];
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/NewFirstPage(新版首页)/Views/New_BannerCell.m
//
//
......@@ -29,7 +29,7 @@
- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
self.cycleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectMake(0, 0, kScreenWidth, 120 * k6Scale) shouldInfiniteLoop:YES imageNamesGroup:@[]];
self.cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
// self.cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
self.cycleScrollView.autoScrollTimeInterval = 5;
self.cycleScrollView.pageControlStyle = SDCycleScrollViewPageContolStyleClassic;
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/NewFirstPage(新版首页)/Views/New_SchoolNewCell.m
//
//
......@@ -39,8 +39,8 @@
self.ContentImageView = [[UIImageView alloc] init];
self.ContentImageView.contentMode = UIViewContentModeScaleAspectFill;
self.ContentImageView.clipsToBounds = YES;
// self.ContentImageView.contentMode = UIViewContentModeScaleAspectFill;
// self.ContentImageView.clipsToBounds = YES;
[self.contentView addSubview:self.ContentImageView];
self.ContentImageView.layer.cornerRadius = 5;
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/NewFirstPage(新版首页)/Views/New_TopicCell.m
//
//
......@@ -24,8 +24,8 @@
self.selectionStyle = UITableViewCellSelectionStyleNone;
self.contentImageView = [[UIImageView alloc] init];
[self.contentView addSubview:self.contentImageView];
self.contentImageView.contentMode = UIViewContentModeScaleAspectFill;
self.contentImageView.clipsToBounds = YES;
// self.contentImageView.contentMode = UIViewContentModeScaleAspectFill;
// self.contentImageView.clipsToBounds = YES;
self.contentImageView.layer.cornerRadius = 5;
self.contentImageView.layer.masksToBounds = YES;
[self.contentImageView mas_makeConstraints:^(MASConstraintMaker *make) {
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/NewFirstPage(新版首页)/Views/New_WindowCell.m
//
//
......@@ -101,8 +101,8 @@
make.bottom.top.equalTo(imageV);
make.width.mas_equalTo(1);
}];
imageV.contentMode = UIViewContentModeScaleAspectFill;
imageV.clipsToBounds = YES;
// imageV.contentMode = UIViewContentModeScaleAspectFill;
// imageV.clipsToBounds = YES;
UIView *line1 = [UIView new];
[imageV addSubview:line1];
line1.backgroundColor = kRGBColor(242, 242, 242, 1);
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/1.0Version(1.0购券)/UserEquipment/Controller/UseEquipmentController.m
//
//
......@@ -20,6 +20,7 @@
#import "HMScannerViewController.h"
#import "SearchEquipmenController.h"
#import "DeleteAlertView.h"
#import "ZXScannerViewController.h"
@interface UseEquipmentController ()<UITableViewDataSource ,UITableViewDelegate,UIGestureRecognizerDelegate>
@property (strong, nonatomic) NSArray *dataArray;
@property (strong, nonatomic) NSArray * imageArray;
......@@ -170,7 +171,7 @@
- (void)viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
self.currentStr = @"";
}
-(void)addGestureForTopView{
......@@ -187,20 +188,35 @@
*/
-(void)tapGestureGotoqrCode
{
NSString *cardName = [NSString stringWithFormat:@"%@-%@",@"二维码扫描", self.equipItem.serviceName];
UIImage *avatar = [UIImage imageNamed:@"avatar"];
__weak typeof(self) weakSelf=self;
HMScannerViewController * scanner=[[HMScannerViewController alloc]initWithCardName:cardName avatar:avatar completion:^(NSString *stringValue) {
// NSString *cardName = [NSString stringWithFormat:@"%@-%@",@"二维码扫描", self.equipItem.serviceName];
// UIImage *avatar = [UIImage imageNamed:@"avatar"];
//
// __weak typeof(self) weakSelf=self;
// HMScannerViewController * scanner=[[HMScannerViewController alloc]initWithCardName:cardName avatar:avatar completion:^(NSString *stringValue) {
//
//
// [weakSelf pushToBuyWith:stringValue];
//
// }];
// scanner.titleStr=@"使用设备";
// scanner.equipmentItem=self.equipItem;
// [self.navigationController pushViewController:scanner animated:NO];
[weakSelf pushToBuyWith:stringValue];
@weakify(self);
ZXScannerViewController *vc = [[ZXScannerViewController alloc] init];
vc.equipmentItem = self.equipItem;
vc.title = @"使用设备";
vc.hidesBottomBarWhenPushed = YES;
vc.scanResult = ^(NSString *result) {
@strongify(self);
dispatch_async(dispatch_get_main_queue(), ^{
[self pushToBuyWith:result];
});
}];
scanner.titleStr=@"使用设备";
scanner.equipmentItem=self.equipItem;
[self.navigationController pushViewController:scanner animated:NO];
};
[self.navigationController pushViewController:vc animated:NO];
}
-(void)pushToBuyWith:(NSString *)strNo;{
......@@ -208,7 +224,7 @@
return;
}
self.currentStr = strNo;
BuyCouponsViewController * view = [[BuyCouponsViewController alloc]init];
view.equipmentItem=self.equipItem;
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/2.0条码/ZXSelfHelpViewController.m
//
//
......@@ -175,7 +175,7 @@
images = @[@"洗衣01", @"洗衣02"];
}
self.cycleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero shouldInfiniteLoop:YES imageNamesGroup:images];
self.cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
// self.cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
self.cycleScrollView.autoScrollTimeInterval = 3;
self.cycleScrollView.pageControlStyle = SDCycleScrollViewPageContolStyleClassic;
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/appointmentBath(预约洗浴)/Controller/ZXAppointBathViewController.m
//
//
......@@ -167,8 +167,8 @@
self.topView.backgroundColor = kRGBColor(242, 242, 242, 1);
UIImageView *header = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenWidth * image.size.height / image.size.width)];
[self.topView addSubview:header];
header.contentMode = UIViewContentModeBottomLeft|UIViewContentModeBottomRight;
header.clipsToBounds = YES;
// header.contentMode = UIViewContentModeBottomLeft|UIViewContentModeBottomRight;
// header.clipsToBounds = YES;
header.userInteractionEnabled = YES;
header.image = image;
// self.phone1 = [[UILabel alloc] init];
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/wisdomLattice(智慧格子)/Controller/ZXExceptionDealController.m
//
//
......@@ -113,8 +113,8 @@
UIImageView *line = [[UIImageView alloc] init];
line.image = [UIImage imageNamed:@"wisdomGezi-line"];
line.contentMode = UIViewContentModeScaleAspectFill;
line.clipsToBounds = YES;
// line.contentMode = UIViewContentModeScaleAspectFill;
// line.clipsToBounds = YES;
[contentImageView addSubview:line];
[line mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(contentImageView.mas_top).offset(84 * k6Scale);
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/wisdomLattice(智慧格子)/Controller/ZXWisdomLatticeViewController.m
//
//
......@@ -164,8 +164,8 @@
- (void) createTableHeader {
UIImageView *top = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 48 * k6Scale)];
top.contentMode = UIViewContentModeScaleAspectFill;
top.clipsToBounds = YES;
// top.contentMode = UIViewContentModeScaleAspectFill;
// top.clipsToBounds = YES;
top.userInteractionEnabled = YES;
enlargeClickRegionBtn *scan = [[enlargeClickRegionBtn alloc] init];
[top addSubview:scan];
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/wisdomLattice(智慧格子)/View/LatticeViolationOrderCell.m
//
//
......@@ -88,8 +88,8 @@
UIImageView *line = [[UIImageView alloc] init];
line.image = [UIImage imageNamed:@"wisdomGezi-line"];
line.contentMode = UIViewContentModeScaleAspectFill;
line.clipsToBounds = YES;
// line.contentMode = UIViewContentModeScaleAspectFill;
// line.clipsToBounds = YES;
[contentImageView addSubview:line];
[line mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(contentImageView.mas_top).offset(84 * k6Scale);
......
ColorfulSchool/ColorfulSchool/Classes/Vendor(三方)/SGQRCode/SGQRCodeObtain.h
//
//
......@@ -7,6 +7,7 @@
//
#import <UIKit/UIKit.h>
#import "EquipmentModel.h"
@class SGQRCodeObtainConfigure, SGQRCodeObtain;
typedef void(^SGQRCodeObtainScanResultBlock)(SGQRCodeObtain *obtain, NSString *result);
......@@ -15,6 +16,11 @@ typedef void(^SGQRCodeObtainAlbumDidCancelImagePickerControllerBlock)(SGQRCodeOb
typedef void(^SGQRCodeObtainAlbumResultBlock)(SGQRCodeObtain *obtain, NSString *result);
@interface SGQRCodeObtain : NSObject
/** 1.0的设备 */
@property (nonatomic, strong) equipmentItem *equipmentItem;
/** 类方法创建 */
+ (instancetype)QRCodeObtain;
......
ColorfulSchool/ColorfulSchool/Classes/Vendor(三方)/SGQRCode/SGQRCodeObtain.m
//
//
......@@ -10,7 +10,7 @@
#import "SGQRCodeObtainConfigure.h"
#import <Photos/Photos.h>
#import "JXLayoutButton.h"
#import "SearchEquipmenController.h"
@interface SGQRCodeObtain () <AVCaptureMetadataOutputObjectsDelegate, AVCaptureVideoDataOutputSampleBufferDelegate, UINavigationControllerDelegate, UIImagePickerControllerDelegate>
@property (nonatomic, weak) UIViewController *controller;
@property (nonatomic, strong) SGQRCodeObtainConfigure *configure;
......@@ -182,6 +182,30 @@
make.centerX.equalTo(controller.view);
}];
if (self.equipmentItem) {
/*
搜索按钮
*/
UIButton * searchBtn = [[UIButton alloc]init];
[searchBtn setImage:[UIImage imageNamed:@"扫描选择.png"] forState:UIControlStateNormal];
@weakify(self);
[[searchBtn rac_signalForControlEvents:UIControlEventTouchDown] subscribeNext:^(id x) {
@strongify(self);
SearchEquipmenController * view = [[SearchEquipmenController alloc]init];
view.equipmentItem=self.equipmentItem;
[controller.navigationController pushViewController:view animated:YES];
}];
[controller.view addSubview:searchBtn];
[searchBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(label2.mas_bottom).offset(15 * k6Scale);
make.width.mas_equalTo(150 * k6Scale);
make.height.mas_equalTo(25 * k6Scale);
make.centerX.equalTo(controller.view.mas_centerX);
}];
}
UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(10, kTopHeight + 100 * k6Scale + kScreenWidth * 0.7, [UIScreen mainScreen].bounds.size.width - 20, 80)];
[controller.view addSubview:label];
......@@ -575,6 +599,7 @@ void soundCompleteCallback(SystemSoundID soundID, void *clientData){
}
}
- (void)closeFlashlight {
self.lightBtn.selected = NO;
AVCaptureDevice *captureDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
if ([captureDevice hasTorch]) {
[captureDevice lockForConfiguration:nil];
......
ColorfulSchool/ColorfulSchool/Classes/Vendor(三方)/SGQRCode/ZXScannerViewController.h
//
//
......@@ -7,10 +7,12 @@
//
#import <UIKit/UIKit.h>
#import "EquipmentModel.h"
typedef void(^ScanResultBlock)(NSString *result);
@interface ZXScannerViewController : UIViewController
/** 1.0的设备 */
@property (nonatomic, strong) equipmentItem *equipmentItem;
@property (copy, nonatomic) ScanResultBlock scanResult;
@end
ColorfulSchool/ColorfulSchool/Classes/Vendor(三方)/SGQRCode/ZXScannerViewController.m
//
//
......@@ -38,6 +38,7 @@
- (void)viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
[obtain closeFlashlight];
[self.scanView removeTimer];
}
......@@ -54,7 +55,7 @@
obtain = [SGQRCodeObtain QRCodeObtain];
obtain.equipmentItem = self.equipmentItem;
[self setupQRCodeScan];
[self.view addSubview:self.scanView];
// [self.view addSubview:self.promptLabel];
......
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