From a5d862051462a5fcc2717b405896a6d424002e54 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 22 十二月 2020 15:43:06 +0800
Subject: [PATCH] 1. 调整了数控实体的存储位置； 2. 新增数据表“媒体文件类型别名表”； 3. 修改任意拍模块，将图片分类改为根据场景类型动态生成，同时新增修改分类别名功能； 4. 优化子任务选择界面的任务排序方式，按照“待开始”、“执行中”、“未执行”的顺序进行排序；
---
app/src/main/res/layout/dialog_take_evidence.xml | 108 +++++++++++++++++++++++++++++++----------------------
1 files changed, 63 insertions(+), 45 deletions(-)
diff --git a/app/src/main/res/layout/dialog_take_evidence.xml b/app/src/main/res/layout/dialog_take_evidence.xml
index 94a7037..b98715b 100644
--- a/app/src/main/res/layout/dialog_take_evidence.xml
+++ b/app/src/main/res/layout/dialog_take_evidence.xml
@@ -2,7 +2,8 @@
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ xmlns:tools="http://schemas.android.com/tools">
<android.support.design.widget.FloatingActionButton
android:src="@drawable/icon_close_white"
@@ -64,9 +65,9 @@
android:id="@+id/tv_dialog_take_evidence_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鏂板闂"
+ android:text="闂鍙栬瘉"
android:textColor="@color/primary_text"
- android:textSize="18dp" />
+ android:textSize="18sp" />
</LinearLayout>
<TextView
@@ -80,8 +81,9 @@
android:id="@+id/sp_take_evidence_select_problem_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="-7dp"
- android:layout_marginRight="-7dp"></Spinner>
+ android:layout_marginTop="@dimen/dimen4"
+ style="@style/SpinnerStyle.Black"
+ tools:listitem="@layout/item_spinner_drop_down" />
<TextView
android:id="@+id/tv_chose"
@@ -94,15 +96,16 @@
android:id="@+id/sp_take_evidence_select_problem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="-7dp"
- android:layout_marginRight="-7dp"></Spinner>
+ android:layout_marginTop="@dimen/dimen4"
+ style="@style/SpinnerStyle.Black"
+ tools:listitem="@layout/item_spinner_drop_down"/>
<EditText
android:id="@+id/et_take_evidence_problem_des"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
android:hint="闂鎻忚堪(鍙��)"
+ android:textSize="@dimen/textSize_14"
android:visibility="visible" />
<TextView
@@ -116,14 +119,16 @@
android:id="@+id/sp_take_evidence_select_location"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="-7dp"
- android:layout_marginRight="-7dp"></Spinner>
+ android:layout_marginTop="@dimen/dimen4"
+ style="@style/SpinnerStyle.Black"
+ tools:listitem="@layout/item_spinner_drop_down"/>
<EditText
android:id="@+id/et_take_evidence_location"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="浣嶇疆澶囨敞(鍙��)" />
+ android:hint="浣嶇疆澶囨敞(鍙��)"
+ android:textSize="@dimen/textSize_14"/>
<LinearLayout
android:id="@+id/ll_change_suggestion"
@@ -142,50 +147,63 @@
android:id="@+id/sp_take_evidence_select_suggestion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="-7dp"
- android:layout_marginRight="-7dp">
- </Spinner>
+ android:layout_marginTop="@dimen/dimen4"
+ style="@style/SpinnerStyle.Black"
+ tools:listitem="@layout/item_spinner_drop_down"/>
<EditText
android:id="@+id/et_take_evidence_suggestion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="鏁存敼寤鸿(鍙��)" />
+ android:hint="鏁存敼寤鸿(鍙��)"
+ android:textSize="@dimen/textSize_14"/>
</LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="10dp"
- android:layout_marginTop="10dp"
- android:orientation="horizontal">
+ <android.support.constraint.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="10dp"
+ android:layout_marginTop="10dp"
+ android:orientation="horizontal">
- <ImageView
- android:id="@+id/iv_take_evidence_add_photo1"
- android:layout_width="60dp"
- android:layout_height="60dp"
- android:layout_marginTop="6dp"
- android:scaleType="centerCrop"
- android:src="@drawable/icon_add_photo" />
+ <ImageView
+ android:id="@+id/iv_take_evidence_add_photo1"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:scaleType="fitCenter"
+ android:src="@drawable/icon_add_photo"
+ android:layout_marginEnd="@dimen/dimen8"
+ app:layout_constraintDimensionRatio="W, 1:1"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/iv_take_evidence_add_photo2"
+ app:layout_constraintTop_toTopOf="parent"/>
- <ImageView
- android:id="@+id/iv_take_evidence_add_photo2"
- android:layout_width="60dp"
- android:layout_height="60dp"
- android:layout_marginLeft="10dp"
- android:layout_marginTop="6dp"
- android:scaleType="centerCrop"
- android:src="@drawable/icon_add_photo_blank" />
+ <ImageView
+ android:id="@+id/iv_take_evidence_add_photo2"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:scaleType="fitCenter"
+ android:src="@drawable/icon_add_photo_blank"
+ android:layout_marginEnd="@dimen/dimen8"
+ app:layout_constraintDimensionRatio="W, 1:1"
+ app:layout_constrainedWidth="true"
+ app:layout_constraintStart_toEndOf="@id/iv_take_evidence_add_photo1"
+ app:layout_constraintEnd_toStartOf="@id/iv_take_evidence_add_photo3"
+ app:layout_constraintTop_toTopOf="parent"/>
- <ImageView
- android:id="@+id/iv_take_evidence_add_photo3"
- android:layout_width="60dp"
- android:layout_height="60dp"
- android:layout_marginLeft="10dp"
- android:layout_marginTop="6dp"
- android:scaleType="centerCrop"
- android:src="@drawable/icon_add_photo_blank" />
- </LinearLayout>
+ <ImageView
+ android:id="@+id/iv_take_evidence_add_photo3"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:scaleType="fitCenter"
+ android:src="@drawable/icon_add_photo_blank"
+ app:layout_constraintDimensionRatio="W, 1:1"
+ app:layout_constrainedWidth="true"
+ app:layout_constraintStart_toEndOf="@id/iv_take_evidence_add_photo2"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"/>
+ </android.support.constraint.ConstraintLayout>
+
</LinearLayout>
</ScrollView>
</android.support.v7.widget.CardView>
--
Gitblit v1.9.3