Commit 68b021fe8606995cc5f5892288c743500dcd5050
1 parent
db62e424
首页改版需求0.6.6
Showing
9 changed files
with
123 additions
and
83 deletions
CNLiveVideoClassifyKit.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 = 'CNLiveVideoClassifyKit' | 10 | s.name = 'CNLiveVideoClassifyKit' |
| 11 | - s.version = '0.6.5' | 11 | + s.version = '0.6.6' |
| 12 | s.summary = '视讯头部一二级菜单组件' | 12 | s.summary = '视讯头部一二级菜单组件' |
| 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. |
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/back_home@2x.png
0 → 100644
17.6 KB
CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle/back_home@3x.png
0 → 100644
31.5 KB
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNCategoryBaseViewController.m
| @@ -57,7 +57,6 @@ | @@ -57,7 +57,6 @@ | ||
| 57 | #pragma mark - JXCategoryViewDelegate | 57 | #pragma mark - JXCategoryViewDelegate |
| 58 | - (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index | 58 | - (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index |
| 59 | { | 59 | { |
| 60 | - self.navigationController.interactivePopGestureRecognizer.enabled = (index ==0); | ||
| 61 | self.ld_currentIndex = index; | 60 | self.ld_currentIndex = index; |
| 62 | } | 61 | } |
| 63 | 62 |
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveClassifySegmentController.m
| @@ -23,6 +23,9 @@ static const CGFloat animationHeight = 15; | @@ -23,6 +23,9 @@ static const CGFloat animationHeight = 15; | ||
| 23 | @property (nonatomic, strong)JXCategoryTitleImageView *myCategoryView; //选择器 | 23 | @property (nonatomic, strong)JXCategoryTitleImageView *myCategoryView; //选择器 |
| 24 | @property (nonatomic, strong) UIButton *customChannelsBtn;//频道按钮 | 24 | @property (nonatomic, strong) UIButton *customChannelsBtn;//频道按钮 |
| 25 | @property (nonatomic, strong) UIButton *loginBtn;//登录按钮 | 25 | @property (nonatomic, strong) UIButton *loginBtn;//登录按钮 |
| 26 | + | ||
| 27 | +@property (nonatomic, strong) UIButton *backHomeBtn;// 回到首页 | ||
| 28 | + | ||
| 26 | @property (nonatomic, strong) CNCustomChannelListView *customChannelsV;//频道控制器窗口 | 29 | @property (nonatomic, strong) CNCustomChannelListView *customChannelsV;//频道控制器窗口 |
| 27 | @property (nonatomic, strong) UIView *fuzzyView;//游客登录弹框 | 30 | @property (nonatomic, strong) UIView *fuzzyView;//游客登录弹框 |
| 28 | @property (nonatomic, strong) UIImageView *topBgImg; //头部图片 | 31 | @property (nonatomic, strong) UIImageView *topBgImg; //头部图片 |
| @@ -71,6 +74,16 @@ static const CGFloat animationHeight = 15; | @@ -71,6 +74,16 @@ static const CGFloat animationHeight = 15; | ||
| 71 | [self.view sendSubviewToBack:self.topBgImg]; | 74 | [self.view sendSubviewToBack:self.topBgImg]; |
| 72 | [self.view addSubview:self.indicatorImg]; | 75 | [self.view addSubview:self.indicatorImg]; |
| 73 | [self.view insertSubview:self.indicatorImg belowSubview:self.topBgImg]; | 76 | [self.view insertSubview:self.indicatorImg belowSubview:self.topBgImg]; |
| 77 | + if ([CNLiveEnvironmentManager manager].isNewHomePage) { | ||
| 78 | + [self.view addSubview:self.backHomeBtn]; | ||
| 79 | + [self.view bringSubviewToFront:self.backHomeBtn]; | ||
| 80 | + [self.backHomeBtn mas_makeConstraints:^(MASConstraintMaker *make) { | ||
| 81 | + make.width.height.mas_equalTo(56); | ||
| 82 | + make.right.equalTo(self.view).offset(-9); | ||
| 83 | + make.bottom.equalTo(self.view).offset(-kVerticalBottomSafeHeight - 78); | ||
| 84 | + }]; | ||
| 85 | + } | ||
| 86 | + | ||
| 74 | [self dataDivideIntoNormalAndOtherWithFirst:YES]; | 87 | [self dataDivideIntoNormalAndOtherWithFirst:YES]; |
| 75 | [self handleDateWithChannelsArray]; | 88 | [self handleDateWithChannelsArray]; |
| 76 | 89 | ||
| @@ -216,7 +229,7 @@ static const CGFloat animationHeight = 15; | @@ -216,7 +229,7 @@ static const CGFloat animationHeight = 15; | ||
| 216 | [super viewWillDisappear:animated]; | 229 | [super viewWillDisappear:animated]; |
| 217 | [self quitCustomChannels]; | 230 | [self quitCustomChannels]; |
| 218 | self.navigationController.navigationBarHidden = NO; | 231 | self.navigationController.navigationBarHidden = NO; |
| 219 | - self.navigationController.interactivePopGestureRecognizer.enabled = YES; | 232 | + self.navigationController.interactivePopGestureRecognizer.enabled = NO; |
| 220 | } | 233 | } |
| 221 | - (void)dealloc | 234 | - (void)dealloc |
| 222 | { | 235 | { |
| @@ -357,6 +370,12 @@ static const CGFloat animationHeight = 15; | @@ -357,6 +370,12 @@ static const CGFloat animationHeight = 15; | ||
| 357 | - (void)loginAction:(UIButton *)sender { | 370 | - (void)loginAction:(UIButton *)sender { |
| 358 | [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushLoginVC]; | 371 | [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushLoginVC]; |
| 359 | } | 372 | } |
| 373 | +- (void)backToHomeAction:(UIButton *)sender{ | ||
| 374 | + CATransition* transition = [CATransition animation]; | ||
| 375 | + transition.type = kCATransitionPush; | ||
| 376 | + transition.subtype = kCATransitionFromRight; | ||
| 377 | + [self.navigationController popViewControllerTransition:transition]; | ||
| 378 | +} | ||
| 360 | #pragma mark - Method | 379 | #pragma mark - Method |
| 361 | - (NSInteger)containsWithChannelId:(NSString *)channelId { | 380 | - (NSInteger)containsWithChannelId:(NSString *)channelId { |
| 362 | NSString *normalKey = [NSString stringWithFormat:@"%@_%@",NormalChannelArray,CNUserShareModel.uid]; | 381 | NSString *normalKey = [NSString stringWithFormat:@"%@_%@",NormalChannelArray,CNUserShareModel.uid]; |
| @@ -983,7 +1002,14 @@ static const CGFloat animationHeight = 15; | @@ -983,7 +1002,14 @@ static const CGFloat animationHeight = 15; | ||
| 983 | } | 1002 | } |
| 984 | return _loginBtn; | 1003 | return _loginBtn; |
| 985 | } | 1004 | } |
| 986 | - | 1005 | +- (UIButton *)backHomeBtn{ |
| 1006 | + if (!_backHomeBtn) { | ||
| 1007 | + _backHomeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; | ||
| 1008 | + [_backHomeBtn setImage:[UIImage loadBundleImage:@"back_home"] forState:UIControlStateNormal]; | ||
| 1009 | + [_backHomeBtn addTarget:self action:@selector(backToHomeAction:) forControlEvents:UIControlEventTouchUpInside]; | ||
| 1010 | + } | ||
| 1011 | + return _backHomeBtn; | ||
| 1012 | +} | ||
| 987 | -(NSMutableArray *)imageNames | 1013 | -(NSMutableArray *)imageNames |
| 988 | { | 1014 | { |
| 989 | if (!_imageNames) { | 1015 | if (!_imageNames) { |
| @@ -1037,6 +1063,7 @@ static const CGFloat animationHeight = 15; | @@ -1037,6 +1063,7 @@ static const CGFloat animationHeight = 15; | ||
| 1037 | } | 1063 | } |
| 1038 | return _statusBarColors; | 1064 | return _statusBarColors; |
| 1039 | } | 1065 | } |
| 1066 | + | ||
| 1040 | /* | 1067 | /* |
| 1041 | #pragma mark - Navigation | 1068 | #pragma mark - Navigation |
| 1042 | 1069 |
Example/CNLiveVideoClassifyKit.xcodeproj/project.pbxproj
| @@ -406,7 +406,6 @@ | @@ -406,7 +406,6 @@ | ||
| 406 | "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", | 406 | "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", |
| 407 | "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework", | 407 | "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework", |
| 408 | "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", | 408 | "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", |
| 409 | - "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework", | ||
| 410 | "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", | 409 | "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", |
| 411 | "${BUILT_PRODUCTS_DIR}/JXCategoryView/JXCategoryView.framework", | 410 | "${BUILT_PRODUCTS_DIR}/JXCategoryView/JXCategoryView.framework", |
| 412 | "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", | 411 | "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", |
| @@ -416,6 +415,7 @@ | @@ -416,6 +415,7 @@ | ||
| 416 | "${BUILT_PRODUCTS_DIR}/SDCycleScrollView/SDCycleScrollView.framework", | 415 | "${BUILT_PRODUCTS_DIR}/SDCycleScrollView/SDCycleScrollView.framework", |
| 417 | "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", | 416 | "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", |
| 418 | "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework", | 417 | "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework", |
| 418 | + "${BUILT_PRODUCTS_DIR}/TZImagePickerController/TZImagePickerController.framework", | ||
| 419 | "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", | 419 | "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", |
| 420 | "${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework", | 420 | "${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework", |
| 421 | "${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework", | 421 | "${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework", |
| @@ -443,7 +443,6 @@ | @@ -443,7 +443,6 @@ | ||
| 443 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", | 443 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", |
| 444 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework", | 444 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework", |
| 445 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", | 445 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", |
| 446 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework", | ||
| 447 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", | 446 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", |
| 448 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JXCategoryView.framework", | 447 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JXCategoryView.framework", |
| 449 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", | 448 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", |
| @@ -453,6 +452,7 @@ | @@ -453,6 +452,7 @@ | ||
| 453 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDCycleScrollView.framework", | 452 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDCycleScrollView.framework", |
| 454 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", | 453 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", |
| 455 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework", | 454 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework", |
| 455 | + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TZImagePickerController.framework", | ||
| 456 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", | 456 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", |
| 457 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework", | 457 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework", |
| 458 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework", | 458 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework", |
| @@ -478,7 +478,7 @@ | @@ -478,7 +478,7 @@ | ||
| 478 | "${PODS_ROOT}/Target Support Files/Pods-CNLiveVideoClassifyKit_Example/Pods-CNLiveVideoClassifyKit_Example-resources.sh", | 478 | "${PODS_ROOT}/Target Support Files/Pods-CNLiveVideoClassifyKit_Example/Pods-CNLiveVideoClassifyKit_Example-resources.sh", |
| 479 | "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle", | 479 | "${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle", |
| 480 | "${PODS_ROOT}/../../CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle", | 480 | "${PODS_ROOT}/../../CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle", |
| 481 | - "${PODS_ROOT}/WeiboSDK/libWeiboSDK/WeiboSDK.bundle", | 481 | + "${PODS_ROOT}/Weibo_SDK/libWeiboSDK/WeiboSDK.bundle", |
| 482 | ); | 482 | ); |
| 483 | name = "[CP] Copy Pods Resources"; | 483 | name = "[CP] Copy Pods Resources"; |
| 484 | outputPaths = ( | 484 | outputPaths = ( |
Example/CNLiveVideoClassifyKit/CNLIVEAppDelegate.m
| @@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
| 17 | 17 | ||
| 18 | - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions | 18 | - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions |
| 19 | { | 19 | { |
| 20 | - [CNLiveEnvironmentManager setEnvironment:CNLiveDebugAppStore];//CNLiveDebugAppStore];//CNLiveProductionAppStore//CNLiveTestFlight | 20 | + [CNLiveEnvironmentManager setEnvironment:CNLiveDebugAppStore isNewHomePage:NO];//CNLiveDebugAppStore];//CNLiveProductionAppStore//CNLiveTestFlight |
| 21 | 21 | ||
| 22 | [BHContext shareInstance].application = application; | 22 | [BHContext shareInstance].application = application; |
| 23 | [BHContext shareInstance].launchOptions = launchOptions; | 23 | [BHContext shareInstance].launchOptions = launchOptions; |
Example/Podfile.lock
| 1 | PODS: | 1 | PODS: |
| 2 | - - AFNetworking (4.0.1): | ||
| 3 | - - AFNetworking/NSURLSession (= 4.0.1) | ||
| 4 | - - AFNetworking/Reachability (= 4.0.1) | ||
| 5 | - - AFNetworking/Security (= 4.0.1) | ||
| 6 | - - AFNetworking/Serialization (= 4.0.1) | ||
| 7 | - - AFNetworking/UIKit (= 4.0.1) | ||
| 8 | - - AFNetworking/NSURLSession (4.0.1): | 2 | + - AFNetworking (4.0.0): |
| 3 | + - AFNetworking/NSURLSession (= 4.0.0) | ||
| 4 | + - AFNetworking/Reachability (= 4.0.0) | ||
| 5 | + - AFNetworking/Security (= 4.0.0) | ||
| 6 | + - AFNetworking/Serialization (= 4.0.0) | ||
| 7 | + - AFNetworking/UIKit (= 4.0.0) | ||
| 8 | + - AFNetworking/NSURLSession (4.0.0): | ||
| 9 | - AFNetworking/Reachability | 9 | - AFNetworking/Reachability |
| 10 | - AFNetworking/Security | 10 | - AFNetworking/Security |
| 11 | - AFNetworking/Serialization | 11 | - AFNetworking/Serialization |
| 12 | - - AFNetworking/Reachability (4.0.1) | ||
| 13 | - - AFNetworking/Security (4.0.1) | ||
| 14 | - - AFNetworking/Serialization (4.0.1) | ||
| 15 | - - AFNetworking/UIKit (4.0.1): | 12 | + - AFNetworking/Reachability (4.0.0) |
| 13 | + - AFNetworking/Security (4.0.0) | ||
| 14 | + - AFNetworking/Serialization (4.0.0) | ||
| 15 | + - AFNetworking/UIKit (4.0.0): | ||
| 16 | - AFNetworking/NSURLSession | 16 | - AFNetworking/NSURLSession |
| 17 | - CNLiveBaseKit (0.1.28): | 17 | - CNLiveBaseKit (0.1.28): |
| 18 | - CNLiveNewTripartiteManagement/MJExtension | 18 | - CNLiveNewTripartiteManagement/MJExtension |
| @@ -81,18 +81,19 @@ PODS: | @@ -81,18 +81,19 @@ PODS: | ||
| 81 | - CNLiveCustomControl/NavigationBar (0.0.6): | 81 | - CNLiveCustomControl/NavigationBar (0.0.6): |
| 82 | - CNLiveCategory | 82 | - CNLiveCategory |
| 83 | - CNLiveCustomControl/WebView (0.0.6) | 83 | - CNLiveCustomControl/WebView (0.0.6) |
| 84 | - - CNLiveCustomUI (0.5.7): | 84 | + - CNLiveCustomUI (0.6.0): |
| 85 | - CNLiveBaseKit | 85 | - CNLiveBaseKit |
| 86 | - CNLiveBusinessTools | 86 | - CNLiveBusinessTools |
| 87 | - - CNLiveCustomUI/CNLiveBasicsUI (= 0.5.7) | ||
| 88 | - - CNLiveCustomUI/CNLiveContentToolTextView (= 0.5.7) | ||
| 89 | - - CNLiveCustomUI/CNLiveCycleScrollView (= 0.5.7) | ||
| 90 | - - CNLiveCustomUI/CNLiveGetImage (= 0.5.7) | ||
| 91 | - - CNLiveCustomUI/CNLivePopView (= 0.5.7) | ||
| 92 | - - CNLiveCustomUI/CNLiveRefresh (= 0.5.7) | ||
| 93 | - - CNLiveCustomUI/CNLiveBasicsUI (0.5.7): | 87 | + - CNLiveCustomUI/CNLiveBasicsUI (= 0.6.0) |
| 88 | + - CNLiveCustomUI/CNLiveContentToolTextView (= 0.6.0) | ||
| 89 | + - CNLiveCustomUI/CNLiveCycleScrollView (= 0.6.0) | ||
| 90 | + - CNLiveCustomUI/CNLiveGetImage (= 0.6.0) | ||
| 91 | + - CNLiveCustomUI/CNLivePopView (= 0.6.0) | ||
| 92 | + - CNLiveCustomUI/CNLiveRefresh (= 0.6.0) | ||
| 93 | + - CNLiveCustomUI/CNLiveBasicsUI (0.6.0): | ||
| 94 | - CNLiveBaseKit | 94 | - CNLiveBaseKit |
| 95 | - CNLiveBusinessTools | 95 | - CNLiveBusinessTools |
| 96 | + - CNLiveCommonCategory | ||
| 96 | - CNLiveCustomUI/CNLiveGetImage | 97 | - CNLiveCustomUI/CNLiveGetImage |
| 97 | - CNLiveNewTripartiteManagement/Masonry | 98 | - CNLiveNewTripartiteManagement/Masonry |
| 98 | - CNLiveNewTripartiteManagement/QMUIKit | 99 | - CNLiveNewTripartiteManagement/QMUIKit |
| @@ -105,23 +106,24 @@ PODS: | @@ -105,23 +106,24 @@ PODS: | ||
| 105 | - CNLiveNewTripartiteManagement/YYModel | 106 | - CNLiveNewTripartiteManagement/YYModel |
| 106 | - CNLiveNewTripartiteManagement/YYText | 107 | - CNLiveNewTripartiteManagement/YYText |
| 107 | - CNLiveNewTripartiteManagement/YYWebImage | 108 | - CNLiveNewTripartiteManagement/YYWebImage |
| 108 | - - CNLiveCustomUI/CNLiveContentToolTextView (0.5.7): | 109 | + - TZImagePickerController |
| 110 | + - CNLiveCustomUI/CNLiveContentToolTextView (0.6.0): | ||
| 109 | - CNLiveBaseKit | 111 | - CNLiveBaseKit |
| 110 | - CNLiveBusinessTools | 112 | - CNLiveBusinessTools |
| 111 | - CNLiveNewTripartiteManagement/Masonry | 113 | - CNLiveNewTripartiteManagement/Masonry |
| 112 | - CNLiveNewTripartiteManagement/QMUIKit | 114 | - CNLiveNewTripartiteManagement/QMUIKit |
| 113 | - - CNLiveCustomUI/CNLiveCycleScrollView (0.5.7): | 115 | + - CNLiveCustomUI/CNLiveCycleScrollView (0.6.0): |
| 114 | - CNLiveBaseKit | 116 | - CNLiveBaseKit |
| 115 | - CNLiveBusinessTools | 117 | - CNLiveBusinessTools |
| 116 | - CNLiveNewTripartiteManagement/SDWebImage | 118 | - CNLiveNewTripartiteManagement/SDWebImage |
| 117 | - - CNLiveCustomUI/CNLiveGetImage (0.5.7): | 119 | + - CNLiveCustomUI/CNLiveGetImage (0.6.0): |
| 118 | - CNLiveBaseKit | 120 | - CNLiveBaseKit |
| 119 | - CNLiveBusinessTools | 121 | - CNLiveBusinessTools |
| 120 | - - CNLiveCustomUI/CNLivePopView (0.5.7): | 122 | + - CNLiveCustomUI/CNLivePopView (0.6.0): |
| 121 | - CNLiveBaseKit | 123 | - CNLiveBaseKit |
| 122 | - CNLiveBusinessTools | 124 | - CNLiveBusinessTools |
| 123 | - CNLiveNewTripartiteManagement/QMUIKit | 125 | - CNLiveNewTripartiteManagement/QMUIKit |
| 124 | - - CNLiveCustomUI/CNLiveRefresh (0.5.7): | 126 | + - CNLiveCustomUI/CNLiveRefresh (0.6.0): |
| 125 | - CNLiveBaseKit | 127 | - CNLiveBaseKit |
| 126 | - CNLiveBusinessTools | 128 | - CNLiveBusinessTools |
| 127 | - CNLiveCustomUI/CNLiveGetImage | 129 | - CNLiveCustomUI/CNLiveGetImage |
| @@ -135,58 +137,64 @@ PODS: | @@ -135,58 +137,64 @@ PODS: | ||
| 135 | - CNLiveSDK/CNLiveStat | 137 | - CNLiveSDK/CNLiveStat |
| 136 | - CNLiveUserManagement | 138 | - CNLiveUserManagement |
| 137 | - WebViewJavascriptBridge | 139 | - WebViewJavascriptBridge |
| 138 | - - CNLiveEnvironment (0.3.6) | ||
| 139 | - - CNLiveNewTripartiteManagement/Masonry (0.2.0.6): | 140 | + - CNLiveEnvironment (0.4.5) |
| 141 | + - CNLiveNewTripartiteManagement/AFNetworking (0.2.0.8): | ||
| 142 | + - AFNetworking (= 4.0.0) | ||
| 143 | + - CNLiveNewTripartiteManagement/Masonry (0.2.0.8): | ||
| 140 | - Masonry (= 1.1.0) | 144 | - Masonry (= 1.1.0) |
| 141 | - - CNLiveNewTripartiteManagement/MJExtension (0.2.0.6): | 145 | + - CNLiveNewTripartiteManagement/MJExtension (0.2.0.8): |
| 142 | - MJExtension (= 3.2.1) | 146 | - MJExtension (= 3.2.1) |
| 143 | - - CNLiveNewTripartiteManagement/MJRefresh (0.2.0.6): | 147 | + - CNLiveNewTripartiteManagement/MJRefresh (0.2.0.8): |
| 144 | - MJRefresh (= 3.2.0) | 148 | - MJRefresh (= 3.2.0) |
| 145 | - - CNLiveNewTripartiteManagement/QMUIKit (0.2.0.6): | 149 | + - CNLiveNewTripartiteManagement/QMUIKit (0.2.0.8): |
| 146 | - QMUIKit (= 4.2.1) | 150 | - QMUIKit (= 4.2.1) |
| 147 | - - CNLiveNewTripartiteManagement/SDCycleScrollView (0.2.0.6): | 151 | + - CNLiveNewTripartiteManagement/SDCycleScrollView (0.2.0.8): |
| 148 | - SDCycleScrollView (= 1.80) | 152 | - SDCycleScrollView (= 1.80) |
| 149 | - - CNLiveNewTripartiteManagement/SDWebImage (0.2.0.6): | 153 | + - CNLiveNewTripartiteManagement/SDWebImage (0.2.0.8): |
| 150 | - SDWebImage (= 5.2.3) | 154 | - SDWebImage (= 5.2.3) |
| 151 | - - CNLiveNewTripartiteManagement/SSZipArchive (0.2.0.6): | 155 | + - CNLiveNewTripartiteManagement/SSZipArchive (0.2.0.8): |
| 152 | - SSZipArchive (= 2.1.5) | 156 | - SSZipArchive (= 2.1.5) |
| 153 | - - CNLiveNewTripartiteManagement/YYAsyncLayer (0.2.0.6): | 157 | + - CNLiveNewTripartiteManagement/WechatOpenSDK (0.2.0.8): |
| 158 | + - WechatOpenSDK (= 1.8.7.1) | ||
| 159 | + - CNLiveNewTripartiteManagement/WeiboSDK (0.2.0.8): | ||
| 160 | + - Weibo_SDK (= 3.2.7) | ||
| 161 | + - CNLiveNewTripartiteManagement/YYAsyncLayer (0.2.0.8): | ||
| 154 | - YYAsyncLayer (= 1.0) | 162 | - YYAsyncLayer (= 1.0) |
| 155 | - - CNLiveNewTripartiteManagement/YYCache (0.2.0.6): | 163 | + - CNLiveNewTripartiteManagement/YYCache (0.2.0.8): |
| 156 | - YYCache (= 1.0.4) | 164 | - YYCache (= 1.0.4) |
| 157 | - - CNLiveNewTripartiteManagement/YYCategories (0.2.0.6): | 165 | + - CNLiveNewTripartiteManagement/YYCategories (0.2.0.8): |
| 158 | - YYCategories (= 1.0.4) | 166 | - YYCategories (= 1.0.4) |
| 159 | - - CNLiveNewTripartiteManagement/YYDispatchQueuePool (0.2.0.6): | 167 | + - CNLiveNewTripartiteManagement/YYDispatchQueuePool (0.2.0.8): |
| 160 | - YYDispatchQueuePool (= 1.0) | 168 | - YYDispatchQueuePool (= 1.0) |
| 161 | - - CNLiveNewTripartiteManagement/YYImage (0.2.0.6): | 169 | + - CNLiveNewTripartiteManagement/YYImage (0.2.0.8): |
| 162 | - YYImage (= 1.0.4) | 170 | - YYImage (= 1.0.4) |
| 163 | - - CNLiveNewTripartiteManagement/YYKeyboardManager (0.2.0.6): | 171 | + - CNLiveNewTripartiteManagement/YYKeyboardManager (0.2.0.8): |
| 164 | - YYKeyboardManager (= 1.0.1) | 172 | - YYKeyboardManager (= 1.0.1) |
| 165 | - - CNLiveNewTripartiteManagement/YYModel (0.2.0.6): | 173 | + - CNLiveNewTripartiteManagement/YYModel (0.2.0.8): |
| 166 | - YYModel (= 1.0.4) | 174 | - YYModel (= 1.0.4) |
| 167 | - - CNLiveNewTripartiteManagement/YYText (0.2.0.6): | 175 | + - CNLiveNewTripartiteManagement/YYText (0.2.0.8): |
| 168 | - YYText (= 1.0.7) | 176 | - YYText (= 1.0.7) |
| 169 | - - CNLiveNewTripartiteManagement/YYWebImage (0.2.0.6): | 177 | + - CNLiveNewTripartiteManagement/YYWebImage (0.2.0.8): |
| 170 | - YYWebImage (= 1.0.5) | 178 | - YYWebImage (= 1.0.5) |
| 171 | - - CNLiveRequestBastKit (0.2.5.7): | ||
| 172 | - - AFNetworking | ||
| 173 | - - CNLiveSDK/CNLiveStat (0.3.4.8) | ||
| 174 | - - CNLiveShareToolKit (0.0.3): | 179 | + - CNLiveRequestBastKit (0.2.5.8): |
| 175 | - AFNetworking | 180 | - AFNetworking |
| 181 | + - CNLiveSDK/CNLiveStat (0.3.5.0) | ||
| 182 | + - CNLiveShareToolKit (0.4.4): | ||
| 176 | - CNLiveCommonCategory | 183 | - CNLiveCommonCategory |
| 177 | - CNLiveEnvironment | 184 | - CNLiveEnvironment |
| 185 | + - CNLiveNewTripartiteManagement/AFNetworking | ||
| 186 | + - CNLiveNewTripartiteManagement/MJExtension | ||
| 187 | + - CNLiveNewTripartiteManagement/QMUIKit | ||
| 188 | + - CNLiveNewTripartiteManagement/SDWebImage | ||
| 189 | + - CNLiveNewTripartiteManagement/WechatOpenSDK | ||
| 190 | + - CNLiveNewTripartiteManagement/WeiboSDK | ||
| 178 | - CNLiveRequestBastKit | 191 | - CNLiveRequestBastKit |
| 179 | - - CNLiveTripartiteManagement/SDWebImage | 192 | + - CNLiveTencentopenapi |
| 180 | - CNLiveUserManagement | 193 | - CNLiveUserManagement |
| 181 | - - MJExtension | ||
| 182 | - - QMUIKit | ||
| 183 | - - WechatOpenSDK (= 1.8.4) | ||
| 184 | - - WeiboSDK | ||
| 185 | - - CNLiveTripartiteManagement/SDWebImage (0.1.9): | ||
| 186 | - - SDWebImage (= 5.2.3) | 194 | + - CNLiveTencentopenapi (0.0.3) |
| 187 | - CNLiveUserManagement (0.1.5): | 195 | - CNLiveUserManagement (0.1.5): |
| 188 | - CNLiveNewTripartiteManagement/MJExtension | 196 | - CNLiveNewTripartiteManagement/MJExtension |
| 189 | - - CNLiveVideoClassifyKit (0.4.3): | 197 | + - CNLiveVideoClassifyKit (0.6.5): |
| 190 | - CNLiveBaseKit | 198 | - CNLiveBaseKit |
| 191 | - CNLiveBaseTools | 199 | - CNLiveBaseTools |
| 192 | - CNLiveBeeHive | 200 | - CNLiveBeeHive |
| @@ -213,7 +221,7 @@ PODS: | @@ -213,7 +221,7 @@ PODS: | ||
| 213 | - CNLiveUserManagement | 221 | - CNLiveUserManagement |
| 214 | - JXCategoryView | 222 | - JXCategoryView |
| 215 | - UMCCommon | 223 | - UMCCommon |
| 216 | - - JXCategoryView (1.5.9) | 224 | + - JXCategoryView (1.6.1) |
| 217 | - Masonry (1.1.0) | 225 | - Masonry (1.1.0) |
| 218 | - MJExtension (3.2.1) | 226 | - MJExtension (3.2.1) |
| 219 | - MJRefresh (3.2.0) | 227 | - MJRefresh (3.2.0) |
| @@ -540,14 +548,19 @@ PODS: | @@ -540,14 +548,19 @@ PODS: | ||
| 540 | - SDWebImage/Core (= 5.2.3) | 548 | - SDWebImage/Core (= 5.2.3) |
| 541 | - SDWebImage/Core (5.2.3) | 549 | - SDWebImage/Core (5.2.3) |
| 542 | - SSZipArchive (2.1.5) | 550 | - SSZipArchive (2.1.5) |
| 543 | - - UMAPM (1.6.3) | ||
| 544 | - - UMCCommon (7.3.6): | 551 | + - TZImagePickerController (3.8.3): |
| 552 | + - TZImagePickerController/Basic (= 3.8.3) | ||
| 553 | + - TZImagePickerController/Location (= 3.8.3) | ||
| 554 | + - TZImagePickerController/Basic (3.8.3) | ||
| 555 | + - TZImagePickerController/Location (3.8.3) | ||
| 556 | + - UMAPM (1.7.0) | ||
| 557 | + - UMCCommon (7.3.7): | ||
| 545 | - UMAPM | 558 | - UMAPM |
| 546 | - UMDevice | 559 | - UMDevice |
| 547 | - UMDevice (2.2.1) | 560 | - UMDevice (2.2.1) |
| 548 | - WebViewJavascriptBridge (6.0.3) | 561 | - WebViewJavascriptBridge (6.0.3) |
| 549 | - - WechatOpenSDK (1.8.4) | ||
| 550 | - - WeiboSDK (3.1.3) | 562 | + - WechatOpenSDK (1.8.7.1) |
| 563 | + - Weibo_SDK (3.2.7) | ||
| 551 | - YYAsyncLayer (1.0) | 564 | - YYAsyncLayer (1.0) |
| 552 | - YYCache (1.0.4) | 565 | - YYCache (1.0.4) |
| 553 | - YYCategories (1.0.4): | 566 | - YYCategories (1.0.4): |
| @@ -587,11 +600,11 @@ SPEC REPOS: | @@ -587,11 +600,11 @@ SPEC REPOS: | ||
| 587 | - CNLiveNewTripartiteManagement | 600 | - CNLiveNewTripartiteManagement |
| 588 | - CNLiveRequestBastKit | 601 | - CNLiveRequestBastKit |
| 589 | - CNLiveShareToolKit | 602 | - CNLiveShareToolKit |
| 590 | - - CNLiveTripartiteManagement | ||
| 591 | - CNLiveUserManagement | 603 | - CNLiveUserManagement |
| 592 | https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git: | 604 | https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git: |
| 593 | - AFNetworking | 605 | - AFNetworking |
| 594 | - CNLiveSDK | 606 | - CNLiveSDK |
| 607 | + - CNLiveTencentopenapi | ||
| 595 | - JXCategoryView | 608 | - JXCategoryView |
| 596 | - Masonry | 609 | - Masonry |
| 597 | - MJExtension | 610 | - MJExtension |
| @@ -600,12 +613,13 @@ SPEC REPOS: | @@ -600,12 +613,13 @@ SPEC REPOS: | ||
| 600 | - SDCycleScrollView | 613 | - SDCycleScrollView |
| 601 | - SDWebImage | 614 | - SDWebImage |
| 602 | - SSZipArchive | 615 | - SSZipArchive |
| 616 | + - TZImagePickerController | ||
| 603 | - UMAPM | 617 | - UMAPM |
| 604 | - UMCCommon | 618 | - UMCCommon |
| 605 | - UMDevice | 619 | - UMDevice |
| 606 | - WebViewJavascriptBridge | 620 | - WebViewJavascriptBridge |
| 607 | - WechatOpenSDK | 621 | - WechatOpenSDK |
| 608 | - - WeiboSDK | 622 | + - Weibo_SDK |
| 609 | - YYAsyncLayer | 623 | - YYAsyncLayer |
| 610 | - YYCache | 624 | - YYCache |
| 611 | - YYCategories | 625 | - YYCategories |
| @@ -621,7 +635,7 @@ EXTERNAL SOURCES: | @@ -621,7 +635,7 @@ EXTERNAL SOURCES: | ||
| 621 | :path: "../" | 635 | :path: "../" |
| 622 | 636 | ||
| 623 | SPEC CHECKSUMS: | 637 | SPEC CHECKSUMS: |
| 624 | - AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce | 638 | + AFNetworking: d9fdf484a3c723ec3c558a41cc5754c7e845ee77 |
| 625 | CNLiveBaseKit: 22b123f4c1b21e3f4ca7862922b428003cc89fee | 639 | CNLiveBaseKit: 22b123f4c1b21e3f4ca7862922b428003cc89fee |
| 626 | CNLiveBaseTools: ba742bbfa73302625c9418d5e10c64a5eba4e089 | 640 | CNLiveBaseTools: ba742bbfa73302625c9418d5e10c64a5eba4e089 |
| 627 | CNLiveBeeHive: 1e105b15b6ccaad546258fcf91231563beb853d4 | 641 | CNLiveBeeHive: 1e105b15b6ccaad546258fcf91231563beb853d4 |
| @@ -631,17 +645,17 @@ SPEC CHECKSUMS: | @@ -631,17 +645,17 @@ SPEC CHECKSUMS: | ||
| 631 | CNLiveCategory: c90a01af1e20cd89f47d4f551d47d2ddc9ca96f3 | 645 | CNLiveCategory: c90a01af1e20cd89f47d4f551d47d2ddc9ca96f3 |
| 632 | CNLiveCommonCategory: 22c9842b31f2087803ae69e983b2c944fb80eae1 | 646 | CNLiveCommonCategory: 22c9842b31f2087803ae69e983b2c944fb80eae1 |
| 633 | CNLiveCustomControl: a692e47171afb799cebc210a8e77c5a4ddfc2099 | 647 | CNLiveCustomControl: a692e47171afb799cebc210a8e77c5a4ddfc2099 |
| 634 | - CNLiveCustomUI: b704f07f5f734e45c06bda1877e67b5f9e5d3581 | 648 | + CNLiveCustomUI: d33b487d45d7c2411d12cf63ed2aaefe2cb02273 |
| 635 | CNLiveCWebViewModule: 7f48305d603dd362943b4fc24f888a8ee77fe639 | 649 | CNLiveCWebViewModule: 7f48305d603dd362943b4fc24f888a8ee77fe639 |
| 636 | - CNLiveEnvironment: 1a6228a9c98d4b69d88728c87ca325f9254f5c93 | ||
| 637 | - CNLiveNewTripartiteManagement: 29ddb2d23ee77bcd42ba5eaf5f1322ed37db5baa | ||
| 638 | - CNLiveRequestBastKit: 9fe28913b94a0a072298eba3356f17b98ef0b6cd | ||
| 639 | - CNLiveSDK: 75bafaafbb8c09dcb4420adfe0f05130405b25e7 | ||
| 640 | - CNLiveShareToolKit: 4d24fe14457b872f4072213b0807af9870a9ebe5 | ||
| 641 | - CNLiveTripartiteManagement: 9754e873f5fe77f05a05586b1fd302f7dd8f9be2 | 650 | + CNLiveEnvironment: ceec94d48016f2c76794ba0e19d9bf343f091065 |
| 651 | + CNLiveNewTripartiteManagement: 8cb5eb9c78bf45ce75d505c9ad6cf72d257df2c3 | ||
| 652 | + CNLiveRequestBastKit: 2c4834ecb6abf2f1191100b2e904d16a79bcb3c4 | ||
| 653 | + CNLiveSDK: 31b81f0296df1aeff28134e93d006a5e96f0f31f | ||
| 654 | + CNLiveShareToolKit: f910a6cb6bac6038e27d582dd7e0b8c41ca4778f | ||
| 655 | + CNLiveTencentopenapi: d7c4cea634f51cae6aa61286dc3847193246dc6d | ||
| 642 | CNLiveUserManagement: ead053f2d701b01ea8fb5f1da572be788f2dd3cf | 656 | CNLiveUserManagement: ead053f2d701b01ea8fb5f1da572be788f2dd3cf |
| 643 | - CNLiveVideoClassifyKit: c6399b27ae425a681b14cf54d72c896fa4efae46 | ||
| 644 | - JXCategoryView: 2ef9ecfd3735158d009ce02d1f29811aa822da65 | 657 | + CNLiveVideoClassifyKit: 76af78e38fd1bd3a0295a163c630c57678863ce0 |
| 658 | + JXCategoryView: 7b1ee69ede4843c581688afe84d0f047723262f2 | ||
| 645 | Masonry: 678fab65091a9290e40e2832a55e7ab731aad201 | 659 | Masonry: 678fab65091a9290e40e2832a55e7ab731aad201 |
| 646 | MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545 | 660 | MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545 |
| 647 | MJRefresh: ed450d6eb9d3346a2cb033ab7eb6de090aeef437 | 661 | MJRefresh: ed450d6eb9d3346a2cb033ab7eb6de090aeef437 |
| @@ -649,12 +663,13 @@ SPEC CHECKSUMS: | @@ -649,12 +663,13 @@ SPEC CHECKSUMS: | ||
| 649 | SDCycleScrollView: b3c9a5ed840c771c4938978174c7c9d9feefeb96 | 663 | SDCycleScrollView: b3c9a5ed840c771c4938978174c7c9d9feefeb96 |
| 650 | SDWebImage: 46a7f73228f84ce80990c786e4372cf4db5875ce | 664 | SDWebImage: 46a7f73228f84ce80990c786e4372cf4db5875ce |
| 651 | SSZipArchive: cefe1364104a0231268a5deb8495bdf2861f52f0 | 665 | SSZipArchive: cefe1364104a0231268a5deb8495bdf2861f52f0 |
| 652 | - UMAPM: 76db9514ceb4c94c44cfa143498860626ca0dda5 | ||
| 653 | - UMCCommon: 67766370204f54467c2271a13397c403992ebeec | 666 | + TZImagePickerController: e9909edbadf7381140efc5b5c9f5bdbfd630f7d4 |
| 667 | + UMAPM: e7674c15fd583c3d9bf2e469cf40002f61bf2b97 | ||
| 668 | + UMCCommon: aac337052f23b0e08c0f3cf021d3bb209f2c49bd | ||
| 654 | UMDevice: 053478c4b4d7292f31f0a275c227d3c4007a5571 | 669 | UMDevice: 053478c4b4d7292f31f0a275c227d3c4007a5571 |
| 655 | WebViewJavascriptBridge: 7f5bc4d3581e672e8f32bd0f812d54bc69bb8e29 | 670 | WebViewJavascriptBridge: 7f5bc4d3581e672e8f32bd0f812d54bc69bb8e29 |
| 656 | - WechatOpenSDK: 9b721089507c895d05f997408c30bb6e6f5f9b60 | ||
| 657 | - WeiboSDK: acb067053668102cf07d01aa7604350162c2e466 | 671 | + WechatOpenSDK: 6a4d1436c15b3b5fe2a0bd383f3046010186da44 |
| 672 | + Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089 | ||
| 658 | YYAsyncLayer: df6b01ebc695c5f6b4c15dd5c23fa3e081eb25c0 | 673 | YYAsyncLayer: df6b01ebc695c5f6b4c15dd5c23fa3e081eb25c0 |
| 659 | YYCache: 8105b6638f5e849296c71f331ff83891a4942952 | 674 | YYCache: 8105b6638f5e849296c71f331ff83891a4942952 |
| 660 | YYCategories: 6bcd4314c6661a561410dce4a793379ebd306abd | 675 | YYCategories: 6bcd4314c6661a561410dce4a793379ebd306abd |
_Pods.xcodeproj deleted
120000 → 0