ios / YH_LivePush · Commits

Go to a project

Authored by 郁健超
Commit 696b4ccd02381bc792dd574579274a10af18f499 1 parent 26dee5f8

修改弹幕UI review by洛克

Inline Side-by-side
Showing 6 changed files with 26 additions and 6 deletions
... ... @@ -138,6 +138,10 @@
31CCA53D1D2613D800ADF9F0 /* UIViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 31CCA53C1D2613D800ADF9F0 /* UIViewAdditions.m */; };
A09B25771CE57CAF00E68E28 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A09B25761CE57CAF00E68E28 /* SystemConfiguration.framework */; };
A51F2241B9D9A5E207DF1E68 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A2F123EA9030672A0EFEF6CC /* libPods.a */; };
D962AC161D30C48C007834D4 /* message_Tip@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D962AC141D30C48C007834D4 /* message_Tip@2x.png */; };
D962AC171D30C48C007834D4 /* message_Tip@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D962AC151D30C48C007834D4 /* message_Tip@3x.png */; };
D962AC1A1D30C4E2007834D4 /* messageArrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D962AC181D30C4E2007834D4 /* messageArrow@2x.png */; };
D962AC1B1D30C4E2007834D4 /* messageArrow@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D962AC191D30C4E2007834D4 /* messageArrow@3x.png */; };
EFF834691CEB638B00345113 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A09B25741CE57CA000E68E28 /* CoreTelephony.framework */; };
/* End PBXBuildFile section */
... ... @@ -354,6 +358,10 @@
A09B25741CE57CA000E68E28 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
A09B25761CE57CAF00E68E28 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
A2F123EA9030672A0EFEF6CC /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
D962AC141D30C48C007834D4 /* message_Tip@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "message_Tip@2x.png"; sourceTree = "<group>"; };
D962AC151D30C48C007834D4 /* message_Tip@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "message_Tip@3x.png"; sourceTree = "<group>"; };
D962AC181D30C4E2007834D4 /* messageArrow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "messageArrow@2x.png"; sourceTree = "<group>"; };
D962AC191D30C4E2007834D4 /* messageArrow@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "messageArrow@3x.png"; sourceTree = "<group>"; };
DF5CC49E6ACE4D402D22806C /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
E02A0042E44F888A50E7158C /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
EF14E52B1C884C71002F1BEF /* YohoLive.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = YohoLive.app; sourceTree = BUILT_PRODUCTS_DIR; };
... ... @@ -485,6 +493,10 @@
2EA13A011D05733B0037C9EB /* resource */ = {
isa = PBXGroup;
children = (
D962AC181D30C4E2007834D4 /* messageArrow@2x.png */,
D962AC191D30C4E2007834D4 /* messageArrow@3x.png */,
D962AC141D30C48C007834D4 /* message_Tip@2x.png */,
D962AC151D30C48C007834D4 /* message_Tip@3x.png */,
2E64AB921D08099E004307A3 /* launchimage1@2x.png */,
2E64AB931D08099E004307A3 /* launchimage1@3x.png */,
2EA13A021D05733B0037C9EB /* adjust.png */,
... ... @@ -798,11 +810,14 @@
2EA13A4A1D05733B0037C9EB /* log.png in Resources */,
2EA13A411D05733B0037C9EB /* Icon-Small-50@2x.png in Resources */,
2EA13A351D05733B0037C9EB /* black.png in Resources */,
D962AC161D30C48C007834D4 /* message_Tip@2x.png in Resources */,
D962AC171D30C48C007834D4 /* message_Tip@3x.png in Resources */,
2EA13A3F1D05733B0037C9EB /* Icon-72@2x.png in Resources */,
2EA13A491D05733B0037C9EB /* line2.png in Resources */,
2EB66FB61D18EEC700E91AAE /* YH_BarrageMsgCell.xib in Resources */,
2EA13A561D05733B0037C9EB /* white.png in Resources */,
2EA13A431D05733B0037C9EB /* Icon@2x.png in Resources */,
D962AC1B1D30C4E2007834D4 /* messageArrow@3x.png in Resources */,
2EA13A3A1D05733B0037C9EB /* flash_off.png in Resources */,
2EA13A391D05733B0037C9EB /* fill.png in Resources */,
2EA13A4B1D05733B0037C9EB /* log2.png in Resources */,
... ... @@ -823,6 +838,7 @@
2EA13A331D05733B0037C9EB /* background@2x.jpg in Resources */,
2EA13A371D05733B0037C9EB /* camera2.png in Resources */,
2EA13A4E1D05733B0037C9EB /* QR_code.png in Resources */,
D962AC1A1D30C4E2007834D4 /* messageArrow@2x.png in Resources */,
2EA13A451D05733B0037C9EB /* landscape.png in Resources */,
2EA13A4C1D05733B0037C9EB /* portrait.png in Resources */,
2EA13A341D05733B0037C9EB /* beauty.png in Resources */,
... ...
... ... @@ -15,7 +15,7 @@
#define kBarrageTableViewWidth (245 * kScreenPointScale)
#define kInputTextFieldHeight 34
#define kInputTextFieldBottomEdge 49
#define kPaddingLeft 15
#define kPaddingLeft 13
#define kCloseButtonWidth 19
#define kMessageTipLeftEdge 111
... ... @@ -114,14 +114,14 @@
[self.view addSubview:self.bottomContainerView];
self.messageTip = [[UIImageView alloc] initWithFrame:CGRectMake(SCREEN_WIDTH - kMessageTipWidth - kMessageTipLeftEdge, self.barrageTableView.bottom - 5 - kMessageTipHeight, kMessageTipWidth, kMessageTipHeight)];
self.messageTip = [[UIImageView alloc] initWithFrame:CGRectMake(SCREEN_WIDTH - kMessageTipWidth - kMessageTipLeftEdge, self.barrageTableView.bottom - kMessageTipHeight, kMessageTipWidth, kMessageTipHeight)];
self.messageTip.image = [UIImage imageNamed:@"message_Tip"];
self.messageTip.userInteractionEnabled = YES;
UITapGestureRecognizer *tapGR = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(newsBubbleClick:)];
tapGR.numberOfTapsRequired = 1;
[self.messageTip addGestureRecognizer:tapGR];
self.messageArrow = [[UIImageView alloc] initWithFrame:CGRectMake(10, 7, 10, 8)];
self.messageArrow = [[UIImageView alloc] initWithFrame:CGRectMake(10, 8, 10, 6)];
self.messageArrow.image = [UIImage imageNamed:@"messageArrow"];
[self.messageTip addSubview:self.messageArrow];
... ... @@ -175,6 +175,10 @@
msgCount = [NSString stringWithFormat:@"%ld条信息",(long)[newMsgCount integerValue]];
}
[self.newsBubble setText:msgCount];
CGSize size = CGSizeMake(60,kMessageTipHeight);
CGSize labelsize = [self.newsBubble sizeThatFits:size];
[self.newsBubble setFrame:CGRectMake(25, (kMessageTipHeight - labelsize.height) / 2, labelsize.width, labelsize.height)];
[self.messageTip setWidth:CGRectGetMaxX(self.newsBubble.frame) + 10];
[self.messageTip setHidden:NO];
}
... ... @@ -222,7 +226,7 @@
_newsBubble = [[UILabel alloc]init];
_newsBubble.userInteractionEnabled = YES;
_newsBubble.textAlignment = NSTextAlignmentCenter;
_newsBubble.font = [UIFont fontOfLightWithSize:11];
_newsBubble.font = [UIFont fontOfSCWithSize:11];
_newsBubble.textColor = [UIColor blackColor];
}
... ... @@ -300,7 +304,7 @@
CGRect tRect = self.barrageTableView.frame;
tRect.origin.y = self.bottomContainerView.top - CGRectGetHeight(tRect) - 5;
self.barrageTableView.frame = tRect;
[self.messageTip setY:self.barrageTableView.bottom - 5 - kMessageTipHeight];
[self.messageTip setY:self.barrageTableView.bottom - kMessageTipHeight];
}];
if (self.keyBoardShowBlock) {
... ... @@ -324,7 +328,7 @@
CGRect tRect = self.barrageTableView.frame;
tRect.origin.y = SCREEN_HEIGHT - CGRectGetHeight(tRect) - kInputTextFieldBottomEdge;
self.barrageTableView.frame = tRect;
[self.messageTip setY:self.barrageTableView.bottom - 5 - kMessageTipHeight];
[self.messageTip setY:self.barrageTableView.bottom - kMessageTipHeight];
}];
if (self.keyBoardShowBlock) {
... ...