Skip to content

Commit 45d6f03

Browse files
author
panshiyu
committed
Merge branch 'master' of https://git.coding.net/pppsy/Coding-iOS
2 parents 456a598 + 7c67c4a commit 45d6f03

6 files changed

Lines changed: 495 additions & 52 deletions

File tree

.DS_Store

4 KB
Binary file not shown.

Coding_iOS.xcodeproj/project.pbxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
0AB591B01AB6D6BE0076C454 /* TweetSendMapAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AB591AF1AB6D6BE0076C454 /* TweetSendMapAnnotation.m */; };
2626
1C222A251B54DF6E0026F8B4 /* CSSearchDisplayVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C222A241B54DF6E0026F8B4 /* CSSearchDisplayVC.m */; };
2727
1C222A2C1B556D0A0026F8B4 /* TopicHotkeyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C222A2B1B556D0A0026F8B4 /* TopicHotkeyView.m */; };
28+
1CF935B91B5FF6EE004229FD /* CSSearchCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CF935B81B5FF6EE004229FD /* CSSearchCell.m */; };
2829
3A3878371AE293D50078D5DE /* EditLabelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A3878361AE293D50078D5DE /* EditLabelViewController.m */; };
2930
3A38783A1AE2949E0078D5DE /* ResetLabelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A3878391AE2949E0078D5DE /* ResetLabelViewController.m */; };
3031
3A3878401AE295970078D5DE /* ResetLabelCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A38783F1AE295970078D5DE /* ResetLabelCell.m */; };
@@ -808,6 +809,8 @@
808809
1C222A241B54DF6E0026F8B4 /* CSSearchDisplayVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSearchDisplayVC.m; sourceTree = "<group>"; };
809810
1C222A2A1B556D0A0026F8B4 /* TopicHotkeyView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopicHotkeyView.h; sourceTree = "<group>"; };
810811
1C222A2B1B556D0A0026F8B4 /* TopicHotkeyView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopicHotkeyView.m; sourceTree = "<group>"; };
812+
1CF935B71B5FF6EE004229FD /* CSSearchCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSearchCell.h; sourceTree = "<group>"; };
813+
1CF935B81B5FF6EE004229FD /* CSSearchCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSearchCell.m; sourceTree = "<group>"; };
811814
3A3878351AE293D50078D5DE /* EditLabelViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditLabelViewController.h; sourceTree = "<group>"; };
812815
3A3878361AE293D50078D5DE /* EditLabelViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EditLabelViewController.m; sourceTree = "<group>"; };
813816
3A3878381AE2949E0078D5DE /* ResetLabelViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResetLabelViewController.h; sourceTree = "<group>"; };
@@ -3957,6 +3960,8 @@
39573960
1C222A241B54DF6E0026F8B4 /* CSSearchDisplayVC.m */,
39583961
FEF35EDD1B580BC00000280F /* mock_topicAdlist.geojson */,
39593962
FEF35EDF1B580BD90000280F /* mock_hotTopiclist.geojson */,
3963+
1CF935B71B5FF6EE004229FD /* CSSearchCell.h */,
3964+
1CF935B81B5FF6EE004229FD /* CSSearchCell.m */,
39603965
);
39613966
path = Search;
39623967
sourceTree = "<group>";
@@ -4767,6 +4772,7 @@
47674772
8E1C3E0819E8DFE300EF3032 /* AboutViewController.m in Sources */,
47684773
FEC419281B53A92600C498F5 /* CSSearchModel.m in Sources */,
47694774
4E6BA2D71A1EE6AF005FD721 /* AFHTTPRequestOperation.m in Sources */,
4775+
1CF935B91B5FF6EE004229FD /* CSSearchCell.m in Sources */,
47704776
4EF8181F1B05C9D8005F974B /* ProjectLineNoteActivity.m in Sources */,
47714777
8EF643A919FF7E2900F7EEB0 /* MessageMediaItemCCell.m in Sources */,
47724778
4ECF70461B18557E000280FF /* MRPRS.m in Sources */,

Coding_iOS/.DS_Store

2 KB
Binary file not shown.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
//
2+
// CSSearchCell.h
3+
// Coding_iOS
4+
//
5+
// Created by pan Shiyu on 15/7/23.
6+
// Copyright (c) 2015年 Coding. All rights reserved.
7+
//
8+
9+
#import <UIKit/UIKit.h>
10+
11+
#import "Tweet.h"
12+
13+
#import "UITTTAttributedLabel.h"
14+
15+
typedef void (^UserBtnClickedBlock) (User *curUser);
16+
17+
@interface CSSearchCell : UITableViewCell <TTTAttributedLabelDelegate, UICollectionViewDataSource, UICollectionViewDelegate, UICollectionViewDelegateFlowLayout>
18+
19+
@property (nonatomic, strong) Tweet *tweet;
20+
21+
@property (nonatomic, copy) UserBtnClickedBlock userBtnClickedBlock;
22+
@property (copy, nonatomic) void (^mediaItemClickedBlock)(HtmlMediaItem *curItem);
23+
24+
+ (CGFloat)cellHeightWithObj:(id)obj;
25+
26+
@end

0 commit comments

Comments
 (0)