Merge branch 'pandorapan_社区相关' into dev_改版主分支

# Conflicts:
#	common/build.gradle
#	common/src/main/java/com/yunbao/common/bean/MessageUserInfoBean.java
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
#	common/src/main/java/com/yunbao/common/utils/RouteUtil.java
#	common/src/main/res/values/strings.xml
#	main/src/main/java/com/yunbao/main/activity/MainActivity.java
This commit is contained in:
hch
2024-03-15 17:27:31 +08:00
148 changed files with 9764 additions and 237 deletions

View File

@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/btn_admin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginTop="10dp"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="15dp">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="15dp">
<LinearLayout
android:id="@+id/imgLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="15dp">
<ImageView
android:id="@+id/img"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:scaleType="centerCrop" />
</androidx.cardview.widget.CardView>
</LinearLayout>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/imgLayout"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:ellipsize="end"
android:maxLines="1"
android:text="标题标题标题标题标题标题标题"
android:textColor="@color/textColor"
android:textSize="14dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/title"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<com.yunbao.common.custom.RatioRoundImageView
android:id="@+id/author"
android:layout_width="30dp"
android:layout_height="30dp"
android:src="@mipmap/user_info_bg"
app:riv_corner_radius="15dp" />
<TextView
android:id="@+id/name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_weight="1"
android:text="昵称"
android:textColor="@color/black1"
android:textSize="12dp" />
<ImageView
android:layout_width="25dp"
android:layout_height="25dp"
android:src="@mipmap/icon_like" />
<TextView
android:id="@+id/like_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="10000"
android:textColor="#FF4874"
android:textSize="12dp" />
</LinearLayout>
<ImageView
android:id="@+id/isVideo"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_alignParentEnd="true"
android:layout_marginTop="5dp"
android:layout_marginEnd="5dp"
android:src="@mipmap/icon_play" />
</RelativeLayout>
</androidx.cardview.widget.CardView>