Commit ca3c6021 authored by zhangshuai's avatar zhangshuai

修改配置

parent 01f32ebc
...@@ -358,6 +358,7 @@ ...@@ -358,6 +358,7 @@
6882ACFC2566A63D008CF1F3 /* ClockIn */ = { 6882ACFC2566A63D008CF1F3 /* ClockIn */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
6882AD072566A73C008CF1F3 /* clmodel */,
6882ACFD2566A68A008CF1F3 /* ClockInVC.h */, 6882ACFD2566A68A008CF1F3 /* ClockInVC.h */,
6882ACFE2566A68A008CF1F3 /* ClockInVC.m */, 6882ACFE2566A68A008CF1F3 /* ClockInVC.m */,
6882ACFF2566A68A008CF1F3 /* ClockInVC.xib */, 6882ACFF2566A68A008CF1F3 /* ClockInVC.xib */,
...@@ -374,6 +375,13 @@ ...@@ -374,6 +375,13 @@
path = model; path = model;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
6882AD072566A73C008CF1F3 /* clmodel */ = {
isa = PBXGroup;
children = (
);
path = clmodel;
sourceTree = "<group>";
};
68A81D0B2566461A003C1BF1 /* category */ = { 68A81D0B2566461A003C1BF1 /* category */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
//测试 //测试
#define ServerReport @"http://reporttest.zhangxinhulian.com" #define ServerReport @"http://reporttest.zhangxinhulian.com"
#define ServerHost @"https://feedapitest.zhangxinhulian.com" // 服务端接口地址 #define ServerHost @"http://feedapitest2.zhangxinhulian.com" // 服务端接口地址
#define ServerAds @"http://bstest.zhangxinhulian.com/v4/ads" #define ServerAds @"http://bstest.zhangxinhulian.com/v4/ads"
////正式 ////正式
//#define ServerReport @"http://report.clouddistribute.net" //#define ServerReport @"http://report.clouddistribute.net"
......
...@@ -44,7 +44,6 @@ typedef enum : NSUInteger { ...@@ -44,7 +44,6 @@ typedef enum : NSUInteger {
cloudCheck, //云朵加速校验 cloudCheck, //云朵加速校验
task_process,// 获取福利中心进度 task_process,// 获取福利中心进度
taskListWithStat,//获取福利中心列表和状态 taskListWithStat,//获取福利中心列表和状态
welfare_task_box,//打开宝箱 福利中心
ddcy_clock_list, //打卡提现-列表 ddcy_clock_list, //打卡提现-列表
...@@ -84,6 +83,7 @@ typedef enum : NSUInteger { ...@@ -84,6 +83,7 @@ typedef enum : NSUInteger {
cash2Coin, // cash2Coin, //
complete_task, // 领取任务奖励 福利中心 complete_task, // 领取任务奖励 福利中心
clock_wd, //打卡提xian - tixian clock_wd, //打卡提xian - tixian
welfare_task_box,//打开宝箱 福利中心
......
...@@ -92,8 +92,7 @@ static CGNetworkTools* _tools = nil; ...@@ -92,8 +92,7 @@ static CGNetworkTools* _tools = nil;
return @"/app/v2/novel/taskListWithStat"; return @"/app/v2/novel/taskListWithStat";
case task_process: case task_process:
return @"/app/v1/game/task_process"; return @"/app/v1/game/task_process";
case welfare_task_box:
return @"/app/v1/game/farm/welfare_task_box";
case ddcy_clock_list: case ddcy_clock_list:
return @"/app/v1/game/ddcy/clock_list"; return @"/app/v1/game/ddcy/clock_list";
...@@ -159,6 +158,8 @@ static CGNetworkTools* _tools = nil; ...@@ -159,6 +158,8 @@ static CGNetworkTools* _tools = nil;
return @"/app/v1/game/complete-task"; return @"/app/v1/game/complete-task";
case clock_wd: case clock_wd:
return @"/app/v1/game/ddcy/clock_wd"; return @"/app/v1/game/ddcy/clock_wd";
case welfare_task_box:
return @"/app/v1/game/farm/welfare_task_box";
default: default:
return @""; return @"";
} }
......
...@@ -90,7 +90,6 @@ ...@@ -90,7 +90,6 @@
- (void)addLeftItme:(UIImage * __nullable)image selecedImage:(UIImage * __nullable)sImage orText:(NSString * __nullable)text selectedText:(NSString * __nullable)sText{ - (void)addLeftItme:(UIImage * __nullable)image selecedImage:(UIImage * __nullable)sImage orText:(NSString * __nullable)text selectedText:(NSString * __nullable)sText{
self.leftButton = [[UIButton alloc] init]; self.leftButton = [[UIButton alloc] init];
if (image == nil) { if (image == nil) {
if (text == nil) { if (text == nil) {
text = @"传入文本"; text = @"传入文本";
...@@ -110,7 +109,9 @@ ...@@ -110,7 +109,9 @@
[self.leftButton setImage:image forState:UIControlStateNormal]; [self.leftButton setImage:image forState:UIControlStateNormal];
[self.leftButton setImage: sImage forState:UIControlStateSelected]; [self.leftButton setImage: sImage forState:UIControlStateSelected];
if (text != nil) {
[self.leftButton setTitle: text forState:UIControlStateNormal];
}
} }
[self.leftButton addTarget:self action: @selector(leftBarButtonItemAction:) forControlEvents:UIControlEventTouchUpInside]; [self.leftButton addTarget:self action: @selector(leftBarButtonItemAction:) forControlEvents:UIControlEventTouchUpInside];
[self.leftButton sizeToFit]; [self.leftButton sizeToFit];
......
...@@ -172,12 +172,12 @@ ...@@ -172,12 +172,12 @@
- (void)loadData{ - (void)loadData{
WEAKSELF; WEAKSELF;
[MBProgressHUD showLoading:@"loading"]; // [MBProgressHUD showLoading:@"loading"];
NSMutableDictionary * dic = [[NSMutableDictionary alloc]init]; NSMutableDictionary * dic = [[NSMutableDictionary alloc]init];
[dic setObject:@"1" forKey:@"type"]; [dic setObject:@"1" forKey:@"type"];
//请求进度 //请求进度
[[CGNetworkTools shared] getWithAction:task_process parameters:dic success:^(id _Nonnull response) { [[CGNetworkTools shared] getWithAction:task_process parameters:dic success:^(id _Nonnull response) {
[MBProgressHUD hideHUD]; // [MBProgressHUD hideHUD];
NSDictionary * dic = response[@"result"][@"data"]; NSDictionary * dic = response[@"result"][@"data"];
if (dic.count) { if (dic.count) {
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
} }
} failure:^(NSError * _Nonnull error) { } failure:^(NSError * _Nonnull error) {
[MBProgressHUD hideHUD]; // [MBProgressHUD hideHUD];
}]; }];
...@@ -197,7 +197,7 @@ ...@@ -197,7 +197,7 @@
// 请求列表 // 请求列表
[[CGNetworkTools shared] getWithAction:taskListWithStat parameters:dicStat success:^(id _Nonnull response) { [[CGNetworkTools shared] getWithAction:taskListWithStat parameters:dicStat success:^(id _Nonnull response) {
[MBProgressHUD hideHUD]; // [MBProgressHUD hideHUD];
if (response) { if (response) {
NSArray * array = response[@"result"][@"data"][@"userTask"]; NSArray * array = response[@"result"][@"data"][@"userTask"];
...@@ -209,7 +209,8 @@ ...@@ -209,7 +209,8 @@
} }
} failure:^(NSError * _Nonnull error) { } failure:^(NSError * _Nonnull error) {
[MBProgressHUD hideHUD]; // [MBProgressHUD hideHUD];
}]; }];
} }
...@@ -294,16 +295,10 @@ ...@@ -294,16 +295,10 @@
- (IBAction)treasureBoxClick:(UIButton *)sender { - (IBAction)treasureBoxClick:(UIButton *)sender {
if (self.coinsProcess >= 6) { [[CGNetworkTools shared] postWithAction:welfare_task_box parameters:@{} success:^(id _Nonnull response) {
if (response) {
[[CGNetworkTools shared] getWithAction:welfare_task_box parameters:@{} success:^(id _Nonnull response) {
} failure:^(NSError * _Nonnull error) {
}];
} }
[[CGNetworkTools shared] getWithAction:welfare_task_box parameters:@{} success:^(id _Nonnull response) {
} failure:^(NSError * _Nonnull error) { } failure:^(NSError * _Nonnull error) {
......
...@@ -41,7 +41,7 @@ target 'GYDemo' do ...@@ -41,7 +41,7 @@ target 'GYDemo' do
# 3. 腾讯广告|优量汇(广点通) #"guangdiantong" //广点通 -- # 3. 腾讯广告|优量汇(广点通) #"guangdiantong" //广点通 --
pod 'GDTMobSDK' pod 'GDTMobSDK'
# 4.AD SDK - chuanshanjia" //穿山甲 -- # 4.AD SDK - chuanshanjia" //穿山甲 --头条
pod 'Bytedance-UnionAD' pod 'Bytedance-UnionAD'
end end
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