Skip to content

Commit bdc09b2

Browse files
LambdaLambda
authored andcommitted
话题为空,部分ui细节fix
1 parent 71494db commit bdc09b2

21 files changed

+142
-48
lines changed

.DS_Store

10 KB
Binary file not shown.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ DerivedData
1717
*.ipa
1818
*.xcuserstate
1919

20+
Coding_iOS/Coding_iOS-Prefix.pch
2021
Coding_iOS/Views/.DS_Store
2122
# CocoaPods
2223
#

Coding_iOS.xcodeproj/project.pbxproj

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,11 @@
484484
4EFE8DAF1B3960E6004B7559 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4EFE8DAE1B3960E6004B7559 /* [email protected] */; };
485485
4EFE8DB91B3A5727004B7559 /* Launch Screen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4EFE8DB81B3A5727004B7559 /* Launch Screen.xib */; };
486486
68D9A2AD062641F5BCA573C5 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B024F2227BD4152BC7C9A7A /* libPods.a */; };
487+
8B35164F1B6CE9460049BC45 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8B35164A1B6CE9460049BC45 /* [email protected] */; };
488+
8B3516501B6CE9460049BC45 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8B35164B1B6CE9460049BC45 /* [email protected] */; };
489+
8B3516511B6CE9460049BC45 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8B35164C1B6CE9460049BC45 /* [email protected] */; };
490+
8B3516521B6CE9460049BC45 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8B35164D1B6CE9460049BC45 /* [email protected] */; };
491+
8B3516531B6CE9460049BC45 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8B35164E1B6CE9460049BC45 /* [email protected] */; };
487492
8E03D4A219F695FE0092F8C8 /* libMobClickLibrary.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E03D49F19F695FE0092F8C8 /* libMobClickLibrary.a */; };
488493
8E03D4A419F696970092F8C8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E03D4A319F696970092F8C8 /* libz.dylib */; };
489494
8E1C3DEA19E7D58A00EF3032 /* AbstractActionSheetPicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E1C3DDA19E7D58A00EF3032 /* AbstractActionSheetPicker.m */; };
@@ -1540,6 +1545,11 @@
15401545
4EFE8DAE1B3960E6004B7559 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
15411546
4EFE8DB81B3A5727004B7559 /* Launch Screen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "Launch Screen.xib"; sourceTree = "<group>"; };
15421547
8B18B0211092D3903D031B13 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
1548+
8B35164A1B6CE9460049BC45 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1549+
8B35164B1B6CE9460049BC45 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1550+
8B35164C1B6CE9460049BC45 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1551+
8B35164D1B6CE9460049BC45 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1552+
8B35164E1B6CE9460049BC45 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
15431553
8E03D49F19F695FE0092F8C8 /* libMobClickLibrary.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libMobClickLibrary.a; sourceTree = "<group>"; };
15441554
8E03D4A019F695FE0092F8C8 /* MobClick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobClick.h; sourceTree = "<group>"; };
15451555
8E03D4A119F695FE0092F8C8 /* MobClickSocialAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobClickSocialAnalytics.h; sourceTree = "<group>"; };
@@ -1705,7 +1715,6 @@
17051715
8EA6CF1519E240C40076D59C /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
17061716
8EA6CF1619E240C40076D59C /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
17071717
8EA6CF1719E240C40076D59C /* Coding_iOS-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Coding_iOS-Info.plist"; sourceTree = "<group>"; };
1708-
8EA6CF1819E240C40076D59C /* Coding_iOS-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Coding_iOS-Prefix.pch"; sourceTree = "<group>"; };
17091718
8EA6CF1A19E240C40076D59C /* Coding_iOS.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Coding_iOS.xcdatamodel; sourceTree = "<group>"; };
17101719
8EA6CF1E19E240C40076D59C /* EditTopicViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditTopicViewController.h; sourceTree = "<group>"; };
17111720
8EA6CF1F19E240C40076D59C /* EditTopicViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EditTopicViewController.m; sourceTree = "<group>"; };
@@ -3229,7 +3238,6 @@
32293238
8EA6CF1619E240C40076D59C /* AppDelegate.m */,
32303239
4EFE8DB81B3A5727004B7559 /* Launch Screen.xib */,
32313240
8EA6CF1719E240C40076D59C /* Coding_iOS-Info.plist */,
3232-
8EA6CF1819E240C40076D59C /* Coding_iOS-Prefix.pch */,
32333241
4E8C51AE1AC0177600B4C51F /* Coding_iOS-Prefix.pch.example */,
32343242
8EA6CF1919E240C40076D59C /* Coding_iOS.xcdatamodeld */,
32353243
8EA6CFC519E240C40076D59C /* Images.xcassets */,
@@ -3417,6 +3425,11 @@
34173425
4E1A228C1AB19D1F00CFC14F /* git_btn_icons */,
34183426
8EA6CF5F19E240C40076D59C /* [email protected] */,
34193427
8EA6CF6319E240C40076D59C /* [email protected] */,
3428+
8B35164A1B6CE9460049BC45 /* [email protected] */,
3429+
8B35164B1B6CE9460049BC45 /* [email protected] */,
3430+
8B35164C1B6CE9460049BC45 /* [email protected] */,
3431+
8B35164D1B6CE9460049BC45 /* [email protected] */,
3432+
8B35164E1B6CE9460049BC45 /* [email protected] */,
34203433
8EA6CF7119E240C40076D59C /* [email protected] */,
34213434
8EA6CF7319E240C40076D59C /* [email protected] */,
34223435
8EA6CF7B19E240C40076D59C /* [email protected] */,
@@ -4150,6 +4163,7 @@
41504163
8E97CE6C1A0B243B006F9AD7 /* [email protected] in Resources */,
41514164
4E6383FD1B33C18700D98648 /* [email protected] in Resources */,
41524165
4EA6791A1A14BFA0001A0324 /* [email protected] in Resources */,
4166+
8B3516531B6CE9460049BC45 /* [email protected] in Resources */,
41534167
8EA6D19919E240C40076D59C /* [email protected] in Resources */,
41544168
4ED673261A8E127100DF2D1A /* [email protected] in Resources */,
41554169
8EA6D14A19E240C40076D59C /* InfoPlist.strings in Resources */,
@@ -4162,6 +4176,7 @@
41624176
4E6383B81B32640900D98648 /* [email protected] in Resources */,
41634177
8EA6D1A319E240C40076D59C /* [email protected] in Resources */,
41644178
4E6383AB1B3262D300D98648 /* [email protected] in Resources */,
4179+
8B3516511B6CE9460049BC45 /* [email protected] in Resources */,
41654180
8E97CE6A1A0A3424006F9AD7 /* [email protected] in Resources */,
41664181
4E07D3161A4D3CA6009EDDF2 /* [email protected] in Resources */,
41674182
4E96E7D91A1B537E0037C098 /* [email protected] in Resources */,
@@ -4269,6 +4284,7 @@
42694284
B94C1B6B1AC945FB0000C271 /* NewProject.storyboard in Resources */,
42704285
8EA6D1A519E240C40076D59C /* [email protected] in Resources */,
42714286
8ED2AAFA19F60D5200607A1D /* [email protected] in Resources */,
4287+
8B3516501B6CE9460049BC45 /* [email protected] in Resources */,
42724288
4EE1A23D1B5F3834004284F1 /* [email protected] in Resources */,
42734289
4E5C06E81AC2B34800F427C5 /* [email protected] in Resources */,
42744290
8EA6D19A19E240C40076D59C /* [email protected] in Resources */,
@@ -4319,6 +4335,7 @@
43194335
8E525C8D19F7E3F800496B34 /* [email protected] in Resources */,
43204336
4E217F101A70EDC700F6DF88 /* [email protected] in Resources */,
43214337
4E6383EC1B32A2C300D98648 /* [email protected] in Resources */,
4338+
8B35164F1B6CE9460049BC45 /* [email protected] in Resources */,
43224339
8EA6D16819E240C40076D59C /* [email protected] in Resources */,
43234340
4E9113A91A1CB19900AC9431 /* [email protected] in Resources */,
43244341
4E9113AB1A1CB19900AC9431 /* [email protected] in Resources */,
@@ -4370,6 +4387,7 @@
43704387
4E996C031ABBF56A00C704F1 /* [email protected] in Resources */,
43714388
8EA6D17F19E240C40076D59C /* [email protected] in Resources */,
43724389
4EACB4411A2C448F0097ABB3 /* [email protected] in Resources */,
4390+
8B3516521B6CE9460049BC45 /* [email protected] in Resources */,
43734391
4E0BD8851B6C7F0A0061CAA6 /* mock_topicAdlist.geojson in Resources */,
43744392
8E872CFE19EFEF0C002C8F34 /* [email protected] in Resources */,
43754393
8EA6D17419E240C40076D59C /* [email protected] in Resources */,

