Skip to content

Commit 175078f

Browse files
committed
讨论改版 - beta
1 parent 9b3c759 commit 175078f

19 files changed

+667
-130
lines changed

Coding_iOS.xcodeproj/project.pbxproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,9 @@
365365
4E6C41191A834EA90098DC17 /* BaseNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E6C41181A834EA90098DC17 /* BaseNavigationController.m */; };
366366
4E6C411F1A846AC30098DC17 /* RFKeyboardToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E6C411C1A846AC30098DC17 /* RFKeyboardToolbar.m */; };
367367
4E6C41201A846AC30098DC17 /* RFToolbarButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E6C411E1A846AC30098DC17 /* RFToolbarButton.m */; };
368+
4E6CBE4B1D8E71DC00644086 /* TopicAnswerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E6CBE4A1D8E71DC00644086 /* TopicAnswerCell.m */; };
369+
4E6CBE4E1D8E7E8000644086 /* TopicAnswerCommentMoreCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E6CBE4D1D8E7E8000644086 /* TopicAnswerCommentMoreCell.m */; };
370+
4E6CBE511D8E962300644086 /* TopicAnswerDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E6CBE501D8E962300644086 /* TopicAnswerDetailViewController.m */; };
368371
4E6D71891A75F00E005AD988 /* YLGIFImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E6D71861A75F00E005AD988 /* YLGIFImage.m */; };
369372
4E6D718A1A75F00E005AD988 /* YLImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E6D71881A75F00E005AD988 /* YLImageView.m */; };
370373
4E6FB0551B5799B100B0A17B /* ProjectTag.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E6FB0541B5799B100B0A17B /* ProjectTag.m */; };
@@ -1687,6 +1690,12 @@
16871690
4E6C411C1A846AC30098DC17 /* RFKeyboardToolbar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RFKeyboardToolbar.m; sourceTree = "<group>"; };
16881691
4E6C411D1A846AC30098DC17 /* RFToolbarButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RFToolbarButton.h; sourceTree = "<group>"; };
16891692
4E6C411E1A846AC30098DC17 /* RFToolbarButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RFToolbarButton.m; sourceTree = "<group>"; };
1693+
4E6CBE491D8E71DC00644086 /* TopicAnswerCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopicAnswerCell.h; sourceTree = "<group>"; };
1694+
4E6CBE4A1D8E71DC00644086 /* TopicAnswerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopicAnswerCell.m; sourceTree = "<group>"; };
1695+
4E6CBE4C1D8E7E8000644086 /* TopicAnswerCommentMoreCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopicAnswerCommentMoreCell.h; sourceTree = "<group>"; };
1696+
4E6CBE4D1D8E7E8000644086 /* TopicAnswerCommentMoreCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopicAnswerCommentMoreCell.m; sourceTree = "<group>"; };
1697+
4E6CBE4F1D8E962300644086 /* TopicAnswerDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopicAnswerDetailViewController.h; sourceTree = "<group>"; };
1698+
4E6CBE501D8E962300644086 /* TopicAnswerDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopicAnswerDetailViewController.m; sourceTree = "<group>"; };
16901699
4E6D71851A75F00E005AD988 /* YLGIFImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YLGIFImage.h; sourceTree = "<group>"; };
16911700
4E6D71861A75F00E005AD988 /* YLGIFImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YLGIFImage.m; sourceTree = "<group>"; };
16921701
4E6D71871A75F00E005AD988 /* YLImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YLImageView.h; sourceTree = "<group>"; };
@@ -4780,6 +4789,8 @@
47804789
4ED4B4AE1D82B28B00EED8C6 /* TeamMembersViewController.m */,
47814790
4E2247FA1D82C98800551EA4 /* MeDisplayViewController.h */,
47824791
4E2247FB1D82C98800551EA4 /* MeDisplayViewController.m */,
4792+
4E6CBE4F1D8E962300644086 /* TopicAnswerDetailViewController.h */,
4793+
4E6CBE501D8E962300644086 /* TopicAnswerDetailViewController.m */,
47834794
);
47844795
path = Controllers;
47854796
sourceTree = "<group>";
@@ -5529,6 +5540,8 @@
55295540
8EF6439219FF7E2900F7EEB0 /* ToMessageCell.m */,
55305541
8EF6439319FF7E2900F7EEB0 /* TopicCommentCell.h */,
55315542
8EF6439419FF7E2900F7EEB0 /* TopicCommentCell.m */,
5543+
4E6CBE491D8E71DC00644086 /* TopicAnswerCell.h */,
5544+
4E6CBE4A1D8E71DC00644086 /* TopicAnswerCell.m */,
55325545
8EF6439519FF7E2900F7EEB0 /* TopicContentCell.h */,
55335546
8EF6439619FF7E2900F7EEB0 /* TopicContentCell.m */,
55345547
3A38784D1AE557700078D5DE /* TopicPreviewCell.h */,
@@ -5539,6 +5552,8 @@
55395552
8EF6439A19FF7E2900F7EEB0 /* TweetCommentCell.m */,
55405553
8EF6439B19FF7E2900F7EEB0 /* TweetCommentMoreCell.h */,
55415554
8EF6439C19FF7E2900F7EEB0 /* TweetCommentMoreCell.m */,
5555+
4E6CBE4C1D8E7E8000644086 /* TopicAnswerCommentMoreCell.h */,
5556+
4E6CBE4D1D8E7E8000644086 /* TopicAnswerCommentMoreCell.m */,
55425557
8EF6439D19FF7E2900F7EEB0 /* TweetDetailCell.h */,
55435558
8EF6439E19FF7E2900F7EEB0 /* TweetDetailCell.m */,
55445559
8EF6439F19FF7E2900F7EEB0 /* TweetDetailCommentCell.h */,
@@ -6847,6 +6862,7 @@
68476862
4E1A22881AB1731600CFC14F /* ProjectDescriptionCell.m in Sources */,
68486863
4ECE8AE11A3943E80021E29C /* UIButton+Common.m in Sources */,
68496864
4ECE8AD81A3943E80021E29C /* UIDownMenuButton.m in Sources */,
6865+
4E6CBE511D8E962300644086 /* TopicAnswerDetailViewController.m in Sources */,
68506866
8EA6D14819E240C40076D59C /* UsersViewController.m in Sources */,
68516867
4E94C4FF1B4D2B9300EB668A /* MenuButton.m in Sources */,
68526868
4ED4B49D1D8295F600EED8C6 /* TeamViewController.m in Sources */,
@@ -6971,6 +6987,7 @@
69716987
8EF643C819FF7E2900F7EEB0 /* ToMessageCell.m in Sources */,
69726988
4E217F111A70EDC700F6DF88 /* SVWebViewControllerActivityChrome.m in Sources */,
69736989
4EC4800C1C2936DA005F1772 /* PhoneCodeButton.m in Sources */,
6990+
4E6CBE4E1D8E7E8000644086 /* TopicAnswerCommentMoreCell.m in Sources */,
69746991
13C8FE6E1CA75816001E30FA /* DynamicCommentCell.m in Sources */,
69756992
4E0BD86D1B6C7E3D0061CAA6 /* CSScrollview.m in Sources */,
69766993
D09AA5C01BFDEDD1008CA9EB /* NSString+Attribute.m in Sources */,
@@ -6991,6 +7008,7 @@
69917008
8EA6D1BE19E240C40076D59C /* Register.m in Sources */,
69927009
4ECF70431B18514F000280FF /* PRListViewController.m in Sources */,
69937010
926C043B1C019CD3004937D8 /* ShopOrder.m in Sources */,
7011+
4E6CBE4B1D8E71DC00644086 /* TopicAnswerCell.m in Sources */,
69947012
4E969CD01AF0EB87005C0CCE /* NSTimer+Common.m in Sources */,
69957013
8EF643B019FF7E2900F7EEB0 /* CodingTipCell.m in Sources */,
69967014
4E6FB0581B58DB0A00B0A17B /* ProjectTagsView.m in Sources */,

