Commit 0f9b97ec6a694790eceb3f63095f063358aa468b

Authored by zhangxiaowen
1 parent 58aedf17

no message

CNLiveEnvironment/Classes/CNLiveConst.h
@@ -11,25 +11,25 @@ @@ -11,25 +11,25 @@
11 #import "CNLiveInterface.h" 11 #import "CNLiveInterface.h"
12 12
13 // AppStore中AppID用于跳转AppStore下载/评分 13 // AppStore中AppID用于跳转AppStore下载/评分
14 -#define AppStoreAppId @"1337575478" 14 +#define AppStoreAppId @"1337575478"
15 15
16 // 请求查询app在AppStore的上架信息 16 // 请求查询app在AppStore的上架信息
17 -#define AppStoreAppInfo @"https://itunes.apple.com/lookup?id=1337575478" 17 +#define AppStoreAppInfo @"https://itunes.apple.com/lookup?id=1337575478"
18 18
19 // h5新闻详情中分享使用到的图片地址 19 // h5新闻详情中分享使用到的图片地址
20 -#define netAddShareImgUrl cn_WjjH5_Host(@"/static/logo.png")  
21 -#define WjjH5Short_Host @"http://dwz.cnlive.com" 20 +#define netAddShareImgUrl cn_WjjH5_Host(@"/static/logo.png")
  21 +#define WjjH5Short_Host @"http://dwz.cnlive.com"
22 22
23 -#define ShowGuideView @"no" // yes:显示欢迎页 no:不显示欢迎页 23 +#define ShowGuideView @"no" // yes:显示欢迎页 no:不显示欢迎页
24 24
25 -#define WjjH5_VideoChina cn_WjjH5_Host(@"/cnnews.html")  
26 -#define WjjH5_NumProduct cn_WjjH5_Host(@"/cndr.html")  
27 -#define WjjH5_Complaint cn_WjjH5_Host(@"/cnComplaint.html")//我的-投诉 25 +#define WjjH5_VideoChina cn_WjjH5_Host(@"/cnnews.html")
  26 +#define WjjH5_NumProduct cn_WjjH5_Host(@"/cndr.html")
  27 +#define WjjH5_Complaint cn_WjjH5_Host(@"/cnComplaint.html")//我的-投诉
