ios / YH_LivePush · Commits

Go to a project

Authored by 盖剑秋
Commit de0e36aafd31505606b76e9d64b97931b169690b 1 parent df7ef011

Release.

Inline Side-by-side
Showing 5 changed files with 16 additions and 13 deletions
@@ -767,7 +767,7 @@ @@ -767,7 +767,7 @@
767 TargetAttributes = { 767 TargetAttributes = {
768 EF14E52A1C884C71002F1BEF = { 768 EF14E52A1C884C71002F1BEF = {
769 CreatedOnToolsVersion = 7.2.1; 769 CreatedOnToolsVersion = 7.2.1;
770 - DevelopmentTeam = MLGBPD9NXN; 770 + DevelopmentTeam = 6U82P566A4;
771 SystemCapabilities = { 771 SystemCapabilities = {
772 com.apple.BackgroundModes = { 772 com.apple.BackgroundModes = {
773 enabled = 1; 773 enabled = 1;
@@ -1158,9 +1158,9 @@ @@ -1158,9 +1158,9 @@
1158 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zine", 1158 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zine",
1159 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zipzap", 1159 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zipzap",
1160 ); 1160 );
1161 - PRODUCT_BUNDLE_IDENTIFIER = kennaki.livepush; 1161 + PRODUCT_BUNDLE_IDENTIFIER = cn.yoho.live.ent;
1162 PRODUCT_NAME = YohoLive; 1162 PRODUCT_NAME = YohoLive;
1163 - PROVISIONING_PROFILE = ""; 1163 + PROVISIONING_PROFILE = "a054e3fc-ce5a-4cd0-a13b-21f70ebeab79";
1164 USER_HEADER_SEARCH_PATHS = ./YohoLive/TXRTMPSDK.framework/Headers; 1164 USER_HEADER_SEARCH_PATHS = ./YohoLive/TXRTMPSDK.framework/Headers;
1165 VALID_ARCHS = "arm64 armv7 armv7s i386"; 1165 VALID_ARCHS = "arm64 armv7 armv7s i386";
1166 }; 1166 };
@@ -1219,9 +1219,9 @@ @@ -1219,9 +1219,9 @@
1219 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zine", 1219 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zine",
1220 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zipzap", 1220 "$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zipzap",
1221 ); 1221 );
1222 - PRODUCT_BUNDLE_IDENTIFIER = kennaki.livepush; 1222 + PRODUCT_BUNDLE_IDENTIFIER = cn.yoho.live.ent;
1223 PRODUCT_NAME = YohoLive; 1223 PRODUCT_NAME = YohoLive;
1224 - PROVISIONING_PROFILE = ""; 1224 + PROVISIONING_PROFILE = "a054e3fc-ce5a-4cd0-a13b-21f70ebeab79";
1225 USER_HEADER_SEARCH_PATHS = ./YohoLive/TXRTMPSDK.framework/Headers; 1225 USER_HEADER_SEARCH_PATHS = ./YohoLive/TXRTMPSDK.framework/Headers;
1226 VALID_ARCHS = "arm64 armv7 armv7s i386"; 1226 VALID_ARCHS = "arm64 armv7 armv7s i386";
1227 }; 1227 };
@@ -109,6 +109,9 @@ @@ -109,6 +109,9 @@
109 109
110 @end 110 @end
111 111
  112 +#define Envir_Test @"http://newboys.test.yoho.cn/"
  113 +#define Envir_Release @"http://new.yohoboys.com/" //正式环境
  114 +