Coding_iOS/Coding_iOS-Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>3.9.5</string>
20+
<string>4.0</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleURLTypes</key>
@@ -36,7 +36,7 @@
3636
</dict>
3737
</array>
3838
<key>CFBundleVersion</key>
39-
<string>3.9.5.201606011800</string>
39+
<string>4.0.201606011800</string>
4040
<key>ITSAppUsesNonExemptEncryption</key>
4141
<false/>
4242
<key>LSApplicationQueriesSchemes</key>

Coding_iOS/Controllers/TeamListViewController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ - (void)viewDidLoad{
4444

4545
- (void)refresh{
4646
if (_teamList.count <= 0) {
47-
[self.myTableView beginLoading];
47+
[self.view beginLoading];
4848
}
4949
ESWeak(self, weakSelf);
5050
[[Coding_NetAPIManager sharedManager] request_JoinedTeamsBlock:^(id data, NSError *error) {
51-
[weakSelf.myTableView endLoading];
51+
[weakSelf.view endLoading];
5252
[weakSelf.myRefreshControl endRefreshing];
5353
if (data) {
5454
weakSelf.teamList = data;

Coding_iOS/Controllers/TeamMembersViewController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ - (void)viewDidLoad{
6565

6666
- (void)refresh{
6767
if (_myMemberArray.count <= 0) {
68-
[self.myTableView beginLoading];
68+
[self.view beginLoading];
6969
}
7070
ESWeak(self, weakSelf);
7171
[[Coding_NetAPIManager sharedManager] request_MembersInTeam:_curTeam andBlock:^(id data, NSError *error) {
72-
[weakSelf.myTableView endLoading];
72+
[weakSelf.view endLoading];
7373
[weakSelf.myRefreshControl endRefreshing];
7474
if (data) {
7575
weakSelf.myMemberArray = data;

Coding_iOS/Controllers/TeamProjectsViewController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ - (void)viewDidLoad{
4545

4646
- (void)refresh{
4747
if (_joinedList.count + _unjoinedList.count <= 0) {
48-
[self.myTableView beginLoading];
48+
[self.view beginLoading];
4949
}
5050
ESWeak(self, weakSelf);
5151
void (^requestFinishedBlock)(NSError *) = ^(NSError *error){
52-
[weakSelf.myTableView endLoading];
52+
[weakSelf.view endLoading];
5353
[weakSelf.myRefreshControl endRefreshing];
5454
[weakSelf.myTableView reloadData];
5555
[weakSelf.myTableView configBlankPage:EaseBlankPageTypeView hasData:(weakSelf.joinedList.count + weakSelf.unjoinedList.count > 0) hasError:(error != nil) reloadButtonBlock:^(id sender) {
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
//
2+
// TopicAnswerDetailViewController.h
3+
// Coding_iOS
4+
//
5+
// Created by Ease on 2016/9/18.
6+
// Copyright © 2016年 Coding. All rights reserved.
7+
//
8+
9+
#import "BaseViewController.h"
10+
#import "ProjectTopic.h"
11+
12+
@interface TopicAnswerDetailViewController : BaseViewController
13+
@property (strong, nonatomic) ProjectTopic *curAnswer;
14+
@property (strong, nonatomic) ProjectTopic *curTopic;
15+
16+
@property (copy, nonatomic) void(^deleteAnswerBlock) (ProjectTopic *curAnswer);
17+
@end

0 commit comments

Comments
 (0)