Skip to content

Commit 569589a

Browse files
committed
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
2 parents d19bf70 + e7e7f74 commit 569589a

File tree

9 files changed

+8
-35
lines changed

9 files changed

+8
-35
lines changed

Coding_iOS.xcodeproj/project.pbxproj

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5131,8 +5131,6 @@
51315131
8E47700D198770E700997D05 /* Frameworks */,
51325132
8E47700E198770E700997D05 /* Resources */,
51335133
96A9263FF11A4AA8B5F6BB6B /* Copy Pods Resources */,
5134-
4D377102C370B11E75B90434 /* Embed Pods Frameworks */,
5135-
E02AF118462CF977ED1C152E /* Embed Pods Frameworks */,
51365134
);
51375135
buildRules = (
51385136
);
@@ -5701,21 +5699,6 @@
57015699
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";
57025700
showEnvVarsInLog = 0;
57035701
};
5704-
4D377102C370B11E75B90434 /* Embed Pods Frameworks */ = {
5705-
isa = PBXShellScriptBuildPhase;
5706-
buildActionMask = 2147483647;
5707-
files = (
5708-
);
5709-
inputPaths = (
5710-
);
5711-
name = "Embed Pods Frameworks";
5712-
outputPaths = (
5713-
);
5714-
runOnlyForDeploymentPostprocessing = 0;
5715-
shellPath = /bin/sh;
5716-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
5717-
showEnvVarsInLog = 0;
5718-
};
57195702
96A9263FF11A4AA8B5F6BB6B /* Copy Pods Resources */ = {
57205703
isa = PBXShellScriptBuildPhase;
57215704
buildActionMask = 2147483647;
@@ -5731,21 +5714,6 @@
57315714
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
57325715
showEnvVarsInLog = 0;
57335716
};
5734-
E02AF118462CF977ED1C152E /* Embed Pods Frameworks */ = {
5735-
isa = PBXShellScriptBuildPhase;
5736-
buildActionMask = 2147483647;
5737-
files = (
5738-
);
5739-
inputPaths = (
5740-
);
5741-
name = "Embed Pods Frameworks";
5742-
outputPaths = (
5743-
);
5744-
runOnlyForDeploymentPostprocessing = 0;
5745-
shellPath = /bin/sh;
5746-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
5747-
showEnvVarsInLog = 0;
5748-
};
57495717
/* End PBXShellScriptBuildPhase section */
57505718

57515719
/* Begin PBXSourcesBuildPhase section */

Coding_iOS/.DS_Store

-8 KB
Binary file not shown.

Coding_iOS/Controllers/ProjectSquareViewController.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
111111
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
112112
ProjectAboutMeListCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ProjectAboutMeListCell"];
113113
cell.openKeywords=TRUE;
114+
cell.hidePrivateIcon=TRUE;
114115
Project *project=_dateSource[indexPath.row];
115116
[cell setProject:project hasSWButtons:NO hasBadgeTip:YES hasIndicator:NO];
116117
// [tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:kPaddingLeftWidth];

Coding_iOS/Images/.DS_Store

-18 KB
Binary file not shown.

Coding_iOS/Models/Project.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
@interface Project : NSObject
1212
@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;
13-
@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;
13+
@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;
1414
@property (assign, nonatomic) BOOL isStaring, isWatching, isLoadingMember, isLoadingDetail;
1515

1616
@property (strong, nonatomic) User *owner;

Coding_iOS/Views/Cell/PRMRSearchCell.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ - (void)setCurMRPR:(MRPR *)curMRPR{
180180
fromStr = [NSString stringWithFormat:@" %@ : %@ ", _curMRPR.author.name, _curMRPR.source_branch];
181181
toStr = [NSString stringWithFormat:@" %@ : %@ ", _curMRPR.des_owner_name, _curMRPR.target_branch];
182182
}
183+
183184
NSString *totalStr = [NSString stringWithFormat:@"%@%@", fromStr, toStr];
184185
if ([totalStr getWidthWithFont:[UIFont systemFontOfSize:12] constrainedToSize:CGSizeMake(CGFLOAT_MAX, 20)] + 40 > kScreen_Width - 2*kPaddingLeftWidth) {
185186
[_toL mas_remakeConstraints:^(MASConstraintMaker *make) {

Coding_iOS/Views/Cell/ProjectAboutMeListCell.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
@interface ProjectAboutMeListCell : SWTableViewCell
2020
@property(nonatomic,assign)BOOL openKeywords;
21+
@property(nonatomic,assign)BOOL hidePrivateIcon;
2122
- (void)setProject:(Project *)project hasSWButtons:(BOOL)hasSWButtons hasBadgeTip:(BOOL)hasBadgeTip hasIndicator:(BOOL)hasIndicator;
2223

2324
@end

Coding_iOS/Views/Cell/ProjectAboutMeListCell.m

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,10 @@ - (void)setProject:(Project *)project hasSWButtons:(BOOL)hasSWButtons hasBadgeTi
101101
}
102102
//Icon
103103
[_projectIconView sd_setImageWithURL:[_project.icon urlImageWithCodePathResizeToView:_projectIconView] placeholderImage:kPlaceholderCodingSquareWidth(55.0)];
104-
_privateIconView.hidden = _project.is_public.boolValue;
104+
_privateIconView.hidden =(_project.is_public!=nil)? _project.is_public.boolValue:([_project.type intValue]==2)?FALSE:TRUE;
105+
if (_hidePrivateIcon) {
106+
_privateIconView.hidden=TRUE;
107+
}
105108

106109
[_privateIconView mas_updateConstraints:^(MASConstraintMaker *make) {
107110
make.size.mas_equalTo(_privateIconView.hidden?CGSizeZero:CGSizeMake(12, 12));

Coding_iOS/Views/Cell/TaskSearchCell.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,5 @@ + (CGFloat)contentLabelHeightWithProjectTopic:(Task *)task{
211211
}
212212

213213

214-
215214
@end
216215

0 commit comments

Comments
 (0)