Authored by 周蓉君

修改工程接口配置。Review by 盖剑秋。

This diff could not be displayed because it is too large.
... ... @@ -1023,6 +1023,122 @@
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
CA6ED9A91D49BB9A008F49F0 /* DebugTest */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = DebugTest;
};
CA6ED9AA1D49BB9A008F49F0 /* DebugTest */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = DF5CC49E6ACE4D402D22806C /* Pods.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Distribution: New & Power Culture Dissemination Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/YohoLive",
"$(PROJECT_DIR)/YohoLive/FromYoho/Controllers/BOARD/ThirdPartySources",
"$(PROJECT_DIR)/YohoLive/FromYoho/Vendors/AliPay",
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/YohoLive/FromYoho/OneAPM/__MACOSX/iOS_SDK_V2.1.3_Xcode7",
"$(PROJECT_DIR)/YohoLive/FromYoho/OneAPM/Frameworks",
"$(PROJECT_DIR)/YohoLive/FromYoho/OneAPM/iOS_SDK_V2.1.3_Xcode7",
"$(PROJECT_DIR)/YohoLive/FromYoho/SDWebImage/Vendors",
"$(PROJECT_DIR)/YohoLive/yoho/Controllers/BOARD/ThirdPartySources",
"$(PROJECT_DIR)/YohoLive/yoho/OneAPM/__MACOSX/iOS_SDK_V2.1.3_Xcode7",
"$(PROJECT_DIR)/YohoLive/yoho/OneAPM/Frameworks",
"$(PROJECT_DIR)/YohoLive/yoho/OneAPM/iOS_SDK_V2.1.3_Xcode7",
"$(PROJECT_DIR)/YohoLive/yoho/SDWebImage/Vendors",
"$(PROJECT_DIR)/YohoLive/yoho/Vendors/AliPay",
"$(PROJECT_DIR)/YohoLive/yoho/Vendors",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_PREFIX_HEADER = YohoLive.pch;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
"DEBUGTEST=1",
);
HEADER_SEARCH_PATHS = ./YohoLive/TXRTMPSDK.framework/Headers;
INFOPLIST_FILE = YohoLive/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/YohoLive/FromYoho/Controllers/BOARD/ThirdPartySources/Flurry",
"$(PROJECT_DIR)/YohoLive/FromYoho/Controllers/BOARD/ThirdPartySources/Zine",
"$(PROJECT_DIR)/YohoLive/FromYoho/Vendors/AliPay",
"$(PROJECT_DIR)/YohoLive/FromYoho/Vendors/libWeiboSDK",
"$(PROJECT_DIR)/YohoLive/FromYoho/Vendors/WeChatSDK",
"$(PROJECT_DIR)/YohoLive/FromYoho/Vendors/ZBarSDK",
"$(PROJECT_DIR)/YohoLive/FromYoho/Vendors/Zine",
"$(PROJECT_DIR)/YohoLive/FromYoho/Vendors/Zipzap",
"$(PROJECT_DIR)/YohoLive/FromYoho/UMengAnalytics-NO-IDFA/umsdk_IOS_analytics_no-idfa_v3.5.17/UMAnalytics_Sdk_3.5.17",
"$(PROJECT_DIR)/YohoLive/yoho/Controllers/BOARD/ThirdPartySources/Flurry",
"$(PROJECT_DIR)/YohoLive/yoho/Controllers/BOARD/ThirdPartySources/Zine",
"$(PROJECT_DIR)/YohoLive/yoho",
"$(PROJECT_DIR)/YohoLive/yoho/Vendors/AliPay",
"$(PROJECT_DIR)/YohoLive/yoho/Vendors/libWeiboSDK",
"$(PROJECT_DIR)/YohoLive/yoho/Vendors/WeChatSDK",
"$(PROJECT_DIR)/YohoLive/yoho/Vendors/ZBarSDK",
"$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zine",
"$(PROJECT_DIR)/YohoLive/yoho/Vendors/Zipzap",
);
PRODUCT_BUNDLE_IDENTIFIER = cn.yoho.live.ent;
PRODUCT_NAME = YohoLive;
PROVISIONING_PROFILE = "a054e3fc-ce5a-4cd0-a13b-21f70ebeab79";
USER_HEADER_SEARCH_PATHS = ./YohoLive/TXRTMPSDK.framework/Headers;
VALID_ARCHS = "arm64 armv7 armv7s i386";
};
name = DebugTest;
};
CA6ED9AB1D49BB9A008F49F0 /* DebugTest */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = DebugTest;
};
EF14E5401C884C71002F1BEF /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
... ... @@ -1110,7 +1226,7 @@
baseConfigurationReference = DF5CC49E6ACE4D402D22806C /* Pods.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Distribution: New & Power Culture Dissemination Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
... ... @@ -1171,7 +1287,7 @@
baseConfigurationReference = E02A0042E44F888A50E7158C /* Pods.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Distribution: New & Power Culture Dissemination Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
... ... @@ -1248,6 +1364,7 @@
isa = XCConfigurationList;
buildConfigurations = (
EF14E5401C884C71002F1BEF /* Debug */,
CA6ED9A91D49BB9A008F49F0 /* DebugTest */,
EF14E5411C884C71002F1BEF /* Release */,
);
defaultConfigurationIsVisible = 0;
... ... @@ -1257,6 +1374,7 @@
isa = XCConfigurationList;
buildConfigurations = (
EF14E5431C884C71002F1BEF /* Debug */,
CA6ED9AA1D49BB9A008F49F0 /* DebugTest */,
EF14E5441C884C71002F1BEF /* Release */,
);
defaultConfigurationIsVisible = 0;
... ... @@ -1266,6 +1384,7 @@
isa = XCConfigurationList;
buildConfigurations = (
EF5285231CA17075009AF0FB /* Debug */,
CA6ED9AB1D49BB9A008F49F0 /* DebugTest */,
EF5285241CA17075009AF0FB /* Release */,
);
defaultConfigurationIsVisible = 0;
... ...
... ... @@ -36,9 +36,6 @@
#define RTMP_PUBLISH_URL @"rtmp://2718.livepush.myqcloud.com/live/2718_01973243308211e6a2cba4dcbef5e35a?bizid=2718" //调试期间您可以修改之以避免输入地址的麻烦
#define SOCKET_LIVE_HOST @"123.206.65.220"
#define SOCKET_LIVE_PORT 9512
#define SOCKET_COMMAND @"cmd"
#define kPushging @"pushing_key"
#define END_ACKCMD @"99"
... ... @@ -109,8 +106,6 @@
@end
#define Envir_Test @"http://newboys.test.yoho.cn/"
#define Envir_Release @"http://new.yohoboys.com/" //正式环境
@implementation YH_RootViewController
... ... @@ -207,7 +202,7 @@
AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
manager.responseSerializer.acceptableContentTypes = [manager.responseSerializer.acceptableContentTypes setByAddingObject:@"text/html"];
NSURLSessionDataTask *task= [manager
GET:[NSString stringWithFormat:@"%@,%@",Envir_Release,@"yohoboyins/v4/qcloud/getPushFlow"]
GET:[NSString stringWithFormat:@"%@,%@", API_BASE_URL_STRING, @"qcloud/getPushFlow"]
parameters:nil progress:NULL
success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
if ([responseObject isKindOfClass:[NSDictionary class]]) {
... ... @@ -538,7 +533,7 @@
NSString *md5 = [self md5:temp];
NSURLSessionDataTask *task = [manager
GET:[NSString stringWithFormat:@"%@,%@",Envir_Release,@"yohoboyins/v4/qcloud/closeLive"]
GET:[NSString stringWithFormat:@"%@,%@",API_BASE_URL_STRING,@"qcloud/closeLive"]
parameters:@{@"cid":_currentChannel.room?:@"0",@"secret":md5}
progress:NULL
success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
... ... @@ -686,7 +681,7 @@
NSString *temp=[NSString stringWithFormat:@"%@yohocms",_currentChannel.room?:@"0"];
NSString *md5 = [self md5:temp];
NSURLSessionDataTask *task = [manager
GET:[NSString stringWithFormat:@"%@,%@",Envir_Release,@"yohoboyins/v4/qcloud/startLive"]
GET:[NSString stringWithFormat:@"%@,%@",API_BASE_URL_STRING,@"qcloud/startLive"]
parameters:@{@"cid":_currentChannel.room?:@"0",@"secret":md5}
progress:NULL
success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
... ...
... ... @@ -7,15 +7,6 @@
#import "YH_HTTPRequestSerializer.h"
#import "YH_HTTPResponseSerializer.h"
//http://previewboys.yoho.cn/yohoboyins/v4预生产环境
//http://newboys.test.yoho.cn/yohoboyins/v4 测试环境
//http://new.yohoboys.com/yohoboyins/v4/正式环境
//#define API_BASE_URL_STRING @"http://newboys.test.yoho.cn/yohoboyins/v4" //预生产环境
#define API_BASE_URL_STRING @"http://new.yohoboys.com/yohoboyins/v4"//正式环境
#define API_h5ezine_URL_STRING @"http://h5api.myoho.net/index.php"
#define SOCKET_LIVE_HOST @"123.206.65.220"
#define SOCKET_LIVE_PORT 9512
#define SOCKET_LIVE_TIMEOUT 10
@implementation M16HttpClient
+ (instancetype)BaseSharedClient {
... ...
... ... @@ -28,29 +28,23 @@
//////////////////////////////////////////////////////////////////////////////////////////////////
//接口名称相关
//http://previewboys.yoho.cn/yohoboyins/v4 预生产环境
//http://newboys.test.yoho.cn/yohoboyins/v4 测试环境
//http://new.yohoboys.com/yohoboyins/v4/ 正式环境
//http://newboys.test.yoho.cn/yohoboyins/v4 预生产环境
#ifdef DEBUGTEST
#ifdef DEBUG
//http://previewboys.yoho.cn/yohoboyins/v4预生产环境
//http://newboys.test.yoho.cn/yohoboyins/v4 测试环境
//http://new.yohoboys.com/yohoboyins/v4/正式环境
//#define API_BASE_URL_STRING @"http://newboys.test.yoho.cn/yohoboyins/v4" //预生产环境
#define API_BASE_URL_STRING @"http://new.yohoboys.com/yohoboyins/v4"//正式环境
#define API_BASE_URL_STRING @"http://newboys.test.yoho.cn/yohoboyins/v4"//正式环境
#define API_h5ezine_URL_STRING @"http://h5api.myoho.net/index.php"
#define SOCKET_LIVE_HOST @"123.206.65.220"
#define SOCKET_LIVE_PORT 9512
#define SOCKET_LIVE_TIMEOUT 10
#else
#define API_BASE_URL_STRING @"http://new.yohoboys.com/yohoboyins/v4"//正式环境
#define API_h5ezine_URL_STRING @"http://h5api.myoho.net/index.php"
#define SOCKET_LIVE_TIMEOUT 10
#endif
#define API_MAGAZINE_DOWNLOAD_URL_STRING @"http://h5api.myoho.net/index.php?r=Apiemag/magList&"
#define SMS_REQUEST_KEY @"ebb730bef3650dd49dac59c67fe4cc12"
... ...