fix bugs. add 字体流光 自定义view,cos上传报错信息。

This commit is contained in:
2025-11-14 17:38:30 +08:00
parent 68b4a66046
commit 3322cfeb22
78 changed files with 1278 additions and 1112 deletions

View File

@@ -1,193 +1,181 @@
<?xml version="1.0" encoding="utf-8"?>
<layout
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"
tools:context=".activity.NobleTitleActivity">
<layout 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"
tools:context=".activity.NobleTitleActivity">
<data>
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/noble_bj">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/noble_bj">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/top_bar"
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="@dimen/dp_40"
app:layout_constraintTop_toTopOf="parent">
android:id="@+id/top_bar"
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="@dimen/dp_40"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_back"
android:layout_width="0dp"
android:layout_height="0dp"
android:contentDescription="@null"
android:scaleType="centerInside"
android:src="@mipmap/ic_topbar_back_dark"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
/>
android:id="@+id/iv_back"
android:layout_width="0dp"
android:layout_height="0dp"
android:contentDescription="@null"
android:scaleType="centerInside"
android:src="@mipmap/ic_topbar_back_dark"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_noble_title"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
/>
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_noble_title"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_intent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:src="@mipmap/icon_noble_gz"
android:layout_marginEnd="@dimen/dp_16"
/>
android:id="@+id/iv_intent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_16"
android:src="@mipmap/icon_noble_gz"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.xscm.moduleutil.widget.CircularImage
android:id="@+id/ci_user_image"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginStart="@dimen/dp_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/top_bar"
tools:src="@mipmap/ic_launcher_foreground"
/>
android:id="@+id/ci_user_image"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/top_bar"
tools:src="@mipmap/ic_launcher_foreground" />
<TextView
android:id="@+id/tv_user_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_6"
app:layout_constraintTop_toTopOf="@+id/ci_user_image"
app:layout_constraintBottom_toBottomOf="@+id/ci_user_image"
app:layout_constraintStart_toEndOf="@+id/ci_user_image"
tools:text="用户名"
android:textColor="#F5E9D1"
android:textSize="@dimen/sp_12"
/>
android:id="@+id/tv_user_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_6"
android:textColor="#F5E9D1"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="@+id/ci_user_image"
app:layout_constraintStart_toEndOf="@+id/ci_user_image"
app:layout_constraintTop_toTopOf="@+id/ci_user_image"
tools:text="用户名" />
<TextView
android:id="@+id/tv_user_lv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@+id/tv_user_name"
app:layout_constraintTop_toTopOf="@+id/tv_user_name"
app:layout_constraintBottom_toBottomOf="@+id/tv_user_name"
tools:text="Lv.1"
android:textColor="#F5E9D1"
android:textSize="@dimen/sp_12"
/>
android:id="@+id/tv_user_lv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#F5E9D1"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="@+id/tv_user_name"
app:layout_constraintStart_toEndOf="@+id/tv_user_name"
app:layout_constraintTop_toTopOf="@+id/tv_user_name"
tools:text="Lv.1" />
<ImageView
android:id="@+id/im_me_noble"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_94"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
app:layout_constraintTop_toBottomOf="@+id/ci_user_image"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:src="@mipmap/me_noble_bj"
android:scaleType="fitXY"
/>
android:id="@+id/im_me_noble"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_94"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_15"
android:scaleType="fitXY"
android:src="@mipmap/me_noble_bj"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ci_user_image" />
<TextView
android:id="@+id/tv_me_noble_lv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_44"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_8"
app:layout_constraintStart_toStartOf="@+id/im_me_noble"
app:layout_constraintTop_toTopOf="@+id/im_me_noble"
tools:text="Lv.1"
android:fontFamily="@font/youshebiaotihei"
android:visibility="gone"
tools:visibility="visible"
android:textSize="@dimen/sp_34"
/>
android:id="@+id/tv_me_noble_lv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_44"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_8"
android:fontFamily="@font/youshebiaotihei"
android:textSize="@dimen/sp_34"
android:visibility="gone"
app:layout_constraintStart_toStartOf="@+id/im_me_noble"
app:layout_constraintTop_toTopOf="@+id/im_me_noble"
tools:text="Lv.1"
tools:visibility="visible" />
<ImageView
android:id="@+id/im_me_noble_status"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_36"
android:layout_marginStart="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
app:layout_constraintStart_toStartOf="@+id/im_me_noble"
app:layout_constraintTop_toTopOf="@+id/im_me_noble"
android:scaleType="fitCenter"
tools:src="@mipmap/me_noble_no"
tools:visibility="gone"
/>
android:id="@+id/im_me_noble_status"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_36"
android:layout_marginStart="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:scaleType="fitCenter"
app:layout_constraintStart_toStartOf="@+id/im_me_noble"
app:layout_constraintTop_toTopOf="@+id/im_me_noble"
tools:src="@mipmap/me_noble_no"
tools:visibility="gone" />
<ImageView
android:id="@+id/im_me_noble_xf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12"
app:layout_constraintStart_toEndOf="@+id/tv_me_noble_lv"
app:layout_constraintTop_toTopOf="@+id/tv_me_noble_lv"
app:layout_constraintBottom_toBottomOf="@+id/tv_me_noble_lv"
android:src="@mipmap/me_noble_xf"
tools:visibility="visible"
android:visibility="gone"
/>
android:id="@+id/im_me_noble_xf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12"
android:src="@mipmap/me_noble_xf"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/tv_me_noble_lv"
app:layout_constraintStart_toEndOf="@+id/tv_me_noble_lv"
app:layout_constraintTop_toTopOf="@+id/tv_me_noble_lv"
tools:visibility="visible" />
<TextView
android:id="@+id/tv_user_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginBottom="@dimen/dp_12"
android:layout_marginStart="@dimen/dp_12"
app:layout_constraintStart_toStartOf="@+id/im_me_noble_status"
app:layout_constraintBottom_toBottomOf="@+id/im_me_noble"
tools:text="未开通"
android:textColor="#F5E9D1"
android:textSize="@dimen/sp_12"
/>
android:id="@+id/tv_user_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginBottom="@dimen/dp_12"
android:textColor="#F5E9D1"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="@+id/im_me_noble"
app:layout_constraintStart_toStartOf="@+id/im_me_noble_status"
tools:text="未开通" />
<ImageView
android:id="@+id/im_noble_db"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
app:layout_constraintTop_toBottomOf="@+id/im_me_noble"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:src="@mipmap/noble_duib"
android:scaleType="fitCenter"/>
android:id="@+id/im_noble_db"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_15"
android:scaleType="fitCenter"
android:src="@mipmap/noble_duib"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/im_me_noble" />
<ImageView
android:id="@+id/im_noble"
android:layout_width="@dimen/dp_104"
android:layout_height="@dimen/dp_104"
app:layout_constraintTop_toBottomOf="@+id/top_bar"
app:layout_constraintEnd_toEndOf="@+id/im_me_noble"
android:src="@mipmap/me_noble_image"
android:scaleType="fitXY"
android:layout_marginEnd="@dimen/dp_13"
/>
android:id="@+id/im_noble"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_13"
android:scaleType="fitXY"
android:src="@mipmap/me_noble_image"
app:layout_constraintEnd_toEndOf="@+id/im_me_noble"
app:layout_constraintTop_toBottomOf="@+id/top_bar" />
<!-- <androidx.cardview.widget.CardView-->
<!-- android:layout_width="match_parent"-->
@@ -203,83 +191,78 @@
<!-- >-->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@drawable/noble_card_border"
android:layout_marginTop="@dimen/dp_13"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
app:layout_constraintTop_toBottomOf="@+id/im_noble_db"
app:layout_constraintBottom_toTopOf="@+id/im_kt"
>
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_13"
android:layout_marginEnd="@dimen/dp_16"
android:background="@drawable/noble_card_border"
app:layout_constraintBottom_toTopOf="@+id/im_kt"
app:layout_constraintTop_toBottomOf="@+id/im_noble_db">
<LinearLayout
android:orientation="vertical"
android:id="@+id/contentView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_12"
android:background="@drawable/bg_r6_2a2a4e"
/>
android:id="@+id/contentView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_12"
android:background="@drawable/bg_r6_2a2a4e"
android:orientation="vertical" />
</FrameLayout>
<!-- </androidx.cardview.widget.CardView>-->
<ImageView
android:id="@+id/im_kt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:src="@mipmap/me_sj"
android:scaleType="fitXY"
app:layout_constraintEnd_toEndOf="parent"
tools:visibility="visible"
android:visibility="gone"
/>
android:id="@+id/im_kt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@mipmap/me_sj"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:visibility="visible" />
<com.xscm.moduleutil.widget.CircularImage
android:id="@+id/ci_image2"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_marginStart="@dimen/dp_12"
app:layout_constraintStart_toStartOf="@+id/im_kt"
app:layout_constraintTop_toTopOf="@+id/im_kt"
app:layout_constraintBottom_toBottomOf="@+id/im_kt"
tools:src="@mipmap/ic_launcher"
tools:visibility="visible"
android:visibility="gone"/>
android:id="@+id/ci_image2"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_marginStart="@dimen/dp_12"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/im_kt"
app:layout_constraintStart_toStartOf="@+id/im_kt"
app:layout_constraintTop_toTopOf="@+id/im_kt"
tools:src="@mipmap/ic_launcher"
tools:visibility="visible" />
<TextView
android:id="@+id/tv_me_x"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_6"
app:layout_constraintStart_toEndOf="@+id/ci_image2"
app:layout_constraintTop_toTopOf="@+id/im_kt"
app:layout_constraintBottom_toBottomOf="@+id/im_kt"
tools:text="夏沫..的当前爵位状态是骑"
android:textColor="#F5E9D1"
android:textSize="@dimen/sp_12"
android:maxLines="1"
android:ellipsize="end"
android:singleLine="true"
android:maxEms="12"
tools:visibility="visible"
android:visibility="gone"
/>
android:id="@+id/tv_me_x"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_6"
android:ellipsize="end"
android:maxEms="12"
android:maxLines="1"
android:singleLine="true"
android:textColor="#F5E9D1"
android:textSize="@dimen/sp_12"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/im_kt"
app:layout_constraintStart_toEndOf="@+id/ci_image2"
app:layout_constraintTop_toTopOf="@+id/im_kt"
tools:text="夏沫..的当前爵位状态是骑"
tools:visibility="visible" />
<ImageView
android:id="@+id/im_sj"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_36"
android:src="@mipmap/noble_sj"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/im_kt"
app:layout_constraintBottom_toBottomOf="@+id/im_kt"
android:layout_marginEnd="@dimen/dp_16"
tools:visibility="visible"
android:visibility="gone"
/>
android:id="@+id/im_sj"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_36"
android:layout_marginEnd="@dimen/dp_16"
android:src="@mipmap/noble_sj"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/im_kt"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/im_kt"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -258,6 +258,26 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_alignParentBottom="true"
android:background="@color/color_FFE5E5E5" />
<LinearLayout
android:id="@+id/ll_send_log"
style="@style/My_Info_Item_LL_Style"
android:background="@drawable/bg_r15_white">
<TextView
style="@style/My_Info_Item_Title_Style"
android:layout_width="0dp"
android:layout_weight="1"
android:text="上传报错信息" />
<ImageView style="@style/My_Info_Item_Arrow_Style" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
@@ -300,6 +320,8 @@
<ImageView style="@style/My_Info_Item_Arrow_Style" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
@@ -386,6 +408,7 @@
<TextView
android:id="@+id/tv_share"
android:visibility="gone"
android:layout_gravity="start"
android:padding="@dimen/dp_40"
android:layout_marginTop="-50dp"

