Skip to content

Commit 625ffd0

Browse files
sumengsumeng
sumeng
authored and
sumeng
committed
Merge remote-tracking branch 'upstream/master'
2 parents 018998e + b14cdf8 commit 625ffd0

15 files changed

Lines changed: 302 additions & 29 deletions

‎Coding_iOS.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,8 @@
287287
4E93F23C1B84356500017916 /* file_menu_icon_info@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E93F2371B84356500017916 /* file_menu_icon_info@2x.png */; };
288288
4E93F23D1B84356500017916 /* file_menu_icon_open@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E93F2381B84356500017916 /* file_menu_icon_open@2x.png */; };
289289
4E93F23E1B84356500017916 /* file_menu_icon_share@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E93F2391B84356500017916 /* file_menu_icon_share@2x.png */; };
290+
4E93F2441B85C4C300017916 /* FileInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E93F2421B85C4C300017916 /* FileInfoViewController.m */; };
291+
4E93F2451B85C4C300017916 /* FileInfoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4E93F2431B85C4C300017916 /* FileInfoViewController.xib */; };
290292
4E94C4E71B4A6AC700EB668A /* ScanBGView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E94C4E61B4A6AC700EB668A /* ScanBGView.m */; };
291293
4E94C4ED1B4A867A00EB668A /* scan_bg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E94C4EC1B4A867A00EB668A /* scan_bg@2x.png */; };
292294
4E94C4EF1B4B73BB00EB668A /* scan_line@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E94C4EE1B4B73BB00EB668A /* scan_line@2x.png */; };
@@ -382,7 +384,6 @@
382384
4EAE06A81B7B1AE100179F4B /* button_file_history@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EAE06A61B7B1AE100179F4B /* button_file_history@2x.png */; };
383385
4EAE06AB1B7B23EA00179F4B /* FileActivitiesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EAE06AA1B7B23EA00179F4B /* FileActivitiesViewController.m */; };
384386
4EAE06AE1B7B241A00179F4B /* FileVersionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EAE06AD1B7B241A00179F4B /* FileVersionsViewController.m */; };
385-
4EAE06B11B7B248F00179F4B /* FileInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EAE06B01B7B248F00179F4B /* FileInfoViewController.m */; };
386387
4EAE06B41B7B325600179F4B /* FileCommentCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EAE06B31B7B325600179F4B /* FileCommentCell.m */; };
387388
4EAE06B71B7B330900179F4B /* FileActivityCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EAE06B61B7B330900179F4B /* FileActivityCell.m */; };
388389
4EAE06BA1B7B47A700179F4B /* FileVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EAE06B91B7B47A700179F4B /* FileVersion.m */; };
@@ -1310,6 +1311,9 @@
13101311
4E93F2371B84356500017916 /* file_menu_icon_info@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "file_menu_icon_info@2x.png"; sourceTree = "<group>"; };
13111312
4E93F2381B84356500017916 /* file_menu_icon_open@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "file_menu_icon_open@2x.png"; sourceTree = "<group>"; };
13121313
4E93F2391B84356500017916 /* file_menu_icon_share@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "file_menu_icon_share@2x.png"; sourceTree = "<group>"; };
1314+
4E93F2411B85C4C300017916 /* FileInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileInfoViewController.h; sourceTree = "<group>"; };
1315+
4E93F2421B85C4C300017916 /* FileInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileInfoViewController.m; sourceTree = "<group>"; };
1316+
4E93F2431B85C4C300017916 /* FileInfoViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FileInfoViewController.xib; sourceTree = "<group>"; };
13131317
4E94C4E51B4A6AC700EB668A /* ScanBGView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScanBGView.h; sourceTree = "<group>"; };
13141318
4E94C4E61B4A6AC700EB668A /* ScanBGView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScanBGView.m; sourceTree = "<group>"; };
13151319
4E94C4EC1B4A867A00EB668A /* scan_bg@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "scan_bg@2x.png"; sourceTree = "<group>"; };
@@ -1457,8 +1461,6 @@
14571461
4EAE06AA1B7B23EA00179F4B /* FileActivitiesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileActivitiesViewController.m; sourceTree = "<group>"; };
14581462
4EAE06AC1B7B241A00179F4B /* FileVersionsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileVersionsViewController.h; sourceTree = "<group>"; };
14591463
4EAE06AD1B7B241A00179F4B /* FileVersionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileVersionsViewController.m; sourceTree = "<group>"; };
1460-
4EAE06AF1B7B248F00179F4B /* FileInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileInfoViewController.h; sourceTree = "<group>"; };
1461-
4EAE06B01B7B248F00179F4B /* FileInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileInfoViewController.m; sourceTree = "<group>"; };
14621464
4EAE06B21B7B325600179F4B /* FileCommentCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileCommentCell.h; sourceTree = "<group>"; };
14631465
4EAE06B31B7B325600179F4B /* FileCommentCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileCommentCell.m; sourceTree = "<group>"; };
14641466
4EAE06B51B7B330900179F4B /* FileActivityCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileActivityCell.h; sourceTree = "<group>"; };
@@ -3682,8 +3684,9 @@
36823684
4EAE06AA1B7B23EA00179F4B /* FileActivitiesViewController.m */,
36833685
4EAE06AC1B7B241A00179F4B /* FileVersionsViewController.h */,
36843686
4EAE06AD1B7B241A00179F4B /* FileVersionsViewController.m */,
3685-
4EAE06AF1B7B248F00179F4B /* FileInfoViewController.h */,
3686-
4EAE06B01B7B248F00179F4B /* FileInfoViewController.m */,
3687+
4E93F2411B85C4C300017916 /* FileInfoViewController.h */,
3688+
4E93F2421B85C4C300017916 /* FileInfoViewController.m */,
3689+
4E93F2431B85C4C300017916 /* FileInfoViewController.xib */,
36873690
);
36883691
path = Controllers;
36893692
sourceTree = "<group>";
@@ -4642,6 +4645,7 @@
46424645
4EF17EDD1B3C3112003CDD2D /* intro_tip_0@3x.png in Resources */,
46434646
8E97CE9F1A0C7E26006F9AD7 /* coding_emoji_08@2x.png in Resources */,
46444647
4E6383E51B3272CF00D98648 /* info_Nav@2x.png in Resources */,
4648+
4E93F2451B85C4C300017916 /* FileInfoViewController.xib in Resources */,
46454649
0A782FDE1AB5B78B00E96661 /* TweetSendCreateLocationCell.xib in Resources */,
46464650
8E8F7B3219EF6306006BA8BD /* btn_privateMsg_white@2x.png in Resources */,
46474651
8E97CEBB1A0C7E26006F9AD7 /* coding_emoji_36@2x.png in Resources */,
@@ -5264,7 +5268,6 @@
52645268
3A38783A1AE2949E0078D5DE /* ResetLabelViewController.m in Sources */,
52655269
4EAE06A41B7AE4EF00179F4B /* FileComment.m in Sources */,
52665270
8EA6D13C19E240C40076D59C /* Tweet_RootViewController.m in Sources */,
5267-
4EAE06B11B7B248F00179F4B /* FileInfoViewController.m in Sources */,
52685271
B93D904B1ACBA3110057A6EE /* ProjectDeleteAlertControllerVisualStyle.m in Sources */,
52695272
4E1A22851AB172C400CFC14F /* ProjectItemsCell.m in Sources */,
52705273
4ECE8B051A3946C10021E29C /* WebContentManager.m in Sources */,
@@ -5369,6 +5372,7 @@
53695372
8EF643CF19FF7E2900F7EEB0 /* TweetDetailCommentCell.m in Sources */,
53705373
4E4D6A8E1B1D5B9A00FD2E49 /* MRPRBaseInfo.m in Sources */,
53715374
7EB02FF31B6D111300D2166C /* AudioRecordView.m in Sources */,
5375+
4E93F2441B85C4C300017916 /* FileInfoViewController.m in Sources */,
53725376
4E4D6A9A1B1D893500FD2E49 /* CommitInfo.m in Sources */,
53735377
4E38CF5F1A7A28AF005536C0 /* CodeBranchTagButton.m in Sources */,
53745378
8E64ED8119ED0CE3006E99DA /* QBAssetsCollectionViewLayout.m in Sources */,

