Skip to content

Commit bb1e3a4

Browse files
author
panshiyu
committed
bugfix && 提交话题页
1 parent 20ff606 commit bb1e3a4

23 files changed

Lines changed: 1403 additions & 4 deletions

‎Coding_iOS.xcodeproj/project.pbxproj‎

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,14 @@
769769
FEC419251B53A39B00C498F5 /* CSSearchVC.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC419241B53A39B00C498F5 /* CSSearchVC.m */; };
770770
FEC419281B53A92600C498F5 /* CSSearchModel.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC419271B53A92600C498F5 /* CSSearchModel.m */; };
771771
FEC4192B1B53A9E300C498F5 /* TMCacheExtend.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC4192A1B53A9E300C498F5 /* TMCacheExtend.m */; };
772+
FEF35EC71B56A4A50000280F /* CSHotTopicVC.m in Sources */ = {isa = PBXBuildFile; fileRef = FEF35EC61B56A4A50000280F /* CSHotTopicVC.m */; };
773+
FEF35ECA1B56A4B40000280F /* CSMyTopicVC.m in Sources */ = {isa = PBXBuildFile; fileRef = FEF35EC91B56A4B40000280F /* CSMyTopicVC.m */; };
774+
FEF35ECD1B56A8B70000280F /* CSTopicModel.m in Sources */ = {isa = PBXBuildFile; fileRef = FEF35ECC1B56A8B70000280F /* CSTopicModel.m */; };
775+
FEF35ED01B56C2870000280F /* CSScrollview.m in Sources */ = {isa = PBXBuildFile; fileRef = FEF35ECF1B56C2870000280F /* CSScrollview.m */; };
776+
FEF35ED31B56C89E0000280F /* UIView+Frame.m in Sources */ = {isa = PBXBuildFile; fileRef = FEF35ED21B56C89E0000280F /* UIView+Frame.m */; };
777+
FEF35EDE1B580BC00000280F /* mock_topicAdlist.geojson in Resources */ = {isa = PBXBuildFile; fileRef = FEF35EDD1B580BC00000280F /* mock_topicAdlist.geojson */; };
778+
FEF35EE01B580BD90000280F /* mock_hotTopiclist.geojson in Resources */ = {isa = PBXBuildFile; fileRef = FEF35EDF1B580BD90000280F /* mock_hotTopiclist.geojson */; };
779+
FEF35EE31B5839090000280F /* CSTopicCreateVC.m in Sources */ = {isa = PBXBuildFile; fileRef = FEF35EE21B5839090000280F /* CSTopicCreateVC.m */; };
772780
/* End PBXBuildFile section */
773781

774782
/* Begin PBXFileReference section */
@@ -1949,6 +1957,20 @@
19491957
FEC419271B53A92600C498F5 /* CSSearchModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSearchModel.m; sourceTree = "<group>"; };
19501958
FEC419291B53A9E300C498F5 /* TMCacheExtend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TMCacheExtend.h; sourceTree = "<group>"; };
19511959
FEC4192A1B53A9E300C498F5 /* TMCacheExtend.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TMCacheExtend.m; sourceTree = "<group>"; };
1960+
FEF35EC51B56A4A50000280F /* CSHotTopicVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSHotTopicVC.h; sourceTree = "<group>"; };
1961+
FEF35EC61B56A4A50000280F /* CSHotTopicVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSHotTopicVC.m; sourceTree = "<group>"; };
1962+
FEF35EC81B56A4B40000280F /* CSMyTopicVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSMyTopicVC.h; sourceTree = "<group>"; };
1963+
FEF35EC91B56A4B40000280F /* CSMyTopicVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSMyTopicVC.m; sourceTree = "<group>"; };
1964+
FEF35ECB1B56A8B70000280F /* CSTopicModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSTopicModel.h; sourceTree = "<group>"; };
1965+
FEF35ECC1B56A8B70000280F /* CSTopicModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSTopicModel.m; sourceTree = "<group>"; };
1966+
FEF35ECE1B56C2870000280F /* CSScrollview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSScrollview.h; sourceTree = "<group>"; };
1967+
FEF35ECF1B56C2870000280F /* CSScrollview.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSScrollview.m; sourceTree = "<group>"; };
1968+
FEF35ED11B56C89E0000280F /* UIView+Frame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Frame.h"; sourceTree = "<group>"; };
1969+
FEF35ED21B56C89E0000280F /* UIView+Frame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Frame.m"; sourceTree = "<group>"; };
1970+
FEF35EDD1B580BC00000280F /* mock_topicAdlist.geojson */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mock_topicAdlist.geojson; sourceTree = "<group>"; };
1971+
FEF35EDF1B580BD90000280F /* mock_hotTopiclist.geojson */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mock_hotTopiclist.geojson; sourceTree = "<group>"; };
1972+
FEF35EE11B5839090000280F /* CSTopicCreateVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSTopicCreateVC.h; sourceTree = "<group>"; };
1973+
FEF35EE21B5839090000280F /* CSTopicCreateVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSTopicCreateVC.m; sourceTree = "<group>"; };
19521974
/* End PBXFileReference section */
19531975