Coding_iOS/.DS_Store

6 KB
Binary file not shown.

Coding_iOS/Coding_iOS-Prefix.pch.example

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#import "UITableView+Common.h"
2727
#import "UIView+Common.h"
2828
#import "UIImageView+Common.h"
29+
#import "UIView+Frame.h"
2930
#import "UILabel+Common.h"
3031
#import "NSDate+Common.h"
3132
#import "UIBarButtonItem+Common.h"
@@ -36,6 +37,7 @@
3637
#import "NSObject+ObjectMap.h"
3738
#import "ImageSizeManager.h"
3839
#import "MobClick.h"
40+
3941
#import <BlocksKit/BlocksKit+UIKit.h>
4042
#import <ReactiveCocoa/ReactiveCocoa.h>
4143
#import <ReactiveCocoa/RACEXTScope.h>

Coding_iOS/Controllers/Search/CSSearchCell.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ + (CGFloat)cellHeightWithObj:(id)obj {
224224
cellHeight += 20;
225225
cellHeight += kTweetCell_PadingTop;
226226
cellHeight += [CSSearchCell contentLabelHeightWithTweet:tweet];
227-
// cellHeight += [CSSearchCell contentMediaHeightWithTweet:tweet];
228227
cellHeight += kTweetCell_PadingBottom;
229228
return cellHeight;
230229
}

