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

中英文修改

Browse Source
This commit is contained in:
18401019693
2023-10-09 16:27:54 +08:00
parent 45ad8a9810
commit 7b62409bf1
29 changed files with 299 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java
View File

@@ -152,7 +152,7 @@ public class SudGameListPopup extends BottomPopupView {
}
});
mRefreshView.initData();
mRefreshView.setEmptyLayoutId(R.layout.sud_no_data);
mRefreshView.setEmptyLayoutId(R.layout.sud_no_data1);
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.random_start), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
@@ -168,6 +168,12 @@ public class SudGameListPopup extends BottomPopupView {
.asCustom(new LiveSudGamePopup(getContext(), data))
.show();
dialog.dismiss();
}else {
if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("当前没有可加入的房间");
} else {
ToastUtil.show("There are currently no rooms to join");
}
}
}

5
common/src/main/java/com/yunbao/common/views/LiveNewWishGiftPopup.java
View File

@@ -2,6 +2,7 @@ package com.yunbao.common.views;
import android.graphics.Color;
import android.util.Log;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -88,7 +89,7 @@ public class LiveNewWishGiftPopup extends BottomPopupView {
for (int i = 0; i < 3; i++) {
TextView wishItem = (TextView) LayoutInflater.from(getContext())
.inflate(R.layout.view_tablaout_wish_item, null, false);
wishItem.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15);
switch (i) {
case 0:
wishItem.setText(R.string.live_gift);
@@ -112,7 +113,7 @@ public class LiveNewWishGiftPopup extends BottomPopupView {
View tab = tabs.getChildAt(i);
LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) tab.getLayoutParams();
layoutParams.setMarginEnd(DpUtil.dp2px(4));
layoutParams.width = DpUtil.dp2px(58);
layoutParams.width = DpUtil.dp2px(90);
tab.setLayoutParams(layoutParams);
wishTab.requestLayout();
}

10
common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java
View File

@@ -202,7 +202,7 @@ public class LiveNewWishListPopup extends BottomPopupView {
ViewList.add(zhouXinFragment);
ViewList.add(lunarWishFragment);
ViewList.add(seasonalWishFragment);
if (TextUtils.equals(ct, "zh")) {
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
wishListTop.setBackgroundResource(R.drawable.wish_list_day_zh);
} else {
wishListTop.setBackgroundResource(R.drawable.wish_list_day_en);
@@ -254,7 +254,7 @@ public class LiveNewWishListPopup extends BottomPopupView {
type = tab.getId() + 1;
switch (type) {
case 1:
if (TextUtils.equals(ct, "zh")) {
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
wishListTop.setBackgroundResource(R.drawable.wish_list_day_zh);
} else {
wishListTop.setBackgroundResource(R.drawable.wish_list_day_en);
@@ -262,7 +262,7 @@ public class LiveNewWishListPopup extends BottomPopupView {
replacementWish.setText(R.string.replacement_wish_day);
break;
case 2:
if (TextUtils.equals(ct, "zh")) {
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
wishListTop.setBackgroundResource(R.drawable.wish_list_week_zh);
} else {
wishListTop.setBackgroundResource(R.drawable.wish_list_week_en);
@@ -270,7 +270,7 @@ public class LiveNewWishListPopup extends BottomPopupView {
replacementWish.setText(R.string.replacement_wish_zhou);
break;
case 3:
if (TextUtils.equals(ct, "zh")) {
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
wishListTop.setBackgroundResource(R.drawable.wish_list_lunar_zh);
} else {
wishListTop.setBackgroundResource(R.drawable.wish_list_lunar_en);
@@ -278,7 +278,7 @@ public class LiveNewWishListPopup extends BottomPopupView {
replacementWish.setText(R.string.replacement_wish_lunar);
break;
case 4:
if (TextUtils.equals(ct, "zh")) {
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
wishListTop.setBackgroundResource(R.drawable.wish_list_seasonal_zh);
} else {
wishListTop.setBackgroundResource(R.drawable.wish_list_seasonal_en);

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

@@ -36,7 +36,7 @@
<TextView
android:id="@+id/replacement_wish"
android:layout_width="117dp"
android:layout_width="140dp"
android:layout_height="31dp"
android:layout_alignParentEnd="true"
android:layout_marginStart="8dp"

1
common/src/main/res/layout/dialog_live_sud_game.xml
View File

@@ -66,6 +66,7 @@
android:id="@+id/avatar"
android:layout_width="35dp"
android:layout_height="35dp"
android:visibility="gone"
android:layout_marginStart="6dp"
android:scaleType="centerCrop"
app:riv_oval="true" />

4
common/src/main/res/layout/hint_custom_popup.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="270dp"
android:layout_height="180dp"
android:layout_width="290dp"
android:layout_height="200dp"
app:cardCornerRadius="18dp"
app:cardElevation="16dp">

13
common/src/main/res/layout/sud_no_data1.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:background="#201E1A"
android:textColor="@color/white"
android:text="@string/interactive_game_rooms_oin" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1104,7 +1104,7 @@ Limited ride And limited avatar frame</string>
<string name="replacement_wish_day">Reset Your: Day</string>
<string name="replacement_wish_zhou">Reset Wish: Week</string>
<string name="replacement_wish_lunar">Reset Wish: Month</string>
<string name="replacement_wish_seasonal">Reset Wish: Month</string>
<string name="replacement_wish_seasonal">Reset Wish: seasonal</string>
<string name="replacement_reset_confirmed">Is reset confirmed</string>
<string name="replacement_reset_confirmed_hint">Resetting will empty the wish list, \nregardless of whether the wish is completed or not</string>
<string name="replacement_reset_confirmed_sure">Confirm Reset</string>
@@ -1354,5 +1354,11 @@ Limited ride And limited avatar frame</string>
<string name="interactive_game_search_room_broadcast_room">Whether to enter the live broadcast room</string>
<string name="interactive_game_search_room_bhe_game">No，only enter the game</string>
<string name="interactive_game_rooms_oin">There are currently no rooms to join</string>
<string name="prank_switch">Turntable prank switch</string>
<string name="see_the_contents_of">After closing, all users will not be able to see the contents of the turntable</string>
<string name="diamonds_every_time">The turntable consumes diamonds every time</string>
<string name="diamonds_every_time_requirement_of">Minimum requirement of 1000 diamonds</string>
<string name="diamonds_every_time_requirement_of_hint">Fill in the content of the prank，Fill in a minimum of 2 words and a maximum of 10 words</string>
<string name="prank_content_yet_hint">You have not set up the prank content yet</string>
</resources>

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

@@ -1351,4 +1351,10 @@
<string name="interactive_game_search_room_broadcast_room">是否同步進入主播直播間</string>
<string name="interactive_game_search_room_bhe_game">否，僅進入遊戲</string>
<string name="interactive_game_rooms_oin">当前没有可加入的房间</string>
<string name="prank_switch">轉盤整蠱開關</string>
<string name="see_the_contents_of">關閉後所有用戶將無法看到轉盤內容</string>
<string name="diamonds_every_time">轉盤每次消耗鑽石</string>
<string name="diamonds_every_time_requirement_of">最少1,000鑽石起步</string>
<string name="diamonds_every_time_requirement_of_hint">填寫整蠱內容，最少2個字，最多10個字</string>
<string name="prank_content_yet_hint">您目前還未設置整蠱內容</string>
</resources>

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

@@ -1350,4 +1350,10 @@
<string name="interactive_game_search_room_broadcast_room">是否同步進入主播直播間</string>
<string name="interactive_game_search_room_bhe_game">否，僅進入遊戲</string>
<string name="interactive_game_rooms_oin">当前没有可加入的房间</string>
<string name="prank_switch">轉盤整蠱開關</string>
<string name="see_the_contents_of">關閉後所有用戶將無法看到轉盤內容</string>
<string name="diamonds_every_time">轉盤每次消耗鑽石</string>
<string name="diamonds_every_time_requirement_of">最少1,000鑽石起步</string>
<string name="diamonds_every_time_requirement_of_hint">填寫整蠱內容，最少2個字，最多10個字</string>
<string name="prank_content_yet_hint">您目前還未設置整蠱內容</string>
</resources>

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

@@ -1350,5 +1350,11 @@
<string name="interactive_game_search_room_broadcast_room">是否同步進入主播直播間</string>
<string name="interactive_game_search_room_bhe_game">否，僅進入遊戲</string>
<string name="interactive_game_rooms_oin">当前没有可加入的房间</string>
<string name="prank_switch">轉盤整蠱開關</string>
<string name="see_the_contents_of">關閉後所有用戶將無法看到轉盤內容</string>
<string name="diamonds_every_time">轉盤每次消耗鑽石</string>
<string name="diamonds_every_time_requirement_of">最少1,000鑽石起步</string>
<string name="diamonds_every_time_requirement_of_hint">填寫整蠱內容，最少2個字，最多10個字</string>
<string name="prank_content_yet_hint">您目前還未設置整蠱內容</string>
</resources>

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

@@ -1104,7 +1104,7 @@ Limited ride And limited avatar frame</string>
<string name="replacement_wish_day">Reset Your: Day</string>
<string name="replacement_wish_zhou">Reset Wish: Week</string>
<string name="replacement_wish_lunar">Reset Wish: Month</string>
<string name="replacement_wish_seasonal">Reset Wish: Month</string>
<string name="replacement_wish_seasonal">Reset Wish: seasonal</string>
<string name="replacement_reset_confirmed">Is reset confirmed</string>
<string name="replacement_reset_confirmed_hint">Resetting will empty the wish list, \nregardless of whether the wish is completed or not</string>
<string name="replacement_reset_confirmed_sure">Confirm Reset</string>
@@ -1357,4 +1357,10 @@ Limited ride And limited avatar frame</string>
<string name="interactive_game_search_room_broadcast_room">Whether to enter the live broadcast room</string>
<string name="interactive_game_search_room_bhe_game">No，only enter the game</string>
<string name="interactive_game_rooms_oin">There are currently no rooms to join</string>
<string name="prank_switch">Turntable prank switch</string>
<string name="see_the_contents_of">After closing, all users will not be able to see the contents of the turntable</string>
<string name="diamonds_every_time">The turntable consumes diamonds every time</string>
<string name="diamonds_every_time_requirement_of">Minimum requirement of 1000 diamonds</string>
<string name="diamonds_every_time_requirement_of_hint">Fill in the content of the prank，Fill in a minimum of 2 words and a maximum of 10 words</string>
<string name="prank_content_yet_hint">You have not set up the prank content yet</string>
</resources>