19541976
/* Begin PBXFrameworksBuildPhase section */
@@ -2647,6 +2669,8 @@
26472669
4E72F82C1B144778001B6CE6 /* NSMutableString+Common.m */,
26482670
4E5A66931B268D160007A0AD /* UIView+PressMenu.h */,
26492671
4E5A66941B268D160007A0AD /* UIView+PressMenu.m */,
2672+
FEF35ED11B56C89E0000280F /* UIView+Frame.h */,
2673+
FEF35ED21B56C89E0000280F /* UIView+Frame.m */,
26502674
);
26512675
path = OC_Category;
26522676
sourceTree = "<group>";
@@ -3088,6 +3112,7 @@
30883112
8EA6CF1B19E240C40076D59C /* Controllers */ = {
30893113
isa = PBXGroup;
30903114
children = (
3115+
FEF35EC41B56A4860000280F /* Topic */,
30913116
FEC419221B53A35100C498F5 /* Search */,
30923117
B9A00D7D1ACA39F1008BA008 /* ProjectSetting */,
30933118
B94C1B661AC945C60000C271 /* NewProject */,
@@ -3946,10 +3971,29 @@
39463971
FEC4192A1B53A9E300C498F5 /* TMCacheExtend.m */,
39473972
1C222A231B54DF6E0026F8B4 /* CSSearchDisplayVC.h */,
39483973
1C222A241B54DF6E0026F8B4 /* CSSearchDisplayVC.m */,
3974+
FEF35EDD1B580BC00000280F /* mock_topicAdlist.geojson */,
3975+
FEF35EDF1B580BD90000280F /* mock_hotTopiclist.geojson */,
39493976
);
39503977
path = Search;
39513978
sourceTree = "<group>";
39523979
};
3980+
FEF35EC41B56A4860000280F /* Topic */ = {
3981+
isa = PBXGroup;
3982+
children = (
3983+
FEF35EC51B56A4A50000280F /* CSHotTopicVC.h */,
3984+
FEF35EC61B56A4A50000280F /* CSHotTopicVC.m */,
3985+
FEF35EC81B56A4B40000280F /* CSMyTopicVC.h */,
3986+
FEF35EC91B56A4B40000280F /* CSMyTopicVC.m */,
3987+
FEF35ECB1B56A8B70000280F /* CSTopicModel.h */,
3988+
FEF35ECC1B56A8B70000280F /* CSTopicModel.m */,
3989+
FEF35ECE1B56C2870000280F /* CSScrollview.h */,
3990+
FEF35ECF1B56C2870000280F /* CSScrollview.m */,
3991+
FEF35EE11B5839090000280F /* CSTopicCreateVC.h */,
3992+
FEF35EE21B5839090000280F /* CSTopicCreateVC.m */,
3993+
);
3994+
path = Topic;
3995+
sourceTree = "<group>";
3996+
};
39533997
/* End PBXGroup section */
39543998

