提交0.1.5

梁星国
1 parent 45812d8d
Showing 5 changed files with 11 additions and 53 deletions
CNLiveAVCamera.podspec
CNLiveAVCamera/Classes/XFCameraController.h
CNLiveAVCamera/Classes/XFCameraController.m
Example/CNLiveAVCamera.xcodeproj/project.pbxproj
Example/Podfile
@@ -8,7 +8,7 @@
  
 Pod::Spec.new do |s|
   s.name             = 'CNLiveAVCamera'
-  s.version          = '0.1.4'
+  s.version          = '0.1.5'
   s.summary          = '自定义相机'
  
 # This description is used to generate tags and improve search results.
@@ -31,7 +31,7 @@ typedef void(^ZXShootCompletionBlock)(PHAsset *asset,NSURL *videoUrl, CGFloat vi
 @end
  
 @interface UIImage (XFCamera)
-+ (UIImage *)imageNamedFromMyBundle:(NSString *)name;
++ (UIImage *)xf_imageNamedFromMyBundle:(NSString *)name;
 @end
  
  
@@ -67,7 +67,7 @@
  
 @implementation UIImage (XFCamera)
  
-+ (UIImage *)imageNamedFromMyBundle:(NSString *)name {
++ (UIImage *)xf_imageNamedFromMyBundle:(NSString *)name {
     NSBundle *imageBundle = [NSBundle xf_cameraBundle];
     name = [name stringByAppendingString:@"@2x"];
     NSString *imagePath = [imageBundle pathForResource:name ofType:@"png"];
@@ -643,7 +643,7 @@ typedef void(^PropertyChangeBlock)(AVCaptureDevice *captureDevice);
     if (!_rotateCameraButton)
     {
         _rotateCameraButton = [[UIButton alloc] init];
-        [_rotateCameraButton setImage:[UIImage imageNamedFromMyBundle:@"fb_xiangji"] forState:UIControlStateNormal];
+        [_rotateCameraButton setImage:[UIImage xf_imageNamedFromMyBundle:@"fb_xiangji"] forState:UIControlStateNormal];
         [_rotateCameraButton addTarget:self action:@selector(rotateCameraBtnFunc:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _rotateCameraButton;
@@ -654,8 +654,8 @@ typedef void(^PropertyChangeBlock)(AVCaptureDevice *captureDevice);
     if (!_flashButton)
     {
         _flashButton = [[UIButton alloc] init];
-        [_flashButton setImage:[UIImage imageNamedFromMyBundle:@"gz_shoudian"] forState:UIControlStateNormal];
-        [_flashButton setImage:[UIImage imageNamedFromMyBundle:@"gz_shoudian2"] forState:UIControlStateSelected];
+        [_flashButton setImage:[UIImage xf_imageNamedFromMyBundle:@"gz_shoudian"] forState:UIControlStateNormal];
+        [_flashButton setImage:[UIImage xf_imageNamedFromMyBundle:@"gz_shoudian2"] forState:UIControlStateSelected];
         [_flashButton addTarget:self action:@selector(flashBtnFunc:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _flashButton;
@@ -677,7 +677,7 @@ typedef void(^PropertyChangeBlock)(AVCaptureDevice *captureDevice);
     if (!_closeButton)
     {
         _closeButton = [[UIButton alloc] init];
-        [_closeButton setImage:[UIImage imageNamedFromMyBundle:@"fb_quxiaoxia"] forState:UIControlStateNormal];
+        [_closeButton setImage:[UIImage xf_imageNamedFromMyBundle:@"fb_quxiaoxia"] forState:UIControlStateNormal];
         [_closeButton addTarget:self action:@selector(closeBtnFunc) forControlEvents:UIControlEventTouchUpInside];
     }
     return _closeButton;
@@ -699,7 +699,7 @@ typedef void(^PropertyChangeBlock)(AVCaptureDevice *captureDevice);
     if (!_focusImageView)
     {
         _focusImageView = [[UIImageView alloc] init];
-        _focusImageView.image = [UIImage imageNamedFromMyBundle:@"sight_video_focus"];
+        _focusImageView.image = [UIImage xf_imageNamedFromMyBundle:@"sight_video_focus"];
     }
     return _focusImageView;
 }
@@ -710,7 +710,7 @@ typedef void(^PropertyChangeBlock)(AVCaptureDevice *captureDevice);
     if (!_cancelButton)
     {
         _cancelButton = [[UIButton alloc] init];
-        [_cancelButton setImage:[UIImage imageNamedFromMyBundle:@"fb_chongpai"] forState:UIControlStateNormal];
+        [_cancelButton setImage:[UIImage xf_imageNamedFromMyBundle:@"fb_chongpai"] forState:UIControlStateNormal];
         [_cancelButton addTarget:self action:@selector(cancelBtnfunc) forControlEvents:UIControlEventTouchUpInside];
     }
     return _cancelButton;
@@ -722,7 +722,7 @@ typedef void(^PropertyChangeBlock)(AVCaptureDevice *captureDevice);
     if (!_confirmButton)
     {
         _confirmButton = [[UIButton alloc] init];
-        [_confirmButton setImage:[UIImage imageNamedFromMyBundle:@"fb_wancheng"] forState:UIControlStateNormal];
+        [_confirmButton setImage:[UIImage xf_imageNamedFromMyBundle:@"fb_wancheng"] forState:UIControlStateNormal];
         [_confirmButton addTarget:self action:@selector(confirmBtnFunc:) forControlEvents:UIControlEventTouchUpInside];
 //        _confirmButton.cs_acceptEventInterval = 2.0f;
  
@@ -226,7 +226,6 @@
 				6003F5AA195388D20070C39A /* Sources */,
 				6003F5AB195388D20070C39A /* Frameworks */,
 				6003F5AC195388D20070C39A /* Resources */,
-				9080C32D0AD68113F8131D42 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -365,48 +364,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveAVCamera_Example/Pods-CNLiveAVCamera_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		9080C32D0AD68113F8131D42 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-CNLiveAVCamera_Tests/Pods-CNLiveAVCamera_Tests-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
-				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
-				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
-				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
-				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
-				"${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveAVCamera_Tests/Pods-CNLiveAVCamera_Tests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		CFC16709BBBEA2470565BEAB /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 #source 'https://github.com/CocoaPods/Specs.git'
+source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
 source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
  
 use_frameworks!