no message

zhangxiaowen
1 parent 0f9b97ec
Showing 7 changed files with 32 additions and 23 deletions
CNLiveEnvironment/Classes/CNLiveConst.h
CNLiveEnvironment/Classes/CNLiveEnvironment.h
CNLiveEnvironment/Classes/CNLiveEnvironmentManager.h
CNLiveEnvironment/Classes/CNLiveEnvironmentManager.m
CNLiveEnvironment/Classes/CNLiveInterface.h
Example/CNLiveEnvironment/XWAppDelegate.m
Example/CNLiveEnvironment/XWViewController.m
@@ -10,28 +10,21 @@
 #define CNLiveConst_h
 #import "CNLiveInterface.h"
+////////////////////////////////////////////////////////
+////////////          App
+////////////////////////////////////////////////////////
 // AppStore中AppID用于跳转AppStore下载/评分
 #define AppStoreAppId                     @"1337575478"
 // 请求查询app在AppStore的上架信息
 #define AppStoreAppInfo                   @"https://itunes.apple.com/lookup?id=1337575478"
-// h5新闻详情中分享使用到的图片地址
-#define netAddShareImgUrl                 cn_WjjH5_Host(@"/static/logo.png")
-#define WjjH5Short_Host                   @"http://dwz.cnlive.com"
-
-#define ShowGuideView                     @"no" // yes:显示欢迎页  no:不显示欢迎页
+// yes:显示欢迎页  no:不显示欢迎页
+#define ShowGuideView                     @"no"
-#define WjjH5_VideoChina                  cn_WjjH5_Host(@"/cnnews.html")
-#define WjjH5_NumProduct                  cn_WjjH5_Host(@"/cndr.html")
-#define WjjH5_Complaint                   cn_WjjH5_Host(@"/cnComplaint.html")//我的-投诉
+//上传手机通讯录和 生成订单二维码时，DES加密key
+#define kUploadContactsKey                @"cnliveIm"
-#define TIM_GetTokenUrl                   cn_API_OpenApi2(@"/im_chat/generateUserSign")
-
-// 网++默认头像地址
-#define CNLiveNetAddDefaultHead           cn_API_Refund(@"/admin/test/head.png")
-
-//
 ////////////////////////////////////////////////////////
 ////////////          数据库---表名
 ////////////////////////////////////////////////////////
@@ -46,6 +46,9 @@
 // IM
 #define IM_Cer_BusiId [CNLiveEnvironmentManager manager].kIM_Cer_BusiId
+// IM请求Token
+#define TIM_GetTokenUrl [CNLiveEnvironmentManager manager].kTIM_GetTokenUrl
+
 // 高德地图Key
 #define GDApiKey [CNLiveEnvironmentManager manager].kGDApiKey
@@ -77,7 +80,7 @@
 #define QQShareAppId_Share [CNLiveEnvironmentManager manager].kQQShareAppId_Share
 #define QQShareAppSecret_Share [CNLiveEnvironmentManager manager].kQQShareAppSecret_Share
-/*shareSDK相关参数*/
+/*ShareSDK相关参数*/
 #define ShareSDKAppId_Share [CNLiveEnvironmentManager manager].kShareSDKAppId_Share
 #define ShareSDKAppSecret_Share [CNLiveEnvironmentManager manager].kShareSDKAppSecret_Share
