GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — 项目内冒泡 - 显示 · DoomYang/Coding-iOS@f77b892

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • Coding_iOS.xcodeproj
    • project.pbxproj
  • Coding_iOS
    • Controllers
      • NProjectViewController
        • NProjectViewController.m
      • RootControllers
        • BaseViewController.m
      • UserInfoViewController.m
      • UserOrProjectTweetsViewController.h
      • UserOrProjectTweetsViewController.m
    • Images/nav_button
      • [email protected]
      • [email protected]
    • Models
      • Tweet.h
      • Tweet.m
      • Tweets.h
      • Tweets.m
    • Util/OC_Category
      • UIView+Common.m
    • Views/Cell
      • TweetCell.m
      • TweetDetailCell.m
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎Coding_iOS.xcodeproj/project.pbxproj‎

Copy file name to clipboardExpand all lines: Coding_iOS.xcodeproj/project.pbxproj
+14-6Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,8 @@
261261
4E53EB591AFB090E0034FE1C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E53EB571AFB090E0034FE1C /* [email protected] */; };
262262
4E53EB5A1AFB090E0034FE1C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E53EB581AFB090E0034FE1C /* [email protected] */; };
263263
4E554D6E1C9804F40008686A /* Close2FAViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E554D6D1C9804F40008686A /* Close2FAViewController.m */; };
264+
4E59D32B1D3E106D008C914B /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E59D3291D3E106D008C914B /* [email protected] */; };
265+
4E59D32C1D3E106D008C914B /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E59D32A1D3E106D008C914B /* [email protected] */; };
264266
4E59E1D31A5E6B34004DAEEC /* TaskDescriptionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E59E1D21A5E6B34004DAEEC /* TaskDescriptionViewController.m */; };
265267
4E5A66951B268D160007A0AD /* UIView+PressMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E5A66941B268D160007A0AD /* UIView+PressMenu.m */; };
266268
4E5C06E81AC2B34800F427C5 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E5C06E71AC2B34800F427C5 /* [email protected] */; };
@@ -875,7 +877,7 @@
875877
8EA6D14519E240C40076D59C /* TweetDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA6CF5219E240C40076D59C /* TweetDetailViewController.m */; };
876878
8EA6D14619E240C40076D59C /* TweetSendViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA6CF5419E240C40076D59C /* TweetSendViewController.m */; };
877879
8EA6D14819E240C40076D59C /* UsersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA6CF5819E240C40076D59C /* UsersViewController.m */; };
878-
8EA6D14919E240C40076D59C /* UserTweetsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA6CF5A19E240C40076D59C /* UserTweetsViewController.m */; };
880+
8EA6D14919E240C40076D59C /* UserOrProjectTweetsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA6CF5A19E240C40076D59C /* UserOrProjectTweetsViewController.m */; };
879881
8EA6D14A19E240C40076D59C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CF5B19E240C40076D59C /* InfoPlist.strings */; };
880882
8EA6D14C19E240C40076D59C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CF5F19E240C40076D59C /* [email protected] */; };
881883
8EA6D15019E240C40076D59C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CF6319E240C40076D59C /* [email protected] */; };
@@ -1518,6 +1520,8 @@
15181520
4E53EB581AFB090E0034FE1C /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
15191521
4E554D6C1C9804F40008686A /* Close2FAViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Close2FAViewController.h; sourceTree = "<group>"; };
15201522
4E554D6D1C9804F40008686A /* Close2FAViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Close2FAViewController.m; sourceTree = "<group>"; };
1523+
4E59D3291D3E106D008C914B /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1524+
4E59D32A1D3E106D008C914B /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
15211525
4E59E1D11A5E6B34004DAEEC /* TaskDescriptionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TaskDescriptionViewController.h; sourceTree = "<group>"; };
15221526
4E59E1D21A5E6B34004DAEEC /* TaskDescriptionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TaskDescriptionViewController.m; sourceTree = "<group>"; };
15231527
4E5A66931B268D160007A0AD /* UIView+PressMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+PressMenu.h"; sourceTree = "<group>"; };
@@ -2431,8 +2435,8 @@
24312435
8EA6CF5419E240C40076D59C /* TweetSendViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TweetSendViewController.m; sourceTree = "<group>"; };
24322436
8EA6CF5719E240C40076D59C /* UsersViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UsersViewController.h; sourceTree = "<group>"; };
24332437
8EA6CF5819E240C40076D59C /* UsersViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UsersViewController.m; sourceTree = "<group>"; };
2434-
8EA6CF5919E240C40076D59C /* UserTweetsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserTweetsViewController.h; sourceTree = "<group>"; };
2435-
8EA6CF5A19E240C40076D59C /* UserTweetsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserTweetsViewController.m; sourceTree = "<group>"; };
2438+
8EA6CF5919E240C40076D59C /* UserOrProjectTweetsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserOrProjectTweetsViewController.h; sourceTree = "<group>"; };
2439+
8EA6CF5A19E240C40076D59C /* UserOrProjectTweetsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserOrProjectTweetsViewController.m; sourceTree = "<group>"; };
24362440
8EA6CF5C19E240C40076D59C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
24372441
8EA6CF5F19E240C40076D59C /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
24382442
8EA6CF6319E240C40076D59C /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
@@ -4408,6 +4412,8 @@
44084412
8E97CE4B1A0A3410006F9AD7 /* nav_button */ = {
44094413
isa = PBXGroup;
44104414
children = (
4415+
4E59D3291D3E106D008C914B /* [email protected] */,
4416+
4E59D32A1D3E106D008C914B /* [email protected] */,
44114417
4ECEF9F81D1D0B3D002A27D3 /* [email protected] */,
44124418
4ECEF9F91D1D0B3D002A27D3 /* [email protected] */,
44134419
4ECEF9FA1D1D0B3D002A27D3 /* [email protected] */,
@@ -4605,8 +4611,8 @@
46054611
0AB591AB1AB6D2F60076C454 /* TweetSendLocaitonMapViewController.m */,
46064612
8EA6CF5719E240C40076D59C /* UsersViewController.h */,
46074613
8EA6CF5819E240C40076D59C /* UsersViewController.m */,
4608-
8EA6CF5919E240C40076D59C /* UserTweetsViewController.h */,
4609-
8EA6CF5A19E240C40076D59C /* UserTweetsViewController.m */,
4614+
8EA6CF5919E240C40076D59C /* UserOrProjectTweetsViewController.h */,
4615+
8EA6CF5A19E240C40076D59C /* UserOrProjectTweetsViewController.m */,
46104616
8EABB1FF19EE7A85009EB53A /* AddUserViewController.h */,
46114617
8EABB20019EE7A85009EB53A /* AddUserViewController.m */,
46124618
8E59F1081A021053009A905F /* CodeListViewController.h */,
@@ -5762,6 +5768,7 @@
57625768
7E335D9D1B6F5E94003D0F3D /* [email protected] in Resources */,
57635769
4EB52F3C1C7C45E700B5EBEA /* [email protected] in Resources */,
57645770
4EB52F1D1C76BA3B00B5EBEA /* [email protected] in Resources */,
5771+
4E59D32C1D3E106D008C914B /* [email protected] in Resources */,
57655772
4EF17ED71B3C3112003CDD2D /* [email protected] in Resources */,
57665773
4E6384031B33C8E900D98648 /* [email protected] in Resources */,
57675774
4EACB4401A2C448F0097ABB3 /* [email protected] in Resources */,
@@ -5990,6 +5997,7 @@
59905997
D0C447FB1C02DCA200DC1C4B /* [email protected] in Resources */,
59915998
4E63840B1B33F9B400D98648 /* [email protected] in Resources */,
59925999
4EB52F2E1C77138A00B5EBEA /* [email protected] in Resources */,
6000+
4E59D32B1D3E106D008C914B /* [email protected] in Resources */,
59936001
8E97CEA31A0C7E26006F9AD7 /* [email protected] in Resources */,
59946002
4EF17EE81B3C3112003CDD2D /* [email protected] in Resources */,
59956003
D0C447F71C02DCA200DC1C4B /* [email protected] in Resources */,
@@ -6623,7 +6631,7 @@
66236631
4E4D6A611B1C65C100FD2E49 /* MRPRCommitsViewController.m in Sources */,
66246632
8E64ED7D19ED0CE3006E99DA /* QBAssetsCollectionOverlayView.m in Sources */,
66256633
4E0BD86B1B6C7E3D0061CAA6 /* CSLikesVC.m in Sources */,
6626-
8EA6D14919E240C40076D59C /* UserTweetsViewController.m in Sources */,
6634+
8EA6D14919E240C40076D59C /* UserOrProjectTweetsViewController.m in Sources */,
66276635
4E4D6AA01B1D89D400FD2E49 /* CommitDetail.m in Sources */,
66286636
4ECE8AD71A3943E80021E29C /* DownMenuCell.m in Sources */,
66296637
4E6C41201A846AC30098DC17 /* RFToolbarButton.m in Sources */,
Collapse file

‎Coding_iOS/Controllers/NProjectViewController/NProjectViewController.m‎

Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/NProjectViewController/NProjectViewController.m
+8-1Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#import "PRListViewController.h"
3131
#import "MRListViewController.h"
3232
#import "EaseGitButtonsView.h"
33-
33+
#import "UserOrProjectTweetsViewController.h"
3434
#import "FunctionTipsManager.h"
3535

3636
@interface NProjectViewController ()<UITableViewDataSource, UITableViewDelegate>
@@ -71,6 +71,7 @@ - (void)viewDidLoad{
7171
tableView;
7272
});
7373

74+
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"tweetsBtn_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(tweetsBtnClicked)];
7475
__weak typeof(self) weakSelf = self;
7576
_gitButtonsView = [EaseGitButtonsView new];
7677
_gitButtonsView.gitButtonClickedBlock = ^(NSInteger index, EaseGitButtonPosition position){
@@ -108,6 +109,12 @@ - (void)refresh{
108109
}];
109110
}
110111

