iOS Team / CNLiveBMineModule · Commits

Commit 4c0cc949405c3b0e37e157fd2c1e30aa398d59e7

Authored by daojian
1 parent c7f8e099

0.0.7 替换IM

Inline Side-by-side
Showing 4 changed files with 10 additions and 9 deletions
CNLiveBMineModule.podspec
  View file @4c0cc94
@@ -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 = 'CNLiveBMineModule' 10 s.name = 'CNLiveBMineModule'
11 - s.version = '0.0.6' 11 + s.version = '0.0.7'
12 s.summary = 'CNLiveBMineModule.' 12 s.summary = 'CNLiveBMineModule.'
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.
@@ -107,7 +107,7 @@ TODO: 网家家企业版-我的模块. @@ -107,7 +107,7 @@ TODO: 网家家企业版-我的模块.
107 s.dependency 'CNLiveBaseClass' 107 s.dependency 'CNLiveBaseClass'
108 108
109 # IM 109 # IM
110 - s.dependency 'CNLiveIMBaseSDK' 110 + s.dependency 'CNLiveNewIMAManagerKit'
111 111
112 # 类别 112 # 类别
113 s.dependency 'CNLiveCategory' 113 s.dependency 'CNLiveCategory'
CNLiveBMineModule/Classes/Setting/Controller/CNLiveSettingController.m
  View file @4c0cc94
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 #import <MJExtension/MJExtension.h> 17 #import <MJExtension/MJExtension.h>
18 #import <SDWebImage/SDWebImage.h> 18 #import <SDWebImage/SDWebImage.h>
19 #import <QMUIKit/QMUIKit.h> 19 #import <QMUIKit/QMUIKit.h>
20 -#import <CNLiveIMBaseSDK/TIMAdapter.h> 20 +#import <CNLiveNewIMAManagerKit/CNLiveNewIMAManagerKit.h>
21 #import <CNLiveBaseKit/CNLiveBaseKit.h> 21 #import <CNLiveBaseKit/CNLiveBaseKit.h>
22 22
23 //#import "CommonLibrary.h" 23 //#import "CommonLibrary.h"
CNLiveBMineModule/Classes/UserInfo/CNLiveInfoUpdateController.m
  View file @4c0cc94
@@ -25,8 +25,7 @@ @@ -25,8 +25,7 @@
25 #import <CNLiveBaseKit/NSString+CNLiveExtension.h> 25 #import <CNLiveBaseKit/NSString+CNLiveExtension.h>
26 #import <CNLiveCommonCategory/UIImage+Common.h> 26 #import <CNLiveCommonCategory/UIImage+Common.h>
27 #import <CNLiveManager/CNLiveManager.h> 27 #import <CNLiveManager/CNLiveManager.h>
28 -#import <CNLiveIMBaseSDK/TIMAdapter.h>  
29 -#import <CNLiveIMBaseSDK/CommonLibrary.h> 28 +#import <CNLiveNewIMAManagerKit/CNLiveNewIMAManagerKit.h>
30 29
31 #import <CNLiveCategory/CNLiveCategory.h> 30 #import <CNLiveCategory/CNLiveCategory.h>
32 #import <CNLiveCustomControl/CNLiveNavigationBar.h> 31 #import <CNLiveCustomControl/CNLiveNavigationBar.h>
Example/CNLiveBMineModule.xcodeproj/project.pbxproj
  View file @4c0cc94
@@ -334,7 +334,6 @@ @@ -334,7 +334,6 @@
334 "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework", 334 "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
335 "${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework", 335 "${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework",
336 "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework", 336 "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
337 - "${BUILT_PRODUCTS_DIR}/CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.framework",  
338 "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework", 337 "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
339 "${BUILT_PRODUCTS_DIR}/CNLiveCacheManagerKit/CNLiveCacheManagerKit.framework", 338 "${BUILT_PRODUCTS_DIR}/CNLiveCacheManagerKit/CNLiveCacheManagerKit.framework",
340 "${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework", 339 "${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
@@ -342,7 +341,6 @@ @@ -342,7 +341,6 @@
342 "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework", 341 "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
343 "${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework", 342 "${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework",
344 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", 343 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
345 - "${BUILT_PRODUCTS_DIR}/CNLiveIMBaseSDK/CNLiveIMBaseSDK.framework",  
346 "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework", 344 "${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
347 "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework", 345 "${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework",
348 "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework", 346 "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework",
@@ -360,11 +358,13 @@ @@ -360,11 +358,13 @@
360 "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework", 358 "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
361 "${PODS_ROOT}/TXIMSDK_iOS/ImSDK.framework", 359 "${PODS_ROOT}/TXIMSDK_iOS/ImSDK.framework",
362 "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", 360 "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework",
  361 + "${BUILT_PRODUCTS_DIR}/YBImageBrowser/YBImageBrowser.framework",
