Skip to content

pidan / FuSiLive

Go to a project
Commit b08832a1 by pierce
Options

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

parents c0fde483 a3b5e00d
Inline Side-by-side
Showing with 293 additions and 65 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/ActionSheet/SLActionSheet.m
......@@ -99,7 +99,7 @@
_delegate = delegate;
_separatorColor = [[UIColor fus_lineColor] colorWithAlphaComponent:0.09];
_separatorColor = [UIColor fus_lineColor];
_otherTitleColor = [UIColor fus_textColorRich];
UIView *shadowView = [[UIView alloc] initWithFrame:frame];
......@@ -152,7 +152,7 @@
[cancelBtn setBackgroundColor:[UIColor fus_appBGColor]];
}
[cancelBtn setTitle:cancelButtonTitle forState:UIControlStateNormal];
_cancelTitleColor = [UIColor fus_appMainColor];
_cancelTitleColor = [UIColor fus_textColorRich];
if (_cancelTitleColor) {
[cancelBtn setTitleColor:_cancelTitleColor forState:UIControlStateNormal];
} else {
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/WebView/FUSWKWebViewController.m
......@@ -303,7 +303,7 @@
btn.width = 44;
}
btn.height = 44;
[btn setTitleColor:[UIColor colorWithHex:@"#CCCCCC"] forState:UIControlStateNormal];
[btn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
UIBarButtonItem *barButton = [[UIBarButtonItem alloc] initWithCustomView:btn];
[mutArray addObject:barButton];
}
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/WebView/FUSWebMorePopListView.m
......@@ -71,6 +71,7 @@ static const NSInteger FUSWebMoreListViewModuleSpace = 10;
self.cancelBtn.titleLabel.font = [UIFont fus_themeFont:16];
self.cancelBtn.layer.cornerRadius = 10;
self.cancelBtn.layer.masksToBounds = YES;
[self.contentView addSubview:self.cancelBtn];
[self.cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.left.right.equalTo(self.contentView);
......@@ -181,7 +182,8 @@ static const NSInteger FUSWebMoreListViewModuleSpace = 10;
}
- (void)fus_showWithAnimation {
dispatch_async(dispatch_get_main_queue(), ^{
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
self.bgBtn.alpha = 0;
[UIView animateWithDuration:0.3 animations:^{
self.bgBtn.alpha = 1;
......@@ -194,6 +196,19 @@ static const NSInteger FUSWebMoreListViewModuleSpace = 10;
[self layoutIfNeeded];
}];
});
// dispatch_async(dispatch_get_main_queue(), ^{
// self.bgBtn.alpha = 0;
// [UIView animateWithDuration:0.3 animations:^{
// self.bgBtn.alpha = 1;
// [self.contentView mas_updateConstraints:^(MASConstraintMaker *make) {
// make.left.equalTo(self.contentView.superview).offset(FUSWebMoreListViewBtnMargin);
// make.right.equalTo(self.contentView.superview).offset(-FUSWebMoreListViewBtnMargin);
// make.height.mas_equalTo(self.contentHeight);
// make.bottom.equalTo(self.contentView.superview).offset(-(UIView.fus_SafeBottom + 20));
// }];
// [self layoutIfNeeded];
// }];
// });
}
@end
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Theme/UIColor+FUSTheme.h
......@@ -44,6 +44,8 @@
+(UIColor *)fus_textColorDeep;
/// 黑色字体 222222
+(UIColor *)fus_textColorRich;
/// 黑色字体 282828
+ (UIColor *)fus_textColorRich2;
/// 灰色字体 666666
+(UIColor *)fus_textColorMedium;
/// 黑色字体 808080
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Theme/UIColor+FUSTheme.m
......@@ -89,6 +89,9 @@
+ (UIColor *)fus_textColorRich{
return [UIColor colorWithHex:@"#222222"];
}
+ (UIColor *)fus_textColorRich2{
return [UIColor colorWithHex:@"#282828"];
}
+ (UIColor *)fus_textColorLight{
return [UIColor colorWithHex:@"#808080"];
}
......
FuSiLive/Assets.xcassets/Live/LocalimageUrl_nav_right_btn_record_black.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "LocalimageUrl_nav_right_btn_record_black@2x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/SingleChat/icon_camera_select.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icon_camera_select@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon_camera_select@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Classes/BaoFang/Main/View/Other/FUSLikeListHeaderView.m
......@@ -51,6 +51,8 @@
}
- (void)initial {
self.backgroundColor = [UIColor colorWithHex:@"f6f6f6"];
self.likeNumberLabel = [[UILabel alloc] init];
self.likeNumberLabel.x = 18;
self.likeNumberLabel.textColor = [UIColor colorWithHex:@"808080"];
......
FuSiLive/Classes/Common/View/MediaPreview/FUSBaseMediaPreview.m
......@@ -526,7 +526,7 @@
_moreBtn = [UIButton buttonWithType:UIButtonTypeCustom];
_moreBtn.frame = CGRectMake(_titleView.width - 44, _closeBtn.y, 44, 44);
[_moreBtn addTarget:self action:@selector(fus_clickMoreBtnAction) forControlEvents:UIControlEventTouchUpInside];
[_moreBtn setImage:[UIImage imageNamed:@"icon_more"] forState:UIControlStateNormal];
[_moreBtn setImage:[[UIImage imageNamed:@"icon_more"] imageByTintColor:[UIColor fus_textColorRich]] forState:UIControlStateNormal];
}
return _moreBtn;
......
FuSiLive/Classes/FusiVersionFeature/ViewController/NovaList/FUSHomeNovaListViewController.m
......@@ -87,6 +87,7 @@
self.segmentView = [[FUSSegmentControlView alloc] initWithFrame:CGRectMake(16, 0, UIView.fus_screenW - 16*2, 40) withItems:@[[NSString fus_localString:@"按时间"], [NSString fus_localString:@"按热度"]]];
self.segmentView.underLine.backgroundColor = [UIColor fus_textColorRich];
self.segmentView.underLineWidth = 8;
self.segmentView.isShowUnderLine = YES;
self.segmentView.space = 20;
[self.segmentView fus_setItemTitleColor:[UIColor blackColor] forState:UIControlStateSelected];
......@@ -208,7 +209,7 @@
[self.followAllBtn setImage:nil forState:UIControlStateNormal];
[self.followAllBtn setImage:[UIImage imageNamed:@"home_nova_list_followAll_btn"] forState:UIControlStateDisabled];
[self.followAllBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
self.followAllBtn.titleLabel.font = [UIFont fus_themeMediumFont:17];
self.followAllBtn.titleLabel.font = [UIFont fus_themeMediumFont:16];
self.followAllBtn.layer.cornerRadius = 44/2.0f;
self.followAllBtn.layer.masksToBounds = YES;
[self.followAllTouchBg addSubview:self.followAllBtn];
......
FuSiLive/Classes/FusiVersionFeature/ViewController/NovaList/View/FUSHomeNovaListCollectionView.m
......@@ -67,7 +67,7 @@
self.emptyView.hidden = YES;
CGFloat itemWidth = (UIView.fus_screenW - self.rowMargin * 2 - (self.columnsCount - 1) * self.rowMargin) / self.columnsCount;
itemWidth = floor(itemWidth);
// itemWidth = floor(itemWidth);
UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
layout.sectionInset = UIEdgeInsetsMake(0, self.columnMargin, self.columnMargin, self.columnMargin);
......
FuSiLive/Classes/InstantMessaging/View/FUSChatIntimacyV2View.m
......@@ -73,7 +73,7 @@
self.intimacyLabel = [[UILabel alloc] init];
self.intimacyLabel.font = [UIFont fus_themeMediumFont:10];
self.intimacyLabel.textColor = [UIColor fus_themeColor];
self.intimacyLabel.textColor = [UIColor fus_diamondBlue];
self.intimacyLabel.text = [NSString fus_localString:@"亲密度"];
[intimacyProgressBgView addSubview:self.intimacyLabel];
[self.intimacyLabel mas_makeConstraints:^(MASConstraintMaker *make) {
......@@ -93,7 +93,7 @@
}];
self.progressTintView = [[UIView alloc] init];
self.progressTintView.backgroundColor = [UIColor fus_themeColor];
self.progressTintView.backgroundColor = [UIColor fus_diamondBlue];
self.progressTintView.layer.cornerRadius = 2;
self.progressTintView.layer.masksToBounds = YES;
[self.progressBgView addSubview:self.progressTintView];
......@@ -135,7 +135,7 @@
// 如果发送改变，则把数字的颜色变成高亮
if (progress > 0) {
[attr addAttribute:NSForegroundColorAttributeName value:[UIColor fus_themeColor] range:NSMakeRange(0, intimacyStr.length)];
[attr addAttribute:NSForegroundColorAttributeName value:[UIColor fus_diamondBlue] range:NSMakeRange(0, intimacyStr.length)];
}
self.intimacyNumLabel.attributedText = attr;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/ContributeList/FUSContributeCellTableViewCell.m
......@@ -309,7 +309,7 @@
make.width.mas_equalTo(37);
}];
} else {
[self.genderAndAgeBtn setTitle:@"" forState:UIControlStateNormal];
[self.genderAndAgeBtn mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nicknameLabel);
make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2);
......
FuSiLive/Classes/Payment/Controller/FUSExchangeDiamondViewController.xib
......@@ -3,7 +3,7 @@
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
......@@ -22,16 +22,16 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="E4W-JR-rXx">
<rect key="frame" x="0.0" y="0.0" width="375" height="160"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="140"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="4dQ-V4-2vS">
<rect key="frame" x="0.0" y="0.0" width="375" height="160"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="140"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="common_large_fire_icon" translatesAutoresizingMaskIntoConstraints="NO" id="D4b-jC-PY1">
<rect key="frame" x="176.5" y="52" width="22" height="28"/>
<rect key="frame" x="176.5" y="42" width="22" height="28"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2i0-3C-TMh">
<rect key="frame" x="179.5" y="85" width="16" height="30"/>
<rect key="frame" x="179.5" y="75" width="16" height="30"/>
<fontDescription key="fontDescription" type="system" pointSize="25"/>
<color key="textColor" red="0.0" green="0.94117647058823528" blue="0.53333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
......@@ -44,14 +44,14 @@
<constraint firstItem="D4b-jC-PY1" firstAttribute="centerX" secondItem="E4W-JR-rXx" secondAttribute="centerX" id="EPN-ai-Js1"/>
<constraint firstAttribute="bottom" secondItem="4dQ-V4-2vS" secondAttribute="bottom" id="PjE-yi-0jq"/>
<constraint firstItem="2i0-3C-TMh" firstAttribute="centerX" secondItem="E4W-JR-rXx" secondAttribute="centerX" id="TJ7-8B-NNo"/>
<constraint firstAttribute="height" constant="160" id="VHP-GR-ChF"/>
<constraint firstAttribute="height" constant="140" id="VHP-GR-ChF"/>
<constraint firstAttribute="trailing" secondItem="4dQ-V4-2vS" secondAttribute="trailing" id="adU-o4-Kpx"/>
<constraint firstItem="4dQ-V4-2vS" firstAttribute="top" secondItem="E4W-JR-rXx" secondAttribute="top" id="oCF-Lh-Kw7"/>
<constraint firstItem="4dQ-V4-2vS" firstAttribute="leading" secondItem="E4W-JR-rXx" secondAttribute="leading" id="ob1-TI-9fR"/>
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="60" sectionHeaderHeight="1" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="faM-Ff-o5o">
<rect key="frame" x="0.0" y="160" width="375" height="507"/>
<rect key="frame" x="0.0" y="140" width="375" height="527"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</tableView>
</subviews>
......
FuSiLive/Classes/Payment/Controller/FUSRechargeViewController.m
......@@ -196,6 +196,8 @@
[super viewDidLoad];
self.diamondLabel.textColor = [UIColor fus_diamondBlue];
if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
self.checkingView.backgroundColor = UIColor.fus_appBGColor;
[self fus_initCheckingViews];
......@@ -265,7 +267,7 @@
UIButton *recordBtn = [UIButton buttonWithType:UIButtonTypeCustom];
recordBtn.frame = CGRectMake(0, 0, 40, 40);
[recordBtn addTarget:self action:@selector(onRechargeButtonClickAction:) forControlEvents:UIControlEventTouchUpInside];
[recordBtn setImage:[[UIImage imageNamed:@"LocalimageUrl_nav_right_btn_record"] imageByTintColor:[UIColor fus_textColorMedium]] forState:UIControlStateNormal];
[recordBtn setImage:[[UIImage imageNamed:@"LocalimageUrl_nav_right_btn_record_black"] imageByTintColor:[UIColor fus_textColorMedium]] forState:UIControlStateNormal];
UIBarButtonItem *recordBarItem = [[UIBarButtonItem alloc] initWithCustomView:recordBtn];
// UIBarButtonItem* spaceItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
......
FuSiLive/Classes/Payment/Controller/FUSRechargeViewController.xib
......@@ -80,10 +80,10 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tax-eY-knd">
<rect key="frame" x="0.0" y="50" width="375" height="160"/>
<rect key="frame" x="0.0" y="50" width="375" height="140"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Bgu-xc-yko">
<rect key="frame" x="0.0" y="0.0" width="375" height="160"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="140"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="zone_account_large_diamond" translatesAutoresizingMaskIntoConstraints="NO" id="aaY-22-EGN">
<rect key="frame" x="167.66666666666666" y="47" width="40" height="40"/>
......@@ -98,7 +98,7 @@
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="aaY-22-EGN" firstAttribute="centerX" secondItem="Tax-eY-knd" secondAttribute="centerX" id="JZ3-ed-zn6"/>
<constraint firstAttribute="height" constant="160" id="W8k-nh-YN8"/>
<constraint firstAttribute="height" constant="140" id="W8k-nh-YN8"/>
<constraint firstItem="n8P-Xq-PGq" firstAttribute="centerX" secondItem="aaY-22-EGN" secondAttribute="centerX" id="a1d-ch-S3q"/>
<constraint firstItem="aaY-22-EGN" firstAttribute="top" secondItem="Tax-eY-knd" secondAttribute="top" constant="47" id="bUt-Xp-tEe"/>
<constraint firstAttribute="trailing" secondItem="Bgu-xc-yko" secondAttribute="trailing" id="btG-Mw-XU4"/>
......@@ -109,7 +109,7 @@
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsVerticalScrollIndicator="NO" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="o3j-Et-9JY">
<rect key="frame" x="0.0" y="210" width="375" height="488"/>
<rect key="frame" x="0.0" y="190" width="375" height="508"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</tableView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="B6a-mj-s4m">
......
FuSiLive/Classes/Search/View/FUSSearchTableViewCell.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" 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="16087"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" restorationIdentifier="cell" selectionStyle="default" indentationWidth="10" rowHeight="72" id="KGk-i7-Jjw" customClass="FUSSearchTableViewCell" customModule="Firefly_Live" customModuleProvider="target">
<tableViewCell contentMode="scaleToFill" restorationIdentifier="cell" selectionStyle="default" indentationWidth="10" rowHeight="72" id="KGk-i7-Jjw" customClass="FUSSearchTableViewCell" customModule="FuSiLive" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="366" height="72"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
......@@ -43,11 +43,11 @@
<color key="textColor" red="0.89803921568627454" green="0.89803921568627454" blue="0.89803921568627454" alpha="0.84705882352941175" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="GoL-d5-9SS">
<rect key="frame" x="124" y="27" width="39" height="18"/>
<imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="vip_icon_none_vip" translatesAutoresizingMaskIntoConstraints="NO" id="GoL-d5-9SS">
<rect key="frame" x="124" y="29" width="14" height="14"/>
<constraints>
<constraint firstAttribute="height" constant="18" id="RDu-5r-YdH"/>
<constraint firstAttribute="width" constant="39" id="vpM-fG-TlA"/>
<constraint firstAttribute="height" constant="14" id="RDu-5r-YdH"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="14" id="vpM-fG-TlA"/>
</constraints>
</imageView>
</subviews>
......@@ -79,4 +79,7 @@
<point key="canvasLocation" x="250.72463768115944" y="62.946428571428569"/>
</tableViewCell>
</objects>
<resources>
<image name="vip_icon_none_vip" width="13" height="13"/>
</resources>
</document>
FuSiLive/Classes/SingleChat/Main/View/FUSChatTextInputView/FUSChatToolView.m
......@@ -174,7 +174,7 @@
}
case FUSChatToolTypePhoto:
{
imageName = @"icon_camera_normal";
imageName = @"icon_camera_select";
break;
}
case FUSChatToolTypeVoice:
......
FuSiLive/Classes/ZhaiXin/Main/Controller/FUSIMZhaiXinViewController.m
......@@ -130,14 +130,14 @@
_settingBtn = [UIButton buttonWithType:UIButtonTypeCustom];
_settingBtn.frame = CGRectMake(UIView.fus_screenW - 44, 0, 44, 44);
[_settingBtn setImage:[UIImage imageNamed:@"zhaixin_setting_btn"] forState:UIControlStateNormal];
[_settingBtn setImage:[UIImage imageNamed:@"fus_my_setting_item_setting_icon"] forState:UIControlStateNormal];
[_settingBtn addTarget:self action:@selector(fus_clickSettingBtnAction) forControlEvents:UIControlEventTouchUpInside];
_settingBtn.hidden = YES;
[self.navView addSubview:self.settingBtn];
_zhaiyouSearchBtn = [UIButton buttonWithType:UIButtonTypeCustom];
_zhaiyouSearchBtn.frame = CGRectMake(_settingBtn.x - 44, 0, 44, 44);
[_zhaiyouSearchBtn setImage:[UIImage imageNamed:@"common_nav_search_icon"] forState:UIControlStateNormal];
[_zhaiyouSearchBtn setImage:[UIImage imageNamed:@"fus_home_navi_search_icon"] forState:UIControlStateNormal];
[_zhaiyouSearchBtn addTarget:self action:@selector(searchBtnClick) forControlEvents:UIControlEventTouchUpInside];
_zhaiyouSearchBtn.hidden = YES;
[self.navView addSubview:self.zhaiyouSearchBtn];
......
FuSiLive/Classes/Zone/Controller/FUSMotoringWareHouseViewController.m
......@@ -129,6 +129,8 @@
if (motoringArr.count==0) {
FUSEmptyView *emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH-UIView.fus_StatusBarAndNavgationBarHeight)];
[emptyView fus_setEmptyViewIcon:[UIImage fus_emptyImg] title:[NSString fus_localString:@"暂无座驾以供选择"] buttonTittle:nil];
emptyView.imageScale = 0.5;
emptyView.contentVerticalOffset = -40;
[self.view addSubview:emptyView];
}
[self.tableView.mj_header endRefreshing];
......
FuSiLive/Classes/Zone/Controller/FireFlyMyZone/FUSZoneUserInfoEditViewController.swift
......@@ -23,9 +23,11 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega
@IBOutlet var verifyBtnWidthConstraint: NSLayoutConstraint!
@IBOutlet weak var voiceSignBgView: UIView!
@IBOutlet var voiceSignLocalLabel: UILabel!
@IBOutlet var voiceSignLabel: UILabel!
@IBOutlet weak var nickNameBgView: UIView!
/// 昵称本地化
@IBOutlet var nickNameLocalLabel: UILabel!
/// 修改昵称的输入框
......@@ -35,6 +37,7 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega
/// 覆盖在修改昵称输入框上的改名
let nickNameBtn = UIButton(type: .custom)
@IBOutlet weak var genderBgView: UIView!
/// 性别本地化
@IBOutlet var genderLocalLabel: UILabel!
/// 性别
......@@ -42,6 +45,7 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega
/// 性别提示Label
@IBOutlet var genderTipLabel: UILabel!
@IBOutlet weak var birthdayBgView: UIView!
/// 生日本地化
@IBOutlet var birthdayLocalLabel: UILabel!
/// 生日
......@@ -49,31 +53,37 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega
/// 生日提示语
@IBOutlet var birthdayTipLabel: UILabel!
@IBOutlet weak var heightBgView: UIView!
/// 身高本地化
@IBOutlet var heightLocalLabel: UILabel!
/// 身高
@IBOutlet var heightLabel: UILabel!
@IBOutlet weak var weightBgView: UIView!
/// 体重本地化
@IBOutlet var weightLocalLabel: UILabel!
/// 体重
@IBOutlet var weightLabel: UILabel!
@IBOutlet weak var careerBgView: UIView!
/// 职业本地化
@IBOutlet var careerLocalLabel: UILabel!
/// 职业
@IBOutlet var careerTextField: FUSTextField!
@IBOutlet weak var educationBgView: UIView!
/// 学历本地化
@IBOutlet var educationLocalLabel: UILabel!
/// 学历
@IBOutlet var educationLabel: UILabel!
@IBOutlet weak var areaBgView: UIView!
/// 地区本地化
@IBOutlet var areaLocalLabel: UILabel!
/// 地区
@IBOutlet var areaLabel: UILabel!
@IBOutlet weak var signBgView: UIView!
/// 签名本地化
@IBOutlet var signLocalLabel: UILabel!
/// 签名的输入框
......@@ -240,6 +250,18 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega
self.careerTextField.textAlignment = NSTextAlignment.right
self.areaLabel.textAlignment = NSTextAlignment.right
self.signTextView.textAlignment = NSTextAlignment.right
let bgViewsList = [voiceSignBgView, nickNameBgView, genderBgView, birthdayBgView, heightBgView, weightBgView, educationBgView, careerBgView, areaBgView]
for (_, tempView) in bgViewsList.enumerated(){
let lineView = UIView()
lineView.backgroundColor = UIColor.fus_line()
tempView?.addSubview(lineView)
lineView.snp.makeConstraints { make in
make.bottom.equalToSuperview()
make.left.right.equalToSuperview().inset(14)
make.height.equalTo(0.5)
}
}
}
//MARK: -- UI Actions
......
FuSiLive/Classes/Zone/Controller/FireFlyMyZone/FUSZoneUserInfoEditViewController.xib
......@@ -11,41 +11,51 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="FUSZoneUserInfoEditViewController" customModule="FuSiLive" customModuleProvider="target">
<connections>
<outlet property="areaBgView" destination="eXm-U2-OIy" id="8C1-Zi-W17"/>
<outlet property="areaLabel" destination="Cwq-fl-Dfk" id="cuq-Fb-sdu"/>
<outlet property="areaLocalLabel" destination="Ynj-2n-4Fv" id="08L-49-mX4"/>
<outlet property="areaLocalWidthConstraint" destination="Cyh-8a-sbm" id="3Q3-vt-IkP"/>
<outlet property="birthdayBgView" destination="kL1-jg-hG1" id="cnn-Z0-2GR"/>
<outlet property="birthdayLabel" destination="ooM-d9-vcR" id="TyJ-D3-Aon"/>
<outlet property="birthdayLocalLabel" destination="TKp-aw-lUU" id="W7L-yA-1Xr"/>
<outlet property="birthdayLocalWidthConstraint" destination="V3W-cm-T2X" id="7YD-gi-jjO"/>
<outlet property="birthdayTipLabel" destination="ESG-9B-Gcy" id="wAE-tq-pmv"/>
<outlet property="careerBgView" destination="Ud8-Ik-7E6" id="TVi-PL-f7u"/>
<outlet property="careerLocalLabel" destination="b8w-Up-nKi" id="kQy-Tj-auk"/>
<outlet property="careerLocalWidthConstraint" destination="Qe1-6d-3cG" id="M3C-dK-FEj"/>
<outlet property="careerTextField" destination="k64-jl-TM6" id="abK-rW-suO"/>
<outlet property="educationBgView" destination="dkz-wm-GbV" id="i0s-YD-LkG"/>
<outlet property="educationLabel" destination="tuv-U5-Cuk" id="uto-IO-6wL"/>
<outlet property="educationLocalLabel" destination="5NG-Hx-Ib9" id="4D3-3i-Apd"/>
<outlet property="edutactionLocalWidthConstraint" destination="7UZ-sk-f1T" id="prS-te-yk8"/>
<outlet property="faceImageView" destination="gga-1M-3Ot" id="eqt-K1-7u6"/>
<outlet property="faceTipsLocalLabel" destination="O3g-Iq-kXb" id="6lL-9N-8yV"/>
<outlet property="genderBgView" destination="KgA-YH-o9n" id="8qX-Zy-nPu"/>
<outlet property="genderLabel" destination="5u7-XD-59n" id="trS-Ff-OkU"/>
<outlet property="genderLocalLabel" destination="l6c-Lp-QBk" id="hAh-Gd-nzW"/>
<outlet property="genderLocalWidthConstraint" destination="tzn-Lp-hkb" id="9cM-cQ-fg0"/>
<outlet property="genderTipLabel" destination="V0E-4X-Z0u" id="bmR-rN-4pj"/>
<outlet property="heightBgView" destination="ipV-pI-gaU" id="vCj-9o-cEs"/>
<outlet property="heightLabel" destination="ZSK-xN-TJl" id="7Jr-Ht-NRH"/>
<outlet property="heightLocalLabel" destination="AGx-qS-qAR" id="Kf9-Tk-wnv"/>
<outlet property="heightLocalWidthConstraint" destination="Exb-x5-jl4" id="ceJ-XD-dzl"/>
<outlet property="nickNameBgView" destination="223-Ib-X2u" id="NqB-bH-bpI"/>
<outlet property="nickNameLocalLabel" destination="Aat-SK-QlS" id="PU2-hG-1j8"/>
<outlet property="nickNameLocalWidthConstraint" destination="hWy-Dd-6P2" id="Ppe-Yi-1mT"/>
<outlet property="nickNameTextField" destination="Fr2-nW-oU7" id="tly-Md-Fa6"/>
<outlet property="nickNameTipLabel" destination="CTh-Qp-YUD" id="bez-uC-RVc"/>
<outlet property="scrollView" destination="js2-qc-wKB" id="5uW-Nr-ygC"/>
<outlet property="signBgView" destination="svU-wW-prw" id="jeQ-5N-HOs"/>
<outlet property="signLocalLabel" destination="wzk-gk-Vai" id="rrk-Jk-Z3T"/>
<outlet property="signLocalWidthConstraint" destination="bKU-90-j2A" id="Zbn-rb-rse"/>
<outlet property="signTextView" destination="c2s-hc-Jo3" id="K8n-74-iWa"/>
<outlet property="verifyBtn" destination="TbC-pL-MNl" id="b99-8Q-iJM"/>
<outlet property="verifyBtnWidthConstraint" destination="kRK-hN-j5j" id="rgy-WT-17F"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
<outlet property="voiceSignBgView" destination="TTr-HE-Br1" id="tOA-Wr-DxW"/>
<outlet property="voiceSignLabel" destination="ty4-iC-Iix" id="Pwe-d2-SPt"/>
<outlet property="voiceSignLocalLabel" destination="y8v-OJ-5ii" id="SJa-wX-b8A"/>
<outlet property="weightBgView" destination="wUj-hj-IAz" id="zn2-bu-dUV"/>
<outlet property="weightLabel" destination="qcb-uW-pOH" id="f0y-lp-YkY"/>
<outlet property="weightLocalLabel" destination="bEb-Zo-RPn" id="M2d-kw-IIU"/>
<outlet property="weightLocalWidthConstraint" destination="Wn1-Hi-8vl" id="yAU-Uj-0CN"/>
......
FuSiLive/Classes/Zone/View/FUSFollowTableViewCell.m
......@@ -12,7 +12,13 @@
@interface FUSFollowTableViewCell ()
@property (nonatomic, strong) UIImageView *headerView;
@property (nonatomic, strong) UILabel *nickNameLabel;
@property (nonatomic, strong) FUSImageMessageView *sexAngAgeView;
//@property (nonatomic, strong) FUSImageMessageView *sexAngAgeView;
/// 在线等级
@property (nonatomic, strong) UILabel *onlineLabel;
/// vip
@property (nonatomic, strong) UIImageView *vipImageView;
/// 性别和年龄按钮
@property (nonatomic, strong) UIButton *genderAndAgeBtn;
@end
@implementation FUSFollowTableViewCell
......@@ -21,12 +27,44 @@
if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
[self.contentView addSubview:self.headerView];
[self.contentView addSubview:self.nickNameLabel];
[self.contentView addSubview:self.sexAngAgeView];
[self.contentView addSubview:self.vipImageView];
[self.contentView addSubview:self.genderAndAgeBtn];
[self.contentView addSubview:self.onlineLabel];
// [self.contentView addSubview:self.sexAngAgeView];
self.backgroundColor = UIColor.fus_appBGColor;
self.contentView.backgroundColor = UIColor.fus_appBGColor;
self.selectedBackgroundView = [[UIView alloc] init];
self.selectedBackgroundView.backgroundColor = UIColor.fus_appBGPressColor;
[self.headerView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.equalTo(self.mas_height).offset(-16);
make.centerY.equalTo(self.headerView.superview);
make.left.offset(15);
}];
[self.nickNameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.headerView.mas_right).offset(12);
make.width.mas_lessThanOrEqualTo(200);
make.top.equalTo(self.headerView.mas_top).offset(2);
}];
[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(14);
make.width.mas_equalTo(20);
}];
[self.vipImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(14);
make.centerY.equalTo(self.nickNameLabel.mas_centerY);
make.left.equalTo(self.onlineLabel.mas_right).offset(4);
}];
[self.genderAndAgeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nickNameLabel);
make.top.equalTo(self.nickNameLabel.mas_bottom).offset(2);
make.height.mas_equalTo(18);
make.width.mas_equalTo(37);
}];
}
return self;
}
......@@ -36,19 +74,62 @@
self.nickNameLabel.text = nil;
[self.headerView setWebImageWithSubURLString:model.face placeholder:nil];
self.nickNameLabel.text = model.nickname;
[self.nickNameLabel sizeToFit];
if ([NSString isNull:model.constellation]) {
[self.sexAngAgeView fus_setAge:@"" sex:model.sex.integerValue];
}else {
[self.sexAngAgeView fus_setAge:model.age sex:model.sex.integerValue];
NSInteger level = 0;
if ([model.privilege[@"richPower"] integerValue] == 1) {
level = model.level.intValue;
}
self.vipImageView.image = [UIImage fus_imageWithLevel:level];
self.onlineLabel.text = [NSString stringWithFormat:@"%@",model.lev];
if (model.sex.integerValue == 0) {
[self.genderAndAgeBtn setImage:[UIImage fus_girlIcon] forState:UIControlStateNormal];
[self.genderAndAgeBtn setTitleColor:[UIColor colorWithHex:@"#FE96B0"] forState:UIControlStateNormal];
} else if (model.sex.integerValue == 1) {
[self.genderAndAgeBtn setImage:[UIImage fus_boyIcon] forState:UIControlStateNormal];
[self.genderAndAgeBtn setTitleColor:[UIColor colorWithHex:@"#76C4FF"] forState:UIControlStateNormal];
} else {
[self.genderAndAgeBtn setImage:[UIImage fus_secretIcon] forState:UIControlStateNormal];
[self.genderAndAgeBtn setTitleColor:[UIColor grayColor] forState:UIControlStateNormal];
}
if (model.age.integerValue > 0) {
[self.genderAndAgeBtn setTitle:model.age forState:UIControlStateNormal];
[self.genderAndAgeBtn mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nickNameLabel);
make.top.equalTo(self.nickNameLabel.mas_bottom).offset(2);
make.height.mas_equalTo(18);
make.width.mas_equalTo(37);
}];
} else {
[self.genderAndAgeBtn setTitle:@"" forState:UIControlStateNormal];
[self.genderAndAgeBtn mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nickNameLabel);
make.top.equalTo(self.nickNameLabel.mas_bottom).offset(2);
make.height.mas_equalTo(18);
make.width.mas_equalTo(18);
}];
}
self.sexAngAgeView.centerY = self.nickNameLabel.centerY;
self.headerView.centerY = self.nickNameLabel.centerY;
self.headerView.x = 15;
self.nickNameLabel.x = CGRectGetMaxX(self.headerView.frame) + 8;
self.sexAngAgeView.x = CGRectGetMaxX(self.nickNameLabel.frame) + 8;
[self.contentView fusrtl_setSubViewsToRTL];
// [self.nickNameLabel sizeToFit];
// if ([NSString isNull:model.constellation]) {
// [self.sexAngAgeView fus_setAge:@"" sex:model.sex.integerValue];
// }else {
// [self.sexAngAgeView fus_setAge:model.age sex:model.sex.integerValue];
// }
// self.sexAngAgeView.centerY = self.nickNameLabel.centerY;
// self.headerView.centerY = self.nickNameLabel.centerY;
//
// self.headerView.x = 15;
// self.nickNameLabel.x = CGRectGetMaxX(self.headerView.frame) + 8;
// self.sexAngAgeView.x = CGRectGetMaxX(self.nickNameLabel.frame) + 8;
// [self.contentView fusrtl_setSubViewsToRTL];
}
- (void)layoutSubviews{
[super layoutSubviews];
self.headerView.layer.cornerRadius = self.headerView.height / 2.0f;
}
- (UIImageView *)headerView {
......@@ -72,13 +153,44 @@
return _nickNameLabel;
}
- (FUSImageMessageView *)sexAngAgeView {
if (!_sexAngAgeView) {
_sexAngAgeView = [[FUSImageMessageView alloc] init];
_sexAngAgeView.messageFont = [UIFont fus_themeFont:9];
_sexAngAgeView.msgLb.shadowOffset = CGSizeMake(0, 0);
_sexAngAgeView.msgLb.textColor = [UIColor whiteColor];
- (UIImageView *)vipImageView{
if (!_vipImageView) {
_vipImageView = [[UIImageView alloc] init];
}
return _vipImageView;
}
- (UIButton *)genderAndAgeBtn{
if (!_genderAndAgeBtn) {
_genderAndAgeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
_genderAndAgeBtn.titleLabel.font = [UIFont fus_themeFont:11];
_genderAndAgeBtn.layer.borderColor = [UIColor colorWithHex:@"#87878A"].CGColor;
_genderAndAgeBtn.layer.borderWidth = 0.5;
_genderAndAgeBtn.layer.cornerRadius = 9;
_genderAndAgeBtn.layer.masksToBounds = YES;
}
return _sexAngAgeView;
return _genderAndAgeBtn;
}
- (UILabel *)onlineLabel{
if (!_onlineLabel) {
_onlineLabel = [[UILabel alloc] init];
_onlineLabel.font = [UIFont fus_themeFont:12];
_onlineLabel.text = @"0";
_onlineLabel.textColor = UIColor.whiteColor;
_onlineLabel.backgroundColor = [UIColor colorWithHex:@"#87878A" alpha:0.32];
_onlineLabel.layer.cornerRadius = 7;
_onlineLabel.layer.masksToBounds = YES;
_onlineLabel.textAlignment = NSTextAlignmentCenter;
}
return _onlineLabel;
}
//- (FUSImageMessageView *)sexAngAgeView {
// if (!_sexAngAgeView) {
// _sexAngAgeView = [[FUSImageMessageView alloc] init];
// _sexAngAgeView.messageFont = [UIFont fus_themeFont:9];
// _sexAngAgeView.msgLb.shadowOffset = CGSizeMake(0, 0);
// _sexAngAgeView.msgLb.textColor = [UIColor whiteColor];
// }
// return _sexAngAgeView;
//}
@end
FuSiLive/Classes/Zone/View/FUSSelectDateView.m
......@@ -94,7 +94,7 @@ typedef void(^ClickBlock)(int type, NSString *dateStr);
[cancelButton setTitle:[NSString fus_localString:@"取消"] forState:UIControlStateNormal];
[cancelButton sizeToFit];
cancelButton.height = TOOLBAR_HEIGHT;
[cancelButton setTitleColor:[UIColor colorWithHex:@"#58DBD7"] forState:UIControlStateNormal];
[cancelButton setTitleColor:[UIColor fus_textColorRich2] forState:UIControlStateNormal];
[cancelButton addTarget:self action:@selector(onCancelButtonAction:) forControlEvents:UIControlEventTouchUpInside];
[toolBar addSubview:cancelButton];
......@@ -106,7 +106,7 @@ typedef void(^ClickBlock)(int type, NSString *dateStr);
[enterButton sizeToFit];
enterButton.height = TOOLBAR_HEIGHT;
enterButton.x = UIView.fus_screenW - enterButton.width - 10;
[enterButton setTitleColor:[UIColor colorWithHex:@"#58DBD7"] forState:UIControlStateNormal];
[enterButton setTitleColor:[UIColor fus_textColorRich2] forState:UIControlStateNormal];
[enterButton addTarget:self action:@selector(onEnterButtonAction:) forControlEvents:UIControlEventTouchUpInside];
[toolBar addSubview:enterButton];
......
FuSiLive/Classes/Zone/View/FUSZoneEditPickerView.m
......@@ -272,7 +272,7 @@
cancelBtn.height = TOOLBAR_HEIGHT;
cancelBtn.x = FUSRTL.isRTL ? UIView.fus_screenW - cancelBtn.width - 10 : 10;
[toolBar addSubview:cancelBtn];
[cancelBtn setTitleColor:[UIColor colorWithHex:@"#58DBD7"] forState:UIControlStateNormal];
[cancelBtn setTitleColor:[UIColor fus_textColorRich2] forState:UIControlStateNormal];
[cancelBtn addTarget:self action:@selector(onTapCancelBtnAction:) forControlEvents:UIControlEventTouchUpInside];
CGFloat certainX = FUSRTL.isRTL ? 10 : UIView.fus_screenW - 70;
......@@ -283,7 +283,7 @@
certainBtn.height = TOOLBAR_HEIGHT;
certainBtn.x = FUSRTL.isRTL ? 10 : UIView.fus_screenW - certainBtn.width - 10;
[toolBar addSubview:certainBtn];
[certainBtn setTitleColor:[UIColor colorWithHex:@"#58DBD7"] forState:UIControlStateNormal];
[certainBtn setTitleColor:[UIColor fus_textColorRich2] forState:UIControlStateNormal];
[certainBtn addTarget:self action:@selector(onTapCertainBtnAction:) forControlEvents:UIControlEventTouchUpInside];
_titleLb = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMaxX(cancelBtn.frame), 0, certainBtn.x - CGRectGetMaxX(cancelBtn.frame), toolBar.height)];
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/FUSSendJewelRankCell.m
......@@ -22,6 +22,9 @@
_faceImageView.layer.cornerRadius = _faceImageView.height / 2;
_faceImageView.layer.masksToBounds = YES;
self.rankLabel.textColor = [UIColor fus_textColorRich2];
self.nickNameLabel.textColor = [UIColor fus_textColorRich2];
self.backgroundColor = UIColor.fus_appBGColor;
self.selectedBackgroundView = [[UIView alloc] init];
self.selectedBackgroundView.backgroundColor = UIColor.fus_appBGPressColor;
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/FUSSendJewelRankCell.xib
......@@ -2,7 +2,8 @@
<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="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
......@@ -43,11 +44,11 @@
<color key="textColor" red="0.0" green="0.94117647058823528" blue="0.53333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7Nl-nU-jxl">
<rect key="frame" x="101" y="12.5" width="30" height="20"/>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="vip_icon_none_vip" translatesAutoresizingMaskIntoConstraints="NO" id="7Nl-nU-jxl">
<rect key="frame" x="101" y="15.5" width="14" height="14"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="VY8-Vi-gHh"/>
<constraint firstAttribute="width" constant="30" id="uUF-5H-Hg0"/>
<constraint firstAttribute="height" constant="14" id="VY8-Vi-gHh"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="14" id="uUF-5H-Hg0"/>
</constraints>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Wdo-3M-C1h">
......@@ -85,6 +86,7 @@
</tableViewCell>
</objects>
<resources>
<image name="fireFly_zone_fire" width="24" height="24"/>
<image name="fireFly_zone_fire" width="12" height="15.5"/>
<image name="vip_icon_none_vip" width="13" height="13"/>
</resources>
</document>
FuSiLive/Classes/Zone/View/FireFlyView/View/FUSMyZoneBottomView.m
......@@ -80,6 +80,11 @@
[self.audioChatBtn setTitle:[NSString fus_localString:@"声讯"] forState:UIControlStateNormal];
[self.videoChatBtn setTitle:[NSString fus_localString:@"视讯"] forState:UIControlStateNormal];
[self.focusBtn setTitleColor:[UIColor fus_textColorRich2] forState:UIControlStateNormal];
[self.chatBtn setTitleColor:[UIColor fus_textColorRich2] forState:UIControlStateNormal];
[self.audioChatBtn setTitleColor:[UIColor fus_textColorRich2] forState:UIControlStateNormal];
[self.videoChatBtn setTitleColor:[UIColor fus_textColorRich2] forState:UIControlStateNormal];
[self updateBottomViewsInfos];
}
......
FuSiLive/Classes/Zone/View/FireFlyView/View/FUSMyZoneBottomView.xib
......@@ -2,7 +2,8 @@
<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>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
......@@ -142,6 +143,6 @@
<image name="zone_bottom_follow" width="18.5" height="17"/>
<image name="zone_bottom_video_chat" width="20.5" height="14.5"/>
<image name="zone_bottom_video_chat_disable" width="18.5" height="17"/>
<image name="zone_bottom_view_mask_img.png" width="750" height="273"/>
<image name="zone_bottom_view_mask_img.png" width="1125" height="390"/>
</resources>
</document>
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