View File

@@ -1,128 +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/bubble"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="@dimen/dp_256"
android:maxWidth="@dimen/dp_256"
android:padding="@dimen/dp_8"
android:background="@drawable/ease_row_pubilc_user_bg"
>
<!-- 网络背景图片 -->
<!-- <ImageView-->
<!-- android:id="@+id/network_background"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="0dp"-->
<!-- tools:src="@mipmap/a1img_9"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"/>-->
<!-- 用户头像 -->
<com.xscm.moduleutil.utils.MeHeadView
android:id="@+id/avatar"
android:layout_width="@dimen/dp_40"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_3"
android:layout_marginTop="@dimen/dp_3"
android:layout_marginBottom="@dimen/dp_3"
android:layout_marginStart="@dimen/dp_8"
app:riv_oval="true"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<!-- 用户名称 -->
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#CCA882"
android:textSize="@dimen/sp_12"
android:layout_marginStart="@dimen/dp_2"
tools:text="饶利"
app:layout_constraintStart_toEndOf="@+id/avatar"
app:layout_constraintTop_toTopOf="@+id/avatar"/>
<!-- 用户标签容器 -->
<LinearLayout
android:id="@+id/line"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_2"
android:layout_marginTop="@dimen/dp_5"
android:orientation="horizontal"
app:layout_constraintStart_toEndOf="@+id/avatar"
app:layout_constraintTop_toBottomOf="@+id/tv_name"/>
<!-- 消息内容 -->
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="left|center_vertical"
android:layout_marginStart="4dp"
android:layout_marginTop="2dp"
android:padding="@dimen/dp_3"
android:paddingEnd="@dimen/dp_10"
app:layout_constraintStart_toEndOf="@+id/avatar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/line">
<TextView
android:id="@+id/tv_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lineHeight="@dimen/dp_20"
android:lineSpacingExtra="@dimen/dp_2"
android:paddingStart="@dimen/dp_8"
android:paddingEnd="@dimen/dp_8"
android:textColor="@color/white"
android:textSize="@dimen/sp_14"
tools:text="饶利: 潇洒亼◇生2.0"
tools:visibility="gone"/>
<com.xscm.moduleutil.widget.AdaptiveImageView
android:id="@+id/im_emj"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_2"
tools:src="@mipmap/ic_launcher"
android:scaleType="fitXY"
android:adjustViewBounds="true"
android:visibility="gone"
tools:visibility="visible"/>
<!-- <ImageView-->
<!-- android:id="@+id/im_emj"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="0dp"-->
<!-- android:layout_marginStart="@dimen/dp_2"-->
<!-- android:paddingStart="@dimen/dp_8"-->
<!-- android:paddingEnd="@dimen/dp_8"-->
<!-- tools:src="@mipmap/ic_launcher"-->
<!-- android:maxHeight="@dimen/dp_50"-->
<!-- android:maxWidth="@dimen/dp_50"-->
<!-- android:minWidth="@dimen/dp_40"-->
<!-- android:minHeight="@dimen/dp_40"-->
<!-- android:scaleType="centerCrop"-->
<!-- android:adjustViewBounds="true"-->
<!-- android:visibility="gone"-->
<!-- tools:visibility="visible"-->
<!-- app:layout_constraintWidth_default="wrap"-->
<!-- app:layout_constraintHeight_default="wrap"-->
<!-- app:layout_constraintWidth_min="@dimen/dp_40"-->
<!-- app:layout_constraintHeight_min="@dimen/dp_40"-->
<!-- app:layout_constraintWidth_max="@dimen/dp_50"-->
<!-- app:layout_constraintHeight_max="@dimen/dp_50"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent"/>-->
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -24,7 +24,7 @@
app:layout_constraintTop_toTopOf="parent">
<TextView
<com.xscm.moduleutil.widget.ShineTextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -32,6 +32,7 @@
android:text="用户名"
android:textColor="#ffffff"
android:textSize="@dimen/sp_14"
app:isShine="false"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -96,9 +97,9 @@
android:gravity="center"
android:text="转币"
android:textColor="@color/white"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:visibility="gone"/>
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/kb"
@@ -132,8 +133,7 @@
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/im_qml"
tools:visibility="visible"/>
tools:visibility="visible" />
<ImageView
@@ -145,9 +145,7 @@
android:src="@mipmap/gsui"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/kb"
/>
app:layout_constraintTop_toBottomOf="@+id/kb" />
<TextView
@@ -347,9 +345,9 @@
android:layout_alignStart="@+id/user_nav1"
android:layout_alignEnd="@+id/user_nav1"
android:gravity="center"
tools:text="用户昵称"
android:textColor="@color/white"
android:textSize="@dimen/sp_10" />
android:textSize="@dimen/sp_10"
tools:text="用户昵称" />
<RelativeLayout
android:id="@+id/rl_reqit"
@@ -366,10 +364,10 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_40"
android:gravity="center"
tools:text="开始使用"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
android:textStyle="bold" />
android:textStyle="bold"
tools:text="开始使用" />
</RelativeLayout>
@@ -402,13 +400,13 @@
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_43"
android:layout_marginEnd="@dimen/dp_22"
android:background="@drawable/bg_r53_33333"
android:gravity="center"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:background="@drawable/bg_r53_33333"
tools:text="5天"
android:textColor="@color/white"
android:textSize="@dimen/sp_9" />
android:textSize="@dimen/sp_9"
tools:text="5天" />
</RelativeLayout>
<com.google.android.flexbox.FlexboxLayout

