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

Merge branch 'dev_userCard'

Browse Source 
# Conflicts:
#	main/src/main/java/com/yunbao/main/activity/MainActivity.java
This commit is contained in:
zlzw
2022-11-09 11:01:45 +08:00
parent ef4c377990 71713e5b37
commit 1fc417ec25
29 changed files with 1832 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
live/src/main/res/drawable/background_ff63c1.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<corners android:radius="30dp" />
<solid android:color="#FF63C1" />
</shape>
</item>
</selector>

10
live/src/main/res/drawable/bg_live_anchor_goodnum.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="142dp" android:height="34dp">
<shape android:shape="rectangle">
<stroke android:width="1dp" android:color="#abafb3ff" />
<gradient android:type="linear" android:useLevel="true" android:startColor="#b8b2a4ff" android:endColor="#80722cff" android:angle="90" />
<corners android:radius="17dp" />
</shape>
</item>
</selector>

9
live/src/main/res/drawable/bg_user_card_fans.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="112dp" android:height="56dp">
<shape android:shape="rectangle">
<gradient android:type="linear" android:useLevel="true" android:startColor="#ffff9782" android:endColor="#ffffbf8a" android:angle="180" />
<corners android:radius="6dp" />
</shape>
</item>
</selector>

9
live/src/main/res/drawable/bg_user_card_guard.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="74dp" android:height="23dp">
<shape android:layout_width="match_parent" android:layout_height="wrap_content" android:shape="rectangle">
<gradient android:angle="180" android:centerColor="#ffe782ff" android:endColor="#ffff9c9c" android:startColor="#ff9e96ff" android:type="linear" android:useLevel="true" />
<corners android:radius="12dp" />
</shape>
</item>
</selector>

9
live/src/main/res/drawable/bg_user_card_honor.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="112dp" android:height="56dp">
<shape android:shape="rectangle">
<gradient android:type="linear" android:useLevel="true" android:startColor="#fffe9afc" android:endColor="#ff8ab3ff" android:angle="180" />
<corners android:radius="6dp" />
</shape>
</item>
</selector>

9
live/src/main/res/drawable/bg_user_card_lv.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="112dp" android:height="56dp">
<shape android:shape="rectangle">
<gradient android:type="linear" android:useLevel="true" android:startColor="#ffff8abd" android:endColor="#fffe9aaa" android:angle="180" />
<corners android:radius="6dp" />
</shape>
</item>
</selector>

100
live/src/main/res/layout/dialog_live_user_bottom_1.xml
View File

@@ -1,56 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#eeeeee"
/>
android:background="#eeeeee" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:orientation="horizontal"
>
android:orientation="horizontal">
<FrameLayout
android:id="@+id/btn_follow"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_vertical"
android:orientation="horizontal"
>
<ImageView
android:id="@+id/follow_img"
android:layout_width="13dp"
android:layout_height="13dp"
/>
<TextView
android:id="@+id/follow_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textColor="@color/textColor"
android:textSize="13sp"
/>
</LinearLayout>
</FrameLayout>
<FrameLayout
android:id="@+id/btn_pri_msg"
@@ -64,14 +27,12 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_vertical"
android:orientation="horizontal"
>
android:orientation="horizontal">
<ImageView
android:layout_width="13dp"
android:layout_height="13dp"
android:src="@mipmap/icon_user_home_msg"
/>
android:src="@mipmap/icon_user_home_msg" />
<TextView
android:layout_width="wrap_content"
@@ -79,8 +40,7 @@
android:layout_marginLeft="4dp"
android:text="@string/pri_msg"
android:textColor="@color/textColor"
android:textSize="13sp"
/>
android:textSize="13sp" />
</LinearLayout>
@@ -90,22 +50,20 @@
android:id="@+id/btn_home_page"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
>
android:layout_weight="1">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_vertical"
android:orientation="horizontal"
>
android:orientation="horizontal">
<ImageView
android:layout_width="13dp"
android:layout_height="13dp"
android:src="@mipmap/icon_user_dialog_home"
/>
android:visibility="gone" />
<TextView
android:id="@+id/black_text"
@@ -114,13 +72,45 @@
android:layout_marginLeft="4dp"
android:text="@string/home_page"
android:textColor="@color/textColor"
android:textSize="13sp"
/>
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
</FrameLayout>
<FrameLayout
android:id="@+id/btn_follow"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/follow_img"
android:layout_width="13dp"
android:layout_height="13dp"
android:src="@mipmap/icon_user_card_follow" />
<TextView
android:id="@+id/follow_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textColor="#FA6400"
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
</FrameLayout>
</LinearLayout>
</LinearLayout>

