From 867029fa3ae9368e21831d3372f052e091c0d061 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Fri, 13 Oct 2023 16:06:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 4 ++-- .../LiveAnchorEditCallMeEditAppDialog.java | 23 ++++++++++--------- .../main/res/layout/item_live_prank_gift.xml | 4 ++-- .../main/res/layout/view_new_live_ready.xml | 2 +- .../main/activity/BindUserActivity.java | 3 ++- .../yunbao/main/activity/FindPwdActivity.java | 2 +- .../main/activity/RegisterActivity.java | 3 ++- 7 files changed, 22 insertions(+), 19 deletions(-) diff --git a/config.gradle b/config.gradle index ee238d891..82c20a7d1 100644 --- a/config.gradle +++ b/config.gradle @@ -9,9 +9,9 @@ ext { ] manifestPlaceholders = [ //正式、 - serverHost : "https://napi.yaoulive.com", +// serverHost : "https://napi.yaoulive.com", // 测试 -// serverHost : " https://ceshi.yaoulive.com", + serverHost : " https://ceshi.yaoulive.com", diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeEditAppDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeEditAppDialog.java index b9d4ca107..e4907870e 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeEditAppDialog.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeEditAppDialog.java @@ -16,6 +16,7 @@ import com.lxj.xpopup.XPopup; import com.yunbao.common.dialog.AbsDialogPopupWindow; import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.utils.StringUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; public class LiveAnchorEditCallMeEditAppDialog extends AbsDialogPopupWindow { @@ -74,24 +75,24 @@ public class LiveAnchorEditCallMeEditAppDialog extends AbsDialogPopupWindow { switch (type) { case TYPE_LETTER: - titleView.setText("填寫信內容"); + titleView.setText(WordUtil.isNewZh()?"填寫信內容":"Fill in the letter"); edit.setHint(R.string.live_anchor_edit_call_me_letter_content); - title.setText("信內容"); + title.setText(WordUtil.isNewZh()?"信內容":"Content of the letter"); break; case TYPE_APP_WECHAT: - titleView.setText("填寫聯系方式"); - edit.setHint("请输入"); - title.setText("Wechat账号"); + titleView.setText(WordUtil.isNewZh()?"填寫聯系方式":"Fill in the contact information"); + edit.setHint(WordUtil.isNewZh()?"请输入":"Please enter"); + title.setText(WordUtil.isNewZh()?"Wechat账号":"Wechat account"); break; case TYPE_APP_LINE: - titleView.setText("填寫聯系方式"); - edit.setHint("请输入"); - title.setText("Line账号"); + titleView.setText(WordUtil.isNewZh()?"填寫聯系方式":"Fill in the contact information"); + edit.setHint(WordUtil.isNewZh()?"请输入":"Please enter"); + title.setText(WordUtil.isNewZh()?"Line账号":"Line account"); break; case TYPE_APP_WHATSAPP: - titleView.setText("填寫聯系方式"); - edit.setHint("请输入"); - title.setText("WhatsApp账号"); + titleView.setText(WordUtil.isNewZh()?"填寫聯系方式":"Fill in the contact information"); + edit.setHint(WordUtil.isNewZh()?"请输入":"Please enter"); + title.setText(WordUtil.isNewZh()?"WhatsApp账号":"WhatsApp Account"); break; } } diff --git a/live/src/main/res/layout/item_live_prank_gift.xml b/live/src/main/res/layout/item_live_prank_gift.xml index 1b86bd40c..843dd2b27 100644 --- a/live/src/main/res/layout/item_live_prank_gift.xml +++ b/live/src/main/res/layout/item_live_prank_gift.xml @@ -49,7 +49,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginTop="8dp" - android:text="禮物" + android:text="@string/live_gift" android:textColor="#808080" android:textSize="10sp" app:layout_constraintStart_toEndOf="@+id/gift_icon" @@ -85,7 +85,7 @@ android:layout_height="wrap_content" android:layout_marginTop="7dp" android:layout_marginEnd="8dp" - android:text="数量" + android:text="@string/lucky_red_envelope_amount" android:textColor="#808080" android:textSize="10sp" app:layout_constraintEnd_toStartOf="@+id/gift_num" diff --git a/live/src/main/res/layout/view_new_live_ready.xml b/live/src/main/res/layout/view_new_live_ready.xml index ab804a539..5b6a1682d 100644 --- a/live/src/main/res/layout/view_new_live_ready.xml +++ b/live/src/main/res/layout/view_new_live_ready.xml @@ -253,7 +253,7 @@ app:srcCompat="@mipmap/ic_live_ready_letter" />