View File

@@ -7,12 +7,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never"
android:background="@mipmap/home_bj"
android:paddingBottom="@dimen/dp_60">
android:background="@mipmap/home_bj">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/dp_60"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
@@ -85,8 +85,20 @@
app:layout_constraintTop_toTopOf="parent"
app:riv_oval="true"/>
<TextView
<com.xscm.moduleutil.widget.ShineTextView
android:id="@+id/tv_nick_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_16"
android:layout_marginTop="@dimen/dp_5"
android:textColor="@color/white"
app:isShine="false"
app:layout_constraintStart_toEndOf="@+id/riv_user_head"
app:layout_constraintTop_toTopOf="@+id/riv_user_head"
android:layout_marginStart="@dimen/dp_14"
tools:text="用户22333333"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#fff"
@@ -139,66 +151,6 @@
app:layout_constraintStart_toStartOf="@+id/beautiful_view"
/>
<!-- <LinearLayout-->
<!-- android:id="@+id/lin"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="match_parent"-->
<!-- android:orientation="vertical"-->
<!-- android:layout_marginStart="@dimen/dp_14"-->
<!-- app:layout_constraintStart_toEndOf="@+id/riv_user_head"-->
<!-- app:layout_constraintTop_toTopOf="@+id/riv_user_head">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_nick_name"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:textColor="#fff"-->
<!-- android:textSize="@dimen/sp_16"-->
<!-- tools:text="用户22333333" />-->
<!-- <LinearLayout-->
<!-- android:id="@+id/beautiful_view_copy"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="7dp"-->
<!-- android:gravity="center_vertical"-->
<!-- android:orientation="horizontal">-->
<!-- <TextView-->
<!-- android:id="@+id/beautiful_view"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:textColor="@color/color_FFFFFFE0"-->
<!-- android:textSize="@dimen/sp_12"-->
<!-- tools:text="22222" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_copy"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginLeft="5dp"-->
<!-- android:background="@mipmap/copy"-->
<!-- android:textColor="@color/color_666666"-->
<!-- android:textSize="12sp" />-->
<!-- <ImageView-->
<!-- android:id="@+id/im_beautiful"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="@dimen/dp_11"-->
<!-- android:layout_marginLeft="5dp"-->
<!-- android:scaleType="fitCenter"-->
<!-- tools:src="@mipmap/beautiful" />-->
<!-- </LinearLayout>-->
<!-- <LinearLayout-->
<!-- android:id="@+id/ll_image_container"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="horizontal"-->
<!-- android:layout_gravity="bottom"-->
<!-- android:layout_marginTop="@dimen/dp_4"-->
<!-- >-->
<!-- </LinearLayout>-->
<!-- </LinearLayout>-->
<ImageView
android:id="@+id/tv_home"
android:layout_width="@dimen/dp_60"
@@ -364,34 +316,6 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- <androidx.cardview.widget.CardView-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="bottom"-->
<!-- android:layout_marginLeft="@dimen/dp_12"-->
<!-- android:layout_marginTop="-46dp"-->
<!-- android:layout_marginRight="@dimen/dp_12"-->
<!-- app:cardCornerRadius="10dp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/me_linearlayout3"-->
<!-- tools:layout_editor_absoluteX="13dp">-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:gravity="center_vertical"-->
<!-- android:layout_marginTop="-50dp"-->
<!-- android:layout_marginStart="@dimen/dp_16"-->
<!-- android:layout_marginEnd="@dimen/dp_16">-->
<!-- <ImageView-->
<!-- android:id="@+id/im_my_room"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="@dimen/dp_67"-->
<!-- android:src="@mipmap/me_wallet_icon"/>-->
<!-- </LinearLayout>-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_noble_title"
android:layout_width="match_parent"