112+
- (void)tweetsBtnClicked{
113+
UserOrProjectTweetsViewController *vc = [UserOrProjectTweetsViewController new];
114+
vc.curTweets = [Tweets tweetsWithProject:self.myProject];
115+
[self.navigationController pushViewController:vc animated:YES];
116+
}
117+
111118
#pragma mark Table M
112119
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
113120
return 3;
Collapse file

‎Coding_iOS/Controllers/RootControllers/BaseViewController.m‎

Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/RootControllers/BaseViewController.m
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#import "EditTaskViewController.h"
1919
#import "ProjectViewController.h"
2020
#import "NProjectViewController.h"
21-
#import "UserTweetsViewController.h"
21+
#import "UserOrProjectTweetsViewController.h"
2222
#import "Coding_NetAPIManager.h"
2323
#import "AppDelegate.h"
2424
#import "WebViewController.h"
@@ -322,7 +322,7 @@ + (UIViewController *)analyseVCFromLinkStr:(NSString *)linkStr analyseMethod:(An
322322
analyseVC = vc;
323323
}else if ((matchedCaptures = [linkStr captureComponentsMatchedByRegex:userTweetRegexStr]).count > 0){
324324
//某人的冒泡
325-
UserTweetsViewController *vc = [[UserTweetsViewController alloc] init];
325+
UserOrProjectTweetsViewController *vc = [[UserOrProjectTweetsViewController alloc] init];
326326
NSString *user_global_key = matchedCaptures[1];
327327
vc.curTweets = [Tweets tweetsWithUser:[User userWithGlobalKey:user_global_key]];
328328
analyseVC = vc;
Collapse file

‎Coding_iOS/Controllers/UserInfoViewController.m‎

Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/UserInfoViewController.m
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#import "MJPhotoBrowser.h"
1313
#import "UsersViewController.h"
1414
#import "ConversationViewController.h"
15-
#import "UserTweetsViewController.h"
15+
#import "UserOrProjectTweetsViewController.h"
1616
#import "AddUserViewController.h"
1717
#import "SettingViewController.h"
1818
#import "SettingMineInfoViewController.h"
@@ -298,7 +298,7 @@ - (void)followBtnClicked{
298298
}
299299

300300
- (void)goToTweets{
301-
UserTweetsViewController *vc = [[UserTweetsViewController alloc] init];
301+
UserOrProjectTweetsViewController *vc = [[UserOrProjectTweetsViewController alloc] init];
302302
vc.curTweets = [Tweets tweetsWithUser:_curUser];
303303
[self.navigationController pushViewController:vc animated:YES];
304304
}
Collapse file

‎…S/Controllers/UserTweetsViewController.h‎ ‎…lers/UserOrProjectTweetsViewController.h‎Coding_iOS/Controllers/UserTweetsViewController.h renamed to Coding_iOS/Controllers/UserOrProjectTweetsViewController.h Coding_iOS/Controllers/UserTweetsViewController.h renamed to Coding_iOS/Controllers/UserOrProjectTweetsViewController.h

Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/UserOrProjectTweetsViewController.h
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#import "Tweets.h"
1111
#import "UIMessageInputView.h"
1212

13-
@interface UserTweetsViewController : BaseViewController<UITableViewDataSource, UITableViewDelegate, UIScrollViewDelegate, UIMessageInputViewDelegate>
13+
@interface UserOrProjectTweetsViewController : BaseViewController<UITableViewDataSource, UITableViewDelegate, UIScrollViewDelegate, UIMessageInputViewDelegate>
1414
@property (strong, nonatomic) Tweets *curTweets;
1515

1616
@end
Collapse file

‎…S/Controllers/UserTweetsViewController.m‎ ‎…lers/UserOrProjectTweetsViewController.m‎Coding_iOS/Controllers/UserTweetsViewController.m renamed to Coding_iOS/Controllers/UserOrProjectTweetsViewController.m Coding_iOS/Controllers/UserTweetsViewController.m renamed to Coding_iOS/Controllers/UserOrProjectTweetsViewController.m

Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/UserOrProjectTweetsViewController.m
+12-6Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#define kCommentIndexNotFound -1
1010

11-
#import "UserTweetsViewController.h"
11+
#import "UserOrProjectTweetsViewController.h"
1212
#import "TweetCell.h"
1313
#import "ODRefreshControl.h"
1414
#import "Coding_NetAPIManager.h"
@@ -18,7 +18,7 @@
1818
#import "SVPullToRefresh.h"
1919
#import "WebViewController.h"
2020

21-
@interface UserTweetsViewController ()
21+
@interface UserOrProjectTweetsViewController ()
2222
@property (nonatomic, strong) UITableView *myTableView;
2323
@property (nonatomic, strong) ODRefreshControl *refreshControl;
2424

@@ -34,7 +34,7 @@ @interface UserTweetsViewController ()
3434
@property (nonatomic, assign) NSInteger deleteTweetsIndex;
3535
@end
3636

37-
@implementation UserTweetsViewController
37+
@implementation UserOrProjectTweetsViewController
3838

3939
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
4040
{
@@ -49,7 +49,13 @@ - (void)viewDidLoad
4949
{
5050
[super viewDidLoad];
5151
// Do any additional setup after loading the view.
52-
self.title = _curTweets.curUser.name;
52+
if (_curTweets.tweetType == TweetTypeUserSingle) {
53+
self.title = _curTweets.curUser.name;
54+
}else if (_curTweets.tweetType == TweetTypeProject){
55+
self.title = _curTweets.curPro.name;
56+
}else{
57+
self.title = @"冒泡列表";
58+
}
5359

5460
// 添加myTableView
5561
_myTableView = ({
@@ -174,12 +180,12 @@ - (void)sendRequest{
174180
if (_curTweets.list.count <= 0) {
175181
[self.view beginLoading];
176182
}
177-
__weak typeof(self) weakSelf = self;
178-
if (_curTweets.curUser.name.length <= 0) {
183+
if (_curTweets.tweetType == TweetTypeUserSingle && _curTweets.curUser.name.length <= 0) {
179184
[self refreshCurUser];
180185
return;
181186
}
182187

188+
__weak typeof(self) weakSelf = self;
183189
[[Coding_NetAPIManager sharedManager] request_Tweets_WithObj:_curTweets andBlock:^(id data, NSError *error) {
184190
[weakSelf.refreshControl endRefreshing];
185191
[weakSelf.view endLoading];
Collapse file

‎Coding_iOS/Images/nav_button/[email protected]‎

Copy file name to clipboard
1.11 KB
  • Display the source diff
  • Display the rich diff
Loading
Collapse file

‎Coding_iOS/Images/nav_button/[email protected]‎

Copy file name to clipboard
1.76 KB
  • Display the source diff
  • Display the rich diff
Loading
Collapse file

‎Coding_iOS/Models/Tweet.h‎

Copy file name to clipboardExpand all lines: Coding_iOS/Models/Tweet.h
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
@property (strong, nonatomic) Project *project;
3838
@property (strong, nonatomic) NSNumber *project_id;
3939

40+
- (BOOL)isProjectTweet;
41+
4042
- (void)addASelectedAssetURL:(NSURL *)assetURL;
4143
- (void)deleteASelectedAssetURL:(NSURL *)assetURL;
4244
- (void)deleteATweetImage:(TweetImage *)tweetImage;
Collapse file

‎Coding_iOS/Models/Tweet.m‎

Copy file name to clipboardExpand all lines: Coding_iOS/Models/Tweet.m
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,9 @@ - (void)setSelectedAssetURLs:(NSMutableArray *)selectedAssetURLs{
332332
}];
333333
}
334334

335+
- (BOOL)isProjectTweet{
336+
return self.project_id != nil;
337+
}
335338
- (void)addASelectedAssetURL:(NSURL *)assetURL{
336339
if (!_selectedAssetURLs) {
337340
_selectedAssetURLs = [NSMutableArray new];

0 commit comments

Comments
0 (0)
You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.