Skip to content

Commit 0d09a2c

Browse files
wanghenghengEase
wanghengheng
authored and
Ease
committed
通知页面 改改改
1 parent 96dc94e commit 0d09a2c

3 files changed

Lines changed: 33 additions & 29 deletions

File tree

‎Coding_iOS.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@
289289
4E76D4DE1A5A7B4A0094A35E /* text_clear_btn@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E76D4DD1A5A7B4A0094A35E /* text_clear_btn@2x.png */; };
290290
4E787DE21B0329B300F06E83 /* ProjectLineNote.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E787DE11B0329B300F06E83 /* ProjectLineNote.m */; };
291291
4E787DE51B03342000F06E83 /* ProjectActivity.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E787DE41B03342000F06E83 /* ProjectActivity.m */; };
292-
4E86FEE51BB556D6005E53F3 /* tipIcon_ProjectFileComment.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E86FEE41BB556D6005E53F3 /* tipIcon_ProjectFileComment.png */; settings = {ASSET_TAGS = (); }; };
292+
4E86FEE51BB556D6005E53F3 /* tipIcon_ProjectFileComment@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E86FEE41BB556D6005E53F3 /* tipIcon_ProjectFileComment@2x.png */; settings = {ASSET_TAGS = (); }; };
293293
4E8765651A22E5B40090CFB9 /* NSMutableArray+SWUtilityButtons.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E87655A1A22E5B40090CFB9 /* NSMutableArray+SWUtilityButtons.m */; };
294294
4E8765661A22E5B40090CFB9 /* SWCellScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E87655C1A22E5B40090CFB9 /* SWCellScrollView.m */; };
295295
4E8765671A22E5B40090CFB9 /* SWLongPressGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E87655E1A22E5B40090CFB9 /* SWLongPressGestureRecognizer.m */; };
@@ -1338,7 +1338,7 @@
13381338
4E787DE11B0329B300F06E83 /* ProjectLineNote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProjectLineNote.m; sourceTree = "<group>"; };
13391339
4E787DE31B03342000F06E83 /* ProjectActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectActivity.h; sourceTree = "<group>"; };
13401340
4E787DE41B03342000F06E83 /* ProjectActivity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProjectActivity.m; sourceTree = "<group>"; };
1341-
4E86FEE41BB556D6005E53F3 /* tipIcon_ProjectFileComment.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tipIcon_ProjectFileComment.png; sourceTree = "<group>"; };
1341+
4E86FEE41BB556D6005E53F3 /* tipIcon_ProjectFileComment@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tipIcon_ProjectFileComment@2x.png"; sourceTree = "<group>"; };
13421342
4E8765591A22E5B40090CFB9 /* NSMutableArray+SWUtilityButtons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableArray+SWUtilityButtons.h"; sourceTree = "<group>"; };
13431343
4E87655A1A22E5B40090CFB9 /* NSMutableArray+SWUtilityButtons.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableArray+SWUtilityButtons.m"; sourceTree = "<group>"; };
13441344
4E87655B1A22E5B40090CFB9 /* SWCellScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWCellScrollView.h; sourceTree = "<group>"; };
@@ -4129,7 +4129,7 @@
41294129
4E4972DE1BB535B400F3AC15 /* tipIcon_ProjectTweetComment@2x.png */,
41304130
4E4972E11BB5395B00F3AC15 /* tipIcon_CommitLineNote@2x.png */,
41314131
4E4972E31BB543A900F3AC15 /* tipIcon_Depot@2x.png */,
4132-
4E86FEE41BB556D6005E53F3 /* tipIcon_ProjectFileComment.png */,
4132+
4E86FEE41BB556D6005E53F3 /* tipIcon_ProjectFileComment@2x.png */,
41334133
);
41344134
path = tip_icons;
41354135
sourceTree = "<group>";
@@ -5117,7 +5117,7 @@
51175117
B9A00D7F1ACA3A05008BA008 /* ProjectSetting.storyboard in Resources */,
51185118
8EA6D19219E240C40076D59C /* timeline_icon_unread@2x.png in Resources */,
51195119
4E095A6D1B69F920008DC439 /* banner__page_selected@2x.png in Resources */,
5120-
4E86FEE51BB556D6005E53F3 /* tipIcon_ProjectFileComment.png in Resources */,
5120+
4E86FEE51BB556D6005E53F3 /* tipIcon_ProjectFileComment@2x.png in Resources */,
51215121
4E217F141A70EDC700F6DF88 /* SVWebViewControllerActivitySafari-iPad@2x.png in Resources */,
51225122
4EF91F641B00B62B0021C951 /* icon_not_locationed@2x.png in Resources */,
51235123
4E6383EA1B32791600D98648 /* checkbox_unchecked@2x.png in Resources */,

Coding_iOS/Images/tip_icons/tipIcon_ProjectFileComment.png renamed to Coding_iOS/Images/tip_icons/tipIcon_ProjectFileComment@2x.png

File renamed without changes.

‎Coding_iOS/Views/Cell/CodingTipCell.m‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ @implementation CodingTipCell
2828