View File

@@ -112,20 +112,5 @@
android:background="@color/color_transparent"/>
</LinearLayout>
<RelativeLayout
android:id="@+id/cool_wait_view"
android:visibility="gone"
android:clickable="true"
android:focusable="true"
android:layout_width="match_parent"
android:layout_height="match_parent">
<app.dinus.com.loadingdrawable.LoadingView
android:layout_width="@dimen/dp_100"
android:layout_height="@dimen/dp_100"
android:layout_centerInParent="true"
android:background="@drawable/ps_ic_shadow_bg"
app:loading_renderer="CoolWaitLoadingRenderer" />
</RelativeLayout>
</RelativeLayout>
</layout>

View File

@@ -46,11 +46,12 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
<com.xscm.moduleutil.widget.ShineTextView
android:id="@+id/dy_name_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_FF333333"
app:isShine="false"
android:textStyle="bold"
android:text="萌新驾到"
android:textSize="18sp" />

View File

@@ -2,14 +2,14 @@
<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:id="@+id/item"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16">
<com.xscm.moduleutil.widget.GifAvatarOvalView
<com.xscm.moduleutil.utils.MeHeadView
android:id="@+id/like_avatar"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50"
@@ -17,17 +17,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:riv_oval="true" />
<ImageView
android:id="@+id/im_i"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/zc"
app:layout_constraintStart_toStartOf="@+id/like_avatar"
app:layout_constraintBottom_toBottomOf="@+id/like_avatar"
app:layout_constraintEnd_toEndOf="@+id/like_avatar"
/>
app:layout_constraintStart_toStartOf="@+id/like_avatar" />
<TextView
<com.xscm.moduleutil.widget.ShineTextView
android:id="@+id/tv_nickname"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_21"
@@ -35,6 +35,7 @@
android:text="用户名"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_12"
app:isShine="false"
app:layout_constraintStart_toEndOf="@+id/like_avatar"
app:layout_constraintTop_toTopOf="@+id/like_avatar" />

