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

礼物弹窗更改

Browse Source
This commit is contained in:
18401019693 2022-11-22 14:57:13 +08:00
parent a9d323354b
commit 08e7e6b461
4 changed files with 185 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.gradle
View File

@ -10,9 +10,9 @@ ext {
manifestPlaceholders = [ manifestPlaceholders = [
//正式 //正式
// serverHost : "https://napi.yaoulive.com", serverHost : "https://napi.yaoulive.com",
//測試 //測試
serverHost : "https://ceshi.yaoulive.com", // serverHost : "https://ceshi.yaoulive.com",
//腾讯地图 //腾讯地图
txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",

13
live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
View File

@ -148,7 +148,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
window.setWindowAnimations(R.style.bottomToTopAnim); window.setWindowAnimations(R.style.bottomToTopAnim);
WindowManager.LayoutParams params = window.getAttributes(); WindowManager.LayoutParams params = window.getAttributes();
params.width = WindowManager.LayoutParams.MATCH_PARENT; params.width = WindowManager.LayoutParams.MATCH_PARENT;
params.height = DpUtil.dp2px(350); params.height = DpUtil.dp2px(355);
params.gravity = Gravity.BOTTOM; params.gravity = Gravity.BOTTOM;
window.setAttributes(params); window.setAttributes(params);
} }
@ -503,11 +503,11 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
} else if (i == R.id.btn_choose) { } else if (i == R.id.btn_choose) {
showGiftCount(); showGiftCount();
} else if (i == R.id.coin) { } else if (i == R.id.coin) {
forwardMyCoin(); forwardMyCoin(0);
} else if (i == R.id.goldCoin) { } else if (i == R.id.goldCoin) {
forwardMyCoin(); forwardMyCoin(2);
} else if (i == R.id.go_charge) { } else if (i == R.id.go_charge) {
forwardMyCoin(); forwardMyCoin(0);
} else if (i == R.id.btn_luck_gift_tip) { } else if (i == R.id.btn_luck_gift_tip) {
dismiss(); dismiss();
((LiveActivity) mContext).openLuckGiftTip(); ((LiveActivity) mContext).openLuckGiftTip();
@ -556,10 +556,10 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
/** /**
* 跳转到我的钻石 * 跳转到我的钻石
*/ */
private void forwardMyCoin() { private void forwardMyCoin(int page) {
dismiss(); dismiss();
//我们的 //我们的
ARouter.getInstance().build(PATH_COIN).withInt("p", 0).navigation(); ARouter.getInstance().build(PATH_COIN).withInt("p", page).navigation();
} }
/** /**
@ -709,6 +709,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
/** /**
* 收到礼物下载完成的通知 * 收到礼物下载完成的通知
*
* @param status * @param status
*/ */
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)

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

