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

Merge remote-tracking branch 'origin/语音房_6.6.4_'

Browse Source 
# Conflicts:
#	common/src/main/res/values-en-rUS/string.xml
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
This commit is contained in:
18401019693
2024-01-15 10:03:00 +08:00
parent 7627219e77 f22f8fcb4b
commit 0b15df41b8
70 changed files with 2926 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/res/drawable/background_sud_game_input.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:topRightRadius="12dp" android:topLeftRadius="12dp"/>
<solid android:color="#E6E9E9E9" />
</shape>

5
common/src/main/res/drawable/background_sud_game_input_edit_text.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="6dp"/>
<solid android:color="#fff" />
</shape>

BIN
common/src/main/res/drawable/bg_live_sud_game_back_new.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

5
common/src/main/res/drawable/bg_live_sud_game_bottom_input.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="20dp" />
<solid android:color="#CC414141" />
</shape>

7
common/src/main/res/drawable/bg_live_sud_game_bottom_input_right.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners
android:bottomRightRadius="20dp"
android:topRightRadius="20dp" />
<solid android:color="#333333" />
</shape>

5
common/src/main/res/drawable/bg_live_sud_game_top_new.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="19dp" />
<solid android:color="#B3414141" />
</shape>

16
common/src/main/res/drawable/bg_live_sud_list_select_item2.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_selected="false">
<shape>
<solid android:color="#0000" />
</shape>
</item>
<item android:state_selected="true">
<shape>
<solid android:color="#252525" />
</shape>
</item>
</selector>

259
common/src/main/res/layout/activity_sud_game.xml
View File

@@ -1,57 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#201E1A"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginTop="44dp"
android:gravity="center_vertical">
<TextView
android:id="@+id/game_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:text="@string/interactive_game_create_room"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold" />
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1" />
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginEnd="16dp"
android:src="@mipmap/icon_interactive_game_create_room_seats"
android:visibility="gone" />
<ImageView
android:id="@+id/sud_history"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginEnd="14dp"
android:src="@mipmap/icon_sud_history_live" />
<TextView
android:id="@+id/exit"
android:layout_width="30dp"
android:layout_height="30dp"
android:background="@drawable/bg_live_sud_game_back"
android:gravity="center"
android:text="@string/video_exit"
android:textColor="#FFFFFF"
android:textSize="8sp" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -61,73 +14,149 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<LinearLayout
android:layout_width="175dp"
android:layout_height="50dp"
android:layout_marginStart="15dp"
android:layout_marginTop="16dp"
android:background="@drawable/bg_live_sud_game_top"
android:gravity="center_vertical">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginStart="6dp"
android:scaleType="centerCrop"
android:visibility="gone"
app:riv_oval="true" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="4dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/interactive_game_create_room_name"
android:textColor="@color/white"
android:textSize="12sp" />
<TextView
android:id="@+id/room_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/interactive_game_create_room_number"
android:textColor="@color/white"
android:textSize="12sp" />
<TextView
android:id="@+id/room_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="150dp"
android:layout_height="50dp"
android:layout_marginStart="23dp"
android:layout_marginTop="25dp"
android:background="@drawable/bg_live_sud_game_top_new"
android:gravity="center">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/room_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/interactive_game_create_room_name"
android:textColor="@color/white"
android:textSize="14sp"
android:textStyle="bold" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="ID:"
android:textColor="@color/white"
android:textSize="12sp" />
<TextView
android:id="@+id/room_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/interactive_game_create_room_number"
android:textColor="@color/white"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="29dp"
android:layout_marginEnd="20dp"
android:gravity="center_vertical">
<ImageView
android:id="@+id/sud_history"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginEnd="14dp"
android:src="@mipmap/icon_sud_history_live_new" />
<TextView
android:id="@+id/exit"
android:layout_width="30dp"
android:layout_height="30dp"
android:background="@drawable/bg_live_sud_game_back_new"
android:gravity="center"
android:text="@string/video_exit"
android:textColor="#FFFFFF"
android:textSize="8sp" />
</LinearLayout>
<LinearLayout
android:layout_width="137dp"
android:layout_height="34dp"
android:layout_gravity="bottom"
android:layout_marginStart="12dp"
android:layout_marginBottom="35dp">
<TextView
android:id="@+id/game_review_input"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_live_sud_game_bottom_input"
android:gravity="center"
android:text="@string/game_review_input"
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_marginEnd="12dp"
android:layout_marginBottom="35dp"
android:animateLayoutChanges="true">
<ImageView
android:id="@+id/game_close_wheat"
android:layout_width="34dp"
android:layout_height="34dp"
android:layout_marginEnd="20dp"
android:src="@mipmap/icon_game_close_wheat" />
<ImageView
android:id="@+id/game_seat"
android:layout_width="34dp"
android:layout_height="34dp"
android:src="@mipmap/icon_game_seat" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/chat_list"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_gravity="bottom"
android:layout_marginBottom="75dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginTop="80dp"
android:gravity="center">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/user_list"
android:layout_width="wrap_content"
android:layout_height="50dp" />
</LinearLayout>
</FrameLayout>