View File

@@ -42,27 +42,14 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_main_title" />
<!-- <LinearLayout-->
<!-- android:id="@+id/video_container"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="160dp"-->
<!-- android:layout_alignParentTop="true"-->
<!-- android:orientation="horizontal"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/tv_main_title">-->
<!-- </LinearLayout>-->
<ImageView
android:id="@+id/im"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/iv_exit"
app:layout_constraintStart_toStartOf="parent"
android:scaleType="fitXY"
android:src="@mipmap/xiaohei_bj"
android:scaleType="fitXY"/>
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv_exit" />
<TextView
android:id="@+id/dating_time"
@@ -86,11 +73,10 @@
android:id="@+id/cl_2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="@+id/im"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/im"
app:layout_constraintBottom_toBottomOf="@+id/im"
>
app:layout_constraintTop_toTopOf="@+id/im">
<com.xscm.moduleutil.widget.RoomMakeWheatView
@@ -102,61 +88,26 @@
app:layout_constraintTop_toTopOf="parent"
app:room_make_wheat_number="000" />
<!-- <com.qxcm.moduleutil.widget.GifAvatarOvalView-->
<!-- android:id="@+id/riv_room"-->
<!-- android:layout_width="@dimen/dp_60"-->
<!-- android:layout_height="@dimen/dp_70"-->
<!-- android:layout_marginStart="@dimen/dp_35"-->
<!-- android:src="@mipmap/default_avatar"-->
<!-- app:gav_border_color="#404F8591"-->
<!-- app:gav_border_width="@dimen/dp_5"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- app:riv_border_color="#404F8591"-->
<!-- app:riv_border_width="@dimen/dp_5"-->
<!-- app:riv_oval="true"-->
<!-- tools:src="@mipmap/default_avatar"/>-->
<!-- <TextView-->
<!-- android:id="@+id/user_name"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="房间号"-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="14sp"-->
<!-- app:layout_constraintEnd_toEndOf="@+id/riv_room"-->
<!-- app:layout_constraintStart_toStartOf="@+id/riv_room"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/riv_room" />-->
<FrameLayout
<RelativeLayout
android:id="@+id/fl_heart_value2"
android:layout_width="@dimen/dp_180"
android:layout_height="@dimen/dp_85"
android:layout_gravity="center_vertical|center_horizontal|center"
app:layout_constraintBottom_toBottomOf="@+id/room_make_wheat1"
app:layout_constraintEnd_toStartOf="@+id/room_make_wheat2"
app:layout_constraintStart_toEndOf="@+id/room_make_wheat1"
app:layout_constraintTop_toTopOf="@+id/room_make_wheat1"
>
<!-- <ImageView-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="@dimen/dp_20"-->
<!-- android:layout_gravity="center_vertical|center_horizontal"-->
<!-- android:src="@mipmap/cxian" />-->
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_heart_value2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical|center_horizontal"
android:src="@mipmap/dating_heart_line2" />
<TextView
android:id="@+id/tv_heart_value2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal"
android:layout_centerInParent="true"
android:shadowColor="#40b40066"
android:shadowDx="0"
android:shadowDy="1"
@@ -164,7 +115,7 @@
android:textColor="@color/white"
android:textSize="@dimen/sp_18"
tools:text="1000000" />
</FrameLayout>
</RelativeLayout>
<com.xscm.moduleutil.widget.RoomMakeWheatView
android:id="@+id/room_make_wheat2"
@@ -174,46 +125,9 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:room_make_wheat_number="000" />
<!-- <com.qxcm.moduleutil.widget.GifAvatarOvalView-->
<!-- android:id="@+id/riv_room2"-->
<!-- android:layout_width="@dimen/dp_60"-->
<!-- android:layout_height="@dimen/dp_60"-->
<!-- android:layout_marginEnd="@dimen/dp_35"-->
<!-- android:src="@mipmap/default_avatar"-->
<!-- app:gav_border_color="#404F8591"-->
<!-- app:gav_border_width="@dimen/dp_5"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- app:riv_border_color="#404F8591"-->
<!-- app:riv_border_width="@dimen/dp_5"-->
<!-- app:riv_oval="true" />-->
<!-- <TextView-->
<!-- android:id="@+id/user_name2"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="房间号"-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="14sp"-->
<!-- app:layout_constraintEnd_toEndOf="@+id/riv_room2"-->
<!-- app:layout_constraintStart_toStartOf="@+id/riv_room2"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/riv_room2" />-->
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/rv_gift"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="@dimen/dp_140"-->
<!-- android:layout_marginStart="@dimen/dp_16"-->
<!-- android:layout_marginTop="@dimen/dp_60"-->
<!-- android:layout_marginEnd="@dimen/dp_16"-->
<!-- android:visibility="gone"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/cl_2"-->
<!-- tools:listitem="@layout/room_gift_wall_item" />-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -248,28 +162,5 @@
android:src="@mipmap/gongxiang" />
</LinearLayout>
<!-- <com.qxcm.moduleutil.widget.DropView-->
<!-- android:id="@+id/drop_view"-->
<!-- android:layout_width="@dimen/dp_240"-->
<!-- android:layout_height="@dimen/dp_135"-->
<!-- android:background="@drawable/bg_r6_000000"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <FrameLayout-->
<!-- android:id="@+id/fl_screenshare"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- />-->
<!-- <ImageView-->
<!-- android:layout_width="@dimen/dp_18"-->
<!-- android:layout_height="@dimen/dp_18"-->
<!-- android:layout_gravity="center|bottom"-->
<!-- android:layout_marginEnd="@dimen/dp_16"-->
<!-- android:src="@mipmap/quan" />-->
<!-- </com.qxcm.moduleutil.widget.DropView>-->
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

