no message

yanglingyu
1 parent 35765882
Showing 9 changed files with 237 additions and 86 deletions
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.m
CNLiveVideoClassifyKit/Classes/Header/CNLiveCommonDefines.h
CNLiveListManager.h → CNLiveVideoClassifyKit/Classes/Manager/CNLiveListManager.h
CNLiveListManager.m → CNLiveVideoClassifyKit/Classes/Manager/CNLiveListManager.m
CNLiveVideoClassifyKit/Classes/Manager/CNLiveVideoClassifyProtocol.h
Example/CNLiveVideoClassifyKit.xcodeproj/project.pbxproj
Example/CNLiveVideoClassifyKit/CNLIVEViewController.m
Example/CNLiveVideoClassifyKit/CNTools.h
Example/CNLiveVideoClassifyKit/CNTools.m
@@ -43,6 +43,7 @@ static const CGFloat animationHeight = 15;
 @property (nonatomic, assign) BOOL            hasChanged;
 @property (nonatomic, assign) BOOL            isEditing;
 @property (nonatomic, assign) BOOL            oldStatusBar;
+@property (nonatomic, assign) BOOL            isLoading;
 @end
@@ -50,6 +51,8 @@ static const CGFloat animationHeight = 15;
 static CGFloat moveHeight = 50;
 - (void)viewDidLoad {
     [super viewDidLoad];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(classifyChannelsRequest:) name:CNWjjClassifyChannelsRequestStateNotifiName object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(classifyChannelsRequestedHideLoading:) name:CNWjjClassifyChannelsRequestHideLoadingNotifiName object:nil];
     self.topBgImgHeight = kStatusHeight+100;
     self.currentIndex = 0;
     [self.view addSubview:self.topBgImg];
@@ -77,7 +80,10 @@ static CGFloat moveHeight = 50;
     self.myCategoryView.cellWidthZoomScale = 1.3;
     self.myCategoryView.imageSize = CGSizeMake(56, 18);
     self.listContainerView.translatesAutoresizingMaskIntoConstraints = NO;
-    [self uploadSubViews];
+    if (!self.isLoading) {
+        [self uploadSubViews];
+    }
+    
     // Do any additional setup after loading the view.
 }
@@ -143,6 +149,23 @@ static CGFloat moveHeight = 50;
     [self updateSelectColors:self.currentIndex];
     [self configCategoryViewWithType:JXCategoryTitleImageType_OnlyImage selectIndex:self.currentIndex unselectIndex:self.currentIndex];
 }