2929
static CGFloat user_icon_width = 35.0;
3030
static CGFloat padding_height = 45;
31-
static CGFloat padding_left = 65.0;
31+
static CGFloat padding_left = 30.0;
3232
static CGFloat padding_between_content = 15.0;
3333
static CGFloat target_height = 45.0;
3434

@@ -40,26 +40,28 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
4040
// Initialization code
4141
self.selectionStyle = UITableViewCellSelectionStyleNone;
4242
self.backgroundColor = [UIColor clearColor];
43-
if (!self.ownerImgView) {
44-
self.ownerImgView = [[UITapImageView alloc] initWithFrame:CGRectMake(kPaddingLeftWidth, 15, user_icon_width, user_icon_width)];
45-
[self.ownerImgView doCircleFrame];
46-
47-
_ownerL = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, user_icon_width, user_icon_width)];
48-
_ownerL.backgroundColor = [UIColor clearColor];
49-
_ownerL.font = [UIFont fontWithName:@"Chalkduster" size:20];
50-
// PartyLetPlain
51-
// Chalkduster
52-
_ownerL.textColor = [UIColor colorWithHexString:@"0x999999"];
53-
_ownerL.textAlignment = NSTextAlignmentCenter;
54-
[self.ownerImgView addSubview:_ownerL];
55-
56-
@weakify(self);
57-
[_ownerImgView addTapBlock:^(id obj) {
58-
@strongify(self);
59-
[self userBtnClicked];
60-
}];
61-
[self.contentView addSubview:self.ownerImgView];
62-
}
43+
// if (!self.ownerImgView) {
44+
// self.ownerImgView = [[UITapImageView alloc] initWithFrame:CGRectMake(kPaddingLeftWidth, 15, user_icon_width, user_icon_width)];
45+
// [self.ownerImgView doCircleFrame];
46+
//
47+
// _ownerL = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, user_icon_width, user_icon_width)];
48+
// _ownerL.backgroundColor = [UIColor clearColor];
49+
// _ownerL.font = [UIFont fontWithName:@"Chalkduster" size:20];
50+
//// _ownerL.font = [UIFont fontWithName:@"PartyLetPlain" size:20];
51+
//// _ownerL.font = [UIFont systemFontOfSize:20];
52+
//// PartyLetPlain
53+
//// Chalkduster
54+
// _ownerL.textColor = [UIColor colorWithHexString:@"0x999999"];
55+
// _ownerL.textAlignment = NSTextAlignmentCenter;
56+
// [self.ownerImgView addSubview:_ownerL];
57+
//
58+
// @weakify(self);
59+
// [_ownerImgView addTapBlock:^(id obj) {
60+
// @strongify(self);
61+
// [self userBtnClicked];
62+
// }];
63+
// [self.contentView addSubview:self.ownerImgView];
64+
// }
6365
if (!self.ownerNameBtn) {
6466
self.ownerNameBtn = [UIButton buttonWithUserStyle];
6567
self.ownerNameBtn.frame = CGRectMake(padding_left, 15, 50, 20);
@@ -116,9 +118,10 @@ - (void)setCurTip:(CodingTip *)curTip{
116118
// [self.ownerImgView sd_setImageWithURL:[@"" urlImageWithCodePathResizeToView:_ownerImgView] placeholderImage:kPlaceholderMonkeyRoundWidth(40.0)];
117119
NSString *userName = curTip.user_item.displayStr;
118120

119-
NSString *pinyin = [userName transformToPinyin];
120-
NSString *username_first = pinyin.length > 0? [[pinyin substringToIndex:1] uppercaseString]: @"C";
121-
_ownerL.text = username_first;
121+
// NSString *pinyin = [userName transformToPinyin];
122+
//// NSString *pinyin = userName;
123+
// NSString *username_first = pinyin.length > 0? [[pinyin substringToIndex:1] uppercaseString]: @"C";
124+
// _ownerL.text = username_first;
122125
//owner姓名
123126
[self.ownerNameBtn setUserTitle:userName font:[UIFont systemFontOfSize:17] maxWidth:(kCodingTipCell_WidthContent -80)];
124127
//时间
@@ -147,7 +150,8 @@ - (void)setCurTip:(CodingTip *)curTip{
147150
_targetBgBtn.hidden = YES;
148151
}
149152
//unread
150-
[self.contentView addBadgeTip:_curTip.status.boolValue? @"": kBadgeTipStr withCenterPosition:CGPointMake(_ownerImgView.center.x, CGRectGetMaxY(_ownerImgView.frame) + 10)];
153+
// [self.contentView addBadgeTip:_curTip.status.boolValue? @"": kBadgeTipStr withCenterPosition:CGPointMake(_ownerImgView.center.x, CGRectGetMaxY(_ownerImgView.frame) + 10)];
154+
[self.contentView addBadgeTip:_curTip.status.boolValue? @"": kBadgeTipStr withCenterPosition:CGPointMake(kPaddingLeftWidth + 4.0, _ownerNameBtn.center.y)];
151155
}
152156

153157
- (void)targetBtnClicked{

0 commit comments

Comments
 (0)