新增文件~

cjddny · cjddny · commit b386fc20bce2 · 2015-11-20T18:07:44.000+08:00
diff --git a/Coding_iOS/Controllers/AllSearchDisplayVC.m b/Coding_iOS/Controllers/AllSearchDisplayVC.m
@@ -32,10 +32,7 @@
 #import "TweetSearchCell.h"
 
 // nav--------
-#import "NProjectViewController.h"
 #import "TweetDetailViewController.h"
-#import "FileViewController.h"
-#import "ProjectSquareViewController.h"
 
 @interface AllSearchDisplayVC () <UISearchBarDelegate, UITableViewDelegate, UITableViewDataSource,UIScrollViewDelegate>
 
@@ -307,14 +304,7 @@ - (void)didClickedHistory:(UIGestureRecognizer *)sender {
 
 #pragma mark -- goVC
 - (void)goToProject:(Project *)project{
-    NProjectViewController *vc = [[NProjectViewController alloc] init];
-    
-    Project *projectCopy=[project copy];
-    projectCopy.owner_user_name=[[[[[projectCopy project_path] componentsSeparatedByString:@"/p"] firstObject] componentsSeparatedByString:@"u/"] lastObject];
-    projectCopy.name=[NSString getStr:project.name removeEmphasize:@"em"];
-    projectCopy.description_mine=[NSString getStr:project.description_mine removeEmphasize:@"em"];
-
-    vc.myProject = projectCopy;
+    UIViewController *vc = [BaseViewController analyseVCFromLinkStr:project.project_path];
     [self.parentVC.navigationController pushViewController:vc animated:TRUE];
 }
 
@@ -325,17 +315,11 @@ -(void)goToTweet:(Tweet *)tweet{
 }
 
 - (void)goToFileVC:(ProjectFile *)file{
-    FileViewController *vc = [FileViewController vcWithFile:file andVersion:nil];
-    [self.parentVC.navigationController pushViewController:vc animated:YES];
-}
-
-- (void)goToProjectSquareVC{
-    ProjectSquareViewController *vc=[ProjectSquareViewController new];
+    UIViewController *vc = [BaseViewController analyseVCFromLinkStr:file.path];
     [self.parentVC.navigationController pushViewController:vc animated:YES];
 }
 
 
-
 #pragma mark -
 #pragma mark Search Data Request
 
diff --git a/Coding_iOS/Models/Project.m b/Coding_iOS/Models/Project.m
@@ -50,6 +50,7 @@ -(id)copyWithZone:(NSZone*)zone {
     person.created_at = [_created_at copy];
     person.updated_at = [_updated_at copy];
     person.project_path=[_project_path copy];
+    person.owner=[_owner copy];
     return person;
 }
 
diff --git a/Coding_iOS/Models/ProjectFile.h b/Coding_iOS/Models/ProjectFile.h
@@ -21,8 +21,8 @@ typedef NS_ENUM(NSInteger, DownloadState){
 
 @interface ProjectFile : NSObject
 @property (readwrite, nonatomic, strong) NSDate *created_at, *updated_at;
-@property (readwrite, nonatomic, strong) NSNumber *file_id, *owner_id, *parent_id, *type, *current_user_role_id, *size, *project_id, *number;
-@property (readwrite, nonatomic, strong) NSString *name, *fileType, *owner_preview, *preview, *storage_key, *storage_type, *title, *share_url;
+@property (readwrite, nonatomic, strong) NSNumber *id,*file_id, *owner_id, *parent_id, *type, *current_user_role_id, *size, *project_id, *number;
+@property (readwrite, nonatomic, strong) NSString *name, *fileType, *owner_preview, *preview, *storage_key, *storage_type, *title, *share_url,*path;
 @property (readwrite, nonatomic, strong) User *owner;
 @property (strong, nonatomic, readonly) NSString *diskFileName;
 
diff --git a/Coding_iOS/Models/ProjectFile.m b/Coding_iOS/Models/ProjectFile.m
@@ -16,6 +16,36 @@ @interface ProjectFile ()
 
 @implementation ProjectFile
 
+-(id)copyWithZone:(NSZone*)zone {
+    ProjectFile *file = [[[self class] allocWithZone:zone] init];
+    file.project_owner_name = [_project_owner_name copy];
+    file.project_name = [_project_name copy];
+    file.diskFileName = [_diskFileName copy];
+    file.owner = [_owner copy];
+    file.share_url = [_share_url copy];
+    file.title = [_title copy];
+    file.storage_type = [_storage_type copy];
+    file.storage_key = [_storage_key copy];
+    file.preview = [_preview copy];
+    file.owner_preview = [_owner_preview copy];
+    file.fileType = [_fileType copy];
+    file.name = [_name copy];
+    file.number = [_number copy];
+    file.project_id = [_project_id copy];
+    file.size = [_size copy];
+    file.current_user_role_id = [_current_user_role_id copy];
+    file.type = [_type copy];
+    file.parent_id = [_parent_id copy];
+    file.owner_id = [_owner_id copy];
+    file.file_id = [_file_id copy];
+    file.created_at = [_created_at copy];
+    file.updated_at = [_updated_at copy];
+    file.id=[_id copy];
+    file.path=[_path copy];
+    return file;
+}
+
+
 +(ProjectFile *)fileWithFileId:(NSNumber *)fileId andProjectId:(NSNumber *)project_id{
     ProjectFile *file = [[ProjectFile alloc] init];
     file.file_id = fileId;
diff --git a/Coding_iOS/Models/User.m b/Coding_iOS/Models/User.m
@@ -9,6 +9,46 @@
 #import "User.h"
 
 @implementation User
+
+
+-(id)copyWithZone:(NSZone*)zone {
+    User *user = [[[self class] allocWithZone:zone] init];
+    user.avatar = [_avatar copy];
+    user.name = [_name copy];
+    user.global_key = [_global_key copy];
+    user.path = [_path copy];
+    user.slogan = [_slogan copy];
+    user.company = [_company copy];
+    user.tags_str = [_tags_str copy];
+    user.tags = [_tags copy];
+    user.location = [_location copy];
+    user.job_str = [_job_str copy];
+    user.job = [_job copy];
+    user.email = [_email copy];
+    user.birthday = [_birthday copy];
+    user.pinyinName = [_pinyinName copy];
+    user.curPassword = [_curPassword copy];
+    user.resetPassword = [_resetPassword copy];
+    user.resetPasswordConfirm = [_resetPasswordConfirm copy];
+    user.phone = [_phone copy];
+    user.introduction = [_introduction copy];
+    user.id = [_id copy];
+    user.sex = [_sex copy];
+    user.follow = [_follow copy];
+    user.followed = [_followed copy];
+    user.fans_count = [_fans_count copy];
+    user.follows_count = [_follows_count copy];
+    user.tweets_count = [_tweets_count copy];
+    user.status = [_status copy];
+    user.tweets_count = [_tweets_count copy];
+    user.last_logined_at = [_last_logined_at copy];
+    user.last_activity_at = [_last_activity_at copy];
+    user.created_at = [_created_at copy];
+    user.updated_at = [_updated_at copy];
+    return user;
+}
+
+
 + (User *)userWithGlobalKey:(NSString *)global_key{
     User *curUser = [[User alloc] init];
     curUser.global_key = global_key;

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ -(id)copyWithZone:(NSZone*)zone {`
`50`	`50`	`person.created_at = [_created_at copy];`
`51`	`51`	`person.updated_at = [_updated_at copy];`
`52`	`52`	`person.project_path=[_project_path copy];`
	`53`	`+ person.owner=[_owner copy];`
`53`	`54`	`return person;`
`54`	`55`	`}`
`55`	`56`