no message

zhangxiaowen
1 parent 91cde789
Showing 5 changed files with 52 additions and 48 deletions
CNLiveUserAgreementManager.podspec
CNLiveUserAgreementManager/Classes/CNUserAgreementManager.h
CNLiveUserAgreementManager/Classes/CNUserAgreementManager.m
Example/CNLiveUserAgreementManager.xcodeproj/project.pbxproj
Example/Podfile
@@ -40,7 +40,7 @@ TODO: Add long description of the pod here.
   # s.frameworks = 'UIKit', 'MapKit'
   # s.dependency 'AFNetworking', '~> 2.3'
   s.dependency 'CNLiveRequestBastKit'
-  s.dependency 'CNLiveEnvironmentConfiguration'
+  s.dependency 'CNLiveEnvironment'
  
  
 end
@@ -10,22 +10,22 @@
  
 NS_ASSUME_NONNULL_BEGIN
 typedef enum {
-    CNAgreementUser               = 1001,//用户协议
-    CNAgreementPrivacy            = 1002,//隐私政策
-    CNAgreementHelp               = 1003,//帮助与反馈
-    CNAgreementUnderstand         = 1004,//使用手册
-    CNAgreementIntroduction       = 1005,//应用简介
-    CNAgreementCopyright          = 1006,//版权信息
-    CNAgreementPermission         = 1007,//软件许可及服务协议
-    CNAgreementIntegralRules      = 1008,//积分规则
-    CNAgreementSigninRules        = 1009,//签到奖励规则
-    CNAgreementReviewApply        = 1010,//复核申请
-    CNAgreementCancellation       = 1011,//注销协议
-    CNAgreementEmojiService       = 1012,//表情包服务说明
-    CNAgreementEmojiComplaints    = 1013,//表情包投诉说明
+    CNAgreementUser                       = 1001,//用户协议
+    CNAgreementPrivacy                    = 1002,//隐私政策
+    CNAgreementHelp                       = 1003,//帮助与反馈
+    CNAgreementUnderstand                 = 1004,//使用手册
+    CNAgreementIntroduction               = 1005,//应用简介
+    CNAgreementCopyright                  = 1006,//版权信息
+    CNAgreementPermission                 = 1007,//软件许可及服务协议
+    CNAgreementIntegralRules              = 1008,//积分规则
+    CNAgreementSigninRules                = 1009,//签到奖励规则
+    CNAgreementReviewApply                = 1010,//复核申请
+    CNAgreementCancellation               = 1011,//注销协议
+    CNAgreementEmojiService               = 1012,//表情包服务说明
+    CNAgreementEmojiComplaints            = 1013,//表情包投诉说明
     CNAgreementEnterpriseQualification    = 1014,//企业资质
-    
-    
+    CNAgreementBuyAudio                   = 1015,//购买音频协议
+
 } CNGetAgreementH5Type;
  
 typedef void(^SuccessBlock)(NSString *h5,NSString *title);
@@ -34,6 +34,8 @@ typedef void(^FailureBlock)(NSError *error);
 @interface CNUserAgreementManager : NSObject
 + (void)getAgreementH5WithType:(CNGetAgreementH5Type)type success:(SuccessBlock)success failure:(FailureBlock)failure;
  
++ (void)jumpToAgreementWebWithType:(CNGetAgreementH5Type)type;
+
 @end
  
 NS_ASSUME_NONNULL_END
@@ -8,7 +8,7 @@
  
 #import "CNUserAgreementManager.h"
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
-#import "CNLiveEnvironmentConfiguration.h"
+#import "CNLiveEnvironment.h"
  
 @interface CNUserAgreementManager()
  
@@ -202,6 +202,16 @@ static CNUserAgreementManager *_instance = nil;
                             }
                         }
                             break;
+                        case CNAgreementBuyAudio:
+                        {
+                            if ([[NSString stringWithFormat:@"%@",dic[@"type"]] isEqualToString:@"ypxy"]) {
+                                if (success) {
+                                    success(dic[@"detailUrl"],dic[@"title"]);
+                                    return ;
+                                }
+                            }
+                        }
+                            break;
                         default:
                             break;
                     }
@@ -228,4 +238,23 @@ static CNUserAgreementManager *_instance = nil;
  
 }
  
+
++ (void)jumpToAgreementWebWithType:(CNGetAgreementH5Type)type{
+    
+    __weak typeof(self) weakSelf = self;
+    [[CNUserAgreementManager shared] getAgreementH5WithType:type success:^(NSString * _Nonnull h5, NSString * _Nonnull title) {
+        __strong typeof(self) strongSelf = weakSelf;
+
+        
+    } failure:^(NSError * _Nonnull error) {
+        __strong typeof(self) strongSelf = weakSelf;
+
+        if(TestEnvironment){
+            NSLog(@"获取协议请求失败");
+        }
+        
+    }];
+    
+}
+
 @end
@@ -226,7 +226,6 @@
 				6003F5AA195388D20070C39A /* Sources */,
 				6003F5AB195388D20070C39A /* Frameworks */,
 				6003F5AC195388D20070C39A /* Resources */,
-				D2AAC06DA362E1B3EB74E364 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -306,8 +305,9 @@
 			inputFileListPaths = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-CNLiveUserAgreementManager_Example/Pods-CNLiveUserAgreementManager_Example-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveUserAgreementManager_Example/Pods-CNLiveUserAgreementManager_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.framework",
 			);
@@ -316,12 +316,13 @@
 			);
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserAgreementManager.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CNLiveUserAgreementManager_Example/Pods-CNLiveUserAgreementManager_Example-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveUserAgreementManager_Example/Pods-CNLiveUserAgreementManager_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		888A51F7B3A7616D53247CA7 /* [CP] Check Pods Manifest.lock */ = {
@@ -368,30 +369,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D2AAC06DA362E1B3EB74E364 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-CNLiveUserAgreementManager_Tests/Pods-CNLiveUserAgreementManager_Tests-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CNLiveUserAgreementManager_Tests/Pods-CNLiveUserAgreementManager_Tests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
  
 /* Begin PBXSourcesBuildPhase section */
@@ -6,13 +6,9 @@ platform :ios, &#39;9.0&#39;
  
 target 'CNLiveUserAgreementManager_Example' do
   pod 'CNLiveUserAgreementManager', :path => '../'
-  pod 'CNLiveRequestBastKit'
-  pod 'CNLiveEnvironmentConfiguration'
  
   target 'CNLiveUserAgreementManager_Tests' do
     inherit! :search_paths
-    pod 'CNLiveRequestBastKit'
-    pod 'CNLiveEnvironmentConfiguration'
  
   end
 end