Commit 055b10a25254fe323c508b5732c2f6bc0587a6de
1 parent
2005911f
0.7.9未登录隐藏我的预约
Showing
3 changed files
with
42 additions
and
39 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.7.8' | 11 | + s.version = '0.7.9' |
| 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/Classes/ClassifyCategory/Controller/CNLiveSubSegmentController.m
| @@ -304,7 +304,9 @@ | @@ -304,7 +304,9 @@ | ||
| 304 | NSMutableArray *array = [NSMutableArray array]; | 304 | NSMutableArray *array = [NSMutableArray array]; |
| 305 | for (CNCategoryGetChannelModel *model in self.pageListArr) { | 305 | for (CNCategoryGetChannelModel *model in self.pageListArr) { |
| 306 | if (!CNLiveStringIsEmpty(model.showName) && !CNLiveStringIsEmpty(model.pageType)) { | 306 | if (!CNLiveStringIsEmpty(model.showName) && !CNLiveStringIsEmpty(model.pageType)) { |
| 307 | - [self.titles addObject:model.showName]; | 307 | + if (!(![CNUserShareManager isLogin] && [model.id isEqualToString:@"300"])) { |
| 308 | + [self.titles addObject:model.showName]; | ||
| 309 | + } | ||
| 308 | [array addObject:model]; | 310 | [array addObject:model]; |
| 309 | if (!CNLiveStringIsEmpty(model.defaultPage) && [model.defaultPage isEqualToString:@"1"]) { | 311 | if (!CNLiveStringIsEmpty(model.defaultPage) && [model.defaultPage isEqualToString:@"1"]) { |
| 310 | self.ld_currentIndex = [self.pageListArr indexOfObject:model]; | 312 | self.ld_currentIndex = [self.pageListArr indexOfObject:model]; |
Example/Podfile.lock
| @@ -14,9 +14,9 @@ PODS: | @@ -14,9 +14,9 @@ PODS: | ||
| 14 | - AFNetworking/Serialization (4.0.0) | 14 | - AFNetworking/Serialization (4.0.0) |
| 15 | - AFNetworking/UIKit (4.0.0): | 15 | - AFNetworking/UIKit (4.0.0): |
| 16 | - AFNetworking/NSURLSession | 16 | - AFNetworking/NSURLSession |
| 17 | - - CNLiveBaseKit (0.1.28): | 17 | + - CNLiveBaseKit (0.1.29): |
| 18 | - CNLiveNewTripartiteManagement/MJExtension | 18 | - CNLiveNewTripartiteManagement/MJExtension |
| 19 | - - CNLiveBaseTools (0.0.4): | 19 | + - CNLiveBaseTools (0.0.8): |
| 20 | - CNLiveBaseKit | 20 | - CNLiveBaseKit |
| 21 | - CNLiveBeeHive | 21 | - CNLiveBeeHive |
| 22 | - CNLiveNewTripartiteManagement/QMUIKit | 22 | - CNLiveNewTripartiteManagement/QMUIKit |
| @@ -128,7 +128,7 @@ PODS: | @@ -128,7 +128,7 @@ PODS: | ||
| 128 | - CNLiveBusinessTools | 128 | - CNLiveBusinessTools |
| 129 | - CNLiveCustomUI/CNLiveGetImage | 129 | - CNLiveCustomUI/CNLiveGetImage |
| 130 | - CNLiveNewTripartiteManagement/MJRefresh | 130 | - CNLiveNewTripartiteManagement/MJRefresh |
| 131 | - - CNLiveCWebViewModule (0.3.1): | 131 | + - CNLiveCWebViewModule (0.3.2): |
| 132 | - CNLiveCustomUI | 132 | - CNLiveCustomUI |
| 133 | - CNLiveEnvironment | 133 | - CNLiveEnvironment |
| 134 | - CNLiveNewTripartiteManagement/Masonry | 134 | - CNLiveNewTripartiteManagement/Masonry |
| @@ -137,49 +137,49 @@ PODS: | @@ -137,49 +137,49 @@ PODS: | ||
| 137 | - CNLiveSDK/CNLiveStat | 137 | - CNLiveSDK/CNLiveStat |
| 138 | - CNLiveUserManagement | 138 | - CNLiveUserManagement |
| 139 | - WebViewJavascriptBridge | 139 | - WebViewJavascriptBridge |
| 140 | - - CNLiveEnvironment (0.4.5) | ||
| 141 | - - CNLiveNewTripartiteManagement/AFNetworking (0.2.0.9): | 140 | + - CNLiveEnvironment (0.5.0) |
| 141 | + - CNLiveNewTripartiteManagement/AFNetworking (0.2.1.1): | ||
| 142 | - AFNetworking (= 4.0.0) | 142 | - AFNetworking (= 4.0.0) |
| 143 | - - CNLiveNewTripartiteManagement/Masonry (0.2.0.9): | 143 | + - CNLiveNewTripartiteManagement/Masonry (0.2.1.1): |
| 144 | - Masonry (= 1.1.0) | 144 | - Masonry (= 1.1.0) |
| 145 | - - CNLiveNewTripartiteManagement/MJExtension (0.2.0.9): | 145 | + - CNLiveNewTripartiteManagement/MJExtension (0.2.1.1): |
| 146 | - MJExtension (= 3.2.1) | 146 | - MJExtension (= 3.2.1) |
| 147 | - - CNLiveNewTripartiteManagement/MJRefresh (0.2.0.9): | 147 | + - CNLiveNewTripartiteManagement/MJRefresh (0.2.1.1): |
| 148 | - MJRefresh (= 3.2.0) | 148 | - MJRefresh (= 3.2.0) |
| 149 | - - CNLiveNewTripartiteManagement/QMUIKit (0.2.0.9): | 149 | + - CNLiveNewTripartiteManagement/QMUIKit (0.2.1.1): |
| 150 | - QMUIKit (= 4.2.1) | 150 | - QMUIKit (= 4.2.1) |
| 151 | - - CNLiveNewTripartiteManagement/SDCycleScrollView (0.2.0.9): | 151 | + - CNLiveNewTripartiteManagement/SDCycleScrollView (0.2.1.1): |
| 152 | - SDCycleScrollView (= 1.80) | 152 | - SDCycleScrollView (= 1.80) |
| 153 | - - CNLiveNewTripartiteManagement/SDWebImage (0.2.0.9): | 153 | + - CNLiveNewTripartiteManagement/SDWebImage (0.2.1.1): |
| 154 | - SDWebImage (= 5.2.3) | 154 | - SDWebImage (= 5.2.3) |
| 155 | - - CNLiveNewTripartiteManagement/SSZipArchive (0.2.0.9): | 155 | + - CNLiveNewTripartiteManagement/SSZipArchive (0.2.1.1): |
| 156 | - SSZipArchive (= 2.1.5) | 156 | - SSZipArchive (= 2.1.5) |
| 157 | - - CNLiveNewTripartiteManagement/WechatOpenSDK (0.2.0.9): | 157 | + - CNLiveNewTripartiteManagement/WechatOpenSDK (0.2.1.1): |
| 158 | - WechatOpenSDK (= 1.8.7.1) | 158 | - WechatOpenSDK (= 1.8.7.1) |
| 159 | - - CNLiveNewTripartiteManagement/WeiboSDK (0.2.0.9): | 159 | + - CNLiveNewTripartiteManagement/WeiboSDK (0.2.1.1): |
| 160 | - Weibo_SDK (= 3.3.0) | 160 | - Weibo_SDK (= 3.3.0) |
| 161 | - - CNLiveNewTripartiteManagement/YYAsyncLayer (0.2.0.9): | 161 | + - CNLiveNewTripartiteManagement/YYAsyncLayer (0.2.1.1): |
| 162 | - YYAsyncLayer (= 1.0) | 162 | - YYAsyncLayer (= 1.0) |
| 163 | - - CNLiveNewTripartiteManagement/YYCache (0.2.0.9): | 163 | + - CNLiveNewTripartiteManagement/YYCache (0.2.1.1): |
| 164 | - YYCache (= 1.0.4) | 164 | - YYCache (= 1.0.4) |
| 165 | - - CNLiveNewTripartiteManagement/YYCategories (0.2.0.9): | 165 | + - CNLiveNewTripartiteManagement/YYCategories (0.2.1.1): |
| 166 | - YYCategories (= 1.0.4) | 166 | - YYCategories (= 1.0.4) |
| 167 | - - CNLiveNewTripartiteManagement/YYDispatchQueuePool (0.2.0.9): | 167 | + - CNLiveNewTripartiteManagement/YYDispatchQueuePool (0.2.1.1): |
| 168 | - YYDispatchQueuePool (= 1.0) | 168 | - YYDispatchQueuePool (= 1.0) |
| 169 | - - CNLiveNewTripartiteManagement/YYImage (0.2.0.9): | 169 | + - CNLiveNewTripartiteManagement/YYImage (0.2.1.1): |
| 170 | - YYImage (= 1.0.4) | 170 | - YYImage (= 1.0.4) |
| 171 | - - CNLiveNewTripartiteManagement/YYKeyboardManager (0.2.0.9): | 171 | + - CNLiveNewTripartiteManagement/YYKeyboardManager (0.2.1.1): |
| 172 | - YYKeyboardManager (= 1.0.1) | 172 | - YYKeyboardManager (= 1.0.1) |
| 173 | - - CNLiveNewTripartiteManagement/YYModel (0.2.0.9): | 173 | + - CNLiveNewTripartiteManagement/YYModel (0.2.1.1): |
| 174 | - YYModel (= 1.0.4) | 174 | - YYModel (= 1.0.4) |
| 175 | - - CNLiveNewTripartiteManagement/YYText (0.2.0.9): | 175 | + - CNLiveNewTripartiteManagement/YYText (0.2.1.1): |
| 176 | - YYText (= 1.0.7) | 176 | - YYText (= 1.0.7) |
| 177 | - - CNLiveNewTripartiteManagement/YYWebImage (0.2.0.9): | 177 | + - CNLiveNewTripartiteManagement/YYWebImage (0.2.1.1): |
| 178 | - YYWebImage (= 1.0.5) | 178 | - YYWebImage (= 1.0.5) |
| 179 | - CNLiveRequestBastKit (0.2.6.0): | 179 | - CNLiveRequestBastKit (0.2.6.0): |
| 180 | - AFNetworking | 180 | - AFNetworking |
| 181 | - CNLiveSDK/CNLiveStat (0.3.5.0) | 181 | - CNLiveSDK/CNLiveStat (0.3.5.0) |
| 182 | - - CNLiveShareToolKit (0.4.6): | 182 | + - CNLiveShareToolKit (0.4.9): |
| 183 | - CNLiveCommonCategory | 183 | - CNLiveCommonCategory |
| 184 | - CNLiveEnvironment | 184 | - CNLiveEnvironment |
| 185 | - CNLiveNewTripartiteManagement/AFNetworking | 185 | - CNLiveNewTripartiteManagement/AFNetworking |
| @@ -192,9 +192,10 @@ PODS: | @@ -192,9 +192,10 @@ PODS: | ||
| 192 | - CNLiveTencentopenapi | 192 | - CNLiveTencentopenapi |
| 193 | - CNLiveUserManagement | 193 | - CNLiveUserManagement |
| 194 | - CNLiveTencentopenapi (0.0.3) | 194 | - CNLiveTencentopenapi (0.0.3) |
| 195 | - - CNLiveUserManagement (0.1.5): | 195 | + - CNLiveUserManagement (0.1.6): |
| 196 | + - CNLiveEnvironment | ||
| 196 | - CNLiveNewTripartiteManagement/MJExtension | 197 | - CNLiveNewTripartiteManagement/MJExtension |
| 197 | - - CNLiveVideoClassifyKit (0.7.6): | 198 | + - CNLiveVideoClassifyKit (0.7.8): |
| 198 | - CNLiveBaseKit | 199 | - CNLiveBaseKit |
| 199 | - CNLiveBaseTools | 200 | - CNLiveBaseTools |
| 200 | - CNLiveBeeHive | 201 | - CNLiveBeeHive |
| @@ -553,7 +554,7 @@ PODS: | @@ -553,7 +554,7 @@ PODS: | ||
| 553 | - TZImagePickerController/Location (= 3.8.3) | 554 | - TZImagePickerController/Location (= 3.8.3) |
| 554 | - TZImagePickerController/Basic (3.8.3) | 555 | - TZImagePickerController/Basic (3.8.3) |
| 555 | - TZImagePickerController/Location (3.8.3) | 556 | - TZImagePickerController/Location (3.8.3) |
| 556 | - - UMAPM (1.7.0) | 557 | + - UMAPM (1.8.0) |
| 557 | - UMCCommon (7.3.7): | 558 | - UMCCommon (7.3.7): |
| 558 | - UMAPM | 559 | - UMAPM |
| 559 | - UMDevice | 560 | - UMDevice |
| @@ -636,8 +637,8 @@ EXTERNAL SOURCES: | @@ -636,8 +637,8 @@ EXTERNAL SOURCES: | ||
| 636 | 637 | ||
| 637 | SPEC CHECKSUMS: | 638 | SPEC CHECKSUMS: |
| 638 | AFNetworking: d9fdf484a3c723ec3c558a41cc5754c7e845ee77 | 639 | AFNetworking: d9fdf484a3c723ec3c558a41cc5754c7e845ee77 |
| 639 | - CNLiveBaseKit: 22b123f4c1b21e3f4ca7862922b428003cc89fee | ||
| 640 | - CNLiveBaseTools: ba742bbfa73302625c9418d5e10c64a5eba4e089 | 640 | + CNLiveBaseKit: 6f1fbe1b4f501f7102d0ee4864b1c21ca93b24e6 |
| 641 | + CNLiveBaseTools: d788320741593dba4800fbc9d89a7f75f1a5885e | ||
| 641 | CNLiveBeeHive: 1e105b15b6ccaad546258fcf91231563beb853d4 | 642 | CNLiveBeeHive: 1e105b15b6ccaad546258fcf91231563beb853d4 |
| 642 | CNLiveBServices: 747c8c6c8d300c4daaeb108027c5886c66ed02ce | 643 | CNLiveBServices: 747c8c6c8d300c4daaeb108027c5886c66ed02ce |
| 643 | CNLiveBusinessBaseModule: 1c70784cc67ac3410c573c7ee28c3f5d88b0894c | 644 | CNLiveBusinessBaseModule: 1c70784cc67ac3410c573c7ee28c3f5d88b0894c |
| @@ -646,15 +647,15 @@ SPEC CHECKSUMS: | @@ -646,15 +647,15 @@ SPEC CHECKSUMS: | ||
| 646 | CNLiveCommonCategory: 22c9842b31f2087803ae69e983b2c944fb80eae1 | 647 | CNLiveCommonCategory: 22c9842b31f2087803ae69e983b2c944fb80eae1 |
| 647 | CNLiveCustomControl: a692e47171afb799cebc210a8e77c5a4ddfc2099 | 648 | CNLiveCustomControl: a692e47171afb799cebc210a8e77c5a4ddfc2099 |
| 648 | CNLiveCustomUI: d33b487d45d7c2411d12cf63ed2aaefe2cb02273 | 649 | CNLiveCustomUI: d33b487d45d7c2411d12cf63ed2aaefe2cb02273 |
| 649 | - CNLiveCWebViewModule: 7f48305d603dd362943b4fc24f888a8ee77fe639 | ||
| 650 | - CNLiveEnvironment: ceec94d48016f2c76794ba0e19d9bf343f091065 | ||
| 651 | - CNLiveNewTripartiteManagement: 7fb07741462b67e290997f80efc42a3df47049bc | 650 | + CNLiveCWebViewModule: 8f83551ba6d8117f31128ba1782991d230d88d0e |
| 651 | + CNLiveEnvironment: abaf42a5eb78d988fa706d7a795b7115ae61d4cb | ||
| 652 | + CNLiveNewTripartiteManagement: 9f175b357771f36fdf00c8a5302306d129717b55 | ||
| 652 | CNLiveRequestBastKit: ef3ebe292acaf2922189ea8b46cc8a9ef48b0b33 | 653 | CNLiveRequestBastKit: ef3ebe292acaf2922189ea8b46cc8a9ef48b0b33 |
| 653 | CNLiveSDK: 31b81f0296df1aeff28134e93d006a5e96f0f31f | 654 | CNLiveSDK: 31b81f0296df1aeff28134e93d006a5e96f0f31f |
| 654 | - CNLiveShareToolKit: c9e31fc76e9559f1a675aea6c2237ef153aaecee | 655 | + CNLiveShareToolKit: 224eeab02d85228b29271eb53ad62f92242fed46 |
| 655 | CNLiveTencentopenapi: d7c4cea634f51cae6aa61286dc3847193246dc6d | 656 | CNLiveTencentopenapi: d7c4cea634f51cae6aa61286dc3847193246dc6d |
| 656 | - CNLiveUserManagement: ead053f2d701b01ea8fb5f1da572be788f2dd3cf | ||
| 657 | - CNLiveVideoClassifyKit: ef860faa9ce04b5506d7d6562ba4019147948da4 | 657 | + CNLiveUserManagement: 68b965fff76513c371a321b3c34862578718dc26 |
| 658 | + CNLiveVideoClassifyKit: 80aac88d05899726e976157df316b9c0b52513f7 | ||
| 658 | JXCategoryView: 7b1ee69ede4843c581688afe84d0f047723262f2 | 659 | JXCategoryView: 7b1ee69ede4843c581688afe84d0f047723262f2 |
| 659 | Masonry: 678fab65091a9290e40e2832a55e7ab731aad201 | 660 | Masonry: 678fab65091a9290e40e2832a55e7ab731aad201 |
| 660 | MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545 | 661 | MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545 |
| @@ -664,7 +665,7 @@ SPEC CHECKSUMS: | @@ -664,7 +665,7 @@ SPEC CHECKSUMS: | ||
| 664 | SDWebImage: 46a7f73228f84ce80990c786e4372cf4db5875ce | 665 | SDWebImage: 46a7f73228f84ce80990c786e4372cf4db5875ce |
| 665 | SSZipArchive: cefe1364104a0231268a5deb8495bdf2861f52f0 | 666 | SSZipArchive: cefe1364104a0231268a5deb8495bdf2861f52f0 |
| 666 | TZImagePickerController: e9909edbadf7381140efc5b5c9f5bdbfd630f7d4 | 667 | TZImagePickerController: e9909edbadf7381140efc5b5c9f5bdbfd630f7d4 |
| 667 | - UMAPM: e7674c15fd583c3d9bf2e469cf40002f61bf2b97 | 668 | + UMAPM: c839160b956cd9bf9949ba51113a7250101f2768 |
| 668 | UMCCommon: aac337052f23b0e08c0f3cf021d3bb209f2c49bd | 669 | UMCCommon: aac337052f23b0e08c0f3cf021d3bb209f2c49bd |
| 669 | UMDevice: 053478c4b4d7292f31f0a275c227d3c4007a5571 | 670 | UMDevice: 053478c4b4d7292f31f0a275c227d3c4007a5571 |
| 670 | WebViewJavascriptBridge: 7f5bc4d3581e672e8f32bd0f812d54bc69bb8e29 | 671 | WebViewJavascriptBridge: 7f5bc4d3581e672e8f32bd0f812d54bc69bb8e29 |
| @@ -682,4 +683,4 @@ SPEC CHECKSUMS: | @@ -682,4 +683,4 @@ SPEC CHECKSUMS: | ||
| 682 | 683 | ||
| 683 | PODFILE CHECKSUM: 6491e4045e4ae937b78cb644deaa04fb626a1aef | 684 | PODFILE CHECKSUM: 6491e4045e4ae937b78cb644deaa04fb626a1aef |
| 684 | 685 | ||
| 685 | -COCOAPODS: 1.11.2 | 686 | +COCOAPODS: 1.11.3 |