Accept Pull Request #390 : (jwill:master -> coding:master)

Pull Request: 阿打算打算的
Created By: @jwill
Accepted By: @王哼哼
URL: https://coding.net/u/coding/p/Coding-iOS/git/pull/390

Author: wanghengheng

Coding_iOS.xcodeproj/project.pbxproj

@@ -5131,8 +5131,6 @@
 				8E47700D198770E700997D05 /* Frameworks */,
 				8E47700E198770E700997D05 /* Resources */,
 				96A9263FF11A4AA8B5F6BB6B /* Copy Pods Resources */,
-				4D377102C370B11E75B90434 /* Embed Pods Frameworks */,
-				E02AF118462CF977ED1C152E /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -5701,21 +5699,6 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		4D377102C370B11E75B90434 /* Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		96A9263FF11A4AA8B5F6BB6B /* Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -5731,21 +5714,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		E02AF118462CF977ED1C152E /* Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

Coding_iOS/.DS_Store

@@ -111,6 +111,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
     ProjectAboutMeListCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ProjectAboutMeListCell"];
     cell.openKeywords=TRUE;
+    cell.hidePrivateIcon=TRUE;
     Project *project=_dateSource[indexPath.row];
     [cell setProject:project hasSWButtons:NO hasBadgeTip:YES hasIndicator:NO];
 //    [tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:kPaddingLeftWidth];

Coding_iOS/Controllers/ProjectSquareViewController.m

@@ -10,7 +10,7 @@
 
 @interface Project : NSObject
 @property (readwrite, nonatomic, strong) NSString *icon, *name, *owner_user_name, *backend_project_path, *full_name, *description_mine, *path, *parent_depot_path, *current_user_role,*project_path;
-@property (readwrite, nonatomic, strong) NSNumber *id, *owner_id, *is_public, *un_read_activities_count, *done, *processing, *star_count, *stared, *watch_count, *watched, *fork_count, *forked, *recommended, *pin, *current_user_role_id;
+@property (readwrite, nonatomic, strong) NSNumber *id, *owner_id, *is_public, *un_read_activities_count, *done, *processing, *star_count, *stared, *watch_count, *watched, *fork_count, *forked, *recommended, *pin, *current_user_role_id,*type;
 @property (assign, nonatomic) BOOL isStaring, isWatching, isLoadingMember, isLoadingDetail;
 
 @property (strong, nonatomic) User *owner;

Coding_iOS/Images/.DS_Store

@@ -180,6 +180,7 @@ - (void)setCurMRPR:(MRPR *)curMRPR{
         fromStr = [NSString stringWithFormat:@"  %@ : %@  ", _curMRPR.author.name, _curMRPR.source_branch];
         toStr = [NSString stringWithFormat:@"  %@ : %@  ", _curMRPR.des_owner_name, _curMRPR.target_branch];
     }
+    
     NSString *totalStr = [NSString stringWithFormat:@"%@%@", fromStr, toStr];
     if ([totalStr getWidthWithFont:[UIFont systemFontOfSize:12] constrainedToSize:CGSizeMake(CGFLOAT_MAX, 20)] + 40 > kScreen_Width - 2*kPaddingLeftWidth) {
         [_toL mas_remakeConstraints:^(MASConstraintMaker *make) {

Coding_iOS/Models/Project.h

@@ -18,6 +18,7 @@
 
 @interface ProjectAboutMeListCell : SWTableViewCell
 @property(nonatomic,assign)BOOL openKeywords;
+@property(nonatomic,assign)BOOL hidePrivateIcon;
 - (void)setProject:(Project *)project hasSWButtons:(BOOL)hasSWButtons hasBadgeTip:(BOOL)hasBadgeTip hasIndicator:(BOOL)hasIndicator;
 
 @end

Coding_iOS/Views/Cell/PRMRSearchCell.m

@@ -101,7 +101,10 @@ - (void)setProject:(Project *)project hasSWButtons:(BOOL)hasSWButtons hasBadgeTi
     }
     //Icon
     [_projectIconView sd_setImageWithURL:[_project.icon urlImageWithCodePathResizeToView:_projectIconView] placeholderImage:kPlaceholderCodingSquareWidth(55.0)];
-    _privateIconView.hidden = _project.is_public.boolValue;
+    _privateIconView.hidden =(_project.is_public!=nil)? _project.is_public.boolValue:([_project.type intValue]==2)?FALSE:TRUE;
+    if (_hidePrivateIcon) {
+        _privateIconView.hidden=TRUE;
+    }
 
     [_privateIconView mas_updateConstraints:^(MASConstraintMaker *make) {
         make.size.mas_equalTo(_privateIconView.hidden?CGSizeZero:CGSizeMake(12, 12));

Coding_iOS/Views/Cell/ProjectAboutMeListCell.h

@@ -211,6 +211,5 @@ + (CGFloat)contentLabelHeightWithProjectTopic:(Task *)task{
 }
 
 
-
 @end