30
common/src/main/res/layout/dialog_sud_game_input.xml Normal file
View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="51dp"
android:background="@drawable/background_sud_game_input">
<EditText
android:id="@+id/text_message"
android:layout_width="match_parent"
android:layout_marginEnd="100dp"
android:layout_height="38dp"
android:layout_marginStart="15dp"
android:paddingStart="8dp"
android:layout_gravity="center_vertical"
android:background="@drawable/background_sud_game_input_edit_text"
android:hint="@string/live_say_something"
android:textColorHint="@color/gray3" />
<TextView
android:id="@+id/send"
android:layout_width="60dp"
android:layout_height="38dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="20dp"
android:background="@mipmap/icon_send_game"
android:gravity="center"
android:text="@string/send"
android:textColor="@color/white"
android:textSize="16sp" />
</FrameLayout>

24
common/src/main/res/layout/view_sud_game_chat_item_holder.xml Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="283dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp">
<TextView
android:id="@+id/chat_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="9dp"
android:layout_marginEnd="5dp"
android:layout_marginBottom="5dp"
android:gravity="center_vertical"
android:textColor="#FFFFFF"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>

29
common/src/main/res/layout/view_sud_game_small.xml Normal file
View File

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="70dp"
android:layout_height="110dp"
android:background="@mipmap/backgroud_sud_game_small_window"
android:orientation="vertical">
<TextView
android:id="@+id/view_information"
android:layout_width="match_parent"
android:layout_height="25dp"
android:layout_marginTop="8dp"
android:background="@drawable/bg_live_sud_list_select_item2"
android:gravity="center"
android:text="@string/game_review_view_information"
android:textColor="@color/white"
android:textSize="12sp" />
<TextView
android:id="@+id/view_un_mute"
android:layout_width="match_parent"
android:layout_height="25dp"
android:layout_marginTop="2dp"
android:background="@drawable/bg_live_sud_list_select_item2"
android:gravity="center"
android:text="@string/game_review_view_unmute"
android:textColor="@color/white"
android:textSize="12sp" />
</LinearLayout>

43
common/src/main/res/layout/view_sud_game_user_list_holder.xml Normal file
View File

@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layout"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="vertical">
<ImageView
android:id="@+id/vacancy_sud_game"
android:layout_width="34dp"
android:layout_height="34dp"
android:layout_marginStart="12dp"
android:src="@mipmap/icon_vacancy_sud_game"
android:visibility="visible" />
<FrameLayout
android:id="@+id/user_layout"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:visibility="visible">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/sud_game_user"
android:layout_width="34dp"
android:layout_height="34dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="12dp"
android:scaleType="centerCrop"
android:src="@mipmap/icon_vacancy_sud_game"
app:riv_oval="true" />
<ImageView
android:id="@+id/mic_status"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginStart="5dp"
android:layout_marginTop="5dp"
android:src="@mipmap/icon_game_close_wheat_mute" />
</FrameLayout>
</LinearLayout>

