Skip to content

pidan / FuSiLive

Go to a project
Commit 19dcd010 by ludi
Options

Merge branch 'feature/UI修改版本' of http://git.yabolive.net:88/pidan/FuSiLive into feature/UI修改版本

parents 0895668d 3833de0c
Expand all
Inline Side-by-side
Showing with 210 additions and 283 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/EmptyView/FUSEmptyView.m
......@@ -65,7 +65,7 @@
[_emptyButton setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
_emptyTitleLabel = [[YYLabel alloc] init];
_emptyTitleLabel.textColor = [UIColor colorWithHex:@"#B3B3B3"];
_emptyTitleLabel.textColor = [UIColor fus_textColorMedium];
_emptyTitleLabel.font = [UIFont fus_themeFont:15];
_emptyTitleLabel.numberOfLines = 0;
_emptyTitleLabel.lineBreakMode = NSLineBreakByWordWrapping;
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSStyleButton.m
......@@ -225,16 +225,16 @@
[self setTitleColor:[UIColor whiteColor] forState:UIControlStateDisabled];
self.layer.cornerRadius = self.height / 2.0f;
self.layer.masksToBounds = YES;
self.backgroundColor = [UIColor fus_appMainColor];
self.backgroundColor = [UIColor fus_diamondBlue];
}
break;
case FUSButtonStyleBlueBorder:
{
[self cleanStyle];
[self setTitleColor:[UIColor fus_appMainColor] forState:UIControlStateNormal];
[self setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
self.layer.cornerRadius = self.height / 2.0f;
self.layer.masksToBounds = YES;
self.layer.borderColor = UIColor.fus_appMainColor.CGColor;
self.layer.borderColor = UIColor.fus_diamondBlue.CGColor;
self.layer.borderWidth = 1;
self.backgroundColor = [UIColor clearColor];
}
......
FuSiLive/Assets.xcassets/Live/Gift/icon_anim/Contents.json 0 → 100644
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/live_end_bg.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "直播结束页-背景@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/live_message_box_no_message_icon.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "通用占位图@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/jacket/live_chat_icon_gift_13.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_chat_icon_gift_13@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/jacket/live_chat_icon_gift_14.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_chat_icon_gift_14@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/jacket/live_chat_icon_gift_15.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_chat_icon_gift_15@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/jacket/live_chat_icon_share.imageset/Contents.json
......@@ -5,18 +5,18 @@
"scale" : "1x"
},
{
"filename" : "分享@2x.png",
"idiom" : "universal",
"filename" : "直播间-底部-分享icon-normal@2x.png",
"scale" : "2x"
},
{
"filename" : "分享@3x.png",
"idiom" : "universal",
"filename" : "直播间-底部-分享icon-normal@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
\ No newline at end of file
}
FuSiLive/Classes/BaoFang/OpenScreenPush/View/FUSOpenScreenPushView.m
......@@ -65,7 +65,7 @@
self.picPageControl.numberOfPages = openScreenPushModel.img.count;
self.picPageControl.currentPage = 0;
self.picPageControl.pageIndicatorTintColor = [UIColor colorWithHex:@"B3B3B3"];
self.picPageControl.currentPageIndicatorTintColor = [UIColor colorWithHex:@"2BE1B0"];
self.picPageControl.currentPageIndicatorTintColor = [UIColor fus_diamondBlue];
if (openScreenPushModel.img.count > 1) {
self.picPageControl.hidden = NO;
......
FuSiLive/Classes/Board/View/BoardPopupView/FireCount/FUSFireCountTableViewCell.xib
......@@ -76,9 +76,9 @@
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="vip_icon_normal" translatesAutoresizingMaskIntoConstraints="NO" id="wq7-T4-CP0">
<rect key="frame" x="141" y="15" width="13" height="15"/>
<rect key="frame" x="141" y="15.5" width="13" height="14"/>
<constraints>
<constraint firstAttribute="height" constant="15" id="7ez-1b-Xza"/>
<constraint firstAttribute="height" constant="14" id="7ez-1b-Xza"/>
</constraints>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="aV3-TM-xFk">
......@@ -124,7 +124,7 @@
<resources>
<image name="fireFly_zone_fireCount_Top1" width="53" height="64"/>
<image name="fireFly_zone_fireCount_Top1_rank" width="43" height="11"/>
<image name="fireFly_zone_fireCount_fire" width="15" height="15"/>
<image name="fireFly_zone_fireCount_fire" width="12" height="15.5"/>
<image name="vip_icon_normal" width="13" height="13"/>
</resources>
</document>
FuSiLive/Classes/Foundation/Http/FUSURLDictionary.h
......@@ -1049,7 +1049,7 @@
#define URL_WEB_ARBIC_HELP DNS_WEB(@"/Nesting/help/l7.html")
// 《直播 & 社区公约》
#define URL_WEB_REGULATION DNS_WEB(@"fusi/help/index.html")//DNS_WEB(@"/regulation.html")
#define URL_WEB_REGULATION DNS_WEB(@"/fusi/help/index.html")//DNS_WEB(@"/regulation.html")
// 主播时长查询
#define URL_LIVE_TIME_SEARCH DNS_WEB(@"/Nesting/queryTime/index.html")
......
FuSiLive/Classes/Foundation/View/CustomView/FUSNameLevelView.xib
......@@ -36,9 +36,9 @@
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="vip_icon_normal" translatesAutoresizingMaskIntoConstraints="NO" id="wzh-4h-Drs">
<rect key="frame" x="57.5" y="1.5" width="13" height="13"/>
<rect key="frame" x="57.5" y="1" width="13" height="14"/>
<constraints>
<constraint firstAttribute="height" constant="13" id="Vgo-JX-t0s"/>
<constraint firstAttribute="height" constant="14" id="Vgo-JX-t0s"/>
</constraints>
</imageView>
</subviews>
......
FuSiLive/Classes/FusiLive-Bridging-Header.h
......@@ -37,6 +37,7 @@
#import "FUSMyZoneViewController.h"
#import "FUSBaoFangHttpHelper.h"
#import "FUSSingleDailyCheckInView.h"
#import "FUSGotBackpackItemAnimView.h"
#import "FUSMyEditNameAlertView.h"
// MARK: -- 直播间
......
FuSiLive/Classes/InstantMessaging/View/ToolViews/FUSIMGiftView.m
......@@ -186,7 +186,7 @@
_rechargeBtn.frame = CGRectMake(CGRectGetMaxX(_diamondCountBtn.frame) + 8, 0 ,btnWidth, _giftBottomView.height);
NSString *title = [NSString stringWithFormat:@"%@ >",[NSString fus_localString:@"储值"]];
NSMutableAttributedString *atrTitle = [[NSMutableAttributedString alloc] initWithString:title];
[atrTitle addAttributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:@"2BE1B0"]} range:NSMakeRange(0, [NSString fus_localString:@"储值"].length)];
[atrTitle addAttributes:@{NSForegroundColorAttributeName:[UIColor fus_diamondBlue]} range:NSMakeRange(0, [NSString fus_localString:@"储值"].length)];
[atrTitle addAttributes:@{NSForegroundColorAttributeName:[UIColor grayColor]} range:NSMakeRange([NSString fus_localString:@"储值"].length ,title.length - [NSString fus_localString:@"储值"].length)];
// [_rechargeBtn setTitle:title forState:UIControlStateNormal];
......
FuSiLive/Classes/InstantMessaging/View/ToolViews/VideoChat/FunctionViews/FUSVideoChatGiftView.m
......@@ -150,7 +150,7 @@ if (@available(iOS 11.0, *)) {height = 290 + UIView.fus_SafeBottom;}\
_jewelCountBtn.titleLabel.font = [UIFont fus_themeFont:14];
[_jewelCountBtn addTarget:self action:@selector(fus_onClickMyJewelCount:) forControlEvents:UIControlEventTouchUpInside];
[_jewelCountBtn setImageEdgeInsets:UIEdgeInsetsMake(3, 0, 3, 0)];
[_jewelCountBtn setTitleColor:[UIColor colorWithHex:@"2BE1B0"] forState:UIControlStateNormal];
[_jewelCountBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
_jewelCountBtn.imageView.contentMode = UIViewContentModeScaleAspectFit;
[_bgView addSubview:_jewelCountBtn];
}
......@@ -172,7 +172,7 @@ if (@available(iOS 11.0, *)) {height = 290 + UIView.fus_SafeBottom;}\
_rechargetBtn.imageEdgeInsets = UIEdgeInsetsMake(0, labelWidth, 0, -labelWidth);
_rechargetBtn.titleEdgeInsets = UIEdgeInsetsMake(0, -imageWidth, 0, imageWidth);
[_rechargetBtn setTitleColor:[UIColor colorWithHex:@"2BE1B0"] forState:UIControlStateNormal];
[_rechargetBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
[_rechargetBtn addTarget:self action:@selector(fus_onClickReChargeBtn:) forControlEvents:UIControlEventTouchUpInside];
[_bgView addSubview:_rechargetBtn];
}
......
FuSiLive/Classes/InstantMessaging/View/ToolViews/VideoChat/FunctionViews/FUSVideoChatUserInfoView.m
......@@ -462,7 +462,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
_nickNameLabel.font = [UIFont fus_themeBoldFont:21];;
[self.bgView addSubview:_nickNameLabel];
_richImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 30, 15)];
_richImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 28, 14)];
_richImageView.contentMode = UIViewContentModeScaleAspectFit;
[self.bgView addSubview:_richImageView];
}
......@@ -478,7 +478,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
}
- (void)fus_initLevLabel {
_levLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 25, 14)];
_levLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 20, 14)];
_levLabel.backgroundColor = [UIColor colorWithHex:@"#D6D6D7"];
_levLabel.font = [UIFont fus_themeFont:9];
_levLabel.layer.cornerRadius = 7;
......@@ -499,7 +499,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
- (void)fus_initSignLabel {
_signLabel = [[UILabel alloc] initWithFrame:CGRectMake(15, CGRectGetMaxY(_fireFlyIDLabel.frame) + 55, self.bgView.width - 30, 15)];
_signLabel.textColor = [UIColor fus_textColorRich];
_signLabel.font = [UIFont fus_themeFont:13];
_signLabel.font = [UIFont fus_themeFont:15];
// _signLabel.adjustsFontSizeToFitWidth = YES;
_signLabel.textAlignment = NSTextAlignmentCenter;
[self.bgView addSubview:_signLabel];
......@@ -522,7 +522,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
UILabel *label = label = [[UILabel alloc] initWithFrame:CGRectMake(0, bgView.centerY - 10, bgView.width, 20)];
label.textColor = UIColor.fus_textColorRich;
label.textAlignment = NSTextAlignmentCenter;
label.font = [UIFont italicSystemFontOfSize:26];
label.font = [UIFont fus_custom1ItalicFont:26];
[bgView addSubview:label];
switch (i) {
......@@ -661,7 +661,8 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
UIImage *vipImg = [UIImage fus_imageWithLevel:model.level.integerValue];
_richImageView.image = vipImg;
if (vipImg) {
_richImageView.width = _richImageView.height / vipImg.size.height * vipImg.size.width;
_richImageView.width = ceil(_richImageView.height / vipImg.size.height * vipImg.size.width);
nickLineWidth += (nickLineItemSpace + _richImageView.width);
}
} else {
......
FuSiLive/Classes/NewLive/Main/Other/FunctionViewHelper/FUSLiveChatDataSourceHelper.m
......@@ -883,7 +883,7 @@
hasShowVipIcon = YES;
UIImage *levelImage = [UIImage fus_imageWithLevel:model.level.integerValue];
if (levelImage) {
CGFloat imageH = levelImageHeight;
CGFloat imageH = 14;
CGFloat imageW = levelImageHeight / levelImage.size.height * levelImage.size.width;
NSAttributedString *levelAttr = [NSAttributedString attachmentStringWithContent:levelImage contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imageW,imageH) alignToFont:FUS_LIVE_FONT(fontSize) alignment:YYTextVerticalAlignmentCenter];
// 让VIP图标图标往下偏移
......
FuSiLive/Classes/NewLive/Main/View/EndView/FUSVideoEndView.m
......@@ -108,7 +108,6 @@
[_bondBtn setImage:UIImage.fus_fireIcon forState:UIControlStateNormal];
_bondBtn.titleEdgeInsets = UIEdgeInsetsMake(0, -5, 0, 5);
}
return self;
}
......@@ -121,6 +120,7 @@
- (void)fus_updateViewWithDataDict:(NSDictionary *)dataDict
{
[_faceImageView setWebImageWithSubURLString:[FUSCacheDataShare shareStore].userDetailInfo.face placeholder:[UIImage imageNamed:@"icon_head_default"] completion:nil];
[self.headerImageView setWebImageWithSubURLString:[FUSCacheDataShare shareStore].userDetailInfo.face];
_nicknameLabel.text = [FUSCacheDataShare shareStore].userDetailInfo.nickname;
NSString *bound = [dataDict[@"bonds"] description];
......
FuSiLive/Classes/NewLive/Main/View/EndView/FUSVideoEndView.xib
......@@ -14,9 +14,17 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="live_end_bg" translatesAutoresizingMaskIntoConstraints="NO" id="l9f-S1-E0C">
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="l9f-S1-E0C">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
</imageView>
<visualEffectView opaque="NO" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="AUe-Zg-mlP">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="Iea-Sj-OA5">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</view>
<blurEffect style="dark"/>
</visualEffectView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="irB-kM-nDY">
<rect key="frame" x="0.0" y="56" width="375" height="575"/>
<subviews>
......@@ -63,6 +71,8 @@
<button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hUj-RF-q22">
<rect key="frame" x="0.0" y="10" width="220" height="35"/>
<fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="25"/>
<inset key="titleEdgeInsets" minX="3" minY="0.0" maxX="0.0" maxY="0.0"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="3" maxY="0.0"/>
<state key="normal" title="0" image="live_coin_bg_view">
<color key="titleColor" red="0.0" green="0.94117647058823528" blue="0.53333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
......@@ -294,15 +304,19 @@
<viewLayoutGuide key="safeArea" id="Xki-Nn-95N"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="AUe-Zg-mlP" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="7Wj-q3-7Zp"/>
<constraint firstItem="irB-kM-nDY" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="8yF-LE-fvo"/>
<constraint firstAttribute="trailing" secondItem="irB-kM-nDY" secondAttribute="trailing" id="Ay3-Lz-PUZ"/>
<constraint firstItem="l9f-S1-E0C" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="IqH-Ks-fy7"/>
<constraint firstItem="l9f-S1-E0C" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Jz6-gg-gvb"/>
<constraint firstAttribute="bottom" secondItem="AUe-Zg-mlP" secondAttribute="bottom" id="Idx-pT-rOc"/>
<constraint firstItem="l9f-S1-E0C" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="KnA-Qw-45O"/>
<constraint firstAttribute="trailing" secondItem="AUe-Zg-mlP" secondAttribute="trailing" id="iBV-O3-c9E"/>
<constraint firstItem="Xki-Nn-95N" firstAttribute="bottom" secondItem="irB-kM-nDY" secondAttribute="bottom" constant="36" id="k6S-sL-PlT"/>
<constraint firstAttribute="trailing" secondItem="l9f-S1-E0C" secondAttribute="trailing" id="tWE-bm-lIv"/>
<constraint firstItem="l9f-S1-E0C" firstAttribute="trailing" secondItem="Xki-Nn-95N" secondAttribute="trailing" id="kFl-uj-E0j"/>
<constraint firstItem="AUe-Zg-mlP" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="rW1-5d-40X"/>
<constraint firstItem="irB-kM-nDY" firstAttribute="top" secondItem="Xki-Nn-95N" secondAttribute="top" constant="36" id="vtc-Ic-0iH"/>
<constraint firstItem="irB-kM-nDY" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="wFH-GI-zHB"/>
<constraint firstAttribute="bottom" secondItem="l9f-S1-E0C" secondAttribute="bottom" id="wfF-LY-SNt"/>
<constraint firstItem="l9f-S1-E0C" firstAttribute="leading" secondItem="Xki-Nn-95N" secondAttribute="leading" id="zc2-I7-XjM"/>
<constraint firstItem="l9f-S1-E0C" firstAttribute="bottom" secondItem="Xki-Nn-95N" secondAttribute="bottom" id="zrZ-zE-7pk"/>
</constraints>
<nil key="simulatedStatusBarMetrics"/>
<connections>
......@@ -334,8 +348,7 @@
</view>
</objects>
<resources>
<image name="live_coin_bg_view" width="35" height="35"/>
<image name="live_end_bg" width="375" height="667"/>
<image name="live_coin_bg_view" width="12" height="15.5"/>
<image name="live_end_bgView" width="279.5" height="287"/>
<image name="live_end_view_line" width="282.5" height="2"/>
</resources>
......
FuSiLive/Classes/NewLive/Main/View/EndView/FUSVideoEndedView.m
......@@ -98,7 +98,6 @@
/**
* 更新View
*
* @param dataModel 数据
* @param islike 是否追踪
*/
- (void)fus_updateViewWithDataDict:(NSDictionary *)dataDict islike:(BOOL)islike
......@@ -128,6 +127,8 @@
if ([NSString isNull:imageUrlStr] || [imageUrlStr isEqualToString:@"(null)"] || [imageUrlStr isEqualToString:@"（null）"]) {
imageUrlStr = dataDict[@"result"][@"face"];
}
[self.bgHeaderImageView setWebImageWithSubURLString:imageUrlStr];
[_userHeaderView fus_setHeaderImageWithHeaderUrl:imageUrlStr placeholder:[UIImage imageNamed:@"icon_head_default"]];
if (islike) {
......@@ -158,32 +159,32 @@
// }
if ([NSArray isNull:userInfos]) {
_guessLikeLabel.hidden = YES;
_leftLineView.hidden = YES;
_rightLineView.hidden = YES;
self.guessLikeLabel.hidden = YES;
self.leftLineView.hidden = YES;
self.rightLineView.hidden = YES;
}else{
_guessLikeLabel.hidden = NO;
_leftLineView.hidden = NO;
_rightLineView.hidden = NO;
self.guessLikeLabel.hidden = NO;
self.leftLineView.hidden = NO;
self.rightLineView.hidden = NO;
[_bottomUserArr removeAllObjects];
[self.bottomUserArr removeAllObjects];
for (FUSBaoFangAnchorModel *anchor in userInfos) {
BOOL isRepeat = NO;
if ([anchor.uid isEqualToString:[FUSLiveHelper shareInstance].roomInfoModel.roomId]) {
isRepeat = YES;
}
if (isRepeat == NO&&_bottomUserArr.count < bottomMaxCount) {
if (isRepeat == NO&&self.bottomUserArr.count < bottomMaxCount) {
if (!anchor.themeInfoModel) {
[_bottomUserArr addObject:anchor];
[self.bottomUserArr addObject:anchor];
}
}
}
[_bottomCollectionView reloadData];
[self.bottomCollectionView reloadData];
}
} failure:^(NSString *msg, int code) {
_guessLikeLabel.hidden = YES;
_leftLineView.hidden = YES;
_rightLineView.hidden = YES;
self.guessLikeLabel.hidden = YES;
self.leftLineView.hidden = YES;
self.rightLineView.hidden = YES;
}];
}
......
FuSiLive/Classes/NewLive/Main/View/EndView/FUSVideoEndedView.xib
......@@ -14,9 +14,17 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="live_end_bg" translatesAutoresizingMaskIntoConstraints="NO" id="bep-h8-dpj">
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="bep-h8-dpj">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
</imageView>
<visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KcM-uB-jqb">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="PPw-jA-YOi">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</view>
<blurEffect style="dark"/>
</visualEffectView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hfR-0l-zzh">
<rect key="frame" x="67" y="70" width="241" height="165"/>
<subviews>
......@@ -134,23 +142,27 @@
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="hfR-0l-zzh" firstAttribute="top" secondItem="tUj-O6-BUD" secondAttribute="top" constant="50" id="BHq-3j-LmQ"/>
<constraint firstItem="hfR-0l-zzh" firstAttribute="centerX" secondItem="bep-h8-dpj" secondAttribute="centerX" id="CLV-mC-HeF"/>
<constraint firstItem="hfR-0l-zzh" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="C9j-jW-qQ5"/>
<constraint firstItem="nvu-QG-onM" firstAttribute="leading" secondItem="IFY-dw-Sd9" secondAttribute="trailing" constant="3" id="Eex-9B-CVj"/>
<constraint firstItem="sLS-jG-1mQ" firstAttribute="top" secondItem="hfR-0l-zzh" secondAttribute="bottom" constant="49" id="F93-uO-qgm"/>
<constraint firstItem="lP3-OG-bnc" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="Gix-zf-1Ni"/>
<constraint firstItem="IFY-dw-Sd9" firstAttribute="centerY" secondItem="nvu-QG-onM" secondAttribute="centerY" id="Hn5-JZ-DUH"/>
<constraint firstItem="hfR-0l-zzh" firstAttribute="width" secondItem="bep-h8-dpj" secondAttribute="width" multiplier="241:375" id="IT4-zk-dwe"/>
<constraint firstItem="KcM-uB-jqb" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="IEn-hn-NaN"/>
<constraint firstItem="caq-O6-ufe" firstAttribute="centerY" secondItem="nvu-QG-onM" secondAttribute="centerY" id="IWF-tt-RRD"/>
<constraint firstItem="sLS-jG-1mQ" firstAttribute="top" secondItem="nvu-QG-onM" secondAttribute="bottom" constant="8" id="N4S-d9-EDy"/>
<constraint firstItem="sLS-jG-1mQ" firstAttribute="centerX" secondItem="bep-h8-dpj" secondAttribute="centerX" id="XdA-iB-J6m"/>
<constraint firstAttribute="trailing" secondItem="bep-h8-dpj" secondAttribute="trailing" id="Z7p-Tc-kt2"/>
<constraint firstItem="bep-h8-dpj" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="g4C-dE-FrM"/>
<constraint firstItem="sLS-jG-1mQ" firstAttribute="width" secondItem="bep-h8-dpj" secondAttribute="width" multiplier="0.7" id="hKR-23-dq3"/>
<constraint firstItem="bep-h8-dpj" firstAttribute="leading" secondItem="tUj-O6-BUD" secondAttribute="leading" id="S6R-Xn-p1C"/>
<constraint firstItem="hfR-0l-zzh" firstAttribute="width" secondItem="iN0-l3-epB" secondAttribute="width" multiplier="0.642667" id="UfK-kl-JOx"/>
<constraint firstItem="bep-h8-dpj" firstAttribute="trailing" secondItem="tUj-O6-BUD" secondAttribute="trailing" id="UzY-nA-ZER"/>
<constraint firstItem="bep-h8-dpj" firstAttribute="bottom" secondItem="tUj-O6-BUD" secondAttribute="bottom" id="Z1t-Vr-TWN"/>
<constraint firstItem="KcM-uB-jqb" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="ZuI-NU-FVj"/>
<constraint firstItem="sLS-jG-1mQ" firstAttribute="width" secondItem="iN0-l3-epB" secondAttribute="width" multiplier="0.7" id="cCd-pf-ho7"/>
<constraint firstAttribute="trailing" secondItem="KcM-uB-jqb" secondAttribute="trailing" id="cVo-T7-vAA"/>
<constraint firstItem="nvu-QG-onM" firstAttribute="centerX" secondItem="sLS-jG-1mQ" secondAttribute="centerX" id="hpy-d9-PiD"/>
<constraint firstItem="bep-h8-dpj" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="jJX-dc-pwg"/>
<constraint firstItem="lP3-OG-bnc" firstAttribute="top" secondItem="sLS-jG-1mQ" secondAttribute="bottom" constant="21.5" id="mxq-N6-hUY"/>
<constraint firstItem="bep-h8-dpj" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="nas-za-lZH"/>
<constraint firstAttribute="bottom" secondItem="bep-h8-dpj" secondAttribute="bottom" id="ojC-eM-9Rk"/>
<constraint firstItem="caq-O6-ufe" firstAttribute="leading" secondItem="nvu-QG-onM" secondAttribute="trailing" constant="3" id="qSJ-E3-flC"/>
<constraint firstAttribute="bottom" secondItem="KcM-uB-jqb" secondAttribute="bottom" id="qdI-l7-Umi"/>
<constraint firstItem="sLS-jG-1mQ" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="ySD-GV-aT1"/>
</constraints>
<nil key="simulatedStatusBarMetrics"/>
<connections>
......@@ -167,7 +179,4 @@
<point key="canvasLocation" x="-918" y="-234"/>
</view>
</objects>
<resources>
<image name="live_end_bg" width="375" height="667"/>
</resources>
</document>
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/ContributeList/FUSContributeCellTableViewCell.m
......@@ -99,7 +99,7 @@
self.onlineLabel.text = @"0";
self.onlineLabel.textColor = UIColor.whiteColor;
self.onlineLabel.backgroundColor = [UIColor colorWithHex:@"#87878A" alpha:0.32];
self.onlineLabel.layer.cornerRadius = 9;
self.onlineLabel.layer.cornerRadius = 7;
self.onlineLabel.layer.masksToBounds = YES;
self.onlineLabel.textAlignment = NSTextAlignmentCenter;
[self.contentView addSubview:self.onlineLabel];
......@@ -151,12 +151,12 @@
[self.onlineLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nicknameLabel.mas_right).offset(4);
make.centerY.equalTo(self.nicknameLabel.mas_centerY);
make.height.mas_equalTo(18);
make.width.mas_equalTo(25);
make.height.mas_equalTo(14);
make.width.mas_equalTo(20);
}];
[self.vipImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(13);
make.width.height.mas_equalTo(14);
make.centerY.equalTo(self.nicknameLabel.mas_centerY);
make.left.equalTo(self.onlineLabel.mas_right).offset(4);
}];
......@@ -225,14 +225,14 @@
self.vipImageView.image = [UIImage fus_imageWithLevel:level];
if (level <= 30) {
[self.vipImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(13);
make.width.height.mas_equalTo(14);
make.centerY.equalTo(self.nicknameLabel.mas_centerY);
make.left.equalTo(self.onlineLabel.mas_right).offset(4);
}];
} else {
[self.vipImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(13);
make.width.mas_equalTo(26);
make.height.mas_equalTo(14);
make.width.mas_equalTo(28);
make.centerY.equalTo(self.nicknameLabel.mas_centerY);
make.left.equalTo(self.onlineLabel.mas_right).offset(4);
}];
......@@ -268,7 +268,7 @@
self.vipImageView.hidden = NO;
self.vipImageView.image = [UIImage imageNamed:@"live_chat_inpay_user_icon"];
[self.vipImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(15);
make.width.height.mas_equalTo(14);
make.centerY.equalTo(self.nicknameLabel.mas_centerY);
make.left.equalTo(self.onlineLabel.mas_right).offset(4);
}];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/UserList/FUSAudienceListView.m
......@@ -95,7 +95,7 @@
self.openVIPBtn = [FUSStyleButton buttonWithType:UIButtonTypeCustom];
self.openVIPBtn.style = FUSButtonStyleBlue;
self.openVIPBtn.titleLabel.font = [UIFont fus_themeFont:12];
self.openVIPBtn.titleLabel.font = [UIFont fus_themeBoldFont:12];
[self.openVIPBtn setTitle:[NSString fus_localString:@"去开通"] forState:UIControlStateNormal];
[self.openVIPBtn setTitleColor:UIColor.fus_textColorRich forState:UIControlStateNormal];
self.openVIPBtn.layer.cornerRadius = 13;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/UserList/FUSAudienceTableViewCell.m
......@@ -79,7 +79,7 @@
self.onlineLabel.text = @"0";
self.onlineLabel.textColor = UIColor.whiteColor;
self.onlineLabel.backgroundColor = [UIColor colorWithHex:@"#87878A" alpha:0.32];
self.onlineLabel.layer.cornerRadius = 9;
self.onlineLabel.layer.cornerRadius = 7;
self.onlineLabel.layer.masksToBounds = YES;
self.onlineLabel.textAlignment = NSTextAlignmentCenter;
[self.contentView addSubview:self.onlineLabel];
......@@ -111,12 +111,12 @@
make.left.equalTo(self.nicknameLabel.mas_right).offset(4);
make.centerY.equalTo(self.nicknameLabel.mas_centerY);
make.height.mas_equalTo(18);
make.width.mas_equalTo(25);
make.height.mas_equalTo(14);
make.width.mas_equalTo(20);
}];
[self.vipImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(13);
make.width.height.mas_equalTo(14);
make.centerY.equalTo(self.nicknameLabel.mas_centerY);
make.left.equalTo(self.onlineLabel.mas_right).offset(4);
}];
......@@ -160,14 +160,14 @@
self.vipImageView.image = [UIImage fus_imageWithLevel:level];
if (level <= 30) {
[self.vipImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(13);
make.width.height.mas_equalTo(14);
make.centerY.equalTo(self.nicknameLabel.mas_centerY);
make.left.equalTo(self.onlineLabel.mas_right).offset(4);
}];
} else {
[self.vipImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(13);
make.width.mas_equalTo(26);
make.height.mas_equalTo(14);
make.width.mas_equalTo(28);
make.centerY.equalTo(self.nicknameLabel.mas_centerY);
make.left.equalTo(self.onlineLabel.mas_right).offset(4);
}];
......@@ -203,7 +203,7 @@
self.vipImageView.hidden = NO;
self.vipImageView.image = [UIImage imageNamed:@"live_chat_inpay_user_icon"];
[self.vipImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(15);
make.width.height.mas_equalTo(14);
make.centerY.equalTo(self.nicknameLabel.mas_centerY);
make.left.equalTo(self.onlineLabel.mas_right).offset(4);
}];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveChatInputBulletsListCell.m
......@@ -53,8 +53,8 @@
self.contentBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.contentBtn.userInteractionEnabled = NO;
self.contentBtn.frame = CGRectMake(0, 0, 82.5, 22);
[self.contentBtn setTitleColor:UIColor.fus_textColorMedium forState:UIControlStateNormal];
[self.contentBtn setTitleColor:UIColor.fus_textColorRich forState:UIControlStateSelected];
[self.contentBtn setTitleColor:[UIColor colorWithHex:@"22222b"] forState:UIControlStateNormal];
[self.contentBtn setTitleColor:[UIColor colorWithHex:@"282828"] forState:UIControlStateSelected];
self.contentBtn.titleLabel.font = [UIFont fus_themeFont:12];
self.contentBtn.layer.cornerRadius = 11;
self.contentBtn.layer.masksToBounds = YES;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveChatInputTaskListView.swift
......@@ -178,12 +178,12 @@ class FUSLiveChatInputTaskListView: UIView, UITableViewDelegate, UITableViewData
dewView.addDewAward(withAmount:"\(listModel.award)" , textColor: UIColor.fus_dewBlue())
UIApplication.shared.keyWindow?.addSubview(dewView)
} else{
let awardView = FUSSingleDailyCheckInView.fus_()
awardView.frame = UIScreen.main.bounds
awardView.backgroundColor = UIColor.init(white: 0, alpha: 0.6)
awardView.fus_showCheckInSucceed(withIcon: listModel.icon, desc: listModel.getTips, award: String(listModel.award), animated: false)
UIApplication.shared.keyWindow?.addSubview(awardView)
FUSGotBackpackItemAnimView.fus_show(with: .type2, icon: listModel.icon, name: listModel.getTips, goodsType: FUSGotBackpackItemGoodsType(rawValue: UInt(listModel.classify)) ?? .goodsTypeNone, isMotorHasWear: false)
// let awardView = FUSSingleDailyCheckInView.fus_()
// awardView.frame = UIScreen.main.bounds
// awardView.backgroundColor = UIColor.init(white: 0, alpha: 0.6)
// awardView.fus_showCheckInSucceed(withIcon: listModel.icon, desc: listModel.getTips, award: String(listModel.award), animated: false)
// UIApplication.shared.keyWindow?.addSubview(awardView)
}
}
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/FUSGiftCenter/FUSGiftAnimation/FUSGiftAnimation.m
......@@ -277,7 +277,7 @@
if (levelStr.integerValue > 0) {
UIImage *levelImage = [UIImage fus_imageWithLevel:levelStr.integerValue];
CGFloat height = 25;
CGFloat height = 14;
CGFloat width = height / levelImage.size.height * levelImage.size.width;
NSAttributedString *levelAttr = [NSAttributedString attachmentStringWithContent:levelImage contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(width, height) alignToFont:[UIFont fus_themeFont:15] alignment:YYTextVerticalAlignmentCenter];
[attr appendAttributedString:levelAttr];
......@@ -369,7 +369,7 @@
_faceImageView.layer.cornerRadius = _faceImageView.height / 2.0;
_faceImageView.layer.masksToBounds = YES;
_faceImageView.layer.borderWidth = 1;
_faceImageView.layer.borderColor = [[UIColor colorWithHex:@"2be1b0"] CGColor];
_faceImageView.layer.borderColor = [[UIColor fus_diamondBlue] CGColor];
[_bgImageView addSubview:_faceImageView];
_senderInfoLabel = [[YYLabel alloc] init];
......@@ -523,7 +523,7 @@
UIImage *levelImage = [UIImage fus_imageWithLevel:model.level.integerValue];
if (levelImage) {
CGFloat imageH = 15;
CGFloat imageH = 14;
CGFloat imageW = imageH / levelImage.size.height * levelImage.size.width;
NSAttributedString *levelAttr = [NSAttributedString attachmentStringWithContent:levelImage contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imageW, imageH) alignToFont:[UIFont fus_themeFont:13] alignment:YYTextVerticalAlignmentCenter];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/FUSGiftCenter/FUSGiftAnimation/FUSGiftNormalAnimation.m
......@@ -260,7 +260,7 @@
_faceImageView.layer.cornerRadius = _faceImageView.height / 2.0;
[_bgView addSubview:_faceImageView];
self.levelImageView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, 26, 13)];
self.levelImageView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, 28, 14)];
self.levelImageView.centerX = self.faceImageView.centerX;
self.levelImageView.centerY = self.faceImageView.centerY;
_levelImageView.contentMode = UIViewContentModeScaleAspectFit;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/FUSGiftCenter/FUSGiftAnimation/FUSWEBPGiftAnimation.m
......@@ -96,20 +96,12 @@
resourceMd5:resourceMd5 completion:^(YYImage *yyImage) {
if (!yyImage) {
[weakSelf fus_endGiftAnimation];
return;
}
weakSelf.retryTime = 0;
// dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
// YYImage *yyImage = [YYImage imageWithData:webpImageData];
// yyImage.preloadAllAnimatedImageFrames = YES;
// dispatch_async(dispatch_get_main_queue(), ^{
[weakSelf displayWithWebpImage:yyImage];
// });
// });
[weakSelf displayWithWebpImage:yyImage];
}];
}
......@@ -133,8 +125,12 @@
if (self.didEndAnimation) {
self.didEndAnimation(weakSelf.animationModel);
}
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(fus_timeOutAnimation) object:nil];
});
}
- (void)fus_timeOutAnimation {
[self fus_endGiftAnimation];
}
- (void)fus_removeGiftAnimation
......@@ -177,7 +173,8 @@
[self fus_endGiftAnimation];
return;
}
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(fus_timeOutAnimation) object:nil];
[self performSelector:@selector(fus_timeOutAnimation) withObject:nil afterDelay:30];
// 图片资源已经加载到内存中
_webpImageView.image = webpImage;
_webpImageView.animationRepeatCount = 1;
......@@ -205,6 +202,7 @@
- (void)dealloc
{
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(fus_timeOutAnimation) object:nil];
if (_webpImageView.observationInfo) {
[_webpImageView removeObserver:self forKeyPath:@"currentAnimatedImageIndex"];
}
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/FUSGiftCenter/NormalGift/View/FUSLiveNormalGiftNumberView.m
......@@ -188,7 +188,7 @@
// [self addSubview:_userRichWearImageView];
//用户等级图标
_userLevelIcon = [[UIImageView alloc] initWithFrame:CGRectMake(CGRectGetMaxX(_userIcon.frame) + 7, _userIcon.top+2, 25, 15)];
_userLevelIcon = [[UIImageView alloc] initWithFrame:CGRectMake(CGRectGetMaxX(_userIcon.frame) + 7, _userIcon.top+2, 28, 14)];
_userLevelIcon.contentMode = UIViewContentModeScaleAspectFit;
[self addSubview:_userLevelIcon];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/GiftView/FUSLiveGiftCollectionViewCell.m
......@@ -278,7 +278,7 @@
if ([model.givecurrency isEqualToString:@"5"]) {
[_priceBtn setTitleColor:[UIColor colorWithHex:@"3CAFF3"] forState:UIControlStateNormal];
[_priceBtn setTitleColor:[UIColor fus_dewBlue] forState:UIControlStateNormal];
}else{
[_priceBtn setTitleColor:[UIColor colorWithHex:@"58DBD7"] forState:UIControlStateNormal];
}
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/GiftView/FUSLiveGiftView.m
......@@ -671,7 +671,7 @@ static FUSLiveGiftView *giftView = nil;
_gemBtn.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
_gemBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentCenter;
[_gemBtn setImage:[UIImage imageNamed:@"common_assets_diamond_23x23"] forState:UIControlStateNormal];
[_gemBtn setTitleColor:[UIColor colorWithHex:@"2BE1B0"] forState:UIControlStateNormal];
[_gemBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
_gemBtn.titleLabel.font = [UIFont fus_themeFont:13];
[_gemBtn sizeToFit];
_gemBtn.centerY = _bottomBGView.height / 2.0;
......@@ -684,7 +684,7 @@ static FUSLiveGiftView *giftView = nil;
- (void)initRechargeButton
{
_rechargeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[_rechargeBtn setTitleColor:[UIColor colorWithHex:@"2BE1B0"] forState:UIControlStateNormal];
[_rechargeBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
[_rechargeBtn setTitle:[NSString fus_localString:@"储值"] forState:UIControlStateNormal];
_rechargeBtn.titleLabel.font = [UIFont fus_themeFont:13];
[_rechargeBtn setImage:[[UIImage imageNamed:@"live_icon_gift_recharge_arrow"] fusrtl_imageFlippedForRightToLeftLayoutDirection] forState:UIControlStateNormal];
......@@ -1501,34 +1501,34 @@ static FUSLiveGiftView *giftView = nil;
FUSLiveGiftDataModel *dataModel = self.categoryDataSource[_selectedIndexPath.section].giftDataArr[_selectedIndexPath.item];
if ([FUSLiveGiftDataModel fus_isNullWithModel:dataModel]) {
[_gemBtn setImage:[UIImage imageNamed:@"common_assets_diamond_23x23"] forState:UIControlStateNormal];
[_gemBtn setTitleColor:[UIColor colorWithHex:@"2BE1B0"] forState:UIControlStateNormal];
[_gemBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
[self fus_updataDiamondCountFromSever:NO];
[_rechargeBtn setTitleColor:[UIColor colorWithHex:@"2BE1B0"] forState:UIControlStateNormal];
[_rechargeBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
[_rechargeBtn setTitle:[NSString fus_localString:@"储值"] forState:UIControlStateNormal];
return;
}
if ([dataModel.currency isEqualToString:@"5"]) {
[_gemBtn setImage:[UIImage imageNamed:@"common_assets_dew_giftPanel"] forState:UIControlStateNormal];
[_gemBtn setTitleColor:[UIColor colorWithHex:@"3CAFF3"] forState:UIControlStateNormal];
[_gemBtn setTitleColor:[UIColor fus_dewBlue] forState:UIControlStateNormal];
[self fus_setDiamondCount:[FUSCacheDataShare shareStore].userDetailInfo.chip];
[_rechargeBtn setTitleColor:[UIColor colorWithHex:@"3CAFF3"] forState:UIControlStateNormal];
[_rechargeBtn setTitleColor:[UIColor fus_dewBlue] forState:UIControlStateNormal];
[_rechargeBtn setTitle:[NSString fus_localString:@"买入"] forState:UIControlStateNormal];
} else {
[_gemBtn setImage:[UIImage imageNamed:@"common_assets_diamond_23x23"] forState:UIControlStateNormal];
[_gemBtn setTitleColor:[UIColor colorWithHex:@"2BE1B0"] forState:UIControlStateNormal];
[_gemBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
[self fus_updataDiamondCountFromSever:NO];
[_rechargeBtn setTitleColor:[UIColor colorWithHex:@"2BE1B0"] forState:UIControlStateNormal];
[_rechargeBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
[_rechargeBtn setTitle:[NSString fus_localString:@"储值"] forState:UIControlStateNormal];
}
}else if (giftType == FUSDewGift) {
[_gemBtn setImage:[UIImage imageNamed:@"common_assets_dew_giftPanel"] forState:UIControlStateNormal];
[_gemBtn setTitleColor:[UIColor colorWithHex:@"3CAFF3"] forState:UIControlStateNormal];
[_gemBtn setTitleColor:[UIColor fus_dewBlue] forState:UIControlStateNormal];
[self fus_setDiamondCount:[FUSCacheDataShare shareStore].userDetailInfo.chip];
[_rechargeBtn setTitleColor:[UIColor colorWithHex:@"3CAFF3"] forState:UIControlStateNormal];
[_rechargeBtn setTitleColor:[UIColor fus_dewBlue] forState:UIControlStateNormal];
[_rechargeBtn setTitle:[NSString fus_localString:@"买入"] forState:UIControlStateNormal];
}
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeadView/FUSLiveCoinTicketView.m
......@@ -115,8 +115,8 @@
self.titleBGImageView = [[UIImageView alloc] initWithFrame:CGRectMake(4, 2, _bgView.height - 4, _bgView.height - 4)];
_titleBGImageView.centerY = _bgView.height / 2.0 - 1;
}else if (self.type == FUSLiveCoinTicketViewTypeHeatPower || self.type == FUSLiveCoinTicketViewTypeHeatRank){
self.titleBGImageView = [[UIImageView alloc] initWithFrame:CGRectMake(7, 2, 12, 8.5)];
_titleBGImageView.centerY = _bgView.height / 2.0;
// self.titleBGImageView = [[UIImageView alloc] initWithFrame:CGRectMake(7, 2, 12, 8.5)];
// _titleBGImageView.centerY = _bgView.height / 2.0;
}
_titleBGImageView.contentMode = UIViewContentModeScaleAspectFit;
......@@ -125,7 +125,8 @@
if (self.type == FUSLiveCoinTicketViewTypeCoinTicket) {
_titleBGImageView.image = [UIImage imageNamed:@"live_coin_bg_view"];
} else if (self.type == FUSLiveCoinTicketViewTypeHeatPower || self.type == FUSLiveCoinTicketViewTypeHeatRank) {
_titleBGImageView.image = [UIImage imageNamed:@"live_coin_heat_bg"];
_titleBGImageView.hidden = YES;
// _titleBGImageView.image = [UIImage imageNamed:@"live_coin_heat_bg"];
}
}
......@@ -166,6 +167,7 @@
self.rankLabel = [[UILabel alloc] initWithFrame:_numberView.frame];
self.rankLabel.font = [UIFont fus_themeFont:12];
self.rankLabel.textColor = UIColor.fus_appMainColor;
self.rankLabel.center = CGPointMake(self.width / 2.0, self.height / 2.0);
[self addSubview:self.rankLabel];
[_titleBGImageView fusrtl_resetFrameToFitRTL];
......@@ -259,7 +261,8 @@
self.bgView.width = self.width;
self.titleBGImageView.x = 7;
self.rankLabel.x = leadingSpace + 2;
// self.rankLabel.x = leadingSpace + 2;
self.rankLabel.center = CGPointMake(self.width / 2.0, self.height / 2.0);
self.arrowImageView.x = CGRectGetMaxX(self.rankLabel.frame) + 3;
[_titleBGImageView fusrtl_resetFrameToFitRTL];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/LinkMicro/View/FUSLinkMicroHeaderView.m
......@@ -75,7 +75,7 @@
_muteImageView.hidden = YES;
[self addSubview:_muteImageView];
_richImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 26, 13)];
_richImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 28, 14)];
_richImageView.contentMode = UIViewContentModeScaleAspectFit;
_richImageView.centerX = _faceView.centerX;
_richImageView.centerY = _faceView.bottom;
......@@ -167,7 +167,7 @@
UIImage *vipImage = [UIImage fus_imageWithLevel:model.level.integerValue];;
_richImageView.image = vipImage;
if (vipImage) {
_richImageView.width = _richImageView.height / vipImage.size.height * vipImage.size.width;
_richImageView.width = ceil(_richImageView.height / vipImage.size.height * vipImage.size.width);
}
}else{
_richImageView.hidden = YES;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/LinkMicro/View/FUSLinkMicroTableViewCell.m
......@@ -64,7 +64,7 @@
[_nameLabel sizeToFit];
[self.contentView addSubview:_nameLabel];
_vipImgView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 30, 15)];
_vipImgView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 28, 14)];
_vipImgView.centerY = self.height/2.0;
[self.contentView addSubview:_vipImgView];
......@@ -165,7 +165,7 @@
UIImage *vipImage = [UIImage fus_imageWithLevel:model.level.integerValue];;
_vipImgView.image = vipImage;
if (vipImage) {
_vipImgView.width = _vipImgView.height / vipImage.size.height * vipImage.size.width;
_vipImgView.width = ceil(_vipImgView.height / vipImage.size.height * vipImage.size.width);
}
}else{
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/LiveSettingAlertView/FUSLiveAnchorSettingAlertView.m
......@@ -25,7 +25,7 @@
// 底部的背景view
@property (nonatomic, strong) UIView *bottomBgView;
// 横线
@property (nonatomic, strong) UIView *lineView;
//@property (nonatomic, strong) UIView *lineView;
// 主题
@property (nonatomic, strong) UILabel *themeLabel;
......@@ -58,7 +58,7 @@
[self addSubview:self.topBgView];
[self addSubview:self.bottomBgView];
[self.bottomBgView addSubview:self.themeLabel];
[self.bottomBgView addSubview:self.lineView];
// [self.bottomBgView addSubview:self.lineView];
[self.bottomBgView addSubview:self.tableView];
[self.topBgView mas_makeConstraints:^(MASConstraintMaker *make) {
......@@ -79,15 +79,15 @@
make.height.mas_equalTo(16);
}];
[self.lineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.equalTo(self.bottomBgView).inset(16);
make.top.equalTo(self.themeLabel.mas_bottom).offset(15);
make.height.mas_equalTo(0.5);
}];
// [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.left.right.equalTo(self.bottomBgView).inset(16);
// make.top.equalTo(self.themeLabel.mas_bottom).offset(15);
// make.height.mas_equalTo(0.5);
// }];
[self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.equalTo(self.bottomBgView);
make.top.equalTo(self.lineView.mas_bottom);
make.top.equalTo(self.themeLabel.mas_bottom).offset(15);
}];
}
......@@ -260,13 +260,13 @@
}
return _bottomBgView;
}
- (UIView *)lineView {
if (!_lineView) {
_lineView = [[UIView alloc] init];
_lineView.backgroundColor = [UIColor fus_lineColor];
}
return _lineView;
}
//- (UIView *)lineView {
// if (!_lineView) {
// _lineView = [[UIView alloc] init];
// _lineView.backgroundColor = [UIColor fus_lineColor];
// }
// return _lineView;
//}
- (UILabel *)themeLabel {
if (!_themeLabel) {
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/LiveSettingAlertView/FUSLiveAnchorSettingItemCell.m
......@@ -133,7 +133,7 @@
- (UISwitch *)switchBtn {
if (!_switchBtn) {
_switchBtn = [[UISwitch alloc] init];
_switchBtn.onTintColor = UIColor.fus_appSubColor;
_switchBtn.onTintColor = UIColor.fus_diamondBlue;
_switchBtn.backgroundColor = [UIColor fus_appBGPressColor];
_switchBtn.layer.cornerRadius = 15.5;
_switchBtn.clipsToBounds = YES;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/MessageBox/FUSLiveMessageBoxView.m
......@@ -164,7 +164,7 @@ static dispatch_queue_t get_live_message_box_parse_queue(){
_emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, _tableView.width, 150)];
_emptyView.contentAligment = FUSEmptyViewAligmentCenter;
[_emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"live_message_box_no_message_icon"] title:[NSString fus_localString:@"您还没有收到私信"] buttonTittle:nil];
[_emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"com_icon_hot_no_data_empty"] title:[NSString fus_localString:@"您还没有收到私信"] buttonTittle:nil];
_emptyView.hidden = YES;
_emptyView.backgroundColor = [UIColor clearColor];
_emptyView.center = CGPointMake(_bgView.width / 2.0, (_bgView.height / 2.0) + _headBGView.height / 2.0);
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/Other/FUSMotorWEBPView.m
......@@ -534,7 +534,7 @@
UIImage *levelImage = [UIImage fus_imageWithLevel:level.integerValue];
if (levelImage) {
CGFloat height = 18;
CGFloat height = 14;
CGFloat width = height / levelImage.size.height * levelImage.size.width;
NSAttributedString *levelAttr = [NSAttributedString attachmentStringWithContent:levelImage contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(width, height) alignToFont:[UIFont fus_themeFont:15] alignment:YYTextVerticalAlignmentCenter];
[attr appendAttributedString:levelAttr];
......@@ -642,7 +642,7 @@
// }
UIImage *levelImage = [UIImage fus_imageWithLevel:level.integerValue];
if (levelImage) {
CGFloat height = 18;
CGFloat height = 14;
CGFloat width = height / levelImage.size.height * levelImage.size.width;
NSAttributedString *levelAttr = [NSAttributedString attachmentStringWithContent:levelImage contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(width, height) alignToFont:[UIFont fus_themeFont:15] alignment:YYTextVerticalAlignmentCenter];
[attr appendAttributedString:levelAttr];
......@@ -796,7 +796,7 @@
if (levelStr.integerValue > 0) {
UIImage *levelImage = [UIImage fus_imageWithLevel:levelStr.integerValue];
if (levelImage) {
CGFloat height = 18;
CGFloat height = 14;
CGFloat width = height / levelImage.size.height * levelImage.size.width;
NSAttributedString *levelAttr = [NSAttributedString attachmentStringWithContent:levelImage contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(width, height) alignToFont:[UIFont fus_themeFont:15] alignment:YYTextVerticalAlignmentCenter];
[attr appendAttributedString:levelAttr];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/Other/FUSMotorsView.m
......@@ -283,7 +283,7 @@
UIImage *levelImage = [UIImage fus_imageWithLevel:level.integerValue];
if (levelImage) {
CGFloat height = 18;
CGFloat height = 14;
CGFloat width = height / levelImage.size.height * levelImage.size.width;
NSAttributedString *levelAttr = [NSAttributedString attachmentStringWithContent:levelImage contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(width, height) alignToFont:[UIFont fus_themeFont:15] alignment:YYTextVerticalAlignmentCenter];
[attr appendAttributedString:levelAttr];
......@@ -392,7 +392,7 @@
UIImage *levelImage = [UIImage fus_imageWithLevel:level.integerValue];
if (levelImage) {
CGFloat height = 18;
CGFloat height = 14;
CGFloat width = height / levelImage.size.height * levelImage.size.width;
NSAttributedString *levelAttr = [NSAttributedString attachmentStringWithContent:levelImage contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(width, height) alignToFont:[UIFont fus_themeFont:15] alignment:YYTextVerticalAlignmentCenter];
[attr appendAttributedString:levelAttr];
......@@ -545,7 +545,7 @@
// 有等级
UIImage *levelImage = [UIImage fus_imageWithLevel:levelStr.integerValue];
if (levelImage) {
CGFloat height = 18;
CGFloat height = 14;
CGFloat width = height / levelImage.size.height * levelImage.size.width;
NSAttributedString *levelAttr = [NSAttributedString attachmentStringWithContent:levelImage contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(width, height) alignToFont:[UIFont fus_themeFont:15] alignment:YYTextVerticalAlignmentCenter];
[attr appendAttributedString:levelAttr];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/PK/View/PKPrepareView/FUSPKAnchorTypeSelectView.m
......@@ -119,7 +119,7 @@ typedef NS_ENUM(NSInteger,PKAnchorType) {
/// 根据有几个按钮分成几等分
CGFloat cellWith = self.width / anchorTypeArr.count;
CGFloat itemCenterX = cellWith * i + cellWith / 2.0f;
anchorTypeBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 22, cardWidth, cardWidth)];
anchorTypeBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 10, cardWidth, cardWidth)];
anchorTypeBtn.centerX = itemCenterX;
anchorTypeBtn.tag = i;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/Popular/ProgressView/FUSPopularProgressView.m
......@@ -32,7 +32,7 @@
self.layer.borderColor = [UIColor whiteColor].CGColor;
self.layer.borderWidth = 0.5;
CGRect rect = CGRectInset(self.bounds, 4, 4);
CGRect rect = CGRectInset(self.bounds, 3, 3 );
self.progressBGView = [[UIView alloc] initWithFrame:rect];
self.progressBGView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.30];
self.progressBGView.layer.cornerRadius = self.progressBGView.width / 2.0f;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/ShareToChat/Views/FUSLiveShareToChatCell.m
......@@ -69,7 +69,7 @@
UIImage *vipImage = [UIImage fus_imageWithLevel:model.level.integerValue];;
self.vipImageView.image = vipImage;
if (vipImage) {
self.vipImageView.width = self.vipImageView.height / vipImage.size.height * vipImage.size.width;
self.vipImageView.width = ceil(self.vipImageView.height / vipImage.size.height * vipImage.size.width);
}
}
}
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/ShareToChat/Views/FUSLiveShareToChatCell.xib
......@@ -31,9 +31,9 @@
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="vip_icon_svip" translatesAutoresizingMaskIntoConstraints="NO" id="DI5-z3-n8n">
<rect key="frame" x="104" y="41.5" width="25" height="17"/>
<rect key="frame" x="104" y="43" width="25" height="14"/>
<constraints>
<constraint firstAttribute="height" constant="17" id="GNH-Bo-t89"/>
<constraint firstAttribute="height" constant="14" id="GNH-Bo-t89"/>
</constraints>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Qvd-n6-41O">
......
FuSiLive/Classes/NewsFeed/Views/FUSNewsFeedCommentView.m
......@@ -508,7 +508,7 @@
- (UIImageView *)richImageView {
if (!_richImageView) {
_richImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 30, 12)];
_richImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 28, 14)];
}
return _richImageView;
}
......
FuSiLive/Classes/NewsFeed/Views/FUSNewsFeedItemCell.m
......@@ -878,7 +878,7 @@
- (UIImageView *)richImageView {
if (!_richImageView) {
_richImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 30, 12)];
_richImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 28, 14)];
_richImageView.contentMode = UIViewContentModeScaleAspectFit;
}
return _richImageView;
......
FuSiLive/Classes/NewsFeed/Views/FUSNewsFeedLikeDetailCell.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -32,10 +32,10 @@
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="RzG-NN-PU0" userLabel="vipLevelImageView">
<rect key="frame" x="99" y="83" width="41" height="17"/>
<rect key="frame" x="99" y="84.5" width="28" height="14"/>
<constraints>
<constraint firstAttribute="height" constant="17" id="vOg-Jk-xHt"/>
<constraint firstAttribute="width" constant="41" id="xdz-4U-7OX"/>
<constraint firstAttribute="height" constant="14" id="vOg-Jk-xHt"/>
<constraint firstAttribute="width" constant="28" id="xdz-4U-7OX"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kWX-qq-uKG">
......
FuSiLive/Classes/NewsFeed/Views/FUSNewsFeedReplyListHeaderView.m
......@@ -284,7 +284,7 @@
- (UIImageView *)richImageView {
if (!_richImageView) {
_richImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 30, 12)];
_richImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 28, 14)];
}
return _richImageView;
}
......
FuSiLive/Classes/NewsFeed/Views/FUSNewsFeedUnlockAlert.xib
......@@ -3,7 +3,7 @@
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -55,10 +55,10 @@
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="yK4-3R-zpP">
<rect key="frame" x="69" y="7" width="0.0" height="13"/>
<rect key="frame" x="69" y="6.5" width="0.0" height="14"/>
<constraints>
<constraint firstAttribute="width" id="IuF-1Q-aPs"/>
<constraint firstAttribute="height" constant="13" id="Ksp-bt-cSU"/>
<constraint firstAttribute="height" constant="14" id="Ksp-bt-cSU"/>
</constraints>
</imageView>
</subviews>
......
FuSiLive/Classes/NewsFeed/Views/NewsFeedDetailHeaderView/FUSNewsFeedDetailHeaderView.m
......@@ -377,7 +377,7 @@
- (UIImageView *)richImageView {
if (!_richImageView) {
_richImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 30, 12)];
_richImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 28, 14)];
_richImageView.contentMode = UIViewContentModeScaleAspectFit;
}
return _richImageView;
......
FuSiLive/Classes/Search/View/FUSMainSearchTableViewCell.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -46,10 +46,10 @@
<nil key="highlightedColor"/>
</label>
<imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7Ur-HP-KZq">
<rect key="frame" x="102" y="27" width="39" height="18"/>
<rect key="frame" x="102" y="29" width="28" height="14"/>
<constraints>
<constraint firstAttribute="width" constant="39" id="3UB-6b-QSB"/>
<constraint firstAttribute="height" constant="18" id="7kz-lw-DUW"/>
<constraint firstAttribute="width" constant="28" id="3UB-6b-QSB"/>
<constraint firstAttribute="height" constant="14" id="7kz-lw-DUW"/>
</constraints>
</imageView>
</subviews>
......
FuSiLive/Classes/Setting/View/FUSSettingChatInviteCell.m
......@@ -112,7 +112,7 @@
- (UIImageView *)vipImageView {
if (!_vipImageView) {
_vipImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 41, 17)];
_vipImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 28, 14)];
}
return _vipImageView;
}
......
FuSiLive/Classes/Zone/Controller/FireFlyMyZone/FUSZoneTaskCenterViewController.m
......@@ -21,6 +21,7 @@
#import "FUSDewAwardAnimationView.h"
#import <StoreKit/StoreKit.h>
#import "FUSSettingViewController.h"
#import "FUSGotBackpackItemAnimView.h"
#import <FirebaseAnalytics/FirebaseAnalytics.h>
......@@ -118,7 +119,7 @@ static NSString *const reuseIdentifyCell = @"cell";
_segmentView.isEqualSpace = YES;
_segmentView.itemFont = [UIFont fus_themeFont:15];
_segmentView.backgroundColor = [UIColor clearColor];
[_segmentView fus_setItemTitleColor:[UIColor fus_themeColor] forState:UIControlStateSelected];
[_segmentView fus_setItemTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateSelected];
[_segmentView fus_setItemTitleColor:[UIColor fus_textColorMedium] forState:UIControlStateNormal];
[_segmentView fus_setUnderLineSelectedImage:[[UIImage imageNamed:@"common_icon_segment_selected"] imageByTintColor:[UIColor fus_themeColor]]];
[self.view addSubview:_segmentView];
......@@ -436,15 +437,15 @@ static NSString *const reuseIdentifyCell = @"cell";
[dewAnimView addDewAwardWithAmount:[NSString stringWithFormat:@"%ld",listModel.award] textColor:[UIColor fus_dewBlue]];
[UIApplication.sharedApplication.keyWindow addSubview:dewAnimView];
} else {
FUSSingleDailyCheckInView *awardView = [FUSSingleDailyCheckInView fus_dailyCheckInView];
awardView.frame = UIView.fus_screenFrame;
awardView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.6];
[awardView fus_showCheckInSucceedWithIcon:listModel.icon
desc:listModel.getTips
award:@(listModel.award).description
animated:NO];
[UIApplication.sharedApplication.keyWindow addSubview:awardView];
[FUSGotBackpackItemAnimView fus_showWithType:FUSGotBackpackItemAnimType2 icon:listModel.icon name:listModel.getTips goodsType:listModel.classify isMotorHasWear:NO];
// FUSSingleDailyCheckInView *awardView = [FUSSingleDailyCheckInView fus_dailyCheckInView];
// awardView.frame = UIView.fus_screenFrame;
// awardView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.6];
// [awardView fus_showCheckInSucceedWithIcon:listModel.icon
// desc:listModel.getTips
// award:@(listModel.award).description
// animated:NO];
// [UIApplication.sharedApplication.keyWindow addSubview:awardView];
}
}
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSGotBackpackItemAnimView.h
......@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface FUSGotBackpackItemAnimView : UIView
+ (void)ff_showWithType:(FUSGotBackpackItemAnimType)type
+ (void)fus_showWithType:(FUSGotBackpackItemAnimType)type
icon:(NSString *)iconUrl
name:(NSString *)name
goodsType:(FUSGotBackpackItemGoodsType)goodsType
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment