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

根据文档修改新礼物UI

Browse Source 
移除主界面预下载所有礼物svga入口
获取直播间状态后开始下载所有礼物svga
GiftCacheUtil改为单例并支持顺序下载所有礼物及插队下载
预处理新人特惠红点显示/隐藏接口
获取svga播放时间统一由SVGAViewUtils处理
This commit is contained in:
zlzw
2022-10-10 11:00:46 +08:00
parent 3a87583340
commit 5060d647fb
35 changed files with 1066 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
live/src/main/res/anim/anim_loading_gift.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<rotate
android:duration="1500"
android:fromDegrees="0"
android:repeatCount="-1"
android:toDegrees="359"
android:pivotX="50%"
android:pivotY="50%"
/>
</set>

10
live/src/main/res/drawable/bg_live_gift.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="360dp" android:height="306dp">
<shape android:shape="rectangle">
<solid android:color="#ff000000" />
<gradient android:type="linear" android:useLevel="true" android:startColor="#ff181a34" android:endColor="#ff080a1b" android:angle="0" />
<corners android:topLeftRadius="8dp" android:topRightRadius="8dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp" />
</shape>
</item>
</selector>

11
live/src/main/res/drawable/bg_live_gift_buy.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners
android:topRightRadius="15dp"
android:bottomLeftRadius="15dp"
android:bottomRightRadius="15dp"
android:topLeftRadius="15dp" />
<stroke
android:width="2dp"
android:color="@color/yellow5" />
</shape>

9
live/src/main/res/drawable/bg_live_gift_download_all.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="151dp" android:height="32dp">
<shape android:shape="rectangle">
<solid android:color="#ffffbe41" />
<corners android:topLeftRadius="16dp" android:topRightRadius="16dp" android:bottomLeftRadius="16dp" android:bottomRightRadius="16dp" />
</shape>
</item>
</selector>

7
live/src/main/res/drawable/bg_live_gift_items.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">
<stroke
android:width="0.3dp"
android:color="#1F245C" />
</shape>

9
live/src/main/res/drawable/bg_live_gift_package_line.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="1dp" android:height="23dp">
<shape android:shape="rectangle">
<solid android:color="#ff626262" />
<corners android:topLeftRadius="1dp" android:topRightRadius="1dp" android:bottomLeftRadius="1dp" android:bottomRightRadius="1dp" />
</shape>
</item>
</selector>

10
live/src/main/res/drawable/bg_live_vip_gold.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="105dp" android:height="32dp">
<shape android:shape="rectangle">
<solid android:color="#ff000000" />
<gradient android:type="linear" android:useLevel="true" android:startColor="#ff26294c" android:endColor="#ff080a1b" android:angle="0" />
<corners android:topLeftRadius="16dp" android:topRightRadius="16dp" android:bottomLeftRadius="16dp" android:bottomRightRadius="16dp" />
</shape>
</item>
</selector>

520
live/src/main/res/layout/dialog_live_gift_wrap.xml
View File

