Skip to content

Commit acbf63d

Browse files
wanghenghengwanghengheng
committed
关注者 - 换图 & bugfix
1 parent cac8723 commit acbf63d

File tree

7 files changed

+10
-4
lines changed

7 files changed

+10
-4
lines changed

‎Coding_iOS.xcodeproj/project.pbxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,8 @@
518518
4ED6181D1C3A72CF0017946C /* ShopAddressCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4ED6181C1C3A72CF0017946C /* ShopAddressCell.xib */; };
519519
4ED6181F1C3A732F0017946C /* button_arrow_left@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ED6181E1C3A732F0017946C /* button_arrow_left@2x.png */; };
520520
4ED618211C3BD79B0017946C /* task_activity_icon_remove_watcher@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ED618201C3BD79B0017946C /* task_activity_icon_remove_watcher@2x.png */; };
521+
4ED618241C3CB1AF0017946C /* taskWatchers@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ED618221C3CB1AF0017946C /* taskWatchers@2x.png */; };
522+
4ED618251C3CB1AF0017946C /* taskWatchers@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ED618231C3CB1AF0017946C /* taskWatchers@3x.png */; };
521523
4ED6731E1A8DD38C00DF2D1A /* ReportIllegalViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ED6731D1A8DD38C00DF2D1A /* ReportIllegalViewController.m */; };
522524
4ED673221A8E0ECC00DF2D1A /* SVWebViewControllerActivityReport.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ED673211A8E0ECC00DF2D1A /* SVWebViewControllerActivityReport.m */; };
523525
4ED673261A8E127100DF2D1A /* SVWebViewControllerActivityReport@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ED673251A8E127100DF2D1A /* SVWebViewControllerActivityReport@2x.png */; };
@@ -1834,6 +1836,8 @@
18341836
4ED6181C1C3A72CF0017946C /* ShopAddressCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ShopAddressCell.xib; sourceTree = "<group>"; };
18351837
4ED6181E1C3A732F0017946C /* button_arrow_left@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_arrow_left@2x.png"; sourceTree = "<group>"; };
18361838
4ED618201C3BD79B0017946C /* task_activity_icon_remove_watcher@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "task_activity_icon_remove_watcher@2x.png"; sourceTree = "<group>"; };
1839+
4ED618221C3CB1AF0017946C /* taskWatchers@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "taskWatchers@2x.png"; sourceTree = "<group>"; };
1840+
4ED618231C3CB1AF0017946C /* taskWatchers@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "taskWatchers@3x.png"; sourceTree = "<group>"; };
18371841
4ED6731C1A8DD38C00DF2D1A /* ReportIllegalViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReportIllegalViewController.h; sourceTree = "<group>"; };
18381842
4ED6731D1A8DD38C00DF2D1A /* ReportIllegalViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReportIllegalViewController.m; sourceTree = "<group>"; };
18391843
4ED673201A8E0ECC00DF2D1A /* SVWebViewControllerActivityReport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVWebViewControllerActivityReport.h; sourceTree = "<group>"; };
@@ -2913,6 +2917,8 @@
29132917
4E63840E1B34124000D98648 /* task_icon_arrow@2x.png */,
29142918
4EED9DCA1B539366000E5827 /* taskOwner@2x.png */,
29152919
4EED9DCB1B539366000E5827 /* taskProject@2x.png */,
2920+
4ED618221C3CB1AF0017946C /* taskWatchers@2x.png */,
2921+
4ED618231C3CB1AF0017946C /* taskWatchers@3x.png */,
29162922
);
29172923
path = task;
29182924
sourceTree = "<group>";
@@ -5260,6 +5266,7 @@
52605266
4E96E7D91A1B537E0037C098 /* icon_file_apk@2x.png in Resources */,
52615267
4E996C021ABBF56A00C704F1 /* n_btn_followed_both@2x.png in Resources */,
52625268
4E6383BB1B32640900D98648 /* messageSystem@2x.png in Resources */,
5269+
4ED618251C3CB1AF0017946C /* taskWatchers@3x.png in Resources */,
52635270
4E095A851B6B24DE008DC439 /* topic_comment_icon@2x.png in Resources */,
52645271
7E8E59841B6F91C40083CA02 /* bubble_right_play_2@2x.png in Resources */,
52655272
4E2BF3CF1B96CDF800A5A0A8 /* share_btn_coding@2x.png in Resources */,
@@ -5347,6 +5354,7 @@
53475354
4EC5AD931A258DF8006FA97C /* icon_file_cell_move@2x.png in Resources */,
53485355
4EC5AD941A258DF8006FA97C /* icon_file_cell_rename@2x.png in Resources */,
53495356
8E97CE9A1A0C7E26006F9AD7 /* coding_emoji_03@2x.png in Resources */,
5357+
4ED618241C3CB1AF0017946C /* taskWatchers@2x.png in Resources */,
53505358
4E96E7E21A1B537E0037C098 /* icon_file_psd@2x.png in Resources */,
53515359
8EA6D18019E240C40076D59C /* sex_man_icon@2x.png in Resources */,
53525360
4EC461B31B39360F00D08970 /* file_changeType_DELETE@2x.png in Resources */,

‎Coding_iOS/Controllers/ProjectMemberListViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
203203
cell.curMember = curMember;
204204
cell.type = _type;
205205
if (_type == ProMemTypeTaskWatchers) {
206-
cell.isAdded = [self.curTask hasWatcher:curMember.user];
206+
[cell.leftBtn setImage:[UIImage imageNamed:[self.curTask hasWatcher:curMember.user]? @"btn_project_added": @"btn_project_add"] forState:UIControlStateNormal];
207207
}
208208
cell.leftBtnClickedBlock = ^(UIButton *sender){
209209
if (tableView.isEditing) {

‎Coding_iOS/Images/task/taskWatchers@2x.png

1.44 KB
Loading

‎Coding_iOS/Images/task/taskWatchers@3x.png

2.26 KB
Loading

‎Coding_iOS/Views/Cell/LeftImage_LRTextCell.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ - (void)layoutSubviews{
110110
case LeftImage_LRTextCellTypeTaskWatchers:
111111
{
112112
[_iconView doNotCircleFrame];
113-
[_iconView setImage:[UIImage imageNamed:@"taskProgress"]];
113+
[_iconView setImage:[UIImage imageNamed:@"taskWatchers"]];
114114
_leftLabel.text = @"关注者";
115115
_rightLabel.text = task.watchers.count > 0? [NSString stringWithFormat:@"%lu 人关注", (unsigned long)task.watchers.count]: @"未添加";
116116
}

‎Coding_iOS/Views/Cell/MemberCell.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
@property (strong, nonatomic) UIButton *leftBtn;
1919
@property (nonatomic,copy) void(^leftBtnClickedBlock)(id sender);
2020
@property (assign, nonatomic) ProMemType type;
21-
@property (assign, nonatomic) BOOL isAdded;
2221

2322
+ (CGFloat)cellHeight;
2423
@end

‎Coding_iOS/Views/Cell/MemberCell.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ - (void)layoutSubviews{
9191
}
9292
}
9393
}else if (_type == ProMemTypeTaskWatchers){
94-
[_leftBtn setImage:[UIImage imageNamed:_isAdded? @"btn_project_added": @"btn_project_add"] forState:UIControlStateNormal];
9594
_leftBtn.hidden = NO;
9695
}else{
9796
_leftBtn.hidden = YES;

0 commit comments

Comments
 (0)