Skip to content

pidan / FuSiLive

Go to a project
Commit 5555176a by ludi
Options

修复bug

parent f04f76ea
Inline Side-by-side
Showing with 165 additions and 54 deletions
FuSiLive/Assets.xcassets/Live/StartPage/live_start_share_twitter.imageset/Contents.json
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "live_start_share_twitter@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
FuSiLive/Assets.xcassets/Live/StartPage/live_start_share_twitter_selected.imageset/Contents.json
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "live_start_share_twitter_selected@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
FuSiLive/Assets.xcassets/Setting/setting_network.imageset/Contents.json
...@@ -5,12 +5,11 @@ ...@@ -5,12 +5,11 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "setting_network@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "setting_network@3x.png", "filename" : "20240717-190320.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
FuSiLive/Classes/Common/View/FUSShareBarcodeView.m
...@@ -31,10 +31,12 @@ ...@@ -31,10 +31,12 @@
self = [[[NSBundle mainBundle] loadNibNamed:NSStringFromClass([self class]) owner:nil options:nil] firstObject]; self = [[[NSBundle mainBundle] loadNibNamed:NSStringFromClass([self class]) owner:nil options:nil] firstObject];
self.frame = frame; self.frame = frame;
// _bgView.layer.cornerRadius = 14; _bgView.layer.cornerRadius = 14;
// _bgView.layer.masksToBounds = YES; _bgView.layer.masksToBounds = YES;
_bgView.backgroundColor = [UIColor fus_appBGColor];
_titleLabel.text = [NSString fus_localString:@"保存二维码图片分享获奖励"]; _titleLabel.text = [NSString fus_localString:@"保存二维码图片分享获奖励"];
_titleLabel.textColor = [UIColor fus_textColorRich];
[_titleLabel sizeToFitScreen]; [_titleLabel sizeToFitScreen];
[_titleLabel sizeToFit]; [_titleLabel sizeToFit];
......
FuSiLive/Classes/Common/View/FUSShareBarcodeView.xib
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<device id="retina4_7" orientation="portrait" appearance="light"/> <device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="do8-6i-uTE"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="do8-6i-uTE">
<rect key="frame" x="49" y="74" width="277.5" height="502"/> <rect key="frame" x="49" y="74" width="277.5" height="502"/>
<subviews> <subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="common_shareview_barcode_bg.png" translatesAutoresizingMaskIntoConstraints="NO" id="Q0L-XX-ONn"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Q0L-XX-ONn">
<rect key="frame" x="-15" y="-10" width="307.5" height="522"/> <rect key="frame" x="-15" y="-10" width="307.5" height="522"/>
</imageView> </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="保存二维码图片分享获取奖励" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t5w-Zx-jyO"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="保存二维码图片分享获取奖励" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t5w-Zx-jyO">
...@@ -99,6 +99,5 @@ ...@@ -99,6 +99,5 @@
</objects> </objects>
<resources> <resources>
<image name="common_bind_agent_tips_bgView_close" width="26" height="26"/> <image name="common_bind_agent_tips_bgView_close" width="26" height="26"/>
<image name="common_shareview_barcode_bg.png" width="659" height="1074"/>
</resources> </resources>
</document> </document>
FuSiLive/Classes/Common/View/FUSWebShareView.m
...@@ -261,6 +261,7 @@ ...@@ -261,6 +261,7 @@
*/ */
- (void)setupUI - (void)setupUI
{ {
self.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.3];
if (_from == FUSFromInvitShare) { if (_from == FUSFromInvitShare) {
self.btnArr = @[@(FacebookPlatform), @(TwitterPlatform), /*@(WechatFriendPlatform), @(WechatCirclePaltform),*/ @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink),@(BarcodePhotoPlatform)]; self.btnArr = @[@(FacebookPlatform), @(TwitterPlatform), /*@(WechatFriendPlatform), @(WechatCirclePaltform),*/ @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink),@(BarcodePhotoPlatform)];
} else { } else {
......
FuSiLive/Classes/Common/View/FUSWebShareView.xib
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" 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="retina5_9" orientation="portrait"> <device id="retina5_9" orientation="portrait" appearance="light"/>
<adaptation id="fullscreen"/>
</device>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<objects> <objects>
...@@ -20,15 +18,16 @@ ...@@ -20,15 +18,16 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BtL-02-hAn"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BtL-02-hAn">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<connections> <connections>
<action selector="onTapBackground:" destination="-1" eventType="touchUpInside" id="DG2-sm-iGw"/> <action selector="onTapBackground:" destination="-1" eventType="touchUpInside" id="DG2-sm-iGw"/>
</connections> </connections>
</button> </button>
<view alpha="0.95999999999999996" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a8x-c5-c7k"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a8x-c5-c7k">
<rect key="frame" x="0.0" y="532" width="375" height="135"/> <rect key="frame" x="0.0" y="532" width="375" height="135"/>
<color key="backgroundColor" white="0.0" alpha="0.79786494006849307" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="135" id="jzs-IN-ZWd"/> <constraint firstAttribute="height" constant="135" id="jzs-IN-ZWd"/>
</constraints> </constraints>
......
FuSiLive/Classes/FusiVersionFeature/Others/FUSControllerPushHelper.m
...@@ -67,10 +67,14 @@ ...@@ -67,10 +67,14 @@
webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID]; webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID];
vc = webVC; vc = webVC;
webVC.closeWebViewHandler = ^(NSInteger cidType) {
// 更新未读 // 更新未读
[FUSSingleChatDBOperate fus_updateReadStatusToSingleChatTableWithFid:serviceUID]; [UINavigationController fus_updateWebServicesReadStatus:serviceUID];
[FUSZhaiXinDBOperate fus_updateUnreadToZhaiXinInfosTableWithTypeId:[NSString stringWithFormat:@"%@%@",SINGLE_CHAT, serviceUID] unread:0]; };
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage]; webVC.onClickBackHandle = ^{
// 更新未读
[UINavigationController fus_updateWebServicesReadStatus:serviceUID];
};
} }
}else if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 2) { }else if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 2) {
...@@ -79,10 +83,14 @@ ...@@ -79,10 +83,14 @@
webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID]; webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID];
vc = webVC; vc = webVC;
webVC.closeWebViewHandler = ^(NSInteger cidType) {
// 更新未读 // 更新未读
[FUSSingleChatDBOperate fus_updateReadStatusToSingleChatTableWithFid:serviceUID]; [UINavigationController fus_updateWebServicesReadStatus:serviceUID];
[FUSZhaiXinDBOperate fus_updateUnreadToZhaiXinInfosTableWithTypeId:[NSString stringWithFormat:@"%@%@",SINGLE_CHAT, serviceUID] unread:0]; };
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage]; webVC.onClickBackHandle = ^{
// 更新未读
[UINavigationController fus_updateWebServicesReadStatus:serviceUID];
};
} }
NSArray *viewControllers = self.viewControllers; NSArray *viewControllers = self.viewControllers;
UIViewController *viewVC = [viewControllers lastObject]; UIViewController *viewVC = [viewControllers lastObject];
...@@ -93,6 +101,13 @@ ...@@ -93,6 +101,13 @@
return vc; return vc;
} }
/// 更新客服未读
+(void)fus_updateWebServicesReadStatus:(NSString *)serviceUID{
[FUSSingleChatDBOperate fus_updateReadStatusToSingleChatTableWithFid:serviceUID];
[FUSZhaiXinDBOperate fus_updateUnreadToZhaiXinInfosTableWithTypeId:[NSString stringWithFormat:@"%@%@",SINGLE_CHAT, serviceUID] unread:0];
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
}
- (void)fus_pushToBuyVIPControllerWithAnimate:(BOOL)animate{ - (void)fus_pushToBuyVIPControllerWithAnimate:(BOOL)animate{
[self pushViewController:[FUSControllerPushHelper fus_getBuyVIPController] animated:animate]; [self pushViewController:[FUSControllerPushHelper fus_getBuyVIPController] animated:animate];
} }
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyHeaderView.m
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
[topBgView mas_makeConstraints:^(MASConstraintMaker *make) { [topBgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.mas_safeAreaLayoutGuideTop); make.top.equalTo(self.mas_safeAreaLayoutGuideTop);
make.left.right.offset(0); make.left.right.offset(0);
make.height.offset(305); make.height.offset(295);
}]; }];
self.avatorBtn = [UIButton buttonWithType:UIButtonTypeCustom]; self.avatorBtn = [UIButton buttonWithType:UIButtonTypeCustom];
...@@ -120,8 +120,8 @@ ...@@ -120,8 +120,8 @@
UIButton *copyBgBtn = [UIButton buttonWithType:UIButtonTypeCustom]; UIButton *copyBgBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[topBgView addSubview:copyBgBtn]; [topBgView addSubview:copyBgBtn];
[copyBgBtn mas_makeConstraints:^(MASConstraintMaker *make) { [copyBgBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(nickNameBgView.mas_bottom).offset(0); make.top.equalTo(nickNameBgView.mas_bottom).offset(-4);
make.height.offset(34); make.height.offset(28);
make.centerX.equalTo(topBgView.mas_centerX); make.centerX.equalTo(topBgView.mas_centerX);
}]; }];
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
self.idLabel.textColor = [UIColor fus_textColorMedium]; self.idLabel.textColor = [UIColor fus_textColorMedium];
[copyBgBtn addSubview:self.idLabel]; [copyBgBtn addSubview:self.idLabel];
[self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(copyBgBtn.mas_left).offset(10); make.left.equalTo(copyBgBtn.mas_left).offset(0);
make.centerY.equalTo(copyBgBtn.mas_centerY); make.centerY.equalTo(copyBgBtn.mas_centerY);
}]; }];
...@@ -352,7 +352,7 @@ ...@@ -352,7 +352,7 @@
#pragma mark --- getter and setter #pragma mark --- getter and setter
+ (CGFloat)fus_viewHeight{ + (CGFloat)fus_viewHeight{
return 360 + UIView.fus_SafeTop; return 350 + UIView.fus_SafeTop;
} }
- (UILabel *)intimacyNumLabel{ - (UILabel *)intimacyNumLabel{
......
FuSiLive/Classes/Login/Controller/FUSLoginPhoneViewController.m
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#import "FUSLoginHttpHelper.h" #import "FUSLoginHttpHelper.h"
#import "FUSDataStatisticsManager.h" #import "FUSDataStatisticsManager.h"
#import <SJAttributesFactory/SJAttributesFactory.h>
@interface FUSLoginPhoneViewController () <UITextFieldDelegate, FUSTextFieldDelegate> @interface FUSLoginPhoneViewController () <UITextFieldDelegate, FUSTextFieldDelegate>
...@@ -169,7 +170,10 @@ ...@@ -169,7 +170,10 @@
// 设置导航栏 // 设置导航栏
self.titleLabel.text = [NSString fus_localString:@"手机号登录/注册"]; self.titleLabel.text = [NSString fus_localString:@"手机号登录/注册"];
_phoneTextField.placeholder = [NSString fus_localString:@"请输入手机号"]; // _phoneTextField.placeholder = [NSString fus_localString:@"请输入手机号"];
_phoneTextField.attributedPlaceholder = [NSAttributedString sj_UIKitText:^(id<SJUIKitTextMakerProtocol> _Nonnull make) {
make.append([NSString fus_localString:@"请输入手机号"]).textColor([UIColor fus_textColorMedium]);
}];
[_loginButton setTitle:[NSString fus_localString:@"下一步"] forState:UIControlStateNormal]; [_loginButton setTitle:[NSString fus_localString:@"下一步"] forState:UIControlStateNormal];
self.countryOrAreaLabel.text = [NSString fus_localString:@"国家/地区"]; self.countryOrAreaLabel.text = [NSString fus_localString:@"国家/地区"];
......
FuSiLive/Classes/Login/Controller/FUSLoginViewController.m
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#import "FUSHistoryLoginStore.h" #import "FUSHistoryLoginStore.h"
#import "FUSStyleButton.h" #import "FUSStyleButton.h"
#import "FUSMainViewControllerHelper.h" #import "FUSMainViewControllerHelper.h"
#import <SJAttributesFactory/SJAttributesFactory.h>
@interface FUSLoginViewController () <UITextFieldDelegate, FUSTextFieldDelegate> @interface FUSLoginViewController () <UITextFieldDelegate, FUSTextFieldDelegate>
...@@ -212,8 +213,14 @@ ...@@ -212,8 +213,14 @@
// 设置导航栏 // 设置导航栏
self.titleLabel.text = [NSString fus_localString:@"登录"]; self.titleLabel.text = [NSString fus_localString:@"登录"];
_phoneTextField.placeholder = [NSString fus_localString:@"请输入手机号"]; // _phoneTextField.placeholder = [NSString fus_localString:@"请输入手机号"];
_passwordTextField.placeholder = [NSString fus_localString:@"请输入密码"]; _phoneTextField.attributedPlaceholder = [NSAttributedString sj_UIKitText:^(id<SJUIKitTextMakerProtocol> _Nonnull make) {
make.append([NSString fus_localString:@"请输入手机号"]).textColor([UIColor fus_textColorMedium]);
}];
// _passwordTextField.placeholder = [NSString fus_localString:@"请输入密码"];
_passwordTextField.attributedPlaceholder = [NSAttributedString sj_UIKitText:^(id<SJUIKitTextMakerProtocol> _Nonnull make) {
make.append([NSString fus_localString:@"请输入密码"]).textColor([UIColor fus_textColorMedium]);
}];
[_loginButton setTitle:[NSString fus_localString:@"登录"] forState:UIControlStateNormal]; [_loginButton setTitle:[NSString fus_localString:@"登录"] forState:UIControlStateNormal];
[_forgetPwdBtn setAttributedTitle:[[NSAttributedString alloc] initWithString:[NSString fus_localString:@"忘记密码"] attributes:@{NSUnderlineStyleAttributeName:[NSNumber numberWithInteger:NSUnderlineStyleSingle]}] forState:UIControlStateNormal]; [_forgetPwdBtn setAttributedTitle:[[NSAttributedString alloc] initWithString:[NSString fus_localString:@"忘记密码"] attributes:@{NSUnderlineStyleAttributeName:[NSNumber numberWithInteger:NSUnderlineStyleSingle]}] forState:UIControlStateNormal];
......
FuSiLive/Classes/Login/Controller/FUSMessageRegisterViewController.m
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#import "FUSRegistPromptView.h" #import "FUSRegistPromptView.h"
#import <FirebaseAnalytics/FirebaseAnalytics.h> #import <FirebaseAnalytics/FirebaseAnalytics.h>
#import <SJAttributesFactory/SJAttributesFactory.h>
@interface FUSMessageRegisterViewController () <UITextFieldDelegate, UITextFieldDelegate, FUSTextFieldDelegate> @interface FUSMessageRegisterViewController () <UITextFieldDelegate, UITextFieldDelegate, FUSTextFieldDelegate>
...@@ -320,13 +321,22 @@ ...@@ -320,13 +321,22 @@
[self fus_enableNavigationBackWithPopFunction:popViewController withAnimated:YES]; [self fus_enableNavigationBackWithPopFunction:popViewController withAnimated:YES];
[self.checkAgeBtn setTitle:[NSString fus_localString:@"我已满18周岁"] forState:UIControlStateNormal]; [self.checkAgeBtn setTitle:[NSString fus_localString:@"我已满18周岁"] forState:UIControlStateNormal];
_phoneTextField.placeholder = [NSString fus_localString:@"手机号码"]; // _phoneTextField.placeholder = [NSString fus_localString:@"手机号码"];
_phoneTextField.attributedPlaceholder = [NSAttributedString sj_UIKitText:^(id<SJUIKitTextMakerProtocol> _Nonnull make) {
make.append( [NSString fus_localString:@"手机号码"]).textColor([UIColor fus_textColorMedium]);
}];
[_protocolBtn setAttributedTitle:[[NSAttributedString alloc] initWithString:[NSString fus_localString:@"使用协议"] attributes:@{NSUnderlineStyleAttributeName:[NSNumber numberWithInteger:NSUnderlineStyleSingle]}] forState:UIControlStateNormal]; [_protocolBtn setAttributedTitle:[[NSAttributedString alloc] initWithString:[NSString fus_localString:@"使用协议"] attributes:@{NSUnderlineStyleAttributeName:[NSNumber numberWithInteger:NSUnderlineStyleSingle]}] forState:UIControlStateNormal];
_countryOrAreaLabel.text = [NSString fus_localString:@"国家/地区"]; _countryOrAreaLabel.text = [NSString fus_localString:@"国家/地区"];
_codeTextField.placeholder = [NSString fus_localString:@"请输入验证码"]; // _codeTextField.placeholder = [NSString fus_localString:@"请输入验证码"];
_passwordTextField.placeholder = [NSString fus_localString:@"请设置6-16位登入密码"]; _codeTextField.attributedPlaceholder = [NSAttributedString sj_UIKitText:^(id<SJUIKitTextMakerProtocol> _Nonnull make) {
make.append([NSString fus_localString:@"请输入验证码"]).textColor([UIColor fus_textColorMedium]);
}];
// _passwordTextField.placeholder = [NSString fus_localString:@"请设置6-16位登入密码"];
_passwordTextField.attributedPlaceholder = [NSAttributedString sj_UIKitText:^(id<SJUIKitTextMakerProtocol> _Nonnull make) {
make.append([NSString fus_localString:@"请设置6-16位登入密码"]).textColor([UIColor fus_textColorMedium]);
}];
[_nextStepBtn setTitle:[NSString fus_localString:@"注册"] forState:UIControlStateNormal]; [_nextStepBtn setTitle:[NSString fus_localString:@"注册"] forState:UIControlStateNormal];
NSMutableAttributedString *atrrStr = [[NSMutableAttributedString alloc] initWithString:[NSString fus_localString:@"已有账号，立即登入>"]]; NSMutableAttributedString *atrrStr = [[NSMutableAttributedString alloc] initWithString:[NSString fus_localString:@"已有账号，立即登入>"]];
......
FuSiLive/Classes/NewsFeed/Controller/FUSNewsFeedDetailViewController.m
...@@ -256,8 +256,10 @@ ...@@ -256,8 +256,10 @@
if (!self.commentList.count && self.messageCommentModel == nil) { if (!self.commentList.count && self.messageCommentModel == nil) {
self.emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH / 2.0f)]; self.emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH / 2.0f)];
self.emptyView.type = FUSEmptyViewTypeBG; self.emptyView.type = FUSEmptyViewTypeImage;
[self.emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"com_icon_hot_no_data_empty"] title:[NSString fus_localString:@"暂无回复"] buttonTittle:nil]; [self.emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"com_icon_hot_no_data_empty"] title:[NSString fus_localString:@"暂无回复"] buttonTittle:nil];
self.emptyView.imageScale = 0.3;
self.emptyView.contentVerticalOffset = -20;
self.tableView.tableFooterView = self.emptyView; self.tableView.tableFooterView = self.emptyView;
[self.tableView reloadData]; [self.tableView reloadData];
self.headerView.lineView.hidden = YES; self.headerView.lineView.hidden = YES;
......
FuSiLive/Classes/ZhaiXin/Official/View/OfficialMsgCell/FUSOfficialTimeTableViewCell.xib
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<button opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qZb-ac-d5a"> <button opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qZb-ac-d5a">
<rect key="frame" x="111" y="10" width="98" height="24"/> <rect key="frame" x="104.5" y="9" width="111" height="26"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="11"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<inset key="contentEdgeInsets" minX="10" minY="5" maxX="10" maxY="5"/> <inset key="contentEdgeInsets" minX="10" minY="5" maxX="10" maxY="5"/>
<state key="normal" title="4月03日 15:44"> <state key="normal" title="4月03日 15:44">
<color key="titleColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="titleColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
FuSiLive/Classes/Zone/View/FireFlyView/View/FUSZoneCanSendNewsFeedTipView.m
...@@ -111,6 +111,7 @@ ...@@ -111,6 +111,7 @@
self.tipLabel.text = [NSString fus_localString:@"发帖文"]; self.tipLabel.text = [NSString fus_localString:@"发帖文"];
self.tipLabel.textColor = [UIColor fus_textColorRich]; self.tipLabel.textColor = [UIColor fus_textColorRich];
self.tipLabel.font = [UIFont fus_themeBoldFont:14];
self.tipBGImageView.image = [UIImage imageNamed:[FUSRTL RTLImageName:@"zone_pop_tip_bg"]]; self.tipBGImageView.image = [UIImage imageNamed:[FUSRTL RTLImageName:@"zone_pop_tip_bg"]];
} }
......
FuSiLive/Resources/LocalizationString/Fusi_Arbic.strings
"私房信用：" = "رصيد الاتصال:";
"朋友圈" = "Momento"; "朋友圈" = "Momento";
"%@倍大奖" = "%@ times"; "%@倍大奖" = "%@ times";
...@@ -56,7 +58,7 @@ ...@@ -56,7 +58,7 @@
"切换后，仅追踪主播超过24小时的粉丝可进入房间，直播时长不计入直播奖励活动" = "After switching，only fans who followed the broadcaster 24hrs ago can enter the room and the broadcasting time won't be included in the Broadcaster Award Activity"; "切换后，仅追踪主播超过24小时的粉丝可进入房间，直播时长不计入直播奖励活动" = "After switching，only fans who followed the broadcaster 24hrs ago can enter the room and the broadcasting time won't be included in the Broadcaster Award Activity";
"查看详情" = "التفاصيل"; "查看详情" = "تفاصيل";
"请输入内容" = "الرجاء إدخال المحتوى"; "请输入内容" = "الرجاء إدخال المحتوى";
...@@ -510,7 +512,7 @@ ...@@ -510,7 +512,7 @@
"请先同意使用协议" = "يرجى اتفاق اتفاقية الاستخدام أولا"; "请先同意使用协议" = "يرجى اتفاق اتفاقية الاستخدام أولا";
"收获萤火" = "تم استلامFIREs"; "收获萤火" = "\u200f الحصول على FIREs\u200f";
"赶快上传你的第一个视频" = "حمّل فيديوك الأول"; "赶快上传你的第一个视频" = "حمّل فيديوك الأول";
...@@ -2158,3 +2160,11 @@ ...@@ -2158,3 +2160,11 @@
"发送验证码" = "يرسل"; "发送验证码" = "يرسل";
"私房信用" = "الائتمان الخاص";
"点赞将消耗%@，是否继续点赞" = "الإعجاب سوف يستهلك %@، هل أنت متأكد من إعجابك؟";
"人气榜" = "قائمة الشعبية";
"私房评分" = "تصنيف المكالمة";
FuSiLive/Resources/LocalizationString/Fusi_Chinese.strings
"私房信用：" = "私房信用：";
"朋友圈" = "朋友圈"; "朋友圈" = "朋友圈";
"%@倍大奖" = "%@倍大獎"; "%@倍大奖" = "%@倍大獎";
...@@ -428,7 +430,7 @@ ...@@ -428,7 +430,7 @@
"是否结束通话" = "是否結束通話"; "是否结束通话" = "是否結束通話";
"恭喜您和%@(ID:%@)绑定成功" = "恭喜您和%@ID:%@)绑定成功"; "恭喜您和%@(ID:%@)绑定成功" = "恭喜您和%@(ID:%@)绑定成功";
"结束PK失败" = "結束PK失敗"; "结束PK失败" = "結束PK失敗";
...@@ -522,7 +524,7 @@ ...@@ -522,7 +524,7 @@
"请先同意使用协议" = "請先同意使用協議"; "请先同意使用协议" = "請先同意使用協議";
"收获萤火" = "收获萤火"; "收获萤火" = "收穫螢火";
"赶快上传你的第一个视频" = "趕快上傳你的第一個視頻"; "赶快上传你的第一个视频" = "趕快上傳你的第一個視頻";
...@@ -2197,3 +2199,6 @@ ...@@ -2197,3 +2199,6 @@
"点赞将消耗%@，是否继续点赞" = "點讚將消耗%@，是否繼續點讚"; "点赞将消耗%@，是否继续点赞" = "點讚將消耗%@，是否繼續點讚";
"人气榜" = "人氣榜"; "人气榜" = "人氣榜";
"私房评分" = "私房評分";
FuSiLive/Resources/LocalizationString/Fusi_Chinese_Traditional.strings
"私房信用：" = "私房信用：";
"朋友圈" = "朋友圈"; "朋友圈" = "朋友圈";
"%@倍大奖" = "%@倍大獎"; "%@倍大奖" = "%@倍大獎";
...@@ -428,7 +430,7 @@ ...@@ -428,7 +430,7 @@
"是否结束通话" = "是否結束通話"; "是否结束通话" = "是否結束通話";
"恭喜您和%@(ID:%@)绑定成功" = "恭喜您和%@ID:%@)绑定成功"; "恭喜您和%@(ID:%@)绑定成功" = "恭喜您和%@(ID:%@)绑定成功";
"结束PK失败" = "結束PK失敗"; "结束PK失败" = "結束PK失敗";
...@@ -522,7 +524,7 @@ ...@@ -522,7 +524,7 @@
"请先同意使用协议" = "請先同意使用協議"; "请先同意使用协议" = "請先同意使用協議";
"收获萤火" = "收获萤火"; "收获萤火" = "收穫螢火";
"赶快上传你的第一个视频" = "趕快上傳你的第一個視頻"; "赶快上传你的第一个视频" = "趕快上傳你的第一個視頻";
...@@ -2192,4 +2194,11 @@ ...@@ -2192,4 +2194,11 @@
"发送验证码" = "獲取驗證碼"; "发送验证码" = "獲取驗證碼";
"私房信用：" = "私房信用："; "私房信用" = "私房信用";
"点赞将消耗%@，是否继续点赞" = "點讚將消耗%@，是否繼續點讚";
"人气榜" = "人氣榜";
"私房评分" = "私房評分";
FuSiLive/Resources/LocalizationString/Fusi_English.strings
"私房信用：" = "Call Credit:";
"朋友圈" = "moment"; "朋友圈" = "moment";
"%@倍大奖" = "%@ times"; "%@倍大奖" = "%@ times";
...@@ -58,7 +60,7 @@ ...@@ -58,7 +60,7 @@
"切换后，仅追踪主播超过24小时的粉丝可进入房间，直播时长不计入直播奖励活动" = "After switching，only fans who followed the broadcaster 24hrs ago can enter the room and the broadcasting time won't be included in the Broadcaster Award Activity"; "切换后，仅追踪主播超过24小时的粉丝可进入房间，直播时长不计入直播奖励活动" = "After switching，only fans who followed the broadcaster 24hrs ago can enter the room and the broadcasting time won't be included in the Broadcaster Award Activity";
"查看详情" = "Check details"; "查看详情" = "Details";
"请输入内容" = "Please fill in contents"; "请输入内容" = "Please fill in contents";
...@@ -522,7 +524,7 @@ ...@@ -522,7 +524,7 @@
"请先同意使用协议" = "Please agree to the agreement first"; "请先同意使用协议" = "Please agree to the agreement first";
"收获萤火" = "Received FIREs"; "收获萤火" = "New FIREs";
"赶快上传你的第一个视频" = "Upload your first video"; "赶快上传你的第一个视频" = "Upload your first video";
...@@ -2192,3 +2194,11 @@ ...@@ -2192,3 +2194,11 @@
"发送验证码" = "Send"; "发送验证码" = "Send";
"私房信用" = "Private credit";
"点赞将消耗%@，是否继续点赞" = "A Like will consume %@, sure to like?";
"人气榜" = "Popularity List";
"私房评分" = "Call rating";
FuSiLive/Resources/LocalizationString/Fusi_Indonesian.strings
"私房信用：" = "Pulsa Panggilan:";
"朋友圈" = "Momento"; "朋友圈" = "Momento";
"%@倍大奖" = "%@ times"; "%@倍大奖" = "%@ times";
...@@ -58,7 +60,7 @@ ...@@ -58,7 +60,7 @@
"切换后，仅追踪主播超过24小时的粉丝可进入房间，直播时长不计入直播奖励活动" = "After switching，only fans who followed the broadcaster 24hrs ago can enter the room and the broadcasting time won't be included in the Broadcaster Award Activity"; "切换后，仅追踪主播超过24小时的粉丝可进入房间，直播时长不计入直播奖励活动" = "After switching，only fans who followed the broadcaster 24hrs ago can enter the room and the broadcasting time won't be included in the Broadcaster Award Activity";
"查看详情" = "Lihat detail"; "查看详情" = "Detail";
"所有人可进入房间" = "All the people can enter the room"; "所有人可进入房间" = "All the people can enter the room";
...@@ -518,7 +520,7 @@ ...@@ -518,7 +520,7 @@
"请先同意使用协议" = "Harap setujui perjanjian terlebih dahulu"; "请先同意使用协议" = "Harap setujui perjanjian terlebih dahulu";
"收获萤火" = "Menerima FIREs"; "收获萤火" = "FIREs Baru";
"赶快上传你的第一个视频" = "Unggah video pertama Anda"; "赶快上传你的第一个视频" = "Unggah video pertama Anda";
...@@ -2166,3 +2168,11 @@ ...@@ -2166,3 +2168,11 @@
"发送验证码" = "Mengirim"; "发送验证码" = "Mengirim";
"私房信用" = "Kredit swasta";
"点赞将消耗%@，是否继续点赞" = "Suka akan memakan %@, pasti suka?";
"人气榜" = "Daftar popularitas";
"私房评分" = "Peringkat panggilan";
FuSiLive/Resources/LocalizationString/Fusi_Japanese.strings
"私房信用：" = "通話クレジット:";
"朋友圈" = "Momento"; "朋友圈" = "Momento";
"%@倍大奖" = "%@ times"; "%@倍大奖" = "%@ times";
...@@ -58,7 +60,7 @@ ...@@ -58,7 +60,7 @@
"切换后，仅追踪主播超过24小时的粉丝可进入房间，直播时长不计入直播奖励活动" = "After switching，only fans who followed the broadcaster 24hrs ago can enter the room and the broadcasting time won't be included in the Broadcaster Award Activity"; "切换后，仅追踪主播超过24小时的粉丝可进入房间，直播时长不计入直播奖励活动" = "After switching，only fans who followed the broadcaster 24hrs ago can enter the room and the broadcasting time won't be included in the Broadcaster Award Activity";
"查看详情" = "詳細を確認する"; "查看详情" = "詳細";
"所有人可进入房间" = "All the people can enter the room"; "所有人可进入房间" = "All the people can enter the room";
...@@ -520,7 +522,7 @@ ...@@ -520,7 +522,7 @@
"请先同意使用协议" = "まず契約に同意してください"; "请先同意使用协议" = "まず契約に同意してください";
"收获萤火" = "FIREs を受け取りました"; "收获萤火" = "新規FIREs";
"赶快上传你的第一个视频" = "最初の動画をアップロードする"; "赶快上传你的第一个视频" = "最初の動画をアップロードする";
...@@ -2170,3 +2172,11 @@ ...@@ -2170,3 +2172,11 @@
"发送验证码" = "送信"; "发送验证码" = "送信";
"私房信用" = "プライベートクレジット";
"点赞将消耗%@，是否继续点赞" = "いいねすると %@ が消費されます。いいねしますか?";
"人气榜" = "人気ランキング";
"私房评分" = "通話評価";
FuSiLive/Resources/LocalizationString/Fusi_Thai.strings
"私房信用：" = "เครดิตการโทร:";
"朋友圈" = "Momento"; "朋友圈" = "Momento";
"%@倍大奖" = "%@ times"; "%@倍大奖" = "%@ times";
...@@ -58,7 +60,7 @@ ...@@ -58,7 +60,7 @@
"切换后，仅追踪主播超过24小时的粉丝可进入房间，直播时长不计入直播奖励活动" = "After switching，only fans who followed the broadcaster 24hrs ago can enter the room and the broadcasting time won't be included in the Broadcaster Award Activity"; "切换后，仅追踪主播超过24小时的粉丝可进入房间，直播时长不计入直播奖励活动" = "After switching，only fans who followed the broadcaster 24hrs ago can enter the room and the broadcasting time won't be included in the Broadcaster Award Activity";
"查看详情" = "ตรวจสอบรายละเอียด"; "查看详情" = "รายละเอียด";
"所有人可进入房间" = "All the people can enter the room"; "所有人可进入房间" = "All the people can enter the room";
...@@ -518,7 +520,7 @@ ...@@ -518,7 +520,7 @@
"请先同意使用协议" = "โปรดยอมรับข้อตกลงเป็นอันดับแรก"; "请先同意使用协议" = "โปรดยอมรับข้อตกลงเป็นอันดับแรก";
"收获萤火" = "ได้รับ FIREs"; "收获萤火" = "FIREs ใหม่";
"赶快上传你的第一个视频" = "อัปโหลดวิดีโอแรกของคุณ"; "赶快上传你的第一个视频" = "อัปโหลดวิดีโอแรกของคุณ";
...@@ -2166,3 +2168,11 @@ ...@@ -2166,3 +2168,11 @@
"发送验证码" = "ส่ง"; "发送验证码" = "ส่ง";
"私房信用" = "เครดิตส่วนตัว";
"点赞将消耗%@，是否继续点赞" = "การกดไลค์จะใช้ %@ แน่ใจว่าจะชอบใช่ไหม?";
"人气榜" = "รายการความนิยม";
"私房评分" = "คะแนนการโทร";
FuSiLive/Resources/LocalizationString/Fusi_vietnamese.strings
"私房信用：" = "Tín dụng cuộc gọi:";
"朋友圈" = "Momento"; "朋友圈" = "Momento";
"%@倍大奖" = "%@ lần"; "%@倍大奖" = "%@ lần";
...@@ -58,7 +60,7 @@ ...@@ -58,7 +60,7 @@
"切换后，仅追踪主播超过24小时的粉丝可进入房间，直播时长不计入直播奖励活动" = "After switching，only fans who followed the broadcaster 24hrs ago can enter the room and the broadcasting time won't be included in the Broadcaster Award Activity"; "切换后，仅追踪主播超过24小时的粉丝可进入房间，直播时长不计入直播奖励活动" = "After switching，only fans who followed the broadcaster 24hrs ago can enter the room and the broadcasting time won't be included in the Broadcaster Award Activity";
"查看详情" = "Kiểm tra chi tiết"; "查看详情" = "Chi tiết";
"所有人可进入房间" = "All the people can enter the room"; "所有人可进入房间" = "All the people can enter the room";
...@@ -520,7 +522,7 @@ ...@@ -520,7 +522,7 @@
"请先同意使用协议" = "Vui lòng đồng ý với thỏa thuận này trước"; "请先同意使用协议" = "Vui lòng đồng ý với thỏa thuận này trước";
"收获萤火" = "Đã nhận được FIREs"; "收获萤火" = "FIREs Mới";
"赶快上传你的第一个视频" = "Trước tiên hãy tải lên video của bạn"; "赶快上传你的第一个视频" = "Trước tiên hãy tải lên video của bạn";
...@@ -2170,3 +2172,11 @@ ...@@ -2170,3 +2172,11 @@
"发送验证码" = "Gửi"; "发送验证码" = "Gửi";
"私房信用" = "Tín dụng tư nhân";
"点赞将消耗%@，是否继续点赞" = "Một lượt thích sẽ tiêu tốn %@, chắc chắn thích?";
"人气榜" = "Danh sách phổ biến";
"私房评分" = "Đánh giá cuộc gọi";
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