+
+#pragma mark - 通知的监听方法 Notification
+// 分类接口请求成功或者失败
+- (void)classifyChannelsRequest:(NSNotification *)noti {
+    
+    [QMUITips hideAllTipsInView:self.view];
+        
+        [self dataDivideIntoNormalAndOtherWithFirst:NO];
+        [self handleDateWithChannelsArray];
+        [self uploadSubViews];
+}
+// 分类接口数据请求完毕隐藏loading
+- (void)classifyChannelsRequestedHideLoading:(NSNotification *)noti {
+    
+    [QMUITips hideAllTipsInView:self.view];
+}
+
 #pragma mark - Action
 // 点击定制频道按钮进入定制
 - (void)customAction:(UIButton *)sender {
@@ -265,14 +288,14 @@ static CGFloat moveHeight = 50;
         [[NSUserDefaults standardUserDefaults] setObject:newChannelVer forKey:CNWjjOldCategoryChannelVerKey];
     } else {  // 从未请求到过数据
-        
-//        if (![CNTools manager].channelsRequested && first) {
-//            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(classifyChannelsRequest:) name:CNWjjClassifyChannelsRequestStateNotifiName object:nil];
-//            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(classifyChannelsRequestedHideLoading:) name:CNWjjClassifyChannelsRequestHideLoadingNotifiName object:nil];
-//            [QMUITips showLoadingInView:self.view];
-//            self.isLoading = YES;
-//            return;
-//        }
+        Class class = NSClassFromString(@"CNTools");
+        SEL manager = NSSelectorFromString(@"manager");
+        SEL sel = NSSelectorFromString(@"channelsRequested");
+        if (!(BOOL)[[class performSelector:manager] performSelector:sel]&& first) {
+            [QMUITips showLoadingInView:self.view];
+            self.isLoading = YES;
+            return;
+        }
         //  默认数据
         NSMutableArray *defaultArray = [NSMutableArray array];
@@ -513,14 +536,14 @@ static CGFloat moveHeight = 50;
     if (model.pageStyleList.count>0) {
         self.topBgImg.frame = CGRectMake(0, 0, KScreenWidth, self.topBgImgHeight);
         CNLiveSubSegmentController *subVC = [[CNLiveSubSegmentController alloc] initWithModel:model];
-//        subVC.isBlack = isBlack;
-//        weakself
-//        subVC.scrollViewDidScrollBlock = ^(UIScrollView * _Nonnull scrollView) {
-//            [weakSelf listScrollViewDidScroll:scrollView];
-//        };
-//        subVC.willBeginDragging = ^(CGFloat lastOffsetY) {
-//            weakSelf.lastOffsetY = lastOffsetY;
-//        };
+        subVC.isBlack = isBlack;
+        weakself
+        subVC.scrollViewDidScrollBlock = ^(UIScrollView * _Nonnull scrollView) {
+            [weakSelf listScrollViewDidScroll:scrollView];
+        };
+        subVC.willBeginDragging = ^(CGFloat lastOffsetY) {
+            weakSelf.lastOffsetY = lastOffsetY;
+        };
         return subVC;
     }
     self.topBgImg.frame = CGRectMake(0, 0, KScreenWidth, self.topBgImgHeight - 50);
@@ -16,57 +16,20 @@
 #endif
 #define NormalChannelArray      @"CNLiveNetAddNormalChannelArray"       //常用频道
 #define OtherChannelArray       @"CNLiveNetAddOtherChannelArray"        //其他频道
-//#define wjjLastAudioInfoSaveKey @"wjjLastAudioInfoSaveKey"
-//#define CNConnectSuccNotification           @"CNConnectSuccNotification"
-//
-//// 本地存储音频信息KEY
-//#define wjjLastAudioInfoSaveKey @"wjjLastAudioInfoSaveKey"
-//#define wjjIsShowWitnessShadeKey @"wjjIsShowWitnessShadeKey"
-//#define wjjIsShowSportShadeKey   @"wjjIsShowSportShadeKey"
-//#define wjjIsShowSupervisionShadeKey @"wjjIsShowSupervisionShadeKey"//监管
-//
-//// 分类-听见中国-音频播放进度
-//#ifndef WjjAudioPlayerScheduleNotification
-//#define WjjAudioPlayerScheduleNotification @"WjjAudioPlayerScheduleNotification"
-//#endif
-//
-//
-//#ifndef WjjAudioPlayerStatusNotification
-//#define WjjAudioPlayerStatusNotification @"WjjAudioPlayerStatusNotification"
-//#endif
-//// 分类-听见中国-播放哪一首音频(contenId)
-//#ifndef WjjAudioPlayerWhichPlayingNotification
-//#define WjjAudioPlayerWhichPlayingNotification @"WjjAudioPlayerWhichPlayingNotification"
-//#endif
-//// 分类-听见中国-自动切换下一首音频(selectedIndex)详情里面的列表
-//#ifndef WjjAudioPlayerWhichPlayingListViewNotification
-//#define WjjAudioPlayerWhichPlayingListViewNotification @"WjjAudioPlayerWhichPlayingListViewNotification"
-//#endif
-//// 分类-听见中国-通知栏中切换上下首音频(Index)
-//#ifndef WjjNotificationBarChangeUpDownAudioNotification
-//#define WjjNotificationBarChangeUpDownAudioNotification @"WjjNotificationBarChangeUpDownAudioNotification"
-//#endif
-//// 分类-听见中国-一首音频播放完成
-//#ifndef WjjAudioPlayDidFinishNotification
-//#define WjjAudioPlayDidFinishNotification @"WjjAudioPlayDidFinishNotification"
-//#endif
-//
+
 //// 分类停止播放目击者列表中的视频
 #ifndef WjjH5StopVideoPlayerNotification
 #define WjjH5StopVideoPlayerNotification @"WjjH5StopVideoPlayerNotification"
 #endif
-//
-//#define kCNLiveGeneralMargin 10*RATIO  //通用间距
-//#define kCNLiveNotGeneralMargin 10  //通用间距
-//#define KCNLiveShortGeneralMargin 8.5*RATIO  //小间距
-//#define KCNLiveShortNotGeneralMargin 8.5  //间距
-//#define kCNLiveCellTopMargin 10 * RATIO      //cell 顶部灰色留白(添加扩大因数)
-//#define kCNLiveCellTopFactorMargin 10       //cell 顶部灰色留白(不添加扩大因数)
-//#define kCNLiveCellPaddingPic 5     // cell 多张图片中间留白
-//#define TableViewDefaultOffestHeight 64.f
-//
-//static NSString *const CNLiveFirendCircleEmptyItemDesc = @"当前版本过低，暂不支持查看此动态，请升级网家家最新版本查看消息。";
-//
+
+
+//分类-频道-频道数据是否请求完成
+#ifndef CNWjjClassifyChannelsRequestStateNotifiName
+#define CNWjjClassifyChannelsRequestStateNotifiName @"CNWjjClassifyChannelsRequestStateNotifiName"
+#endif
+#ifndef CNWjjClassifyChannelsRequestHideLoadingNotifiName
+#define CNWjjClassifyChannelsRequestHideLoadingNotifiName @"CNWjjClassifyChannelsRequestHideLoadingNotifiName"
+#endif
 #ifndef CNWjjClassifyChannelsRequestHideLoadingNotifiName
 #define CNWjjClassifyChannelsRequestHideLoadingNotifiName @"CNWjjClassifyChannelsRequestHideLoadingNotifiName"
@@ -84,10 +47,4 @@
 #define kDSHappinessPageControlScrollEnableNotification @"kDSHappinessPageControlScrollEnableNotification"
 #endif
-
-//#define cn_WjjH5_Host(url)                    [NSString stringWithFormat:@"%@%@",[CNLiveEnvironmentManager manager].kWjjH5_Host,url]
-//
-//#define RGBACOLOR(r,g,b,a) \
-//[UIColor colorWithRed:r/256.f green:g/256.f blue:b/256.f alpha:a]
-
 #endif /* CNLiveCommonDefines_h */
+//
+//  CNLiveVideoClassifyProtocol.h
+//  Pods
+//
+//  Created by CNLive on 2021/9/8.
+//
+/* CNLiveVideoClassifyProtocol_h */
+//
+
+/**
+ *与主工程交互
+ */
+@protocol CNLiveVideoClassifyProtocol <NSObject>
+
+
+
+@end
@@ -8,6 +8,7 @@
 /* Begin PBXBuildFile section */
 		083CB9C326D4ED2000E21EBC /* CNliveCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 0816338E26BE298900B076D6 /* CNliveCollectionViewCell.m */; };
