Skip to content

C
colorfulSchoolReconsitution
Commit ec5d5649 by 刘卓鑫
Options

提交3.9.2代码

parent 096f59fc
Showing with 378 additions and 77 deletions
ColorfulSchool/ColorfulSchool.xcodeproj/project.pbxproj
......@@ -131,7 +131,7 @@
1CB9AF72237102B500ED0434 /* DC_ZXWashOrderListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CB9AF50237102B400ED0434 /* DC_ZXWashOrderListModel.m */; };
1CB9AF73237102B500ED0434 /* DC_ZXWashMerthinModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CB9AF51237102B400ED0434 /* DC_ZXWashMerthinModel.m */; };
1CB9AF74237102B500ED0434 /* DC_ZXWashLocationModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CB9AF56237102B400ED0434 /* DC_ZXWashLocationModel.m */; };
1CBB66172390C11D00351692 /* ad_close.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CBB66162390C11D00351692 /* ad_close.png */; };
1CBB66172390C11D00351692 /* xxxxad_close.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CBB66162390C11D00351692 /* xxxxad_close.png */; };
1CBDE2C6238D0436006DA46E /* ZXTaskManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CBDE2C5238D0435006DA46E /* ZXTaskManager.m */; };
1CC15429230D5B7400582EC1 /* ZXAimiWalletAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CC15428230D5B7400582EC1 /* ZXAimiWalletAlertView.m */; };
1CC1542D230D6E3600582EC1 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1CC1542C230D6E3600582EC1 /* LaunchScreen.storyboard */; };
......@@ -974,7 +974,7 @@
1CB9AF55237102B400ED0434 /* DC_ZXWashOrderListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DC_ZXWashOrderListModel.h; sourceTree = "<group>"; };
1CB9AF56237102B400ED0434 /* DC_ZXWashLocationModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DC_ZXWashLocationModel.m; sourceTree = "<group>"; };
1CB9AF57237102B400ED0434 /* DC_ZXWashMerthinModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DC_ZXWashMerthinModel.h; sourceTree = "<group>"; };
1CBB66162390C11D00351692 /* ad_close.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ad_close.png; sourceTree = "<group>"; };
1CBB66162390C11D00351692 /* xxxxad_close.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = xxxxad_close.png; sourceTree = "<group>"; };
1CBDE2C4238D0435006DA46E /* ZXTaskManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXTaskManager.h; sourceTree = "<group>"; };
1CBDE2C5238D0435006DA46E /* ZXTaskManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXTaskManager.m; sourceTree = "<group>"; };
1CC15427230D5B7400582EC1 /* ZXAimiWalletAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXAimiWalletAlertView.h; sourceTree = "<group>"; };
......@@ -3631,7 +3631,7 @@
A7200868210EF6A600BE2DC6 /* ssssaaaaff.png */,
A7DECC652079F0E20039EC22 /* ss.gif */,
A7BFF1D620D115A300CE350A /* 查看全部@2x.png */,
1CBB66162390C11D00351692 /* ad_close.png */,
1CBB66162390C11D00351692 /* xxxxad_close.png */,
A7265BEC20CA3FAE0084B814 /* close-operation.png */,
A7265BE720CA3AEE0084B814 /* menu-holder@2x.png */,
);
......@@ -5168,7 +5168,7 @@
A72BE4B821D5CD030069C0E1 /* AlertStyleSimple.xib in Resources */,
A705C00221D4B067004F1628 /* ImageSelectedOn.png in Resources */,
A7B058A5211AD1AF00304B38 /* README.txt in Resources */,
1CBB66172390C11D00351692 /* ad_close.png in Resources */,
1CBB66172390C11D00351692 /* xxxxad_close.png in Resources */,
A705C01421D4B067004F1628 /* UIBarButtonItemGrid@2x.png in Resources */,
A78A3F4021952EE7001558A5 /* orderSound.wav in Resources */,
);
......
ColorfulSchool/ColorfulSchool/AppDelegate.m
......@@ -562,6 +562,7 @@
if ([userInfo[@"CODE"] integerValue] == 996){
ZXHomePageFeedBackViewController *feedVc = [[ZXHomePageFeedBackViewController alloc] init];
feedVc.hidesBottomBarWhenPushed = YES;
[[ZXTool getCurrentVC].navigationController pushViewController:feedVc animated:YES];
} else if ([userInfo[@"CODE"] integerValue] == 997) {
......@@ -581,10 +582,12 @@
NSInteger orderId = [responseObject[@"orderId"] integerValue];
jumpPay.orderId = orderId;
[ZXPayManager sharedZXPayManager].orderId = orderId;
jumpPay.hidesBottomBarWhenPushed = YES;
[[ZXTool getCurrentVC].navigationController pushViewController:jumpPay animated:YES];
} else {
ZXNewOrderDetailViewController *orderDetail = [[ZXNewOrderDetailViewController alloc] init];
orderDetail.orderId = [userInfo[@"orderInfo"] integerValue];
orderDetail.hidesBottomBarWhenPushed = YES;
[[ZXTool getCurrentVC].navigationController pushViewController:orderDetail animated:YES];
}
});
......
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/BUAD/BUADTool.h
//
//
......@@ -17,13 +17,18 @@ NS_ASSUME_NONNULL_BEGIN
- (void) loadLauchAdByDelegate:(id) delagte;
- (void) loadBannerAdWithController:(UIViewController *) viewController superView:(UIView *) superView isFirstPage:(BOOL) isFirst;
- (void) loadBannerAdWithController:(UIViewController *) viewController
superView:(UIView *) superView
bottomMargin:(CGFloat) bottomMargin;
- (void) loadBannerAdWithController:(UIViewController *) viewController superView:(UIView *) superView ;
//创建激励视频
- (void) createRewardedVideoAdWithController:(UIViewController *) viewController;
////展示激励视频广告
//- (void) showRewardedVideoAd;
@end
NS_ASSUME_NONNULL_END
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/BUAD/BUADTool.m
//
//
......@@ -75,6 +75,26 @@
}
[self.bannerView loadAdData];
}
//自定义
- (void) loadBannerAdWithController:(UIViewController *) viewController
superView:(UIView *) superView
bottomMargin:(CGFloat) bottomMargin {
// splash AD demo
BUSize *imgSize = [BUSize sizeBy:BUProposalSize_Banner600_90];
CGFloat bannerHeigh = kScreenWidth/600*90;
if (self.bannerView == nil) {
self.bannerView = [[BUNativeExpressBannerView alloc] initWithSlotID:@"933112579" rootViewController:viewController imgSize:imgSize adSize:CGSizeMake(kScreenWidth, bannerHeigh) IsSupportDeepLink:YES];
self.bannerView.delegate = self;
[superView insertSubview:self.bannerView atIndex:0];
[self.bannerView mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.equalTo(superView.mas_bottom).offset(-bottomMargin);
make.left.right.equalTo(superView);
make.height.mas_equalTo(bannerHeigh);
}];
}
[self.bannerView loadAdData];
}
- (void) loadBannerAdWithController:(UIViewController *) viewController superView:(UIView *) superView {
// splash AD demo
BUSize *imgSize = [BUSize sizeBy:BUProposalSize_Banner600_90];
......
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/TXAD/TXADHeader.h
//
//
......@@ -10,7 +10,7 @@
#define TXADHeader_h
#define kTXAdAPPID @"1108089964"
#define kTXAdNativePLACEMENTID @"8030751158735005" //原生广告id
#define kTXAdNativePLACEMENTID @"3080199247582715" //原生广告id
#define kTXAdLauchPLACEMENTID @"9090758636743260" //开屏广告id
......
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/TXAD/ZXTXAdTool.h
//
//
......@@ -29,9 +29,13 @@ kSINGLETON_FOR_HEADER(ZXTXAdTool)
viewController:(UIViewController *) viewController
isFirstPage:(BOOL) isFirstPage
isHasBottomMargin:(BOOL) isHasBottomMargin;
- (void) createMessageFlowAdWithSuperView:(UIView *) superView fromViewController:(UIViewController *) fromViewController bottomMargin:(CGFloat) bottomMargin;
/**banner广告*/
-(void) createBannerAdByPlacmentId:(NSString *) placenmentId currentViewController:(UIViewController *) viewController
superView:(UIView *) superView;
- (void) loadBannerAdWithController:(UIViewController *) viewController
superView:(UIView *) superView
bottomMargin:(CGFloat) bottomMargin;
@property (nonatomic, copy) dispatch_block_t closeAction;
@end
......
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/TXAD/ZXTXAdTool.m
//
//
......@@ -19,6 +19,8 @@
@property (nonatomic, strong) GDTNativeAdData *currentAdData;
//banner广告
@property (nonatomic, strong) GDTMobBannerView *bannerView;
@property (nonatomic, assign) CGFloat bottomMargin;
@property (nonatomic, weak) UIView *adView;
@property (nonatomic, weak) UIView *topView;
......@@ -141,7 +143,15 @@ kSINGLETON_FOR_CLASS(ZXTXAdTool)
{
NSLog(@"%s",__FUNCTION__);
}
- (void) createMessageFlowAdWithSuperView:(UIView *) superView fromViewController:(UIViewController *) fromViewController bottomMargin:(CGFloat) bottomMargin {
self.nativeAd = [[GDTNativeExpressAd alloc] initWithAppId:kTXAdAPPID placementId:kTXAdNativePLACEMENTID adSize:CGSizeMake(kScreenWidth, kScreenWidth * 0.56)];
self.nativeAd.delegate = self;
self.adView = superView;
self.bottomMargin = bottomMargin;
self.fromVc = fromViewController;
[self.nativeAd loadAd:1];
}
#pragma mark - ========== 原生广告 ==========
- (void) createNativieAdByView:(UIView *) view
topView:(UIView *) topView
......@@ -179,48 +189,11 @@ kSINGLETON_FOR_CLASS(ZXTXAdTool)
expressView.controller = self.fromVc;
[expressView render];
[self.adView addSubview:expressView];
if (self.isFristPage) {
[expressView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.adView.mas_left).offset(5 * k6Scale);
make.right.equalTo(self.adView.mas_right).offset(-5 * k6Scale);
make.height.mas_equalTo(kScreenWidth * 0.56);
make.bottom.equalTo([ZXPayManager sharedZXPayManager].notPayOrderView.mas_top);
}];
} else {
if (self.isHasBottomMargin) {
CGFloat margin = 49;
if (iPhoneX) {
margin = 83;
}
[expressView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.adView.mas_left).offset(5 * k6Scale);
make.right.equalTo(self.adView.mas_right).offset(-5 * k6Scale);
make.height.mas_equalTo(kScreenWidth * 0.56);
make.bottom.equalTo(self.adView.mas_bottom).offset(-margin);
}];
} else {
if (self.topView) {
[expressView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.adView.mas_left).offset(5 * k6Scale);
make.right.equalTo(self.adView.mas_right).offset(-5 * k6Scale);
make.height.mas_equalTo(kScreenWidth * 0.56);
make.top.equalTo(self.topView.mas_bottom).offset(5 * k6Scale);
}];
} else {
[expressView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.adView).offset(15 * k6Scale);
make.right.equalTo(self.adView).offset(-15 * k6Scale);
make.height.mas_equalTo((kScreenWidth - 20) * 0.56);
make.bottom.equalTo(self.adView);
}];
}
}
}
if (self.isFristPage == NO && self.isHasBottomMargin == NO && self.topView == nil) {
[self createRemoveAdView:expressView];
} else {
[self createCountingDowViewByAdView:expressView];
}
[expressView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.equalTo(self.adView);
make.bottom.equalTo(self.adView.mas_bottom).offset(-self.bottomMargin);
make.height.mas_equalTo(kScreenWidth * 0.56);
}];
} @catch (NSException *exception) {
} @finally {
......@@ -399,6 +372,23 @@ kSINGLETON_FOR_CLASS(ZXTXAdTool)
[self loadBannerView];
}
- (void)loadBannerAdWithController:(UIViewController *)viewController superView:(UIView *)superView bottomMargin:(CGFloat)bottomMargin {
CGRect rect = {CGPointZero, GDTMOB_AD_SUGGEST_SIZE_320x50};
self.bannerView = [[GDTMobBannerView alloc] initWithFrame:rect appId:kTXAdAPPID placementId:@"1010494297797517"];
self.bannerView.currentViewController = viewController;
self.bannerView.interval = 40;
self.bannerView.delegate = self;
self.bannerView.showCloseBtn = YES;
[superView addSubview:self.bannerView];
[self.bannerView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.right.equalTo(superView);
make.height.mas_equalTo(kScreenWidth * 0.15);
make.bottom.equalTo(superView.mas_bottom).offset(-bottomMargin);
}];
[self loadBannerView];
}
- (void)removeBannerAd {
[self.bannerView removeFromSuperview];
self.bannerView = nil;
......
ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXAdTool.m
//
//
......@@ -60,14 +60,14 @@
//开屏广告 1次展示
[ZXTool requestDataHideLoadingToastWithType:kXMHTTPMethodGET url:[NSString stringWithFormat:@"%@/app/open/advert/round/info?id=%@&sourceType=0", [kUserDefaults valueForKey:@"SX_MONEY"], CacheUserId] para:nil completed:^(CommonModel *common, NSString *error) {
[ZXTool requestDataHideLoadingToastWithType:kXMHTTPMethodGET url:[NSString stringWithFormat:@"%@/app/open/advert/round/info?id=%@&sourceType=2", [kUserDefaults valueForKey:@"SX_MONEY"], CacheUserId] para:nil completed:^(CommonModel *common, NSString *error) {
if (error == nil) {
ZXLauchModel *lauch = [ZXLauchModel mj_objectWithKeyValues:common.data];
[ZXLauchModel clearTable];
[lauch save];
if (lauch.whether == NO) {
return ;
}
// if (lauch.whether == NO) {
// return ;
// }
dispatch_async(dispatch_get_main_queue(), ^{
......@@ -106,7 +106,7 @@
[self jumpAction:lauch];
};
[adView reloadAdImageWithUrl:lauch.advertImg];
[adView reloadAdImageWithUrl:[lauch.advertImg componentsSeparatedByString:@","].firstObject];
[kAppWindow addSubview:adView];
//内部曝光
......
ColorfulSchool/ColorfulSchool/Classes/Config(配置)/Macros.h
//
//
......@@ -75,6 +75,8 @@ static NSString *kFailurMsg = @"数据加载失败,请检查一下当前网络
#define kAPP_ME_REFRESHAD @"kAPP_ME_REFRESHAD"
//app是否开启了任务
#define kAPP_IS_OPENB_TASK @"kAPP_IS_OPENB_TASK"
//app是否开启了退款
#define kAPP_IS_OPENB_TK @"kAPP_IS_OPENB_TK"
/*首页的key和value--对应rootUrl*/
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/2.0条码/ZXSelfHelpViewController.m
//
//
......@@ -14,8 +14,8 @@
#import "ZXAdViewAdTool.h"
#import "BUADTool.h"
#import "ZXBDTool.h"
@interface ZXSelfHelpViewController () {
#import <GDTMobSDK/GDTUnifiedBannerView.h>
@interface ZXSelfHelpViewController ()<GDTUnifiedBannerViewDelegate> {
enlargeClickRegionBtn *showCode;
......@@ -32,6 +32,12 @@
@property (nonatomic, strong) SDCycleScrollView *cycleScrollView;
@property (nonatomic, strong) UIView *fouvtionView;
@property (nonatomic, strong) UIImageView *barcodeView;
//腾讯banner广告
@property (nonatomic, strong) GDTUnifiedBannerView *tx_bannerAd;
//腾讯banner广告的底部间距
@property (nonatomic, assign) CGFloat tx_banner_bottomMargin;
@end
@implementation ZXSelfHelpViewController
......@@ -85,6 +91,7 @@
if ([[kUserDefaults objectForKey:kAPP_SELP_ADVIEW_SHOW] isEqualToString:@"yes"]) {
[[[BUADTool alloc] init] loadBannerAdWithController:self superView:self.view isFirstPage:NO];
[self createTxBannerAd];
// UIView *adSuperView = [[UIView alloc] init];
// [self.view addSubview:adSuperView];
// adSuperView.backgroundColor = UIColor.whiteColor;
......@@ -401,7 +408,112 @@
#pragma mark - ===================腾讯banner广告===========================
- (void) createTxBannerAd {
self.tx_bannerAd = [[GDTUnifiedBannerView alloc]
initWithFrame:CGRectZero appId:@"1108089964"
placementId:@"1010494297797517"
viewController:self];
self.tx_bannerAd.accessibilityIdentifier = @"banner_ad";
self.tx_bannerAd.animated = YES;
self.tx_bannerAd.autoSwitchInterval = 4;
self.tx_bannerAd.delegate = self;
[self.view insertSubview:self.tx_bannerAd atIndex:0];
[self.tx_bannerAd mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.right.equalTo(self.view);
make.height.mas_equalTo(kScreenWidth * 0.15);
make.bottom.equalTo(self.view.mas_bottom).offset(-kScreenWidth * 0.15);
}];
[self.tx_bannerAd loadAdAndShow];
}
#pragma mark - GDTUnifiedBannerViewDelegate
/**
* 请求广告条数据成功后调用
* 当接收服务器返回的广告数据成功后调用该函数
*/
- (void)unifiedBannerViewDidLoad:(GDTUnifiedBannerView *)unifiedBannerView
{
NSLog(@"%s",__FUNCTION__);
NSLog(@"unified banner did load");
}
/**
* 请求广告条数据失败后调用
* 当接收服务器返回的广告数据失败后调用该函数
*/
- (void)unifiedBannerViewFailedToLoad:(GDTUnifiedBannerView *)unifiedBannerView error:(NSError *)error
{
NSLog(@"%s",__FUNCTION__);
}
/**
* banner2.0曝光回调
*/
- (void)unifiedBannerViewWillExpose:(nonnull GDTUnifiedBannerView *)unifiedBannerView {
NSLog(@"%s",__FUNCTION__);
}
/**
* banner2.0点击回调
*/
- (void)unifiedBannerViewClicked:(GDTUnifiedBannerView *)unifiedBannerView
{
NSLog(@"%s",__FUNCTION__);
}
/**
* 应用进入后台时调用
* 当点击应用下载或者广告调用系统程序打开，应用将被自动切换到后台
*/
- (void)unifiedBannerViewWillLeaveApplication:(GDTUnifiedBannerView *)unifiedBannerView
{
NSLog(@"%s",__FUNCTION__);
}
/**
* 全屏广告页已经被关闭
*/
- (void)unifiedBannerViewDidDismissFullScreenModal:(GDTUnifiedBannerView *)unifiedBannerView
{
NSLog(@"%s",__FUNCTION__);
}
/**
* 全屏广告页即将被关闭
*/
- (void)unifiedBannerViewWillDismissFullScreenModal:(GDTUnifiedBannerView *)unifiedBannerView
{
NSLog(@"%s",__FUNCTION__);
}
/**
* banner2.0广告点击以后即将弹出全屏广告页
*/
- (void)unifiedBannerViewWillPresentFullScreenModal:(GDTUnifiedBannerView *)unifiedBannerView
{
NSLog(@"%s",__FUNCTION__);
}
/**
* banner2.0广告点击以后弹出全屏广告页完毕
*/
- (void)unifiedBannerViewDidPresentFullScreenModal:(GDTUnifiedBannerView *)unifiedBannerView
{
NSLog(@"%s",__FUNCTION__);
}
/**
* banner2.0被用户关闭时调用
*/
- (void)unifiedBannerViewWillClose:(nonnull GDTUnifiedBannerView *)unifiedBannerView {
self.tx_bannerAd = nil;
NSLog(@"%s",__FUNCTION__);
}
@end
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/AimiWallet/Controller/AimiWalletViewController.m
//
//
......@@ -283,6 +283,168 @@ static NSString * const ID = @"CollectionCell";
[self creatBeanCollectionView];
//MARK:退款开关
if ([[kUserDefaults objectForKey:kAPP_IS_OPENB_TK] isEqualToString:@"yes"]) {
UIButton *button = [[UIButton alloc] init];
[self.view addSubview:button];
[button setTitle:@"退款" forState:UIControlStateNormal];
button.backgroundColor = [UIColor whiteColor];
button.titleLabel.font = kFontSize(12);
[button setTitleColor:[UIColor colorWithHexString:@"#333333"] forState:UIControlStateNormal];
[button mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(45 * k6Scale);
make.height.mas_equalTo(20 * k6Scale);
make.left.equalTo(self.aimiLabel.mas_right).offset(10 * k6Scale);
make.centerY.equalTo(self.aimiLabel);
}];
button.layer.cornerRadius = 6 * k6Scale;
button.layer.masksToBounds = YES;
[button addTarget:self action:@selector(showTKDesc) forControlEvents:UIControlEventTouchUpInside];
}
}
#pragma mark - 显示退款说明
- (void) showTKDesc {
[ZXTool requestDataWithType:kXMHTTPMethodGET url:[NSString stringWithFormat:@"%@/app/explain/recharge/refund", [kUserDefaults objectForKey:@"NEW_PAY"]] para:nil completed:^(CommonModel *common, NSString *error) {
dispatch_async(dispatch_get_main_queue(), ^{
[ZXTool hideLoadingAnimation];
if (error) {
[ZXTool showText:error];
} else {
[self showCustomWithData:common.data];
}
});
}];
}
-(void) showCustomWithData:(NSDictionary *) data {
NSString *title = data[@"title"];
NSString *contet = data[@"content"];
NSString *contactPerson = data[@"contactPerson"];
NSString *contactNumber = data[@"contactNumber"];
UIView *holder = [[UIView alloc] initWithFrame:[UIScreen mainScreen].bounds];
holder.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:.2];
CGFloat bgW = kScreenWidth * 0.75;
UIView *bgView = [[UIView alloc] init];
[holder addSubview:bgView];
[bgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(bgW);
make.center.equalTo(holder);
}];
bgView.backgroundColor = [UIColor whiteColor];
bgView.layer.cornerRadius = 15 * k6Scale;
bgView.layer.masksToBounds = YES;
UIView *line = [[UIView alloc] init];
line.backgroundColor = RGB(242, 242, 242);
[bgView addSubview:line];
[line mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.equalTo(bgView);
make.height.mas_equalTo(1);
make.bottom.mas_equalTo(bgView.mas_bottom).offset(-44 * k6Scale);
}];
UILabel *bottomLabel = [[UILabel alloc] init];
[bgView addSubview:bottomLabel];
bottomLabel.backgroundColor = [UIColor clearColor];
bottomLabel.textAlignment = NSTextAlignmentCenter;
bottomLabel.textColor = RGB(248, 149, 83);
bottomLabel.font = kFontSize(16 * k6Scale);
bottomLabel.text = @"确定";
bottomLabel.userInteractionEnabled = YES;
[bottomLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.equalTo(bgView);
make.height.mas_equalTo(44 * k6Scale);
}];
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] init];
[bottomLabel addGestureRecognizer:tap];
__weak typeof(holder) weakholder = holder;
[[tap rac_gestureSignal] subscribeNext:^(id x) {
[weakholder removeFromSuperview];
weakholder.hidden = YES;
}];
UILabel *titleLbel = [[UILabel alloc] init];
[bgView addSubview:titleLbel];
titleLbel.textColor = [UIColor colorWithHexString:@"#333333"];
titleLbel.font = kFontSize(18 * k6Scale);
titleLbel.text = title;
titleLbel.textAlignment = NSTextAlignmentCenter;
[titleLbel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.equalTo(bgView);
make.height.mas_equalTo(55 * k6Scale);
}];
UILabel *msgLbel = [[UILabel alloc] init];
[bgView addSubview:msgLbel];
msgLbel.textColor = [UIColor colorWithHexString:@"#333333"];
msgLbel.font = kFontSize(15 * k6Scale);
msgLbel.numberOfLines = 0;
msgLbel.textAlignment = NSTextAlignmentLeft;
[msgLbel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(bgView.mas_left).offset(10 * k6Scale);
make.right.equalTo(bgView.mas_right).offset(-10 * k6Scale);
make.top.mas_equalTo(titleLbel.mas_bottom);
}];
msgLbel.text = [NSString stringWithFormat:@" %@", contet];;
UILabel *msgLbel1 = [[UILabel alloc] init];
[bgView addSubview:msgLbel1];
msgLbel1.textColor = [UIColor colorWithHexString:@"#333333"];
msgLbel1.font = kFontSize(15 * k6Scale);
msgLbel1.textAlignment = NSTextAlignmentLeft;
[msgLbel1 mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(bgView.mas_left).offset(10 * k6Scale);
make.right.equalTo(bgView.mas_right).offset(-10 * k6Scale);
make.top.mas_equalTo(msgLbel.mas_bottom).offset(5 * k6Scale);
}];
if (contactPerson && ![contactPerson isEqualToString:@""]) {
msgLbel1.text = [NSString stringWithFormat:@"联系人: %@", contactPerson];;
}
UILabel *msgLbel2 = [[UILabel alloc] init];
[bgView addSubview:msgLbel2];
msgLbel2.textColor = [UIColor colorWithHexString:@"#333333"];
msgLbel2.font = kFontSize(15 * k6Scale);
msgLbel2.textAlignment = NSTextAlignmentLeft;
[msgLbel2 mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(bgView.mas_left).offset(10 * k6Scale);
make.top.mas_equalTo(msgLbel1.mas_bottom).offset(5 * k6Scale);
make.bottom.equalTo(line.mas_top).offset(-15 * k6Scale);
}];
if (contactNumber && ![contactNumber isEqualToString:@""]) {
msgLbel2.text = [NSString stringWithFormat:@"联系电话: %@", contactNumber];
enlargeClickRegionBtn *button = [[enlargeClickRegionBtn alloc] init];
[bgView addSubview:button];
[button setTitle:@"复制" forState:UIControlStateNormal];
button.backgroundColor = [UIColor colorWithHexString:@"#57bdee"];
button.titleLabel.font = kFontSize(10);
[button setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[button mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(30 * k6Scale);
make.height.mas_equalTo(15 * k6Scale);
make.left.equalTo(msgLbel2.mas_right).offset(5 * k6Scale);
make.centerY.equalTo(msgLbel2);
}];
button.layer.cornerRadius = 3 * k6Scale;
button.layer.masksToBounds = YES;
[[button rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(id x) {
UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
pasteboard.string = contactNumber;
[ZXTool showText:@"复制成功，请在拨打电话处粘贴"];
}];
}
[[UIApplication sharedApplication].keyWindow addSubview:holder];
}
#pragma mark - ==========查询钱包页面数据==========
- (void) checkWalletData {
......
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/AimiWallet/Controller/AimiWalletViewController.xib
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
......@@ -156,7 +154,7 @@
<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"/>
</constraints>
<point key="canvasLocation" x="-5562" y="-609"/>
<point key="canvasLocation" x="-6001" y="-609"/>
</view>
</objects>
<resources>
......
ColorfulSchool/ColorfulSchool/Classes/Task(任务)/ZXTaskViewController.h
//
//
......@@ -14,7 +14,8 @@ NS_ASSUME_NONNULL_BEGIN
/** jumpUrl */
@property (nonatomic, copy) NSString *jumpUrl;
/** 页面index */
@property (nonatomic, copy) NSString *pageIndex;
/** 是否是任务首页 */
@property (nonatomic, assign) NSInteger isTaskHomePage;
/** 状态栏颜色 */
......
ColorfulSchool/ColorfulSchool/Main(入口)/Controller/MyTabViewController.m
//
//
......@@ -76,6 +76,8 @@
[kUserDefaults setValue:@"no" forKey:kAPP_QB_SHOW];//默认是no
[kUserDefaults setValue:@"no" forKey:kAPP_SELP_ADVIEW_SHOW];//默认是no
[kUserDefaults setValue:@"no" forKey:kAPP_IS_OPENB_TASK];//默认是no
[kUserDefaults setValue:@"no" forKey:kAPP_IS_OPENB_TK];//默认是no
if (CacheToken==nil || ![CacheToken isKindOfClass:[NSString class]]) {
return;
}
......@@ -91,7 +93,7 @@
if ([responseObject[@"code"] integerValue] == 1000) {
NSArray *arr = responseObject[@"areaSwitchs"];
//type 1资讯 2商城 3支付配置 4免密开关 5小程序(app不需要) 10阿里妈妈 11百青藤 14任务
//type 1资讯 2商城 3支付配置 4免密开关 5小程序(app不需要) 10阿里妈妈 11百青藤 14任务 15退款开关
[self.switchs removeAllObjects];
for (NSDictionary *dic in arr) {
if ([dic[@"type"] isEqualToString:@"1"] || [dic[@"type"] isEqualToString:@"2"] || [dic[@"type"] isEqualToString:@"10"] || [dic[@"type"] isEqualToString:@"11"] || [dic[@"type"] isEqualToString:@"14"]) {
......@@ -111,7 +113,9 @@
if ([dic[@"type"] isEqualToString:@"12"] && [dic[@"isEnabled"] integerValue] == 1) {
[kUserDefaults setValue:@"yes" forKey:kAPP_SELP_ADVIEW_SHOW];//默认是no
}
if ([dic[@"type"] isEqualToString:@"15"] && [dic[@"isEnabled"] integerValue] == 1) {
[kUserDefaults setValue:@"yes" forKey:kAPP_IS_OPENB_TK];//默认是no
}
}
dispatch_async(dispatch_get_main_queue(), ^{
......
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