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

修改中英文

Browse Source
This commit is contained in:
18401019693 2023-10-13 16:06:07 +08:00
parent 52e199b901
commit 867029fa3a
7 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.gradle
View File

@ -9,9 +9,9 @@ ext {
] ]
manifestPlaceholders = [ manifestPlaceholders = [
//正式、 //正式、
serverHost : "https://napi.yaoulive.com", // serverHost : "https://napi.yaoulive.com",
// 测试 // 测试
// serverHost : " https://ceshi.yaoulive.com", serverHost : " https://ceshi.yaoulive.com",

23
live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeEditAppDialog.java
View File

@ -16,6 +16,7 @@ import com.lxj.xpopup.XPopup;
import com.yunbao.common.dialog.AbsDialogPopupWindow; import com.yunbao.common.dialog.AbsDialogPopupWindow;
import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R; import com.yunbao.live.R;
public class LiveAnchorEditCallMeEditAppDialog extends AbsDialogPopupWindow { public class LiveAnchorEditCallMeEditAppDialog extends AbsDialogPopupWindow {
@ -74,24 +75,24 @@ public class LiveAnchorEditCallMeEditAppDialog extends AbsDialogPopupWindow {
switch (type) { switch (type) {
case TYPE_LETTER: case TYPE_LETTER:
titleView.setText("填寫信內容"); titleView.setText(WordUtil.isNewZh()?"填寫信內容":"Fill in the letter");
edit.setHint(R.string.live_anchor_edit_call_me_letter_content); edit.setHint(R.string.live_anchor_edit_call_me_letter_content);
title.setText("信內容"); title.setText(WordUtil.isNewZh()?"信內容":"Content of the letter");
break; break;
case TYPE_APP_WECHAT: case TYPE_APP_WECHAT:
titleView.setText("填寫聯系方式"); titleView.setText(WordUtil.isNewZh()?"填寫聯系方式":"Fill in the contact information");
edit.setHint("请输入"); edit.setHint(WordUtil.isNewZh()?"请输入":"Please enter");
title.setText("Wechat账号"); title.setText(WordUtil.isNewZh()?"Wechat账号":"Wechat account");
break; break;
case TYPE_APP_LINE: case TYPE_APP_LINE:
titleView.setText("填寫聯系方式"); titleView.setText(WordUtil.isNewZh()?"填寫聯系方式":"Fill in the contact information");
edit.setHint("请输入"); edit.setHint(WordUtil.isNewZh()?"请输入":"Please enter");
title.setText("Line账号"); title.setText(WordUtil.isNewZh()?"Line账号":"Line account");
break; break;
case TYPE_APP_WHATSAPP: case TYPE_APP_WHATSAPP:
titleView.setText("填寫聯系方式"); titleView.setText(WordUtil.isNewZh()?"填寫聯系方式":"Fill in the contact information");
edit.setHint("请输入"); edit.setHint(WordUtil.isNewZh()?"请输入":"Please enter");
title.setText("WhatsApp账号"); title.setText(WordUtil.isNewZh()?"WhatsApp账号":"WhatsApp Account");
break; break;
} }
} }

4
live/src/main/res/layout/item_live_prank_gift.xml
View File

@ -49,7 +49,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:text="禮物" android:text="@string/live_gift"
android:textColor="#808080" android:textColor="#808080"
android:textSize="10sp" android:textSize="10sp"
app:layout_constraintStart_toEndOf="@+id/gift_icon" app:layout_constraintStart_toEndOf="@+id/gift_icon"
@ -85,7 +85,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="7dp" android:layout_marginTop="7dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:text="数量" android:text="@string/lucky_red_envelope_amount"
android:textColor="#808080" android:textColor="#808080"
android:textSize="10sp" android:textSize="10sp"
app:layout_constraintEnd_toStartOf="@+id/gift_num" app:layout_constraintEnd_toStartOf="@+id/gift_num"

2
live/src/main/res/layout/view_new_live_ready.xml
View File

@ -253,7 +253,7 @@
app:srcCompat="@mipmap/ic_live_ready_letter" /> app:srcCompat="@mipmap/ic_live_ready_letter" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="60dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"

3
main/src/main/java/com/yunbao/main/activity/BindUserActivity.java
View File

@ -38,6 +38,7 @@ import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.main.R; import com.yunbao.main.R;
import com.yunbao.main.event.EditProfileEvent; import com.yunbao.main.event.EditProfileEvent;
import com.yunbao.main.event.RegSuccessEvent; import com.yunbao.main.event.RegSuccessEvent;
@ -204,7 +205,7 @@ public class BindUserActivity extends AbsActivity {
webSettings.setJavaScriptEnabled(true); webSettings.setJavaScriptEnabled(true);
webview.addJavascriptInterface(new JsBridge(), "jsBridge"); webview.addJavascriptInterface(new JsBridge(), "jsBridge");
// 也可以加载本地html(webView.loadUrl("file:///android_asset/xxx.html")) // 也可以加载本地html(webView.loadUrl("file:///android_asset/xxx.html"))
webview.loadUrl(CommonAppConfig.HOST + "/h5/live/TCaptcha.html"); webview.loadUrl(CommonAppConfig.HOST + "/h5/live/TCaptcha.html"+ "?isZh=" + (WordUtil.isNewZh() ? "1" : 0));
allCountries.clear(); allCountries.clear();
allCountries.addAll(Country.getAll(mContext, null)); allCountries.addAll(Country.getAll(mContext, null));

2
main/src/main/java/com/yunbao/main/activity/FindPwdActivity.java
View File

@ -221,7 +221,7 @@ public class FindPwdActivity extends AbsActivity {
webSettings.setJavaScriptEnabled(true); webSettings.setJavaScriptEnabled(true);
webview.addJavascriptInterface(new JsBridge(), "jsBridge"); webview.addJavascriptInterface(new JsBridge(), "jsBridge");
// 也可以加载本地html(webView.loadUrl("file:///android_asset/xxx.html")) // 也可以加载本地html(webView.loadUrl("file:///android_asset/xxx.html"))
webview.loadUrl(CommonAppConfig.HOST +"/h5/live/TCaptcha.html"); webview.loadUrl(CommonAppConfig.HOST + "/h5/live/TCaptcha.html"+ "?isZh=" + (WordUtil.isNewZh() ? "1" : 0));
} }
private void showCountryCode(){ private void showCountryCode(){

3
main/src/main/java/com/yunbao/main/activity/RegisterActivity.java
View File

@ -50,6 +50,7 @@ import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.http.LiveHttpUtil; import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter; import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.main.R; import com.yunbao.main.R;
import com.yunbao.main.event.RegSuccessEvent; import com.yunbao.main.event.RegSuccessEvent;
import com.yunbao.main.http.MainHttpConsts; import com.yunbao.main.http.MainHttpConsts;
@ -239,7 +240,7 @@ public class RegisterActivity extends AbsActivity {
webSettings.setJavaScriptEnabled(true); webSettings.setJavaScriptEnabled(true);
webview.addJavascriptInterface(new JsBridge(), "jsBridge"); webview.addJavascriptInterface(new JsBridge(), "jsBridge");
// 也可以加载本地html(webView.loadUrl("file:///android_asset/xxx.html")) // 也可以加载本地html(webView.loadUrl("file:///android_asset/xxx.html"))
webview.loadUrl(CommonAppConfig.HOST + "/h5/live/TCaptcha.html"); webview.loadUrl(CommonAppConfig.HOST + "/h5/live/TCaptcha.html"+ "?isZh=" + (WordUtil.isNewZh() ? "1" : 0));
} }