+		08DAFBDE26E8A2660099999A /* CNTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 08DAFBDC26E8A2660099999A /* CNTools.m */; };
 		14963F4E510A1E5865D15ED8 /* Pods_CNLiveVideoClassifyKit_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7743536FE5FB6796BFAA55B5 /* Pods_CNLiveVideoClassifyKit_Tests.framework */; };
 		6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
 		6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
@@ -40,6 +41,8 @@
 /* Begin PBXFileReference section */
 		0816338D26BE298900B076D6 /* CNliveCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNliveCollectionViewCell.h; sourceTree = "<group>"; };
 		0816338E26BE298900B076D6 /* CNliveCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNliveCollectionViewCell.m; sourceTree = "<group>"; };
+		08DAFBDC26E8A2660099999A /* CNTools.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNTools.m; sourceTree = "<group>"; };
+		08DAFBDD26E8A2660099999A /* CNTools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNTools.h; sourceTree = "<group>"; };
 		24BF123CDE580DC9CCCE1718 /* Pods-CNLiveVideoClassifyKit_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CNLiveVideoClassifyKit_Example.release.xcconfig"; path = "Target Support Files/Pods-CNLiveVideoClassifyKit_Example/Pods-CNLiveVideoClassifyKit_Example.release.xcconfig"; sourceTree = "<group>"; };
 		3A8AB8DB19B4EF9ACF33573D /* Pods-CNLiveVideoClassifyKit_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CNLiveVideoClassifyKit_Tests.release.xcconfig"; path = "Target Support Files/Pods-CNLiveVideoClassifyKit_Tests/Pods-CNLiveVideoClassifyKit_Tests.release.xcconfig"; sourceTree = "<group>"; };
 		5793570C0C400C4B3B4942CE /* Pods-CNLiveVideoClassifyKit_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CNLiveVideoClassifyKit_Example.debug.xcconfig"; path = "Target Support Files/Pods-CNLiveVideoClassifyKit_Example/Pods-CNLiveVideoClassifyKit_Example.debug.xcconfig"; sourceTree = "<group>"; };
@@ -142,6 +145,8 @@
 				6003F5A6195388D20070C39A /* CNLIVEViewController.m */,
 				0816338D26BE298900B076D6 /* CNliveCollectionViewCell.h */,
 				0816338E26BE298900B076D6 /* CNliveCollectionViewCell.m */,