@@ -1,239 +1,315 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/border_translucent">
<ScrollView android:id="@+id/tabview"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:orientation="horizontal"
android:layout_marginBottom="10dp"
android:layout_height="wrap_content">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/items"
android:layout_marginLeft="10dp"
android:layout_marginRight="80dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</RelativeLayout>
</ScrollView>
<com.yunbao.common.custom.DrawableTextView
android:id="@+id/btn_luck_gift_tip"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:drawablePadding="2dp"
android:drawableTint="@color/gray1"
android:gravity="center_vertical"
android:text="@string/live_ktgz"
android:textColor="@color/gray1"
android:textSize="12sp"
app:dt_right_drawable="@mipmap/icon_arrow_right_3"
app:dt_right_height="12dp"
app:dt_right_width="12dp"
/>
<LinearLayout
android:id="@+id/group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tabview"
android:orientation="vertical"
>
android:id="@+id/live_gift_download_all"
android:layout_width="155dp"
android:layout_height="32dp"
android:layout_marginStart="12dp"
android:layout_alignParentStart="true"
android:background="@drawable/bg_live_gift_download_all"
android:gravity="center"
android:visibility="invisible"
android:orientation="horizontal">
<com.yunbao.live.custom.GiftPageViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="5dp"
android:background="@mipmap/bg_gift_list"
/>
<ImageView
android:layout_width="19dp"
android:layout_height="19dp"
android:layout_marginEnd="7dp"
android:src="@mipmap/icon_small_download" />
<com.yunbao.live.custom.GiftPageViewPager
android:visibility="gone"
android:id="@+id/vpWrapList"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="5dp"
android:background="@mipmap/bg_gift_list"
/>
<RadioGroup
android:id="@+id/radio_group"
<TextView
android:layout_width="wrap_content"
android:layout_height="6dp"
android:layout_gravity="center_horizontal"
android:orientation="horizontal"
/>
<RadioGroup
android:visibility="gone"
android:id="@+id/radio_group_wrap"
android:layout_height="match_parent"
android:gravity="center"
android:visibility="visible"
android:text="一鍵下載所有禮物動畫"
android:textSize="10sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_luck_gift_tip"
android:layout_width="105.27dp"
android:layout_alignParentEnd="true"
android:layout_height="32dp"
android:layout_marginEnd="12dp"
android:background="@drawable/bg_live_vip_gold"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:id="@+id/vipGoldIcon"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginEnd="7dp"
android:scaleType="centerCrop"
android:src="@mipmap/icon_vip_gold" />
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="6dp"
android:layout_gravity="center_horizontal"
android:orientation="horizontal"
/>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="46dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
>
<RelativeLayout
android:id="@+id/btn_send_group"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/btn_send"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:background="@drawable/bg_live_gift_send_2"
android:enabled="false"
android:gravity="center"
android:text="@string/live_gift_send"
android:textColor="@color/fg_btn_gift_send"
android:textSize="14sp"
/>
<TextView
android:id="@+id/btn_choose"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/btn_send"
android:background="@drawable/bg_live_gift_choose"
android:gravity="center"
android:paddingRight="13dp"
android:text="1"
android:textColor="@color/global"
android:textSize="14sp"
android:visibility="invisible"
/>
<ImageView
android:id="@+id/arrow"
android:layout_width="13dp"
android:layout_height="7dp"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:layout_toLeftOf="@id/btn_send"
android:rotation="180"
android:src="@mipmap/icon_live_gift_2"
android:tint="@color/global"
android:visibility="invisible"
/>
</RelativeLayout>
<LinearLayout
android:gravity="center"
android:layout_height="wrap_content">
<TextView
android:id="@+id/vipGoldTitle"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<com.yunbao.common.custom.DrawableTextView
android:id="@+id/coin"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:drawablePadding="4dp"
android:gravity="center_vertical"
android:textColor="@color/white"
android:textSize="12sp"
app:dt_left_drawable="@mipmap/diamond"
app:dt_left_height="20dp"
app:dt_left_width="20dp"
app:dt_right_height="14dp"
app:dt_right_width="14dp"
/>
<com.yunbao.common.custom.DrawableTextView
android:id="@+id/goldCoin"
android:layout_marginLeft="10dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:drawablePadding="4dp"
android:gravity="center_vertical"
android:textColor="@color/white"
android:textSize="12sp"
app:dt_left_drawable="@mipmap/gold_coin"
app:dt_left_height="20dp"
app:dt_left_width="20dp"
app:dt_right_height="14dp"
app:dt_right_width="14dp"
/>
<com.yunbao.common.custom.DrawableTextView
android:id="@+id/go_charge"
android:layout_marginLeft="10dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:drawablePadding="4dp"
android:gravity="center_vertical"
android:text="@string/charge"
android:textColor="@color/yellow5"
android:textSize="12sp"
app:dt_left_height="20dp"
app:dt_left_width="20dp"
app:dt_right_height="14dp"
app:dt_right_width="14dp"/>
</LinearLayout>
android:layout_height="match_parent"
android:layout_gravity="center"
android:textColor="#FFFFFF"
android:text="開通貴族"
android:textSize="11.52sp" />
<TextView
android:id="@+id/vipGoldDesc"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:textColor="#999999"
android:text="享受專屬特權！"
android:textSize="7.68sp" />
</LinearLayout>
</FrameLayout>
</LinearLayout>
<ProgressBar
android:id="@+id/loading"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerInParent="true"
android:layout_marginBottom="8dp"
android:layout_marginTop="14dp"
android:indeterminateBehavior="repeat"
android:indeterminateDrawable="@drawable/anim_loading"
android:indeterminateOnly="true"
/>
<RelativeLayout
android:id="@+id/btn_send_lian"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_alignBottom="@id/group"
android:layout_alignParentRight="true"
android:layout_marginBottom="5dp"
android:layout_marginRight="10dp"
android:background="@mipmap/icon_live_gift_lian"
android:visibility="invisible"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:text="@string/live_gift_send_lian"
android:textColor="@color/white"
android:textSize="12sp"
/>
<TextView
android:id="@+id/lian_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="35dp"
android:textColor="#fff"
android:textSize="14sp"/>
</RelativeLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_live_gift">
<LinearLayout
android:id="@+id/gift_tab_layout"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/items"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="5dp" />
<ImageView
android:layout_marginEnd="15dp"
android:layout_width="wrap_content"
android:src="@drawable/bg_live_gift_package_line"
android:layout_gravity="center"
android:layout_height="23dp"/>
<com.yunbao.common.custom.DrawableTextView
android:id="@+id/btn_gift_package"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="10dp"
android:drawablePadding="2dp"
android:gravity="center_vertical"
android:text="@string/live_wrap"
android:textColor="#FFFFFF"
android:textSize="12sp"
app:dt_left_height="23dp"
app:dt_left_width="1.3dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/gift_tab_layout"
android:orientation="vertical">
<com.yunbao.live.custom.GiftPageViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="8dp"/>
<com.yunbao.live.custom.GiftPageViewPager
android:id="@+id/vpWrapList"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="8dp"
android:background="@mipmap/bg_gift_list"
android:visibility="gone" />
<RadioGroup
android:id="@+id/radio_group"
android:layout_width="wrap_content"
android:layout_height="6dp"
android:layout_marginEnd="30dp"
android:layout_gravity="end"
android:orientation="horizontal" />
<RadioGroup
android:id="@+id/radio_group_wrap"
android:layout_width="wrap_content"
android:layout_height="6dp"
android:layout_gravity="center_horizontal"
android:orientation="horizontal"
android:visibility="gone" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="66dp"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<RelativeLayout
android:id="@+id/btn_send_group"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/btn_send"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="10dp"
android:background="@drawable/bg_live_gift_send_2"
android:enabled="false"
android:gravity="center"
android:text="@string/live_gift_send"
android:textColor="@color/fg_btn_gift_send"
android:textSize="14sp" />
<TextView
android:id="@+id/btn_choose"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/btn_send"
android:background="@drawable/bg_live_gift_choose"
android:gravity="center"
android:paddingRight="13dp"
android:text="1"
android:textColor="@color/global"
android:textSize="14sp"
android:visibility="invisible" />
<ImageView
android:id="@+id/arrow"
android:layout_width="13dp"
android:layout_height="7dp"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:layout_toLeftOf="@id/btn_send"
android:src="@mipmap/icon_live_gift_2"
app:tint="@color/global"
android:visibility="invisible" />
</RelativeLayout>
<LinearLayout
android:orientation="horizontal"
android:gravity="bottom"
android:layout_marginBottom="5dp"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<com.yunbao.common.custom.DrawableTextView
android:id="@+id/goldCoin"
android:layout_width="wrap_content"
android:layout_weight="1"
android:layout_height="wrap_content"
android:drawablePadding="4dp"
android:gravity="center_vertical"
android:textColor="@color/white"
android:textSize="12sp"
app:dt_left_drawable="@mipmap/gold_coin"
app:dt_left_height="20dp"
app:dt_left_width="20dp"
app:dt_right_height="14dp"
app:dt_right_width="14dp" />
<com.yunbao.common.custom.DrawableTextView
android:id="@+id/coin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawablePadding="4dp"
android:gravity="center_vertical"
android:textColor="@color/white"
android:textSize="12sp"
app:dt_left_drawable="@mipmap/diamond"
app:dt_left_height="20dp"
app:dt_left_width="20dp"
app:dt_right_height="14dp"
app:dt_right_width="14dp" />
</LinearLayout>
<com.yunbao.common.custom.DrawableTextView
android:id="@+id/go_charge"
android:layout_width="42dp"
android:layout_height="22dp"
android:layout_marginStart="10dp"
android:layout_marginBottom="5dp"
android:drawablePadding="4dp"
android:gravity="center"
android:text="@string/charge"
android:background="@drawable/bg_live_gift_buy"
android:textColor="@color/yellow5"
android:textSize="12sp"
app:dt_left_height="20dp"
app:dt_left_width="20dp"
app:dt_right_height="14dp"
app:dt_right_width="14dp" />
</LinearLayout>
</FrameLayout>
</LinearLayout>
<ProgressBar
android:id="@+id/loading"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerInParent="true"
android:layout_marginTop="14dp"
android:layout_marginBottom="8dp"
android:indeterminateBehavior="repeat"
android:indeterminateDrawable="@drawable/anim_loading"
android:indeterminateOnly="true" />
<RelativeLayout
android:id="@+id/btn_send_lian"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_alignBottom="@id/group"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:layout_marginBottom="5dp"
android:background="@mipmap/icon_live_gift_lian"
android:visibility="invisible">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:text="@string/live_gift_send_lian"
android:textColor="@color/white"
android:textSize="12sp" />
<TextView
android:id="@+id/lian_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="35dp"
android:textColor="#fff"
android:textSize="14sp" />
</RelativeLayout>
</RelativeLayout>
</LinearLayout>

