Commit 1253c19408b1f286e79b7f16370219095e1144d1

Authored by daojian
1 parent 8d923806

0.3.4 版本

CNLiveEnvironment.podspec
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveEnvironment' 10 s.name = 'CNLiveEnvironment'
11 - s.version = '0.3.3' 11 + s.version = '0.3.4'
12 s.summary = 'CNLiveEnvironment' 12 s.summary = 'CNLiveEnvironment'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
@@ -28,7 +28,7 @@ TODO: CNLiveEnvironment @@ -28,7 +28,7 @@ TODO: CNLiveEnvironment
28 s.source = { :git => 'http://bj.gitlab.cnlive.com/ios-team/CNLiveEnvironment.git', :tag => s.version.to_s } 28 s.source = { :git => 'http://bj.gitlab.cnlive.com/ios-team/CNLiveEnvironment.git', :tag => s.version.to_s }
29 # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>' 29 # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
30 30
31 - s.ios.deployment_target = '9.0' 31 + s.ios.deployment_target = '10.0'
32 32
33 s.source_files = 'CNLiveEnvironment/Classes/**/*' 33 s.source_files = 'CNLiveEnvironment/Classes/**/*'
34 34
CNLiveEnvironment/Classes/CNLiveEnvironment.h
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
27 #define AppDownloadUrl [CNLiveEnvironmentManager manager].kAppDownloadUrl 27 #define AppDownloadUrl [CNLiveEnvironmentManager manager].kAppDownloadUrl
28 28
29 #define WjjH5_Host [CNLiveEnvironmentManager manager].kWjjH5_Host 29 #define WjjH5_Host [CNLiveEnvironmentManager manager].kWjjH5_Host
  30 +#define WjjH5_Host_HTTPS [CNLiveEnvironmentManager manager].kWjjH5_Host_Https
