准备切分支 提交用户底部部分逻辑
This commit is contained in:
parent
a86b560996
commit
73ea623700
@ -99,6 +99,21 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
|
||||
private ImageView pd_pao, combo;
|
||||
private CircleProgress2 circleProgress;
|
||||
|
||||
|
||||
// private TextView etInput; // 对应于XML中的TextView
|
||||
// private ImageView msgImage; // 对应于XML中的第一个ImageView
|
||||
// private ImageView pandaImage; // 对应于XML中的另一个ImageView
|
||||
// private TextView quickGiftRemainingQuantity; // 对应于XML中的TextView
|
||||
// private ImageView combo; // 对应于XML中的ImageView
|
||||
// private CircleProgress2 circleProgress; // 假设CircleProgress2是一个自定义视图类
|
||||
// private TextView timeText; // 对应于XML中的TextView
|
||||
// private ImageView giftImage; // 对应于XML中的ImageView
|
||||
// private View msgRedPoint; // 对应于XML中的View
|
||||
// private ImageView totalImage; // 对应于XML中的ImageView
|
||||
// private View totalRedPoint; // 对应于XML中的View
|
||||
|
||||
|
||||
|
||||
public LiveAudienceViewHolder(Context context, ViewGroup parentView) {
|
||||
super(context, parentView);
|
||||
this.context = (Activity) context;
|
||||
@ -115,11 +130,27 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
|
||||
public void init() {
|
||||
super.init();
|
||||
EventBus.getDefault().register(this);
|
||||
findViewById(R.id.btn_close).setOnClickListener(this);
|
||||
findViewById(R.id.btn_share).setOnClickListener(this);
|
||||
findViewById(R.id.btn_red_pack).setOnClickListener(this);
|
||||
findViewById(R.id.btn_gift).setOnClickListener(this);
|
||||
findViewById(R.id.btn_zg).setOnClickListener(this);
|
||||
|
||||
// findViewById(R.id.btn_close).setOnClickListener(this);
|
||||
// findViewById(R.id.btn_share).setOnClickListener(this);
|
||||
// findViewById(R.id.btn_red_pack).setOnClickListener(this);
|
||||
// findViewById(R.id.btn_gift).setOnClickListener(this);
|
||||
// findViewById(R.id.btn_zg).setOnClickListener(this);
|
||||
|
||||
|
||||
// 初始化控件
|
||||
// etInput = findViewById(R.id.et_input);
|
||||
// msgImage = findViewById(R.id.msg_image);
|
||||
// pandaImage = findViewById(R.id.panda_image);
|
||||
// quickGiftRemainingQuantity = findViewById(R.id.quick_gift_remaining_quantity);
|
||||
// combo = findViewById(R.id.combo);
|
||||
// circleProgress = findViewById(R.id.circleProgress);
|
||||
// timeText = findViewById(R.id.time_text);
|
||||
// giftImage = findViewById(R.id.gift_image);
|
||||
// msgRedPoint = findViewById(R.id.msg_red_point);
|
||||
// totalImage = findViewById(R.id.total_image);
|
||||
// totalRedPoint = findViewById(R.id.total_red_point);
|
||||
|
||||
voiceButton = (LinearLayout) findViewById(R.id.voice_button);
|
||||
giftImage = (ImageView) findViewById(R.id.gift_image);
|
||||
quick_gift_remaining_quantity = (TextView) findViewById(R.id.quick_gift_remaining_quantity);
|
||||
@ -659,7 +690,6 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
|
||||
int i = v.getId();
|
||||
if (i == R.id.btn_close) {
|
||||
close();
|
||||
|
||||
} else if (i == R.id.btn_share) {
|
||||
((LiveAudienceActivity) mContext).light();
|
||||
|
||||
@ -668,7 +698,6 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
|
||||
|
||||
} else if (i == R.id.btn_gift) {
|
||||
openGiftWindow();
|
||||
|
||||
//全屏
|
||||
} else if (i == R.id.btn_more) {
|
||||
((LiveActivity) mContext).openMoreWindow();
|
||||
|
@ -27,7 +27,8 @@
|
||||
android:layout_marginBottom="30dp"
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="vertical"
|
||||
android:visibility="gone">
|
||||
android:visibility="gone"
|
||||
tools:visibility="gone">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
@ -113,9 +114,18 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<include
|
||||
layout="@layout/view_live_audience_part"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="45dp"
|
||||
android:layout_alignParentBottom="true"
|
||||
tools:layout_marginBottom="45dp"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="45dp"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:gravity="center_vertical">
|
||||
|
||||
@ -127,7 +137,8 @@
|
||||
android:layout_centerVertical="true"
|
||||
android:padding="5dp"
|
||||
android:src="@mipmap/icon_live_close"
|
||||
android:visibility="invisible" />
|
||||
android:visibility="invisible"
|
||||
tools:visibility="invisible" />
|
||||
|
||||
|
||||
<pl.droidsonroids.gif.GifImageView
|
||||
@ -283,9 +294,9 @@
|
||||
</LinearLayout>
|
||||
<!--消息中心-->
|
||||
<RelativeLayout
|
||||
android:visibility="visible"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content">
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="visible">
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/rt_msg"
|
||||
@ -388,8 +399,7 @@
|
||||
android:id="@+id/circleProgress"
|
||||
android:layout_width="32dp"
|
||||
android:layout_height="32dp"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_centerVertical="true" />
|
||||
android:layout_centerHorizontal="true" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/pd_pao"
|
||||
@ -410,7 +420,8 @@
|
||||
android:text="120S"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="10sp"
|
||||
android:visibility="gone" />
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible" />
|
||||
|
||||
|
||||
<ImageView
|
||||
@ -473,8 +484,8 @@
|
||||
android:layout_width="6dp"
|
||||
android:layout_height="6dp"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_marginEnd="12dp"
|
||||
android:layout_marginTop="3dp"
|
||||
android:layout_marginEnd="12dp"
|
||||
android:background="@drawable/bg_red_point"
|
||||
tools:visibility="visible" />
|
||||
</RelativeLayout>
|
||||
|
@ -53,6 +53,67 @@
|
||||
app:layout_constraintStart_toEndOf="@+id/msg_image"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/quick_gift_remaining_quantity"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentBottom="true"
|
||||
app:layout_constraintTop_toBottomOf="@+id/et_input"
|
||||
app:layout_constraintStart_toStartOf="@+id/panda_image"
|
||||
app:layout_constraintEnd_toEndOf="@+id/panda_image"
|
||||
android:text="99"
|
||||
android:textColor="#FFB403"
|
||||
android:textSize="8sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/combo"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:padding="5dp"
|
||||
app:layout_constraintTop_toTopOf="@+id/panda_image"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/panda_image"
|
||||
app:layout_constraintStart_toStartOf="@+id/panda_image"
|
||||
app:layout_constraintEnd_toEndOf="@+id/panda_image"
|
||||
android:src="@mipmap/icon_combo"
|
||||
android:visibility="gone"
|
||||
tools:visibility="gone" />
|
||||
|
||||
|
||||
<com.yunbao.common.views.weight.CircleProgress2
|
||||
android:id="@+id/circleProgress"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_margin="5dp"
|
||||
android:layout_centerHorizontal="true"
|
||||
app:layout_constraintTop_toTopOf="@+id/panda_image"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/panda_image"
|
||||
app:layout_constraintStart_toStartOf="@+id/panda_image"
|
||||
app:layout_constraintEnd_toEndOf="@+id/panda_image"
|
||||
tools:visibility="gone"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/time_text"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_margin="5dp"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:background="@drawable/backgroud_panda_time"
|
||||
app:layout_constraintTop_toTopOf="@+id/panda_image"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/panda_image"
|
||||
app:layout_constraintStart_toStartOf="@+id/panda_image"
|
||||
app:layout_constraintEnd_toEndOf="@+id/panda_image"
|
||||
android:gravity="center"
|
||||
android:text="120S"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="10sp"
|
||||
android:visibility="gone"
|
||||
tools:visibility="gone"/>
|
||||
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/gift_image"
|
||||
android:layout_width="wrap_content"
|
Loading…
Reference in New Issue
Block a user