112 @implementation YH_RootViewController 115 @implementation YH_RootViewController
113 116
114 - (void)liveNotifyEndSuccess { 117 - (void)liveNotifyEndSuccess {
@@ -204,7 +207,7 @@ @@ -204,7 +207,7 @@
204 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; 207 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
205 manager.responseSerializer.acceptableContentTypes = [manager.responseSerializer.acceptableContentTypes setByAddingObject:@"text/html"]; 208 manager.responseSerializer.acceptableContentTypes = [manager.responseSerializer.acceptableContentTypes setByAddingObject:@"text/html"];
206 NSURLSessionDataTask *task= [manager 209 NSURLSessionDataTask *task= [manager
207 - GET:@"http://new.yohoboys.com/yohoboyins/v4/qcloud/getPushFlow" 210 + GET:[NSString stringWithFormat:@"%@,%@",Envir_Release,@"yohoboyins/v4/qcloud/getPushFlow"]
208 parameters:nil progress:NULL 211 parameters:nil progress:NULL
209 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 212 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
210 if ([responseObject isKindOfClass:[NSDictionary class]]) { 213 if ([responseObject isKindOfClass:[NSDictionary class]]) {
@@ -535,7 +538,7 @@ @@ -535,7 +538,7 @@
535 NSString *md5 = [self md5:temp]; 538 NSString *md5 = [self md5:temp];
536 539
537 NSURLSessionDataTask *task = [manager 540 NSURLSessionDataTask *task = [manager
538 - GET:@"http://new.yohoboys.com/yohoboyins/v4/qcloud/closeLive" 541 + GET:[NSString stringWithFormat:@"%@,%@",Envir_Release,@"yohoboyins/v4/qcloud/closeLive"]
539 parameters:@{@"cid":_currentChannel.room?:@"0",@"secret":md5} 542 parameters:@{@"cid":_currentChannel.room?:@"0",@"secret":md5}
540 progress:NULL 543 progress:NULL
541 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 544 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
@@ -683,7 +686,7 @@ @@ -683,7 +686,7 @@
683 NSString *temp=[NSString stringWithFormat:@"%@yohocms",_currentChannel.room?:@"0"]; 686 NSString *temp=[NSString stringWithFormat:@"%@yohocms",_currentChannel.room?:@"0"];
684 NSString *md5 = [self md5:temp]; 687 NSString *md5 = [self md5:temp];
685 NSURLSessionDataTask *task = [manager 688 NSURLSessionDataTask *task = [manager
686 - GET:@"http://new.yohoboys.com/yohoboyins/v4/qcloud/startLive" 689 + GET:[NSString stringWithFormat:@"%@,%@",Envir_Release,@"yohoboyins/v4/qcloud/startLive"]
687 parameters:@{@"cid":_currentChannel.room?:@"0",@"secret":md5} 690 parameters:@{@"cid":_currentChannel.room?:@"0",@"secret":md5}
688 progress:NULL 691 progress:NULL
689 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { 692 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
@@ -10,8 +10,8 @@ @@ -10,8 +10,8 @@
10 //http://previewboys.yoho.cn/yohoboyins/v4预生产环境 10 //http://previewboys.yoho.cn/yohoboyins/v4预生产环境
11 //http://newboys.test.yoho.cn/yohoboyins/v4 测试环境 11 //http://newboys.test.yoho.cn/yohoboyins/v4 测试环境
12 //http://new.yohoboys.com/yohoboyins/v4/正式环境 12 //http://new.yohoboys.com/yohoboyins/v4/正式环境
13 -#define API_BASE_URL_STRING @"http://newboys.test.yoho.cn/yohoboyins/v4" //预生产环境  
14 -//#define API_BASE_URL_STRING @"http://new.yohoboys.com/yohoboyins/v4"//正式环境 13 +//#define API_BASE_URL_STRING @"http://newboys.test.yoho.cn/yohoboyins/v4" //预生产环境
  14 +#define API_BASE_URL_STRING @"http://new.yohoboys.com/yohoboyins/v4"//正式环境
15 #define API_h5ezine_URL_STRING @"http://h5api.myoho.net/index.php" 15 #define API_h5ezine_URL_STRING @"http://h5api.myoho.net/index.php"
16 #define SOCKET_LIVE_HOST @"123.206.65.220" 16 #define SOCKET_LIVE_HOST @"123.206.65.220"
17 #define SOCKET_LIVE_PORT 9512 17 #define SOCKET_LIVE_PORT 9512
@@ -34,8 +34,8 @@ @@ -34,8 +34,8 @@
34 //http://previewboys.yoho.cn/yohoboyins/v4预生产环境 34 //http://previewboys.yoho.cn/yohoboyins/v4预生产环境
35 //http://newboys.test.yoho.cn/yohoboyins/v4 测试环境 35 //http://newboys.test.yoho.cn/yohoboyins/v4 测试环境
36 //http://new.yohoboys.com/yohoboyins/v4/正式环境 36 //http://new.yohoboys.com/yohoboyins/v4/正式环境
37 -#define API_BASE_URL_STRING @"http://newboys.test.yoho.cn/yohoboyins/v4" //预生产环境  
38 -//#define API_BASE_URL_STRING @"http://new.yohoboys.com/yohoboyins/v4"//正式环境 37 +//#define API_BASE_URL_STRING @"http://newboys.test.yoho.cn/yohoboyins/v4" //预生产环境
  38 +#define API_BASE_URL_STRING @"http://new.yohoboys.com/yohoboyins/v4"//正式环境
39 #define API_h5ezine_URL_STRING @"http://h5api.myoho.net/index.php" 39 #define API_h5ezine_URL_STRING @"http://h5api.myoho.net/index.php"
40 #define SOCKET_LIVE_HOST @"123.206.65.220" 40 #define SOCKET_LIVE_HOST @"123.206.65.220"
41 #define SOCKET_LIVE_PORT 9512 41 #define SOCKET_LIVE_PORT 9512
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 44
45 #else 45 #else
46 46
47 -#define API_BASE_URL_STRING @"http://newboys.test.yoho.cn/yohoboyins/v4" 47 +#define API_BASE_URL_STRING @"http://new.yohoboys.com/yohoboyins/v4"//正式环境
48 #define API_h5ezine_URL_STRING @"http://h5api.myoho.net/index.php" 48 #define API_h5ezine_URL_STRING @"http://h5api.myoho.net/index.php"
49 #define SOCKET_LIVE_TIMEOUT 10 49 #define SOCKET_LIVE_TIMEOUT 10
50 50