457
live/src/main/res/layout/dialog_new_live_user.xml Normal file
View File

@@ -0,0 +1,457 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="52dp"
android:background="@drawable/bg_live_user">
<TextView
android:id="@+id/btn_report"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="14dp"
android:layout_marginEnd="14dp"
android:gravity="center"
android:text="@string/report"
android:textColor="#B1B1B1"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/btn_guard"
android:layout_width="88dp"
android:layout_height="23dp"
android:layout_marginStart="14dp"
android:layout_marginTop="14dp"
android:background="@drawable/bg_user_card_guard"
android:gravity="center"
android:orientation="horizontal"
android:visibility="invisible"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/guard_val"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="1dp"
android:text="@string/user_card_guard"
android:textColor="#FFFFFF"
android:textSize="12sp" />
<ImageView
android:id="@+id/imageView4"
android:layout_width="10dp"
android:layout_height="10dp"
app:srcCompat="@mipmap/icon_arrow_right_3" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:id="@+id/shawl"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical">
<RelativeLayout
android:layout_width="83dp"
android:layout_height="83dp">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="63dp"
android:layout_height="63dp"
android:layout_centerInParent="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="10dp"
android:scaleType="centerCrop"
app:riv_oval="true" />
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/gift_svga"
android:layout_width="82dp"
android:layout_height="82dp"
android:layout_centerInParent="true"
android:scaleType="centerCrop"
app:autoPlay="true" />
</RelativeLayout>
<pl.droidsonroids.gif.GifImageView
android:id="@+id/btn_live"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:adjustViewBounds="true"
android:src="@mipmap/icon_user_home_living"
android:visibility="visible" />
</RelativeLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="7dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textColor="@color/textColor"
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="17dp"
android:layout_marginTop="13dp"
android:gravity="center_horizontal"
android:orientation="horizontal">
<ImageView
android:id="@+id/good_nub_ico"
android:layout_width="18dp"
android:layout_height="15dp"
android:layout_marginRight="6dp"
android:src="@mipmap/good_nub"
android:visibility="visible" />
<ImageView
android:id="@+id/user_card_id"
android:layout_width="18dp"
android:layout_height="15dp"
android:layout_marginRight="6dp"
android:src="@mipmap/user_card_id"
android:visibility="visible" />
<TextView
android:id="@+id/id_val"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingRight="10dp"
android:textColor="#B1B1B1"
android:textSize="13sp" />
<View
android:layout_width="1dp"
android:layout_height="25dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:background="#B1B1B1"
android:visibility="visible" />
<TextView
android:id="@+id/fans_val"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingRight="10dp"
android:textColor="#B1B1B1"
android:textSize="13sp" />
<View
android:layout_width="1dp"
android:layout_height="25dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:background="#B1B1B1"
android:visibility="visible" />
<TextView
android:id="@+id/praise_val"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingRight="10dp"
android:textColor="#B1B1B1"
android:textSize="13sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:id="@+id/sex"
android:layout_width="27dp"
android:layout_height="17dp"
android:layout_marginLeft="4dp" />
<ImageView
android:id="@+id/user_card_lv_icon"
android:layout_width="46.5dp"
android:layout_height="17.5dp"
android:layout_gravity="center"
android:layout_marginStart="6dp"/>
<LinearLayout
android:id="@+id/btn_union"
android:layout_width="88dp"
android:layout_height="23dp"
android:layout_marginStart="6dp"
android:background="@drawable/bg_user_card_guard"
android:gravity="center"
android:orientation="horizontal"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/union_val"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="1dp"
android:text="@string/user_card_guard"
android:textColor="#FFFFFF"
android:textSize="12sp" />
</LinearLayout>
<ImageView
android:id="@+id/user_card_noble"
android:layout_width="48dp"
android:layout_height="24dp"
android:layout_marginStart="6dp"
android:src="@mipmap/emperor_rom" />
</LinearLayout>
<TextView
android:id="@+id/sign"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:textColor="#B1B1B1"
android:textSize="14sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="15dp"
android:gravity="center"
android:orientation="horizontal"
android:visibility="gone">
<ImageView
android:id="@+id/medal_ico1"
android:layout_width="35dp"
android:layout_height="35dp" />
<LinearLayout
android:id="@+id/ry_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="visible">
<View
android:id="@+id/no_gz"
android:layout_width="1dp"
android:layout_height="25dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:background="#B1B1B1"
android:visibility="visible" />
<ImageView
android:id="@+id/ry_ico1"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginLeft="8dp"
android:visibility="visible" />
<ImageView
android:id="@+id/ry_ico2"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginLeft="8dp"
android:visibility="visible" />
<ImageView
android:id="@+id/ry_ico3"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginLeft="8dp"
android:visibility="visible" />
<ImageView
android:id="@+id/ry_ico4"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginLeft="8dp"
android:visibility="visible" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:visibility="visible">
<LinearLayout
android:layout_width="112dp"
android:layout_height="56dp"
android:background="@drawable/bg_user_card_lv"
android:gravity="center">
<ImageView
android:id="@+id/live_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:visibility="visible"
android:src="@mipmap/icon_chat_face" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:orientation="vertical">
<TextView
android:id="@+id/lv_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/live_user_level_anchor"
android:textColor="#FFFFFF"
android:textSize="12sp" />
<TextView
android:id="@+id/lv_val"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Lv.0"
android:textColor="#FFFFFF"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="112dp"
android:layout_height="56dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/bg_user_card_fans"
android:gravity="center">
<ImageView
android:id="@+id/noble_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:visibility="visible"
android:src="@mipmap/icon_chat_face" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/live_noble_level_anchor"
android:textColor="#FFFFFF"
android:textSize="12sp" />
<TextView
android:id="@+id/noble_val"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Lv.0"
android:textColor="#FFFFFF"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="112dp"
android:layout_height="56dp"
android:background="@drawable/bg_user_card_honor"
android:gravity="center">
<ImageView
android:id="@+id/honor_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:visibility="visible"
android:src="@mipmap/icon_chat_face"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/live_honor_number_anchor"
android:textColor="#FFFFFF"
android:textSize="12sp" />
<TextView
android:id="@+id/honor_val"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#FFFFFF"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<FrameLayout
android:id="@+id/bottom_container"
android:layout_marginTop="13dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</FrameLayout>

