From efafbbf142c81c233c71de636a2d3ce9dc2124f0 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 12 九月 2023 19:20:05 +0800
Subject: [PATCH] 修复bug
---
app/src/main/res/layout/activity_certificate_of_honor.xml | 256 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 216 insertions(+), 40 deletions(-)
diff --git a/app/src/main/res/layout/activity_certificate_of_honor.xml b/app/src/main/res/layout/activity_certificate_of_honor.xml
index cbc1500..f00f761 100644
--- a/app/src/main/res/layout/activity_certificate_of_honor.xml
+++ b/app/src/main/res/layout/activity_certificate_of_honor.xml
@@ -1,7 +1,8 @@
<?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">
+ xmlns:tools="http://schemas.android.com/tools"
+ >
<data>
<variable
@@ -10,10 +11,12 @@
</data>
<androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/parentLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
-
+ android:background="@color/color_normal_background"
+ android:orientation="vertical"
+ >
<com.android.app_base.widget.ExtendTitleBar
android:id="@+id/titleBar"
android:layout_width="match_parent"
@@ -34,32 +37,6 @@
android:background="@drawable/ic_operate"
/>
</FrameLayout>
-
- <LinearLayout
- android:id="@+id/layout_default"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginHorizontal="56dp"
- android:gravity="center_vertical"
- >
- <TextView
- android:id="@+id/tv_title"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:text="鐧惧勾蹇冩効(浠呬緵鍙傝��)"
- android:layout_weight="1"
- android:textColor="@color/white"
- android:textSize="@dimen/sp_20"
- />
- <ImageView
- android:id="@+id/iv_search_default"
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_search"
- />
- </LinearLayout>
-
<LinearLayout
android:id="@+id/layout_search"
android:layout_width="match_parent"
@@ -87,9 +64,11 @@
android:textColor="#61000000"
android:background="@null"
android:imeOptions="actionSearch"
- android:text=""
android:singleLine="true"
- android:hint="鍦ㄢ�滃澶т簨璁板唴鎼滅储鈥�"
+ android:text="鍦ㄢ�滆崳瑾夎瘉涔︹�滃唴鎼滅储"
+ android:editable="false"
+ android:focusable="false"
+ android:clickable="false"
/>
<ImageView
android:id="@+id/iv_search_type"
@@ -99,14 +78,40 @@
/>
</LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_default"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginHorizontal="56dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:id="@+id/tv_title"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="16dp"
+ android:text="鑽ｈ獕璇佷功濂栭」锛堜粎渚涙煡鐪嬶級"
+ android:textColor="@color/white"
+ android:layout_weight="1"
+ android:textSize="20sp"
+ app:textOverflowMode="@{4}"
+ />
+ <ImageView
+ android:id="@+id/iv_search_default"
+ android:layout_width="@dimen/dp_24"
+ android:layout_height="@dimen/dp_24"
+ android:background="@drawable/ic_search"
+ android:layout_marginStart="20dp"
+ />
+ </LinearLayout>
</com.android.app_base.widget.ExtendTitleBar>
-
<LinearLayout
android:id="@+id/layout_data_null"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center"
+ android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -121,23 +126,194 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
- android:text="鏆傛椂杩樻病鏈夋暟鎹摝~\n鐐瑰嚮鈥濓紜鈥濈珛鍗冲垱寤�"
+ android:text="鏆傛椂杩樻病鏈夋暟鎹摝~"
android:textSize="14sp"
android:textColor="#73000000"
/>
</LinearLayout>
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/recyclerView"
+ <com.scwang.smart.refresh.layout.SmartRefreshLayout
+ android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:background="@color/color_normal_background"
- app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/titleBar"
- app:layout_constraintVertical_bias="1.0"
- tools:itemCount="20"
- />
+ app:layout_constraintBottom_toBottomOf="parent"
+ >
+ <com.scwang.smart.refresh.header.MaterialHeader
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ />
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/recyclerView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:itemCount="20"
+ tools:listitem="@layout/item_family_assets"
+ />
+ <com.scwang.smart.refresh.footer.BallPulseFooter
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+ </com.scwang.smart.refresh.layout.SmartRefreshLayout>
+
+ <RelativeLayout
+ android:id="@+id/container_search_parameter"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintTop_toBottomOf="@id/titleBar"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:layout_marginTop="-4dp"
+ tools:layout_height="wrap_content"
+ >
+ <LinearLayout
+ android:id="@+id/layout_search_parameter"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/white"
+ android:layout_marginHorizontal="56dp"
+ android:paddingEnd="12dp"
+ android:paddingStart="5dp"
+ >
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:background="#FF939393" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:gravity="center">
+
+ <androidx.appcompat.widget.AppCompatTextView
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:text="绫诲瀷"
+ android:textColor="#FF333333"
+ android:textSize="14sp"
+ android:gravity="center"
+ android:maxLines="1"
+ app:autoSizeTextType="uniform"
+ app:autoSizeMinTextSize="10sp"
+ app:autoSizeMaxTextSize="14sp"
+ />
+
+ <com.android.app_base.widget.ClearEditText
+ android:layout_width="0dp"
+ android:layout_weight="4"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:inputType="text"
+ android:layout_marginStart="6dp"
+ android:text="@={viewModel.requestBeanLiveData.type}"
+ android:hint="璇疯緭鍏ョ被鍨�"
+ android:textColorHint="#61000000"
+ android:textColor="#FF333333"
+ android:textSize="14sp"
+ android:maxLines="1"
+ app:autoSizeTextType="uniform"
+ app:autoSizeMinTextSize="10sp"
+ app:autoSizeMaxTextSize="14sp"
+ app:background="@drawable/ic_clear"
+ />
+
+
+ </LinearLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.3dp"
+ android:background="#FF939393" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:gravity="center">
+
+ <androidx.appcompat.widget.AppCompatTextView
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:text="鍚嶇О"
+ android:textColor="#FF333333"
+ android:textSize="14sp"
+ android:gravity="center"
+ android:maxLines="1"
+ app:autoSizeTextType="uniform"
+ app:autoSizeMinTextSize="10sp"
+ app:autoSizeMaxTextSize="14sp"
+ />
+
+ <com.android.app_base.widget.ClearEditText
+ android:layout_width="0dp"
+ android:layout_weight="4"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:inputType="text"
+ android:layout_marginStart="6dp"
+ android:text="@={viewModel.requestBeanLiveData.name}"
+ android:hint="璇疯緭鍏ュ悕绉�"
+ android:textColorHint="#61000000"
+ android:textColor="#FF333333"
+ android:textSize="14sp"
+ android:maxLines="1"
+ app:autoSizeTextType="uniform"
+ app:autoSizeMinTextSize="10sp"
+ app:autoSizeMaxTextSize="14sp"
+ app:background="@drawable/ic_clear"
+ />
+
+ </LinearLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.3dp"
+ android:background="#FF939393" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:gravity="center">
+
+ <androidx.appcompat.widget.AppCompatTextView
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:text="绾у埆"
+ android:textColor="#FF333333"
+ android:textSize="14sp"
+ android:gravity="center"
+ android:maxLines="1"
+ android:lines="1"
+ app:autoSizeTextType="uniform"
+ app:autoSizeMinTextSize="10sp"
+ app:autoSizeMaxTextSize="14sp"
+ />
+
+ <com.android.app_base.widget.ClearEditText
+ android:layout_width="0dp"
+ android:layout_weight="4"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:inputType="text"
+ android:layout_marginStart="6dp"
+ android:text="@={viewModel.requestBeanLiveData.grade}"
+ android:hint="璇疯緭鍏ョ骇鍒�"
+ android:textColorHint="#61000000"
+ android:textColor="#FF333333"
+ android:textSize="14sp"
+ android:maxLines="1"
+ app:autoSizeTextType="uniform"
+ app:autoSizeMinTextSize="10sp"
+ app:autoSizeMaxTextSize="14sp"
+ app:background="@drawable/ic_clear"
+ />
+ </LinearLayout>
+ </LinearLayout>
+
+ </RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
--
Gitblit v1.9.1