28 28
29 -#define TIM_GetTokenUrl cn_API_OpenApi2(@"/im_chat/generateUserSign") 29 +#define TIM_GetTokenUrl cn_API_OpenApi2(@"/im_chat/generateUserSign")
30 30
31 // 网++默认头像地址 31 // 网++默认头像地址
32 -#define CNLiveNetAddDefaultHead cn_API_Refund(@"/admin/test/head.png") 32 +#define CNLiveNetAddDefaultHead cn_API_Refund(@"/admin/test/head.png")
33 33
34 // 34 //
35 //////////////////////////////////////////////////////// 35 ////////////////////////////////////////////////////////
@@ -37,19 +37,19 @@ @@ -37,19 +37,19 @@
37 //////////////////////////////////////////////////////// 37 ////////////////////////////////////////////////////////
38 38
39 //达人个人主页表名 39 //达人个人主页表名
40 -#define DarenHomeRealm @"DarenHome" 40 +#define DarenHomeRealm @"DarenHome"
41 41
42 //达人列表表名 42 //达人列表表名
43 -#define DarenSubsRealm @"DarenSubs" 43 +#define DarenSubsRealm @"DarenSubs"
44 44
45 //生活列表表名 45 //生活列表表名
46 -#define LifeSubsRealm @"LifeSubs" 46 +#define LifeSubsRealm @"LifeSubs"
47 47
48 //系统订单列表表名 48 //系统订单列表表名
49 -#define LifeHomeRealm @"LifeHome" 49 +#define LifeHomeRealm @"LifeHome"
50 50
51 //朋友圈新消息表名 51 //朋友圈新消息表名
52 -#define MomentNewMsgRealm @"MomentNewMsg" 52 +#define MomentNewMsgRealm @"MomentNewMsg"
53 53
54 54
55 #endif /* CNLiveConst_h */ 55 #endif /* CNLiveConst_h */
CNLiveEnvironment/Classes/CNLiveEnvironment.h
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 #define DisplayName [CNLiveEnvironmentManager manager].displayName 44 #define DisplayName [CNLiveEnvironmentManager manager].displayName
45 45
46 // IM 46 // IM
47 -#define IM_Cer_busiId [CNLiveEnvironmentManager manager].kIM_Cer_busiId 47 +#define IM_Cer_BusiId [CNLiveEnvironmentManager manager].kIM_Cer_BusiId
48 48
49 // 高德地图Key 49 // 高德地图Key
50 #define GDApiKey [CNLiveEnvironmentManager manager].kGDApiKey 50 #define GDApiKey [CNLiveEnvironmentManager manager].kGDApiKey
CNLiveEnvironment/Classes/CNLiveEnvironmentManager.h
@@ -44,7 +44,7 @@ typedef NS_ENUM(NSInteger, CNLiveEnvironmentType) { @@ -44,7 +44,7 @@ typedef NS_ENUM(NSInteger, CNLiveEnvironmentType) {
44 44
45 @property (nonatomic, copy, readonly) NSString *displayName; // 展示名字 45 @property (nonatomic, copy, readonly) NSString *displayName; // 展示名字
46 46
47 -@property (nonatomic, assign, readonly) NSInteger kIM_Cer_busiId; // IM 47 +@property (nonatomic, assign, readonly) NSInteger kIM_Cer_BusiId; // IM
48 48
49 @property (nonatomic, copy, readonly) NSString *kGDApiKey; // 高德地图Key 49 @property (nonatomic, copy, readonly) NSString *kGDApiKey; // 高德地图Key
50 50
CNLiveEnvironment/Classes/CNLiveEnvironmentManager.m
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 32
33 @property (nonatomic, copy, readwrite) NSString *displayName; //App展示名字 33 @property (nonatomic, copy, readwrite) NSString *displayName; //App展示名字
34 34
35 -@property (nonatomic, assign, readwrite) NSInteger kIM_Cer_busiId; // IM 35 +@property (nonatomic, assign, readwrite) NSInteger kIM_Cer_BusiId; // IM
36 36
37 @property (nonatomic, copy, readwrite) NSString *kGDApiKey; // 高德地图Key 37 @property (nonatomic, copy, readwrite) NSString *kGDApiKey; // 高德地图Key
38 38
@@ -145,9 +145,9 @@ @@ -145,9 +145,9 @@
145 manager.displayName = @"网家家测试企业"; 145 manager.displayName = @"网家家测试企业";
146 146
147 #if DEBUG 147 #if DEBUG
148 - manager.kIM_Cer_busiId = 9204; 148 + manager.kIM_Cer_BusiId = 9204;
149 #else 149 #else
150 - manager.kIM_Cer_busiId = 9205; 150 + manager.kIM_Cer_BusiId = 9205;
151 #endif 151 #endif
152 152
153 manager.kGDApiKey = @"f4459435f1c756d2efedc6ceec12be63"; 153 manager.kGDApiKey = @"f4459435f1c756d2efedc6ceec12be63";
@@ -215,9 +215,9 @@ @@ -215,9 +215,9 @@
215 manager.displayName = @"网家家正式企业"; 215 manager.displayName = @"网家家正式企业";
216 216
217 #if DEBUG 217 #if DEBUG
218 - manager.kIM_Cer_busiId = 7346; 218 + manager.kIM_Cer_BusiId = 7346;
219 #else 219 #else
220 - manager.kIM_Cer_busiId = 7347; 220 + manager.kIM_Cer_BusiId = 7347;
221 #endif 221 #endif
222 222
223 manager.kGDApiKey = @"84d765606a54635aec2648f663d4a5ed"; 223 manager.kGDApiKey = @"84d765606a54635aec2648f663d4a5ed";
@@ -284,9 +284,9 @@ @@ -284,9 +284,9 @@
284 manager.displayName = @"网家家测试商店"; 284 manager.displayName = @"网家家测试商店";
285 285
286 #if DEBUG 286 #if DEBUG
287 - manager.kIM_Cer_busiId = 12450; 287 + manager.kIM_Cer_BusiId = 12450;
288 #else 288 #else
289 - manager.kIM_Cer_busiId = 12451; 289 + manager.kIM_Cer_BusiId = 12451;
290 #endif 290 #endif
291 291
292 manager.kGDApiKey = @"4b15525f4265edfed8dce1d02f08a893"; 292 manager.kGDApiKey = @"4b15525f4265edfed8dce1d02f08a893";
@@ -352,9 +352,9 @@ @@ -352,9 +352,9 @@
352 352
353 manager.displayName = @"网家家"; 353 manager.displayName = @"网家家";
354 #if DEBUG 354 #if DEBUG
355 - manager.kIM_Cer_busiId = 12452; 355 + manager.kIM_Cer_BusiId = 12452;
356 #else 356 #else
357 - manager.kIM_Cer_busiId = 12453; 357 + manager.kIM_Cer_BusiId = 12453;
358 #endif 358 #endif
359 359
360 manager.kGDApiKey = @"5a0e2a559b987e67d5b0c13490adde02"; 360 manager.kGDApiKey = @"5a0e2a559b987e67d5b0c13490adde02";