0.7.7

yanglingyu
1 parent 1cbbfdbd
Showing 6 changed files with 89 additions and 32 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Classes/SearchView/Model/CNWitnessSearchModel.h
CNLiveVideoClassifyKit/Classes/SearchView/Model/CNWitnessSearchModel.m
CNLiveVideoClassifyKit/Classes/SearchView/View/CNWitnessSearchPersonCell.m
CNLiveVideoClassifyKit/Classes/SearchView/View/CNWitnessSearchVideoCell.m
Example/Podfile.lock
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveVideoClassifyKit'
-  s.version          = '0.7.6'
+  s.version          = '0.7.7'
   s.summary          = '视讯头部一二级菜单组件'
 # This description is used to generate tags and improve search results.
@@ -14,7 +14,19 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy)NSString *title;
 @property (nonatomic, strong)NSArray <NSString *>* list;
 @end
-
+///用户认证信息
+@interface CNAuthInfosModel : NSObject
+/// 认证id
+@property (nonatomic, copy)NSString *officialId;
+/// 文字背景色
+@property (nonatomic, copy)NSString *background_color;
+/// 认证图标
+@property (nonatomic, copy)NSString *icon;
+/// 认证名称
+@property (nonatomic, copy)NSString *name;
+/// 字体颜色
+@property (nonatomic, copy)NSString *text_color;
+@end
 @interface CNWitnessHotModel : NSObject
 @property (nonatomic, assign)NSInteger sort;
 @property (nonatomic, copy)NSString *value;
@@ -30,7 +42,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong)NSDictionary *vip;
 @property (nonatomic, assign)NSInteger fansNum;
 @property (nonatomic, assign)NSInteger focusNum;
+/// 认证信息
+@property (nonatomic, strong)NSArray<CNAuthInfosModel *>* authInfos;
 @end
+
 @interface CNToolMessageModel : NSObject
 @property (nonatomic, assign)NSInteger commentsNum;
 @property (nonatomic, strong)NSArray * commentList;
@@ -44,6 +59,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign)NSInteger collectionNum;
 @property (nonatomic, copy)NSString *sort;
 @property (nonatomic, copy)NSString *voted;
+
 @end
 @interface CNWitnessSearchDetailModel : NSObject
 @property (nonatomic, copy)NSString *title;
@@ -15,11 +15,16 @@
 @end
 @implementation CNPersonMessageModel
-
++ (NSDictionary *)mj_objectClassInArray{
+    return @{@"authInfos":@"CNAuthInfosModel"};
+}
 @end
 @implementation CNToolMessageModel
 @end
+@implementation CNAuthInfosModel
+
+@end
 @implementation CNWitnessSearchDetailModel
 @end
@@ -11,6 +11,7 @@
 @interface CNWitnessSearchPersonCell ()
 @property (nonatomic, strong)UIImageView *logoImage;
+@property (nonatomic, strong)UIImageView *authInfoImage;
 @property (nonatomic, strong)UILabel *nameLabel;
 @property (nonatomic, strong)UILabel *fansNumLabel;
 @property (nonatomic, strong)QMUIButton *focusedBtn;
@@ -21,6 +22,7 @@
 - (instancetype)initWithFrame:(CGRect)frame{
     if (self = [super initWithFrame:frame]) {
         [self.contentView addSubview:self.logoImage];
+        [self.contentView addSubview:self.authInfoImage];
         [self.contentView addSubview:self.nameLabel];
         [self.contentView addSubview:self.fansNumLabel];
         [self.contentView addSubview:self.focusedBtn];
@@ -30,6 +32,10 @@
             make.centerY.equalTo(self);
             make.width.height.mas_equalTo(50);
         }];