30 #define API_Host [CNLiveEnvironmentManager manager].kAPI_Host 31 #define API_Host [CNLiveEnvironmentManager manager].kAPI_Host
31 #define API_Contact [CNLiveEnvironmentManager manager].kAPI_Contact 32 #define API_Contact [CNLiveEnvironmentManager manager].kAPI_Contact
32 #define API_Refund [CNLiveEnvironmentManager manager].kAPI_Refund 33 #define API_Refund [CNLiveEnvironmentManager manager].kAPI_Refund
CNLiveEnvironment/Classes/CNLiveEnvironmentManager.h
@@ -32,6 +32,7 @@ typedef NS_ENUM(NSInteger, CNLiveAppType) { @@ -32,6 +32,7 @@ typedef NS_ENUM(NSInteger, CNLiveAppType) {
32 32
33 @property (nonatomic, copy, readonly) NSString *kAppDownloadUrl;// 下载地址 33 @property (nonatomic, copy, readonly) NSString *kAppDownloadUrl;// 下载地址
34 @property (nonatomic, copy, readonly) NSString *kWjjH5_Host; 34 @property (nonatomic, copy, readonly) NSString *kWjjH5_Host;
  35 +@property (nonatomic, copy, readonly) NSString *kWjjH5_Host_Https;
35 36
36 @property (nonatomic, copy, readonly) NSString *kAPI_Host; 37 @property (nonatomic, copy, readonly) NSString *kAPI_Host;
37 @property (nonatomic, copy, readonly) NSString *kAPI_Contact; 38 @property (nonatomic, copy, readonly) NSString *kAPI_Contact;
CNLiveEnvironment/Classes/CNLiveEnvironmentManager.m
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
17 17
18 @property (nonatomic, copy, readwrite) NSString *kAppDownloadUrl; 18 @property (nonatomic, copy, readwrite) NSString *kAppDownloadUrl;
19 @property (nonatomic, copy, readwrite) NSString *kWjjH5_Host; 19 @property (nonatomic, copy, readwrite) NSString *kWjjH5_Host;
  20 +@property (nonatomic, copy, readwrite) NSString *kWjjH5_Host_Https;
20 21
21 @property (nonatomic, copy, readwrite) NSString *kAPI_Host; 22 @property (nonatomic, copy, readwrite) NSString *kAPI_Host;
22 @property (nonatomic, copy, readwrite) NSString *kAPI_Contact; 23 @property (nonatomic, copy, readwrite) NSString *kAPI_Contact;
@@ -147,7 +148,9 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -147,7 +148,9 @@ static CNLiveEnvironmentManager *_instance = nil;
147 manager.isTestEnvironment = YES; 148 manager.isTestEnvironment = YES;
148 149
149 manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html"; 150 manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";
  151 +
150 manager.kWjjH5_Host = @"http://wjjh5test.cnlive.com"; 152 manager.kWjjH5_Host = @"http://wjjh5test.cnlive.com";
  153 + manager.kWjjH5_Host_Https = @"https://wjjh5test.cnlive.com";
151 154
152 manager.kAPI_Host = @"https://apiwjjtest.cnlive.com"; 155 manager.kAPI_Host = @"https://apiwjjtest.cnlive.com";
153 manager.kAPI_Contact = @"https://imtest.cnlive.com"; 156 manager.kAPI_Contact = @"https://imtest.cnlive.com";
@@ -230,7 +233,8 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -230,7 +233,8 @@ static CNLiveEnvironmentManager *_instance = nil;
230 233
231 manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html"; 234 manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";
232 manager.kWjjH5_Host = @"http://wjjh5.cnlive.com"; 235 manager.kWjjH5_Host = @"http://wjjh5.cnlive.com";
233 - 236 + manager.kWjjH5_Host_Https = @"https://wjjh5.cnlive.com";
  237 +
234 manager.kAPI_Host = @"https://apiwjj.cnlive.com"; 238 manager.kAPI_Host = @"https://apiwjj.cnlive.com";
235 manager.kAPI_Contact = @"https://wjjim.cnlive.com"; 239 manager.kAPI_Contact = @"https://wjjim.cnlive.com";
236 manager.kAPI_Refund = @"https://wjj.ys1.cnliveimg.com"; 240 manager.kAPI_Refund = @"https://wjj.ys1.cnliveimg.com";
@@ -312,6 +316,7 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -312,6 +316,7 @@ static CNLiveEnvironmentManager *_instance = nil;
312 316
313 manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html"; 317 manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";
314 manager.kWjjH5_Host = @"http://wjjh5test.cnlive.com"; 318 manager.kWjjH5_Host = @"http://wjjh5test.cnlive.com";
  319 + manager.kWjjH5_Host_Https = @"https://wjjh5test.cnlive.com";
315 320
316 manager.kAPI_Host = @"https://apiwjjtest.cnlive.com"; 321 manager.kAPI_Host = @"https://apiwjjtest.cnlive.com";
317 manager.kAPI_Contact = @"https://imtest.cnlive.com"; 322 manager.kAPI_Contact = @"https://imtest.cnlive.com";
@@ -396,6 +401,7 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -396,6 +401,7 @@ static CNLiveEnvironmentManager *_instance = nil;
396 401
397 manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html"; 402 manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";
398 manager.kWjjH5_Host = @"http://wjjh5.cnlive.com"; 403 manager.kWjjH5_Host = @"http://wjjh5.cnlive.com";
  404 + manager.kWjjH5_Host_Https = @"https://wjjh5.cnlive.com";
399 405
400 manager.kAPI_Host = @"https://apiwjj.cnlive.com"; 406 manager.kAPI_Host = @"https://apiwjj.cnlive.com";
401 manager.kAPI_Contact = @"https://wjjim.cnlive.com"; 407 manager.kAPI_Contact = @"https://wjjim.cnlive.com";
@@ -479,7 +485,8 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -479,7 +485,8 @@ static CNLiveEnvironmentManager *_instance = nil;
479 485
480 manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html"; 486 manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";
481 manager.kWjjH5_Host = @"http://wjjh5test.cnlive.com"; 487 manager.kWjjH5_Host = @"http://wjjh5test.cnlive.com";
482 - 488 + manager.kWjjH5_Host_Https = @"https://wjjh5test.cnlive.com";
  489 +
483 manager.kAPI_Host = @"https://apiwjjtest.cnlive.com"; 490 manager.kAPI_Host = @"https://apiwjjtest.cnlive.com";
484 manager.kAPI_Contact = @"https://imtest.cnlive.com"; 491 manager.kAPI_Contact = @"https://imtest.cnlive.com";
485 manager.kAPI_Refund = @"https://wjj.ys1.cnliveimg.com"; 492 manager.kAPI_Refund = @"https://wjj.ys1.cnliveimg.com";
@@ -619,7 +626,8 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -619,7 +626,8 @@ static CNLiveEnvironmentManager *_instance = nil;
619 626
620 manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html"; 627 manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";
621 manager.kWjjH5_Host = @"http://wjjh5test.cnlive.com"; 628 manager.kWjjH5_Host = @"http://wjjh5test.cnlive.com";
622 - 629 + manager.kWjjH5_Host_Https = @"https://wjjh5test.cnlive.com";
  630 +
623 manager.kAPI_Host = @"https://apiwjjtest.cnlive.com"; 631 manager.kAPI_Host = @"https://apiwjjtest.cnlive.com";
624 manager.kAPI_Contact = @"https://imtest.cnlive.com"; 632 manager.kAPI_Contact = @"https://imtest.cnlive.com";
625 manager.kAPI_Refund = @"https://wjj.ys1.cnliveimg.com"; 633 manager.kAPI_Refund = @"https://wjj.ys1.cnliveimg.com";
@@ -695,7 +703,8 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -695,7 +703,8 @@ static CNLiveEnvironmentManager *_instance = nil;
695 703
696 manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html"; 704 manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";
697 manager.kWjjH5_Host = @"http://wjjh5.cnlive.com"; 705 manager.kWjjH5_Host = @"http://wjjh5.cnlive.com";
698 - 706 + manager.kWjjH5_Host_Https = @"https://wjjh5.cnlive.com";
  707 +
699 manager.kAPI_Host = @"https://apiwjj.cnlive.com"; 708 manager.kAPI_Host = @"https://apiwjj.cnlive.com";
700 manager.kAPI_Contact = @"https://wjjim.cnlive.com"; 709 manager.kAPI_Contact = @"https://wjjim.cnlive.com";
701 manager.kAPI_Refund = @"https://wjj.ys1.cnliveimg.com"; 710 manager.kAPI_Refund = @"https://wjj.ys1.cnliveimg.com";
@@ -770,7 +779,8 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -770,7 +779,8 @@ static CNLiveEnvironmentManager *_instance = nil;
770 779
771 manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html"; 780 manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";
772 manager.kWjjH5_Host = @"http://wjjh5test.cnlive.com"; 781 manager.kWjjH5_Host = @"http://wjjh5test.cnlive.com";
773 - 782 + manager.kWjjH5_Host_Https = @"https://wjjh5test.cnlive.com";
  783 +
774 manager.kAPI_Host = @"https://apiwjjtest.cnlive.com"; 784 manager.kAPI_Host = @"https://apiwjjtest.cnlive.com";
775 manager.kAPI_Contact = @"https://imtest.cnlive.com"; 785 manager.kAPI_Contact = @"https://imtest.cnlive.com";
776 manager.kAPI_Refund = @"https://wjj.ys1.cnliveimg.com"; 786 manager.kAPI_Refund = @"https://wjj.ys1.cnliveimg.com";
Example/Podfile
1 use_frameworks! 1 use_frameworks!
2 -source 'https://github.com/CocoaPods/Specs.git' 2 +source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
3 source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git' 3 source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
4 4
5 platform :ios, '9.0' 5 platform :ios, '9.0'