34
live/src/main/res/layout/view_live_room.xml
View File

@@ -68,14 +68,30 @@
android:textColor="@color/white"
android:textSize="12sp" />
<TextView
android:id="@+id/id_val"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:text="1111"
android:textColor="@color/white"
android:textSize="8sp" />
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:id="@+id/good_nub_ico"
android:layout_width="18dp"
android:layout_height="15dp"
android:layout_marginEnd="2dp"
android:src="@mipmap/good_nub"
android:visibility="gone" />
<TextView
android:id="@+id/id_val"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:text="1111"
android:textColor="@color/white"
android:textSize="8sp" />
</LinearLayout>
</LinearLayout>
@@ -389,8 +405,8 @@
android:layout_height="wrap_content"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_marginStart="10dp"
android:visibility="visible"
android:layout_toEndOf="@id/live_wks_layout">
android:layout_toEndOf="@id/live_wks_layout"
android:visibility="visible">
<include layout="@layout/view_noble_seat" />
</LinearLayout>
@@ -2042,6 +2058,7 @@
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_event4"
android:layout_width="67dp"
@@ -2067,6 +2084,7 @@
app:indicator_width="8dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_event3"
android:layout_width="67dp"

BIN
live/src/main/res/mipmap-mdpi/icon_user_card_follow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

1
live/src/main/res/values/strings.xml
View File

@@ -11,6 +11,7 @@
<string name="views_rank">觀眾</string>
<string name="gurad_rank">觀眾</string>
<string name="fans">粉絲</string>
<string name="praise">獲讚</string>
<string name="room_msg">私信</string>
<string name="live_room_title">選擇房間類型</string>
<string name="live_room_public">公開房</string>