+        [self.authInfoImage mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.width.height.mas_equalTo(12);
+            make.right.bottom.equalTo(self.logoImage).offset(-2);
+        }];
         [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
             make.top.equalTo(self.logoImage).offset(4);
             make.left.equalTo(self.logoImage.mas_right).offset(15);
@@ -91,6 +97,10 @@
         self.focusedBtn.layer.borderWidth = 0;
     }
     self.focusedBtn.hidden = [CNUserShareModelUid isEqualToString:model.id];
+    if (model.authInfos.count>0) {
+        CNAuthInfosModel *authModel = model.authInfos[0];
+        [self.authInfoImage sd_setImageWithURL:[NSURL URLWithString:authModel.icon]];
+    }
 }
 #pragma mark - Getting
 - (UIImageView *)logoImage
@@ -118,6 +128,14 @@
     }
     return _logoImage;
 }
+- (UIImageView *)authInfoImage
+{
+    if (!_authInfoImage) {
+        _authInfoImage = [[UIImageView alloc] init];
+        _authInfoImage.contentMode = UIViewContentModeScaleAspectFit;
+    }
+    return _authInfoImage;
+}
 - (UILabel *)nameLabel
 {
     if (!_nameLabel) {
@@ -15,6 +15,7 @@
 @property (nonatomic, strong)UIImageView *playImage;
 @property (nonatomic, strong)UILabel *titleLabel;
 @property (nonatomic, strong)UIImageView *logoImage;
+@property (nonatomic, strong)UIImageView *authInfoImage;
 @property (nonatomic, strong)UILabel *nameLabel;
 @property (nonatomic, strong)QMUIButton *likeBtn;
 @end
@@ -27,6 +28,7 @@
         [self.videoImage addSubview:self.playImage];
         [self.bgView addSubview:self.titleLabel];
         [self.bgView addSubview:self.logoImage];
+        [self.bgView addSubview:self.authInfoImage];
         [self.bgView addSubview:self.nameLabel];
         [self.bgView addSubview:self.likeBtn];
         [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -51,6 +53,10 @@
             make.left.equalTo(self.contentView).offset(10);
             make.width.height.mas_equalTo(21);
         }];
+        [self.authInfoImage mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.width.height.mas_equalTo(6);
+            make.right.bottom.equalTo(self.logoImage).offset(-1);
+        }];
         [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
             make.centerY.equalTo(self.logoImage);
             make.left.equalTo(self.logoImage.mas_right).offset(5);
@@ -118,6 +124,10 @@
     [self.likeBtn setTitle:[NSString stringWithFormat:@"%ld",model.tool.likesNum] forState:UIControlStateNormal];
     [self.likeBtn setTitle:[NSString stringWithFormat:@"%ld",model.tool.likesNum] forState:UIControlStateSelected];
     self.likeBtn.selected = _model.tool.liked;
+    if (model.icon.authInfos.count>0) {
+        CNAuthInfosModel *authModel = model.icon.authInfos[0];
+        [self.authInfoImage sd_setImageWithURL:[NSURL URLWithString:authModel.icon]];
+    }
     [self.likeBtn sizeToFit];
 }
 #pragma mark - Getting
@@ -169,6 +179,14 @@
     }
     return _logoImage;
 }