@ -2,24 +2,25 @@
<LinearLayout 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" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="350dp"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:orientation="horizontal" android:layout_height="wrap_content"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_height="wrap_content"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:id="@+id/live_gift_download_all" android:id="@+id/live_gift_download_all"
android:layout_width="155dp" android:layout_width="155dp"
android:layout_height="32dp" android:layout_height="32dp"
android:layout_marginStart="12dp"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginStart="12dp"
android:background="@drawable/bg_live_gift_download_all" android:background="@drawable/bg_live_gift_download_all"
android:gravity="center" android:gravity="center"
android:visibility="invisible" android:orientation="horizontal"
android:orientation="horizontal"> android:visibility="invisible">
<ImageView <ImageView
android:layout_width="19dp" android:layout_width="19dp"
@ -31,16 +32,17 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:visibility="visible"
android:text="一鍵下載所有禮物動畫" android:text="一鍵下載所有禮物動畫"
android:textSize="10sp" /> android:textSize="10sp"
android:visibility="visible" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/btn_luck_gift_tip" android:id="@+id/btn_luck_gift_tip"
android:layout_width="105.27dp" android:layout_width="105.27dp"
android:layout_alignParentEnd="true"
android:layout_height="32dp" android:layout_height="32dp"
android:layout_alignParentEnd="true"
android:layout_marginEnd="12dp" android:layout_marginEnd="12dp"
android:background="@drawable/bg_live_vip_blue" android:background="@drawable/bg_live_vip_blue"
android:gravity="center" android:gravity="center"
@ -53,56 +55,63 @@
android:layout_marginEnd="7dp" android:layout_marginEnd="7dp"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@mipmap/icon_vip_gold" /> android:src="@mipmap/icon_vip_gold" />
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start" android:gravity="start"
android:layout_height="wrap_content"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/vipGoldTitle" android:id="@+id/vipGoldTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="start" android:layout_gravity="start"
android:textColor="#FFFFFF"
android:text="@string/live_gift_buy_gold" android:text="@string/live_gift_buy_gold"
android:textColor="#FFFFFF"
android:textSize="11.52sp" /> android:textSize="11.52sp" />
<TextView <TextView
android:id="@+id/vipGoldDesc" android:id="@+id/vipGoldDesc"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:textColor="#999999"
android:text="@string/live_gift_buy_gold_desc" android:text="@string/live_gift_buy_gold_desc"
android:textColor="#999999"
android:textSize="7.68sp" /> android:textSize="7.68sp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_live_gift"> android:background="@drawable/bg_live_gift">
<LinearLayout <LinearLayout
android:id="@+id/gift_tab_layout" android:id="@+id/gift_tab_layout"
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp"
android:gravity="center" android:gravity="center"
android:layout_height="50dp"> android:orientation="horizontal">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/items" android:id="@+id/items"
android:layout_weight="1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginEnd="5dp" /> android:layout_marginEnd="5dp"
android:layout_weight="1" />
<ImageView <ImageView
android:layout_marginEnd="15dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:src="@drawable/bg_live_gift_package_line" android:layout_height="23dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_height="23dp"/> android:layout_marginEnd="15dp"
android:src="@drawable/bg_live_gift_package_line" />
<com.yunbao.common.custom.DrawableTextView <com.yunbao.common.custom.DrawableTextView
android:id="@+id/btn_gift_package" android:id="@+id/btn_gift_package"
android:layout_width="36dp" android:layout_width="36dp"
@ -121,62 +130,68 @@
android:id="@+id/group" android:id="@+id/group"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="300dp" android:layout_height="300dp"
android:gravity="bottom"
android:layout_below="@id/gift_tab_layout" android:layout_below="@id/gift_tab_layout"
android:gravity="bottom"
android:orientation="vertical"> android:orientation="vertical">
<androidx.viewpager.widget.ViewPager <androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager" android:id="@+id/viewPager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginBottom="1dp"/> android:layout_weight="1" />
<androidx.viewpager.widget.ViewPager <androidx.viewpager.widget.ViewPager
android:id="@+id/vpWrapList" android:id="@+id/vpWrapList"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginBottom="1dp" android:layout_marginBottom="3dp"
android:layout_weight="1"
android:visibility="gone" /> android:visibility="gone" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="66dp"
android:layout_weight="0">
<RadioGroup <RadioGroup
android:id="@+id/radio_group" android:id="@+id/radio_group"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="6dp" android:layout_height="6dp"
android:layout_marginEnd="30dp"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_marginTop="3.5dp"
android:layout_marginEnd="20dp"
android:gravity="end"
android:orientation="horizontal" /> android:orientation="horizontal" />
<RadioGroup <RadioGroup
android:id="@+id/radio_group_wrap" android:id="@+id/radio_group_wrap"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_marginEnd="20dp"
android:layout_height="6dp" android:layout_height="6dp"
android:layout_gravity="center_horizontal" android:layout_gravity="end"
android:layout_marginTop="3.5dp"
android:gravity="end"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone" /> android:visibility="visible" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_weight="0"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<RelativeLayout <RelativeLayout
android:id="@+id/btn_send_group" android:id="@+id/btn_send_group"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp">
<TextView <TextView
android:id="@+id/btn_send" android:id="@+id/btn_send"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_alignParentBottom="true"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp"
android:background="@drawable/bg_live_gift_send_2" android:background="@drawable/bg_live_gift_send_2"
android:enabled="false" android:enabled="false"
android:gravity="center" android:gravity="center"
@ -188,7 +203,8 @@
android:id="@+id/btn_choose" android:id="@+id/btn_choose"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_centerVertical="true" android:layout_alignParentBottom="true"
android:layout_marginBottom="10dp"
android:layout_toLeftOf="@id/btn_send" android:layout_toLeftOf="@id/btn_send"
android:background="@drawable/bg_live_gift_choose" android:background="@drawable/bg_live_gift_choose"
android:gravity="center" android:gravity="center"
@ -202,31 +218,35 @@
android:id="@+id/arrow" android:id="@+id/arrow"
android:layout_width="13dp" android:layout_width="13dp"
android:layout_height="7dp" android:layout_height="7dp"
android:layout_centerVertical="true" android:layout_alignParentBottom="true"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:layout_marginBottom="22dp"
android:layout_toLeftOf="@id/btn_send" android:layout_toLeftOf="@id/btn_send"
android:src="@mipmap/icon_live_gift_2" android:src="@mipmap/icon_live_gift_2"
app:tint="@color/global" android:visibility="invisible"
android:visibility="invisible" /> app:tint="@color/global" />
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
android:orientation="horizontal" android:layout_width="wrap_content"
android:gravity="bottom" android:layout_height="match_parent"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:layout_width="wrap_content" android:gravity="bottom"
android:layout_height="match_parent"> android:layout_marginStart="20dp"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:orientation="vertical">
<com.yunbao.common.custom.DrawableTextView <com.yunbao.common.custom.DrawableTextView
android:id="@+id/goldCoin" android:id="@+id/goldCoin"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:drawablePadding="4dp" android:drawablePadding="4dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textColor="@color/white" android:textColor="@color/white"
@ -253,16 +273,17 @@
app:dt_right_width="14dp" /> app:dt_right_width="14dp" />
</LinearLayout> </LinearLayout>
<com.yunbao.common.custom.DrawableTextView <com.yunbao.common.custom.DrawableTextView
android:id="@+id/go_charge" android:id="@+id/go_charge"
android:layout_width="42dp" android:layout_width="42dp"
android:layout_height="22dp" android:layout_height="22dp"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginBottom="3dp" android:layout_marginBottom="3dp"
android:background="@drawable/bg_live_gift_buy"
android:drawablePadding="4dp" android:drawablePadding="4dp"
android:gravity="center" android:gravity="center"
android:text="@string/charge" android:text="@string/charge"
android:background="@drawable/bg_live_gift_buy"
android:textColor="@color/yellow5" android:textColor="@color/yellow5"
android:textSize="12sp" android:textSize="12sp"
app:dt_left_height="20dp" app:dt_left_height="20dp"

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

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<com.yunbao.common.custom.MyFrameLayout2 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="92dp"
app:mfl_ratio="1"
android:background="@drawable/bg_live_gift_items" android:background="@drawable/bg_live_gift_items"
> app:mfl_ratio="1">
<com.yunbao.common.custom.MyRadioButton <com.yunbao.common.custom.MyRadioButton
android:id="@+id/radioButton" android:id="@+id/radioButton"
@ -14,15 +12,14 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/bg_live_gift_item" android:background="@drawable/bg_live_gift_item"
android:button="@null" android:button="@null"
android:checked="true" android:checked="true" />
/>
<com.yunbao.live.custom.GiftMarkView <com.yunbao.live.custom.GiftMarkView
android:id="@+id/mark" android:id="@+id/mark"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginRight="1dp" android:layout_marginTop="1dp"
android:layout_marginTop="1dp"/> android:layout_marginRight="1dp" />
<RelativeLayout <RelativeLayout
android:layout_width="45dp" android:layout_width="45dp"
@ -34,20 +31,21 @@
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_centerVertical="true" android:layout_centerHorizontal="true"
android:layout_centerHorizontal="true"/> android:layout_centerVertical="true" />
<TextView android:id="@+id/expire" <TextView
android:id="@+id/expire"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:textColor="@color/color_white"
android:gravity="center"
android:background="#D996cff0"
android:visibility="gone"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginBottom="2dp" android:layout_marginBottom="2dp"
android:textSize="8sp"/> android:background="#D996cff0"
android:gravity="center"
android:textColor="@color/color_white"
android:textSize="8sp"
android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
@ -56,11 +54,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|center" android:layout_gravity="bottom|center"
android:gravity="center"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView android:id="@+id/pay_ico" <ImageView
android:id="@+id/pay_ico"
android:layout_width="10dp" android:layout_width="10dp"
android:layout_height="10dp" /> android:layout_height="10dp" />
@ -68,8 +67,8 @@
android:id="@+id/price" android:id="@+id/price"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/gray3"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:textColor="@color/gray3"
android:textSize="11sp" /> android:textSize="11sp" />
</LinearLayout> </LinearLayout>
@ -78,18 +77,17 @@
android:id="@+id/name" android:id="@+id/name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginBottom="23dp" android:layout_marginBottom="23dp"
android:gravity="center" android:gravity="center"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="12sp" android:textSize="12sp" />
android:layout_gravity="bottom"
/>
<TextView <TextView
android:visibility="gone"
android:layout_gravity="right"
android:id="@+id/tvRedpoint" android:id="@+id/tvRedpoint"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="14dp" android:layout_height="14dp"
android:layout_gravity="right"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:background="@drawable/bg_red_point" android:background="@drawable/bg_red_point"
android:gravity="center" android:gravity="center"
@ -98,7 +96,8 @@
android:paddingLeft="3dp" android:paddingLeft="3dp"
android:paddingRight="3dp" android:paddingRight="3dp"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="10sp" /> android:textSize="10sp"
android:visibility="gone" />
<LinearLayout <LinearLayout
android:id="@+id/gift_loading_layout" android:id="@+id/gift_loading_layout"
@ -117,4 +116,4 @@
</LinearLayout> </LinearLayout>
</com.yunbao.common.custom.MyFrameLayout2> </FrameLayout>