From 63608b5dca9eebb6fa2cb1a8652b395f1d910c3e Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期一, 02 九月 2024 13:52:17 +0800
Subject: [PATCH] 对新接口进行了适配
---
app/src/main/res/layout/item_privacy.xml | 180 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 98 insertions(+), 82 deletions(-)
diff --git a/app/src/main/res/layout/item_privacy.xml b/app/src/main/res/layout/item_privacy.xml
index 30778e5..64cd944 100644
--- a/app/src/main/res/layout/item_privacy.xml
+++ b/app/src/main/res/layout/item_privacy.xml
@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools">
<data>
+ <import type="android.text.TextUtils" />
<variable
name="bean"
type="com.application.zhangshi_app_android.bean.PrivacyBean" />
@@ -19,7 +20,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -30,52 +31,84 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_title"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_40"
+ android:layout_height="40dp"
android:gravity="center_vertical">
- <TextView
- android:id="@+id/textView2"
- android:layout_width="wrap_content"
+ <androidx.appcompat.widget.AppCompatTextView
+ android:id="@+id/textView1"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginStart="24dp"
+ android:layout_marginStart="20dp"
android:text="@{bean.type}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_16"
- android:textStyle="bold"
+ android:textSize="16sp"
+ android:gravity="start|center_vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- tools:text="鎴夸骇璇�" />
+ app:layout_constraintEnd_toStartOf="@id/textView2"
+ app:layout_constraintHorizontal_weight="1.5"
+ android:ellipsize="end"
+ android:maxLines="1"
+ app:autoSizeTextType="uniform"
+ app:autoSizeMaxTextSize="16sp"
+ app:autoSizeMinTextSize="12sp"
+ app:layout_constraintHorizontal_chainStyle="spread_inside"
+ tools:text="閭エ" />
- <TextView
- android:layout_width="wrap_content"
+ <androidx.appcompat.widget.AppCompatTextView
+ android:id="@+id/textView2"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center"
- android:text="@{bean.account}"
- android:textColor="@color/black"
- android:textSize="@dimen/sp_16"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.45"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:text="寮犱笁" />
-
- <TextView
- android:id="@+id/tv_time"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{bean.time}"
+ android:text="@{bean.accNo}"
android:textColor="@color/black"
android:textSize="16sp"
- android:layout_marginEnd="20dp"
- android:textStyle="bold"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toStartOf="@+id/tv_time"
+ app:layout_constraintStart_toEndOf="@+id/textView1"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintHorizontal_weight="2"
+ android:layout_marginHorizontal="20dp"
+ android:ellipsize="end"
+ android:maxLines="1"
+ app:autoSizeTextType="uniform"
+ app:autoSizeMaxTextSize="16sp"
+ app:autoSizeMinTextSize="12sp"
+ tools:text="寮犱笁" />
+
+ <androidx.appcompat.widget.AppCompatTextView
+ android:id="@+id/tv_time"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:text="@{bean.happenTime}"
+ android:textColor="@color/black"
+ android:textSize="16sp"
+ android:layout_marginEnd="10dp"
+ android:gravity="center_vertical|center"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/iv_fold"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toEndOf="@id/textView2"
+ app:layout_constraintHorizontal_weight="2"
+ android:maxLines="1"
+ android:ellipsize="end"
+ app:autoSizeTextType="uniform"
+ app:autoSizeMaxTextSize="16sp"
+ app:autoSizeMinTextSize="12sp"
+ tools:text="2019-01-12"
+ />
+ <ImageView
+ android:id="@+id/iv_fold"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_fold"
+ app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:text="2019-01-12" />
+ android:layout_marginEnd="10dp"
+ />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -90,206 +123,189 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_6"
+ android:layout_marginBottom="6dp"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="璐﹀彿锛�"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.account}"
+ android:text="@{bean.accNo}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_6"
+ android:layout_marginBottom="6dp"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="瀵嗙爜锛�"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{bean.password}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_6"
+ android:layout_marginBottom="6dp"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鏈夋晥鏃堕棿锛�"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.effectiveTime}"
+ android:text="@{bean.validityDate}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_6"
+ android:layout_marginBottom="6dp"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鏄惁寮�鍚寚绾癸細"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.isFingerprint==1?`鏄痐:`鍚}"
+ android:text="@{bean.isFinger}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_6"
+ android:layout_marginBottom="6dp"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鏄惁寮�鍚汉鑴歌瘑鍒細"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.isFace==1?`鏄痐:`鍚}"
+ android:text="@{bean.isFace}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_6"
+ android:layout_marginBottom="6dp"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="绉佹湁/鍏湁锛�"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.isPublic==1?`鍏湁`:`绉佹湁`}"
+ android:text="@{bean.isPrivate}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_6"
+ android:layout_marginBottom="6dp"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="瀛樻斁浣嶇疆锛�"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.location}"
+ android:text="@{TextUtils.isEmpty(bean.location) ? `鈥斺�擿 : bean.location}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_6"
+ android:layout_marginBottom="6dp"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="澶囨敞锛�"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{bean.remark}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/dp_6"
+ android:layout_marginBottom="6dp"
android:text="鐢靛瓙鏂囦欢锛�"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_15"
+ android:layout_marginBottom="15dp"
>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- tools:listitem="@layout/item_image"
+ tools:listitem="@layout/item_electronic_file"
tools:itemCount="3"
/>
--
Gitblit v1.9.1