+				08DAFBDD26E8A2660099999A /* CNTools.h */,
+				08DAFBDC26E8A2660099999A /* CNTools.m */,
 				71719F9D1E33DC2100824A3D /* LaunchScreen.storyboard */,
 				6003F5A8195388D20070C39A /* Images.xcassets */,
 				6003F594195388D20070C39A /* Supporting Files */,
@@ -421,6 +426,7 @@
 				6003F59E195388D20070C39A /* CNLIVEAppDelegate.m in Sources */,
 				6003F5A7195388D20070C39A /* CNLIVEViewController.m in Sources */,
 				6003F59A195388D20070C39A /* main.m in Sources */,
+				08DAFBDE26E8A2660099999A /* CNTools.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -17,6 +17,7 @@
 #import <CNLiveNetworking.h>
 #import <CNLiveCommonCategory/CNLiveCommonCategory.h>
 #import <MJExtension.h>
+#import "CNTools.h"
 #ifndef CNTouristsId
@@ -39,22 +40,7 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-    NSLog(@"%@,%@",CNCategoryGetChannelUrl,CNLiveStringIsEmpty(CNUserShareModel.uid)?CNTouristsId:CNUserShareModel.uid);
-  NSDictionary *dic = @{
-    @"plat":@"i"
-  };
-[CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNCategoryGetChannelUrl Param:dic CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
-    if ([NSArray isArray:responseObject[@"data"]]) {
-        NSMutableArray *jsonArray = [[NSMutableArray alloc] init];
-        for (NSDictionary *dic in responseObject[@"data"]) {
-            NSString *jsonStr = CNLiveNSDictionaryDicToJson(dic);
-            [jsonArray addObject:jsonStr];
-        }
-        [[NSUserDefaults standardUserDefaults] setObject:jsonArray forKey:CNLiveNetAddGetCategoryChannels];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-    }
-    
-}];
+    [CNTools GetClassifyChannelsUrlsAndSave];
     self.title = @"首页";
     segArr = @[@"分类"];
     [self.view addSubview:self.collectionView];
+//
+//  CNTools.h
+//  CNLiveNetAdd
+//
+//  Created by 张旭 on 2017/12/30.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+//#import <ImSDK/ImSDK.h>
+//#import "CNLiveLabel.h"
+//#import "OpenInstallSDK.h"
+
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNTools : NSObject
+
++ (instancetype)manager;
+
+//+(BOOL)selectLinkAndPhoneNumber:(YYLabel *)yyLabel CurrentPoint:(CGPoint)point;
+/// 请求App配置信息
++ (void)requestAppSettingAndSaveAppInfoWithVersionMsgBlock:(void(^)())versionMsgBlock;
+/// 获取分类频道
++ (void)GetClassifyChannelsUrlsAndSave;
+// 获取广告信息
++ (void)GetAdvertisingDataSourceWithSuccessBlock:(void(^)(NSDictionary *openScreenAdv))successBlock;
+@property (nonatomic, assign) BOOL channelsRequesting;
+@property (nonatomic, assign) BOOL channelsRequested;
+@property (nonatomic, assign) BOOL appSettingRequesting;
+
++ (void)createAlertView:(NSString *)phone;
+
+//alert
+typedef void(^ConfirmActionBlock)(void);
+//+ (id)showAlertWithTitle:(NSString *)title vc:(UIViewController *)vc cancelTitle:(NSString *)cancelTitle confirmTitle:(NSString *)confirmTitle confirmClick:(ConfirmActionBlock)confirmClick;
+
++ (NSMutableAttributedString * _Nonnull)attributedStringWithText:(NSString *_Nonnull)text font:(CGFloat)font;
+
+
+#pragma mark - 计算字符数
+
+//去识别url的正则表达式
++ (NSAttributedString *)recognizerLink:(NSMutableAttributedString *)attribut;
+#pragma mark 创建联系人
++ (void)createNewContactWithPhoneNum:(NSString *)phoneNum;
+
+/**
+ 加密前的params转string
+
+ @param parameters 要加密的params
+ @return params对应的string
+ */
+//+ (nullable NSString *)CNENcryptRequestStringFromParameters:(nullable NSDictionary *)parameters;
+
+
+//设置朋友圈会话已读
+//+ (void)readSysMomentConv;
+
+////文字转语音播放
+//+ (AVSpeechSynthesizer *)startAVVoiceWithText:(NSString *)text;
+
+#pragma mark - Openinstall 取得参数
+/*** 第一次安装获取渠道参数 ***/
++ (void)getOpenisntallFirstInstallParms;
+
+// 渠道id
++ (NSString *)getFrmId;
+
+/*** 验证码获取渠道参数 ***/
++ (void)setFrmId;
+
+/*** 用户一键拉起 ***/
+//+ (void)openInstallPullUpParams:(OpeninstallData *)appData urlStr:(NSString *)urlStr;
+//
+///*** Openisntall用户登录后跳转 ***/
+//+ (void)openInstallLoginJumpStr:(NSString *)str;
+//
+///*** 跳转实现 ***/
+//+ (void)jumpVCWithAvtivityUrl:(NSURL *)avtivityUrl;
+
+
+
+@end
+NS_ASSUME_NONNULL_END
+//
+//  CNTools.m
+//  CNLiveNetAdd
+//
+//  Created by 张旭 on 2017/12/30.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "CNTools.h"
+#import <CNLiveEnvironment/CNLiveEnvironment.h>
+#import <MJExtension.h>
+#import <CNLiveRequestBastKit/CNLiveNetworking.h>
+#import <CNLiveBaseKit/CNLiveBaseKit.h>
+#import <NSString+CNLiveExtension.h>
+#import <CNUserInfoManager.h>
+#import <CNLiveCommonCategory/CNLiveCommonCategory.h>
+#import <CNLiveVideoClassifyKit/CNLivevideoClassifyPCH.h>
+
+
+static NSString * const CNDarenDownloadShareSourceUrl = @"CNDarenDownloadShareSourceUrl";
+//24*60*60*1000
+#define kTimerLength 24*60*60*1000
+
+@interface CNTools ()
+
+@property (nonatomic, assign) BOOL firstDownload;
+@property (nonatomic, assign) BOOL needToChange;
+@property (nonatomic, copy) NSString *channel;
+
+@end
+
+@implementation CNTools
+
++ (instancetype)manager {
+    static CNTools *manager;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        manager = [[self alloc] init];
+    });
+    return manager;
+}
++ (void)GetClassifyChannelsUrlsAndSave {
+    
+    if ([CNTools manager].channelsRequesting) {
+        return;
+    }
+    [CNTools manager].channelsRequesting = YES;
+    NSDictionary *dic = @{
+        @"plat":@"i"
+    };
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNCategoryGetChannelUrl Param:dic CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        NSMutableArray *jsonArray = [[NSMutableArray alloc] init];
+        if ([NSArray isArray:responseObject[@"data"]]) {
+            
+            for (NSDictionary *dic in responseObject[@"data"]) {
+                NSString *jsonStr = CNLiveNSDictionaryDicToJson(dic);
+                [jsonArray addObject:jsonStr];
+            }
+            [[NSUserDefaults standardUserDefaults] setObject:jsonArray forKey:CNLiveNetAddGetCategoryChannels];
+            [[NSUserDefaults standardUserDefaults] synchronize];
+        }
+        if (![NSArray isArray:jsonArray]) {
+            [[NSNotificationCenter defaultCenter] postNotificationName:CNWjjClassifyChannelsRequestStateNotifiName object:nil userInfo:@{@"success":@"1"}];
+        } else {
+            [[NSNotificationCenter defaultCenter] postNotificationName:CNWjjClassifyChannelsRequestHideLoadingNotifiName object:nil userInfo:nil];
+        }
+        [CNTools manager].channelsRequesting = NO;
+        [CNTools manager].channelsRequested = YES;
+    }];
+    
+}
+
+
+
+
+@end