6.8.2 用户列表部分UI进行修改
@ -419,8 +419,9 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
|
|||||||
-keep class com.qiniu.**{public <init>();}
|
-keep class com.qiniu.**{public <init>();}
|
||||||
-ignorewarnings
|
-ignorewarnings
|
||||||
|
|
||||||
|
|
||||||
# End of content from D:\AndroidProject\pandorapanL\app\proguard-rules.pro
|
# End of content from D:\AndroidProject\pandorapanL\app\proguard-rules.pro
|
||||||
# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\app\build\intermediates\aapt_proguard_file\google_testRelease\processGoogle_testReleaseResources\aapt_rules.txt
|
# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\app\build\intermediates\aapt_proguard_file\google_onlineRelease\processGoogle_onlineReleaseResources\aapt_rules.txt
|
||||||
-keep class androidx.core.app.CoreComponentFactory { <init>(); }
|
-keep class androidx.core.app.CoreComponentFactory { <init>(); }
|
||||||
-keep class androidx.core.content.FileProvider { <init>(); }
|
-keep class androidx.core.content.FileProvider { <init>(); }
|
||||||
-keep class androidx.core.content.FileProvider4Utils { <init>(); }
|
-keep class androidx.core.content.FileProvider4Utils { <init>(); }
|
||||||
@ -1093,10 +1094,10 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
|
|||||||
-keepclassmembers class * { *** videoEditClick(android.view.View); }
|
-keepclassmembers class * { *** videoEditClick(android.view.View); }
|
||||||
|
|
||||||
|
|
||||||
# End of content from D:\AndroidProject\pandorapanL\app\build\intermediates\aapt_proguard_file\google_testRelease\processGoogle_testReleaseResources\aapt_rules.txt
|
# End of content from D:\AndroidProject\pandorapanL\app\build\intermediates\aapt_proguard_file\google_onlineRelease\processGoogle_onlineReleaseResources\aapt_rules.txt
|
||||||
# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\lib_faceunity\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt
|
# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\lib_faceunity\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
|
||||||
|
|
||||||
# End of content from D:\AndroidProject\pandorapanL\lib_faceunity\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt
|
# End of content from D:\AndroidProject\pandorapanL\lib_faceunity\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
|
||||||
# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\8d3e3177c15403546de73d87508067d6\transformed\jetified-XPopup-2.10.0\proguard.txt
|
# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\8d3e3177c15403546de73d87508067d6\transformed\jetified-XPopup-2.10.0\proguard.txt
|
||||||
# Generated keep rule for Lifecycle observer adapter.
|
# Generated keep rule for Lifecycle observer adapter.
|
||||||
-if class com.lxj.xpopup.core.BasePopupView {
|
-if class com.lxj.xpopup.core.BasePopupView {
|
||||||
@ -1156,9 +1157,9 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
|
|||||||
|
|
||||||
|
|
||||||
# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\a1df9a6aa192455030f7c9970b70e0e9\transformed\material-1.4.0\proguard.txt
|
# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\a1df9a6aa192455030f7c9970b70e0e9\transformed\material-1.4.0\proguard.txt
|
||||||
# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\lib_google\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt
|
# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\lib_google\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
|
||||||
|
|
||||||
# End of content from D:\AndroidProject\pandorapanL\lib_google\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt
|
# End of content from D:\AndroidProject\pandorapanL\lib_google\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
|
||||||
# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\2929985d9627ba3bb45a0ebd18eaf9d3\transformed\jetified-linesdk-5.0.1\proguard.txt
|
# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\2929985d9627ba3bb45a0ebd18eaf9d3\transformed\jetified-linesdk-5.0.1\proguard.txt
|
||||||
-keepattributes *Annotation*
|
-keepattributes *Annotation*
|
||||||
|
|
||||||
|
BIN
common/src/main/res/mipmap-hdpi/icon_live_close_4.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
common/src/main/res/mipmap-hdpi/live_users_more_2.png
Normal file
After Width: | Height: | Size: 2.4 KiB |
BIN
common/src/main/res/mipmap-mdpi/ic_expend_down.png
Normal file
After Width: | Height: | Size: 377 B |
BIN
common/src/main/res/mipmap-mdpi/ic_expend_up.png
Normal file
After Width: | Height: | Size: 366 B |
BIN
common/src/main/res/mipmap-xhdpi/icon_live_close_4.png
Normal file
After Width: | Height: | Size: 1.7 KiB |
BIN
common/src/main/res/mipmap-xhdpi/live_users_more_2.png
Normal file
After Width: | Height: | Size: 2.6 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/ic_expend_down.png
Normal file
After Width: | Height: | Size: 1009 B |
BIN
common/src/main/res/mipmap-xxhdpi/ic_expend_up.png
Normal file
After Width: | Height: | Size: 950 B |
BIN
common/src/main/res/mipmap-xxxhdpi/ic_expend_down.png
Normal file
After Width: | Height: | Size: 455 B |
BIN
common/src/main/res/mipmap-xxxhdpi/ic_expend_up.png
Normal file
After Width: | Height: | Size: 433 B |
@ -4,6 +4,7 @@ import static android.text.TextUtils.isEmpty;
|
|||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.graphics.drawable.Drawable;
|
import android.graphics.drawable.Drawable;
|
||||||
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
@ -74,7 +75,7 @@ public class LiveUserAdapter extends RecyclerView.Adapter<LiveUserAdapter.Vh> {
|
|||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
public Vh onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
public Vh onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||||
return new Vh(mInflater.inflate(R.layout.item_live_user, parent, false));
|
return new Vh(mInflater.inflate(R.layout.item_live_user1, parent, false));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -115,6 +116,7 @@ public class LiveUserAdapter extends RecyclerView.Adapter<LiveUserAdapter.Vh> {
|
|||||||
|
|
||||||
if (payload == null) {
|
if (payload == null) {
|
||||||
ImgLoader.display2(mContext, userBean.getAvatar(), mAvatar,100,100);
|
ImgLoader.display2(mContext, userBean.getAvatar(), mAvatar,100,100);
|
||||||
|
Log.i("LiveUserAdapter", "setData:设置头像"+ userBean.getAvatar());
|
||||||
// ImageLoadUtils.loadUrl(userBean.getAvatar(),32,32,mAvatar);
|
// ImageLoadUtils.loadUrl(userBean.getAvatar(),32,32,mAvatar);
|
||||||
}
|
}
|
||||||
gift_svga.setImageDrawable(null);
|
gift_svga.setImageDrawable(null);
|
||||||
@ -149,6 +151,7 @@ public class LiveUserAdapter extends RecyclerView.Adapter<LiveUserAdapter.Vh> {
|
|||||||
if (mList != null && list != null && list.size() > 0) {
|
if (mList != null && list != null && list.size() > 0) {
|
||||||
mList.clear();
|
mList.clear();
|
||||||
mList.addAll(list);
|
mList.addAll(list);
|
||||||
|
Log.i("LiveUserAdapter", "refreshList:"+list.size());
|
||||||
notifyDataSetChanged();
|
notifyDataSetChanged();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -381,7 +381,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
private List<WishlistItemModel> wishlist = new ArrayList<>();
|
private List<WishlistItemModel> wishlist = new ArrayList<>();
|
||||||
private TextView mHourRank, mHotText;
|
private TextView mHourRank, mHotText;
|
||||||
private LinearLayout msg; //默认悬浮窗布局
|
private LinearLayout msg; //默认悬浮窗布局
|
||||||
private LinearLayout mAnchorLayout, liveRankPk2;
|
private View mAnchorLayout;
|
||||||
|
private LinearLayout liveRankPk2;
|
||||||
private ImageView mGoodNumberIcon;
|
private ImageView mGoodNumberIcon;
|
||||||
private View msg2; //悬浮窗来私信的布局
|
private View msg2; //悬浮窗来私信的布局
|
||||||
private ConstraintLayout msgLayout; //悬浮窗
|
private ConstraintLayout msgLayout; //悬浮窗
|
||||||
@ -1799,7 +1800,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
room_hot = (TextView) findViewById(R.id.room_hot);
|
room_hot = (TextView) findViewById(R.id.room_hot);
|
||||||
fans = (TextView) findViewById(R.id.fans);
|
fans = (TextView) findViewById(R.id.fans);
|
||||||
fans_btn = (LinearLayout) findViewById(R.id.fans_btn);
|
fans_btn = (LinearLayout) findViewById(R.id.fans_btn);
|
||||||
mAnchorLayout = (LinearLayout) 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);
|
||||||
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);
|
||||||
@ -4040,10 +4041,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
private void setGuardIcon(LiveUserGiftBean guard) {
|
private void setGuardIcon(LiveUserGiftBean guard) {
|
||||||
if (guard != null) {
|
if (guard != null) {
|
||||||
nowGuardUser = guard;
|
nowGuardUser = guard;
|
||||||
ViewGroup.LayoutParams params = userGuard.getLayoutParams();
|
// ViewGroup.LayoutParams params = userGuard.getLayoutParams();
|
||||||
params.height = DpUtil.dp2px(30);
|
// params.height = DpUtil.dp2px(30);
|
||||||
params.width = DpUtil.dp2px(30);
|
// params.width = DpUtil.dp2px(30);
|
||||||
userGuard.setLayoutParams(params);
|
// userGuard.setLayoutParams(params);
|
||||||
ImgLoader.displayAvatar(mContext, guard.getAvatar(), userGuard);
|
ImgLoader.displayAvatar(mContext, guard.getAvatar(), userGuard);
|
||||||
gift_svga.setVisibility(View.VISIBLE);
|
gift_svga.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
@ -4055,10 +4056,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
public void setGuardIcon(GuardUserModel model) {
|
public void setGuardIcon(GuardUserModel model) {
|
||||||
if (model != null && !TextUtils.isEmpty(model.getGuardUserAvatar())) {
|
if (model != null && !TextUtils.isEmpty(model.getGuardUserAvatar())) {
|
||||||
guardUserModel = model;
|
guardUserModel = model;
|
||||||
ViewGroup.LayoutParams params = userGuard.getLayoutParams();
|
// ViewGroup.LayoutParams params = userGuard.getLayoutParams();
|
||||||
params.height = DpUtil.dp2px(30);
|
// params.height = DpUtil.dp2px(30);
|
||||||
params.width = DpUtil.dp2px(30);
|
// params.width = DpUtil.dp2px(30);
|
||||||
userGuard.setLayoutParams(params);
|
// userGuard.setLayoutParams(params);
|
||||||
ImgLoader.displayAvatar(mContext, model.getGuardUserAvatar(), userGuard);
|
ImgLoader.displayAvatar(mContext, model.getGuardUserAvatar(), userGuard);
|
||||||
gift_svga.setVisibility(View.VISIBLE);
|
gift_svga.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
15
live/src/main/res/drawable/bg_live_add.xml
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:shape="rectangle">
|
||||||
|
<gradient
|
||||||
|
android:angle="180"
|
||||||
|
android:endColor="#ffffaa0a"
|
||||||
|
android:startColor="#ffffb813"
|
||||||
|
android:type="linear"
|
||||||
|
android:useLevel="true" />
|
||||||
|
<corners
|
||||||
|
android:bottomLeftRadius="19dp"
|
||||||
|
android:bottomRightRadius="19dp"
|
||||||
|
android:topLeftRadius="19dp"
|
||||||
|
android:topRightRadius="19dp" />
|
||||||
|
</shape>
|
@ -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="18dp"/>
|
<corners android:radius="19dp"/>
|
||||||
<solid android:color="#8065615A"/>
|
<solid android:color="#40000000"/>
|
||||||
</shape>
|
</shape>
|
@ -2,6 +2,7 @@
|
|||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:layout_width="32dp"
|
android:layout_width="32dp"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_marginEnd="1dp"
|
android:layout_marginEnd="1dp"
|
||||||
android:layout_height="32dp">
|
android:layout_height="32dp">
|
||||||
|
|
||||||
@ -47,7 +48,8 @@
|
|||||||
android:layout_height="16dp"
|
android:layout_height="16dp"
|
||||||
android:layout_alignParentRight="true"
|
android:layout_alignParentRight="true"
|
||||||
android:layout_alignParentBottom="true"
|
android:layout_alignParentBottom="true"
|
||||||
android:visibility="gone" />
|
android:visibility="gone"
|
||||||
|
tools:visibility="visible"/>
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/guard_icon"
|
android:id="@+id/guard_icon"
|
||||||
@ -55,5 +57,6 @@
|
|||||||
android:layout_height="17dp"
|
android:layout_height="17dp"
|
||||||
android:layout_alignParentRight="true"
|
android:layout_alignParentRight="true"
|
||||||
android:layout_alignParentBottom="true"
|
android:layout_alignParentBottom="true"
|
||||||
android:visibility="gone" />
|
android:visibility="gone"
|
||||||
|
tools:visibility="visible"/>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
48
live/src/main/res/layout/item_live_user1.xml
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
<?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="40dp"
|
||||||
|
android:layout_height="34dp">
|
||||||
|
|
||||||
|
<com.yunbao.common.views.weight.ClipPathCircleImage
|
||||||
|
android:id="@+id/avatar"
|
||||||
|
android:layout_width="34dp"
|
||||||
|
android:layout_height="34dp"
|
||||||
|
android:layout_centerInParent="true"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:scaleType="centerCrop"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:riv_oval="true"
|
||||||
|
tools:src="@drawable/m_chu_xia" />
|
||||||
|
|
||||||
|
<com.opensource.svgaplayer.SVGAImageView
|
||||||
|
android:id="@+id/gift_svga"
|
||||||
|
android:layout_width="38dp"
|
||||||
|
android:layout_height="38dp"
|
||||||
|
app:autoPlay="true"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/icon"
|
||||||
|
android:layout_width="16dp"
|
||||||
|
android:layout_height="16dp"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/avatar"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/avatar"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/guard_icon"
|
||||||
|
android:layout_width="17dp"
|
||||||
|
android:layout_height="17dp"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/avatar"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/avatar"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
@ -8,174 +8,181 @@
|
|||||||
android:layout_marginBottom="45dp"
|
android:layout_marginBottom="45dp"
|
||||||
android:paddingTop="15dp">
|
android:paddingTop="15dp">
|
||||||
|
|
||||||
<LinearLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:id="@+id/lin"
|
android:id="@+id/lin"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="40dp"
|
||||||
android:layout_marginTop="25dp"
|
android:layout_marginTop="25dp">
|
||||||
android:orientation="horizontal">
|
|
||||||
|
|
||||||
<LinearLayout
|
<View
|
||||||
android:id="@+id/group_1"
|
android:id="@+id/group_1"
|
||||||
android:layout_width="142dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="34dp"
|
android:layout_height="38dp"
|
||||||
android:layout_marginLeft="8dp"
|
android:layout_marginStart="12dp"
|
||||||
android:layout_marginTop="4dp"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
android:background="@drawable/bg_live_item_an"
|
app:layout_constraintDimensionRatio="3.852"
|
||||||
android:gravity="center_vertical"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
android:orientation="horizontal">
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintWidth_percent="0.33"
|
||||||
<RelativeLayout
|
tools:background="@drawable/bg_live_item_an" />
|
||||||
android:layout_width="26dp"
|
|
||||||
android:layout_height="26dp"
|
|
||||||
android:layout_marginLeft="5dp">
|
|
||||||
|
|
||||||
<com.makeramen.roundedimageview.RoundedImageView
|
<com.makeramen.roundedimageview.RoundedImageView
|
||||||
android:id="@+id/avatar"
|
android:id="@+id/avatar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="0dp"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="0dp"
|
||||||
android:scaleType="centerCrop"
|
android:scaleType="centerCrop"
|
||||||
android:src="@drawable/m_chu_xia"
|
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" />
|
app:riv_oval="true" />
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/level_anchor"
|
android:id="@+id/level_anchor"
|
||||||
android:layout_width="13dp"
|
android:layout_width="13dp"
|
||||||
android:layout_height="13dp"
|
android:layout_height="13dp"
|
||||||
android:layout_alignParentRight="true"
|
android:visibility="gone"
|
||||||
android:layout_alignParentBottom="true"
|
app:layout_constraintBottom_toBottomOf="@id/avatar"
|
||||||
android:visibility="gone" />
|
app:layout_constraintEnd_toEndOf="@+id/avatar"
|
||||||
</RelativeLayout>
|
tools:visibility="visible" />
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="60dp"
|
<ImageView
|
||||||
android:layout_height="wrap_content"
|
android:id="@+id/btn_follow"
|
||||||
android:layout_marginLeft="5dp"
|
android:layout_width="0dp"
|
||||||
android:layout_marginRight="5dp"
|
android:layout_height="0dp"
|
||||||
android:orientation="vertical">
|
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
|
<TextView
|
||||||
android:id="@+id/name"
|
android:id="@+id/name"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="4dp"
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
android:includeFontPadding="false"
|
android:includeFontPadding="false"
|
||||||
android:maxWidth="90dp"
|
android:maxWidth="90dp"
|
||||||
android:maxEms="4"
|
android:maxEms="4"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:text="@string/do_you_like_find"
|
|
||||||
android:textColor="@color/white"
|
android:textColor="@color/white"
|
||||||
android:textSize="12sp" />
|
android:textSize="12sp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/group_1"
|
||||||
<LinearLayout
|
app:layout_constraintStart_toEndOf="@+id/avatar"
|
||||||
android:layout_width="wrap_content"
|
app:layout_constraintTop_toTopOf="@id/group_1"
|
||||||
android:layout_height="wrap_content"
|
app:layout_constraintVertical_bias="0.18"
|
||||||
android:gravity="center"
|
tools:text="@string/do_you_like_find" />
|
||||||
android:orientation="horizontal">
|
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/good_nub_ico"
|
android:id="@+id/good_nub_ico"
|
||||||
android:layout_width="18dp"
|
android:layout_width="18dp"
|
||||||
android:layout_height="15dp"
|
android:layout_height="15dp"
|
||||||
android:layout_marginEnd="2dp"
|
|
||||||
android:src="@mipmap/usercard_good_nub"
|
android:src="@mipmap/usercard_good_nub"
|
||||||
android:visibility="gone" />
|
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
|
<TextView
|
||||||
android:id="@+id/id_val"
|
android:id="@+id/id_val"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:includeFontPadding="false"
|
android:includeFontPadding="false"
|
||||||
android:text="1111"
|
android:textColor="#CBCBCB"
|
||||||
android:textColor="@color/white"
|
android:textSize="10sp"
|
||||||
android:textSize="8sp" />
|
app:layout_constraintBottom_toBottomOf="@+id/group_1"
|
||||||
</LinearLayout>
|
app:layout_constraintStart_toEndOf="@+id/good_nub_ico"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/name"
|
||||||
|
tools:text="1111" />
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
|
<!-- 这些事靠右的-->
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/btn_follow"
|
android:id="@+id/btn_close"
|
||||||
android:layout_width="34dp"
|
android:layout_width="34dp"
|
||||||
android:layout_height="34dp"
|
android:layout_height="34dp"
|
||||||
android:layout_marginEnd="5dp"
|
android:layout_marginEnd="12dp"
|
||||||
android:gravity="center"
|
android:src="@mipmap/icon_live_close_4"
|
||||||
android:src="@mipmap/live_icon_focus"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
android:textColor="@color/white"
|
app:layout_constraintDimensionRatio="1"
|
||||||
android:visibility="visible" />
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/view_medal"
|
android:id="@+id/user_more"
|
||||||
android:layout_width="30dp"
|
|
||||||
android:layout_height="30dp"
|
|
||||||
android:layout_marginRight="5dp"
|
|
||||||
android:gravity="center"
|
|
||||||
android:textColor="@color/white"
|
|
||||||
android:textSize="14sp"
|
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:layout_width="34dp"
|
android:layout_width="34dp"
|
||||||
android:layout_height="34dp"
|
android:layout_height="34dp"
|
||||||
android:layout_gravity="center"
|
android:layout_marginEnd="6dp"
|
||||||
android:layout_marginStart="8dp"
|
android:src="@mipmap/live_users_more_2"
|
||||||
android:scaleType="centerCrop">
|
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
|
<com.makeramen.roundedimageview.RoundedImageView
|
||||||
android:id="@+id/user_guard"
|
android:id="@+id/user_guard"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="36dp"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="36dp"
|
||||||
android:layout_centerInParent="true"
|
android:layout_centerInParent="true"
|
||||||
|
android:layout_marginEnd="6dp"
|
||||||
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_constraintDimensionRatio="1"
|
||||||
|
app:layout_constraintEnd_toStartOf="@+id/user_recyclerView"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
app:riv_oval="true" />
|
app:riv_oval="true" />
|
||||||
|
|
||||||
|
|
||||||
<com.opensource.svgaplayer.SVGAImageView
|
<com.opensource.svgaplayer.SVGAImageView
|
||||||
android:id="@+id/gift_svga"
|
android:id="@+id/gift_svga"
|
||||||
android:layout_width="34dp"
|
android:layout_width="36dp"
|
||||||
android:layout_height="34dp"
|
android:layout_height="36dp"
|
||||||
android:src="@mipmap/img_guardian_online"
|
android:src="@mipmap/img_guardian_online"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
app:autoPlay="true" />
|
app:autoPlay="true"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/user_guard"
|
||||||
</RelativeLayout>
|
app:layout_constraintEnd_toEndOf="@+id/user_guard"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/user_guard"
|
||||||
<LinearLayout
|
app:layout_constraintTop_toTopOf="@+id/user_guard"
|
||||||
android:layout_width="match_parent"
|
tools:visibility="visible" />
|
||||||
android:layout_height="wrap_content"
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
android:gravity="end|center"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
|
||||||
android:id="@+id/user_recyclerView"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="32dp"
|
|
||||||
android:layout_gravity="end|center"
|
|
||||||
android:layout_marginEnd="4dp"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:overScrollMode="never"
|
|
||||||
android:visibility="visible" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/user_more"
|
|
||||||
android:layout_width="24dp"
|
|
||||||
android:layout_height="34dp"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:src="@mipmap/live_users_more" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/btn_close"
|
|
||||||
android:layout_width="17dp"
|
|
||||||
android:layout_height="17dp"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:layout_marginStart="6dp"
|
|
||||||
android:layout_marginEnd="10dp"
|
|
||||||
android:scaleType="fitCenter"
|
|
||||||
android:src="@mipmap/icon_live_close_3" />
|
|
||||||
</LinearLayout>
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<!--消息-->
|
<!--消息-->
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
@ -1138,7 +1145,6 @@
|
|||||||
android:id="@+id/textView"
|
android:id="@+id/textView"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:gravity="right"
|
android:gravity="right"
|
||||||
android:text="@string/room_msg"
|
android:text="@string/room_msg"
|
||||||
@ -3050,8 +3056,8 @@
|
|||||||
android:layout_below="@+id/new_task_send_gift_content"
|
android:layout_below="@+id/new_task_send_gift_content"
|
||||||
android:layout_alignParentEnd="true"
|
android:layout_alignParentEnd="true"
|
||||||
android:layout_marginEnd="15dp"
|
android:layout_marginEnd="15dp"
|
||||||
android:fontFamily="sans-serif-condensed-medium"
|
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
|
android:fontFamily="sans-serif-condensed-medium"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:text="@string/live_room_push_view_gift"
|
android:text="@string/live_room_push_view_gift"
|
||||||
android:textColor="#FF2B5AB8"
|
android:textColor="#FF2B5AB8"
|
||||||
@ -3254,9 +3260,9 @@
|
|||||||
android:layout_alignParentBottom="true"
|
android:layout_alignParentBottom="true"
|
||||||
android:layout_marginStart="35dp"
|
android:layout_marginStart="35dp"
|
||||||
android:layout_marginEnd="65dp"
|
android:layout_marginEnd="65dp"
|
||||||
|
android:layout_marginBottom="5dp"
|
||||||
android:ellipsize="marquee"
|
android:ellipsize="marquee"
|
||||||
android:scrollHorizontally="true"
|
android:scrollHorizontally="true"
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:text="@string/live_room_push_like_an"
|
android:text="@string/live_room_push_like_an"
|
||||||
android:textColor="@color/white"
|
android:textColor="@color/white"
|
||||||
|
179
live/src/main/res/layout/view_live_room1.xml
Normal file
@ -0,0 +1,179 @@
|
|||||||
|
<?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>
|