Commit ca3c6021 authored by zhangshuai's avatar zhangshuai

修改配置

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