20
live/src/main/res/layout/item_live_gift.xml
View File

@@ -3,8 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mfl_ratio="1.25"
android:layout_height="wrap_content"
android:background="@drawable/bg_live_gift_items"
>
<com.yunbao.common.custom.MyRadioButton
@@ -98,4 +98,20 @@
android:paddingRight="3dp"
android:textColor="@color/white"
android:textSize="10sp" />
<LinearLayout
android:id="@+id/gift_loading_layout"
android:background="#C0000000"
android:layout_width="match_parent"
android:gravity="center"
android:layout_height="match_parent">
<ImageView
android:id="@+id/gift_loading"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="30dp"
android:src="@mipmap/icon_download_gift"
/>
</LinearLayout>
</com.yunbao.common.custom.MyFrameLayout2>

29
live/src/main/res/layout/view_live_audience.xml
View File

@@ -348,14 +348,39 @@
android:src="@mipmap/live_lw" />
<ImageView
android:id="@+id/live_new_people"
android:id="@+id/live_new_people1"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_toStartOf="@id/gift_image"
android:padding="4dp"
android:src="@mipmap/live_icon_newpeople_en"
android:visibility="visible" />
android:visibility="gone" />
<RelativeLayout
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_toStartOf="@id/gift_image"
android:padding="4dp">
<ImageView
android:id="@+id/live_new_people"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:src="@mipmap/live_icon_newpeople_en" />
<View
android:id="@+id/live_new_people_red_dot"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_alignParentRight="true"
android:layout_marginTop="0dp"
android:layout_marginRight="0dp"
android:background="@drawable/background_ff5075"
android:visibility="visible" />
</RelativeLayout>
</RelativeLayout>

BIN
live/src/main/res/mipmap-xxxhdpi/icon_download_gift.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
live/src/main/res/mipmap-xxxhdpi/icon_loading_gift.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
live/src/main/res/mipmap-xxxhdpi/icon_small_download.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
live/src/main/res/mipmap-xxxhdpi/icon_vip_gold.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB