提交0.1.1

梁星国
1 parent b2a0b938
Showing 5 changed files with 55 additions and 6 deletions
CNLiveImagePickerController.podspec
Example/CNLiveImagePickerController.xcodeproj/project.pbxproj
Example/CNLiveImagePickerController/CNLiveImagePickerController-Info.plist
Example/CNLiveImagePickerController/CNLiveViewController.m
Example/Podfile
@@ -28,7 +28,7 @@ TODO: Add long description of the pod here.
   s.source           = { :git => 'http://bj.gitlab.cnlive.com/ios-team/CNLiveImagePickerController.git', :tag => s.version.to_s }
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
  
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '9.0'
  
   s.requires_arc = true
   s.resources    = "CNLiveImagePickerController/Classes/*.{png,bundle}"
@@ -41,8 +41,8 @@ TODO: Add long description of the pod here.
  
   # s.public_header_files = 'Pod/Classes/**/*.h'
   # s.frameworks = 'UIKit', 'MapKit'
-  s.dependency 'CNLiveBaseKit'
-#  s.dependency 'CNLiveUploadManager'
+    s.dependency 'CNLiveBaseKit'
+ # s.dependency 'CNLiveUploadManager'
  
  
  
@@ -305,11 +305,17 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-CNLiveImagePickerController_Example/Pods-CNLiveImagePickerController_Example-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
+				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -28,6 +28,31 @@
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
+    
+    <key>NSBluetoothAlwaysUsageDescription</key>
+    <string>需要允许开启蓝牙才能对音箱使用配对及配网功能</string>
+    <key>NSBluetoothPeripheralUsageDescription</key>
+    <string>需要允许开启蓝牙才能对音箱使用配对及配网功能</string>
+    <key>NSCameraUsageDescription</key>
+    <string>需要允许开启相机才能在发布生活圈或聊天时使用录制视频和拍照功能</string>
+    <key>NSContactsUsageDescription</key>
+    <string>需要允许访问通讯录才能获取手机联系人中的网家家用户</string>
+    <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+    <string>需要允许使用您的位置信息才能获取您所在的城市</string>
+    <key>NSLocationAlwaysUsageDescription</key>
+    <string>需要允许使用您的位置信息才能获取您所在的城市</string>
+    <key>NSLocationWhenInUseUsageDescription</key>
+    <string>需要允许使用您的位置信息才能获取您所在的城市</string>
+    <key>NSMicrophoneUsageDescription</key>
+    <string>需要允许开启麦克风才能使用录制视频和语音等服务</string>
+    <key>NSMotionUsageDescription</key>
+    <string>需要允许访问运动与健身才能在参加线上跑步赛事时记录您的步数信息</string>
+    
+    <key>NSPhotoLibraryAddUsageDescription</key>
+    <string></string>
+    <key>NSPhotoLibraryUsageDescription</key>
+    <string>需要允许打开相册才能访问相册照片和保存照片</string>
+
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
@@ -7,8 +7,9 @@
 //
  
 #import "CNLiveViewController.h"
+#import "CNImagePickerManager.h"
  
-@interface CNLiveViewController ()
+@interface CNLiveViewController ()<TZImagePickerControllerDelegate>
  
 @end
  
@@ -18,6 +19,23 @@
 {
     [super viewDidLoad];
 	// Do any additional setup after loading the view, typically from a nib.
+    UIButton *button  = [UIButton buttonWithType:UIButtonTypeCustom];
+    [self.view addSubview:button];
+    [button setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+    button.backgroundColor = [UIColor yellowColor];
+    button.frame = CGRectMake(50, 50, 100, 100);
+    [button setTitle:@"相册" forState:UIControlStateNormal];
+    [button addTarget:self action:@selector(buttonAction:) forControlEvents:UIControlEventTouchUpInside];
+    
+    
+}
+
+- (void)buttonAction:(UIButton *)sender {
+    
+    [CNImagePickerManager ImagePickerWithMaxImagesCount:9 columnNumber:4 delegate:self pushPhotoPickerVc:YES isSelectOriginalPhoto:nil selectedAssets:nil enterType:CNImagePickerEnterTypeFriendsCircle pickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
+        
+    }];
+    
 }
  
 - (void)didReceiveMemoryWarning
@@ -2,12 +2,12 @@ use_frameworks!
 source 'https://github.com/CocoaPods/Specs.git'
 source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
  
-platform :ios, '8.0'
+platform :ios, '9.0'
  
 target 'CNLiveImagePickerController_Example' do
   pod 'CNLiveImagePickerController', :path => '../'
  
-  #pod 'CNLiveBaseKit'
+#  pod 'CNLiveBaseKit'
  
   target 'CNLiveImagePickerController_Tests' do
     inherit! :search_paths