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

修复

Browse Source
This commit is contained in:
18401019693
2023-07-10 16:36:48 +08:00
parent 4918f9ba20
commit 1d447b0a90
10 changed files with 131 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
live/src/main/java/com/yunbao/live/adapter/LiveGiftAdapter.java
View File

@@ -3,6 +3,7 @@ package com.yunbao.live.adapter;
import android.content.Context;
import android.graphics.Color;
import android.text.TextUtils;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -243,6 +244,7 @@ public class LiveGiftAdapter extends RecyclerView.Adapter<LiveGiftAdapter.Vh> {
mPayico.setVisibility(View.GONE);
mPrice.setText(mContext.getString(R.string.build_up_popularity));
mPrice.setTextColor(Color.parseColor("#db8c4a"));
mPrice.setTextSize(TypedValue.COMPLEX_UNIT_SP,8);
ViewClicksAntiShake.clicksAntiShake(mRadioButton, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
@@ -253,6 +255,7 @@ public class LiveGiftAdapter extends RecyclerView.Adapter<LiveGiftAdapter.Vh> {
}
});
} else {
mPrice.setTextSize(TypedValue.COMPLEX_UNIT_SP,11);
mRadioButton.setOnClickListener(mOnClickListener);
mPrice.setTextColor(Color.parseColor("#c8c8c8"));
mPayico.setVisibility(View.VISIBLE);

2
live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
View File

@@ -165,7 +165,7 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
.show();
} else {
new XPopup.Builder(getContext())
.asCustom(new ResultRendPacketPopup(getContext(), true, data.setRedPacketId(redPacketInfoModel.getSuperJackpotId()), true))
.asCustom(new ResultRendPacketPopup(getContext(), true, data.setSuperJackpotId(redPacketInfoModel.getSuperJackpotId()), true))
.show();
}

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

@@ -68,6 +68,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:gravity="center"
android:textColor="@color/gray3"
android:textSize="11sp" />

2
live/src/main/res/layout/view_receive_red_packet.xml
View File

@@ -96,7 +96,7 @@
android:background="@drawable/background_open_red_packet"
android:text="@string/red_packet_open"
android:textColor="#FFE9BF"
android:textSize="36sp"
android:textSize="32sp"
android:textStyle="bold"
android:visibility="invisible" />

2
live/src/main/res/layout/view_red_packet.xml
View File

@@ -47,7 +47,7 @@
android:id="@+id/open_red_packet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="待開紅包:4"
android:text="@string/open_red_packet"
android:textColor="@color/white"
android:textSize="9sp" />
</LinearLayout>

191
live/src/main/res/layout/view_send_red_packet.xml
View File

@@ -129,7 +129,7 @@
android:layout_marginTop="213dp">
<androidx.cardview.widget.CardView
android:layout_width="50dp"
android:layout_width="72dp"
android:layout_height="35dp"
android:layout_marginStart="43dp"
app:cardBackgroundColor="#E82936"
@@ -142,10 +142,10 @@
android:gravity="center"
android:text="@string/conditions"
android:textColor="@color/white"
android:textSize="15sp" />
android:textSize="13sp" />
</androidx.cardview.widget.CardView>
<FrameLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="15dp"
@@ -163,15 +163,17 @@
<Button
android:id="@+id/following_anchor"
android:layout_width="75dp"
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_gravity="end"
android:layout_marginStart="5dp"
android:layout_weight="1"
android:background="@drawable/background_red_packet_select"
android:gravity="center"
android:text="@string/following_anchor"
android:textColor="#FDD04A"
android:textSize="12sp" />
</FrameLayout>
android:textSize="10sp" />
</LinearLayout>
</LinearLayout>
<FrameLayout
@@ -183,7 +185,7 @@
<TextView
android:id="@+id/red_envelope_rill"
android:layout_width="wrap_content"
android:layout_width="105dp"
android:layout_height="wrap_content"
android:text="@string/red_envelope_rill"
android:textColor="@color/white"
@@ -191,9 +193,10 @@
<TextView
android:id="@+id/total_consumption_of_drill"
android:layout_width="wrap_content"
android:layout_width="105dp"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:gravity="end"
android:text="@string/total_consumption_of_drill"
android:textColor="@color/white"
android:textSize="12sp" />
@@ -227,99 +230,109 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/background_send_red_packet_illustrate"
android:clickable="true"
android:focusable="true"
android:visibility="gone">
<!--结果-->
<LinearLayout
android:layout_width="245dp"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:layout_marginTop="25dp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/send_red_packet_illustrate1"
android:textColor="@color/white"
android:textSize="12sp" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="392dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/send_red_packet_illustrate2"
android:textColor="@color/white"
android:textSize="11sp" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<!--结果-->
<LinearLayout
android:layout_width="245dp"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:layout_marginTop="25dp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="@string/send_red_packet_illustrate3"
android:textColor="@color/white"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/send_red_packet_illustrate1"
android:textColor="@color/white"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/send_red_packet_illustrate4"
android:textColor="@color/white"
android:textSize="11sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/send_red_packet_illustrate2"
android:textColor="@color/white"
android:textSize="11sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="@string/send_red_packet_illustrate5"
android:textColor="@color/white"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="@string/send_red_packet_illustrate3"
android:textColor="@color/white"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/send_red_packet_illustrate6"
android:textColor="@color/white"
android:textSize="11sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/send_red_packet_illustrate4"
android:textColor="@color/white"
android:textSize="11sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="@string/send_red_packet_illustrate7"
android:textColor="@color/white"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="@string/send_red_packet_illustrate5"
android:textColor="@color/white"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/send_red_packet_illustrate8"
android:textColor="@color/white"
android:textSize="11sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/send_red_packet_illustrate6"
android:textColor="@color/white"
android:textSize="11sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="@string/send_red_packet_illustrate9"
android:textColor="@color/white"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="@string/send_red_packet_illustrate7"
android:textColor="@color/white"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/send_red_packet_illustrate10"
android:textColor="@color/white"
android:textSize="11sp" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/send_red_packet_illustrate8"
android:textColor="@color/white"
android:textSize="11sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="@string/send_red_packet_illustrate9"
android:textColor="@color/white"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/send_red_packet_illustrate10"
android:textColor="@color/white"
android:textSize="11sp" />
</LinearLayout>
<ImageView
android:id="@+id/illustrate_close"
android:layout_width="19dp"
android:layout_height="19dp"
android:layout_gravity="end"
android:layout_margin="12dp"
android:src="@mipmap/meiyan_icon_close" />
</FrameLayout>
</androidx.core.widget.NestedScrollView>
<ImageView
android:id="@+id/illustrate_close"
android:layout_width="19dp"
android:layout_height="19dp"
android:layout_gravity="end"
android:layout_margin="12dp"
android:src="@mipmap/meiyan_icon_close" />
</FrameLayout>
</FrameLayout>