iOS Team / CNLiveUserAgreementManager · Commits

Commit fcb27db05052d426dcabb8c31d9c9039dd6073d9

Authored by zhangxiaowen
1 parent a94bbb44

no message

Inline Side-by-side
Showing 2 changed files with 42 additions and 50 deletions
Example/CNLiveUserAgreementManager.xcodeproj/project.pbxproj
  View file @fcb27db
@@ -207,7 +207,7 @@ @@ -207,7 +207,7 @@
207 6003F586195388D20070C39A /* Sources */, 207 6003F586195388D20070C39A /* Sources */,
208 6003F587195388D20070C39A /* Frameworks */, 208 6003F587195388D20070C39A /* Frameworks */,
209 6003F588195388D20070C39A /* Resources */, 209 6003F588195388D20070C39A /* Resources */,
210 - F74E7A0180CFA079F840CE45 /* [CP] Embed Pods Frameworks */, 210 + 48D3F4744AFB84A218C63FC0 /* [CP] Embed Pods Frameworks */,
211 ); 211 );
212 buildRules = ( 212 buildRules = (
213 ); 213 );
@@ -298,29 +298,47 @@ @@ -298,29 +298,47 @@
298 /* End PBXResourcesBuildPhase section */ 298 /* End PBXResourcesBuildPhase section */
299 299
300 /* Begin PBXShellScriptBuildPhase section */ 300 /* Begin PBXShellScriptBuildPhase section */
301 - 888A51F7B3A7616D53247CA7 /* [CP] Check Pods Manifest.lock */ = { 301 + 48D3F4744AFB84A218C63FC0 /* [CP] Embed Pods Frameworks */ = {
302 isa = PBXShellScriptBuildPhase; 302 isa = PBXShellScriptBuildPhase;
303 buildActionMask = 2147483647; 303 buildActionMask = 2147483647;
304 files = ( 304 files = (
305 ); 305 );
306 - inputFileListPaths = (  
307 - );  
308 inputPaths = ( 306 inputPaths = (
309 - "${PODS_PODFILE_DIR_PATH}/Podfile.lock",  
310 - "${PODS_ROOT}/Manifest.lock",  
311 - );  
312 - name = "[CP] Check Pods Manifest.lock";  
313 - outputFileListPaths = ( 307 + "${PODS_ROOT}/Target Support Files/Pods-CNLiveUserAgreementManager_Example/Pods-CNLiveUserAgreementManager_Example-frameworks.sh",
  308 + "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
  309 + "${BUILT_PRODUCTS_DIR}/CNLiveBaseClass/CNLiveBaseClass.framework",
  310 + "${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
  311 + "${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework",
  312 + "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
  313 + "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework",
  314 + "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
  315 + "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
  316 + "${BUILT_PRODUCTS_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.framework",
  317 + "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
  318 + "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
  319 + "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework",
314 ); 320 );
  321 + name = "[CP] Embed Pods Frameworks";
315 outputPaths = ( 322 outputPaths = (
316 - "$(DERIVED_FILE_DIR)/Pods-CNLiveUserAgreementManager_Tests-checkManifestLockResult.txt", 323 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
  324 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseClass.framework",
  325 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
  326 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework",
  327 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
  328 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework",
  329 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
  330 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
  331 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserAgreementManager.framework",
  332 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
  333 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
  334 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework",
317 ); 335 );
318 runOnlyForDeploymentPostprocessing = 0; 336 runOnlyForDeploymentPostprocessing = 0;
319 shellPath = /bin/sh; 337 shellPath = /bin/sh;
320 - 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"; 338 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveUserAgreementManager_Example/Pods-CNLiveUserAgreementManager_Example-frameworks.sh\"\n";
321 showEnvVarsInLog = 0; 339 showEnvVarsInLog = 0;
322 }; 340 };
323 - CA8096650F6267DDF34721DE /* [CP] Check Pods Manifest.lock */ = { 341 + 888A51F7B3A7616D53247CA7 /* [CP] Check Pods Manifest.lock */ = {
324 isa = PBXShellScriptBuildPhase; 342 isa = PBXShellScriptBuildPhase;
325 buildActionMask = 2147483647; 343 buildActionMask = 2147483647;
326 files = ( 344 files = (
@@ -335,51 +353,33 @@ @@ -335,51 +353,33 @@
335 outputFileListPaths = ( 353 outputFileListPaths = (
336 ); 354 );
337 outputPaths = ( 355 outputPaths = (
338 - "$(DERIVED_FILE_DIR)/Pods-CNLiveUserAgreementManager_Example-checkManifestLockResult.txt", 356 + "$(DERIVED_FILE_DIR)/Pods-CNLiveUserAgreementManager_Tests-checkManifestLockResult.txt",
339 ); 357 );
340 runOnlyForDeploymentPostprocessing = 0; 358 runOnlyForDeploymentPostprocessing = 0;
341 shellPath = /bin/sh; 359 shellPath = /bin/sh;
342 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"; 360 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";
343 showEnvVarsInLog = 0; 361 showEnvVarsInLog = 0;
344 }; 362 };
345 - F74E7A0180CFA079F840CE45 /* [CP] Embed Pods Frameworks */ = { 363 + CA8096650F6267DDF34721DE /* [CP] Check Pods Manifest.lock */ = {
346 isa = PBXShellScriptBuildPhase; 364 isa = PBXShellScriptBuildPhase;
347 buildActionMask = 2147483647; 365 buildActionMask = 2147483647;
348 files = ( 366 files = (
349 ); 367 );
  368 + inputFileListPaths = (
  369 + );
350 inputPaths = ( 370 inputPaths = (
351 - "${PODS_ROOT}/Target Support Files/Pods-CNLiveUserAgreementManager_Example/Pods-CNLiveUserAgreementManager_Example-frameworks.sh",  
352 - "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",  
353 - "${BUILT_PRODUCTS_DIR}/CNLiveBaseClass/CNLiveBaseClass.framework",  
354 - "${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",  
355 - "${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework",  
356 - "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",  
357 - "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework",  
358 - "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",  
359 - "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",  
360 - "${BUILT_PRODUCTS_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.framework",  
361 - "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",  
362 - "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",  
363 - "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", 371 + "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
  372 + "${PODS_ROOT}/Manifest.lock",
  373 + );
  374 + name = "[CP] Check Pods Manifest.lock";
  375 + outputFileListPaths = (
364 ); 376 );
365 - name = "[CP] Embed Pods Frameworks";  
366 outputPaths = ( 377 outputPaths = (
367 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",  
368 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseClass.framework",  
369 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",  
370 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework",  
371 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",  
372 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework",  
373 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",  
374 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",  
375 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserAgreementManager.framework",  
376 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",  
377 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",  
378 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", 378 + "$(DERIVED_FILE_DIR)/Pods-CNLiveUserAgreementManager_Example-checkManifestLockResult.txt",
379 ); 379 );
380 runOnlyForDeploymentPostprocessing = 0; 380 runOnlyForDeploymentPostprocessing = 0;
381 shellPath = /bin/sh; 381 shellPath = /bin/sh;
382 - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveUserAgreementManager_Example/Pods-CNLiveUserAgreementManager_Example-frameworks.sh\"\n"; 382 + 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";
383 showEnvVarsInLog = 0; 383 showEnvVarsInLog = 0;
384 }; 384 };
385 /* End PBXShellScriptBuildPhase section */ 385 /* End PBXShellScriptBuildPhase section */
Example/CNLiveUserAgreementManager/CNLiveViewController.m
  View file @fcb27db
@@ -35,15 +35,7 @@ @@ -35,15 +35,7 @@
35 35
36 } 36 }
37 - (void)testButtonClicked { 37 - (void)testButtonClicked {
38 - [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementCancellation];  
39 -// [CNLiveUserAgreementManager jumpToAgreementH5WithString:@"yhxy"];  
40 - [CNLiveUserAgreementManager getAgreementH5WithType:CNLiveUserAgreementCancellation success:^(NSString * _Nonnull h5, NSString * _Nonnull title, BOOL isShow) {  
41 - CNLiveUserAgreementController *vc = [[CNLiveUserAgreementController alloc] initWithUrl:h5 title:title closeHidden:NO];  
42 -// [self.navigationController pushViewController:vc animated:YES];  
43 -  
44 - } failure:^(NSError * _Nonnull error) {  
45 -  
46 - }]; 38 + [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementUnderstand];
47 39
48 } 40 }
49 41