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

第二行的UI调整完成

Browse Source
This commit is contained in:
ningwenqiang 2024-09-12 16:34:34 +08:00
parent eba7cb1ab8
commit c58b37d111
64 changed files with 940 additions and 636 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/res/drawable/bg_gift_progressbar.xml
View File

@ -5,7 +5,7 @@
<shape> <shape>
<!--设置ProgressBar进度条圆角半径--> <!--设置ProgressBar进度条圆角半径-->
<corners android:radius="1dp" /> <corners android:radius="1dp" />
<solid android:color="#A5A193" /> <solid android:color="#26000000" />
</shape> </shape>
</item> </item>

BIN
common/src/main/res/mipmap-hdpi/icon_red_packet_open.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
common/src/main/res/mipmap-mdpi/icon_red_packet_open.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
common/src/main/res/mipmap-xhdpi/icon_red_packet_open.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
common/src/main/res/mipmap-xxxhdpi/icon_red_packet_open.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

550
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -10,6 +10,7 @@ import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.graphics.Color;
import android.graphics.Outline; import android.graphics.Outline;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
@ -19,7 +20,10 @@ import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.SystemClock; import android.os.SystemClock;
import android.text.Html; import android.text.Html;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.style.ForegroundColorSpan;
import android.util.Log; import android.util.Log;
import android.view.Gravity; import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -45,6 +49,8 @@ import android.widget.ViewFlipper;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.Group;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
@ -450,21 +456,20 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
public static SVGAVideoEntity drawableTitleEn; public static SVGAVideoEntity drawableTitleEn;
public static SVGAVideoEntity drawableBg; public static SVGAVideoEntity drawableBg;
private LinearLayout giftLayout; // private LinearLayout giftLayout;
private TextView gift_number; // private TextView gift_number;
private TextView gift_total; // private TextView gift_total;
private ProgressBar gift_progressbar; // private ProgressBar gift_progressbar;
//
private LinearLayout wishlistLayout; // private LinearLayout wishlistLayout;
private ImageView wish_icon; // private ImageView wish_icon;
private TextView wish_number; // private TextView wish_number;
private TextView wish_total; // private TextView wish_total;
private ProgressBar wish_progressbar; // private ProgressBar wish_progressbar;
//
private LinearLayout anTask; // private LinearLayout anTask;
private boolean isComAll; private boolean isComAll;
private int mDp500; private int mDp500;
//首次进入该直播间 关注弹窗 //首次进入该直播间 关注弹窗
private RelativeLayout notify_follow_layout; private RelativeLayout notify_follow_layout;
private ImageView notify_follow_coin; private ImageView notify_follow_coin;
@ -487,6 +492,39 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
private TextView new_task_send_gift_details; private TextView new_task_send_gift_details;
private ImageView close_task_send_gift_close; private ImageView close_task_send_gift_close;
// 新手任务相关控件
private ImageView newTaskBg;
private Group newTaskGroup;
// 红包任务相关控件
private ImageView newRedPacketImg;
private TextView newRedPacketTv;
private Group newRedPacketGroup;
// 神龙任务相关控件
private ImageView newDragonImg;
private TextView newDragonTv;
private Group newDragonGroup;
// 心愿任务相关控件
private View newWishBgView;
private ImageView newWishImg;
private TextView newWishNowTv;
private TextView newWishTotalTv;
private ProgressBar wish_progressbar;
private Group newWishGroup;
// 周星榜相关控件
private View newWeekBgView;
// private ImageView newWeekImg;
// private TextView newWeekTitleTv;
private TextView newWeekNowTv;
private TextView newWeekTotalTv;
private ProgressBar weekProgressbar;
private Group newWeekGroup;
public LiveRoomViewHolder setGuardType(int guardType) { public LiveRoomViewHolder setGuardType(int guardType) {
this.guardType = guardType; this.guardType = guardType;
return this; return this;
@ -1802,6 +1840,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
fans_btn = (LinearLayout) findViewById(R.id.fans_btn); fans_btn = (LinearLayout) findViewById(R.id.fans_btn);
mAnchorLayout = findViewById(R.id.group_1); mAnchorLayout = findViewById(R.id.group_1);
liveRankPk2 = (LinearLayout) findViewById(R.id.live_rank_pk2); liveRankPk2 = (LinearLayout) findViewById(R.id.live_rank_pk2);
findViewById(R.id.topLayout1_line).setVisibility(isAnchorLive()?View.GONE:View.VISIBLE);
mGoodNumberIcon = (ImageView) findViewById(R.id.good_nub_ico); mGoodNumberIcon = (ImageView) findViewById(R.id.good_nub_ico);
pkRankLayout = (FrameLayout) findViewById(R.id.live_rank_pk); pkRankLayout = (FrameLayout) findViewById(R.id.live_rank_pk);
pkRankVf = (ViewFlipper) findViewById(R.id.rank_pk_vf); pkRankVf = (ViewFlipper) findViewById(R.id.rank_pk_vf);
@ -2070,11 +2109,33 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
avatar_r1 = (RoundedImageView) findViewById(R.id.avatar_r1); avatar_r1 = (RoundedImageView) findViewById(R.id.avatar_r1);
avatar_r2 = (RoundedImageView) findViewById(R.id.avatar_r2); avatar_r2 = (RoundedImageView) findViewById(R.id.avatar_r2);
avatar_r3 = (RoundedImageView) findViewById(R.id.avatar_r3); avatar_r3 = (RoundedImageView) findViewById(R.id.avatar_r3);
redPacket = findViewById(R.id.red_packet);
redPacketCountdown = (TextView) findViewById(R.id.red_packet_countdown);
redSchedule = (TextView) findViewById(R.id.red_schedule); // 初始化红包任务相关控件
redPacketQueue = (LinearLayout) findViewById(R.id.red_packet_queue); newRedPacketImg = findViewById(R.id.newRedPacketImg);
openRedPacket = (TextView) findViewById(R.id.open_red_packet); newRedPacketTv = findViewById(R.id.newRedPacketTv);
newRedPacketGroup = findViewById(R.id.newRedPacketGroup);
// 初始化神龙任务相关控件
newDragonImg = findViewById(R.id.newDragonImg);
newDragonTv = findViewById(R.id.newDragonTv);
newDragonGroup = findViewById(R.id.newDragonGroup);
ViewClicksAntiShake.clicksAntiShake(newDragonImg, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
new DragonSendMoneyListPopup(mContext, mLiveUid, isDragonTime, isAttention != 0).showDialog();
}
});
//redPacket = findViewById(R.id.red_packet);
// redPacketCountdown = (TextView) findViewById(R.id.red_packet_countdown);
// redSchedule = (TextView) findViewById(R.id.red_schedule);
// redPacketQueue = (LinearLayout) findViewById(R.id.red_packet_queue);
// openRedPacket = (TextView) findViewById(R.id.open_red_packet);
lt_pk_line = (RelativeLayout) findViewById(R.id.lt_pk_line); lt_pk_line = (RelativeLayout) findViewById(R.id.lt_pk_line);
clickAvatar(); clickAvatar();
@ -2172,35 +2233,38 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
pa_pao_layout.setVisibility(View.GONE); pa_pao_layout.setVisibility(View.GONE);
combo_layout.setVisibility(View.GONE); combo_layout.setVisibility(View.GONE);
dragonImmediateParticipation = (RelativeLayout) findViewById(R.id.dragon_immediate_participation);
dragonImmediateParticipationTime = (RelativeLayout) findViewById(R.id.dragon_immediate_participation_time);
participation_time = (TextView) findViewById(R.id.participation_time);
ViewClicksAntiShake.clicksAntiShake(dragonImmediateParticipation, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
new DragonSendMoneyListPopup(mContext, mLiveUid, false, isAttention != 0).showDialog(); // dragonImmediateParticipation = (RelativeLayout) findViewById(R.id.dragon_immediate_participation);
// new XPopup.Builder(mContext) // dragonImmediateParticipationTime = (RelativeLayout) findViewById(R.id.dragon_immediate_participation_time);
// .asCustom(new GuardUpgradePopup(mContext, mLiveUid)) // participation_time = (TextView) findViewById(R.id.participation_time);
// .show(); // ViewClicksAntiShake.clicksAntiShake(dragonImmediateParticipation, new ViewClicksAntiShake.ViewClicksCallBack() {
// ttttttype = ttttttype + 1; // @Override
// buyGuardNew(new NewAllServerNotifyGuardEvent() // public void onViewClicks() {
// .setAction("90") // new DragonSendMoneyListPopup(mContext, mLiveUid, false, isAttention != 0).showDialog();
// .setGuardType(String.valueOf(ttttttype)) //// new XPopup.Builder(mContext)
// .setMsgCn("周末暴打小朋友在接化发直播間開通【星之守護】") //// .asCustom(new GuardUpgradePopup(mContext, mLiveUid))
// .setMsgEn("周末暴打小朋友opened 【星之守護】 in 接化发 live broadcast room") //// .show();
// .setLiveuid("98915")); //// ttttttype = ttttttype + 1;
} //// buyGuardNew(new NewAllServerNotifyGuardEvent()
}); //// .setAction("90")
ViewClicksAntiShake.clicksAntiShake(dragonImmediateParticipationTime, new ViewClicksAntiShake.ViewClicksCallBack() { //// .setGuardType(String.valueOf(ttttttype))
@Override //// .setMsgCn("周末暴打小朋友在接化发直播間開通【星之守護】")
public void onViewClicks() { //// .setMsgEn("周末暴打小朋友opened 【星之守護】 in 接化发 live broadcast room")
new DragonSendMoneyListPopup(mContext, mLiveUid, true, isAttention != 0).showDialog(); //// .setLiveuid("98915"));
// new XPopup.Builder(mContext) // }
// .asCustom(new GuardUpgradePopup(mContext, mLiveUid)) // });
// .show(); // ViewClicksAntiShake.clicksAntiShake(dragonImmediateParticipationTime, new ViewClicksAntiShake.ViewClicksCallBack() {
} // @Override
}); // public void onViewClicks() {
// new DragonSendMoneyListPopup(mContext, mLiveUid, true, isAttention != 0).showDialog();
//// new XPopup.Builder(mContext)
//// .asCustom(new GuardUpgradePopup(mContext, mLiveUid))
//// .show();
// }
// });
// dragonImmediateParticipation.setVisibility(View.GONE); // dragonImmediateParticipation.setVisibility(View.GONE);
//整蛊转盘优化更新 //整蛊转盘优化更新
@ -2595,21 +2659,71 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
Log.i("红包", "run: 红包倒计时 " + redTimeCountdown); Log.i("红包", "run: 红包倒计时 " + redTimeCountdown);
if (redTimeCountdown > 1) { if (redTimeCountdown > 1) {
timeHandler.postDelayed(timeRunnable, 1000); timeHandler.postDelayed(timeRunnable, 1000);
redPacketCountdown.setText(TimeUtils.getTime(redTimeCountdown)); // redPacketCountdown.setText(TimeUtils.getTime(redTimeCountdown));
newRedPacketTv.setText(TimeUtils.getTime(redTimeCountdown));
redTimeCountdown = redTimeCountdown - 1; redTimeCountdown = redTimeCountdown - 1;
} else { } else {
redTimeCountdown = 0; redTimeCountdown = 0;
timeHandler.removeCallbacks(timeRunnable); timeHandler.removeCallbacks(timeRunnable);
StringBuffer stringBuffer = new StringBuffer(); // StringBuffer stringBuffer = new StringBuffer();
stringBuffer.append(mRedPacketModel.getRedPacketRemain()).append("/").append(mRedPacketModel.getRedPacketQuantity()); // stringBuffer.append(mRedPacketModel.getRedPacketRemain()).append("/").append(mRedPacketModel.getRedPacketQuantity());
redSchedule.setText(stringBuffer.toString()); //newRedPacketTv.setText(stringBuffer.toString());
openRedPacket.setText(String.format(mContext.getString(R.string.open_red_packet), mRedPacketModel.getRedPacketCount() + "")); newRedPacketImg.setImageResource(R.mipmap.icon_red_packet_open);
redPacketCountdown.setVisibility(View.GONE); setRedPacketText(mRedPacketModel.getRedPacketRemain(), mRedPacketModel.getRedPacketQuantity(), newRedPacketTv);
redPacketQueue.setVisibility(View.VISIBLE); // redSchedule.setText(stringBuffer.toString());
// openRedPacket.setText(String.format(mContext.getString(R.string.open_red_packet), mRedPacketModel.getRedPacketCount() + ""));
// redPacketCountdown.setVisibility(View.GONE);
// redPacketQueue.setVisibility(View.VISIBLE);
} }
} }
}; };
private void setRedPacketText(int now, int total, TextView tv) {
String redPacketRemain = String.valueOf(now);
String redPacketQuantity = String.valueOf(total);
StringBuffer stringBuffer = new StringBuffer();
stringBuffer.append(redPacketRemain).append("/").append(redPacketQuantity);
SpannableString spannableString = new SpannableString(stringBuffer.toString());
// 设置剩余数量为黄色
int startIndex = 0; // 剩余数量的起始位置
int endIndex = redPacketRemain.length(); // 剩余数量的结束位置
spannableString.setSpan(new ForegroundColorSpan(Color.YELLOW), startIndex, endIndex, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
tv.setText(spannableString);
}
//是否是主播
private boolean isAnchorLive() {
return mContext instanceof LiveRyAnchorActivity || mContext instanceof LiveSwAnchorActivity;
}
//这个是设置神龙的状态的
private boolean isDragonTime = false;
private void setDragonTime(boolean isTime) {
newDragonGroup.setVisibility(View.VISIBLE);
isDragonTime = isTime;
if (isTime) {
newDragonTv.setTextColor(Color.parseColor("#F9BA03"));
newDragonTv.setText(R.string.dragon_immediate_participation);
} else {
newDragonTv.setTextColor(ContextCompat.getColor(mContext, R.color.white));
}
}
private boolean isShowDragonTime() {
return newDragonGroup.getVisibility() == View.VISIBLE && isDragonTime;
}
private boolean isShowDragonParticipation() {
return newDragonGroup.getVisibility() == View.VISIBLE && !isDragonTime;
}
//主播倒计时调用接口 //主播倒计时调用接口
private Handler anchorTimeHandler = new Handler(); private Handler anchorTimeHandler = new Handler();
private int mCountdown; private int mCountdown;
@ -2635,17 +2749,18 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}); });
} }
} else { } else {
redPacket.setVisibility(View.GONE); //redPacket.setVisibility(View.GONE);
if (dragonImmediateParticipation.getVisibility() == View.VISIBLE) { newRedPacketGroup.setVisibility(View.GONE);
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); // if (dragonImmediateParticipation.getVisibility() == View.VISIBLE) {
layoutParams.topMargin = DpUtil.dp2px(160); // RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
dragonImmediateParticipation.setLayoutParams(layoutParams); // layoutParams.topMargin = DpUtil.dp2px(160);
} // dragonImmediateParticipation.setLayoutParams(layoutParams);
if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE) { // }
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); // if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE) {
layoutParams.topMargin = DpUtil.dp2px(160); // RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
dragonImmediateParticipationTime.setLayoutParams(layoutParams); // layoutParams.topMargin = DpUtil.dp2px(160);
} // dragonImmediateParticipationTime.setLayoutParams(layoutParams);
// }
anchorTimeHandler.removeCallbacks(anchorTimeRunnable); anchorTimeHandler.removeCallbacks(anchorTimeRunnable);
LiveNetManager.get(mContext).endRedPacket(mLiveUid, mRedPacketModel.getRedPacketId(), new com.yunbao.common.http.base.HttpCallback<String>() { LiveNetManager.get(mContext).endRedPacket(mLiveUid, mRedPacketModel.getRedPacketId(), new com.yunbao.common.http.base.HttpCallback<String>() {
@Override @Override
@ -2670,43 +2785,50 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
timeHandler.removeCallbacks(timeRunnable); timeHandler.removeCallbacks(timeRunnable);
mRedPacketModel = redPacketModel; mRedPacketModel = redPacketModel;
if (redPacketModel.getIsShow() == 1) { if (redPacketModel.getIsShow() == 1) {
redPacket.setVisibility(View.VISIBLE); //redPacket.setVisibility(View.VISIBLE);
if (dragonImmediateParticipation.getVisibility() == View.VISIBLE) { newRedPacketImg.setImageResource(R.mipmap.icon_red_packet_new);
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); newRedPacketGroup.setVisibility(View.VISIBLE);
layoutParams.topMargin = DpUtil.dp2px(240);
dragonImmediateParticipation.setLayoutParams(layoutParams);
}
if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE && mContext instanceof LiveRyAnchorActivity || mContext instanceof LiveSwAnchorActivity) {
RelativeLayout.LayoutParams layoutParamsredPacket = (RelativeLayout.LayoutParams) redPacket.getLayoutParams();
layoutParamsredPacket.topMargin = DpUtil.dp2px(160);
redPacket.setLayoutParams(layoutParamsredPacket);
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipationTime.getLayoutParams(); // if (dragonImmediateParticipation.getVisibility() == View.VISIBLE) {
layoutParams.topMargin = DpUtil.dp2px(240); // RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
dragonImmediateParticipationTime.setLayoutParams(layoutParams); // layoutParams.topMargin = DpUtil.dp2px(240);
} // dragonImmediateParticipation.setLayoutParams(layoutParams);
if (mContext instanceof LiveRyAnchorActivity || mContext instanceof LiveSwAnchorActivity) { // }
if (dragonImmediateParticipationTime.getVisibility() == View.GONE) { // if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE && mContext instanceof LiveRyAnchorActivity || mContext instanceof LiveSwAnchorActivity) {
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) redPacket.getLayoutParams(); // RelativeLayout.LayoutParams layoutParamsredPacket = (RelativeLayout.LayoutParams) redPacket.getLayoutParams();
layoutParams.topMargin = DpUtil.dp2px(160); // layoutParamsredPacket.topMargin = DpUtil.dp2px(160);
redPacket.setLayoutParams(layoutParams); // redPacket.setLayoutParams(layoutParamsredPacket);
} //
} // RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipationTime.getLayoutParams();
// layoutParams.topMargin = DpUtil.dp2px(240);
// dragonImmediateParticipationTime.setLayoutParams(layoutParams);
// }
// if (mContext instanceof LiveRyAnchorActivity || mContext instanceof LiveSwAnchorActivity) {
// if (dragonImmediateParticipationTime.getVisibility() == View.GONE) {
// RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) redPacket.getLayoutParams();
// layoutParams.topMargin = DpUtil.dp2px(160);
// redPacket.setLayoutParams(layoutParams);
// }
// }
if (redPacketModel.getCountdown() > 180) { if (redPacketModel.getCountdown() > 180) {
redPacketQueue.setVisibility(View.GONE); // redPacketQueue.setVisibility(View.GONE);
redPacketCountdown.setVisibility(View.VISIBLE); // redPacketCountdown.setVisibility(View.VISIBLE);
// redPacketCountdown.setText(TimeUtils.getTime(redTimeCountdown));
mCountdown = redPacketModel.getCountdown(); mCountdown = redPacketModel.getCountdown();
redTimeCountdown = mCountdown - 180; redTimeCountdown = mCountdown - 180;
redPacketCountdown.setText(TimeUtils.getTime(redTimeCountdown)); newRedPacketTv.setText(TimeUtils.getTime(redTimeCountdown));
timeHandler.post(timeRunnable); timeHandler.post(timeRunnable);
} else { } else {
redTimeCountdown = 0; redTimeCountdown = 0;
redPacketQueue.setVisibility(View.VISIBLE); // redPacketQueue.setVisibility(View.VISIBLE);
redPacketCountdown.setVisibility(View.GONE); // redPacketCountdown.setVisibility(View.GONE);
StringBuffer stringBuffer = new StringBuffer(); newRedPacketImg.setImageResource(R.mipmap.icon_red_packet_open);
stringBuffer.append(mRedPacketModel.getRedPacketRemain()).append("/").append(mRedPacketModel.getRedPacketQuantity()); setRedPacketText(mRedPacketModel.getRedPacketRemain(), mRedPacketModel.getRedPacketQuantity(), newRedPacketTv);
redSchedule.setText(stringBuffer.toString()); // StringBuffer stringBuffer = new StringBuffer();
openRedPacket.setText(String.format(mContext.getString(R.string.open_red_packet), mRedPacketModel.getRedPacketCount() + "")); // stringBuffer.append(mRedPacketModel.getRedPacketRemain()).append("/").append(mRedPacketModel.getRedPacketQuantity());
// redSchedule.setText(stringBuffer.toString());
// openRedPacket.setText(String.format(mContext.getString(R.string.open_red_packet), mRedPacketModel.getRedPacketCount() + ""));
} }
if (IMLoginManager.get(mContext).getUserInfo().anchorUserType() && (mContext instanceof LiveSwAnchorActivity || mContext instanceof LiveRyAnchorActivity)) { if (IMLoginManager.get(mContext).getUserInfo().anchorUserType() && (mContext instanceof LiveSwAnchorActivity || mContext instanceof LiveRyAnchorActivity)) {
anchorTimeHandler.removeCallbacks(anchorTimeRunnable); anchorTimeHandler.removeCallbacks(anchorTimeRunnable);
@ -2716,7 +2838,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
hindeRedPacket(); hindeRedPacket();
} }
//测试点开红包 //测试点开红包
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.red_packet), new ViewClicksAntiShake.ViewClicksCallBack() { ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.newRedPacketImg), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override @Override
public void onViewClicks() { public void onViewClicks() {
@ -2751,17 +2873,19 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
public void hindeRedPacket() { public void hindeRedPacket() {
redPacket.setVisibility(View.GONE); // redPacket.setVisibility(View.GONE);
if (dragonImmediateParticipation.getVisibility() == View.VISIBLE) { newRedPacketGroup.setVisibility(View.GONE);
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
layoutParams.topMargin = DpUtil.dp2px(160); // if (dragonImmediateParticipation.getVisibility() == View.VISIBLE) {
dragonImmediateParticipation.setLayoutParams(layoutParams); // RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
} // layoutParams.topMargin = DpUtil.dp2px(160);
if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE) { // dragonImmediateParticipation.setLayoutParams(layoutParams);
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipationTime.getLayoutParams(); // }
layoutParams.topMargin = DpUtil.dp2px(160); // if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE) {
dragonImmediateParticipationTime.setLayoutParams(layoutParams); // RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipationTime.getLayoutParams();
} // layoutParams.topMargin = DpUtil.dp2px(160);
// dragonImmediateParticipationTime.setLayoutParams(layoutParams);
// }
} }
public void setRedPacketInfoModel(RedPacketInfoModel redPacket) { public void setRedPacketInfoModel(RedPacketInfoModel redPacket) {
@ -3236,9 +3360,13 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
public void initWishList(List<WishlistItemModel> wishlist) { public void initWishList(List<WishlistItemModel> wishlist) {
if (wishlist.size() > 0) { if (wishlist.size() > 0) {
this.wishlist = wishlist; this.wishlist = wishlist;
wishlistLayout.setVisibility(View.VISIBLE); //wishlistLayout.setVisibility(View.VISIBLE);
Log.i("nwq","initWishList VISIBLE");
newWishGroup.setVisibility(View.VISIBLE);
} else { } else {
wishlistLayout.setVisibility(View.GONE); //wishlistLayout.setVisibility(View.GONE);
Log.i("nwq","initWishList GONE");
newWishGroup.setVisibility(View.GONE);
} }
} }
@ -4072,51 +4200,56 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
if (mLiveUid.contains(String.valueOf(IMLoginManager.get(mContext).getUserInfo().getId()))) { if (mLiveUid.contains(String.valueOf(IMLoginManager.get(mContext).getUserInfo().getId()))) {
mSendMoneyLongModel = sendMoneyLongModel; mSendMoneyLongModel = sendMoneyLongModel;
sendMoneyTime = Long.parseLong(sendMoneyLongModel.getCountdown()); sendMoneyTime = Long.parseLong(sendMoneyLongModel.getCountdown());
participation_time.removeCallbacks(sendMoneyRunnable); // participation_time.removeCallbacks(sendMoneyRunnable);
dragonImmediateParticipationTime.setVisibility(View.VISIBLE); newDragonTv.removeCallbacks(sendMoneyRunnable);
if (redPacket.getVisibility() == View.VISIBLE) { // dragonImmediateParticipationTime.setVisibility(View.VISIBLE);
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); setDragonTime(true);
layoutParams.topMargin = DpUtil.dp2px(240); // if (redPacket.getVisibility() == View.VISIBLE) {
dragonImmediateParticipationTime.setLayoutParams(layoutParams); // RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
} else { // layoutParams.topMargin = DpUtil.dp2px(240);
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); // dragonImmediateParticipationTime.setLayoutParams(layoutParams);
layoutParams.topMargin = DpUtil.dp2px(160); // } else {
dragonImmediateParticipationTime.setLayoutParams(layoutParams); // RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
} // layoutParams.topMargin = DpUtil.dp2px(160);
// dragonImmediateParticipationTime.setLayoutParams(layoutParams);
// }
String s1 = StringUtil.getDurationText(sendMoneyTime * 1000); String s1 = StringUtil.getDurationText(sendMoneyTime * 1000);
participation_time.setText(s1); newDragonTv.setText(s1);
participation_time.post(sendMoneyRunnable); // participation_time.setText(s1);
// participation_time.post(sendMoneyRunnable);
newDragonTv.post(sendMoneyRunnable);
} else { } else {
dragonImmediateParticipation.setVisibility(View.VISIBLE); setDragonTime(false);
if (redPacket.getVisibility() == View.VISIBLE) { // dragonImmediateParticipation.setVisibility(View.VISIBLE);
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); // if (redPacket.getVisibility() == View.VISIBLE) {
layoutParams.topMargin = DpUtil.dp2px(240); // RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
dragonImmediateParticipation.setLayoutParams(layoutParams); // layoutParams.topMargin = DpUtil.dp2px(240);
} else { // dragonImmediateParticipation.setLayoutParams(layoutParams);
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); // } else {
layoutParams.topMargin = DpUtil.dp2px(160); // RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
dragonImmediateParticipation.setLayoutParams(layoutParams); // layoutParams.topMargin = DpUtil.dp2px(160);
} // dragonImmediateParticipation.setLayoutParams(layoutParams);
// }
} }
} }
public void onSendMoneyLongEndEvent(SendMoneyLongEndEvent moneyLongEndEvent) { public void onSendMoneyLongEndEvent(SendMoneyLongEndEvent moneyLongEndEvent) {
if (mLiveUid.contains(String.valueOf(IMLoginManager.get(mContext).getUserInfo().getId()))) { newDragonGroup.setVisibility(View.GONE);
dragonImmediateParticipationTime.setVisibility(View.GONE); // if (mLiveUid.contains(String.valueOf(IMLoginManager.get(mContext).getUserInfo().getId()))) {
if (redPacket.getVisibility() == View.VISIBLE) { // dragonImmediateParticipationTime.setVisibility(View.GONE);
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); // if (redPacket.getVisibility() == View.VISIBLE) {
layoutParams.topMargin = DpUtil.dp2px(190); // RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
dragonImmediateParticipationTime.setLayoutParams(layoutParams); // layoutParams.topMargin = DpUtil.dp2px(190);
} else { // dragonImmediateParticipationTime.setLayoutParams(layoutParams);
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); // } else {
layoutParams.topMargin = DpUtil.dp2px(160); // RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
dragonImmediateParticipationTime.setLayoutParams(layoutParams); // layoutParams.topMargin = DpUtil.dp2px(160);
} // dragonImmediateParticipationTime.setLayoutParams(layoutParams);
} else { // }
dragonImmediateParticipation.setVisibility(View.GONE); // } else {
// dragonImmediateParticipation.setVisibility(View.GONE);
} // }
} }
private long sendMoneyTime; private long sendMoneyTime;
@ -4126,10 +4259,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
sendMoneyTime--; sendMoneyTime--;
if (sendMoneyTime > 0) { if (sendMoneyTime > 0) {
String s1 = StringUtil.getDurationText(sendMoneyTime * 1000); String s1 = StringUtil.getDurationText(sendMoneyTime * 1000);
participation_time.setText(s1); newDragonTv.setText(s1);
participation_time.postDelayed(sendMoneyRunnable, 1000); newDragonTv.postDelayed(sendMoneyRunnable, 1000);
} else { } else {
participation_time.removeCallbacks(sendMoneyRunnable); newDragonTv.removeCallbacks(sendMoneyRunnable);
LiveNetManager.get(mContext).endSendMoneyLong(mLiveUid, mSendMoneyLongModel.getSendMoneyLongKey(), new com.yunbao.common.http.base.HttpCallback<SendMoneyLongModel>() { LiveNetManager.get(mContext).endSendMoneyLong(mLiveUid, mSendMoneyLongModel.getSendMoneyLongKey(), new com.yunbao.common.http.base.HttpCallback<SendMoneyLongModel>() {
@Override @Override
public void onSuccess(SendMoneyLongModel data) { public void onSuccess(SendMoneyLongModel data) {
@ -4146,41 +4279,54 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}; };
public void onSendMoneyLong() { public void onSendMoneyLong() {
dragonImmediateParticipation.setVisibility(View.VISIBLE); setDragonTime(false);
if (redPacket.getVisibility() == View.VISIBLE) { // dragonImmediateParticipation.setVisibility(View.VISIBLE);
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); // if (redPacket.getVisibility() == View.VISIBLE) {
layoutParams.topMargin = DpUtil.dp2px(240); // RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
dragonImmediateParticipation.setLayoutParams(layoutParams); // layoutParams.topMargin = DpUtil.dp2px(240);
} else { // dragonImmediateParticipation.setLayoutParams(layoutParams);
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); // } else {
layoutParams.topMargin = DpUtil.dp2px(110); // RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
dragonImmediateParticipation.setLayoutParams(layoutParams); // layoutParams.topMargin = DpUtil.dp2px(110);
} // dragonImmediateParticipation.setLayoutParams(layoutParams);
// }
} }
/** /**
* 设置礼物墙和周星榜 * 设置礼物墙和周星榜
*/ */
public void setGiftWall(String giftWallLightenNumber, String giftWallLightenTotal) { public void setGiftWall(String giftWallLightenNumber, String giftWallLightenTotal) {
giftLayout = findViewById(R.id.giftLayout); newWeekGroup = findViewById(R.id.newWeekGroup);
if (!TextUtils.isEmpty(giftWallLightenNumber) && !TextUtils.isEmpty(giftWallLightenTotal)) {
giftLayout.setVisibility(View.VISIBLE);
gift_number = findViewById(R.id.gift_number);
gift_total = findViewById(R.id.gift_total);
gift_progressbar = findViewById(R.id.gift_progressbar);
gift_number.setText(giftWallLightenNumber); if (!TextUtils.isEmpty(giftWallLightenNumber) && !TextUtils.isEmpty(giftWallLightenTotal)) {
gift_total.setText("/" + giftWallLightenTotal); // 初始化周星榜相关控件
gift_progressbar.setMax(Integer.parseInt(giftWallLightenTotal)); newWeekGroup.setVisibility(View.VISIBLE);
gift_progressbar.setProgress(Integer.parseInt(giftWallLightenNumber)); newWeekBgView = findViewById(R.id.newWeekBgView);
ViewClicksAntiShake.clicksAntiShake(giftLayout, new ViewClicksAntiShake.ViewClicksCallBack() { newWeekNowTv = findViewById(R.id.newWeekNowTv);
newWeekTotalTv = findViewById(R.id.newWeekTotalTv);
weekProgressbar = findViewById(R.id.week_progressbar);
newWeekNowTv.setText(giftWallLightenNumber);
newWeekTotalTv.setText("/" + giftWallLightenTotal);
weekProgressbar.setMax(Integer.parseInt(giftWallLightenTotal));
weekProgressbar.setProgress(Integer.parseInt(giftWallLightenNumber));
//
// gift_number = findViewById(R.id.gift_number);
// gift_total = findViewById(R.id.gift_total);
// gift_progressbar = findViewById(R.id.gift_progressbar);
// gift_number.setText(giftWallLightenNumber);
// gift_total.setText("/" + giftWallLightenTotal);
// gift_progressbar.setMax(Integer.parseInt(giftWallLightenTotal));
// gift_progressbar.setProgress(Integer.parseInt(giftWallLightenNumber));
ViewClicksAntiShake.clicksAntiShake(newWeekBgView, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override @Override
public void onViewClicks() { public void onViewClicks() {
new com.yunbao.common.dialog.GiftWallDialog(mContext, mLiveUid, mAnchorName, mLiveUid, true).setFullWindows(false).showDialog(); new com.yunbao.common.dialog.GiftWallDialog(mContext, mLiveUid, mAnchorName, mLiveUid, true).setFullWindows(false).showDialog();
} }
}); });
} else { } else {
giftLayout.setVisibility(View.GONE); newWeekGroup.setVisibility(View.GONE);
} }
} }
@ -5297,14 +5443,26 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
public void setShowTask(String url, boolean isShow) { public void setShowTask(String url, boolean isShow) {
anTask = findViewById(R.id.anTask); newTaskGroup = findViewById(R.id.newTaskGroup);
anTask.setOnClickListener(new View.OnClickListener() { newTaskBg = findViewById(R.id.newTaskBg);
newTaskBg.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
ZhuangBanActivity.forward(mContext, url, false, 1); ZhuangBanActivity.forward(mContext, url, false, 1);
} }
}); });
anTask.setVisibility(isShow ? View.VISIBLE : View.GONE); newTaskGroup.setVisibility(isShow ? View.VISIBLE : View.GONE);
// anTask = findViewById(R.id.anTask);
// anTask.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// ZhuangBanActivity.forward(mContext, url, false, 1);
// }
// });
// anTask.setVisibility(isShow ? View.VISIBLE : View.GONE);
} }
/** /**
@ -6014,13 +6172,21 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
public void initWishListData(WishModel model) { public void initWishListData(WishModel model) {
ImgLoader.display(mContext, model.getWishlistIcon(), wish_icon); // ImgLoader.display(mContext, model.getWishlistIcon(), wish_icon);
wish_number.setText(model.getWishlistProgress()); // wish_number.setText(model.getWishlistProgress());
wish_total.setText("/" + model.getWishlistNum()); // wish_total.setText("/" + model.getWishlistNum());
// wish_progressbar.setMax(Integer.parseInt(model.getWishlistNum()));
// wish_progressbar.setProgress(Integer.parseInt(model.getWishlistProgress()));
// wishlistLayout.setVisibility(View.VISIBLE);
ImgLoader.display(mContext, model.getWishlistIcon(), newWishImg);
newWishNowTv.setText(model.getWishlistProgress());
newWishTotalTv.setText("/" + model.getWishlistNum());
wish_progressbar.setMax(Integer.parseInt(model.getWishlistNum())); wish_progressbar.setMax(Integer.parseInt(model.getWishlistNum()));
wish_progressbar.setProgress(Integer.parseInt(model.getWishlistProgress())); wish_progressbar.setProgress(Integer.parseInt(model.getWishlistProgress()));
wishlistLayout.setVisibility(View.VISIBLE); newWishGroup.setVisibility(View.VISIBLE);
ViewClicksAntiShake.clicksAntiShake(wishlistLayout, new ViewClicksAntiShake.ViewClicksCallBack() { Log.i("nwq","initWishListData");
ViewClicksAntiShake.clicksAntiShake(newWeekBgView, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override @Override
public void onViewClicks() { public void onViewClicks() {
MobclickAgent.onEvent(mContext, "live_room_wish", "心愿单按钮"); MobclickAgent.onEvent(mContext, "live_room_wish", "心愿单按钮");
@ -6052,7 +6218,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
wishListProgress = null; wishListProgress = null;
WishModel model = wishModel; WishModel model = wishModel;
if (wishlistLayout != null) { if (newWishGroup != null) {
initWishListData(model); initWishListData(model);
new Handler().postDelayed(new Runnable() { new Handler().postDelayed(new Runnable() {
@Override @Override
@ -6742,18 +6908,28 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
if (wishListProgress == null) return; if (wishListProgress == null) return;
if (!TextUtils.isEmpty(wishListProgress.getWishlistName()) || !TextUtils.isEmpty(wishListProgress.getWishlistProgress())) { if (!TextUtils.isEmpty(wishListProgress.getWishlistName()) || !TextUtils.isEmpty(wishListProgress.getWishlistProgress())) {
initWishListData(wishListProgress); initWishListData(wishListProgress);
wishlistLayout.setVisibility(View.VISIBLE); //wishlistLayout.setVisibility(View.VISIBLE);
Log.i("nwq","updateTopBanner VISIBLE");
newWishGroup.setVisibility(View.VISIBLE);
} else { } else {
wishlistLayout.setVisibility(View.GONE); //wishlistLayout.setVisibility(View.GONE);
Log.i("nwq","updateTopBanner GONE");
newWishGroup.setVisibility(View.GONE);
} }
} }
public void initWishListView() { public void initWishListView() {
wishlistLayout = findViewById(R.id.wishlistLayout); newWishBgView = findViewById(R.id.newWishBgView);
wish_icon = findViewById(R.id.wish_icon); newWishImg = findViewById(R.id.newWishImg);
wish_number = findViewById(R.id.wish_number); newWishNowTv = findViewById(R.id.newWishNowTv);
wish_total = findViewById(R.id.wish_total); newWishTotalTv = findViewById(R.id.newWishTotalTv);
wish_progressbar = findViewById(R.id.wishlist_progressbar); wish_progressbar = findViewById(R.id.wish_progressbar);
newWishGroup = findViewById(R.id.newWishGroup);
// wishlistLayout = findViewById(R.id.wishlistLayout);
// wish_icon = findViewById(R.id.wish_icon);
// wish_number = findViewById(R.id.wish_number);
// wish_total = findViewById(R.id.wish_total);
// wish_progressbar = findViewById(R.id.wishlist_progressbar);
} }
private synchronized void checkNewLetter() { private synchronized void checkNewLetter() {

2
live/src/main/res/drawable/bg_live_item.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="10dp"/> <corners android:radius="10dp"/>
<solid android:color="#8065615A"/> <solid android:color="#40000000"/>
</shape> </shape>

5
live/src/main/res/drawable/bg_live_item_rank.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="6dp"/>
<solid android:color="#40000000"/>
</shape>

18
live/src/main/res/layout/item_live_user1.xml
View File

@ -3,16 +3,18 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="34dp"> android:layout_height="40dp">
<com.yunbao.common.views.weight.ClipPathCircleImage <com.yunbao.common.views.weight.ClipPathCircleImage
android:id="@+id/avatar" android:id="@+id/avatar"
android:layout_width="34dp" android:layout_width="32dp"
android:layout_height="34dp" android:layout_height="32dp"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:scaleType="centerCrop" android:scaleType="centerCrop"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:riv_oval="true" app:riv_oval="true"
@ -20,11 +22,13 @@
<com.opensource.svgaplayer.SVGAImageView <com.opensource.svgaplayer.SVGAImageView
android:id="@+id/gift_svga" android:id="@+id/gift_svga"
android:layout_width="38dp" android:layout_width="40dp"
android:layout_height="38dp" android:layout_height="40dp"
app:autoPlay="true" app:autoPlay="true"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="@+id/avatar"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintEnd_toEndOf="@+id/avatar"
app:layout_constraintStart_toStartOf="@+id/avatar"
app:layout_constraintTop_toTopOf="@+id/avatar" />
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"

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

@ -146,10 +146,11 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/user_recyclerView" android:id="@+id/user_recyclerView"
android:layout_width="120dp" android:layout_width="120dp"
android:layout_height="34dp" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:overScrollMode="never" android:overScrollMode="never"
android:visibility="visible" android:visibility="visible"
android:layout_marginEnd="3dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/user_more" app:layout_constraintEnd_toStartOf="@+id/user_more"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
@ -157,10 +158,10 @@
<com.makeramen.roundedimageview.RoundedImageView <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/user_guard" android:id="@+id/user_guard"
android:layout_width="36dp" android:layout_width="34dp"
android:layout_height="36dp" android:layout_height="34dp"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_marginEnd="6dp" android:layout_marginEnd="3dp"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@mipmap/img_guardian_empty" android:src="@mipmap/img_guardian_empty"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -191,6 +192,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:gravity="top" android:gravity="top"
tools:visibility="gone"
android:orientation="vertical"> android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
@ -327,7 +329,6 @@
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:src="@drawable/live_icon_right_more" /> android:src="@drawable/live_icon_right_more" />
</FrameLayout> </FrameLayout>
<!--贵族--> <!--贵族-->
<LinearLayout <LinearLayout
@ -341,8 +342,16 @@
<include layout="@layout/view_noble_seat" /> <include layout="@layout/view_noble_seat" />
</LinearLayout> </LinearLayout>
<View
android:id="@+id/topLayout1_line"
android:visibility="gone"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"/>
<!--天梯赛--> <!--天梯赛-->
<FrameLayout <FrameLayout
android:layout_marginEnd="12dp"
android:id="@+id/live_rank_pk" android:id="@+id/live_rank_pk"
android:layout_width="85dp" android:layout_width="85dp"
android:layout_height="23dp" android:layout_height="23dp"
@ -370,300 +379,308 @@
</LinearLayout> </LinearLayout>
<LinearLayout <include
android:id="@+id/topLayout2" android:id="@+id/topLayout2"
layout="@layout/view_live_room_part2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="36dp"
android:layout_below="@+id/topLayout1" android:layout_below="@+id/topLayout1"
android:layout_marginTop="5dp" android:layout_marginTop="5dp" />
android:orientation="horizontal"> <!-- 第二条目 -->
<!-- <LinearLayout-->
<!-- android:id="@+id/topLayout2"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="40dp"-->
<!-- android:layout_below="@+id/topLayout22"-->
<!-- android:layout_marginTop="5dp"-->
<!-- android:orientation="horizontal">-->
<!--新手任务--> <!-- &lt;!&ndash;新手任务&ndash;&gt;-->
<LinearLayout <!-- <LinearLayout-->
android:id="@+id/anTask" <!-- android:id="@+id/anTask"-->
android:layout_width="82dp" <!-- android:layout_width="82dp"-->
android:layout_height="match_parent" <!-- android:layout_height="match_parent"-->
android:layout_marginStart="12dp" <!-- android:layout_marginStart="12dp"-->
android:background="@mipmap/bg_live_room_task" <!-- android:background="@mipmap/bg_live_room_task"-->
android:gravity="center" <!-- android:gravity="center"-->
android:visibility="gone" <!-- android:visibility="gone"-->
tools:visibility="visible"> <!-- tools:visibility="visible">-->
<TextView <!-- <TextView-->
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:text="@string/live_room_new_task" <!-- android:text="@string/live_room_new_task"-->
android:textColor="#1D386B" <!-- android:textColor="#1D386B"-->
android:textSize="10dp" /> <!-- android:textSize="10dp" />-->
<ImageView <!-- <ImageView-->
android:layout_width="32dp" <!-- android:layout_width="32dp"-->
android:layout_height="32dp" <!-- android:layout_height="32dp"-->
android:src="@mipmap/icon_live_room_task" /> <!-- android:src="@mipmap/icon_live_room_task" />-->
</LinearLayout> <!-- </LinearLayout>-->
<!--红包--> <!-- &lt;!&ndash;红包&ndash;&gt;-->
<RelativeLayout <!-- <RelativeLayout-->
android:id="@+id/red_packet" <!-- android:id="@+id/red_packet"-->
android:layout_width="40dp" <!-- android:layout_width="40dp"-->
android:layout_height="match_parent" <!-- android:layout_height="match_parent"-->
android:layout_marginStart="12dp" <!-- android:layout_marginStart="12dp"-->
android:visibility="gone" <!-- android:visibility="gone"-->
tools:visibility="visible"> <!-- tools:visibility="visible">-->
<ImageView <!-- <ImageView-->
android:layout_width="40dp" <!-- android:layout_width="40dp"-->
android:layout_height="40dp" <!-- android:layout_height="40dp"-->
android:src="@mipmap/icon_red_packet_new" /> <!-- android:src="@mipmap/icon_red_packet_new" />-->
<TextView <!-- <TextView-->
android:id="@+id/red_packet_countdown" <!-- android:id="@+id/red_packet_countdown"-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:layout_alignParentEnd="true" <!-- android:layout_alignParentEnd="true"-->
android:layout_alignParentBottom="true" <!-- android:layout_alignParentBottom="true"-->
android:background="@mipmap/bg_live_room_red_time" <!-- android:background="@mipmap/bg_live_room_red_time"-->
android:gravity="center" <!-- android:gravity="center"-->
android:text="@string/red_packet_countdown" <!-- android:text="@string/red_packet_countdown"-->
android:textColor="@color/white" <!-- android:textColor="@color/white"-->
android:textSize="7sp" <!-- android:textSize="7sp"-->
android:visibility="visible" /> <!-- android:visibility="visible" />-->
<LinearLayout <!-- <LinearLayout-->
android:id="@+id/red_packet_queue" <!-- android:id="@+id/red_packet_queue"-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:layout_alignParentEnd="true" <!-- android:layout_alignParentEnd="true"-->
android:layout_alignParentBottom="true" <!-- android:layout_alignParentBottom="true"-->
android:orientation="vertical" <!-- android:orientation="vertical"-->
android:paddingStart="6dp" <!-- android:paddingStart="6dp"-->
android:visibility="visible"> <!-- android:visibility="visible">-->
<TextView <!-- <TextView-->
android:id="@+id/red_schedule" <!-- android:id="@+id/red_schedule"-->
android:layout_width="19dp" <!-- android:layout_width="19dp"-->
android:layout_height="8dp" <!-- android:layout_height="8dp"-->
android:background="@mipmap/bg_live_room_red_time" <!-- android:background="@mipmap/bg_live_room_red_time"-->
android:gravity="center" <!-- android:gravity="center"-->
android:text="10/200" <!-- android:text="10/200"-->
android:textColor="@color/white" <!-- android:textColor="@color/white"-->
android:textSize="6sp" /> <!-- android:textSize="6sp" />-->
<TextView <!-- <TextView-->
android:id="@+id/open_red_packet" <!-- android:id="@+id/open_red_packet"-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:text="@string/open_red_packet" <!-- android:text="@string/open_red_packet"-->
android:textColor="@color/white" <!-- android:textColor="@color/white"-->
android:textSize="9sp" <!-- android:textSize="9sp"-->
android:visibility="gone" /> <!-- android:visibility="gone" />-->
</LinearLayout> <!-- </LinearLayout>-->
</RelativeLayout> <!-- </RelativeLayout>-->
<!----> <!-- &lt;!&ndash;&ndash;&gt;-->
<RelativeLayout <!-- <RelativeLayout-->
android:id="@+id/dragon_immediate_participation" <!-- android:id="@+id/dragon_immediate_participation"-->
android:layout_width="40dp" <!-- android:layout_width="40dp"-->
android:layout_height="match_parent" <!-- android:layout_height="match_parent"-->
android:layout_marginStart="12dp" <!-- android:layout_marginStart="12dp"-->
android:gravity="center" <!-- android:gravity="center"-->
android:orientation="vertical" <!-- android:orientation="vertical"-->
android:visibility="gone" <!-- android:visibility="gone"-->
tools:visibility="visible"> <!-- tools:visibility="visible">-->
<ImageView <!-- <ImageView-->
android:layout_width="40dp" <!-- android:layout_width="40dp"-->
android:layout_height="40dp" <!-- android:layout_height="40dp"-->
android:src="@mipmap/icon_live_dragon_money" /> <!-- android:src="@mipmap/icon_live_dragon_money" />-->
<TextView <!-- <TextView-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:layout_alignParentEnd="true" <!-- android:layout_alignParentEnd="true"-->
android:layout_alignParentBottom="true" <!-- android:layout_alignParentBottom="true"-->
android:background="@mipmap/bg_live_room_red_time" <!-- android:background="@mipmap/bg_live_room_red_time"-->
android:padding="1dp" <!-- android:padding="1dp"-->
android:text="@string/dragon_immediate_participation" <!-- android:text="@string/dragon_immediate_participation"-->
android:textColor="#F9BA03" <!-- android:textColor="#F9BA03"-->
android:textSize="7sp" <!-- android:textSize="7sp"-->
android:textStyle="bold" /> <!-- android:textStyle="bold" />-->
</RelativeLayout> <!-- </RelativeLayout>-->
<!----> <!-- &lt;!&ndash;&ndash;&gt;-->
<RelativeLayout <!-- <RelativeLayout-->
android:id="@+id/dragon_immediate_participation_time" <!-- android:id="@+id/dragon_immediate_participation_time"-->
android:layout_width="40dp" <!-- android:layout_width="40dp"-->
android:layout_height="match_parent" <!-- android:layout_height="match_parent"-->
android:layout_marginStart="12dp" <!-- android:layout_marginStart="12dp"-->
android:gravity="center" <!-- android:gravity="center"-->
android:orientation="vertical" <!-- android:orientation="vertical"-->
android:visibility="gone" <!-- android:visibility="gone"-->
tools:visibility="visible"> <!-- tools:visibility="visible">-->
<ImageView <!-- <ImageView-->
android:layout_width="40dp" <!-- android:layout_width="40dp"-->
android:layout_height="40dp" <!-- android:layout_height="40dp"-->
android:src="@mipmap/icon_live_dragon_money" /> <!-- android:src="@mipmap/icon_live_dragon_money" />-->
<TextView <!-- <TextView-->
android:id="@+id/participation_time" <!-- android:id="@+id/participation_time"-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:layout_alignParentEnd="true" <!-- android:layout_alignParentEnd="true"-->
android:layout_alignParentBottom="true" <!-- android:layout_alignParentBottom="true"-->
android:background="@mipmap/bg_live_room_red_time" <!-- android:background="@mipmap/bg_live_room_red_time"-->
android:padding="1dp" <!-- android:padding="1dp"-->
android:text="@string/dragon_immediate_participation" <!-- android:text="@string/dragon_immediate_participation"-->
android:textColor="#F9BA03" <!-- android:textColor="#F9BA03"-->
android:textSize="7sp" <!-- android:textSize="7sp"-->
android:textStyle="bold" /> <!-- android:textStyle="bold" />-->
</RelativeLayout> <!-- </RelativeLayout>-->
<View <!-- <View-->
android:layout_width="0dp" <!-- android:layout_width="0dp"-->
android:layout_height="0dp" <!-- android:layout_height="0dp"-->
android:layout_weight="1" /> <!-- android:layout_weight="1" />-->
<!--礼物墙--> <!-- &lt;!&ndash;礼物墙&ndash;&gt;-->
<LinearLayout <!-- <LinearLayout-->
android:id="@+id/giftLayout" <!-- android:id="@+id/giftLayout"-->
android:layout_width="82dp" <!-- android:layout_width="82dp"-->
android:layout_height="match_parent" <!-- android:layout_height="match_parent"-->
android:layout_gravity="end" <!-- android:layout_gravity="end"-->
android:layout_marginEnd="9dp" <!-- android:layout_marginEnd="9dp"-->
android:background="@mipmap/bg_live_room_gift" <!-- android:background="@mipmap/bg_live_room_gift"-->
android:orientation="horizontal" <!-- android:orientation="horizontal"-->
android:visibility="gone" <!-- android:visibility="gone"-->
tools:visibility="visible"> <!-- tools:visibility="visible">-->
<LinearLayout <!-- <LinearLayout-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="match_parent" <!-- android:layout_height="match_parent"-->
android:gravity="center_vertical" <!-- android:gravity="center_vertical"-->
android:orientation="vertical" <!-- android:orientation="vertical"-->
android:paddingStart="6dp"> <!-- android:paddingStart="6dp">-->
<TextView <!-- <TextView-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="12dp" <!-- android:layout_height="12dp"-->
android:text="@string/live_room_gift" <!-- android:text="@string/live_room_gift"-->
android:textColor="#FFFFFF" <!-- android:textColor="#FFFFFF"-->
android:textSize="10dp" /> <!-- android:textSize="10dp" />-->
<LinearLayout <!-- <LinearLayout-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="16dp" <!-- android:layout_height="16dp"-->
android:gravity="bottom" <!-- android:gravity="bottom"-->
android:orientation="horizontal"> <!-- android:orientation="horizontal">-->
<TextView <!-- <TextView-->
android:id="@+id/gift_number" <!-- android:id="@+id/gift_number"-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:text="11" <!-- android:text="11"-->
android:textColor="#FFC949" <!-- android:textColor="#FFC949"-->
android:textSize="15dp" /> <!-- android:textSize="15dp" />-->
<TextView <!-- <TextView-->
android:id="@+id/gift_total" <!-- android:id="@+id/gift_total"-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:text="22" <!-- android:text="22"-->
android:textColor="#FFFFFF" <!-- android:textColor="#FFFFFF"-->
android:textSize="12dp" /> <!-- android:textSize="12dp" />-->
</LinearLayout> <!-- </LinearLayout>-->
<ProgressBar <!-- <ProgressBar-->
android:id="@+id/gift_progressbar" <!-- android:id="@+id/gift_progressbar"-->
style="@android:style/Widget.ProgressBar.Horizontal" <!-- style="@android:style/Widget.ProgressBar.Horizontal"-->
android:layout_width="30dp" <!-- android:layout_width="30dp"-->
android:layout_height="1.5dp" <!-- android:layout_height="1.5dp"-->
android:layout_marginTop="2dp" <!-- android:layout_marginTop="2dp"-->
android:progressDrawable="@drawable/bg_gift_progressbar" /> <!-- android:progressDrawable="@drawable/bg_gift_progressbar" />-->
</LinearLayout> <!-- </LinearLayout>-->
<ImageView <!-- <ImageView-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:layout_gravity="center_vertical" <!-- android:layout_gravity="center_vertical"-->
android:layout_marginStart="10dp" <!-- android:layout_marginStart="10dp"-->
android:src="@mipmap/icon_live_room_gift" /> <!-- android:src="@mipmap/icon_live_room_gift" />-->
</LinearLayout> <!-- </LinearLayout>-->
<!--心愿单--> <!-- &lt;!&ndash;心愿单&ndash;&gt;-->
<LinearLayout <!-- <LinearLayout-->
android:id="@+id/wishlistLayout" <!-- android:id="@+id/wishlistLayout"-->
android:layout_width="82dp" <!-- android:layout_width="82dp"-->
android:layout_height="match_parent" <!-- android:layout_height="match_parent"-->
android:layout_gravity="end" <!-- android:layout_gravity="end"-->
android:layout_marginEnd="12dp" <!-- android:layout_marginEnd="12dp"-->
android:background="@mipmap/bg_live_room_wishlist" <!-- android:background="@mipmap/bg_live_room_wishlist"-->
android:orientation="horizontal" <!-- android:orientation="horizontal"-->
android:visibility="gone" <!-- android:visibility="gone"-->
tools:visibility="visible"> <!-- tools:visibility="visible">-->
<LinearLayout <!-- <LinearLayout-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="match_parent" <!-- android:layout_height="match_parent"-->
android:gravity="center_vertical" <!-- android:gravity="center_vertical"-->
android:orientation="vertical" <!-- android:orientation="vertical"-->
android:paddingStart="6dp"> <!-- android:paddingStart="6dp">-->
<TextView <!-- <TextView-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="12dp" <!-- android:layout_height="12dp"-->
android:gravity="center" <!-- android:gravity="center"-->
android:text="@string/live_room_wishlist" <!-- android:text="@string/live_room_wishlist"-->
android:textColor="#FFFFFF" <!-- android:textColor="#FFFFFF"-->
android:textSize="10dp" /> <!-- android:textSize="10dp" />-->
<LinearLayout <!-- <LinearLayout-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="16dp" <!-- android:layout_height="16dp"-->
android:gravity="bottom" <!-- android:gravity="bottom"-->
android:orientation="horizontal"> <!-- android:orientation="horizontal">-->
<TextView <!-- <TextView-->
android:id="@+id/wish_number" <!-- android:id="@+id/wish_number"-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:text="11" <!-- android:text="11"-->
android:textColor="#FFC949" <!-- android:textColor="#FFC949"-->
android:textSize="15dp" /> <!-- android:textSize="15dp" />-->
<TextView <!-- <TextView-->
android:id="@+id/wish_total" <!-- android:id="@+id/wish_total"-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:text="22" <!-- android:text="22"-->
android:textColor="#FFFFFF" <!-- android:textColor="#FFFFFF"-->
android:textSize="12dp" /> <!-- android:textSize="12dp" />-->
</LinearLayout> <!-- </LinearLayout>-->
<ProgressBar <!-- <ProgressBar-->
android:id="@+id/wishlist_progressbar" <!-- android:id="@+id/wishlist_progressbar"-->
style="@android:style/Widget.ProgressBar.Horizontal" <!-- style="@android:style/Widget.ProgressBar.Horizontal"-->
android:layout_width="30dp" <!-- android:layout_width="30dp"-->
android:layout_height="1.5dp" <!-- android:layout_height="1.5dp"-->
android:layout_marginTop="2dp" <!-- android:layout_marginTop="2dp"-->
android:progressDrawable="@drawable/bg_gift_progressbar" /> <!-- android:progressDrawable="@drawable/bg_gift_progressbar" />-->
</LinearLayout> <!-- </LinearLayout>-->
<ImageView <!-- <ImageView-->
android:id="@+id/wish_icon" <!-- android:id="@+id/wish_icon"-->
android:layout_width="28dp" <!-- android:layout_width="28dp"-->
android:layout_height="28dp" <!-- android:layout_height="28dp"-->
android:layout_gravity="center_vertical" <!-- android:layout_gravity="center_vertical"-->
android:layout_marginStart="10dp" <!-- android:layout_marginStart="10dp"-->
android:src="@mipmap/icon_live_room_gift" /> <!-- android:src="@mipmap/icon_live_room_gift" />-->
</LinearLayout> <!-- </LinearLayout>-->
</LinearLayout> <!-- </LinearLayout>-->
<!--贡献--> <!--贡献-->
<LinearLayout <LinearLayout

179
live/src/main/res/layout/view_live_room1.xml
View File

@ -1,179 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/lin"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginTop="25dp">
<View
android:id="@+id/group_1"
android:layout_width="0dp"
android:layout_height="38dp"
android:layout_marginStart="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="3.852"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent="0.33"
tools:background="@drawable/bg_live_item_an" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="0dp"
android:layout_height="0dp"
android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia"
app:layout_constraintBottom_toBottomOf="@id/group_1"
app:layout_constraintDimensionRatio="1"
app:layout_constraintStart_toStartOf="@id/group_1"
app:layout_constraintTop_toTopOf="@+id/group_1"
app:riv_oval="true" />
<ImageView
android:id="@+id/level_anchor"
android:layout_width="13dp"
android:layout_height="13dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/avatar"
app:layout_constraintEnd_toEndOf="@+id/avatar"
tools:visibility="visible" />
<ImageView
android:id="@+id/btn_follow"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="2dp"
android:src="@mipmap/live_icon_focus"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@id/group_1"
app:layout_constraintDimensionRatio="1"
app:layout_constraintEnd_toEndOf="@id/group_1"
app:layout_constraintHorizontal_bias="0.92"
app:layout_constraintStart_toStartOf="@+id/group_1"
app:layout_constraintTop_toTopOf="@id/group_1" />
<ImageView
android:id="@+id/view_medal"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="2dp"
android:gravity="center"
android:textColor="@color/white"
android:textSize="14sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/group_1"
app:layout_constraintDimensionRatio="1"
app:layout_constraintEnd_toEndOf="@id/group_1"
app:layout_constraintHorizontal_bias="0.92"
app:layout_constraintStart_toStartOf="@+id/group_1"
app:layout_constraintTop_toTopOf="@id/group_1"
tools:visibility="visible" />
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:ellipsize="end"
android:includeFontPadding="false"
android:maxWidth="90dp"
android:maxEms="4"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/group_1"
app:layout_constraintStart_toEndOf="@+id/avatar"
app:layout_constraintTop_toTopOf="@id/group_1"
app:layout_constraintVertical_bias="0.18"
tools:text="@string/do_you_like_find" />
<ImageView
android:id="@+id/good_nub_ico"
android:layout_width="18dp"
android:layout_height="15dp"
android:src="@mipmap/usercard_good_nub"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/group_1"
app:layout_constraintStart_toStartOf="@+id/name"
app:layout_constraintTop_toBottomOf="@+id/name"
tools:visibility="visible" />
<TextView
android:id="@+id/id_val"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:textColor="#CBCBCB"
android:textSize="10sp"
app:layout_constraintBottom_toBottomOf="@+id/group_1"
app:layout_constraintStart_toEndOf="@+id/good_nub_ico"
app:layout_constraintTop_toBottomOf="@+id/name"
tools:text="1111" />
<!-- 这些事靠右的-->
<ImageView
android:id="@+id/btn_close"
android:layout_width="34dp"
android:layout_height="34dp"
android:layout_marginEnd="12dp"
android:src="@mipmap/icon_live_close_4"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/user_more"
android:layout_width="34dp"
android:layout_height="34dp"
android:layout_marginEnd="6dp"
android:src="@mipmap/live_users_more_2"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/btn_close"
app:layout_constraintTop_toTopOf="parent" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/user_recyclerView"
android:layout_width="120dp"
android:layout_height="34dp"
android:orientation="horizontal"
android:overScrollMode="never"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/user_more"
app:layout_constraintTop_toTopOf="parent"
tools:itemCount="4" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/user_guard"
android:layout_width="34dp"
android:layout_height="34dp"
android:layout_centerInParent="true"
android:layout_marginEnd="6dp"
android:scaleType="centerCrop"
android:src="@mipmap/img_guardian_empty"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1"
app:layout_constraintEnd_toStartOf="@+id/user_recyclerView"
app:layout_constraintTop_toTopOf="parent"
app:riv_oval="true" />
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/gift_svga"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@mipmap/img_guardian_online"
android:visibility="gone"
app:autoPlay="true"
app:layout_constraintBottom_toBottomOf="@+id/user_guard"
app:layout_constraintEnd_toEndOf="@+id/user_guard"
app:layout_constraintStart_toStartOf="@+id/user_guard"
app:layout_constraintTop_toTopOf="@+id/user_guard"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>

281
live/src/main/res/layout/view_live_room_part2.xml Normal file
View File

@ -0,0 +1,281 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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="match_parent"
tools:layout_height="36dp">
<!-- 新手任务 -->
<ImageView
android:id="@+id/newTaskBg"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="12dp"
android:src="@mipmap/bg_new_task"
app:layout_constraintDimensionRatio="2.7"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/newTaskIc"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="3dp"
android:src="@mipmap/ic_new_task"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1"
app:layout_constraintEnd_toEndOf="@+id/newTaskBg"
app:layout_constraintHeight_percent="0.84"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/newTaskTv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/live_room_new_task"
android:textColor="#1D386B"
android:textSize="10sp"
app:layout_constraintEnd_toStartOf="@+id/newTaskIc"
app:layout_constraintStart_toStartOf="@+id/newTaskBg" />
<androidx.constraintlayout.widget.Group
android:id="@+id/newTaskGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="newTaskBg,newTaskIc,newTaskTv"
tools:visibility="visible" />
<!-- 红包任务 -->
<ImageView
android:id="@+id/newRedPacketImg"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="12dp"
android:src="@mipmap/icon_red_packet_new"
app:layout_constraintDimensionRatio="1"
app:layout_constraintStart_toEndOf="@+id/newTaskBg"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/newRedPacketTv"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@mipmap/bg_live_room_red_time"
android:gravity="center"
android:textColor="@color/white"
android:textSize="7sp"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@+id/newRedPacketImg"
app:layout_constraintDimensionRatio="2.5"
app:layout_constraintEnd_toEndOf="@+id/newRedPacketImg"
app:layout_constraintHeight_percent="0.3"
tools:text="16:36" />
<androidx.constraintlayout.widget.Group
android:id="@+id/newRedPacketGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="newRedPacketImg,newRedPacketTv"
tools:visibility="visible" />
<!-- 神龙任务 -->
<ImageView
android:id="@+id/newDragonImg"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="12dp"
android:src="@mipmap/icon_live_dragon_money"
app:layout_constraintDimensionRatio="1"
app:layout_constraintStart_toEndOf="@+id/newRedPacketImg"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/newDragonTv"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@mipmap/bg_live_room_red_time"
android:gravity="center"
android:textColor="@color/white"
android:textSize="7sp"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@+id/newDragonImg"
app:layout_constraintDimensionRatio="2.5"
app:layout_constraintEnd_toEndOf="@+id/newDragonImg"
app:layout_constraintHeight_percent="0.3"
tools:text="16:36" />
<androidx.constraintlayout.widget.Group
android:id="@+id/newDragonGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="newDragonImg,newDragonTv"
tools:visibility="visible" />
<!-- 心愿任务 从后面开始布局-->
<View
android:id="@+id/newWishBgView"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="10dp"
android:background="@drawable/bg_live_item_rank"
app:layout_constraintDimensionRatio="2.6"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/newWishImg"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@mipmap/ic_live_week_rank"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1.05"
app:layout_constraintEnd_toEndOf="@+id/newWishBgView"
app:layout_constraintHeight_percent="0.64"
app:layout_constraintHorizontal_bias="0.87"
app:layout_constraintStart_toStartOf="@+id/newWishBgView"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/newWishTitleTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="7dp"
android:layout_marginTop="1dp"
android:text="@string/live_room_gift"
android:textColor="#FFFFFF"
android:textSize="9sp"
app:layout_constraintStart_toStartOf="@+id/newWishBgView"
app:layout_constraintTop_toTopOf="@+id/newWishBgView" />
<TextView
android:id="@+id/newWishNowTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="5"
android:textColor="#FFC949 "
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/newWishTitleTv"
app:layout_constraintTop_toBottomOf="@+id/newWishTitleTv" />
<TextView
android:id="@+id/newWishTotalTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="bottom"
tools:text="/26"
android:textColor="#FFFFFF"
android:textSize="10sp"
app:layout_constraintBottom_toBottomOf="@+id/newWishNowTv"
app:layout_constraintStart_toEndOf="@+id/newWishNowTv" />
<ProgressBar
android:id="@+id/wish_progressbar"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="0dp"
android:layout_height="2dp"
android:layout_marginEnd="10dp"
android:progressDrawable="@drawable/bg_gift_progressbar"
app:layout_constraintEnd_toStartOf="@+id/newWishImg"
app:layout_constraintStart_toStartOf="@+id/newWishTitleTv"
app:layout_constraintTop_toBottomOf="@+id/newWishNowTv"
tools:progress="10" />
<androidx.constraintlayout.widget.Group
android:id="@+id/newWishGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="newWishBgView,newWishImg,newWishTitleTv,newWishNowTv,newWishTotalTv,wish_progressbar"
tools:visibility="visible" />
<!--周星榜-->
<View
android:id="@+id/newWeekBgView"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="10dp"
android:background="@drawable/bg_live_item_rank"
app:layout_constraintDimensionRatio="2.6"
app:layout_constraintEnd_toStartOf="@+id/newWishBgView"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/newWeekImg"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@mipmap/ic_live_week_rank"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1.05"
app:layout_constraintEnd_toEndOf="@+id/newWeekBgView"
app:layout_constraintHeight_percent="0.64"
app:layout_constraintHorizontal_bias="0.87"
app:layout_constraintStart_toStartOf="@+id/newWeekBgView"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/newWeekTitleTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="7dp"
android:layout_marginTop="1dp"
android:text="@string/live_wks"
android:textColor="#FFFFFF"
android:textSize="9sp"
app:layout_constraintStart_toStartOf="@+id/newWeekBgView"
app:layout_constraintTop_toTopOf="@+id/newWeekBgView" />
<TextView
android:id="@+id/newWeekNowTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="5"
android:textColor="#FFC949 "
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/newWeekTitleTv"
app:layout_constraintTop_toBottomOf="@+id/newWeekTitleTv" />
<TextView
android:id="@+id/newWeekTotalTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="bottom"
tools:text="/26"
android:textColor="#FFFFFF"
android:textSize="10sp"
app:layout_constraintBottom_toBottomOf="@+id/newWeekNowTv"
app:layout_constraintStart_toEndOf="@+id/newWeekNowTv" />
<ProgressBar
android:id="@+id/week_progressbar"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="0dp"
android:layout_height="2dp"
android:layout_marginEnd="10dp"
android:progressDrawable="@drawable/bg_gift_progressbar"
app:layout_constraintEnd_toStartOf="@+id/newWeekImg"
app:layout_constraintStart_toStartOf="@+id/newWeekTitleTv"
app:layout_constraintTop_toBottomOf="@+id/newWeekNowTv"
tools:progress="10" />
<androidx.constraintlayout.widget.Group
android:id="@+id/newWeekGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="newWeekBgView,newWeekImg,newWeekTitleTv,newWeekNowTv,newWeekTotalTv,week_progressbar"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>

BIN
live/src/main/res/mipmap-hdpi/bg_new_task.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-hdpi/ic_gift_wall.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
live/src/main/res/mipmap-hdpi/ic_live_close_mic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
live/src/main/res/mipmap-hdpi/ic_live_hour_rank.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 188 B

BIN
live/src/main/res/mipmap-hdpi/ic_live_menu_gift.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
live/src/main/res/mipmap-hdpi/ic_live_menu_menu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
live/src/main/res/mipmap-hdpi/ic_live_menu_msg.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-hdpi/ic_live_menu_panda.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
live/src/main/res/mipmap-hdpi/ic_live_open_mic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1013 B

BIN
live/src/main/res/mipmap-hdpi/ic_live_shen_long.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
live/src/main/res/mipmap-hdpi/ic_live_vs_new.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
live/src/main/res/mipmap-hdpi/ic_live_week_rank.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
live/src/main/res/mipmap-hdpi/ic_new_task.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 848 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 555 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 160 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 517 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 651 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 612 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
live/src/main/res/mipmap-xhdpi/bg_new_task.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
live/src/main/res/mipmap-xhdpi/ic_gift_wall.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
live/src/main/res/mipmap-xhdpi/ic_live_close_mic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
live/src/main/res/mipmap-xhdpi/ic_live_hour_rank.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 187 B

BIN
live/src/main/res/mipmap-xhdpi/ic_live_menu_gift.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
live/src/main/res/mipmap-xhdpi/ic_live_menu_menu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
live/src/main/res/mipmap-xhdpi/ic_live_menu_msg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
live/src/main/res/mipmap-xhdpi/ic_live_menu_panda.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
live/src/main/res/mipmap-xhdpi/ic_live_open_mic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
live/src/main/res/mipmap-xhdpi/ic_live_shen_long.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

BIN
live/src/main/res/mipmap-xhdpi/ic_live_vs_new.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
live/src/main/res/mipmap-xhdpi/ic_live_week_rank.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
live/src/main/res/mipmap-xhdpi/ic_new_task.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 299 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB