Skip to content

pidan / FuSiLive

Go to a project
Commit 7ec59b90 by ludi
Options

修复一系列bug

parent 4a6e2900
Expand all
Inline Side-by-side
Showing with 61 additions and 26 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/FUSReportViewController.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>
......@@ -17,6 +18,7 @@
<outlet property="reportTipsOptionLb" destination="S9x-Di-m6Y" id="LCT-ky-5bz"/>
<outlet property="tableviewBgHeightConstraint" destination="V5D-pi-6Cf" id="Z1W-6n-9LP"/>
<outlet property="textView" destination="A2y-dJ-i9V" id="5my-iK-lwU"/>
<outlet property="textViewBgView" destination="nHG-Yn-O3P" id="qb9-Hp-Bqp"/>
<outlet property="uploadTipsLabel" destination="I6u-U0-WIE" id="Ao9-so-2g6"/>
<outlet property="view" destination="dW9-Lw-S20" id="1cx-oV-Nyc"/>
</connections>
......
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/View/FUSReportOptionTableViewCell.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" 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="17125"/>
<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>
......@@ -31,7 +31,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pf1-qg-p4p">
<rect key="frame" x="43" y="11.5" width="42" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
</subviews>
......
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