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

Merge branch 'dev_random_pk'

Browse Source 
# Conflicts:
#	common/src/main/res/values/strings.xml
#	config.gradle
#	live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
#	live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
#	live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
This commit is contained in:
zlzw
2022-12-09 09:30:17 +08:00
parent 4cd4939c58 4ad75a11a8
commit b56368412c
54 changed files with 2956 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
common/src/main/res/layout/dialog_live_new_function.xml
View File

@@ -256,6 +256,27 @@
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/live_tool_random_pk"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="23dp"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/icon_live_random_pk" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/live_random"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/live_tool_mic"

71
common/src/main/res/layout/dialog_live_random_pk.xml Normal file
View File

@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="280dp"
android:layout_height="wrap_content"
android:background="@drawable/bg_dialog"
android:gravity="center_horizontal"
android:orientation="vertical"
>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="15dp"
android:layout_marginTop="15dp"
android:gravity="center_horizontal"
android:text="@string/random_pk_dialog_title"
android:textColor="@color/textColor"
android:textSize="16sp"
/>
<TextView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="15dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:gravity="center_horizontal"
android:textColor="#161616"
android:textSize="14sp"
/>
<LinearLayout
android:layout_width="match_parent"
android:gravity="center"
android:layout_marginBottom="22dp"
android:layout_height="40dp">
<TextView
android:id="@+id/btn_cancel"
android:layout_width="87dp"
android:layout_height="33dp"
android:gravity="center"
android:text="@string/random_pk_dialog_refuse"
android:textColor="#FFC621"
android:layout_marginRight="7dp"
android:textSize="14sp"
android:background="@drawable/bg_dialog_unfollow_cancel"
/>
<TextView
android:id="@+id/btn_confirm"
android:layout_width="87dp"
android:layout_height="33dp"
android:gravity="center"
android:layout_marginLeft="7dp"
android:text="@string/random_pk_dialog_apply"
android:textColor="#FFFFFF"
android:textSize="14sp"
android:background="@mipmap/tipbox_btn_orange"
/>
</LinearLayout>
</LinearLayout>

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

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

@@ -723,6 +723,7 @@
<string name="live_wishlist">心願單</string>
<string name="live_zg">娛樂整蠱</string>
<string name="live_dr">多人PK</string>
<string name="live_random" translatable="false">随机PK</string>
<string name="live_mic">語音連麥</string>
<string name="live_wks">周星榜</string>
<string name="live_zslk">暫時離開</string>
@@ -971,4 +972,9 @@
<string name="invite_anchor">邀請\n主播</string>
<string name="end_pk">結束\nPK</string>
<string name="pk_time">時間 %s</string>
<string name="random_pk_dialog_apply" translatable="false">接受</string>
<string name="random_pk_dialog_refuse" translatable="false">拒绝</string>
<string name="random_pk_dialog_refuse_again" translatable="false">坚持拒绝</string>
<string name="random_pk_dialog_title" translatable="false">随机PK提示</string>
</resources>