Coding_iOS/Controllers/Search/CSSearchDisplayVC.m

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,6 @@ - (void)initSubViewsInContentView {
157157
vc.topicID = [dict[@"id"] intValue];
158158
[weakSelf.parentVC.navigationController pushViewController:vc animated:YES];
159159

160-
//TODO psy
161-
// self.searchBar.text = key;
162-
// [CSSearchModel addSearchHistory:self.searchBar.text];
163-
// [self initSearchHistoryView];
164-
// [self.searchBar resignFirstResponder];
165-
//
166-
// [self initSearchResultsTableView];
167160
};
168161
[_contentView addSubview:_topicHotkeyView];
169162
[_topicHotkeyView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -224,7 +217,7 @@ - (void)initSearchResultsTableView {
224217

225218
self.headerLabel = ({
226219

227-
UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, kScreen_Width, 35)];
220+
UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, kScreen_Width, 44)];
228221
label.backgroundColor = [UIColor whiteColor];
229222
label.textColor = [UIColor colorWithHexString:@"0x999999"];
230223
label.textAlignment = NSTextAlignmentCenter;
@@ -275,13 +268,14 @@ - (void)initSearchHistoryView {
275268
NSArray *array = [CSSearchModel getSearchHistory];
276269
CGFloat imageLeft = 12.0f;
277270
CGFloat textLeft = 34.0f;
278-
CGFloat height = 35.0f;
271+
CGFloat height = 44.0f;
279272

280273
for (int i = 0; i < array.count; i++) {
281274

282275
UILabel *lblHistory = [[UILabel alloc] initWithFrame:CGRectMake(textLeft, i * height, kScreen_Width - textLeft, height)];
283276
lblHistory.userInteractionEnabled = YES;
284-
lblHistory.textColor = [UIColor colorWithHexString:@"0x999999"];
277+
lblHistory.font = [UIFont systemFontOfSize:14];
278+
lblHistory.textColor = [UIColor colorWithHexString:@"0x222222"];
285279
lblHistory.text = array[i];
286280

287281
UIImageView *leftView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 12, 12)];
@@ -309,9 +303,10 @@ - (void)initSearchHistoryView {
309303
if(array.count) {
310304

311305
UIButton *btnClean = [UIButton buttonWithType:UIButtonTypeCustom];
306+
btnClean.titleLabel.font = [UIFont systemFontOfSize:14];
312307
[btnClean setTitle:@"清除搜索历史" forState:UIControlStateNormal];
313-
[btnClean setTitleColor:[UIColor colorWithHexString:@"0x3bbd79"] forState:UIControlStateNormal];
314-
[btnClean setTitleColor:[UIColor colorWithHexString:@"0x3bbd79" andAlpha:.3] forState:UIControlStateHighlighted];
308+
[btnClean setTitleColor:[UIColor colorWithHexString:@"0x1bbf75"] forState:UIControlStateNormal];
309+
// [btnClean setTitleColor:[UIColor colorWithHexString:@"0x3bbd79" andAlpha:.3] forState:UIControlStateHighlighted];
315310
[btnClean setFrame:CGRectMake(0, array.count * height, kScreen_Width, height)];
316311
[_searchHistoryView addSubview:btnClean];
317312
[btnClean addTarget:self action:@selector(didCLickedCleanSearchHistory:) forControlEvents:UIControlEventTouchUpInside];
@@ -469,7 +464,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
469464
cell.userBtnClickedBlock = ^(User *curUser){
470465
UserInfoViewController *vc = [[UserInfoViewController alloc] init];
471466
vc.curUser = curUser;
472-
// [[[UIApplication sharedApplication].windows[0] rootViewController].navigationController pushViewController:vc animated:YES];
473467
[self.parentVC.parentViewController.navigationController pushViewController:vc animated:YES];
474468
};
475469
cell.mediaItemClickedBlock = ^(HtmlMediaItem *curItem){

Coding_iOS/Controllers/Topic/CSLikesVC.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@
99
#import "LikersViewController.h"
1010

1111
@interface CSLikesVC : BaseViewController<UITableViewDataSource, UITableViewDelegate>
12-
13-
@property (nonatomic,strong)NSArray *userlist;
14-
12+
@property (nonatomic,assign)int topicID;
1513
@end

Coding_iOS/Controllers/Topic/CSLikesVC.m

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@
1010
#import "User.h"
1111
#import "UserCell.h"
1212
#import "UserInfoViewController.h"
13+
#import "Coding_NetAPIManager.h"
14+
#import "ODRefreshControl.h"
1315

1416
@interface CSLikesVC ()
1517

1618
@property (strong, nonatomic) UITableView *myTableView;
1719
@property (strong, nonatomic) NSMutableArray *searchResults;
18-
20+
@property (strong, nonatomic) ODRefreshControl *myRefreshControl;
21+
@property (nonatomic,strong)NSArray *userlist;
1922
@end
2023

2124
@implementation CSLikesVC
@@ -39,7 +42,28 @@ - (void)viewDidLoad {
3942
tableView;
4043
});
4144

42-
[self.myTableView reloadData];
45+
// _myRefreshControl = [[ODRefreshControl alloc] initInScrollView:self.myTableView];
46+
// [_myRefreshControl addTarget:self action:@selector(refresh) forControlEvents:UIControlEventValueChanged];
47+
48+
_userlist = @[];
49+
[self refresh];
50+
51+
}
52+
53+
- (void)refresh {
54+
55+
[[Coding_NetAPIManager sharedManager] request_JoinedUsers_WithTopicID:_topicID page:1 andBlock:^(NSArray *datalist, NSError *error) {
56+
if (datalist) {
57+
self.userlist = datalist;
58+
[self.myTableView reloadData];
59+
}
60+
}];
61+
}
62+
63+
- (void)dealloc
64+
{
65+
_myTableView.delegate = nil;
66+
_myTableView.dataSource = nil;
4367
}
4468

4569
#pragma mark Table M

Coding_iOS/Controllers/Topic/CSMyTopicVC.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ - (void)viewDidLoad {
6868
[weakCarousel scrollToItemAtIndex:index animated:NO];
6969
}];
7070
[self.view addSubview:_mySegmentControl];
71-
_myCarousel.scrollEnabled = NO;
71+
_myCarousel.scrollEnabled = YES;
7272

7373
}
7474

0 commit comments

Comments
 (0)