@@ -45,6 +45,7 @@ typedef NS_ENUM(NSInteger, CNLiveEnvironmentType) {
 @property (nonatomic, copy, readonly) NSString *displayName; // 展示名字
 @property (nonatomic, assign, readonly) NSInteger kIM_Cer_BusiId; // IM
+@property (nonatomic, copy, readonly) NSString *kTIM_GetTokenUrl; // IM请求token
 @property (nonatomic, copy, readonly) NSString *kGDApiKey; // 高德地图Key
@@ -33,6 +33,7 @@
 @property (nonatomic, copy, readwrite) NSString *displayName; //App展示名字
 @property (nonatomic, assign, readwrite) NSInteger kIM_Cer_BusiId; // IM
+@property (nonatomic, copy, readwrite) NSString *kTIM_GetTokenUrl; // IM请求token
 @property (nonatomic, copy, readwrite) NSString *kGDApiKey; // 高德地图Key
@@ -149,6 +150,7 @@
 #else
             manager.kIM_Cer_BusiId = 9205;
 #endif
+            manager.kTIM_GetTokenUrl = @"https://imtest.cnlive.com/CnliveIM/notify/generateUserSign.action";
             manager.kGDApiKey = @"f4459435f1c756d2efedc6ceec12be63";
             manager.kTingYunAppKey = @"3dda66ec904a4c3a8ad0169ca74de352";
@@ -219,6 +221,7 @@
 #else
             manager.kIM_Cer_BusiId = 7347;
 #endif
+            manager.kTIM_GetTokenUrl = @"https://api.cnlive.com/open/api2/im_chat/generateUserSign";
             manager.kGDApiKey = @"84d765606a54635aec2648f663d4a5ed";
             manager.kTingYunAppKey = @"782d9a70547a4e3f91cb328b122bb85c";
@@ -288,6 +291,7 @@
 #else
             manager.kIM_Cer_BusiId = 12451;
 #endif
+            manager.kTIM_GetTokenUrl = @"https://imtest.cnlive.com/CnliveIM/notify/generateUserSign.action";
             manager.kGDApiKey = @"4b15525f4265edfed8dce1d02f08a893";
             manager.kTingYunAppKey = @"3dda66ec904a4c3a8ad0169ca74de352";
@@ -356,6 +360,7 @@
 #else
             manager.kIM_Cer_BusiId = 12453;
 #endif
+            manager.kTIM_GetTokenUrl = @"https://api.cnlive.com/open/api2/im_chat/generateUserSign";
             manager.kGDApiKey = @"5a0e2a559b987e67d5b0c13490adde02";
             manager.kTingYunAppKey = @"37c9ea3f439145269e5cffe095466b17";
@@ -18,9 +18,16 @@
 #define cn_API_OpenApi2(url)                  [NSString stringWithFormat:@"%@%@",[CNLiveEnvironmentManager manager].kAPI_OpenApi2,url]
 #define cn_API_Classify(url)                  [NSString stringWithFormat:@"%@%@",[CNLiveEnvironmentManager manager].kAPI_Classify,url]
+// 分享使用到的logo图片
+#define NetAddShareImgUrl                     cn_WjjH5_Host(@"/static/logo.png")
+#define WjjH5Short_Host                       @"http://dwz.cnlive.com"
+
+//我的-投诉
+#define WjjH5_Complaint                       cn_WjjH5_Host(@"/cnComplaint.html")
+
+// 网++默认头像地址
+#define CNLiveNetAddDefaultHead               cn_API_Refund(@"/admin/test/head.png")
-//上传手机通讯录和 生成订单二维码时，DES加密key
-#define kUploadContactsKey    @"cnliveIm"
 #define iUploadContacts                       cn_API_Contact(@"/CnliveIM/notify/uploadContacts.action")
 //其他投诉
@@ -22,8 +22,7 @@
 //    NSLog(@"%@",APPKey);
 //    NSLog(@"%@",CNStockDarenVideoCallBackUrl);
 //    NSLog(@"%@",CNGetWitnessCancelCollection);
-//    NSLog(@"%@",cn_API_Host(@"/我爱中国"));
-    NSLog(@"%@",WjjH5_VideoChina);
+    NSLog(@"%@",cn_API_Host(@"/我爱中国"));
     [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];
 //    NSLog(@"%@",EnvironmentDesc);
@@ -34,9 +33,7 @@
 //    NSLog(@"%@",APPKey);
 //    NSLog(@"%@",CNStockDarenVideoCallBackUrl);
 //    NSLog(@"%@",CNGetWitnessCancelCollection);
-//    NSLog(@"%@",cn_API_Host(@"/我爱中国"));
-
-    NSLog(@"%@",WjjH5_VideoChina);
+    NSLog(@"%@",cn_API_Host(@"/我爱中国"));
@@ -22,7 +22,10 @@
     [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];
     NSLog(@"%@",CNStockDarenVideoCallBackUrl);
     NSLog(@"%@",CNGetWitnessCancelCollection);
-    NSLog(@"%@",CNGetSpAddFollowsUrl);
+    NSLog(@"%@",NetAddShareImgUrl);
+
+    
+    NSLog(@"%@",TIM_GetTokenUrl);
 }