+- (UIImageView *)authInfoImage
+{
+    if (!_authInfoImage) {
+        _authInfoImage = [[UIImageView alloc] init];
+        _authInfoImage.contentMode = UIViewContentModeScaleAspectFit;
+    }
+    return _authInfoImage;
+}
 - (UILabel *)nameLabel
 {
     if (!_nameLabel) {
@@ -138,48 +138,48 @@ PODS:
     - CNLiveUserManagement
     - WebViewJavascriptBridge
   - CNLiveEnvironment (0.4.5)
-  - CNLiveNewTripartiteManagement/AFNetworking (0.2.0.8):
+  - CNLiveNewTripartiteManagement/AFNetworking (0.2.0.9):
     - AFNetworking (= 4.0.0)
-  - CNLiveNewTripartiteManagement/Masonry (0.2.0.8):
+  - CNLiveNewTripartiteManagement/Masonry (0.2.0.9):
     - Masonry (= 1.1.0)
-  - CNLiveNewTripartiteManagement/MJExtension (0.2.0.8):
+  - CNLiveNewTripartiteManagement/MJExtension (0.2.0.9):
     - MJExtension (= 3.2.1)
-  - CNLiveNewTripartiteManagement/MJRefresh (0.2.0.8):
+  - CNLiveNewTripartiteManagement/MJRefresh (0.2.0.9):
     - MJRefresh (= 3.2.0)
-  - CNLiveNewTripartiteManagement/QMUIKit (0.2.0.8):
+  - CNLiveNewTripartiteManagement/QMUIKit (0.2.0.9):
     - QMUIKit (= 4.2.1)
-  - CNLiveNewTripartiteManagement/SDCycleScrollView (0.2.0.8):
+  - CNLiveNewTripartiteManagement/SDCycleScrollView (0.2.0.9):
     - SDCycleScrollView (= 1.80)
-  - CNLiveNewTripartiteManagement/SDWebImage (0.2.0.8):
+  - CNLiveNewTripartiteManagement/SDWebImage (0.2.0.9):
     - SDWebImage (= 5.2.3)
-  - CNLiveNewTripartiteManagement/SSZipArchive (0.2.0.8):
+  - CNLiveNewTripartiteManagement/SSZipArchive (0.2.0.9):
     - SSZipArchive (= 2.1.5)
-  - CNLiveNewTripartiteManagement/WechatOpenSDK (0.2.0.8):
+  - CNLiveNewTripartiteManagement/WechatOpenSDK (0.2.0.9):
     - WechatOpenSDK (= 1.8.7.1)
-  - CNLiveNewTripartiteManagement/WeiboSDK (0.2.0.8):
-    - Weibo_SDK (= 3.2.7)
-  - CNLiveNewTripartiteManagement/YYAsyncLayer (0.2.0.8):
+  - CNLiveNewTripartiteManagement/WeiboSDK (0.2.0.9):
+    - Weibo_SDK (= 3.3.0)
+  - CNLiveNewTripartiteManagement/YYAsyncLayer (0.2.0.9):
     - YYAsyncLayer (= 1.0)
-  - CNLiveNewTripartiteManagement/YYCache (0.2.0.8):
+  - CNLiveNewTripartiteManagement/YYCache (0.2.0.9):
     - YYCache (= 1.0.4)
-  - CNLiveNewTripartiteManagement/YYCategories (0.2.0.8):
+  - CNLiveNewTripartiteManagement/YYCategories (0.2.0.9):
     - YYCategories (= 1.0.4)
-  - CNLiveNewTripartiteManagement/YYDispatchQueuePool (0.2.0.8):
+  - CNLiveNewTripartiteManagement/YYDispatchQueuePool (0.2.0.9):
     - YYDispatchQueuePool (= 1.0)
-  - CNLiveNewTripartiteManagement/YYImage (0.2.0.8):
+  - CNLiveNewTripartiteManagement/YYImage (0.2.0.9):
     - YYImage (= 1.0.4)
-  - CNLiveNewTripartiteManagement/YYKeyboardManager (0.2.0.8):
+  - CNLiveNewTripartiteManagement/YYKeyboardManager (0.2.0.9):
     - YYKeyboardManager (= 1.0.1)
-  - CNLiveNewTripartiteManagement/YYModel (0.2.0.8):
+  - CNLiveNewTripartiteManagement/YYModel (0.2.0.9):
     - YYModel (= 1.0.4)
-  - CNLiveNewTripartiteManagement/YYText (0.2.0.8):
+  - CNLiveNewTripartiteManagement/YYText (0.2.0.9):
     - YYText (= 1.0.7)
-  - CNLiveNewTripartiteManagement/YYWebImage (0.2.0.8):
+  - CNLiveNewTripartiteManagement/YYWebImage (0.2.0.9):
     - YYWebImage (= 1.0.5)
-  - CNLiveRequestBastKit (0.2.5.8):
+  - CNLiveRequestBastKit (0.2.6.0):
     - AFNetworking
   - CNLiveSDK/CNLiveStat (0.3.5.0)
-  - CNLiveShareToolKit (0.4.4):
+  - CNLiveShareToolKit (0.4.6):
     - CNLiveCommonCategory
     - CNLiveEnvironment
     - CNLiveNewTripartiteManagement/AFNetworking
@@ -194,7 +194,7 @@ PODS:
   - CNLiveTencentopenapi (0.0.3)
   - CNLiveUserManagement (0.1.5):
     - CNLiveNewTripartiteManagement/MJExtension
-  - CNLiveVideoClassifyKit (0.6.8):
+  - CNLiveVideoClassifyKit (0.7.6):
     - CNLiveBaseKit
     - CNLiveBaseTools
     - CNLiveBeeHive
@@ -560,7 +560,7 @@ PODS:
   - UMDevice (2.2.1)
   - WebViewJavascriptBridge (6.0.3)
   - WechatOpenSDK (1.8.7.1)
-  - Weibo_SDK (3.2.7)
+  - Weibo_SDK (3.3.0)
   - YYAsyncLayer (1.0)
   - YYCache (1.0.4)
   - YYCategories (1.0.4):
@@ -648,13 +648,13 @@ SPEC CHECKSUMS:
   CNLiveCustomUI: d33b487d45d7c2411d12cf63ed2aaefe2cb02273
   CNLiveCWebViewModule: 7f48305d603dd362943b4fc24f888a8ee77fe639
   CNLiveEnvironment: ceec94d48016f2c76794ba0e19d9bf343f091065
-  CNLiveNewTripartiteManagement: 8cb5eb9c78bf45ce75d505c9ad6cf72d257df2c3
-  CNLiveRequestBastKit: 2c4834ecb6abf2f1191100b2e904d16a79bcb3c4
+  CNLiveNewTripartiteManagement: 7fb07741462b67e290997f80efc42a3df47049bc
+  CNLiveRequestBastKit: ef3ebe292acaf2922189ea8b46cc8a9ef48b0b33
   CNLiveSDK: 31b81f0296df1aeff28134e93d006a5e96f0f31f
-  CNLiveShareToolKit: f910a6cb6bac6038e27d582dd7e0b8c41ca4778f
+  CNLiveShareToolKit: c9e31fc76e9559f1a675aea6c2237ef153aaecee
   CNLiveTencentopenapi: d7c4cea634f51cae6aa61286dc3847193246dc6d
   CNLiveUserManagement: ead053f2d701b01ea8fb5f1da572be788f2dd3cf
-  CNLiveVideoClassifyKit: 3f81acad60edb8cecaebf6b94fdc29bdaf194570
+  CNLiveVideoClassifyKit: ef860faa9ce04b5506d7d6562ba4019147948da4
   JXCategoryView: 7b1ee69ede4843c581688afe84d0f047723262f2
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545
@@ -669,7 +669,7 @@ SPEC CHECKSUMS:
   UMDevice: 053478c4b4d7292f31f0a275c227d3c4007a5571
   WebViewJavascriptBridge: 7f5bc4d3581e672e8f32bd0f812d54bc69bb8e29
   WechatOpenSDK: 6a4d1436c15b3b5fe2a0bd383f3046010186da44
-  Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089
+  Weibo_SDK: 7478846cccb43c4785ba76b214115fb7ec9dc0d4
   YYAsyncLayer: df6b01ebc695c5f6b4c15dd5c23fa3e081eb25c0
   YYCache: 8105b6638f5e849296c71f331ff83891a4942952
   YYCategories: 6bcd4314c6661a561410dce4a793379ebd306abd