BIN
common/src/main/res/mipmap-xxhdpi/backgroud_sud_game_small_window.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_game_close_wheat.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_game_close_wheat_mute.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_game_hang_up.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_game_hang_up_en.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_game_open_wheat.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_game_seat.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_game_seat_en.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_send_game.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_sud_history_live_new.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_vacancy_sud_game.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

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

@@ -666,7 +666,7 @@
<string name="receive_awards">ReceiveAwards</string>
<string name="one_free">One free gift privilege!</string>
<string name="send">Send out</string>
<string name="send">Send</string>
<string name="sorry">I am sorry</string>
<string name="video">video</string>
<string name="FILE_PROVIDER">myname.pdlive.shayu.fileprovider</string>
@@ -1441,4 +1441,8 @@ Limited ride And limited avatar frame</string>
<string name="sys_msg_day"></string>
<string name="main_suspension_war_order">BattlePass</string>
<string name="game_review_input">Comment</string>
<string name="game_review_view_information">Information</string>
<string name="game_review_view_unmute">Unmute</string>
<string name="game_review_view_sound_off">Mute</string>
</resources>

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

@@ -1427,6 +1427,10 @@
<string name="battlepass_exchange_buy_max">商品兌換數量已達到上限</string>
<string name="battlepass_zl_get">開通成功</string>
<string name="battlepass_buy_max">您已購買該戰令</string>
<string name="game_review_input">評論</string>
<string name="game_review_view_information">查看信息</string>
<string name="game_review_view_unmute">取消靜音</string>
<string name="game_review_view_sound_off">靜音</string>
<string name="receive_success">領取成功</string>
<string name="receive1">領取</string>

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

@@ -1426,6 +1426,10 @@
<string name="battlepass_exchange_buy_max">商品兌換數量已達到上限</string>
<string name="battlepass_zl_get">開通成功</string>
<string name="battlepass_buy_max">您已購買該戰令</string>
<string name="game_review_input">評論</string>
<string name="game_review_view_information">查看信息</string>
<string name="game_review_view_unmute">取消靜音</string>
<string name="game_review_view_sound_off">靜音</string>
<string name="receive_success">領取成功</string>
<string name="receive1">領取</string>

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

@@ -1421,6 +1421,10 @@
<string name="battlepass_exchange_buy_max">商品兌換數量已達到上限</string>
<string name="battlepass_zl_get">開通成功</string>
<string name="battlepass_buy_max">您已購買該戰令</string>
<string name="game_review_input">評論</string>
<string name="game_review_view_information">查看信息</string>
<string name="game_review_view_unmute">取消靜音</string>
<string name="game_review_view_sound_off">靜音</string>
<string name="msg_del_sys01">內含物品還未領取，是否確定刪除消息？</string>
<string name="msg_del_sys02">是否確定刪除消息？</string>

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

@@ -666,7 +666,7 @@
<string name="receive_awards">ReceiveAwards</string>
<string name="one_free">One free gift privilege!</string>
<string name="send">Send out</string>
<string name="send">Send</string>
<string name="sorry">I am sorry</string>
<string name="video">video</string>
<string name="FILE_PROVIDER">myname.pdlive.shayu.fileprovider</string>
@@ -1432,6 +1432,10 @@ Limited ride And limited avatar frame</string>
<string name="battlepass_exchange_buy_max">The quantity of goods exchanged has reached the upper limit</string>
<string name="battlepass_zl_get">Successfully opened</string>
<string name="battlepass_buy_max">You have purchased the BattlePass</string>
<string name="game_review_input">Comment</string>
<string name="game_review_view_information">Information</string>
<string name="game_review_view_unmute">Unmute</string>
<string name="game_review_view_sound_off">Mute</string>
<string name="receive_success">Successfully claimed</string>
<string name="receive1">Receive</string>