Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
pidan
/
FuSiLive
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
fb4b2ae1
authored
Jul 04, 2024
by
ludi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
翻译整理完上传的版本
parent
e52f7917
Hide whitespace changes
Inline
Side-by-side
Showing
38 changed files
with
305 additions
and
162 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSRotationImageCropper/FUSRotationCropperImageViewController.m
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/MyEditName/FUSMyEditNameAlertView.m
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/ResponsibilityConfirm/FUSResponsibilityConfirmAlertView.m
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/ShowbroadcastGuide/FUSShowBroadcastGuideAlertView.m
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMessageFunctionColumnView.m
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMessageView.m
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyHeaderView.m
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyView.m
FuSiLive/Classes/FusiVersionFeature/ViewController/ImAnchor/FUSImAnchorViewController.m
FuSiLive/Classes/FusiVersionFeature/ViewController/ImAnchor/View/FUSImAnchorHeaderView.m
FuSiLive/Classes/FusiVersionFeature/ViewController/NovaList/FUSHomeNovaListViewController.m
FuSiLive/Classes/FusiVersionFeature/ViewController/NovaList/View/FUSHomeNovaListCollectionView.m
FuSiLive/Classes/FusiVersionFeature/ViewController/NovaList/cell/FFHomeListNovaListCollectionViewSmallCell.m
FuSiLive/Classes/InstantMessaging/View/FUSChatIntimacyV2View.m
FuSiLive/Classes/Login/Controller/FUSForgetPasswordViewController.m
FuSiLive/Classes/Login/Controller/FUSLoginPhoneViewController.m
FuSiLive/Classes/Login/Controller/FUSLoginViewController.m
FuSiLive/Classes/Login/Controller/FUSMessageRegisterViewController.m
FuSiLive/Classes/Login/View/FUSBoundAgentInfoView.m
FuSiLive/Classes/NewLive/Main/View/EndView/FUSVideoOfficialEndV2View.m
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/ContributeList/FUSMyContributeView.m
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/FUSAudiencePopView.m
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/UserList/FUSAudienceListView.m
FuSiLive/Classes/NewLive/Main/View/FunctionView/ChatInputView/FUSBottomOptionalItemView.m
FuSiLive/Classes/NewLive/Main/View/FunctionView/ChatInputView/FUSBottomOptionalView.m
FuSiLive/Classes/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveChatInputToolView.swift
FuSiLive/Classes/NewLive/Main/View/FunctionView/LiveSettingAlertView/FUSLiveAnchorSettingAlertView.m
FuSiLive/Classes/NewLive/Main/View/Push/FUSLiveStartView.m
FuSiLive/Classes/NewsFeed/RichEditor/Controller/FUSPublishNewsFeedViewController.m
FuSiLive/Classes/NewsFeed/RichEditor/Controller/WGBaseRichEditorViewController.m
FuSiLive/Classes/ZhaiXin/Main/Controller/FUSSingleLiveRecordViewController.m
FuSiLive/Classes/ZhaiXin/Main/View/FUSSingleChatTableViewCell.m
FuSiLive/Classes/ZhaiXin/Main/View/FUSSingleLiveRecordV2TableViewCell.m
FuSiLive/Classes/Zone/Controller/FireFlyMyZone/FUSZoneTaskCenterViewController.m
FuSiLive/Classes/Zone/Other/FUSZoneHttpRequest.m
FuSiLive/Classes/Zone/View/FireFlyView/View/FUSZoneCanSendNewsFeedTipView.m
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterTableViewCell.m
FuSiLive/Resources/LocalizationString/Fusi_Chinese.strings
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSRotationImageCropper/FUSRotationCropperImageViewController.m
View file @
fb4b2ae1
...
...
@@ -58,7 +58,7 @@
UILabel
*
contentTitleLabel
=
[[
UILabel
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
200
,
44
)];
contentTitleLabel
.
font
=
[
UIFont
systemFontOfSize
:
18
];
contentTitleLabel
.
text
=
FUSLocalizationHelper
.
versionL
ocalString
(
@"更換頭像"
);
contentTitleLabel
.
text
=
FUSLocalizationHelper
.
l
ocalString
(
@"更換頭像"
);
contentTitleLabel
.
textColor
=
[
UIColor
whiteColor
];
contentTitleLabel
.
textAlignment
=
NSTextAlignmentCenter
;
[
naviContentView
addSubview
:
contentTitleLabel
];
...
...
@@ -82,11 +82,11 @@
[
rotationBtn
addTarget
:
self
action
:
@selector
(
fus_rotationBtnDidClicked
:
)
forControlEvents
:
UIControlEventTouchUpInside
];
UIButton
*
restoreBtn
=
[
UIButton
buttonWithType
:
UIButtonTypeCustom
];
[
restoreBtn
setTitle
:
FUSLocalizationHelper
.
versionL
ocalString
(
@"還原"
)
forState
:
UIControlStateNormal
];
[
restoreBtn
setTitle
:
FUSLocalizationHelper
.
l
ocalString
(
@"還原"
)
forState
:
UIControlStateNormal
];
restoreBtn
.
titleLabel
.
font
=
[
UIFont
systemFontOfSize
:
15
];
[
restoreBtn
setTitleColor
:[
UIColor
whiteColor
]
forState
:
UIControlStateNormal
];
[
controlView
addSubview
:
restoreBtn
];
CGSize
btnSize
=
[
FUSLocalizationHelper
.
versionLocalString
(
@"還
原"
)
sizeWithFont
:
restoreBtn
.
titleLabel
.
font
maxWidth
:
MAXFLOAT
];
CGSize
btnSize
=
[
FUSLocalizationHelper
.
localString
(
@"还
原"
)
sizeWithFont
:
restoreBtn
.
titleLabel
.
font
maxWidth
:
MAXFLOAT
];
restoreBtn
.
frame
=
CGRectMake
(
screenWidth
-
btnSize
.
width
-
40
,
0
,
btnSize
.
width
+
40
,
controlView
.
height
);
[
restoreBtn
addTarget
:
self
action
:
@selector
(
fus_restoreBtnDidClicked
:
)
forControlEvents
:
UIControlEventTouchUpInside
];
...
...
@@ -95,22 +95,21 @@
UIButton
*
cancelBtn
=
[
UIButton
buttonWithType
:
UIButtonTypeCustom
];
cancelBtn
.
titleLabel
.
font
=
[
UIFont
systemFontOfSize
:
18
];
[
cancelBtn
setTitle
:
FUSLocalizationHelper
.
versionL
ocalString
(
@"取消"
)
forState
:
UIControlStateNormal
];
[
cancelBtn
setTitle
:
FUSLocalizationHelper
.
l
ocalString
(
@"取消"
)
forState
:
UIControlStateNormal
];
[
cancelBtn
setTitleColor
:[
UIColor
whiteColor
]
forState
:
UIControlStateNormal
];
[
confirmView
addSubview
:
cancelBtn
];
// btnSize = [FUSLocalizationHelper.versionLocalString(@"取消") sizeWithFont:cancelBtn.titleLabel.font maxWidth:MAXFLOAT];
cancelBtn
.
frame
=
CGRectMake
(
0
,
0
,
80
,
confirmView
.
height
);
[
cancelBtn
addTarget
:
self
action
:
@selector
(
fus_returnBtnDidClicked
:
)
forControlEvents
:
UIControlEventTouchUpInside
];
UIButton
*
okBtn
=
[
UIButton
buttonWithType
:
UIButtonTypeCustom
];
okBtn
.
titleLabel
.
font
=
[
UIFont
boldSystemFontOfSize
:
17
];
[
okBtn
setTitle
:
FUSLocalizationHelper
.
versionLocalString
(
@"確認&更換
"
)
forState
:
UIControlStateNormal
];
[
okBtn
setTitle
:
FUSLocalizationHelper
.
localString
(
@"确认&更换
"
)
forState
:
UIControlStateNormal
];
[
okBtn
setTitleColor
:[
UIColor
colorWithRed
:
34
/
255
.
f
green
:
34
/
255
.
f
blue
:
34
/
255
.
f
alpha
:
1
]
forState
:
UIControlStateNormal
];
[
okBtn
setBackgroundColor
:[
UIColor
colorWithRed
:
0
green
:
247
/
255
.
f
blue
:
1
alpha
:
1
]];
okBtn
.
layer
.
cornerRadius
=
20
;
okBtn
.
layer
.
masksToBounds
=
YES
;
[
confirmView
addSubview
:
okBtn
];
btnSize
=
[
FUSLocalizationHelper
.
versionL
ocalString
(
@"確認&更換"
)
sizeWithFont
:
cancelBtn
.
titleLabel
.
font
maxWidth
:
MAXFLOAT
];
btnSize
=
[
FUSLocalizationHelper
.
l
ocalString
(
@"確認&更換"
)
sizeWithFont
:
cancelBtn
.
titleLabel
.
font
maxWidth
:
MAXFLOAT
];
okBtn
.
frame
=
CGRectMake
(
screenWidth
-
117
-
13
,
12
,
117
,
40
);
[
okBtn
addTarget
:
self
action
:
@selector
(
fus_okBtnDidClicked
:
)
forControlEvents
:
UIControlEventTouchUpInside
];
...
...
@@ -133,7 +132,7 @@
tipsLabel
.
font
=
[
UIFont
systemFontOfSize
:
14
];
tipsLabel
.
textColor
=
[
UIColor
colorWithRed
:
215
/
255
.
f
green
:
212
/
255
.
f
blue
:
212
/
255
.
f
alpha
:
1
];
tipsLabel
.
numberOfLines
=
0
;
tipsLabel
.
text
=
FUSLocalizationHelper
.
versionL
ocalString
(
@"1.請提供高清品質的圖片作為頭像和封面。
\n
2.請確認您的頭像和封面不涉及違反您所在國法律的內容。
\n
3.請確認您的頭像和封面沒有涉及暴力和過度暴露、色情的圖片。
\n
4.請確認您的頭像和封面尊重您社交群體的文化。"
);
tipsLabel
.
text
=
FUSLocalizationHelper
.
l
ocalString
(
@"1.請提供高清品質的圖片作為頭像和封面。
\n
2.請確認您的頭像和封面不涉及違反您所在國法律的內容。
\n
3.請確認您的頭像和封面沒有涉及暴力和過度暴露、色情的圖片。
\n
4.請確認您的頭像和封面尊重您社交群體的文化。"
);
[
tipsContentView
addSubview
:
tipsLabel
];
[
tipsLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
left
.
right
.
top
.
bottom
.
inset
(
15
);
...
...
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/MyEditName/FUSMyEditNameAlertView.m
View file @
fb4b2ae1
...
...
@@ -96,7 +96,7 @@
self
.
okBtn
=
[
UIButton
buttonWithType
:
UIButtonTypeCustom
];
self
.
okBtn
.
titleLabel
.
font
=
[
UIFont
fus_themeMediumFont
:
15
];
[
self
.
okBtn
setTitleColor
:[
UIColor
fus_textColorRich
]
forState
:
UIControlStateNormal
];
[
self
.
okBtn
setTitle
:
FUSLocalizationHelper
.
versionL
ocalString
(
@"确定"
)
forState
:
UIControlStateNormal
];
[
self
.
okBtn
setTitle
:
FUSLocalizationHelper
.
l
ocalString
(
@"确定"
)
forState
:
UIControlStateNormal
];
[
self
.
contentView
addSubview
:
self
.
okBtn
];
[
self
.
okBtn
addTarget
:
self
action
:
@selector
(
fus_okButonDidClicked
:
)
forControlEvents
:
UIControlEventTouchUpInside
];
...
...
@@ -162,7 +162,7 @@
#pragma mark --- button did clicked
-
(
void
)
fus_okButonDidClicked
:
(
UIButton
*
)
btn
{
if
(
self
.
inpuTextField
.
text
.
length
<=
0
)
{
FUSLocalizationHelper
.
versionL
ocalString
(
@"昵称不能为空"
);
FUSLocalizationHelper
.
l
ocalString
(
@"昵称不能为空"
);
return
;
}
else
if
([
self
.
inpuTextField
.
text
isEqualToString
:
_oldValue
]){
return
;
...
...
@@ -199,23 +199,24 @@
}
-
(
NSString
*
)
fus_desStr
{
if
(
_viewType
==
0
)
{
return
FUSLocalizationHelper
.
versionL
ocalString
(
@"修改昵称消耗 %@ x1"
);
return
FUSLocalizationHelper
.
l
ocalString
(
@"修改昵称消耗 %@ x1"
);
}
else
{
return
FUSLocalizationHelper
.
versionL
ocalString
(
@"修改珍爱团名消耗 %@ x1"
);
return
FUSLocalizationHelper
.
l
ocalString
(
@"修改珍爱团名消耗 %@ x1"
);
}
}
-
(
NSString
*
)
fus_title
{
if
(
_viewType
==
0
)
{
return
FUSLocalizationHelper
.
versionL
ocalString
(
@"修改昵称"
);
return
FUSLocalizationHelper
.
l
ocalString
(
@"修改昵称"
);
}
else
{
return
FUSLocalizationHelper
.
versionL
ocalString
(
@"修改珍爱团名"
);
return
FUSLocalizationHelper
.
l
ocalString
(
@"修改珍爱团名"
);
}
}
-
(
NSString
*
)
fus_cardName
{
if
(
_viewType
==
0
)
{
return
FUSLocalizationHelper
.
versionLocalString
(
@"改名卡"
);
// return FUSLocalizationHelper.localString(@"改名卡");
return
FUSLocalizationHelper
.
localString
(
@"改名卡(10宝石)"
);
}
else
{
return
FUSLocalizationHelper
.
versionL
ocalString
(
@"珍爱团改名卡"
);
return
FUSLocalizationHelper
.
l
ocalString
(
@"珍爱团改名卡"
);
}
}
-
(
UIColor
*
)
fus_cardColor
{
...
...
@@ -227,16 +228,16 @@
}
-
(
NSString
*
)
fus_placehodler
{
if
(
_viewType
==
0
)
{
return
FUSLocalizationHelper
.
versionLocalString
(
@"請輸入昵稱
"
);
return
FUSLocalizationHelper
.
localString
(
@"请输入昵称
"
);
}
else
{
return
FUSLocalizationHelper
.
versionLocalString
(
@"請輸
入珍爱团名"
);
return
FUSLocalizationHelper
.
localString
(
@"请输
入珍爱团名"
);
}
}
-
(
NSString
*
)
fus_warning
{
if
(
_viewType
==
0
)
{
return
FUSLocalizationHelper
.
versionLocalString
(
@"我們拒絕涉及暴力或明顯裸露、性暗示的暱稱
。"
);
return
FUSLocalizationHelper
.
localString
(
@"我们拒绝涉及暴力或明显裸露、性暗示的暱称
。"
);
}
else
{
return
FUSLocalizationHelper
.
versionLocalString
(
@""
)
;
return
@""
;
}
}
#pragma mark --- getter and setter
...
...
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/ResponsibilityConfirm/FUSResponsibilityConfirmAlertView.m
View file @
fb4b2ae1
...
...
@@ -117,7 +117,7 @@
self
.
okBtn
.
titleLabel
.
font
=
[
UIFont
fus_themeBoldFont
:
18
];
[
self
.
okBtn
setTitleColor
:[
UIColor
fus_textColorRich
]
forState
:
UIControlStateNormal
];
[
self
.
okBtn
setBackgroundColor
:[
UIColor
fus_diamondBlue
]];
[
self
.
okBtn
setTitle
:
FUSLocalizationHelper
.
versionLocalString
(
@"開
始直播"
)
forState
:
UIControlStateNormal
];
[
self
.
okBtn
setTitle
:
FUSLocalizationHelper
.
localString
(
@"开
始直播"
)
forState
:
UIControlStateNormal
];
self
.
okBtn
.
layer
.
cornerRadius
=
54
/
2
.
0
f
;
self
.
okBtn
.
layer
.
masksToBounds
=
YES
;
[
self
.
contentView
addSubview
:
self
.
okBtn
];
...
...
@@ -168,14 +168,14 @@
self
.
nickNameLabel
.
text
=
[
FUSCacheDataShare
shareStore
].
userDetailInfo
.
nickname
;
self
.
idLabel
.
text
=
[
NSString
stringWithFormat
:
@"ID: %@"
,[
FUSCacheDataShare
shareStore
].
userDetailInfo
.
uid
];
NSMutableArray
*
responsibilityContentTextList
=
[[
NSMutableArray
alloc
]
initWithArray
:@[
FUSLocalizationHelper
.
versionLocalString
(
@"確認您年滿17周歲
"
)]];
NSMutableArray
*
responsibilityContentTextList
=
[[
NSMutableArray
alloc
]
initWithArray
:@[
FUSLocalizationHelper
.
localString
(
@"确认您年满17周岁
"
)]];
//0=开播,1=发布动态。
if
(
type
==
0
)
{
[
self
.
okBtn
setTitle
:
FUSLocalizationHelper
.
versionLocalString
(
@"開
始直播"
)
forState
:
UIControlStateNormal
];
[
responsibilityContentTextList
addObjectsFromArray
:@[
FUSLocalizationHelper
.
versionLocalString
(
@"確認直播行為符合您所在國家的法律"
),
FUSLocalizationHelper
.
versionLocalString
(
@"確認直播溝通沒有欺詐與傷
害"
)]];
[
self
.
okBtn
setTitle
:
FUSLocalizationHelper
.
localString
(
@"开
始直播"
)
forState
:
UIControlStateNormal
];
[
responsibilityContentTextList
addObjectsFromArray
:@[
FUSLocalizationHelper
.
localString
(
@"确认直播行为符合您所在国家的法律"
),
FUSLocalizationHelper
.
localString
(
@"确认直播沟通没有欺诈与伤
害"
)]];
}
else
if
(
type
==
1
)
{
[
self
.
okBtn
setTitle
:
FUSLocalizationHelper
.
versionL
ocalString
(
@"分享"
)
forState
:
UIControlStateNormal
];
[
responsibilityContentTextList
addObjectsFromArray
:@[
FUSLocalizationHelper
.
versionLocalString
(
@"確認分享的內容符合您所在國
家的法律"
)]];
[
self
.
okBtn
setTitle
:
FUSLocalizationHelper
.
l
ocalString
(
@"分享"
)
forState
:
UIControlStateNormal
];
[
responsibilityContentTextList
addObjectsFromArray
:@[
FUSLocalizationHelper
.
localString
(
@"确认分享的内容符合您所在国
家的法律"
)]];
}
[
self
.
confirmContentViewList
removeAllObjects
];
...
...
@@ -191,8 +191,8 @@
}
//直播公约
NSString
*
text1
=
FUSLocalizationHelper
.
versionL
ocalString
(
@"同意且遵守"
);
NSString
*
text2
=
FUSLocalizationHelper
.
versionLocalString
(
@"《直播 & 社區公約
》"
);
NSString
*
text1
=
FUSLocalizationHelper
.
l
ocalString
(
@"同意且遵守"
);
NSString
*
text2
=
FUSLocalizationHelper
.
localString
(
@"《直播 & 社区公约
》"
);
NSString
*
protocolStr
=
[
NSString
stringWithFormat
:
@"%ld、%@%@"
,
responsibilityContentTextList
.
count
+
1
,
text1
,
text2
];
NSMutableAttributedString
*
protocolAttriStr
=
[[
NSMutableAttributedString
alloc
]
initWithString
:
protocolStr
];
protocolAttriStr
.
alignment
=
NSTextAlignmentLeft
;
...
...
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/ShowbroadcastGuide/FUSShowBroadcastGuideAlertView.m
View file @
fb4b2ae1
...
...
@@ -66,7 +66,7 @@
titleLabel
.
textAlignment
=
NSTextAlignmentCenter
;
titleLabel
.
font
=
[
UIFont
fus_themeMediumFont
:
18
];
titleLabel
.
textColor
=
[
UIColor
fus_textColorRich
];
titleLabel
.
text
=
FUSLocalizationHelper
.
versionLocalString
(
@"未發現追蹤
的主播直播"
);
titleLabel
.
text
=
FUSLocalizationHelper
.
localString
(
@"未发现追踪
的主播直播"
);
[
self
.
contentView
addSubview
:
titleLabel
];
UIImageView
*
logoImageView
=
[[
UIImageView
alloc
]
initWithImage
:[
UIImage
imageNamed
:
@"fus_home_broadcastAlert_logo_icon"
]];
...
...
@@ -77,7 +77,7 @@
UILabel
*
guessDesLabel
=
[[
UILabel
alloc
]
init
];
guessDesLabel
.
font
=
[
UIFont
fus_themeMediumFont
:
18
];
guessDesLabel
.
textColor
=
[
UIColor
fus_textColorRich
];
guessDesLabel
.
text
=
FUSLocalizationHelper
.
versionL
ocalString
(
@"猜你想要"
);
guessDesLabel
.
text
=
FUSLocalizationHelper
.
l
ocalString
(
@"猜你想要"
);
[
self
.
contentView
addSubview
:
guessDesLabel
];
[
guessDesLabel
sizeToFit
];
guessDesLabel
.
top
=
logoImageView
.
bottom
+
15
;
...
...
@@ -106,7 +106,7 @@
cancelBtn
.
layer
.
masksToBounds
=
YES
;
cancelBtn
.
backgroundColor
=
[
UIColor
colorWithHex
:
@"#E5E5E5"
];
[
cancelBtn
setTitleColor
:[
UIColor
fus_textColorRich
]
forState
:
UIControlStateNormal
];
[
cancelBtn
setTitle
:
FUSLocalizationHelper
.
versionL
ocalString
(
@"取消"
)
forState
:
UIControlStateNormal
];
[
cancelBtn
setTitle
:
FUSLocalizationHelper
.
l
ocalString
(
@"取消"
)
forState
:
UIControlStateNormal
];
[
self
.
contentView
addSubview
:
cancelBtn
];
[
cancelBtn
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
bottom
.
offset
(
-
28
);
...
...
@@ -119,7 +119,7 @@
okBtn
.
layer
.
masksToBounds
=
YES
;
okBtn
.
backgroundColor
=
[
UIColor
fus_diamondBlue
];
[
okBtn
setTitleColor
:[
UIColor
fus_textColorRich
]
forState
:
UIControlStateNormal
];
[
okBtn
setTitle
:
FUSLocalizationHelper
.
versionLocalString
(
@"確
定"
)
forState
:
UIControlStateNormal
];
[
okBtn
setTitle
:
FUSLocalizationHelper
.
localString
(
@"确
定"
)
forState
:
UIControlStateNormal
];
[
self
.
contentView
addSubview
:
okBtn
];
[
okBtn
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
bottom
.
offset
(
-
28
);
...
...
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMessageFunctionColumnView.m
View file @
fb4b2ae1
...
...
@@ -85,27 +85,27 @@
switch
([
typeNum
integerValue
])
{
case
FUSMessageFunctionColumnClickedDiamond
:
tempIconImgView
.
image
=
[
UIImage
imageNamed
:
@"fus_message_functionColumn_diamond_icon"
];
tempTitleLabel
.
text
=
FUSLocalizationHelper
.
versionLocalString
(
@"寶
石消息"
);
tempTitleLabel
.
text
=
FUSLocalizationHelper
.
localString
(
@"宝
石消息"
);
break
;
case
FUSMessageFunctionColumnClickedDew
:
tempIconImgView
.
image
=
[
UIImage
imageNamed
:
@"fus_message_functionColumn_dew_icon"
];
tempTitleLabel
.
text
=
FUSLocalizationHelper
.
versionL
ocalString
(
@"露水消息"
);
tempTitleLabel
.
text
=
FUSLocalizationHelper
.
l
ocalString
(
@"露水消息"
);
break
;
case
FUSMessageFunctionColumnClickedFire
:
tempIconImgView
.
image
=
[
UIImage
imageNamed
:
@"fus_message_functionColumn_fire_icon"
];
tempTitleLabel
.
text
=
FUSLocalizationHelper
.
versionLocalString
(
@"螢
火消息"
);
tempTitleLabel
.
text
=
FUSLocalizationHelper
.
localString
(
@"萤
火消息"
);
break
;
case
FUSMessageFunctionColumnClickedInvitationAndFollow
:
tempIconImgView
.
image
=
[
UIImage
imageNamed
:
@"fus_message_functionColumn_invitationAndFollow_icon"
];
tempTitleLabel
.
text
=
FUSLocalizationHelper
.
versionLocalString
(
@"邀請&追蹤
"
);
tempTitleLabel
.
text
=
FUSLocalizationHelper
.
localString
(
@"邀请&追踪
"
);
break
;
case
FUSMessageFunctionColumnClickedInvitation
:
tempIconImgView
.
image
=
[
UIImage
imageNamed
:
@"fus_message_functionColumn_invitationAndFollow_icon"
];
tempTitleLabel
.
text
=
FUSLocalizationHelper
.
versionLocalString
(
@"邀請
"
);
tempTitleLabel
.
text
=
FUSLocalizationHelper
.
localString
(
@"邀请
"
);
break
;
case
FUSMessageFunctionColumnClickedFollow
:
tempIconImgView
.
image
=
[
UIImage
imageNamed
:
@"fus_message_functionColumn_invitationAndFollow_icon"
];
tempTitleLabel
.
text
=
FUSLocalizationHelper
.
versionLocalString
(
@"追蹤
"
);
tempTitleLabel
.
text
=
FUSLocalizationHelper
.
localString
(
@"追踪
"
);
break
;
default
:
break
;
...
...
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMessageView.m
View file @
fb4b2ae1
...
...
@@ -84,7 +84,7 @@
UILabel
*
titleLabel
=
[[
UILabel
alloc
]
init
];
titleLabel
.
font
=
[
UIFont
fus_themeBoldFont
:
20
];
titleLabel
.
textColor
=
[
UIColor
fus_textColorDeep
];
titleLabel
.
text
=
FUSLocalizationHelper
.
versionL
ocalString
(
@"消息"
);
titleLabel
.
text
=
FUSLocalizationHelper
.
l
ocalString
(
@"消息"
);
[
self
.
naviView
addSubview
:
titleLabel
];
[
titleLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
left
.
offset
(
20
);
...
...
@@ -146,7 +146,7 @@
UILabel
*
notificationRemindTextLabel
=
[[
UILabel
alloc
]
init
];
notificationRemindTextLabel
.
font
=
[
UIFont
fus_themeFont
:
14
];
notificationRemindTextLabel
.
textColor
=
[
UIColor
fus_textColorRich
];
notificationRemindTextLabel
.
text
=
FUSLocalizationHelper
.
versionLocalString
(
@"開啟通知,隨時
接收好友私信"
);
notificationRemindTextLabel
.
text
=
FUSLocalizationHelper
.
localString
(
@"开启通知,随时
接收好友私信"
);
[
self
.
notificationRemindView
addSubview
:
notificationRemindTextLabel
];
[
notificationRemindTextLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
left
.
equalTo
(
bellImgView
.
mas_right
).
offset
(
10
);
...
...
@@ -164,7 +164,7 @@
UIButton
*
notificationOpenBtn
=
[
UIButton
buttonWithType
:
UIButtonTypeCustom
];
notificationOpenBtn
.
titleLabel
.
font
=
[
UIFont
fus_themeFont
:
13
];
[
notificationOpenBtn
setTitleColor
:[
UIColor
colorWithHex
:
@"#22222B"
]
forState
:
UIControlStateNormal
];
[
notificationOpenBtn
setTitle
:[
NSString
stringWithFormat
:
@" %@ "
,
FUSLocalizationHelper
.
versionLocalString
(
@"開啟
"
)]
forState
:
UIControlStateNormal
];
[
notificationOpenBtn
setTitle
:[
NSString
stringWithFormat
:
@" %@ "
,
FUSLocalizationHelper
.
localString
(
@"开启
"
)]
forState
:
UIControlStateNormal
];
notificationOpenBtn
.
backgroundColor
=
[
UIColor
fus_diamondBlue
];
notificationOpenBtn
.
layer
.
cornerRadius
=
25
/
2
.
0
f
;
[
self
.
notificationRemindView
addSubview
:
notificationOpenBtn
];
...
...
@@ -191,7 +191,7 @@
-
(
void
)
fus_createMessageColumn
{
//分页控制
_segCtrlView
=
[[
FUSSegmentControlView
alloc
]
initWithFrame
:
CGRectMake
(
8
,
0
,
UIView
.
fus_screenW
-
16
,
38
)
withItems
:@[
FUSLocalizationHelper
.
versionLocalString
(
@"私信"
),
FUSLocalizationHelper
.
versionL
ocalString
(
@"亲密"
)]];
_segCtrlView
=
[[
FUSSegmentControlView
alloc
]
initWithFrame
:
CGRectMake
(
8
,
0
,
UIView
.
fus_screenW
-
16
,
38
)
withItems
:@[
FUSLocalizationHelper
.
localString
(
@"私信"
),
FUSLocalizationHelper
.
l
ocalString
(
@"亲密"
)]];
// [_segCtrlView fus_setUnderLineSelectedImage:[UIImage imageNamed:@"common_icon_segment_selected"]];
_segCtrlView
.
itemSelectedFont
=
[
UIFont
fus_themeBoldFont
:
18
];
_segCtrlView
.
itemFont
=
[
UIFont
fus_themeBoldFont
:
18
];
...
...
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyHeaderView.m
View file @
fb4b2ae1
...
...
@@ -170,7 +170,7 @@
}];
NSArray
*
labelsArray
=
@[
self
.
intimacyNumLabel
,
self
.
followNumLabel
,
self
.
fansNumLabel
];
NSArray
*
titleArray
=
@[
FUSLocalizationHelper
.
versionLocalString
(
@"親密"
),
FUSLocalizationHelper
.
versionLocalString
(
@"追蹤"
),
FUSLocalizationHelper
.
versionLocalString
(
@"粉絲
"
)];
NSArray
*
titleArray
=
@[
FUSLocalizationHelper
.
localString
(
@"亲密"
),
FUSLocalizationHelper
.
localString
(
@"追踪"
),
FUSLocalizationHelper
.
localString
(
@"粉丝
"
)];
NSArray
*
intimacyTagList
=
@[
@
(
FUSMyHeaderButtonTypeIntimacy
),
@
(
FUSMyHeaderButtonTypeFollow
),
@
(
FUSMyHeaderButtonTypeFans
)];
NSMutableArray
*
intimacyBlankViewsArray
=
[[
NSMutableArray
alloc
]
init
];
for
(
int
i
=
0
;
i
<
titleArray
.
count
;
i
++
)
{
...
...
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyView.m
View file @
fb4b2ae1
...
...
@@ -253,14 +253,14 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
-
(
NSString
*
)
fus_getItemTitle
:
(
FUSMySettingItemType
)
type
{
switch
(
type
)
{
case
FUSMySettingItemTypeImAnchor
:
return
FUSLocalizationHelper
.
versionL
ocalString
(
@"我是主播"
);
case
FUSMySettingItemTypeSetIntitationCode
:
return
FUSLocalizationHelper
.
versionLocalString
(
@"填寫邀請碼
"
);
case
FUSMySettingItemTypeIntitationReward
:
return
FUSLocalizationHelper
.
versionLocalString
(
@"邀請獎勵
"
);
case
FUSMySettingItemTypeTaskReward
:
return
FUSLocalizationHelper
.
versionLocalString
(
@"任務獎勵
"
);
case
FUSMySettingItemTypeGiveAwayDiamond
:
return
FUSLocalizationHelper
.
versionLocalString
(
@"贈出寶
石"
);
case
FUSMySettingItemTypeBackpack
:
return
FUSLocalizationHelper
.
versionL
ocalString
(
@"背包"
);
case
FUSMySettingItemTypeHelp
:
return
FUSLocalizationHelper
.
versionL
ocalString
(
@"幫助"
);
case
FUSMySettingItemTypeSetting
:
return
FUSLocalizationHelper
.
versionLocalString
(
@"設
置"
);
case
FUSMySettingItemTypeImAnchor
:
return
FUSLocalizationHelper
.
l
ocalString
(
@"我是主播"
);
case
FUSMySettingItemTypeSetIntitationCode
:
return
FUSLocalizationHelper
.
localString
(
@"填写邀请码
"
);
case
FUSMySettingItemTypeIntitationReward
:
return
FUSLocalizationHelper
.
localString
(
@"邀请奖励
"
);
case
FUSMySettingItemTypeTaskReward
:
return
FUSLocalizationHelper
.
localString
(
@"任务奖励
"
);
case
FUSMySettingItemTypeGiveAwayDiamond
:
return
FUSLocalizationHelper
.
localString
(
@"赠出宝
石"
);
case
FUSMySettingItemTypeBackpack
:
return
FUSLocalizationHelper
.
l
ocalString
(
@"背包"
);
case
FUSMySettingItemTypeHelp
:
return
FUSLocalizationHelper
.
l
ocalString
(
@"幫助"
);
case
FUSMySettingItemTypeSetting
:
return
FUSLocalizationHelper
.
localString
(
@"设
置"
);
default
:
return
@""
;
}
}
...
...
FuSiLive/Classes/FusiVersionFeature/ViewController/ImAnchor/FUSImAnchorViewController.m
View file @
fb4b2ae1
...
...
@@ -199,13 +199,13 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
-
(
NSString
*
)
fus_getItemTitle
:
(
FUSImAnchorItemType
)
type
{
switch
(
type
)
{
case
FUSImAnchorItemTypeLiveTask
:
return
FUSLocalizationHelper
.
versionLocalString
(
@"直播任務
"
);
case
FUSImAnchorItemTypePopular
:
return
FUSLocalizationHelper
.
versionLocalString
(
@"人氣
加成"
);
case
FUSImAnchorItemTypeLiveTime
:
return
FUSLocalizationHelper
.
versionLocalString
(
@"直播時長
"
);
case
FUSImAnchorItemTypeTotalFire
:
return
FUSLocalizationHelper
.
versionLocalString
(
@"累計螢
火"
);
case
FUSImAnchorItemTypePrivacyRoomSetting
:
return
FUSLocalizationHelper
.
versionLocalString
(
@"私房設
置"
);
case
FUSImAnchorItemTypeBroadcastBuild
:
return
FUSLocalizationHelper
.
versionLocalString
(
@"主播養
成"
);
case
FUSImAnchorItemTypeActivity
:
return
FUSLocalizationHelper
.
versionLocalString
(
@"活動
"
);
case
FUSImAnchorItemTypeLiveTask
:
return
FUSLocalizationHelper
.
localString
(
@"直播任务
"
);
case
FUSImAnchorItemTypePopular
:
return
FUSLocalizationHelper
.
localString
(
@"人气
加成"
);
case
FUSImAnchorItemTypeLiveTime
:
return
FUSLocalizationHelper
.
localString
(
@"直播时长
"
);
case
FUSImAnchorItemTypeTotalFire
:
return
FUSLocalizationHelper
.
localString
(
@"累计萤
火"
);
case
FUSImAnchorItemTypePrivacyRoomSetting
:
return
FUSLocalizationHelper
.
localString
(
@"私房设
置"
);
case
FUSImAnchorItemTypeBroadcastBuild
:
return
FUSLocalizationHelper
.
localString
(
@"主播养
成"
);
case
FUSImAnchorItemTypeActivity
:
return
FUSLocalizationHelper
.
localString
(
@"活动
"
);
default
:
return
@""
;
}
}
...
...
FuSiLive/Classes/FusiVersionFeature/ViewController/ImAnchor/View/FUSImAnchorHeaderView.m
View file @
fb4b2ae1
...
...
@@ -194,7 +194,7 @@
withdrawTitleLabel
.
textColor
=
[
UIColor
fus_textColorLight
];
if
(
!
FUSConfig
.
sharedInstanced
.
devConfigs
.
appStatus
)
{
// 非sh显示
withdrawTitleLabel
.
text
=
FUSLocalizationHelper
.
versionL
ocalString
(
@"可提现"
);
withdrawTitleLabel
.
text
=
FUSLocalizationHelper
.
l
ocalString
(
@"可提现"
);
}
[
bottomBgImageView
addSubview
:
withdrawTitleLabel
];
[
withdrawTitleLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
...
...
FuSiLive/Classes/FusiVersionFeature/ViewController/NovaList/FUSHomeNovaListViewController.m
View file @
fb4b2ae1
...
...
@@ -86,7 +86,7 @@
-
(
void
)
ffsetupSegmentView
{
self
.
segmentView
=
[[
FUSSegmentControlView
alloc
]
initWithFrame
:
CGRectMake
(
16
,
0
,
UIView
.
fus_screenW
-
16
*
2
,
40
)
withItems
:@[
FUSLocalizationHelper
.
versionLocalString
(
@"按时间"
),
FUSLocalizationHelper
.
versionL
ocalString
(
@"按热度"
)]];
self
.
segmentView
=
[[
FUSSegmentControlView
alloc
]
initWithFrame
:
CGRectMake
(
16
,
0
,
UIView
.
fus_screenW
-
16
*
2
,
40
)
withItems
:@[
FUSLocalizationHelper
.
localString
(
@"按时间"
),
FUSLocalizationHelper
.
l
ocalString
(
@"按热度"
)]];
self
.
segmentView
.
underLine
.
backgroundColor
=
[
UIColor
fus_textColorRich
];
self
.
segmentView
.
isShowUnderLine
=
YES
;
self
.
segmentView
.
space
=
20
;
...
...
@@ -204,8 +204,8 @@
self
.
followAllBtn
=
[
UIButton
buttonWithType
:
UIButtonTypeCustom
];
self
.
followAllBtn
.
backgroundColor
=
[
UIColor
fus_themeColor
];
[
self
.
followAllBtn
setTitle
:
FUSLocalizationHelper
.
versionL
ocalString
(
@"全部追踪"
)
forState
:
UIControlStateNormal
];
[
self
.
followAllBtn
setTitle
:
FUSLocalizationHelper
.
versionL
ocalString
(
@"已追踪"
)
forState
:
UIControlStateDisabled
];
[
self
.
followAllBtn
setTitle
:
FUSLocalizationHelper
.
l
ocalString
(
@"全部追踪"
)
forState
:
UIControlStateNormal
];
[
self
.
followAllBtn
setTitle
:
FUSLocalizationHelper
.
l
ocalString
(
@"已追踪"
)
forState
:
UIControlStateDisabled
];
[
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
];
...
...
@@ -243,7 +243,7 @@
[
self
.
navView
addSubview
:
backBtn
];
UILabel
*
titleLabel
=
[[
UILabel
alloc
]
initWithFrame
:
CGRectMake
((
self
.
navView
.
width
-
200
)
/
2
.
0
,
self
.
navView
.
height
-
44
,
200
,
44
)];
titleLabel
.
text
=
FUSLocalizationHelper
.
versionL
ocalString
(
@"FUSI 新星"
);
titleLabel
.
text
=
FUSLocalizationHelper
.
l
ocalString
(
@"FUSI 新星"
);
titleLabel
.
textColor
=
[
UIColor
fus_textColorRich
];
titleLabel
.
font
=
[
UIFont
fus_themeBoldFont
:
17
];
titleLabel
.
textAlignment
=
NSTextAlignmentCenter
;
...
...
FuSiLive/Classes/FusiVersionFeature/ViewController/NovaList/View/FUSHomeNovaListCollectionView.m
View file @
fb4b2ae1
...
...
@@ -62,7 +62,7 @@
self
.
currentPage
=
1
;
self
.
emptyView
=
[[
FUSEmptyView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
UIView
.
fus_screenW
,
UIView
.
fus_screenH
/
2
.
0
f
)];
[
self
.
emptyView
fus_setEmptyViewIcon
:[
UIImage
fus_emptyImg
]
title
:
FUSLocalizationHelper
.
versionL
ocalString
(
@"空空如也"
)
buttonTittle
:
nil
];
[
self
.
emptyView
fus_setEmptyViewIcon
:[
UIImage
fus_emptyImg
]
title
:
FUSLocalizationHelper
.
l
ocalString
(
@"空空如也"
)
buttonTittle
:
nil
];
[
self
addSubview
:
self
.
emptyView
];
self
.
emptyView
.
hidden
=
YES
;
...
...
@@ -120,7 +120,7 @@
[
FUSLoadingView
fus_showProgressViewWithMessage
:
nil
];
[
FUSBaoFangHttpHelper
fus_requestRoomNovaBatchLikesWithMark
:
self
.
mark
success
:
^
{
[
FUSLoadingView
fus_showProgressViewWithMessage
:
FUSLocalizationHelper
.
versionL
ocalString
(
@"追踪成功"
)];
[
FUSLoadingView
fus_showProgressViewWithMessage
:
FUSLocalizationHelper
.
l
ocalString
(
@"追踪成功"
)];
[
FUSLoadingView
fus_dismissProgressView
];
self
.
isFollowAll
=
YES
;
...
...
FuSiLive/Classes/FusiVersionFeature/ViewController/NovaList/cell/FFHomeListNovaListCollectionViewSmallCell.m
View file @
fb4b2ae1
...
...
@@ -114,7 +114,7 @@
self
.
creditLabel
=
[[
UILabel
alloc
]
init
];
self
.
creditLabel
.
font
=
[
UIFont
fus_themeFont
:
9
];
self
.
creditLabel
.
text
=
[
NSString
fus_versionLocalString
:
@"Credit"
]
;
self
.
creditLabel
.
text
=
@"Credit"
;
self
.
creditLabel
.
textColor
=
[
UIColor
colorWithHex
:
@"#53B9F3"
alpha
:
1
];
[
self
.
creditLabel
sizeToFit
];
[
self
.
contentView
addSubview
:
self
.
creditLabel
];
...
...
@@ -304,14 +304,14 @@
}
else
if
(
model
.
videoState
==
0
){
// self.onLiveAnimateView.animationImages = UIImage.waitingAnimatedImageArray;
self
.
onlineLabel
.
text
=
[
NSString
fus_versionLocalString
:
@"online"
]
;
self
.
onlineLabel
.
text
=
@"online"
;
self
.
onlineLabel
.
textColor
=
[
UIColor
whiteColor
];
//正在私聊中
}
else
if
(
model
.
videoState
==
2
){
// self.onLiveAnimateView.animationImages = UIImage.callingAnimatedImageArray;
self
.
onlineLabel
.
text
=
[
NSString
fus_versionLocalString
:
@"calling"
]
;
self
.
onlineLabel
.
text
=
@"calling"
;
self
.
onlineLabel
.
textColor
=
[
UIColor
colorWithHex
:
@"#3AC1FF"
alpha
:
1
];
}
...
...
@@ -524,7 +524,7 @@
-
(
UILabel
*
)
onlineLabel
{
if
(
!
_onlineLabel
)
{
_onlineLabel
=
[[
UILabel
alloc
]
init
];
_onlineLabel
.
text
=
[
NSString
fus_versionLocalString
:
@"Live"
]
;
_onlineLabel
.
text
=
@"Live"
;
_onlineLabel
.
font
=
[
UIFont
fus_themeFont
:
10
];
_onlineLabel
.
textColor
=
[
UIColor
whiteColor
];
[
_onlineLabel
sizeToFit
];
...
...
FuSiLive/Classes/InstantMessaging/View/FUSChatIntimacyV2View.m
View file @
fb4b2ae1
...
...
@@ -74,7 +74,7 @@
self
.
intimacyLabel
=
[[
UILabel
alloc
]
init
];
self
.
intimacyLabel
.
font
=
[
UIFont
fus_themeMediumFont
:
10
];
self
.
intimacyLabel
.
textColor
=
[
UIColor
fus_themeColor
];
self
.
intimacyLabel
.
text
=
[
NSString
fus_
versionLocalString
:
@"親
密度"
];
self
.
intimacyLabel
.
text
=
[
NSString
fus_
localString
:
@"亲
密度"
];
[
intimacyProgressBgView
addSubview
:
self
.
intimacyLabel
];
[
self
.
intimacyLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
left
.
top
.
bottom
.
offset
(
0
);
...
...
FuSiLive/Classes/Login/Controller/FUSForgetPasswordViewController.m
View file @
fb4b2ae1
...
...
@@ -628,7 +628,7 @@
}
else
{
self
.
countryInfoDict
=
nil
;
self
.
countryDetailLabel
.
text
=
[
NSString
fus_
versionL
ocalString
:
@"未知国家"
];
self
.
countryDetailLabel
.
text
=
[
NSString
fus_
l
ocalString
:
@"未知国家"
];
self
.
countryDetailLabel
.
textAlignment
=
NSTextAlignmentRight
;
_countryCode
=
nil
;
}
...
...
FuSiLive/Classes/Login/Controller/FUSLoginPhoneViewController.m
View file @
fb4b2ae1
...
...
@@ -380,7 +380,7 @@
}
else
{
self
.
countryInfoDict
=
nil
;
self
.
countryLabel
.
text
=
[
NSString
fus_
versionL
ocalString
:
@"未知国家"
];
self
.
countryLabel
.
text
=
[
NSString
fus_
l
ocalString
:
@"未知国家"
];
self
.
countryLabel
.
textAlignment
=
NSTextAlignmentRight
;
}
...
...
FuSiLive/Classes/Login/Controller/FUSLoginViewController.m
View file @
fb4b2ae1
...
...
@@ -543,7 +543,7 @@
}
else
{
self
.
countryInfoDict
=
nil
;
self
.
countryLabel
.
text
=
[
NSString
fus_
versionL
ocalString
:
@"未知国家"
];
self
.
countryLabel
.
text
=
[
NSString
fus_
l
ocalString
:
@"未知国家"
];
self
.
countryLabel
.
textAlignment
=
NSTextAlignmentRight
;
}
...
...
FuSiLive/Classes/Login/Controller/FUSMessageRegisterViewController.m
View file @
fb4b2ae1
...
...
@@ -1090,7 +1090,7 @@
}
else
{
self
.
countryInfoDict
=
nil
;
self
.
countryLabel
.
text
=
[
NSString
fus_
versionL
ocalString
:
@"未知国家"
];
self
.
countryLabel
.
text
=
[
NSString
fus_
l
ocalString
:
@"未知国家"
];
self
.
countryLabel
.
textAlignment
=
NSTextAlignmentRight
;
}
...
...
FuSiLive/Classes/Login/View/FUSBoundAgentInfoView.m
View file @
fb4b2ae1
...
...
@@ -66,7 +66,7 @@
_tipsTitleLbael
.
text
=
FUSLocalizationHelper
.
localString
(
@"输入朋友的邀请码"
);
[
_confirmBtn
setTitle
:
FUSLocalizationHelper
.
localString
(
@"确定"
)
forState
:
UIControlStateNormal
];
[
_cancelBtn
setTitle
:
FUSLocalizationHelper
.
versionL
ocalString
(
@"取消"
)
forState
:
UIControlStateNormal
];
[
_cancelBtn
setTitle
:
FUSLocalizationHelper
.
l
ocalString
(
@"取消"
)
forState
:
UIControlStateNormal
];
_cancelBtn
.
layer
.
cornerRadius
=
46
/
2
.
0
f
;
_cancelBtn
.
layer
.
masksToBounds
=
YES
;
...
...
FuSiLive/Classes/NewLive/Main/View/EndView/FUSVideoOfficialEndV2View.m
View file @
fb4b2ae1
...
...
@@ -60,7 +60,7 @@
make
.
size
.
mas_equalTo
(
CGSizeMake
(
74
,
74
));
}];
NSMutableAttributedString
*
textString
=
[[
NSMutableAttributedString
alloc
]
initWithString
:[
NSString
fus_
versionLocalString
:
@"由於直播內容涉及違規
\n
本直播已中斷
"
]
attributes
:@{
NSFontAttributeName
:
[
UIFont
fus_themeFont
:
19
],
NSForegroundColorAttributeName
:
[
UIColor
whiteColor
]}];
NSMutableAttributedString
*
textString
=
[[
NSMutableAttributedString
alloc
]
initWithString
:[
NSString
fus_
localString
:
@"由于直播内容涉及违规
\n
本直播已中断
"
]
attributes
:@{
NSFontAttributeName
:
[
UIFont
fus_themeFont
:
19
],
NSForegroundColorAttributeName
:
[
UIColor
whiteColor
]}];
self
.
contentLabel
=
[[
UILabel
alloc
]
init
];
self
.
contentLabel
.
numberOfLines
=
0
;
...
...
@@ -86,7 +86,7 @@
_closeBtn
.
layer
.
masksToBounds
=
YES
;
_closeBtn
.
layer
.
cornerRadius
=
44
/
2
.
0
;
self
.
closeBtn
.
titleLabel
.
font
=
[
UIFont
fus_themeMediumFont
:
17
];
[
self
.
closeBtn
setTitle
:[
NSString
fus_
versionL
ocalString
:
@"返回"
]
forState
:
UIControlStateNormal
];
[
self
.
closeBtn
setTitle
:[
NSString
fus_
l
ocalString
:
@"返回"
]
forState
:
UIControlStateNormal
];
[
closeCenterView
addSubview
:
self
.
closeBtn
];
[
self
.
closeBtn
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
center
.
equalTo
(
closeCenterView
);
...
...
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/ContributeList/FUSMyContributeView.m
View file @
fb4b2ae1
...
...
@@ -102,7 +102,7 @@
self
.
sendGiftLabel
=
[[
UILabel
alloc
]
init
];
self
.
sendGiftLabel
.
textColor
=
UIColor
.
fus_textColorDeep
;
self
.
sendGiftLabel
.
text
=
FUSLocalizationHelper
.
versionL
ocalString
(
@"上榜"
);
self
.
sendGiftLabel
.
text
=
FUSLocalizationHelper
.
l
ocalString
(
@"上榜"
);
self
.
sendGiftLabel
.
font
=
[
UIFont
fus_themeBoldFont
:
16
];
self
.
sendGiftLabel
.
textAlignment
=
NSTextAlignmentCenter
;
[
self
.
sendGiftView
addSubview
:
self
.
sendGiftLabel
];
...
...
@@ -216,11 +216,11 @@
self
.
rankImageView
.
hidden
=
YES
;
}
self
.
sendGiftLabel
.
text
=
FUSLocalizationHelper
.
versionL
ocalString
(
@"超越上一名"
);
self
.
sendGiftLabel
.
text
=
FUSLocalizationHelper
.
l
ocalString
(
@"超越上一名"
);
}
else
{
self
.
rankLabel
.
text
=
@"未上榜"
;
self
.
fireLabel
.
text
=
@"0"
;
self
.
sendGiftLabel
.
text
=
FUSLocalizationHelper
.
versionL
ocalString
(
@"上榜"
);
self
.
sendGiftLabel
.
text
=
FUSLocalizationHelper
.
l
ocalString
(
@"上榜"
);
}
[
self
.
faceImageView
setWebImageWithSubURLString
:
FUSCacheDataShare
.
shareStore
.
userDetailInfo
.
face
];
...
...
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/FUSAudiencePopView.m
View file @
fb4b2ae1
...
...
@@ -65,9 +65,9 @@
[
self
.
contentView
addSubview
:
self
.
closeBtn
];
self
.
segmentView
=
[[
FUSSegmentControlView
alloc
]
initWithFrame
:
CGRectMake
(
19
,
0
,
UIView
.
fus_screenW
-
70
,
44
)
withItems
:@[
FUSLocalizationHelper
.
versionLocalString
(
@"观看人数
"
),
FUSLocalizationHelper
.
localString
(
@"觀看人數
"
),
@"VIP"
,
FUSLocalizationHelper
.
versionLocalString
(
@"贡献
榜"
)]];
FUSLocalizationHelper
.
localString
(
@"貢獻
榜"
)]];
self
.
segmentView
.
space
=
27
;
self
.
segmentView
.
alignment
=
FUSSegmentControlAlignmentLeft
;
[
self
.
segmentView
fus_setUnderLineSelectedImage
:[
UIImage
fus_ImageNamed
:
@"common_icon_segment_selected"
]];
...
...
@@ -130,7 +130,7 @@
[
self
.
onlineUserView
showUserListWithIsVipOnly
:
NO
];
__weak
typeof
(
self
)
weakSelf
=
self
;
self
.
onlineUserView
.
totalUserChangedHandler
=
^
(
NSInteger
total
)
{
[
weakSelf
.
segmentView
fus_setImageForIndex
:
0
title
:[
NSString
stringWithFormat
:
@"%@ %zd"
,
FUSLocalizationHelper
.
versionL
ocalString
(
@"观看人数"
),
total
]];
[
weakSelf
.
segmentView
fus_setImageForIndex
:
0
title
:[
NSString
stringWithFormat
:
@"%@ %zd"
,
FUSLocalizationHelper
.
l
ocalString
(
@"观看人数"
),
total
]];
};
[
self
.
vipUserView
showUserListWithIsVipOnly
:
YES
];
[
UIView
animateWithDuration
:
0
.
3
animations
:
^
{
...
...
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/UserList/FUSAudienceListView.m
View file @
fb4b2ae1
...
...
@@ -88,7 +88,7 @@
[
self
addSubview
:
self
.
openVIPView
];
self
.
openVIPDecsLabel
=
[[
UILabel
alloc
]
init
];
self
.
openVIPDecsLabel
.
text
=
FUSLocalizationHelper
.
versionL
ocalString
(
@"开通VIP,享受豪华特权"
);
self
.
openVIPDecsLabel
.
text
=
FUSLocalizationHelper
.
l
ocalString
(
@"开通VIP,享受豪华特权"
);
self
.
openVIPDecsLabel
.
font
=
[
UIFont
fus_themeBoldFont
:
15
];
self
.
openVIPDecsLabel
.
textColor
=
UIColor
.
fus_textColorRich
;
[
self
.
openVIPView
addSubview
:
self
.
openVIPDecsLabel
];
...
...
FuSiLive/Classes/NewLive/Main/View/FunctionView/ChatInputView/FUSBottomOptionalItemView.m
View file @
fb4b2ae1
...
...
@@ -104,13 +104,13 @@
if
(
isMute
)
{
self
.
itemImageView
.
image
=
[
UIImage
imageNamed
:
@"live_setting_open_mic"
];
self
.
itemName
.
text
=
[
NSString
fus_
versionL
ocalString
:
@"打开麦克风"
];
self
.
itemName
.
text
=
[
NSString
fus_
l
ocalString
:
@"打开麦克风"
];
sender
.
selected
=
NO
;
[
FUSDialogView
fus_showDialog
:[
NSString
fus_
versionL
ocalString
:
@"麦克风已关闭"
]];
[
FUSDialogView
fus_showDialog
:[
NSString
fus_
l
ocalString
:
@"麦克风已关闭"
]];
}
else
{
self
.
itemImageView
.
image
=
[
UIImage
imageNamed
:
@"live_setting_close_mic"
];
self
.
itemName
.
text
=
[
NSString
fus_
versionL
ocalString
:
@"关闭麦克风"
];
[
FUSDialogView
fus_showDialog
:[
NSString
fus_
versionL
ocalString
:
@"麦克风已开启"
]];
self
.
itemName
.
text
=
[
NSString
fus_
l
ocalString
:
@"关闭麦克风"
];
[
FUSDialogView
fus_showDialog
:[
NSString
fus_
l
ocalString
:
@"麦克风已开启"
]];
sender
.
selected
=
YES
;
}
});
...
...
@@ -123,13 +123,13 @@
BOOL
isMirror
=
[
FUSLiveHelper
shareInstance
].
streamView
.
pushView
.
captureHelper
.
videoMirror
;
if
(
isMirror
)
{
self
.
itemImageView
.
image
=
[
UIImage
imageNamed
:
@"live_setting_video_mirror"
];
self
.
itemName
.
text
=
[
NSString
fus_
versionL
ocalString
:
@"镜像"
];
[
FUSDialogView
fus_showDialog
:[
NSString
fus_
versionL
ocalString
:
@"已关闭画面镜像"
]];
self
.
itemName
.
text
=
[
NSString
fus_
l
ocalString
:
@"镜像"
];
[
FUSDialogView
fus_showDialog
:[
NSString
fus_
l
ocalString
:
@"已关闭画面镜像"
]];
sender
.
selected
=
YES
;
}
else
{
self
.
itemImageView
.
image
=
[
UIImage
imageNamed
:
@"live_setting_video_mirror_close"
];
self
.
itemName
.
text
=
[
NSString
fus_
versionL
ocalString
:
@"关闭镜像"
];
[
FUSDialogView
fus_showDialog
:[
NSString
fus_
versionL
ocalString
:
@"已开启画面镜像"
]];
self
.
itemName
.
text
=
[
NSString
fus_
l
ocalString
:
@"关闭镜像"
];
[
FUSDialogView
fus_showDialog
:[
NSString
fus_
l
ocalString
:
@"已开启画面镜像"
]];
sender
.
selected
=
NO
;
}
});
...
...
FuSiLive/Classes/NewLive/Main/View/FunctionView/ChatInputView/FUSBottomOptionalView.m
View file @
fb4b2ae1
...
...
@@ -76,7 +76,7 @@
//TODO:图片: added By Pidan
if
(
FUSLiveHelper
.
shareInstance
.
liveRoomType
==
FUSRoomTypeLinkMic
)
{
BOOL
isMute
=
[
FUSLiveHelper
fus_livePushMuteState
];
NSString
*
muteStr
=
isMute
?
[
NSString
fus_
versionLocalString
:
@"打开麦克风"
]
:
[
NSString
fus_versionL
ocalString
:
@"关闭麦克风"
];
NSString
*
muteStr
=
isMute
?
[
NSString
fus_
localString
:
@"打开麦克风"
]
:
[
NSString
fus_l
ocalString
:
@"关闭麦克风"
];
NSString
*
muteImgStr
=
isMute
?
@"live_setting_open_mic"
:
@"live_setting_close_mic"
;
[
self
showOptionalViewWithTitleArray
:@[
muteStr
]
withImages
:@[
muteImgStr
]
...
...
@@ -84,23 +84,23 @@
return
;
}
else
if
(
type
==
FUSShowAllSetting
)
{
BOOL
isLightOn
=
FUSLiveHelper
.
shareInstance
.
isTorchOn
;
NSString
*
lightStr
=
isLightOn
?
[
NSString
fus_
versionLocalString
:
@"闪光关闭"
]
:
[
NSString
fus_versionL
ocalString
:
@"闪光开启"
];
NSString
*
lightStr
=
isLightOn
?
[
NSString
fus_
localString
:
@"闪光关闭"
]
:
[
NSString
fus_l
ocalString
:
@"闪光开启"
];
NSString
*
lightImgStr
=
isLightOn
?
@"live_icon_turnOffLine"
:
@"live_icon_turnOnLine"
;
BOOL
isMute
=
[
FUSLiveHelper
fus_livePushMuteState
];
NSString
*
muteStr
=
isMute
?
[
NSString
fus_
versionLocalString
:
@"打开麦克风"
]
:
[
NSString
fus_versionL
ocalString
:
@"关闭麦克风"
];
NSString
*
muteStr
=
isMute
?
[
NSString
fus_
localString
:
@"打开麦克风"
]
:
[
NSString
fus_l
ocalString
:
@"关闭麦克风"
];
NSString
*
muteImgStr
=
isMute
?
@"live_setting_open_mic"
:
@"live_setting_close_mic"
;
BOOL
isMirror
=
[
FUSLiveHelper
shareInstance
].
streamView
.
pushView
.
captureHelper
.
videoMirror
;
NSString
*
mirror
=
isMirror
?
[
NSString
fus_
versionLocalString
:
@"镜像"
]
:
[
NSString
fus_versionL
ocalString
:
@"关闭镜像"
];
NSString
*
mirror
=
isMirror
?
[
NSString
fus_
localString
:
@"镜像"
]
:
[
NSString
fus_l
ocalString
:
@"关闭镜像"
];
NSString
*
mirrorImgStr
=
isMirror
?
@"live_setting_video_mirror"
:
@"live_setting_video_mirror_close"
;
[
self
showOptionalViewWithTitleArray
:@[[
NSString
fus_
versionL
ocalString
:
@"美颜设置"
],
[
self
showOptionalViewWithTitleArray
:@[[
NSString
fus_
l
ocalString
:
@"美颜设置"
],
// [NSString fus_versionLocalString:@"清晰度"],
muteStr
,
[
NSString
fus_
versionL
ocalString
:
@"反转镜头"
],
[
NSString
fus_
l
ocalString
:
@"反转镜头"
],
lightStr
,
mirror
,
// [NSString fus_versionLocalString:@"直播主题"],
...
...
@@ -127,7 +127,7 @@
clickItem
:
click
];
}
else
if
(
type
==
FUSShowFlashLineAndCamera
){
[
self
showOptionalViewWithTitleArray
:@[[
NSString
fus_
versionLocalString
:
@"闪光关闭"
],[
NSString
fus_versionL
ocalString
:
@"反转镜头"
]]
[
self
showOptionalViewWithTitleArray
:@[[
NSString
fus_
localString
:
@"闪光关闭"
],[
NSString
fus_l
ocalString
:
@"反转镜头"
]]
withImages
:@[
@"live_icon_turnOnLine"
,
@"live_icon_changeCamera"
]
withTypes
:
@[
@
(
FUSFaceBeautyTurnOnLight
),
...
...
FuSiLive/Classes/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveChatInputToolView.swift
View file @
fb4b2ae1
...
...
@@ -265,15 +265,15 @@ class FUSLiveChatInputToolView: UIView {
case
FUSLiveBottomToolTypePK
:
profileLb
.
text
=
FUSLocalizationHelper
.
localString
(
"PK"
)
case
FUSLiveBottomToolTypeStartPictureInPicture
:
profileLb
.
text
=
FUSLocalizationHelper
.
versionL
ocalString
(
"小窗播放"
)
profileLb
.
text
=
FUSLocalizationHelper
.
l
ocalString
(
"小窗播放"
)
case
FUSLiveBottomToolTypeRoomSetting
:
profileLb
.
text
=
FUSLocalizationHelper
.
versionL
ocalString
(
"房间设置"
)
profileLb
.
text
=
FUSLocalizationHelper
.
l
ocalString
(
"房间设置"
)
case
FUSLiveBottomToolTypeLiveSetting
:
profileLb
.
text
=
FUSLocalizationHelper
.
versionL
ocalString
(
"直播设置"
)
profileLb
.
text
=
FUSLocalizationHelper
.
l
ocalString
(
"直播设置"
)
case
FUSLiveBottomToolTypeExchange
:
profileLb
.
text
=
FUSLocalizationHelper
.
versionL
ocalString
(
"兑换"
)
profileLb
.
text
=
FUSLocalizationHelper
.
l
ocalString
(
"兑换"
)
case
FUSLiveBottomToolTypeNovaBuild
:
profileLb
.
text
=
FUSLocalizationHelper
.
versionL
ocalString
(
"新星养成"
)
profileLb
.
text
=
FUSLocalizationHelper
.
l
ocalString
(
"新星养成"
)
default
:
break
}
...
...
FuSiLive/Classes/NewLive/Main/View/FunctionView/LiveSettingAlertView/FUSLiveAnchorSettingAlertView.m
View file @
fb4b2ae1
...
...
@@ -95,8 +95,8 @@
self
.
models
=
[
NSMutableArray
array
];
FUSLiveAnchorSettingModel
*
folderMsg
=
[[
FUSLiveAnchorSettingModel
alloc
]
init
];
folderMsg
.
title
=
[
NSString
fus_
versionL
ocalString
:
@"观众入场消息折叠"
];
folderMsg
.
subtitle
=
[
NSString
fus_
versionL
ocalString
:
@"从未升级VIP的玩家,入场消息将被折叠展现"
];
folderMsg
.
title
=
[
NSString
fus_
l
ocalString
:
@"观众入场消息折叠"
];
folderMsg
.
subtitle
=
[
NSString
fus_
l
ocalString
:
@"从未升级VIP的玩家,入场消息将被折叠展现"
];
NSUserDefaults
*
userDefaults
=
[[
NSUserDefaults
alloc
]
initWithSuiteName
:
FUSCacheDataShare
.
shareStore
.
userDetailInfo
.
uid
];
if
([
userDefaults
valueForKey
:
UD_KEY_WelcomeMessageFoldSwitch
])
{
...
...
@@ -118,8 +118,8 @@
if
(
@available
(
iOS
15
.
0
,
*
))
{
if
(
!
self
.
isAnchor
)
{
FUSLiveAnchorSettingModel
*
minimuze
=
[[
FUSLiveAnchorSettingModel
alloc
]
init
];
minimuze
.
title
=
[
NSString
fus_
versionL
ocalString
:
@"自动小窗播放"
];
minimuze
.
subtitle
=
[
NSString
fus_
versionL
ocalString
:
@"直播间内切换至App外时,保存直播间小窗播放"
];
minimuze
.
title
=
[
NSString
fus_
l
ocalString
:
@"自动小窗播放"
];
minimuze
.
subtitle
=
[
NSString
fus_
l
ocalString
:
@"直播间内切换至App外时,保存直播间小窗播放"
];
BOOL
switchState
=
[[
NSUserDefaults
fus_readCurrentUserObjectWithKey
:
UD_KEY_OPEN_ROOM_MINIMIZE
]
boolValue
];
minimuze
.
switchState
=
switchState
;
__weak
typeof
(
minimuze
)
weakMinimuze
=
weakMinimuze
;
...
...
@@ -157,8 +157,8 @@
if
(
self
.
isAnchor
)
{
self
.
interactionGameItem
=
[[
FUSLiveAnchorSettingModel
alloc
]
init
];
self
.
interactionGameItem
.
title
=
[
NSString
fus_
versionL
ocalString
:
@"互动游戏"
];
self
.
interactionGameItem
.
subtitle
=
[
NSString
fus_
versionL
ocalString
:
@"主播可自行决定,本直播间玩家下方是否有互动游戏界面"
];
self
.
interactionGameItem
.
title
=
[
NSString
fus_
l
ocalString
:
@"互动游戏"
];
self
.
interactionGameItem
.
subtitle
=
[
NSString
fus_
l
ocalString
:
@"主播可自行决定,本直播间玩家下方是否有互动游戏界面"
];
self
.
interactionGameItem
.
switchState
=
FUSLiveHelper
.
shareInstance
.
roomInfoModel
.
stateSwitch
.
liveGameState
;
...
...
@@ -271,7 +271,7 @@
-
(
UILabel
*
)
themeLabel
{
if
(
!
_themeLabel
)
{
_themeLabel
=
[[
UILabel
alloc
]
init
];
_themeLabel
.
text
=
[
NSString
fus_
versionL
ocalString
:
@"房间设置"
];
_themeLabel
.
text
=
[
NSString
fus_
l
ocalString
:
@"房间设置"
];
_themeLabel
.
textAlignment
=
NSTextAlignmentCenter
;
_themeLabel
.
font
=
[
UIFont
fus_themeBoldFont
:
16
];
_themeLabel
.
textColor
=
[
UIColor
fus_textColorDeep
];
...
...
FuSiLive/Classes/NewLive/Main/View/Push/FUSLiveStartView.m
View file @
fb4b2ae1
...
...
@@ -196,7 +196,7 @@
[
FUSResponsibilityConfirmAlertView
fus_showOn
:
self
type
:
0
clickHandler
:^
(
NSInteger
clickType
)
{
if
(
clickType
==
0
)
{
// 未勾选完所有就点确定
[
FUSAlertView
showAlertWithTitle
:
nil
message
:[
NSString
fus_
versionLocalString
:
@"您需要勾選所有確認事項後 開啟直播"
]
cancelButtonTitle
:
nil
otherButtonTitles
:
@[[
NSString
fus_versionLocalString
:
@"確認
"
]]
clickBlock
:^
(
NSInteger
buttonIndex
)
{
[
FUSAlertView
showAlertWithTitle
:
nil
message
:[
NSString
fus_
localString
:
@"您需要勾选所有确认事项后 开启直播"
]
cancelButtonTitle
:
nil
otherButtonTitles
:
@[[
NSString
fus_localString
:
@"确认
"
]]
clickBlock
:^
(
NSInteger
buttonIndex
)
{
}];
}
else
if
(
clickType
==
1
)
{
...
...
FuSiLive/Classes/NewsFeed/RichEditor/Controller/FUSPublishNewsFeedViewController.m
View file @
fb4b2ae1
...
...
@@ -683,7 +683,7 @@ FUSImagePickerViewControllerDelegate>
[
FUSResponsibilityConfirmAlertView
fus_showOn
:
self
.
view
type
:
1
clickHandler
:^
(
NSInteger
clickType
)
{
if
(
clickType
==
0
)
{
// 未勾选完所有就点确定
[
FUSAlertView
showAlertWithTitle
:
nil
message
:[
NSString
fus_
versionLocalString
:
@"您需要勾選所有確認事項後發佈"
]
cancelButtonTitle
:
nil
otherButtonTitles
:
@[[
NSString
fus_versionLocalString
:
@"確認
"
]]
clickBlock
:^
(
NSInteger
buttonIndex
)
{
[
FUSAlertView
showAlertWithTitle
:
nil
message
:[
NSString
fus_
localString
:
@"您需要勾选所有确认事项后发布"
]
cancelButtonTitle
:
nil
otherButtonTitles
:
@[[
NSString
fus_localString
:
@"确认
"
]]
clickBlock
:^
(
NSInteger
buttonIndex
)
{
}];
}
else
if
(
clickType
==
1
)
{
...
...
FuSiLive/Classes/NewsFeed/RichEditor/Controller/WGBaseRichEditorViewController.m
View file @
fb4b2ae1
...
...
@@ -213,7 +213,7 @@ WKScriptMessageHandler
[
FUSResponsibilityConfirmAlertView
fus_showOn
:
self
.
view
type
:
1
clickHandler
:^
(
NSInteger
clickType
)
{
if
(
clickType
==
0
)
{
// 未勾选完所有就点确定
[
FUSAlertView
showAlertWithTitle
:
nil
message
:[
NSString
fus_
versionLocalString
:
@"您需要勾選所有確認事項後發佈"
]
cancelButtonTitle
:
nil
otherButtonTitles
:
@[[
NSString
fus_versionLocalString
:
@"確認
"
]]
clickBlock
:^
(
NSInteger
buttonIndex
)
{
[
FUSAlertView
showAlertWithTitle
:
nil
message
:[
NSString
fus_
localString
:
@"您需要勾选所有确认事项后发布"
]
cancelButtonTitle
:
nil
otherButtonTitles
:
@[[
NSString
fus_localString
:
@"确认
"
]]
clickBlock
:^
(
NSInteger
buttonIndex
)
{
}];
}
else
if
(
clickType
==
1
)
{
...
...
FuSiLive/Classes/ZhaiXin/Main/Controller/FUSSingleLiveRecordViewController.m
View file @
fb4b2ae1
...
...
@@ -102,7 +102,7 @@
#pragma mark - UI
-
(
void
)
setNavBarItem
{
self
.
navigationItem
.
title
=
[
NSString
fus_
versionLocalString
:
@"視訊/聲訊通話記錄
"
];
self
.
navigationItem
.
title
=
[
NSString
fus_
localString
:
@"视讯/声讯通话记录
"
];
FUSButton
*
backButton
=
[
FUSButton
buttonWithType
:
UIButtonTypeCustom
];
backButton
.
frame
=
CGRectMake
(
0
,
0
,
44
,
44
);
...
...
FuSiLive/Classes/ZhaiXin/Main/View/FUSSingleChatTableViewCell.m
View file @
fb4b2ae1
...
...
@@ -113,7 +113,7 @@
_nameLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@%@"
,
FUSConfig
.
sharedInstanced
.
appConfigs
.
appName
,
FUSLocalizationHelper
.
localString
(
@"伴聊"
)];
[
_headPicImageView
setImage
:[
UIImage
imageNamed
:
@"chat_im_yabao_accompany"
]];
}
else
if
([
_model
.
typeId
hasPrefix
:
SINGLE_LIVE_RECORD
])
{
_nameLabel
.
text
=
[
NSString
fus_
versionL
ocalString
:
@"私房通话记录"
];
_nameLabel
.
text
=
[
NSString
fus_
l
ocalString
:
@"私房通话记录"
];
_model
.
unread
=
[[
NSUserDefaults
standardUserDefaults
]
objectForKey
:
FUSBO_SINGLE_LIVE_RECORD_COUNT
([
FUSCacheDataShare
shareStore
].
userDetailInfo
.
uid
)];
[
_headPicImageView
setImage
:[
UIImage
imageNamed
:
@"ZhaiXin_Cell_Single_Live_Record"
]];
}
else
if
([
_model
.
typeId
hasPrefix
:
NEWS_FEED_MESSAGE
]){
...
...
FuSiLive/Classes/ZhaiXin/Main/View/FUSSingleLiveRecordV2TableViewCell.m
View file @
fb4b2ae1
...
...
@@ -126,7 +126,7 @@
self
.
callCommentBtn
=
[
UIButton
buttonWithType
:
UIButtonTypeCustom
];
self
.
callCommentBtn
.
titleLabel
.
font
=
[
UIFont
fus_themeFont
:
9
];
[
self
.
callCommentBtn
setTitleColor
:[
UIColor
fus_textColorMedium
]
forState
:
UIControlStateNormal
];
[
self
.
callCommentBtn
setTitle
:[
NSString
fus_
versionL
ocalString
:
@"评分"
]
forState
:
UIControlStateNormal
];
[
self
.
callCommentBtn
setTitle
:[
NSString
fus_
l
ocalString
:
@"评分"
]
forState
:
UIControlStateNormal
];
self
.
callCommentBtn
.
layer
.
cornerRadius
=
9
;
self
.
callCommentBtn
.
layer
.
borderColor
=
[
UIColor
colorWithHex
:
@"#CDCDCD"
].
CGColor
;
self
.
callCommentBtn
.
layer
.
borderWidth
=
1
;
...
...
@@ -181,7 +181,7 @@
self
.
callAlreadyCommentLabel
=
[[
UILabel
alloc
]
init
];
self
.
callAlreadyCommentLabel
.
font
=
[
UIFont
fus_themeMediumFont
:
10
];
self
.
callAlreadyCommentLabel
.
textColor
=
[
UIColor
fus_textColorMedium
];
self
.
callAlreadyCommentLabel
.
text
=
[
NSString
fus_
versionLocalString
:
@"已評
分"
];
self
.
callAlreadyCommentLabel
.
text
=
[
NSString
fus_
localString
:
@"已评
分"
];
[
self
.
callAlreadyCommentBgView
addSubview
:
self
.
callAlreadyCommentLabel
];
[
self
.
callAlreadyCommentLabel
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
right
.
equalTo
(
gradeStarsBgView
.
mas_left
).
offset
(
-
7
);
...
...
FuSiLive/Classes/Zone/Controller/FireFlyMyZone/FUSZoneTaskCenterViewController.m
View file @
fb4b2ae1
...
...
@@ -90,7 +90,7 @@ static NSString *const reuseIdentifyCell = @"cell";
self
.
liveAwardTaskModel
=
[[
FUSZoneTaskInfoMModel
alloc
]
init
];
self
.
liveAwardTaskModel
.
type
=
@"0"
;
self
.
liveAwardTaskModel
.
name
=
[
NSString
fus_
versionL
ocalString
:
@"奖励领取"
];
self
.
liveAwardTaskModel
.
name
=
[
NSString
fus_
l
ocalString
:
@"奖励领取"
];
[
self
fus_initNav
];
...
...
FuSiLive/Classes/Zone/Other/FUSZoneHttpRequest.m
View file @
fb4b2ae1
...
...
@@ -718,7 +718,7 @@
if
(
!
dataModel
)
{
dataModel
=
[[
FUSZoneTaskInfoMModel
alloc
]
init
];
dataModel
.
type
=
@"0"
;
dataModel
.
name
=
[
NSString
fus_
versionL
ocalString
:
@"奖励领取"
];
dataModel
.
name
=
[
NSString
fus_
l
ocalString
:
@"奖励领取"
];
}
success
(
dataModel
);
...
...
@@ -920,7 +920,7 @@
+
(
void
)
fus_requestUserUpdateNickname
:
(
NSString
*
)
nickname
success
:
(
void
(
^
)(
void
))
success
failure
:
(
void
(
^
)(
NSString
*
msg
,
int
code
))
failure
{
if
(
nickname
.
length
<=
0
)
{
failure
(
FUSLocalizationHelper
.
versionL
ocalString
(
@"昵称不能为空"
),
-
1
);
failure
(
FUSLocalizationHelper
.
l
ocalString
(
@"昵称不能为空"
),
-
1
);
return
;
}
NSDictionary
*
params
=
@{
@"nickname"
:
nickname
};
...
...
FuSiLive/Classes/Zone/View/FireFlyView/View/FUSZoneCanSendNewsFeedTipView.m
View file @
fb4b2ae1
...
...
@@ -110,7 +110,7 @@
-
(
void
)
customInit
{
// self.tipLabel.text = FUSLocalizationHelper.localString(@"可以在这里分享內容哦~");
self
.
tipLabel
.
text
=
[
NSString
fus_
versionLocalString
:
@"發
帖文"
];
self
.
tipLabel
.
text
=
[
NSString
fus_
localString
:
@"发
帖文"
];
self
.
tipBGImageView
.
image
=
[
UIImage
imageNamed
:[
FUSRTL
RTLImageName
:
@"zone_pop_tip_bg"
]];
}
...
...
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterTableViewCell.m
View file @
fb4b2ae1
...
...
@@ -128,7 +128,7 @@ static NSString *const reuseIdentifyNoTaskCell = @"FUSMissionCenterNoTaskCell";
if
(
_currentModel
.
tasklist
.
count
==
0
)
{
FUSMissionCenterNoTaskCell
*
cell
=
[
tableView
dequeueReusableCellWithIdentifier
:
reuseIdentifyNoTaskCell
forIndexPath
:
indexPath
];
cell
.
selectionStyle
=
UITableViewCellSelectionStyleNone
;
cell
.
noTaskLabel
.
text
=
[
NSString
fus_
versionL
ocalString
:
@"暂无可领取的奖励"
];
cell
.
noTaskLabel
.
text
=
[
NSString
fus_
l
ocalString
:
@"暂无可领取的奖励"
];
return
cell
;
}
...
...
@@ -191,7 +191,7 @@ static NSString *const reuseIdentifyNoTaskCell = @"FUSMissionCenterNoTaskCell";
if
(
_currentModel
.
tasklist
.
count
==
0
)
{
FUSMissionCenterNoTaskCell
*
cell
=
[
tableView
dequeueReusableCellWithIdentifier
:
reuseIdentifyNoTaskCell
forIndexPath
:
indexPath
];
cell
.
selectionStyle
=
UITableViewCellSelectionStyleNone
;
cell
.
noTaskLabel
.
text
=
[
NSString
fus_
versionL
ocalString
:
@"暂无可领取的奖励"
];
cell
.
noTaskLabel
.
text
=
[
NSString
fus_
l
ocalString
:
@"暂无可领取的奖励"
];
return
cell
;
}
...
...
FuSiLive/Resources/LocalizationString/Fusi_Chinese.strings
View file @
fb4b2ae1
...
...
@@ -18,7 +18,7 @@
"取消" = "取消";
"确定" = "
确
定";
"确定" = "
確
定";
"您搜索的用户不存在,去#热门#看看吧" = "您搜索的用户不存在,去#热门#看看吧";
...
...
@@ -52,8 +52,6 @@
"来播点什么呢" = "来播点什么呢";
"开始直播" = "开始直播";
"开始即同意" = "开始即同意";
"《直播 & 社区公约》" = "《直播 & 社區公約》";
...
...
@@ -108,8 +106,6 @@
"多选" = "多选";
"邀请" = "邀请";
"好友申请三天内有效" = "好友申请三天内有效";
"您还没有收到消息" = "您还没有收到消息";
...
...
@@ -382,8 +378,6 @@
"复制失败" = "复制失败";
"分享失败" = "分享失败";
"等级" = "等级";
"时" = "时";
...
...
@@ -550,16 +544,14 @@
"每分钟" = "每分钟";
"美颜设置" = "美
颜设
置";
"美颜设置" = "美
顏設
置";
"反转镜头" = "反
转镜头
";
"反转镜头" = "反
轉鏡頭
";
"美颜关闭" = "美颜关闭";
"美颜开启" = "美颜开启";
"切换摄像头" = "切换摄像头";
"开启闪光灯" = "开启闪光灯";
"关闭闪光灯" = "关闭闪光灯";
...
...
@@ -580,8 +572,6 @@
"举报" = "举报";
"粉丝" = "粉丝";
"魅力" = "魅力";
"富豪" = "富豪";
...
...
@@ -600,8 +590,6 @@
"本次直播已结束" = "本次直播已结束";
"直播时长" = "直播时长";
"新增追踪" = "新增追踪";
"确定要开始直播吗?" = "确定要开始直播吗?";
...
...
@@ -752,8 +740,6 @@
"我的游戏" = "我的游戏";
"设置" = "设置";
"账号绑定" = "账号绑定";
"手机号" = "手机号";
...
...
@@ -776,9 +762,7 @@
"帮助" = "帮助";
"评分" = "评分";
"已评分" = "已评分";
"评分" = "評分";
"关于" = "关于";
...
...
@@ -926,8 +910,6 @@
"密码错误" = "密码错误";
"请输入密码" = "请输入密码";
"手机号码" = "手机号码";
"验证码" = "验证码";
...
...
@@ -978,8 +960,6 @@
"完成" = "完成";
"请输入昵称" = "请输入昵称";
"请选择性别" = "请选择性别";
"去更新" = "去更新";
...
...
@@ -1104,9 +1084,9 @@
"重录" = "重录";
"闪光开启" = "
闪光开启
";
"闪光开启" = "
閃光開啓
";
"闪光关闭" = "
闪光关闭
";
"闪光关闭" = "
閃光關閉
";
"美白" = "美白";
...
...
@@ -1232,8 +1212,6 @@
"暂时没有赠出记录" = "暂时没有赠出记录";
"赠出宝石" = "赠出宝石";
"视频" = "视频";
"签名" = "签名";
...
...
@@ -1248,8 +1226,6 @@
"当前网络不好,下拉刷新试试" = "当前网络不好,下拉刷新试试";
"点击更换头像" = "点击更换头像";
"排名" = "排名";
"手机号已绑定" = "手机号已绑定";
...
...
@@ -1308,8 +1284,6 @@
"萤火提现" = "萤火提现";
"累计萤火" = "累计萤火";
"现金提现" = "现金提现";
"当前可提现萤火" = "当前可提现萤火";
...
...
@@ -1334,7 +1308,7 @@
"相机胶卷" = "相机胶卷";
"直播设置" = "直播
设
置";
"直播设置" = "直播
設
置";
"关闭动态码率" = "关闭动态码率";
...
...
@@ -1434,7 +1408,7 @@
"兑换黄金萤火虫" = "兑换黄金萤火虫";
"兑换" = "
兑换
";
"兑换" = "
兌換
";
"去兑换" = "去兑换";
...
...
@@ -1612,7 +1586,7 @@
"%@个直播间" = "%@个直播间";
"昵称不能为空" = "
昵称不能为
空";
"昵称不能为空" = "
暱稱不能爲
空";
"VIP中心" = "VIP中心";
...
...
@@ -1720,7 +1694,7 @@
"请上传您喜欢的头像和设定昵称" = "请上传您喜欢的头像和设定昵称";
"点击更换头像" = "
点击更换头
像";
"点击更换头像" = "
點擊更換頭
像";
"取消追踪" = "取消追踪";
...
...
@@ -1732,8 +1706,6 @@
"首次免费" = "首次免费";
"性别只能修改一次" = "性别只能修改一次";
"生日只能修改一次" = "生日只能修改一次";
"提交" = "提交";
...
...
@@ -1742,3 +1714,174 @@
"保存失败" = "保存失败";
"按时间" = "按時間";
"按热度" = "按熱度";
"全部追踪" = "全部追蹤";
"FUSI 新星" = "FUSI 新星";
"修改昵称消耗 %@ x1" = "修改暱稱消耗 %@ x1";
"修改珍爱团名消耗 %@ x1" = "修改珍愛團名消耗 %@ x1";
"修改珍爱团名" = "修改珍愛團名";
"改名卡" = "改名卡";
"改名卡(10宝石)" = "改名卡(10寶石)";
"珍爱团改名卡" = "珍愛團改名卡";
"请输入昵称" = "請輸入昵稱";
"请输入珍爱团名" = "請輸入珍爱团名";
"我们拒绝涉及暴力或明显裸露、性暗示的暱称。" = "我們拒絕涉及暴力或明顯裸露、性暗示的暱稱。";
"开始直播" = "開始直播";
"确认您年满17周岁" = "确认您年满17周岁";
"确认直播行为符合您所在国家的法律" = "確認直播行為符合您所在國家的法律";
"确认直播沟通没有欺诈与伤害" = "確認直播溝通沒有欺詐與傷害";
"分享" = "分享";
"确认分享的内容符合您所在国家的法律" = "確認分享的內容符合您所在國家的法律";
"同意且遵守" = "同意且遵守";
"未发现追踪的主播直播" = "未發現追蹤的主播直播";
"猜你想要" = "猜你想要";
"宝石消息" = "寶石消息";
"露水消息" = "露水消息";
"萤火消息" = "螢火消息";
"邀请&追踪" = "邀請&追蹤";
"邀请" = "邀請";
"开启通知,随时接收好友私信" = "開啟通知,隨時接收好友私信";
"开启" = "開啟";
"私信" = "私信";
"亲密" = "親密";
"粉丝" = "粉絲";
"我是主播" = "我是主播";
"填写邀请码" = "填寫邀請碼";
"邀请奖励" = "邀請獎勵";
"任务奖励" = "任務獎勵";
"赠出宝石" = "贈出寶石";
"幫助" = "幫助";
"设置" = "設置";
"可提现" = "可提現";
"直播任务" = "直播任務";
"人气加成" = "人氣加成";
"直播时长" = "直播時長";
"累计萤火" = "累計螢火";
"私房设置" = "私房設置";
"主播养成" = "主播養成";
"活动" = "活動";
"亲密度" = "親密度";
"未知国家" = "未知國家";
"由于直播内容涉及违规\n本直播已中断" = "由於直播內容涉及違規\n本直播已中斷";
"观众入场消息折叠" = "觀衆入場消息摺疊";
"从未升级VIP的玩家,入场消息将被折叠展现" = "從未升級VIP的玩家,入場消息將被摺疊展現";
"自动小窗播放" = "自動小窗播放";
"直播间内切换至App外时,保存直播间小窗播放" = "直播間內切換至App外時,保存直播間小窗播放";
"互动游戏" = "互動遊戲";
"主播可自行决定,本直播间玩家下方是否有互动游戏界面" = "主播可自行決定,本直播間玩家下方是否有互動遊戲界面";
"房间设置" = "房間設置";
"上榜" = "上榜";
"超越上一名" = "超越上一名";
"开通VIP,享受豪华特权" = "開通VIP,享受豪華特權";
"去开通" = "去開通";
"观看人数" = "觀看人數";
"贡献榜" = "貢獻榜";
"打开麦克风" = "打開麥克風";
"麦克风已关闭" = "麥克風已關閉";
"关闭麦克风" = "關閉麥克風";
"麦克风已开启" = "麥克風已開啓";
"镜像" = "鏡像";
"已关闭画面镜像" = "已關閉畫面鏡像";
"关闭镜像" = "關閉鏡像";
"已开启画面镜像" = "已開啓畫面鏡像";
"小窗播放" = "小窗播放";
"新星养成" = "新星養成";
"您需要勾选所有确认事项后 开启直播" = "您需要勾選所有確認事項後 開啟直播";
"确认" = "確認";
"您需要勾选所有确认事项后发布" = "您需要勾選所有確認事項後發佈";
"视讯/声讯通话记录" = "視訊/聲訊通話記錄";
"私房通话记录" = "私房通話記錄";
"奖励领取" = "獎勵領取";
"发帖文" = "發帖文";
"暂无可领取的奖励" = "暫無可領取的獎勵";
"更换头像" = "更換頭像";
"已评分" = "已評分";
"还原" = "還原";
"确认&更换" = "確認&更換";
"1.请提供高清品质的图片作为头像和封面。\n2.请确认您的头像和封面不涉及违反您所在国法律的内容。\n3.请确认您的头像和封面没有涉及暴力和过度暴露、色情的图片。\n4.请确认您的头像和封面尊重您社交群体的文化。" = "1.請提供高清品質的圖片作為頭像和封面。\n2.請確認您的頭像和封面不涉及違反您所在國法律的內容。\n3.請確認您的頭像和封面沒有涉及暴力和過度暴露、色情的圖片。\n4.請確認您的頭像和封面尊重您社交群體的文化。";
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment