Commit c2e34ed864968e4a54429c10774b73bee1f0a8f8
1 parent
62cddbf8
0.0.6 删除IM
Showing
4 changed files
with
3 additions
and
20 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.5' | 11 | + s.version = '0.0.6' |
| 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. |
| @@ -115,9 +115,6 @@ TODO: 网家家-登录模块. | @@ -115,9 +115,6 @@ TODO: 网家家-登录模块. | ||
| 115 | # 相机 | 115 | # 相机 |
| 116 | s.dependency 'CNLiveAVCamera' | 116 | s.dependency 'CNLiveAVCamera' |
| 117 | 117 | ||
| 118 | - #IM | ||
| 119 | - s.dependency 'CNLiveIMBaseSDK' | ||
| 120 | - | ||
| 121 | s.dependency 'tingyunApp', '~>2.14.0' | 118 | s.dependency 'tingyunApp', '~>2.14.0' |
| 122 | 119 | ||
| 123 | # 分享 | 120 | # 分享 |
CNLiveBLoginModule/Classes/View/CNLiveCompleteInfoView.m
| @@ -21,8 +21,7 @@ | @@ -21,8 +21,7 @@ | ||
| 21 | #import <AVFoundation/AVMediaFormat.h> | 21 | #import <AVFoundation/AVMediaFormat.h> |
| 22 | #import <CNLiveAVCamera/XFCameraController.h> | 22 | #import <CNLiveAVCamera/XFCameraController.h> |
| 23 | #import <CNLiveImagePickerController/CNImagePickerController.h> | 23 | #import <CNLiveImagePickerController/CNImagePickerController.h> |
| 24 | -#import <CNLiveIMBaseSDK/TIMAdapter.h> | ||
| 25 | -#import <CNLiveIMBaseSDK/CommonLibrary.h> | 24 | +//#import <CNLiveNewIMAManagerKit/CNLiveNewIMAManagerKit.h> |
| 26 | #import <CNLiveCategory/CNLiveCategory.h> | 25 | #import <CNLiveCategory/CNLiveCategory.h> |
| 27 | 26 | ||
| 28 | 27 | ||
| @@ -33,7 +32,6 @@ | @@ -33,7 +32,6 @@ | ||
| 33 | @property (nonatomic, weak) UIButton *head; | 32 | @property (nonatomic, weak) UIButton *head; |
| 34 | @property (nonatomic, weak) CNLiveLoginTextField *nickname; | 33 | @property (nonatomic, weak) CNLiveLoginTextField *nickname; |
| 35 | @property (nonatomic, weak) UIButton *next; | 34 | @property (nonatomic, weak) UIButton *next; |
| 36 | -@property (nonatomic, strong) IMALoginParam *loginParam; | ||
| 37 | 35 | ||
| 38 | @end | 36 | @end |
| 39 | @implementation CNLiveCompleteInfoView | 37 | @implementation CNLiveCompleteInfoView |
| @@ -47,7 +45,6 @@ static const NSInteger timeValue = 1.5; | @@ -47,7 +45,6 @@ static const NSInteger timeValue = 1.5; | ||
| 47 | if (self) { | 45 | if (self) { |
| 48 | self.userInteractionEnabled = YES; | 46 | self.userInteractionEnabled = YES; |
| 49 | [self createSubviews:frame]; | 47 | [self createSubviews:frame]; |
| 50 | - _loginParam = [[IMALoginParam alloc] init]; | ||
| 51 | _image = nil; | 48 | _image = nil; |
| 52 | } | 49 | } |
| 53 | return self; | 50 | return self; |
CNLiveBLoginModule/Classes/View/CNLiveLoginView.m
| @@ -18,8 +18,7 @@ | @@ -18,8 +18,7 @@ | ||
| 18 | #import <CNLiveUserManagement/CNUserInfoManager.h> | 18 | #import <CNLiveUserManagement/CNUserInfoManager.h> |
| 19 | #import <CNLiveEnvironment/CNLiveEnvironment.h> | 19 | #import <CNLiveEnvironment/CNLiveEnvironment.h> |
| 20 | #import <CNLiveCategory/CNLiveCategory.h> | 20 | #import <CNLiveCategory/CNLiveCategory.h> |
| 21 | -#import <CNLiveIMBaseSDK/TIMAdapter.h> | ||
| 22 | -#import <CNLiveIMBaseSDK/CommonLibrary.h> | 21 | +//#import <CNLiveNewIMAManagerKit/CNLiveNewIMAManagerKit.h> |
| 23 | #import <CNLiveCustomControl/CNLiveCountDownButton.h> | 22 | #import <CNLiveCustomControl/CNLiveCountDownButton.h> |
| 24 | //#import "XWLoginNotification.h" | 23 | //#import "XWLoginNotification.h" |
| 25 | 24 |
Example/CNLiveBLoginModule.xcodeproj/project.pbxproj
| @@ -312,22 +312,18 @@ | @@ -312,22 +312,18 @@ | ||
| 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", | ||
| 316 | "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework", | 315 | "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework", |
| 317 | - "${BUILT_PRODUCTS_DIR}/CNLiveCacheManagerKit/CNLiveCacheManagerKit.framework", | ||
| 318 | "${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework", | 316 | "${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework", |
| 319 | "${BUILT_PRODUCTS_DIR}/CNLiveChooseCountry/CNLiveChooseCountry.framework", | 317 | "${BUILT_PRODUCTS_DIR}/CNLiveChooseCountry/CNLiveChooseCountry.framework", |
| 320 | "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework", | 318 | "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework", |
| 321 | "${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework", | 319 | "${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework", |
| 322 | "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", | 320 | "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", |
| 323 | - "${BUILT_PRODUCTS_DIR}/CNLiveIMBaseSDK/CNLiveIMBaseSDK.framework", | ||
| 324 | "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", | 321 | "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", |
| 325 | "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework", | 322 | "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework", |
| 326 | "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework", | 323 | "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework", |
| 327 | "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", | 324 | "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", |
| 328 | "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework", | 325 | "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework", |
| 329 | "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", | 326 | "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", |
| 330 | - "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework", | ||
| 331 | "${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework", | 327 | "${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework", |
| 332 | "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", | 328 | "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", |
| 333 | "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework", | 329 | "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework", |
| @@ -336,7 +332,6 @@ | @@ -336,7 +332,6 @@ | ||
| 336 | "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework", | 332 | "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework", |
| 337 | "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", | 333 | "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", |
| 338 | "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework", | 334 | "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework", |
| 339 | - "${PODS_ROOT}/TXIMSDK_iOS/ImSDK.framework", | ||
| 340 | "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", | 335 | "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", |
| 341 | "${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework", | 336 | "${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework", |
| 342 | "${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework", | 337 | "${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework", |
| @@ -355,22 +350,18 @@ | @@ -355,22 +350,18 @@ | ||
| 355 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework", | 350 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework", |
| 356 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework", | 351 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework", |
| 357 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework", | 352 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework", |
| 358 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessBaseModule.framework", | ||
| 359 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework", | 353 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework", |
| 360 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCacheManagerKit.framework", | ||
| 361 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework", | 354 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework", |
| 362 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveChooseCountry.framework", | 355 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveChooseCountry.framework", |
| 363 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework", | 356 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework", |
| 364 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework", | 357 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework", |
| 365 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", | 358 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", |
| 366 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveIMBaseSDK.framework", | ||
| 367 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework", | 359 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework", |
| 368 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework", | 360 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework", |
| 369 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework", | 361 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework", |
| 370 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", | 362 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", |
| 371 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework", | 363 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework", |
| 372 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", | 364 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", |
| 373 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework", | ||
| 374 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework", | 365 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework", |
| 375 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", | 366 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", |
| 376 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework", | 367 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework", |
| @@ -379,7 +370,6 @@ | @@ -379,7 +370,6 @@ | ||
| 379 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework", | 370 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework", |
| 380 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", | 371 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", |
| 381 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework", | 372 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework", |
| 382 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ImSDK.framework", | ||
| 383 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", | 373 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", |
| 384 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework", | 374 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework", |
| 385 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework", | 375 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework", |