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-11-14 16:05:43 +08:00
parent aff5a178a0
commit 82c1d15ca5
9 changed files with 158 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java
View File

@ -202,9 +202,9 @@ public class CreateSudGamePopup extends BottomPopupView {
if (TextUtils.equals(currencyType, "3")) {
if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("数量区间为100--5W");
ToastUtil.show("貨幣數量区间为100--5W");
} else {
ToastUtil.show("The quantity range is 100 to 5 W");
ToastUtil.show("The amount of money ranges from 100 to 5 W");
}
} else {
if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
@ -219,18 +219,18 @@ public class CreateSudGamePopup extends BottomPopupView {
if (TextUtils.equals(currencyType, "3")) {
if (sill.length() > 6) {
if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("数量区间为100--5W");
ToastUtil.show("貨幣數量区间为100--5W");
} else {
ToastUtil.show("The quantity range is 100 to 5 W");
ToastUtil.show("The amount of money ranges from 100 to 5 W");
}
return;
} else {
int sillNumber = Integer.parseInt(sill);
if (sillNumber < 100 || sillNumber > 50000) {
if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("数量区间为100--5W");
ToastUtil.show("貨幣數量区间为100--5W");
} else {
ToastUtil.show("The quantity range is 100 to 5 W");
ToastUtil.show("The amount of money ranges from 100 to 5 W");
}
return;
}
@ -246,18 +246,18 @@ public class CreateSudGamePopup extends BottomPopupView {
} else {
if (sill.length() > 4) {
if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("星幣數量區間為[10 - 1000]");
ToastUtil.show("貨幣數量区间为[10 - 1000]");
} else {
ToastUtil.show("The number range of star coins is [10-1000]");
ToastUtil.show("Currency quantity range [10-1000]");
}
return;
} else {
int sillNumber = Integer.parseInt(sill);
if (sillNumber < 10 || sillNumber > 1000) {
if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("数量区间为10~1000");
ToastUtil.show("貨幣數量区间为[10 - 1000]");
} else {
ToastUtil.show("The quantity range is 10 to 1000");
ToastUtil.show("Currency quantity range [10-1000]]");
}
return;
}

135
common/src/main/res/layout/sud_game_rule_bottom_popup.xml
View File

@ -11,82 +11,83 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.appcompat.widget.LinearLayoutCompat
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:orientation="vertical">
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/regular_bubble"
android:textColor="#FFFFFF"
android:textSize="24sp" />
<TextView
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="18dp"
android:layout_marginEnd="21dp"
android:ellipsize="end"
android:maxLines="3"
android:text="@string/sud_in_game_rule_hint1"
android:textColor="#FFFFFF"
android:textSize="14sp" />
android:layout_marginTop="32dp"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="21dp"
android:ellipsize="end"
android:maxLines="4"
android:text="@string/sud_in_game_rule_hint2"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/regular_bubble"
android:textColor="#FFFFFF"
android:textSize="24sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="21dp"
android:ellipsize="end"
android:maxLines="3"
android:text="@string/sud_in_game_rule_hint3"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="18dp"
android:layout_marginEnd="21dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint1"
android:textColor="#FFFFFF"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="21dp"
android:ellipsize="end"
android:maxLines="5"
android:text="@string/sud_in_game_rule_hint4"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="21dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint2"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="21dp"
android:layout_marginBottom="22dp"
android:ellipsize="end"
android:maxLines="2"
android:text="@string/sud_in_game_rule_hint5"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="21dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint3"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="21dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint4"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="21dp"
android:layout_marginBottom="22dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint5"
android:textColor="@color/white"
android:textSize="14sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
</ScrollView>
</androidx.appcompat.widget.LinearLayoutCompat>
<ImageView
android:id="@+id/sud_rule_close"

137
common/src/main/res/layout/sud_game_rule_popup.xml
View File

@ -9,9 +9,9 @@
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="4dp"
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
app:cardCornerRadius="4dp"
app:cardElevation="12dp">
<FrameLayout
@ -19,82 +19,83 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.appcompat.widget.LinearLayoutCompat
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:orientation="vertical">
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/regular_bubble"
android:textColor="#FFA800"
android:textSize="24sp" />
<TextView
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="18dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:maxLines="3"
android:text="@string/sud_in_game_rule_hint1"
android:textColor="#333333"
android:textSize="14sp" />
android:layout_marginTop="32dp"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:maxLines="4"
android:text="@string/sud_in_game_rule_hint2"
android:textColor="#333333"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/regular_bubble"
android:textColor="#FFA800"
android:textSize="24sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:maxLines="3"
android:text="@string/sud_in_game_rule_hint3"
android:textColor="#333333"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="18dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint1"
android:textColor="#333333"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:maxLines="5"
android:text="@string/sud_in_game_rule_hint4"
android:textColor="#333333"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint2"
android:textColor="#333333"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="42dp"
android:ellipsize="end"
android:maxLines="2"
android:text="@string/sud_in_game_rule_hint5"
android:textColor="#333333"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint3"
android:textColor="#333333"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint4"
android:textColor="#333333"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="42dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint5"
android:textColor="#333333"
android:textSize="14sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
</ScrollView>
</androidx.appcompat.widget.LinearLayoutCompat>
<ImageView
android:id="@+id/sud_rule_close"

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

@ -1375,8 +1375,8 @@ Limited ride And limited avatar frame</string>
<string name="sud_in_game_game_game_peer_today">"Today "</string>
<string name="sud_in_game_rule_hint1">1. Interactive games are a new section provided by PDLIVE for users, who can participate in the game section on the homepage or in the live room;</string>
<string name="sud_in_game_rule_hint2">2. Currently, we have launched \'GoBang\',\' Bumper car \',\' Flying Chess\', \'Minesweeping\', \'Dart Master\', and \'Monster Eliminating\'. We will provide more game types in the future. Stay tuned;</string>
<string name="sud_in_game_rule_hint3">3. Users can customize the game threshold, which must be between 100 to 50000 gold beans or 10 to 1000 star coins, and the amount must be a multiple of 10;</string>
<string name="sud_in_game_rule_hint4">4. At the beginning of the game, chips from participating users will be collected. After the game ends, 10% of the chips will be collected as tickets, and all remaining chips will be given to the winning users.In a draw, the corresponding chips will be deducted from the tickets and returned to the users;</string>
<string name="sud_in_game_rule_hint3">3.Users can customize the game threshold, which must be between 100 to 50000 gold beans , and the amount must be a multiple of 10;</string>
<string name="sud_in_game_rule_hint4">4.At the beginning of the game, chips from participating users will be collected. After the game ends, 10% of the chips will be collected as tickets, and all remaining chips will be given to the winning users.In a draw, the corresponding chips will be deducted from the tickets and returned to the users;</string>
<string name="sud_in_game_rule_hint5">5. The final interpretation right of the event belongs to PDLIVE.</string>
<string name="sud_in_game_game_currency_item">Currency</string>
<string name="sud_in_game_game_currency">Currency:</string>

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

@ -1373,7 +1373,7 @@
<string name="sud_in_game_rule_hint1">1、互動遊戲是PDLIVE為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與；</string>
<string name="sud_in_game_rule_hint2">2、目前已上線【五子棋】、【碰碰我最強】、【飛行棋】、【扫雷】、【飞镖达人】、【怪兽消消乐】，後續將會提供更多遊戲種類，敬請期待；</string>
<string name="sud_in_game_rule_hint3">3、用戶可自定義設定遊戲門檻，要求在100~50000金豆之間，數額必須為10的倍數；</string>
<string name="sud_in_game_rule_hint4">4、遊戲開始時將會收取參與遊戲用戶的門檻金豆，在遊戲結束後，將收取10%的金豆作為門票，剩餘金豆將全部給予勝利用戶，平局時將會扣除相應金豆门票後返還給用戶；</string>
<string name="sud_in_game_rule_hint4">4、 遊戲開始時將會收取參與遊戲用戶的籌碼，在遊戲結束後，將收取10%的籌碼作為門票，剩餘籌碼將全部給予勝利用戶，平局時將會扣除相應籌碼门票後返還給用戶；</string>
<string name="sud_in_game_rule_hint5">5、活動最終解釋權歸PDLIVE所有。</string>
<string name="sud_in_game_game_currency_item">貨幣</string>
<string name="sud_in_game_game_currency">貨幣：</string>

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

@ -1372,7 +1372,7 @@
<string name="sud_in_game_rule_hint1">1、互動遊戲是PDLIVE為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與；</string>
<string name="sud_in_game_rule_hint2">2、目前已上線【五子棋】、【碰碰我最強】、【飛行棋】、【扫雷】、【飞镖达人】、【怪兽消消乐】，後續將會提供更多遊戲種類，敬請期待；</string>
<string name="sud_in_game_rule_hint3">3、用戶可自定義設定遊戲門檻，要求在100~50000金豆之間，數額必須為10的倍數；</string>
<string name="sud_in_game_rule_hint4">4、遊戲開始時將會收取參與遊戲用戶的門檻金豆，在遊戲結束後，將收取10%的金豆作為門票，剩餘金豆將全部給予勝利用戶，平局時將會扣除相應金豆门票後返還給用戶；</string>
<string name="sud_in_game_rule_hint4">4、 遊戲開始時將會收取參與遊戲用戶的籌碼，在遊戲結束後，將收取10%的籌碼作為門票，剩餘籌碼將全部給予勝利用戶，平局時將會扣除相應籌碼门票後返還給用戶；</string>
<string name="sud_in_game_rule_hint5">5、活動最終解釋權歸PDLIVE所有。</string>
<string name="sud_in_game_game_currency_item">貨幣</string>
<string name="sud_in_game_game_currency">貨幣：</string>

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

@ -1369,10 +1369,10 @@
<string name="sud_in_game_game_game_peer_user">對局用戶</string>
<string name="sud_in_game_game_game_peer_user_nodata">暫無記錄~</string>
<string name="sud_in_game_game_game_peer_today">今日</string>
<string name="sud_in_game_rule_hint1">1、互動遊戲是PDLIVE為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與；</string>
<string name="sud_in_game_rule_hint1">1、1. 互動遊戲是PDLIVE為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與；</string>
<string name="sud_in_game_rule_hint2">2、目前已上線【五子棋】、【碰碰我最強】、【飛行棋】、【扫雷】、【飞镖达人】、【怪兽消消乐】，後續將會提供更多遊戲種類，敬請期待；</string>
<string name="sud_in_game_rule_hint3">3、用戶可自定義設定遊戲門檻，要求在100~50000金豆之間，數額必須為10的倍數；</string>
<string name="sud_in_game_rule_hint4">4、遊戲開始時將會收取參與遊戲用戶的門檻金豆，在遊戲結束後，將收取10%的金豆作為門票，剩餘金豆將全部給予勝利用戶，平局時將會扣除相應金豆门票後返還給用戶；</string>
<string name="sud_in_game_rule_hint3">3、 用戶可自定義設定遊戲門檻，要求在100~50000金豆之間，數額必須為10的倍數；</string>
<string name="sud_in_game_rule_hint4">4、 遊戲開始時將會收取參與遊戲用戶的籌碼，在遊戲結束後，將收取10%的籌碼作為門票，剩餘籌碼將全部給予勝利用戶，平局時將會扣除相應籌碼门票後返還給用戶；</string>
<string name="sud_in_game_rule_hint5">5、活動最終解釋權歸PDLIVE所有。</string>
<string name="sud_in_game_game_currency_item">貨幣</string>
<string name="sud_in_game_game_currency">貨幣：</string>

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

@ -1382,9 +1382,9 @@ Limited ride And limited avatar frame</string>
<string name="sud_in_game_game_game_peer_today_7">"≤7 days "</string>
<string name="sud_in_game_game_game_peer_today_30">≤ 30 days</string>
<string name="sud_in_game_rule_hint1">1. Interactive games are a new section provided by PDLIVE for users, who can participate in the game section on the homepage or in the live room;</string>
<string name="sud_in_game_rule_hint2">2. Currently, we have launched \'GoBang\',\' Bumper car \',\' Flying Chess\', \'Minesweeping\', \'Dart Master\', and \'Monster Eliminating\'. We will provide more game types in the future. Stay tuned;</string>
<string name="sud_in_game_rule_hint3">3. Users can customize the game threshold, which must be between 100 to 50000 gold beans or 10 to 1000 star coins, and the amount must be a multiple of 10;</string>
<string name="sud_in_game_rule_hint4">4. At the beginning of the game, chips from participating users will be collected. After the game ends, 10% of the chips will be collected as tickets, and all remaining chips will be given to the winning users.In a draw, the corresponding chips will be deducted from the tickets and returned to the users;</string>
<string name="sud_in_game_rule_hint2">2.Currently, we have launched \'GoBang\',\' Bumper car \',\' Flying Chess\', \'Minesweeping\', \'Dart Master\', and \'Monster Eliminating\'. We will provide more game types in the future. Stay tuned;</string>
<string name="sud_in_game_rule_hint3">3.. Users can customize the game threshold, which must be between 100 to 50000 gold beans , and the amount must be a multiple of 10;</string>
<string name="sud_in_game_rule_hint4">4.At the beginning of the game, chips from participating users will be collected. After the game ends, 10% of the chips will be collected as tickets, and all remaining chips will be given to the winning users.In a draw, the corresponding chips will be deducted from the tickets and returned to the users;</string>
<string name="sud_in_game_rule_hint5">5. The final interpretation right of the event belongs to PDLIVE.</string>
<string name="room_sill0_100">0-100 coins</string>
<string name="room_sill100_500">100-500 coins</string>

2
live/src/main/res/values-en/strings.xml
View File

@ -35,7 +35,7 @@
<string name="live_data_msg2">Historical data can be viewed in the anchor center</string>
<string name="live_data_tip">* Non-real-time calculation of data</string>
<string name="buy_guard_info" >Be TA\'s guardian, escort for TA!</string>
<string name="buy_guard_info" >Guardian, always be there for your anchor~ </string>
<string name="buy_guard_back_coin" >return</string>
<string name="praise">Like</string>
<string name="live_gift_buy_gold" >Open aristocracy</string>