Commit a27a1f1f06021dd3933f0a1ecb0c4c51a184a327

Authored by yanglingyu
1 parent df17c390

0.4.9

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.4.8' 11 + s.version = '0.4.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/SearchView/Model/CNWitnessSearchModel.h
@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN @@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
15 @end 15 @end
16 16
17 @interface CNWitnessHotModel : NSObject 17 @interface CNWitnessHotModel : NSObject
18 -@property (nonatomic, assign)NSInteger score; 18 +@property (nonatomic, assign)NSInteger sort;
19 @property (nonatomic, copy)NSString *value; 19 @property (nonatomic, copy)NSString *value;
20 @end 20 @end
21 @interface CNPersonMessageModel : NSObject 21 @interface CNPersonMessageModel : NSObject
CNLiveVideoClassifyKit/Classes/SearchView/ViewController/CNWitnessSearchViewController.m
@@ -73,15 +73,10 @@ static NSString *const CNWitnessSearchHeaderViewID = @"CNWitnessSearchHeaderView @@ -73,15 +73,10 @@ static NSString *const CNWitnessSearchHeaderViewID = @"CNWitnessSearchHeaderView
73 [self.listVC.view mas_makeConstraints:^(MASConstraintMaker *make) { 73 [self.listVC.view mas_makeConstraints:^(MASConstraintMaker *make) {
74 make.left.equalTo(self.view).offset(kScreenWidth); 74 make.left.equalTo(self.view).offset(kScreenWidth);
75 make.bottom.equalTo(self.view); 75 make.bottom.equalTo(self.view);
76 - make.top.equalTo(self.collectionView); 76 + make.top.equalTo(self.topView.mas_bottom).offset(0.5);
77 make.width.mas_equalTo(kScreenWidth); 77 make.width.mas_equalTo(kScreenWidth);
78 }]; 78 }];
79 } 79 }
80 -- (void)viewDidDisappear:(BOOL)animated{  
81 - [super viewDidDisappear:animated];  
82 - [self removeChild:self.listVC];  
83 - self.listVC = nil;  
84 -}  
85 - (BOOL)preferredNavigationBarHidden{ 80 - (BOOL)preferredNavigationBarHidden{
86 return YES; 81 return YES;
87 } 82 }
@@ -136,7 +131,7 @@ static NSString *const CNWitnessSearchHeaderViewID = @"CNWitnessSearchHeaderView @@ -136,7 +131,7 @@ static NSString *const CNWitnessSearchHeaderViewID = @"CNWitnessSearchHeaderView
136 weakself 131 weakself
137 cell.deleteBlock = ^(NSString * _Nonnull str) { 132 cell.deleteBlock = ^(NSString * _Nonnull str) {
138 [weakSelf.histories removeObject:str]; 133 [weakSelf.histories removeObject:str];
139 - [CNWitnessSearchPresent saveSearchHistories:self.histories]; 134 + [CNWitnessSearchPresent saveSearchHistories:weakSelf.histories];
140 [weakSelf dealHotsAndHistories]; 135 [weakSelf dealHotsAndHistories];
141 }; 136 };
142 return cell; 137 return cell;
@@ -164,11 +159,11 @@ static NSString *const CNWitnessSearchHeaderViewID = @"CNWitnessSearchHeaderView @@ -164,11 +159,11 @@ static NSString *const CNWitnessSearchHeaderViewID = @"CNWitnessSearchHeaderView
164 case 1: 159 case 1:
165 { 160 {
166 [weakSelf.histories removeAllObjects]; 161 [weakSelf.histories removeAllObjects];
167 - [CNWitnessSearchPresent saveSearchHistories:self.histories]; 162 + [CNWitnessSearchPresent saveSearchHistories:weakSelf.histories];
168 [weakSelf dealHotsAndHistories]; 163 [weakSelf dealHotsAndHistories];
169 } 164 }
170 break; 165 break;
171 - 166 +
172 default: 167 default:
173 break; 168 break;
174 } 169 }