363 "${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework", 362 "${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework",
364 "${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework", 363 "${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework",
365 "${BUILT_PRODUCTS_DIR}/YYCategories/YYCategories.framework", 364 "${BUILT_PRODUCTS_DIR}/YYCategories/YYCategories.framework",
366 "${BUILT_PRODUCTS_DIR}/YYDispatchQueuePool/YYDispatchQueuePool.framework", 365 "${BUILT_PRODUCTS_DIR}/YYDispatchQueuePool/YYDispatchQueuePool.framework",
367 "${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework", 366 "${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
  367 + "${BUILT_PRODUCTS_DIR}/YYKeyboardManager/YYKeyboardManager.framework",
368 "${BUILT_PRODUCTS_DIR}/YYModel/YYModel.framework", 368 "${BUILT_PRODUCTS_DIR}/YYModel/YYModel.framework",
369 "${BUILT_PRODUCTS_DIR}/YYText/YYText.framework", 369 "${BUILT_PRODUCTS_DIR}/YYText/YYText.framework",
370 "${BUILT_PRODUCTS_DIR}/YYWebImage/YYWebImage.framework", 370 "${BUILT_PRODUCTS_DIR}/YYWebImage/YYWebImage.framework",
@@ -377,7 +377,6 @@ @@ -377,7 +377,6 @@
377 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework", 377 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
378 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework", 378 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework",
379 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework", 379 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
380 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessBaseModule.framework",  
381 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework", 380 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
382 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCacheManagerKit.framework", 381 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCacheManagerKit.framework",
383 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework", 382 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
@@ -385,7 +384,6 @@ @@ -385,7 +384,6 @@
385 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework", 384 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
386 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework", 385 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework",
387 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", 386 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
388 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveIMBaseSDK.framework",  
389 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework", 387 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
390 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework", 388 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework",
391 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework", 389 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework",
@@ -403,11 +401,13 @@ @@ -403,11 +401,13 @@
403 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework", 401 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
404 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ImSDK.framework", 402 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ImSDK.framework",
405 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", 403 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework",
  404 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YBImageBrowser.framework",
406 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework", 405 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework",
407 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework", 406 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework",
408 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCategories.framework", 407 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCategories.framework",
409 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYDispatchQueuePool.framework", 408 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYDispatchQueuePool.framework",
410 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework", 409 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
  410 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKeyboardManager.framework",
411 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYModel.framework", 411 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYModel.framework",
412 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework", 412 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework",
413 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYWebImage.framework", 413 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYWebImage.framework",
@@ -426,6 +426,7 @@ @@ -426,6 +426,7 @@
426 "${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-resources.sh", 426 "${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-resources.sh",
427 "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBMineModule/CNLiveBMineModule.bundle", 427 "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBMineModule/CNLiveBMineModule.bundle",
428 "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBUserAgreement/CNLiveBUserAgreement.bundle", 428 "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBUserAgreement/CNLiveBUserAgreement.bundle",
  429 + "${PODS_CONFIGURATION_BUILD_DIR}/CNLivePhotoBrowser/CNLivePhotoBrowser.bundle",
429 "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle", 430 "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle",
430 "${PODS_ROOT}/Weibo_SDK/libWeiboSDK/WeiboSDK.bundle", 431 "${PODS_ROOT}/Weibo_SDK/libWeiboSDK/WeiboSDK.bundle",
431 ); 432 );
@@ -433,6 +434,7 @@ @@ -433,6 +434,7 @@
433 outputPaths = ( 434 outputPaths = (
434 "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBMineModule.bundle", 435 "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBMineModule.bundle",
435 "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBUserAgreement.bundle", 436 "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBUserAgreement.bundle",
  437 + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLivePhotoBrowser.bundle",
436 "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle", 438 "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveShareToolKit.bundle",
437 "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle", 439 "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle",
438 ); 440 );