39553999
/* Begin PBXNativeTarget section */
@@ -4083,6 +4127,7 @@
40834127
4EDD8F521A36F42300E9E232 /* ReleaseNotes.txt in Resources */,
40844128
8EA6D19619E240C40076D59C /* [email protected] in Resources */,
40854129
4E6383BC1B32640900D98648 /* [email protected] in Resources */,
4130+
FEF35EE01B580BD90000280F /* mock_hotTopiclist.geojson in Resources */,
40864131
4E743E6F1A88ABF700DADDE5 /* [email protected] in Resources */,
40874132
8E97CE631A0A3424006F9AD7 /* [email protected] in Resources */,
40884133
8E97CEA41A0C7E26006F9AD7 /* [email protected] in Resources */,
@@ -4165,6 +4210,7 @@
41654210
4E96E7DB1A1B537E0037C098 /* [email protected] in Resources */,
41664211
4EF17ED51B3C3112003CDD2D /* [email protected] in Resources */,
41674212
8EA6D19B19E240C40076D59C /* [email protected] in Resources */,
4213+
FEF35EDE1B580BC00000280F /* mock_topicAdlist.geojson in Resources */,
41684214
8EF6434119FE696B00F7EEB0 /* [email protected] in Resources */,
41694215
4EF17ED61B3C3112003CDD2D /* [email protected] in Resources */,
41704216
4E4D6ABE1B252C5300FD2E49 /* [email protected] in Resources */,
@@ -4433,6 +4479,7 @@
44334479
4ECE8B031A3946C10021E29C /* TagsManager.m in Sources */,
44344480
4E4D6AAC1B1EED6A00FD2E49 /* AddCommentCell.m in Sources */,
44354481
8EA6D1CC19E240C40076D59C /* UITTTAttributedLabel.m in Sources */,
4482+
FEF35ED31B56C89E0000280F /* UIView+Frame.m in Sources */,
44364483
8EF643C619FF7E2900F7EEB0 /* TitleValueCell.m in Sources */,
44374484
4EA7F1671A6D192B00A046BD /* ODRefreshControl.m in Sources */,
44384485
8EA6D20C19E240C40076D59C /* RDVTabBarItem.m in Sources */,
@@ -4572,6 +4619,7 @@
45724619
4E6D71891A75F00E005AD988 /* YLGIFImage.m in Sources */,
45734620
0A27A05D1AB5A13B00067833 /* TweetSendLocationDetailViewController.m in Sources */,
45744621
0AB591B01AB6D6BE0076C454 /* TweetSendMapAnnotation.m in Sources */,
4622+
FEF35ECD1B56A8B70000280F /* CSTopicModel.m in Sources */,
45754623
4ECF70491B185BCC000280FF /* MRPR.m in Sources */,
45764624
4E8D5D661B45306900B70936 /* OTPListViewController.m in Sources */,
45774625
4EA7F1651A6D192B00A046BD /* UIImageView+WebCache.m in Sources */,
@@ -4681,6 +4729,7 @@
46814729
4E1A22881AB1731600CFC14F /* ProjectDescriptionCell.m in Sources */,
46824730
4ECE8AE11A3943E80021E29C /* UIButton+Common.m in Sources */,
46834731
4ECE8AD81A3943E80021E29C /* UIDownMenuButton.m in Sources */,
4732+
FEF35ECA1B56A4B40000280F /* CSMyTopicVC.m in Sources */,
46844733
8EA6D14819E240C40076D59C /* UsersViewController.m in Sources */,
46854734
4E94C4FF1B4D2B9300EB668A /* MenuButton.m in Sources */,
46864735
3A3878401AE295970078D5DE /* ResetLabelCell.m in Sources */,
@@ -4761,6 +4810,7 @@
47614810
4E59E1D31A5E6B34004DAEEC /* TaskDescriptionViewController.m in Sources */,
47624811
4ECE8AFD1A3946C10021E29C /* AddressManager.m in Sources */,
47634812
B9A00D821ACA3A17008BA008 /* ProjectSettingViewController.m in Sources */,
4813+
FEF35EC71B56A4A50000280F /* CSHotTopicVC.m in Sources */,
47644814
8E1C3DED19E7D58A00EF3032 /* ActionSheetDistancePicker.m in Sources */,
47654815
8E59F0F41A00F3B9009A905F /* ProjectCodeListCell.m in Sources */,
47664816
0A6E6BAA1AAF4B24004C0107 /* TweetSendLocationViewController.m in Sources */,
@@ -4789,9 +4839,11 @@
47894839
4E4D6A821B1C6D5F00FD2E49 /* FileChangesIntroduceCell.m in Sources */,
47904840
8EA6D1BE19E240C40076D59C /* Register.m in Sources */,
47914841
4ECF70431B18514F000280FF /* MRPRListViewController.m in Sources */,
4842+
FEF35EE31B5839090000280F /* CSTopicCreateVC.m in Sources */,
47924843
4E969CD01AF0EB87005C0CCE /* NSTimer+Common.m in Sources */,
47934844
8EF643B019FF7E2900F7EEB0 /* CodingTipCell.m in Sources */,
47944845
8EA6D1BA19E240C40076D59C /* Projects.m in Sources */,
4846+
FEF35ED01B56C2870000280F /* CSScrollview.m in Sources */,
47954847
4E996BDF1ABA7CE100C704F1 /* UserInfoDetailUserCell.m in Sources */,
47964848
4EACB4461A2C60110097ABB3 /* ProjectActivities.m in Sources */,
47974849
8EA6D1CB19E240C40076D59C /* UITapImageView.m in Sources */,
@@ -4926,7 +4978,7 @@
49264978
"$(PROJECT_DIR)/Coding_iOS/Vendor/XGPush",
49274979
);
49284980
PRODUCT_NAME = Coding_iOS;
4929-
PROVISIONING_PROFILE = "";
4981+
PROVISIONING_PROFILE = "21f7faa3-9329-4375-aea1-90b277640a40";
49304982
TARGETED_DEVICE_FAMILY = 1;
49314983
WRAPPER_EXTENSION = app;
49324984
};
@@ -4959,7 +5011,7 @@
49595011
"$(PROJECT_DIR)/Coding_iOS/Vendor/XGPush",
49605012
);
49615013
PRODUCT_NAME = Coding_iOS;
4962-
PROVISIONING_PROFILE = "";
5014+
PROVISIONING_PROFILE = "21f7faa3-9329-4375-aea1-90b277640a40";
49635015
TARGETED_DEVICE_FAMILY = 1;
49645016
WRAPPER_EXTENSION = app;
49655017
};

