yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整中英文

Browse Source 
调整开播频道接口
This commit is contained in:
zlzw
2023-09-02 11:16:01 +08:00
parent 2e907bc1ed
commit 57bda40a82
36 changed files with 274 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common/src/main/java/com/yunbao/common/bean/LiveClassBean.java
View File

@@ -1,6 +1,7 @@
package com.yunbao.common.bean;
import com.alibaba.fastjson.annotation.JSONField;
import com.google.gson.annotations.SerializedName;
/**
* Created by cxf on 2018/9/25.
@@ -16,6 +17,8 @@ public class LiveClassBean {
private boolean checked;
private String chinese;
private String english;
@SerializedName("channel_show")
private int channel_show;
public String getChinese() {
return chinese;
@@ -92,4 +95,12 @@ public class LiveClassBean {
public void setChecked(boolean checked) {
this.checked = checked;
}
public int getChannel_show() {
return channel_show;
}
public void setChannel_show(int channel_show) {
this.channel_show = channel_show;
}
}

12
common/src/main/java/com/yunbao/common/utils/MicStatusManager.java
View File

@@ -134,7 +134,11 @@ public class MicStatusManager {
new Handler(Looper.getMainLooper()).post(new Runnable() {
public void run() {
MicStatusManager.getInstance().clear();
ToastUtil.show("已成功退出語音連麥");
if(WordUtil.isNewZh()) {
ToastUtil.show("已成功退出語音連麥");
}else{
ToastUtil.show("You have successfully exited the voice connection");
}
}
});
}
@@ -193,7 +197,11 @@ public class MicStatusManager {
* 显示退出连麦状态对话框
*/
public void showDownMicDialog(Context context) {
DialogUitl.showSimpleDialog(context, "當前正在連麥中", new DialogUitl.SimpleCallback() {
String content="當前正在連麥中";
if(!WordUtil.isNewZh()){
content="Currently connecting the wheat";
}
DialogUitl.showSimpleDialog(context, content, new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
// downMic(); //不做下麦跳转

17
common/src/main/java/com/yunbao/common/utils/WordUtil.java
View File

@@ -1,5 +1,6 @@
package com.yunbao.common.utils;
import android.content.res.Configuration;
import android.content.res.Resources;
import com.yunbao.common.CommonAppContext;
@@ -31,8 +32,20 @@ public class WordUtil {
String language = locale.getLanguage();
return language.endsWith("zh");
}
public static boolean isNewZh(){
return IMLoginManager.get(CommonAppContext.sInstance).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE;
public static boolean isNewZh() {
return IMLoginManager.get(CommonAppContext.sInstance).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE;
}
public static String getNewString(int res) {
Configuration config = new Configuration();
Configuration tmp = sResources.getConfiguration();
config.setToDefaults();
config.locale = IMLoginManager.get(CommonAppContext.sInstance).getLocaleLanguage();
sResources.updateConfiguration(config, sResources.getDisplayMetrics());
String str = sResources.getString(res);
sResources.updateConfiguration(tmp, sResources.getDisplayMetrics());
return str;
}
/**

2
common/src/main/res/layout/dialog_live_mic_invite.xml
View File

@@ -15,7 +15,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="主播："
android:text="@string/live_mic_anchor_to_user_dialog"
android:textColor="#161616"
android:textStyle="bold"
android:textSize="16sp"

BIN
common/src/main/res/mipmap-b+en+us/icon_user_home_living.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 37 KiB

29
common/src/main/res/values-en-rUS/string.xml
View File

@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<string name="refresh_header_pulling">Drop down to refresh</string>
<string name="refresh_header_refreshing">Refreshing</string>
<string name="refresh_header_pulling">Pull down to refresh</string>
<string name="refresh_header_refreshing">Loading...</string>
<string name="refresh_header_loading">Loading</string>
<string name="refresh_header_release">Release refresh now</string>
<string name="refresh_header_release">Release to refresh</string>
<string name="refresh_header_finish">Refresh finish</string>
<string name="refresh_header_failed">refresh failed</string>
<string name="refresh_header_update">M-d HH:mm</string>
<string name="refresh_footer_pulling">Pull up to load more</string>
<string name="refresh_footer_release">Release load now</string>
<string name="refresh_footer_loading">Loading</string>
<string name="refresh_footer_refreshing">Refreshing</string>
<string name="refresh_footer_refreshing">Loading...</string>
<string name="refresh_footer_finish">Load complete</string>
<string name="refresh_footer_failed">Failed to load</string>
<string name="edit_one_1">Are you sure to use the data?</string>
@@ -181,7 +181,7 @@
<string name="guard_tip_2">You are the current anchor\'s annual guardian \ n the guardian date expires</string>
<string name="guard_gift_tip">Special gift for annual guard</string>
<string name="guard_no_data_2">You haven\'t guarded</string>
<string name="guard_buy_tip">您為當前主播的月守護\n無法開通周守護</string>
<string name="guard_buy_tip">You are the monthly guardian of the current anchor\nUnable to enable weekly guard</string>
<string name="guard_buy_tip_2">You are the monthly guard of the current anchor. Opening the annual guard will cover your monthly guard time. Do you want to open it?</string>
<string name="guard_buy_tip_3">You will spend%1$s%2$s to open%3$s for the anchor</string>
<!-- <string name="guard_name_1">Guardian of the 7 day</string>-->
@@ -832,14 +832,14 @@
<string name="live_hot_give">Heat addition</string>
<string name="live_hot_time">Hot &#38; Time</string>
<string name="live_hot_ruletext1"> 熱度可以給主播的房間增加曝光度，熱度越高的直播間，在首頁的排名也越靠前，從而帶來更多的進房用戶，幫助主播在一段時間內迅速提高房間熱度，送出之後立即生效。</string>
<string name="live_hot_ruletext2">熱度卡如何獲得？</string>
<string name="live_hot_ruletext3">1、周星榜主播冠軍的第一名用戶每週可自動獲得；</string>
<string name="live_hot_ruletext4">2、通過參與官方活動，具體活動可留意官方消息。</string>
<string name="live_hot_ruletext21">熱度卡如何使用？</string>
<string name="live_hot_ruletext22">前往「個人中心」-「我的包裹」中，即可使用熱度卡。</string>
<string name="live_hot_ruletext31">熱度卡生效多久？</string>
<string name="live_hot_ruletext32">對指定主播使用熱度卡後，將會立即生效，效果時長為24小時，不管主播是否在線，熱度時長都將會持續減少</string>
<string name="live_hot_ruletext1">The popularity can increase the exposure to the anchor\'s room. The higher the live broadcast room, the more popular on the homepage, which will bring more users in the house and help the anchor to quickly increase the room heat in a period of time. Immediately after the delivery Effective.</string>
<string name="live_hot_ruletext2">How to get the heat card?</string>
<string name="live_hot_ruletext3">1. The first user of Zhou Xingbang\'s anchor champion can automatically get it every week;</string>
<string name="live_hot_ruletext4">2. By participating in the official activities, the official news can be paid attention to.</string>
<string name="live_hot_ruletext21">How to use the heat card?</string>
<string name="live_hot_ruletext22">Go to the \"Personal Center\"-\"My Package\" to use the heat card.</string>
<string name="live_hot_ruletext31">How long does the heat card take effect?</string>
<string name="live_hot_ruletext32">After using the hot card for the designated anchor, it will take effect immediately. The effect time is 24 hours. Regardless of whether the anchor is online, the heat time will continue to decrease</string>
<string name="welcome_pd">Rewards coming!</string>
<string name="welcome_pd_tip">Receive free
Limited ride And limited avatar frame</string>
@@ -1312,6 +1312,9 @@ Limited ride And limited avatar frame</string>
<string name="cancel_ca">cancel</string>
<string name="settings_ser">settings</string>
<string name="too_many_gifts">Too many gifts</string>
<string name="list_for_lianmai">Current</string>
<string name="user_apply_for_lianmai">Apply for list</string>
<string name="live_mic_anchor_to_user_dialog">Anchor:</string>
</resources>

3
common/src/main/res/values-zh-rHK/strings.xml
View File

@@ -1308,4 +1308,7 @@
<string name="cancel_ca">不再設置</string>
<string name="settings_ser">去設置</string>
<string name="too_many_gifts">重複添加禮物</string>
<string name="list_for_lianmai">當前連麥</string>
<string name="user_apply_for_lianmai">連麥申請</string>
<string name="live_mic_anchor_to_user_dialog">主播：</string>
</resources>

3
common/src/main/res/values-zh-rTW/strings.xml
View File

@@ -1307,4 +1307,7 @@
<string name="cancel_ca">不再設置</string>
<string name="settings_ser">去設置</string>
<string name="too_many_gifts">重複添加禮物</string>
<string name="list_for_lianmai">當前連麥</string>
<string name="user_apply_for_lianmai">連麥申請</string>
<string name="live_mic_anchor_to_user_dialog">主播：</string>
</resources>

3
common/src/main/res/values-zh/strings.xml
View File

@@ -1307,6 +1307,9 @@
<string name="cancel_ca">不再設置</string>
<string name="settings_ser">去設置</string>
<string name="too_many_gifts">重複添加禮物</string>
<string name="list_for_lianmai">當前連麥</string>
<string name="user_apply_for_lianmai">連麥申請</string>
<string name="live_mic_anchor_to_user_dialog">主播：</string>
</resources>

29
common/src/main/res/values/strings.xml
View File

@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<string name="refresh_header_pulling">Drop down to refresh</string>
<string name="refresh_header_refreshing">Refreshing</string>
<string name="refresh_header_pulling">Pull down to refresh</string>
<string name="refresh_header_refreshing">Loading...</string>
<string name="refresh_header_loading">Loading</string>
<string name="refresh_header_release">Release refresh now</string>
<string name="refresh_header_release">Release to refresh</string>
<string name="refresh_header_finish">Refresh finish</string>
<string name="refresh_header_failed">refresh failed</string>
<string name="refresh_header_update">M-d HH:mm</string>
<string name="refresh_footer_pulling">Pull up to load more</string>
<string name="refresh_footer_release">Release load now</string>
<string name="refresh_footer_loading">Loading</string>
<string name="refresh_footer_refreshing">Refreshing</string>
<string name="refresh_footer_refreshing">Loading...</string>
<string name="refresh_footer_finish">Load complete</string>
<string name="refresh_footer_failed">Failed to load</string>
<string name="edit_one_1">Are you sure to use the data?</string>
@@ -181,7 +181,7 @@
<string name="guard_tip_2">You are the current anchor\'s annual guardian \ n the guardian date expires</string>
<string name="guard_gift_tip">Special gift for annual guard</string>
<string name="guard_no_data_2">You haven\'t guarded</string>
<string name="guard_buy_tip">您為當前主播的月守護\n無法開通周守護</string>
<string name="guard_buy_tip">You are the monthly guardian of the current anchor\nUnable to enable weekly guard</string>
<string name="guard_buy_tip_2">You are the monthly guard of the current anchor. Opening the annual guard will cover your monthly guard time. Do you want to open it?</string>
<string name="guard_buy_tip_3">You will spend%1$s%2$s to open%3$s for the anchor</string>
<!-- <string name="guard_name_1">Guardian of the 7 day</string>-->
@@ -832,14 +832,14 @@
<string name="live_hot_give">Heat addition</string>
<string name="live_hot_time">Hot &#38; Time</string>
<string name="live_hot_ruletext1"> 熱度可以給主播的房間增加曝光度，熱度越高的直播間，在首頁的排名也越靠前，從而帶來更多的進房用戶，幫助主播在一段時間內迅速提高房間熱度，送出之後立即生效。</string>
<string name="live_hot_ruletext2">熱度卡如何獲得？</string>
<string name="live_hot_ruletext3">1、周星榜主播冠軍的第一名用戶每週可自動獲得；</string>
<string name="live_hot_ruletext4">2、通過參與官方活動，具體活動可留意官方消息。</string>
<string name="live_hot_ruletext21">熱度卡如何使用？</string>
<string name="live_hot_ruletext22">前往「個人中心」-「我的包裹」中，即可使用熱度卡。</string>
<string name="live_hot_ruletext31">熱度卡生效多久？</string>
<string name="live_hot_ruletext32">對指定主播使用熱度卡後，將會立即生效，效果時長為24小時，不管主播是否在線，熱度時長都將會持續減少</string>
<string name="live_hot_ruletext1">The popularity can increase the exposure to the anchor\'s room. The higher the live broadcast room, the more popular on the homepage, which will bring more users in the house and help the anchor to quickly increase the room heat in a period of time. Immediately after the delivery Effective.</string>
<string name="live_hot_ruletext2">How to get the heat card?</string>
<string name="live_hot_ruletext3">1. The first user of Zhou Xingbang\'s anchor champion can automatically get it every week;</string>
<string name="live_hot_ruletext4">2. By participating in the official activities, the official news can be paid attention to.</string>
<string name="live_hot_ruletext21">How to use the heat card?</string>
<string name="live_hot_ruletext22">Go to the \"Personal Center\"-\"My Package\" to use the heat card.</string>
<string name="live_hot_ruletext31">How long does the heat card take effect?</string>
<string name="live_hot_ruletext32">After using the hot card for the designated anchor, it will take effect immediately. The effect time is 24 hours. Regardless of whether the anchor is online, the heat time will continue to decrease</string>
<string name="welcome_pd">Rewards coming!</string>
<string name="welcome_pd_tip">Receive free
Limited ride And limited avatar frame</string>
@@ -1313,5 +1313,8 @@ Limited ride And limited avatar frame</string>
<string name="cancel_ca">cancel</string>
<string name="settings_ser">settings</string>
<string name="too_many_gifts">Too many gifts</string>
<string name="list_for_lianmai">Current</string>
<string name="user_apply_for_lianmai">Apply for list</string>
<string name="live_mic_anchor_to_user_dialog">Anchor:</string>
</resources>