View File

@@ -128,10 +128,10 @@
app:tl_indicator_corner_radius="@dimen/dp_3"
app:tl_indicator_drawable="@color/transparent"
app:tl_indicator_height="@dimen/dp_6"
app:tl_tab_padding="@dimen/dp_10"
app:tl_indicator_margin_bottom="@dimen/dp_3"
app:tl_indicator_width="0dp"
app:tl_showCateIndicator="false"
app:tl_tab_width="@dimen/dp_50"
app:tl_textBold="SELECT"
app:tl_textSelectColor="@color/white"
app:tl_textSelectedSize="@dimen/sp_14"

View File

@@ -63,7 +63,8 @@
app:layout_constraintEnd_toEndOf="@id/view_top2"
app:layout_constraintStart_toStartOf="@id/view_top2"/>
<TextView
<com.xscm.moduleutil.widget.ShineTextView
app:isShine="false"
android:id="@+id/room_top2_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -167,9 +168,10 @@
app:layout_constraintTop_toBottomOf="@+id/room_top2_name"
android:visibility="gone"/>
<TextView
<com.xscm.moduleutil.widget.ShineTextView
android:id="@+id/room_top1_name"
android:layout_width="0dp"
app:isShine="false"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:ellipsize="end"
@@ -207,7 +209,8 @@
app:layout_constraintTop_toBottomOf="@+id/room_top1_name"
android:visibility="gone"/>
<TextView
<com.xscm.moduleutil.widget.ShineTextView
app:isShine="false"
android:id="@+id/room_top3_name"
android:layout_width="0dp"
android:layout_height="wrap_content"

View File

@@ -46,7 +46,8 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.20">
<TextView
<com.xscm.moduleutil.widget.ShineTextView
app:isShine="false"
android:id="@+id/room_item_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

View File

@@ -46,9 +46,10 @@
android:layout_marginEnd="@dimen/dp_12"
android:background="@mipmap/gsui" />
<TextView
<com.xscm.moduleutil.widget.ShineTextView
android:id="@+id/tv_nick_name"
android:layout_width="wrap_content"
app:isShine="false"
android:layout_height="@dimen/dp_24"
android:layout_below="@+id/riv_user_head"
android:layout_marginStart="@dimen/dp_15"

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
</resources>