‎Coding_iOS/Coding_iOS-Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleExecutable</key>
1010
<string>${EXECUTABLE_NAME}</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>com.dp.test1</string>
12+
<string>com.dv.snake</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

‎Coding_iOS/Coding_iOS-Prefix.pch‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#import "UIButton+Common.h"
2626
#import "UITableView+Common.h"
2727
#import "UIView+Common.h"
28+
#import "UIView+Frame.h"
2829
#import "UIImageView+Common.h"
2930
#import "UILabel+Common.h"
3031
#import "NSDate+Common.h"

‎Coding_iOS/Controllers/Search/CSSearchDisplayVC.m‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515

1616
#import "CSSearchModel.h"
1717

18+
#import "RKSwipeBetweenViewControllers.h"
19+
#import "CSHotTopicVC.h"
20+
#import "CSMyTopicVC.h"
21+
1822
#define kCellIdentifier_Search @"com.coding.search.tweet.result"
1923

2024
@interface CSSearchDisplayVC () <UISearchBarDelegate, UITableViewDelegate, UITableViewDataSource>
@@ -227,7 +231,22 @@ - (void)initSearchHistoryView {
227231

228232
- (void)didClickedMoreHotkey:(id)sender {
229233

234+
RKSwipeBetweenViewControllers *nav_topic = [RKSwipeBetweenViewControllers newSwipeBetweenViewControllers];
235+
[nav_topic.viewControllerArray addObjectsFromArray:@[[CSHotTopicVC new],[CSMyTopicVC new]]];
236+
nav_topic.buttonText = @[@"热门话题", @"我的话题"];
237+
238+
CATransition *transition = [CATransition animation];
239+
transition.duration = 0.3;
240+
transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
241+
transition.type = kCATransitionPush;
242+
transition.subtype = kCATransitionFromRight;
243+
230244

245+
[self.searchContentsController.view.window.layer addAnimation:transition forKey:nil];
246+
247+
[self.searchContentsController presentViewController:nav_topic animated:NO completion:^{
248+
249+
}];
231250
}
232251

233252
- (void)didCLickedCleanSearchHistory:(id)sender {

‎Coding_iOS/Controllers/Search/CSSearchVC.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ @implementation CSSearchVC
1717
- (void)viewDidLoad {
1818
[super viewDidLoad];
1919
// Do any additional setup after loading the view.
20+
2021
}
2122

2223
@end

‎Coding_iOS/Controllers/Search/mock_hotTopiclist.geojson‎

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

‎Coding_iOS/Controllers/Search/mock_topicAdlist.geojson‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"code":0,"data":[{"id":383,"name":"码市","speackers":27,"watchers":30,"count":30,"image_url":"https://dn-coding-net-production-static.qbox.me/ae45c967-54ac-4f85-9509-c04dc44b236a.png","description":"码市，让技术变现","watched":false,"created_at":1436168268000},{"id":160,"name":"悬赏3000","speackers":1,"watchers":2,"count":1,"image_url":"https://dn-coding-net-public-image.qbox.me/9720fe33-b093-4e0b-b646-6b1e1bad58e8.png","description":"悬赏 3000，为 coding 客户端添加 ”冒泡搜索“、”冒泡话题“ 功能！","watched":false,"created_at":1430793634000},{"id":146,"name":"Coding 开源组件","speackers":2,"watchers":8,"count":2,"image_url":"https://dn-coding-net-public-image.qbox.me/97809bbf-993f-4490-88cc-59ce1a0f12d6.jpg","description":"Coding 网页适配版（m.coding.net）开源啦！","watched":false,"created_at":1430358533000}]}

‎Coding_iOS/Controllers/Topic/CSHotTopicVC.h‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
//
2+
// CSHotTopicVC.h
3+
// Coding_iOS
4+
//
5+
// Created by pan Shiyu on 15/7/15.
6+
// Copyright (c) 2015年 Coding. All rights reserved.
7+
//
8+
9+
#import <UIKit/UIKit.h>
10+
#import "CSScrollview.h"
11+
12+
@interface CSHotTopicVC : UIViewController
13+
14+
@end
15+
16+
//普通cell
17+
@interface CSHotTopicCell : UITableViewCell
18+
19+
- (void)updateDisplayByTopic:(id)data;
20+
21+
@end
22+
23+
//title使用
24+
@interface CSHotTopicTitleCell : UITableViewCell
25+
26+
@end
27+
28+
//ad cell
29+
@interface CSHotAdCell : UITableViewCell
30+
31+
@end
32+

0 commit comments

Comments
 (0)