Commit 62cddbf833fff35d30b816800c3763a9e1ff38b9
1 parent
1582227a
0.0.5 图片选择器 修改
Showing
3 changed files
with
14 additions
and
10 deletions
CNLiveBLoginModule.podspec
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | 8 | ||
| 9 | Pod::Spec.new do |s| | 9 | Pod::Spec.new do |s| |
| 10 | s.name = 'CNLiveBLoginModule' | 10 | s.name = 'CNLiveBLoginModule' |
| 11 | - s.version = '0.0.4' | 11 | + s.version = '0.0.5' |
| 12 | s.summary = 'CNLiveBLoginModule.' | 12 | s.summary = 'CNLiveBLoginModule.' |
| 13 | 13 | ||
| 14 | # This description is used to generate tags and improve search results. | 14 | # This description is used to generate tags and improve search results. |
| @@ -37,7 +37,7 @@ TODO: 网家家-登录模块. | @@ -37,7 +37,7 @@ TODO: 网家家-登录模块. | ||
| 37 | # ss.source_files = 'CNLiveBLoginModule/Classes/Module/*.{h,m}' | 37 | # ss.source_files = 'CNLiveBLoginModule/Classes/Module/*.{h,m}' |
| 38 | # ss.dependency 'CNLiveBLoginModule/Controller' | 38 | # ss.dependency 'CNLiveBLoginModule/Controller' |
| 39 | # end | 39 | # end |
| 40 | -# | 40 | +# |
| 41 | # # Controller | 41 | # # Controller |
| 42 | # s.subspec 'Controller' do |ss| | 42 | # s.subspec 'Controller' do |ss| |
| 43 | # ss.source_files = 'CNLiveBLoginModule/Classes/Controller/*.{h,m}' | 43 | # ss.source_files = 'CNLiveBLoginModule/Classes/Controller/*.{h,m}' |
| @@ -45,18 +45,18 @@ TODO: 网家家-登录模块. | @@ -45,18 +45,18 @@ TODO: 网家家-登录模块. | ||
| 45 | # ss.dependency 'CNLiveBLoginModule/Model' | 45 | # ss.dependency 'CNLiveBLoginModule/Model' |
| 46 | # ss.dependency 'CNLiveBLoginModule/ThreeLogin' | 46 | # ss.dependency 'CNLiveBLoginModule/ThreeLogin' |
| 47 | # end | 47 | # end |
| 48 | -# | 48 | +# |
| 49 | # # View | 49 | # # View |
| 50 | # s.subspec 'View' do |ss| | 50 | # s.subspec 'View' do |ss| |
| 51 | # ss.source_files = 'CNLiveBLoginModule/Classes/View/*.{h,m}' | 51 | # ss.source_files = 'CNLiveBLoginModule/Classes/View/*.{h,m}' |
| 52 | # ss.dependency 'CNLiveBLoginModule/Model' | 52 | # ss.dependency 'CNLiveBLoginModule/Model' |
| 53 | # end | 53 | # end |
| 54 | -# | 54 | +# |
| 55 | # # Model | 55 | # # Model |
| 56 | # s.subspec 'Model' do |ss| | 56 | # s.subspec 'Model' do |ss| |
| 57 | # ss.source_files = 'CNLiveBLoginModule/Classes/Model/*.{h,m}' | 57 | # ss.source_files = 'CNLiveBLoginModule/Classes/Model/*.{h,m}' |
| 58 | # end | 58 | # end |
| 59 | -# | 59 | +# |
| 60 | # s.subspec 'ThreeLogin' do |ss| | 60 | # s.subspec 'ThreeLogin' do |ss| |
| 61 | # ss.source_files = 'CNLiveBLoginModule/Classes/ThreeLogin/*.{h,m}' | 61 | # ss.source_files = 'CNLiveBLoginModule/Classes/ThreeLogin/*.{h,m}' |
| 62 | # ss.dependency 'CNLiveBLoginModule/View' | 62 | # ss.dependency 'CNLiveBLoginModule/View' |
CNLiveBLoginModule/Classes/View/CNLiveCompleteInfoView.m
| @@ -20,13 +20,13 @@ | @@ -20,13 +20,13 @@ | ||
| 20 | #import <AVFoundation/AVCaptureDevice.h> | 20 | #import <AVFoundation/AVCaptureDevice.h> |
| 21 | #import <AVFoundation/AVMediaFormat.h> | 21 | #import <AVFoundation/AVMediaFormat.h> |
| 22 | #import <CNLiveAVCamera/XFCameraController.h> | 22 | #import <CNLiveAVCamera/XFCameraController.h> |
| 23 | -#import <CNLiveImagePickerController/TZImagePickerController.h> | 23 | +#import <CNLiveImagePickerController/CNImagePickerController.h> |
| 24 | #import <CNLiveIMBaseSDK/TIMAdapter.h> | 24 | #import <CNLiveIMBaseSDK/TIMAdapter.h> |
| 25 | #import <CNLiveIMBaseSDK/CommonLibrary.h> | 25 | #import <CNLiveIMBaseSDK/CommonLibrary.h> |
| 26 | #import <CNLiveCategory/CNLiveCategory.h> | 26 | #import <CNLiveCategory/CNLiveCategory.h> |
| 27 | 27 | ||
| 28 | 28 | ||
| 29 | -@interface CNLiveCompleteInfoView()<UITextFieldDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate,QMUIAlertControllerDelegate>{ | 29 | +@interface CNLiveCompleteInfoView()<UITextFieldDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate,QMUIAlertControllerDelegate>{ |
| 30 | UIImage *_image; | 30 | UIImage *_image; |
| 31 | } | 31 | } |
| 32 | 32 | ||
| @@ -188,7 +188,7 @@ static const NSInteger timeValue = 1.5; | @@ -188,7 +188,7 @@ static const NSInteger timeValue = 1.5; | ||
| 188 | [CNLiveAuthorizationManager getPHAuthorizationStatus:^{ | 188 | [CNLiveAuthorizationManager getPHAuthorizationStatus:^{ |
| 189 | __strong typeof(weakSelf) strongSelf = weakSelf; | 189 | __strong typeof(weakSelf) strongSelf = weakSelf; |
| 190 | if(!strongSelf) return ; | 190 | if(!strongSelf) return ; |
| 191 | - TZImagePickerController *picker = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:strongSelf]; | 191 | + CNImagePickerController *picker = [[CNImagePickerController alloc] initWithMaxImagesCount:1 delegate:strongSelf]; |
| 192 | picker.modalPresentationStyle = UIModalPresentationFullScreen; | 192 | picker.modalPresentationStyle = UIModalPresentationFullScreen; |
| 193 | picker.allowPickingVideo = NO; | 193 | picker.allowPickingVideo = NO; |
| 194 | picker.allowPreview = NO; | 194 | picker.allowPreview = NO; |
Example/CNLiveBLoginModule.xcodeproj/project.pbxproj
| @@ -312,6 +312,7 @@ | @@ -312,6 +312,7 @@ | ||
| 312 | "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework", | 312 | "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework", |
| 313 | "${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework", | 313 | "${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework", |
| 314 | "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework", | 314 | "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework", |
| 315 | + "${BUILT_PRODUCTS_DIR}/CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.framework", | ||
| 315 | "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework", | 316 | "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework", |
| 316 | "${BUILT_PRODUCTS_DIR}/CNLiveCacheManagerKit/CNLiveCacheManagerKit.framework", | 317 | "${BUILT_PRODUCTS_DIR}/CNLiveCacheManagerKit/CNLiveCacheManagerKit.framework", |
| 317 | "${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework", | 318 | "${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework", |
| @@ -319,11 +320,11 @@ | @@ -319,11 +320,11 @@ | ||
| 319 | "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework", | 320 | "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework", |
| 320 | "${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework", | 321 | "${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework", |
| 321 | "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", | 322 | "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", |
| 323 | + "${BUILT_PRODUCTS_DIR}/CNLiveIMBaseSDK/CNLiveIMBaseSDK.framework", | ||
| 322 | "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", | 324 | "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", |
| 323 | "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework", | 325 | "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework", |
| 324 | "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework", | 326 | "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework", |
| 325 | "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", | 327 | "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", |
| 326 | - "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework", | ||
| 327 | "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework", | 328 | "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework", |
| 328 | "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", | 329 | "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", |
| 329 | "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework", | 330 | "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework", |
| @@ -334,6 +335,7 @@ | @@ -334,6 +335,7 @@ | ||
| 334 | "${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework", | 335 | "${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework", |
| 335 | "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework", | 336 | "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework", |
| 336 | "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", | 337 | "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", |
| 338 | + "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework", | ||
| 337 | "${PODS_ROOT}/TXIMSDK_iOS/ImSDK.framework", | 339 | "${PODS_ROOT}/TXIMSDK_iOS/ImSDK.framework", |
| 338 | "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", | 340 | "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", |
| 339 | "${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework", | 341 | "${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework", |
| @@ -353,6 +355,7 @@ | @@ -353,6 +355,7 @@ | ||
| 353 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework", | 355 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework", |
| 354 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework", | 356 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework", |
| 355 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework", | 357 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework", |
| 358 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessBaseModule.framework", | ||
| 356 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework", | 359 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework", |
| 357 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCacheManagerKit.framework", | 360 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCacheManagerKit.framework", |
| 358 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework", | 361 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework", |
| @@ -360,11 +363,11 @@ | @@ -360,11 +363,11 @@ | ||
| 360 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework", | 363 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework", |
| 361 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework", | 364 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework", |
| 362 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", | 365 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", |
| 366 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveIMBaseSDK.framework", | ||
| 363 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework", | 367 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework", |
| 364 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework", | 368 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework", |
| 365 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework", | 369 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework", |
| 366 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", | 370 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", |
| 367 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework", | ||
| 368 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework", | 371 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework", |
| 369 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", | 372 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", |
| 370 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework", | 373 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework", |
| @@ -375,6 +378,7 @@ | @@ -375,6 +378,7 @@ | ||
| 375 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework", | 378 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework", |
| 376 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework", | 379 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework", |
| 377 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", | 380 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", |
| 381 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework", | ||
| 378 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ImSDK.framework", | 382 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ImSDK.framework", |
| 379 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", | 383 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", |
| 380 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework", | 384 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework", |