iOS Team / CNLiveCommuntyModule · Commits

Commit cf2279619b612c072158c1844d34d312dd930fa9

Authored by liushiyu
2 parents b646ff99 babffa31

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveCommuntyModule 

# Conflicts:
#	CNLiveCommuntyModule.podspec
Inline Side-by-side
Showing 5 changed files with 9 additions and 3 deletions
CNLiveCommuntyModule.podspec
  View file @cf22796
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveCommuntyModule'
11   - s.version = '0.2.6'
  11 + s.version = '0.2.8'
12 12 s.summary = 'A short description of CNLiveCommuntyModule.'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntEvaluaViewController.m
  View file @cf22796
... ... @@ -338,7 +338,7 @@
338 338 {
339 339 CNImagePickerController *imagePickerVc = [[CNImagePickerController alloc] initWithMaxImagesCount:3 columnNumber:3 delegate:self pushPhotoPickerVc:YES];
340 340 imagePickerVc.modalPresentationStyle = UIModalPresentationFullScreen;
341   - [imagePickerVc configTZImagePicker];//配置
  341 + [imagePickerVc configCNTZImagePicker];//配置
342 342 imagePickerVc.isSelectOriginalPhoto = NO;//是否选择原图
343 343 // 1.设置目前已经选中的图片数组
344 344 imagePickerVc.selectedAssets = self.assetsArray;
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntInformViewController.m
  View file @cf22796
... ... @@ -7,7 +7,7 @@
7 7  
8 8 #import "CNLiveCommuntInformViewController.h"
9 9  
10   -@interface CNLiveCommuntInformViewController ()<UITableViewDelegate,UITableViewDataSource,CNLiveCommuntSubInputTableViewDelegate,TZImagePickerControllerDelegate,UINavigationControllerDelegate,UIImagePickerControllerDelegate>
  10 +@interface CNLiveCommuntInformViewController ()<UITableViewDelegate,UITableViewDataSource,CNLiveCommuntSubInputTableViewDelegate,CNTZImagePickerControllerDelegate,UINavigationControllerDelegate,UIImagePickerControllerDelegate>
11 11 @property (nonatomic, strong) NSMutableArray * dataSource;
12 12 @property (nonatomic, strong) NSMutableArray * dataArray;
13 13 @property (nonatomic, strong) NSMutableArray * imageArray;
... ...
Example/CNLiveCommuntyModule.xcodeproj/project.pbxproj
  View file @cf22796
... ... @@ -418,6 +418,7 @@
418 418 "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
419 419 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
420 420 "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
  421 + "${BUILT_PRODUCTS_DIR}/TZImagePickerController/TZImagePickerController.framework",
421 422 "${BUILT_PRODUCTS_DIR}/YBImageBrowser/YBImageBrowser.framework",
422 423 "${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework",
423 424 "${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework",
... ... @@ -464,6 +465,7 @@
464 465 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
465 466 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
466 467 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
  468 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TZImagePickerController.framework",
467 469 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YBImageBrowser.framework",
468 470 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework",
469 471 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework",
... ...
README.md
  View file @cf22796
... ... @@ -27,3 +27,7 @@ woshiliushiyu, 1010530278@qq.com
27 27 ## License
28 28  
29 29 CNLiveCommuntyModule is available under the MIT license. See the LICENSE file for more info.
  30 +
  31 +##推送
  32 +pod repo push CNLiveRepos CNLiveCommuntyModule.podspec --verbose --use-libraries --skip-import-validation --allow-warnings
  33 +
... ...