‎Coding_iOS/Controllers/FileInfoViewController.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// FileInfoViewController.h
33
// Coding_iOS
44
//
5-
// Created by Ease on 15/8/12.
5+
// Created by Ease on 15/8/20.
66
// Copyright (c) 2015年 Coding. All rights reserved.
77
//
88

‎Coding_iOS/Controllers/FileInfoViewController.m‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// FileInfoViewController.m
33
// Coding_iOS
44
//
5-
// Created by Ease on 15/8/12.
5+
// Created by Ease on 15/8/20.
66
// Copyright (c) 2015年 Coding. All rights reserved.
77
//
88

@@ -11,6 +11,13 @@
1111
@interface FileInfoViewController ()
1212
@property (strong, nonatomic) ProjectFile *curFile;
1313

14+
@property (weak, nonatomic) IBOutlet UILabel *finenameL;
15+
@property (weak, nonatomic) IBOutlet UILabel *numL;
16+
@property (weak, nonatomic) IBOutlet UILabel *typeL;
17+
@property (weak, nonatomic) IBOutlet UILabel *sizeL;
18+
@property (weak, nonatomic) IBOutlet UILabel *createL;
19+
@property (weak, nonatomic) IBOutlet UILabel *updateL;
20+
@property (weak, nonatomic) IBOutlet UILabel *createUserL;
1421
@end
1522

1623
@implementation FileInfoViewController
@@ -19,4 +26,23 @@ + (instancetype)vcWithFile:(ProjectFile *)file{
1926
vc.curFile = file;
2027
return vc;
2128
}
29+
30+
- (void)viewDidLoad {
31+
[super viewDidLoad];
32+
// Do any additional setup after loading the view from its nib.
33+
self.title = @"文件信息";
34+
self.finenameL.text = _curFile.name;
35+
self.numL.text = [NSString stringWithFormat:@"#%@", _curFile.number.stringValue];
36+
self.typeL.text = [NSString stringWithFormat:@".%@", _curFile.fileType];
37+
self.sizeL.text = [NSString sizeDisplayWithByte:_curFile.size.floatValue];
38+
self.createL.text = [_curFile.created_at stringTimesAgo];
39+
self.updateL.text = [_curFile.updated_at stringTimesAgo];
40+
self.createUserL.text = _curFile.owner.name;
41+
}
42+
43+
- (void)didReceiveMemoryWarning {
44+
[super didReceiveMemoryWarning];
45+
// Dispose of any resources that can be recreated.
46+
}
47+
2248
@end

0 commit comments

Comments
 (0)