iOS Team / CNLiveUserAgreementManager · Commits

Commit ea64852623bc41b69fe64452f3e670ef1d2e3953

Authored by zhangxiaowen
1 parent ed31012b

no message

Inline Side-by-side
Showing 2 changed files with 29 additions and 29 deletions
CNLiveUserAgreementManager/Classes/CNLiveUserAgreementWebController.m
  View file @ea64852
... ... @@ -108,7 +108,7 @@ static const NSInteger margin = 15;
108 108 UIButton *leftBtn = [UIButton buttonWithType:UIButtonTypeCustom];
109 109 leftBtn.adjustsImageWhenHighlighted = NO;
110 110 leftBtn.frame = CGRectMake(margin, [UIApplication sharedApplication].statusBarFrame.size.height, 44, 44);
111   - UIImage *leftImage = [UIImage cn_getImageName:@"web_black_back" bundleName:@"CNLiveUserAgreementManager" targetClass:[CNLiveUserAgreementWebController class]];
  111 + UIImage *leftImage = [self getImageWithImageName:@"web_black_back" bundleName:@"CNLiveUserAgreementManager" targetClass:[CNLiveUserAgreementWebController class]];
112 112 [leftBtn setImage:[leftImage imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
113 113 [leftBtn addTarget:self action:@selector(goBack) forControlEvents:UIControlEventTouchUpInside];
114 114 [leftBtn setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft];
... ... @@ -117,7 +117,7 @@ static const NSInteger margin = 15;
117 117 UIButton *closeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
118 118 closeBtn.adjustsImageWhenHighlighted = NO;
119 119 closeBtn.frame = CGRectMake(44+margin, [UIApplication sharedApplication].statusBarFrame.size.height, 44, 44);
120   - UIImage *closeImage = [UIImage cn_getImageName:@"web_black_close" bundleName:@"CNLiveUserAgreementManager" targetClass:[CNLiveUserAgreementWebController class]];
  120 + UIImage *closeImage = [self getImageWithImageName:@"web_black_close" bundleName:@"CNLiveUserAgreementManager" targetClass:[CNLiveUserAgreementWebController class]];
121 121 [closeBtn setImage:[closeImage imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
122 122 [closeBtn addTarget:self action:@selector(closeClick) forControlEvents:UIControlEventTouchUpInside];
123 123 [closeBtn setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft];
... ...
Example/CNLiveUserAgreementManager.xcodeproj/project.pbxproj
  View file @ea64852
... ... @@ -207,7 +207,7 @@
207 207 6003F586195388D20070C39A /* Sources */,
208 208 6003F587195388D20070C39A /* Frameworks */,
209 209 6003F588195388D20070C39A /* Resources */,
210   - 5206ABF66D9A6B38AC659600 /* [CP] Embed Pods Frameworks */,
  210 + F74E7A0180CFA079F840CE45 /* [CP] Embed Pods Frameworks */,
211 211 );
212 212 buildRules = (
213 213 );
... ... @@ -298,32 +298,6 @@
298 298 /* End PBXResourcesBuildPhase section */
299 299  
300 300 /* Begin PBXShellScriptBuildPhase section */
301   - 5206ABF66D9A6B38AC659600 /* [CP] Embed Pods Frameworks */ = {
302   - isa = PBXShellScriptBuildPhase;
303   - buildActionMask = 2147483647;
304   - files = (
305   - );
306   - inputPaths = (
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}/CNLiveCategory/CNLiveCategory.framework",
310   - "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
311   - "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
312   - "${BUILT_PRODUCTS_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.framework",
313   - );
314   - name = "[CP] Embed Pods Frameworks";
315   - outputPaths = (
316   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
317   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
318   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
319   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
320   - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserAgreementManager.framework",
321   - );
322   - runOnlyForDeploymentPostprocessing = 0;
323   - shellPath = /bin/sh;
324   - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveUserAgreementManager_Example/Pods-CNLiveUserAgreementManager_Example-frameworks.sh\"\n";
325   - showEnvVarsInLog = 0;
326   - };
327 301 888A51F7B3A7616D53247CA7 /* [CP] Check Pods Manifest.lock */ = {
328 302 isa = PBXShellScriptBuildPhase;
329 303 buildActionMask = 2147483647;
... ... @@ -368,6 +342,32 @@
368 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";
369 343 showEnvVarsInLog = 0;
370 344 };
  345 + F74E7A0180CFA079F840CE45 /* [CP] Embed Pods Frameworks */ = {
  346 + isa = PBXShellScriptBuildPhase;
  347 + buildActionMask = 2147483647;
  348 + files = (
  349 + );
  350 + 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}/CNLiveCategory/CNLiveCategory.framework",
  354 + "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
  355 + "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
  356 + "${BUILT_PRODUCTS_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.framework",
  357 + );
  358 + name = "[CP] Embed Pods Frameworks";
  359 + outputPaths = (
  360 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
  361 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
  362 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
  363 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
  364 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserAgreementManager.framework",
  365 + );
  366 + runOnlyForDeploymentPostprocessing = 0;
  367 + shellPath = /bin/sh;
  368 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveUserAgreementManager_Example/Pods-CNLiveUserAgreementManager_Example-frameworks.sh\"\n";
  369 + showEnvVarsInLog = 0;
  370 + };
371 371 /* End PBXShellScriptBuildPhase section */
372 372  
373 373 /* Begin PBXSourcesBuildPhase section */
... ...