Skip to content

pidan / FuSiLive

Go to a project
Commit c7d02c45 by pierce
Options

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

parents 2ff94f76 58445c66
Inline Side-by-side
Showing with 82 additions and 48 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/MenuPopListView/FUSMenuPopListTableViewCell.m
......@@ -48,7 +48,8 @@
//选中的背景颜色
UIView *selectedView = [[UIView alloc] initWithFrame:self.bounds];
selectedView.backgroundColor = [UIColor colorWithHex:@"#191723"];
// selectedView.backgroundColor = [UIColor colorWithHex:@"#191723"];
selectedView.backgroundColor = [UIColor fus_textColorLight];
self.selectedBackgroundView = selectedView;
//红点默认隐藏
......
FuSiLive/Classes/Foundation/Http/FUSURLDictionary.h
......@@ -17,7 +17,8 @@
#define DNS_ACCOUNTS(url) [NSString stringWithFormat:@"%@%@",[[FUSAPIDNSManager shareInstance] accountsDNS],url]
#define DNS_WEB(url) [NSString stringWithFormat:@"%@/footseen%@",[[FUSAPIDNSManager shareInstance] webURL],url]
//#define DNS_WEB(url) [NSString stringWithFormat:@"%@/footseen%@",[[FUSAPIDNSManager shareInstance] webURL],url]
#define DNS_WEB(url) [NSString stringWithFormat:@"%@%@",[[FUSAPIDNSManager shareInstance] webURL],url]
#define DNS_PAYMENTS(url) [NSString stringWithFormat:@"%@%@",[[FUSAPIDNSManager shareInstance] payURL],url]
......
FuSiLive/Classes/Setting/Controller/FUSLanguageSettingViewController.m
......@@ -60,8 +60,8 @@ static NSString *const kLanguageCellKey = @"kLanguageCellKey";
self.navigationItem.title = FUSLocalizationHelper.localString(@"切换语言");
[self.rightBtn setTitleColor:[UIColor colorWithHex:@"CCCCCC"] forState:UIControlStateNormal];
[self.rightBtn setTitleColor:[UIColor colorWithHex:@"666666"] forState:UIControlStateDisabled];
[self.rightBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[self.rightBtn setTitleColor:[UIColor colorWithHex:@"CCCCCC"] forState:UIControlStateDisabled];
self.rightBtn.enabled = NO;
[self fus_setupTableView];
......@@ -105,11 +105,11 @@ static NSString *const kLanguageCellKey = @"kLanguageCellKey";
cell.textLabel.font = [UIFont fus_themeFont:15];
cell.backgroundColor = UIColor.fus_appBGColor;
cell.textLabel.textColor = [UIColor colorWithHex:@"#CCCCCC"];
cell.textLabel.textColor = [UIColor fus_textColorRich];
cell.textLabel.textAlignment = NSTextAlignmentLeft;
UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 20, 20)];
imageView.image = [UIImage imageNamed:@"check_done"];
imageView.image = [[UIImage imageNamed:@"check_done"] imageByTintColor:[UIColor fus_textColorRich]];
imageView.contentMode = UIViewContentModeScaleAspectFit;
cell.accessoryView = imageView;
cell.selectedBackgroundView = [[UIView alloc] init];
......
FuSiLive/Classes/Setting/Controller/FUSSettingViewController.m
......@@ -283,9 +283,11 @@
_liveRoomSettingGroup.groupHeaderText = FUSLocalizationHelper.localString(@"直播间设置");
if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
_liveRoomSettingGroup.items = @[_hiddinSettingItem, _minimizeItem];
// _liveRoomSettingGroup.items = @[_hiddinSettingItem, _minimizeItem];
_liveRoomSettingGroup.items = @[_minimizeItem];
}else{
_liveRoomSettingGroup.items = @[_micTakeDivideItem, _hiddinSettingItem, _minimizeItem];
// _liveRoomSettingGroup.items = @[_micTakeDivideItem, _hiddinSettingItem, _minimizeItem];
_liveRoomSettingGroup.items = @[_micTakeDivideItem, _minimizeItem];
}
......
FuSiLive/Classes/ZhaiXin/Official/Controller/FUSOfficialViewController.m
......@@ -112,10 +112,10 @@
FUSButton *backButton = [FUSButton buttonWithType:UIButtonTypeCustom];
backButton.frame = CGRectMake(0, 0, 44, 44);
UIImage *backImage = [UIImage imageNamed:[FUSRTL RTLImageName:@"common_navigation_back_white"]];
UIImage *backImage = [UIImage fus_backImage];
[backButton setImage:backImage forState:UIControlStateNormal];
[backButton addTarget:self action:@selector(onClickNavBackBtn) forControlEvents:UIControlEventTouchUpInside];
backButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
// backButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:backButton];
__weak typeof(self) weakSelf = self;
......
FuSiLive/Classes/ZhaiXin/Official/View/OfficialMsgCell/FUSOfficialImageTableViewCell.m
......@@ -35,6 +35,10 @@
self.selectionStyle = UITableViewCellSelectionStyleNone;
_officialBgView.layer.cornerRadius = 8;
self.officialBgView.backgroundColor = [UIColor fus_textInputBackgroundGrayColor];
self.titleLabel.textColor = [UIColor fus_textColorRich];
self.contentLabel.textColor = [UIColor fus_textColorMedium];
}
+ (CGFloat)getHeightWithModel:(FUSOfficialMessageModel *)dataModel
......
FuSiLive/Classes/ZhaiXin/Official/View/OfficialMsgCell/FUSOfficialMultiLineTableViewCell.m
......@@ -52,6 +52,12 @@
_officialBgView.layer.cornerRadius = 8;
_bottomClickableIdentifyLabel.adjustsFontSizeToFitWidth = YES;
_bottomClickableIdentifyLabel.textAlignment = NSTextAlignmentRight;
self.officialBgView.backgroundColor = [UIColor fus_textInputBackgroundGrayColor];
self.titleLabel.textColor = [UIColor fus_textColorRich];
self.contentLabel.textColor = [UIColor fus_textColorMedium];
self.bottomClickableIdentifyLabel.textColor = [UIColor fus_themeColor];
}
+ (CGFloat)getHeightWithModel:(FUSOfficialMessageModel *)dataModel
......
FuSiLive/Classes/ZhaiXin/Official/View/OfficialMsgCell/FUSOfficialSingleLineTableViewCell.m
......@@ -27,10 +27,12 @@
self.selectionStyle = UITableViewCellSelectionStyleNone;
self.officialBgView.backgroundColor = [UIColor fus_textInputBackgroundGrayColor];
_contentAttrLabel.font = [UIFont systemFontOfSize:16];
_contentAttrLabel.delegate = self;
_contentAttrLabel.lineSpacing = 3;
_contentAttrLabel.textColor = [UIColor whiteColor];
_contentAttrLabel.textColor = [UIColor fus_textColorRich];
_contentAttrLabel.linkColor = [UIColor colorWithHex:@"#03EE7D"];
if (FUSRTL.isRTL) {
_contentAttrLabel.textAlignment = kCTTextAlignmentRight;
......
FuSiLive/Classes/Zone/Controller/FUSReportViewController.m
......@@ -16,6 +16,7 @@
@interface FUSReportViewController () <FUSTextViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout, UITableViewDelegate, UITableViewDataSource>
@property (weak, nonatomic) IBOutlet UIView *textViewBgView;
@property (weak, nonatomic) IBOutlet FUSTextView *textView;
@property (weak, nonatomic) IBOutlet UICollectionView *collectionView;
......@@ -49,6 +50,9 @@
{
[super viewDidLoad];
self.textViewBgView.backgroundColor = [UIColor fus_textInputBackgroundGrayColor];
self.textView.textColor = [UIColor fus_textColorRich];
// 初始化UI
[self initView];
}
......
FuSiLive/Classes/Zone/Controller/FireFlyMyZone/FUSMyZoneViewController.m
......@@ -173,8 +173,8 @@
- (void)fus_initTableView {
__weak typeof(self) weakSelf = self;
self.tableView = [[FUSMyZoneTableView alloc] initWithFrame:self.scollView.bounds style:UITableViewStylePlain rootVC:self];
self.tableView.isMyZone = self.isMyZone;
self.tableView = [[FUSMyZoneTableView alloc] initWithFrame:self.scollView.bounds style:UITableViewStylePlain isMyZone:self.isMyZone rootVC:self];
// self.tableView.isMyZone = self.isMyZone;
self.tableView.clipsToBounds = NO;
// [self.scollView addSubview:self.bgImageView];
[self.scollView addSubview:self.tableView];
......
FuSiLive/Classes/Zone/Controller/FireFlyMyZone/FUSZoneUserInfoEditViewController.swift
......@@ -138,7 +138,7 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega
private func fus_initNav() {
self.navigationItem.title = FUSLocalizationHelper.localString("编辑资料")
let backImage = UIImage(named: FUSRTL.rtlImageName("common_navigation_back_white"))
let backImage = UIImage.fus_back()
let backBtn:FUSButton = FUSButton(frame: CGRect(x: 0, y: 0, width: 44, height: 44))
backBtn.setImage(backImage, for: UIControl.State.normal)
......@@ -653,13 +653,13 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega
@IBAction func touchDownBtnAction(_ sender: UIButton) {
UIView.animate(withDuration: 0.3) {
sender.superview?.backgroundColor = UIColor.init(hex: "1D1D24")
sender.superview?.backgroundColor = UIColor.fus_textInputBackgroundGray()
}
}
@IBAction func touchEndBtnAction(_ sender: UIButton) {
UIView.animate(withDuration: 0.3) {
sender.superview?.backgroundColor = UIColor.init(hex: "11121A")
sender.superview?.backgroundColor = UIColor.white
}
}
......@@ -809,7 +809,8 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega
if !NSString.isNull(self.userInfoModel?.addr) {
self.areaLabel.text = self.userInfoModel?.addr
self.areaLabel.textColor = UIColor.init(hex: "CCCCCC")
// self.areaLabel.textColor = UIColor.init(hex: "CCCCCC")
self.areaLabel.textColor = UIColor.fus_textColorMedium()
} else {
self.areaLabel.text = FUSLocalizationHelper.localString("位置未开启")
self.areaLabel.textColor = UIColor.init(hex: "#F65755")
......@@ -849,7 +850,8 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega
self.voiceSignLabel.text = FUSLocalizationHelper.localString("未录制")
self.voiceSignLabel.textColor = UIColor.init(hex: "#F65755")
} else {
self.voiceSignLabel.textColor = UIColor.init(hex: "CCCCCC")
// self.voiceSignLabel.textColor = UIColor.init(hex: "CCCCCC")
self.voiceSignLabel.textColor = UIColor.fus_textColorMedium()
let status = userInfo?.voiceChat["status"] as? NSNumber;
if status?.intValue == -1 {
......@@ -886,7 +888,8 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega
self.genderLabel.textColor = UIColor.init(hex: "4d4d4d")
} else {
self.genderTipLabel.text = FUSLocalizationHelper.localString("性别只能修改一次");
self.genderLabel.textColor = UIColor.init(hex: "cccccc")
// self.genderLabel.textColor = UIColor.init(hex: "cccccc")
self.genderLabel.textColor = UIColor.fus_textColorMedium()
}
let changedBirth:NSNumber? = infoChange?["changedBirth"] as? NSNumber
......@@ -895,7 +898,8 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega
self.birthdayLabel.textColor = UIColor.init(hex: "4d4d4d")
} else {
self.birthdayTipLabel.text = FUSLocalizationHelper.localString("生日只能修改一次")
self.birthdayLabel.textColor = UIColor.init(hex: "cccccc")
// self.birthdayLabel.textColor = UIColor.init(hex: "cccccc")
self.birthdayLabel.textColor = UIColor.fus_textColorMedium()
}
}, failure: { (msg:String?, code:Int32) in
......
FuSiLive/Classes/Zone/Controller/FireFlyMyZone/FUSZoneUserInfoEditViewController.xib
......@@ -2,13 +2,14 @@
<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="retina5_5" 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="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="FUSZoneUserInfoEditViewController" customModule="Firefly_Live" customModuleProvider="target">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="FUSZoneUserInfoEditViewController" customModule="FuSiLive" customModuleProvider="target">
<connections>
<outlet property="areaLabel" destination="Cwq-fl-Dfk" id="cuq-Fb-sdu"/>
<outlet property="areaLocalLabel" destination="Ynj-2n-4Fv" id="08L-49-mX4"/>
......@@ -74,7 +75,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="点击更换头像" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O3g-Iq-kXb">
<rect key="frame" x="171" y="93" width="72" height="17"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="12"/>
<color key="textColor" red="0.30196078430000001" green="0.30196078430000001" blue="0.30196078430000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OsW-5s-PhW">
......@@ -117,7 +118,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="语音签名" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y8v-OJ-5ii">
<rect key="frame" x="20" y="10" width="60" height="21"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="未录制" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ty4-iC-Iix">
......@@ -126,7 +127,7 @@
<constraint firstAttribute="height" constant="20" id="pAY-cI-7yb"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wOX-hs-kUn">
......@@ -166,7 +167,7 @@
<constraint firstAttribute="width" constant="30" id="hWy-Dd-6P2"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CTh-Qp-YUD">
......@@ -180,7 +181,7 @@
<constraints>
<constraint firstAttribute="height" constant="20" id="gZk-Fj-crB"/>
</constraints>
<color key="textColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<textInputTraits key="textInputTraits" returnKeyType="done"/>
</textField>
......@@ -208,7 +209,7 @@
<constraint firstAttribute="width" constant="30" id="tzn-Lp-hkb"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="女性" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5u7-XD-59n">
......@@ -217,7 +218,7 @@
<constraint firstAttribute="height" constant="20" id="Sb8-5u-VZG"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="V0E-4X-Z0u">
......@@ -267,7 +268,7 @@
<constraint firstAttribute="width" constant="30" id="V3W-cm-T2X"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="160cm" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ooM-d9-vcR">
......@@ -276,7 +277,7 @@
<constraint firstAttribute="height" constant="20" id="dkZ-n6-caT"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ESG-9B-Gcy">
......@@ -325,7 +326,7 @@
<constraint firstAttribute="width" constant="30" id="Exb-x5-jl4"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZSK-xN-TJl">
......@@ -334,7 +335,7 @@
<constraint firstAttribute="height" constant="20" id="tLG-Tj-87h"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="15G-yR-bgc">
......@@ -375,7 +376,7 @@
<constraint firstAttribute="width" constant="30" id="Wn1-Hi-8vl"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="50kg" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qcb-uW-pOH">
......@@ -384,7 +385,7 @@
<constraint firstAttribute="height" constant="20" id="jYC-h7-FfM"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Fia-eE-GJw">
......@@ -424,7 +425,7 @@
<constraint firstAttribute="width" constant="30" id="Qe1-6d-3cG"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="-" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="k64-jl-TM6" customClass="FUSTextField">
......@@ -432,7 +433,7 @@
<constraints>
<constraint firstAttribute="height" constant="20" id="AZg-y9-WtP"/>
</constraints>
<color key="textColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<textInputTraits key="textInputTraits" returnKeyType="done"/>
</textField>
......@@ -456,7 +457,7 @@
<constraint firstAttribute="width" constant="30" id="7UZ-sk-f1T"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tuv-U5-Cuk">
......@@ -465,7 +466,7 @@
<constraint firstAttribute="height" constant="20" id="53B-h2-NXz"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ED2-7r-SRc">
......@@ -505,7 +506,7 @@
<constraint firstAttribute="width" constant="30" id="Cyh-8a-sbm"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cwq-fl-Dfk">
......@@ -514,7 +515,7 @@
<constraint firstAttribute="height" constant="20" id="cGB-2L-m21"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0wE-TB-fkq">
......@@ -554,12 +555,12 @@
<constraint firstAttribute="width" constant="30" id="bKU-90-j2A"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" textAlignment="right" translatesAutoresizingMaskIntoConstraints="NO" id="c2s-hc-Jo3">
<rect key="frame" x="63" y="2" width="331" height="63"/>
<color key="textColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences" returnKeyType="done"/>
</textView>
......@@ -577,7 +578,7 @@
</view>
</subviews>
<viewLayoutGuide key="safeArea" id="4N2-pF-Wxm"/>
<color key="backgroundColor" red="0.066666666669999999" green="0.070588235289999995" blue="0.1019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="KgA-YH-o9n" secondAttribute="trailing" id="3QW-ve-PRM"/>
<constraint firstAttribute="trailing" secondItem="svU-wW-prw" secondAttribute="trailing" id="4Rt-iS-N8S"/>
......@@ -617,7 +618,7 @@
</view>
</subviews>
<viewLayoutGuide key="safeArea" id="huT-08-FDP"/>
<color key="backgroundColor" red="0.066666666666666666" green="0.070588235294117646" blue="0.10196078431372549" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="nEx-Wt-mea" firstAttribute="leading" secondItem="js2-qc-wKB" secondAttribute="leading" id="8dT-4y-yO7"/>
<constraint firstItem="nEx-Wt-mea" firstAttribute="top" secondItem="js2-qc-wKB" secondAttribute="top" id="AnK-RV-bXb"/>
......@@ -641,7 +642,7 @@
</objects>
<resources>
<image name="baofang_vchat_verified_img" width="41.666667938232422" height="13"/>
<image name="icon_head_default" width="160" height="160"/>
<image name="icon_head_default" width="562.5" height="562.5"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
......
FuSiLive/Classes/Zone/View/FireFlyView/View/FUSMyZoneTableView.h
......@@ -36,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
// 内容高度变化的回调
@property (nonatomic, copy) void(^tableContentHeightDidChangedHandler)(CGFloat height);
- (instancetype)initWithFrame:(CGRect)frame style:(UITableViewStyle)style rootVC:(UIViewController *)rootVC;
- (instancetype)initWithFrame:(CGRect)frame style:(UITableViewStyle)style isMyZone:(BOOL)isMyZone rootVC:(UIViewController *)rootVC;
/// tableView所有内容的总高度
- (CGFloat)fus_currentTabelViewHeight;
......
FuSiLive/Classes/Zone/View/FireFlyView/View/FUSMyZoneTableView.m
......@@ -37,7 +37,16 @@
@end
@implementation FUSMyZoneTableView
- (instancetype)initWithFrame:(CGRect)frame style:(UITableViewStyle)style isMyZone:(BOOL)isMyZone rootVC:(UIViewController *)rootVC{
self = [super initWithFrame:frame style:style];
if (self) {
_rootVC = rootVC;
_isMyZone = isMyZone;
[self fus_initUI];
[self fus_initCellManager];
}
return self;
}
- (instancetype)initWithFrame:(CGRect)frame style:(UITableViewStyle)style rootVC:(UIViewController *)rootVC {
self = [super initWithFrame:frame style:style];
if (self) {
......
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