1.定位的修改

This commit is contained in:
2025-09-26 14:22:48 +08:00
committed by 梁小江
parent 393c59dd1b
commit 77a1d910f0
8 changed files with 326 additions and 196 deletions

View File

@@ -215,6 +215,8 @@ dependencies {
api 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
api 'io.github.mayzs:paho.mqtt.android:1.2.1'
// room数据库
// def room_version = "2.5.0"
// implementation "androidx.room:room-runtime:$room_version"

View File

@@ -62,7 +62,6 @@
app:layout_constraintTop_toBottomOf="@+id/tv_gz" />
<TextView
android:visibility="gone"
android:id="@+id/tv_time1"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_28"
@@ -77,7 +76,6 @@
tools:text="1" />
<TextView
android:visibility="gone"
android:id="@+id/tv_time2"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_28"
@@ -92,7 +90,6 @@
tools:text="3" />
<TextView
android:visibility="gone"
android:id="@+id/tv_time_m"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_28"
@@ -112,7 +109,6 @@
android:layout_marginStart="@dimen/dp_5"
android:background="@mipmap/time_b"
android:gravity="center"
android:visibility="gone"
android:textColor="#00F3D3"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/tv_bd"
@@ -121,7 +117,6 @@
tools:text="1" />
<TextView
android:visibility="gone"
android:id="@+id/tv_time4"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_28"
@@ -133,162 +128,16 @@
app:layout_constraintBottom_toBottomOf="@+id/tv_bd"
app:layout_constraintStart_toEndOf="@+id/tv_time3"
app:layout_constraintTop_toTopOf="@+id/tv_bd"
tools:text="8" />
<LinearLayout
android:layout_marginTop="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_15"
app:layout_constraintTop_toBottomOf="@+id/tv_jc"
app:layout_constraintLeft_toRightOf="@+id/tv_time4"
android:id="@+id/gift_l4"
android:layout_width="@dimen/dp_56"
android:layout_height="@dimen/dp_73"
android:orientation="vertical"
/>
<com.xscm.moduleutil.widget.GifAvatarOvalView
android:id="@+id/iv_homeowner_bg"
android:background="@color/_000000"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_58"
app:layout_constraintStart_toStartOf="@+id/gift_l4"
app:layout_constraintEnd_toEndOf="@+id/gift_l4"
app:layout_constraintTop_toTopOf="@+id/gift_l4"
android:layout_marginTop="@dimen/dp_2"
android:scaleType="fitCenter"/>
<ImageView
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_58"
app:layout_constraintStart_toStartOf="@+id/gift_l4"
app:layout_constraintEnd_toEndOf="@+id/gift_l4"
app:layout_constraintTop_toTopOf="@+id/gift_l4"
android:layout_marginBottom="@dimen/dp_2"
android:src="@mipmap/xlh_image"
android:scaleType="fitCenter"/>
<TextView
android:id="@+id/tv_homeowner_name"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_14"
app:layout_constraintStart_toStartOf="@+id/gift_l4"
app:layout_constraintEnd_toEndOf="@+id/gift_l4"
app:layout_constraintBottom_toBottomOf="@+id/gift_l4"
tools:text="时尚的金针菇"
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/sp_10"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_35"
android:background="@drawable/bg_round_corner"
android:text="房主"
android:textColor="#FFE554"
android:textSize="@dimen/sp_12"
app:layout_constraintLeft_toLeftOf="@+id/iv_homeowner_bg"
app:layout_constraintRight_toRightOf="@+id/iv_homeowner_bg"
app:layout_constraintTop_toTopOf="@+id/iv_homeowner_bg" />
<androidx.constraintlayout.widget.ConstraintLayout
android:visibility="gone"
android:layout_marginTop="@dimen/dp_21"
app:layout_constraintLeft_toLeftOf="parent"
android:layout_marginLeft="@dimen/dp_40"
app:layout_constraintTop_toBottomOf="@+id/tv_homeowner_name"
android:id="@+id/gift_l5"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.xscm.moduleutil.widget.GifAvatarOvalView
app:layout_constraintRight_toRightOf="parent"
android:background="@color/read_dot_bg"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:id="@+id/iv_lucky_person"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_80"
android:layout_marginTop="@dimen/dp_2"
android:scaleType="fitCenter"/>
<ImageView
app:layout_constraintRight_toRightOf="@+id/iv_lucky_person"
app:layout_constraintBottom_toBottomOf="@+id/iv_lucky_person"
app:layout_constraintTop_toTopOf="@+id/iv_lucky_person"
app:layout_constraintLeft_toLeftOf="@+id/iv_lucky_person"
android:layout_width="@dimen/dp_94"
android:layout_height="@dimen/dp_90"
android:layout_marginBottom="@dimen/dp_2"
android:src="@mipmap/xlh_image"
android:scaleType="fitCenter"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_65"
android:background="@drawable/bg_round_corner"
android:text="幸运者"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintLeft_toLeftOf="@+id/iv_lucky_person"
app:layout_constraintRight_toRightOf="@+id/iv_lucky_person"
app:layout_constraintTop_toTopOf="@+id/iv_lucky_person" />
<TextView
android:layout_marginTop="@dimen/dp_23"
android:text="烟花易冷"
android:textColor="@color/white"
android:gravity="center"
app:layout_constraintRight_toRightOf="@+id/iv_lucky_person"
app:layout_constraintLeft_toLeftOf="@+id/iv_lucky_person"
app:layout_constraintTop_toBottomOf="@+id/iv_lucky_person"
android:layout_width="0dp"
android:layout_height="wrap_content"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
app:layout_constraintRight_toLeftOf="@+id/tv_gz"
app:layout_constraintTop_toTopOf="@+id/iv_homeowner_bg"
android:layout_width="wrap_content"
android:layout_marginRight="@dimen/dp_46"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/iv_iv_bg"
android:layout_width="@dimen/dp_36"
android:layout_height="@dimen/dp_36"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:src="@mipmap/ic_launcher"
android:scaleType="fitCenter"/>
<ImageView
android:id="@+id/iv_bg"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_width="@dimen/dp_48"
android:background="@mipmap/xlh_g_2"
android:layout_height="@dimen/dp_60"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:visibility="gone"
android:id="@+id/cl_gift"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_195"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintEnd_toEndOf="parent"
android:background="@mipmap/tour_zj_bj"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_bd">
@@ -432,7 +281,7 @@
android:layout_marginBottom="@dimen/dp_15"
android:orientation="horizontal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintTop_toBottomOf="@+id/gift_l5"
app:layout_constraintTop_toBottomOf="@+id/cl_gift"
app:layout_constraintBottom_toTopOf="@+id/exchange_layout"
/>
@@ -464,6 +313,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/exchange_layout"
app:layout_constraintBottom_toBottomOf="@+id/exchange_layout"
android:visibility="gone"
/>
<View