代码 - 查找&创建

Author: wanghengheng

Coding_iOS.xcodeproj/project.pbxproj

@@ -10,9 +10,10 @@
 #import "CodeViewController.h"
 #import "ProjectViewController.h"
 #import "ProjectCommitsViewController.h"
+#import "ProjectViewController.h"
 
 @interface CodeListViewController ()
-
+@property (strong, nonatomic) ProjectCodeListView *listView;
 @end
 
 @implementation CodeListViewController
@@ -23,20 +24,18 @@ - (void)viewDidLoad {
     self.title = [[_myCodeTree.path componentsSeparatedByString:@"/"] lastObject];
     [self configRightNavBtn];
 
-    ProjectCodeListView *listView = [[ProjectCodeListView alloc] initWithFrame:self.view.bounds project:_myProject andCodeTree:_myCodeTree];
+    _listView = [[ProjectCodeListView alloc] initWithFrame:self.view.bounds project:_myProject andCodeTree:_myCodeTree];
     __weak typeof(self) weakSelf = self;
-    listView.codeTreeFileOfRefBlock = ^(CodeTree_File *curCodeTreeFile, NSString *ref){
+    _listView.codeTreeFileOfRefBlock = ^(CodeTree_File *curCodeTreeFile, NSString *ref){
         [weakSelf goToVCWith:curCodeTreeFile andRef:ref];
     };
-    listView.refChangedBlock = ^(NSString *ref){
-        weakSelf.myCodeTree.ref = ref;
+    _listView.codeTreeChangedBlock = ^(CodeTree *tree){
+        weakSelf.myCodeTree = tree;
     };
-    [self.view addSubview:listView];
-    [listView mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.view addSubview:_listView];
+    [_listView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.edges.equalTo(self.view);
     }];
-    [listView addBranchTagButton];
-    
 }
 
 - (void)configRightNavBtn{
@@ -47,44 +46,20 @@ - (void)configRightNavBtn{
 
 - (void)rightNavBtnClicked{
     __weak typeof(self) weakSelf = self;
-    [[UIActionSheet bk_actionSheetCustomWithTitle:nil buttonTitles:@[@"查看提交记录", @"退出代码查看"] destructiveTitle:nil cancelTitle:@"取消" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {
-        switch (index) {
-            case 0:{
-                [weakSelf goToCommitsVC];
-            }
-                break;
-            case 1:{
-                [weakSelf.navigationController.viewControllers enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(UIViewController *obj, NSUInteger idx, BOOL *stop) {
-                    if (![obj isKindOfClass:[CodeViewController class]] &&
-                        ![obj isKindOfClass:[CodeListViewController class]] &&
-                        !([obj isKindOfClass:[ProjectViewController class]] && [(ProjectViewController *)obj curType] == ProjectViewTypeCodes)) {
-                        *stop = YES;
-                        [weakSelf.navigationController popToViewController:obj animated:YES];
-                    }
-                }];
-            }
-                break;
-            default:
-                break;
+    [[UIActionSheet bk_actionSheetCustomWithTitle:nil buttonTitles:@[@"上传图片", @"创建文本文件", @"查看提交记录", @"退出代码查看"] destructiveTitle:nil cancelTitle:@"取消" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {
+        if (index == 0) {
+            [weakSelf.listView uploadImageClicked];
+        }else if (index == 1){
+            [weakSelf.listView createFileClicked];
+        }else if (index == 2){
+            [weakSelf goToCommitsVC];
+        }else if (index == 3){
+            [weakSelf popOutCodeVC];
         }
     }] showInView:self.view];
 }
 
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
+#pragma mark action
 - (void)goToVCWith:(CodeTree_File *)codeTreeFile andRef:(NSString *)ref{
     DebugLog(@"%@", codeTreeFile.path);
     if ([codeTreeFile.mode isEqualToString:@"tree"]) {//文件夹
@@ -97,6 +72,13 @@ - (void)goToVCWith:(CodeTree_File *)codeTreeFile andRef:(NSString *)ref{
         CodeFile *nextCodeFile = [CodeFile codeFileWithRef:ref andPath:codeTreeFile.path];
         CodeViewController *vc = [CodeViewController codeVCWithProject:_myProject andCodeFile:nextCodeFile];
         [self.navigationController pushViewController:vc animated:YES];
+    }else if ([codeTreeFile.mode isEqualToString:@"git_link"]){
+        UIViewController *vc = [BaseViewController analyseVCFromLinkStr:codeTreeFile.info.submoduleLink];
+        if (vc) {
+            [self.navigationController pushViewController:vc animated:YES];
+        }else{
+            [NSObject showHudTipStr:@"有些文件还不支持查看呢_(:з」∠)_"];
+        }
     }else{
         [NSObject showHudTipStr:@"有些文件还不支持查看呢_(:з」∠)_"];
     }
@@ -109,4 +91,16 @@ - (void)goToCommitsVC{
     [self.navigationController pushViewController:vc animated:YES];
 }
 
+- (void)popOutCodeVC{
+    __weak typeof(self) weakSelf = self;
+    [self.navigationController.viewControllers enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(UIViewController *obj, NSUInteger idx, BOOL *stop) {
+        if (![obj isKindOfClass:[CodeViewController class]] &&
+            ![obj isKindOfClass:[CodeListViewController class]] &&
+            !([obj isKindOfClass:[ProjectViewController class]] && [(ProjectViewController *)obj curType] == ProjectViewTypeCodes)) {
+            *stop = YES;
+            [weakSelf.navigationController popToViewController:obj animated:YES];
+        }
+    }];
+}
+
 @end

Coding_iOS/Controllers/CodeListViewController.m

@@ -155,7 +155,7 @@ - (void)configRightNavBtn{
 
 - (void)rightNavBtnClicked{
     NSMutableArray *actionTitles = @[@"编辑代码", @"查看提交记录", @"退出代码查看"].mutableCopy;
-    if (!self.myCodeFile.can_edit) {
+    if (!self.myCodeFile.can_edit || [self.myCodeFile.file.mode isEqualToString:@"image"]) {
         [actionTitles removeObjectAtIndex:0];
     }
     __weak typeof(self) weakSelf = self;
@@ -165,7 +165,7 @@ - (void)rightNavBtnClicked{
 }
 
 - (void)actionSheetClicked:(UIActionSheet *)sheet index:(NSInteger)index{
-    if (!self.myCodeFile.can_edit) {
+    if (!self.myCodeFile.can_edit || [self.myCodeFile.file.mode isEqualToString:@"image"]) {
         index++;
     }
     if (index == 0) {

Coding_iOS/Controllers/CodeViewController.m

@@ -23,7 +23,6 @@ typedef NS_ENUM(NSInteger, ProjectViewType)
 @property (nonatomic, strong) Project *myProject;
 @property (nonatomic, assign) NSInteger curIndex;
 @property (nonatomic, assign, readonly) ProjectViewType curType;
-@property (strong, nonatomic) NSString *codeRef;
 
 + (ProjectViewController *)codeVCWithCodeRef:(NSString *)codeRef andProject:(Project *)project;
 

Coding_iOS/Controllers/ProjectViewController.h

@@ -61,14 +61,15 @@ @interface ProjectViewController ()
 
 @property (nonatomic, strong)  UIBarButtonItem *screenBar;
 
+@property (strong, nonatomic) CodeTree *myCodeTree;
 
 @end
 
 @implementation ProjectViewController
 
 + (ProjectViewController *)codeVCWithCodeRef:(NSString *)codeRef andProject:(Project *)project{
     ProjectViewController *vc = [self new];
-    vc.codeRef = codeRef;
+    vc.myCodeTree = [CodeTree codeTreeWithRef:codeRef andPath:@""];
     vc.myProject = project;
     if (vc.myProject.is_public.boolValue) {
         vc.curIndex = 2;
@@ -77,6 +78,14 @@ + (ProjectViewController *)codeVCWithCodeRef:(NSString *)codeRef andProject:(Pro
     }
     return vc;
 }
+
+- (CodeTree *)myCodeTree{
+    if (!_myCodeTree) {
+        _myCodeTree = [CodeTree codeTreeWithRef:@"master" andPath:@""];
+    }
+    return _myCodeTree;
+}
+
 - (instancetype)init
 {
     self = [super init];
@@ -85,9 +94,11 @@ - (instancetype)init
     }
     return self;
 }
+
 - (UIView *)getCurContentView{
     return [_projectContentDict objectForKey:[NSNumber numberWithInteger:_curIndex]];
 }
+
 - (void)saveCurContentView:(UIView *)curContentView{
     if (curContentView) {
         [_projectContentDict setObject:curContentView forKey:[NSNumber numberWithInteger:_curIndex]];
@@ -188,18 +199,14 @@ - (void)viewWillDisappear:(BOOL)animated {
 
 - (void)refreshToQueryData{
     UIView *curView = [self getCurContentView];
-    if (curView && [curView respondsToSelector:@selector(refreshToQueryData)]) {
-        [curView performSelector:@selector(refreshToQueryData)];
+    if (!curView) {
+        return;
     }
 
-    
-    if ([curView isKindOfClass:[ProjectTasksView class]]) {
-        ProjectTasksView *tasksView = (ProjectTasksView *)curView;
-        [tasksView refreshToQueryData];
-    }else{
-        if (curView && [curView respondsToSelector:@selector(reloadData)]) {
-            [curView performSelector:@selector(reloadData)];
-        }
+    if ([curView respondsToSelector:@selector(refreshToQueryData)]) {
+        [curView performSelector:@selector(refreshToQueryData)];
+    }else if ([curView respondsToSelector:@selector(reloadData)]){
+        [curView performSelector:@selector(reloadData)];
     }
 }
 
@@ -237,7 +244,7 @@ - (void)configRightBarButtonItemWithViewType:(ProjectViewType)viewType{
                        action:@selector(navRightBtnClicked)];
     }else if (viewType == ProjectViewTypeCodes){
         UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 20, 20)];
-        [button setImage:[UIImage imageNamed:@"timeBtn_Nav"] forState:UIControlStateNormal];
+        [button setImage:[UIImage imageNamed:@"moreBtn_Nav"] forState:UIControlStateNormal];
         [button addTarget:self action:@selector(navRightBtnClicked) forControlEvents:UIControlEventTouchUpInside];
         navRightBtn = [[UIBarButtonItem alloc] initWithCustomView:button];
     }
@@ -356,14 +363,13 @@ - (void)refreshWithNewIndex:(NSInteger)newIndex{
                 break;
             case ProjectViewTypeCodes:{
                 curView = ({
-                    ProjectCodeListView *codeListView = [[ProjectCodeListView alloc] initWithFrame:self.view.bounds project:_myProject andCodeTree:[CodeTree codeTreeWithRef:_codeRef andPath:@""]];
+                    ProjectCodeListView *codeListView = [[ProjectCodeListView alloc] initWithFrame:self.view.bounds project:_myProject andCodeTree:_myCodeTree];
                     codeListView.codeTreeFileOfRefBlock = ^(CodeTree_File *curCodeTreeFile, NSString *ref){
                         [weakSelf goToVCWith:curCodeTreeFile andRef:ref];
                     };
-                    codeListView.refChangedBlock = ^(NSString *ref){
-                        weakSelf.codeRef = ref;
+                    codeListView.codeTreeChangedBlock = ^(CodeTree *tree){
+                        weakSelf.myCodeTree = tree;
                     };
-                    [codeListView addBranchTagButton];
                     codeListView;
                 });
             }
@@ -426,6 +432,13 @@ - (void)goToVCWith:(CodeTree_File *)codeTreeFile andRef:(NSString *)ref{
         CodeFile *nextCodeFile = [CodeFile codeFileWithRef:ref andPath:codeTreeFile.path];
         CodeViewController *vc = [CodeViewController codeVCWithProject:_myProject andCodeFile:nextCodeFile];
         [self.navigationController pushViewController:vc animated:YES];
+    }else if ([codeTreeFile.mode isEqualToString:@"git_link"]){
+        UIViewController *vc = [BaseViewController analyseVCFromLinkStr:codeTreeFile.info.submoduleLink];
+        if (vc) {
+            [self.navigationController pushViewController:vc animated:YES];
+        }else{
+            [NSObject showHudTipStr:@"有些文件还不支持查看呢_(:з」∠)_"];
+        }
     }else{
         [NSObject showHudTipStr:@"有些文件还不支持查看呢_(:з」∠)_"];
     }
@@ -672,18 +685,33 @@ - (void)navRightBtnClicked{
             break;
         case ProjectViewTypeCodes:
         {
-            //代码提交记录
-            ProjectCommitsViewController *vc = [ProjectCommitsViewController new];
-            vc.curProject = self.myProject;
-            vc.curCommits = [Commits commitsWithRef:self.codeRef? self.codeRef: @"master" Path:@""];
-            [self.navigationController pushViewController:vc animated:YES];
+            __weak typeof(self) weakSelf = self;
+            [[UIActionSheet bk_actionSheetCustomWithTitle:nil buttonTitles:@[@"上传图片", @"创建文本文件", @"查看提交记录"] destructiveTitle:nil cancelTitle:@"取消" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {
+                if (index == 0) {
+                    [(ProjectCodeListView *)[weakSelf getCurContentView] uploadImageClicked];
+                }else if (index == 1){
+                    [(ProjectCodeListView *)[weakSelf getCurContentView] createFileClicked];
+                }else if (index == 2){
+                    [weakSelf goToCommitsVC];
+                }
+            }] showInView:self.view];
         }
             break;
         default:
             break;
     }
 }
 
+- (void)goToCommitsVC{
+    //代码提交记录
+    ProjectCommitsViewController *vc = [ProjectCommitsViewController new];
+    vc.curProject = self.myProject;
+    vc.curCommits = [Commits commitsWithRef:self.myCodeTree.ref Path:@""];
+    [self.navigationController pushViewController:vc animated:YES];
+}
+
+
+
 - (UIBarButtonItem *)HDCustomNavButtonWithTitle:(NSString *)title imageName:(NSString *)imageName target:(id)targe action:(SEL)action {
     UIButton *itemButtom = [UIButton buttonWithType:UIButtonTypeCustom];
     UIImage *image = [UIImage imageNamed:imageName];

Coding_iOS/Controllers/ProjectViewController.m

@@ -16,11 +16,14 @@
 @property (readwrite, nonatomic, strong) NSString *ref, *path;
 @property (readwrite, nonatomic, strong) CodeFile_RealFile *file;
 @property (strong, nonatomic) Commit *headCommit;
-@property (strong, nonatomic) NSString *editData, *editMessage;
+@property (strong, nonatomic) NSString *editData, *editMessage, *editName;
 
 + (CodeFile *)codeFileWithRef:(NSString *)ref andPath:(NSString *)path;
 + (CodeFile *)codeFileWithMDStr:(NSString *)md_html;
++ (CodeFile *)codeFileToCommitWithRef:(NSString *)ref andPath:(NSString *)path name:(NSString *)name data:(NSString *)data message:(NSString *)message headCommit:(Commit *)headCommit;
+
 - (NSDictionary *)toEditParams;
+- (NSDictionary *)toCreateParams;
 @end
 
 
@@ -30,4 +33,4 @@
 @property (readwrite, nonatomic, strong) Committer *lastCommitter;
 @property (nonatomic, assign) BOOL previewed;
 @property (nonatomic, assign) NSInteger size;
-@end
+@end

Coding_iOS/Images/icon_code/icon_code_executable@2x.png

@@ -27,6 +27,14 @@ + (CodeFile *)codeFileWithMDStr:(NSString *)md_html{
     codeFile.file = file;
     return codeFile;
 }
++ (CodeFile *)codeFileToCommitWithRef:(NSString *)ref andPath:(NSString *)path name:(NSString *)name data:(NSString *)data message:(NSString *)message headCommit:(Commit *)headCommit{
+    CodeFile *codeFile = [self codeFileWithRef:ref andPath:path];
+    codeFile.editName = name;
+    codeFile.editData = data;
+    codeFile.editMessage = message;
+    codeFile.headCommit = headCommit;
+    return codeFile;
+}
 - (NSString *)path{
     if (!_path) {
         _path = @"";
@@ -45,6 +53,12 @@ - (NSString *)editData{
     }
     return _editData;
 }
+- (NSString *)editName{
+    if (!_editName) {
+        _editName = _file.name.copy;
+    }
+    return _editName;
+}
 - (NSString *)editMessage{
     if (!_editMessage) {
         _editMessage = [NSString stringWithFormat:@"update %@", _path];
@@ -58,9 +72,17 @@ - (NSDictionary *)toEditParams{
     params[@"lastCommitSha"] = self.headCommit.commitId;
     return params;
 }
+- (NSDictionary *)toCreateParams{
+    NSMutableDictionary *params = @{}.mutableCopy;
+    params[@"title"] = self.editName;
+    params[@"content"] = self.editData;
+    params[@"message"] = self.editMessage;
+    params[@"lastCommitSha"] = self.headCommit.commitId;
+    return params;
+}
 @end
 
 
 @implementation CodeFile_RealFile
 
-@end
+@end