|
|
@@ -1,5 +1,6 @@
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
|
|
|
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
+ xmlns:app="http://schemas.android.com/apk/res-auto">
|
|
|
|
|
|
<LinearLayout
|
|
|
android:layout_width="@dimen/dialog_common_root_width"
|
|
|
@@ -19,7 +20,7 @@
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_weight="1"
|
|
|
- android:text="@string/point_manage_add_title"
|
|
|
+ android:text="@string/filter"
|
|
|
android:textColor="@color/black"
|
|
|
android:textSize="@dimen/common_btn_text_size" />
|
|
|
|
|
|
@@ -36,170 +37,177 @@
|
|
|
android:layout_height="@dimen/divider_line_space"
|
|
|
android:background="@color/black" />
|
|
|
|
|
|
- <LinearLayout
|
|
|
+ <androidx.constraintlayout.widget.ConstraintLayout
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="match_parent"
|
|
|
android:layout_weight="1"
|
|
|
android:orientation="vertical">
|
|
|
|
|
|
- <LinearLayout
|
|
|
- android:layout_width="match_parent"
|
|
|
+ <com.grkj.ui_base.widget.RequiredTextView
|
|
|
+ android:id="@+id/point_name_tv_title"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
+ android:layout_marginLeft="@dimen/dialog_content_normal_padding_horizontal"
|
|
|
android:layout_marginTop="@dimen/common_spacing_2x"
|
|
|
- android:gravity="center_vertical"
|
|
|
- android:orientation="horizontal"
|
|
|
- android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
|
|
|
-
|
|
|
- <TextView
|
|
|
- android:layout_width="wrap_content"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:text="@string/point_manage_point_name"
|
|
|
- android:textColor="@color/black"
|
|
|
- android:textSize="@dimen/common_text_size" />
|
|
|
-
|
|
|
- <EditText
|
|
|
- android:id="@+id/point_name_tv"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:layout_marginLeft="@dimen/common_spacing"
|
|
|
- android:background="@drawable/bg_common_input"
|
|
|
- android:hint="@string/please_input_point_name"
|
|
|
- android:maxLines="1"
|
|
|
- android:paddingHorizontal="@dimen/common_spacing"
|
|
|
- android:paddingVertical="2dp"
|
|
|
- android:singleLine="true"
|
|
|
- android:textColor="@color/black"
|
|
|
- android:textSize="@dimen/common_text_size" />
|
|
|
- </LinearLayout>
|
|
|
-
|
|
|
- <LinearLayout
|
|
|
- android:layout_width="match_parent"
|
|
|
+ android:text="@string/point_manage_point_name"
|
|
|
+ android:textColor="@color/black"
|
|
|
+ android:textSize="@dimen/common_text_size"
|
|
|
+ app:layout_constraintLeft_toLeftOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="parent"
|
|
|
+ app:markPosition="end"
|
|
|
+ app:required="true" />
|
|
|
+
|
|
|
+ <EditText
|
|
|
+ android:id="@+id/point_name_tv"
|
|
|
+ android:layout_width="0dp"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginLeft="@dimen/common_spacing"
|
|
|
+ android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
|
|
|
+ android:background="@drawable/bg_common_input"
|
|
|
+ android:hint="@string/please_input_point_name"
|
|
|
+ android:maxLines="1"
|
|
|
+ android:paddingHorizontal="@dimen/common_spacing"
|
|
|
+ android:paddingVertical="2dp"
|
|
|
+ android:singleLine="true"
|
|
|
+ android:textColor="@color/black"
|
|
|
+ android:textSize="@dimen/common_text_size"
|
|
|
+ app:layout_constraintBottom_toBottomOf="@+id/point_name_tv_title"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toEndOf="@+id/point_name_tv_title"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/point_name_tv_title" />
|
|
|
+
|
|
|
+ <com.grkj.ui_base.widget.RequiredTextView
|
|
|
+ android:id="@+id/function_tv"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_marginTop="@dimen/common_spacing_2x"
|
|
|
- android:gravity="center_vertical"
|
|
|
- android:orientation="horizontal"
|
|
|
- android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
|
|
|
-
|
|
|
- <TextView
|
|
|
- android:layout_width="wrap_content"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:text="@string/point_manage_point_function"
|
|
|
- android:textColor="@color/black"
|
|
|
- android:textSize="@dimen/common_text_size" />
|
|
|
-
|
|
|
- <EditText
|
|
|
- android:id="@+id/function_et"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:layout_marginLeft="@dimen/common_spacing"
|
|
|
- android:background="@drawable/bg_common_input"
|
|
|
- android:hint="@string/please_input_point_function"
|
|
|
- android:maxLines="1"
|
|
|
- android:paddingHorizontal="@dimen/common_spacing"
|
|
|
- android:paddingVertical="2dp"
|
|
|
- android:singleLine="true"
|
|
|
- android:textColor="@color/black"
|
|
|
- android:textSize="@dimen/common_text_size" />
|
|
|
- </LinearLayout>
|
|
|
-
|
|
|
- <LinearLayout
|
|
|
- android:layout_width="match_parent"
|
|
|
+ android:text="@string/point_manage_point_function"
|
|
|
+ android:textColor="@color/black"
|
|
|
+ android:textSize="@dimen/common_text_size"
|
|
|
+ app:layout_constraintEnd_toEndOf="@+id/point_name_tv_title"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/point_name_tv_title"
|
|
|
+ app:markPosition="end"
|
|
|
+ app:required="true" />
|
|
|
+
|
|
|
+ <EditText
|
|
|
+ android:id="@+id/function_et"
|
|
|
+ android:layout_width="0dp"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginLeft="@dimen/common_spacing"
|
|
|
+ android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
|
|
|
+ android:background="@drawable/bg_common_input"
|
|
|
+ android:hint="@string/please_input_point_function"
|
|
|
+ android:maxLines="1"
|
|
|
+ android:paddingHorizontal="@dimen/common_spacing"
|
|
|
+ android:paddingVertical="2dp"
|
|
|
+ android:singleLine="true"
|
|
|
+ android:textColor="@color/black"
|
|
|
+ android:textSize="@dimen/common_text_size"
|
|
|
+ app:layout_constraintBottom_toBottomOf="@+id/function_tv"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toEndOf="@+id/function_tv"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/function_tv" />
|
|
|
+
|
|
|
+ <com.grkj.ui_base.widget.RequiredTextView
|
|
|
+ android:id="@+id/power_type_tv_title"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginLeft="37dp"
|
|
|
android:layout_marginTop="@dimen/common_spacing_2x"
|
|
|
- android:gravity="center_vertical"
|
|
|
- android:orientation="horizontal"
|
|
|
- android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
|
|
|
-
|
|
|
- <TextView
|
|
|
- android:layout_width="wrap_content"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:text="@string/point_manage_point_power_type"
|
|
|
- android:textColor="@color/black"
|
|
|
- android:textSize="@dimen/common_text_size" />
|
|
|
-
|
|
|
- <TextView
|
|
|
- android:id="@+id/power_type_tv"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:layout_marginLeft="@dimen/common_spacing"
|
|
|
- android:background="@drawable/bg_common_input"
|
|
|
- android:drawableRight="@mipmap/icon_drop_down"
|
|
|
- android:hint="@string/please_select_power_type"
|
|
|
- android:maxLines="1"
|
|
|
- android:paddingHorizontal="@dimen/common_spacing"
|
|
|
- android:paddingVertical="2dp"
|
|
|
- android:singleLine="true"
|
|
|
- android:textColor="@color/black"
|
|
|
- android:textSize="@dimen/common_text_size" />
|
|
|
- </LinearLayout>
|
|
|
-
|
|
|
-
|
|
|
- <LinearLayout
|
|
|
- android:layout_width="match_parent"
|
|
|
+ android:text="@string/point_manage_point_power_type"
|
|
|
+ android:textColor="@color/black"
|
|
|
+ android:textSize="@dimen/common_text_size"
|
|
|
+ app:layout_constraintEnd_toEndOf="@+id/function_tv"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/function_tv"
|
|
|
+ app:markPosition="end"
|
|
|
+ app:required="true" />
|
|
|
+
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/power_type_tv"
|
|
|
+ android:layout_width="0dp"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginLeft="@dimen/common_spacing"
|
|
|
+ android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
|
|
|
+ android:background="@drawable/bg_common_input"
|
|
|
+ android:drawableRight="@mipmap/icon_drop_down"
|
|
|
+ android:hint="@string/please_select_power_type"
|
|
|
+ android:maxLines="1"
|
|
|
+ android:paddingHorizontal="@dimen/common_spacing"
|
|
|
+ android:paddingVertical="2dp"
|
|
|
+ android:singleLine="true"
|
|
|
+ android:textColor="@color/black"
|
|
|
+ android:textSize="@dimen/common_text_size"
|
|
|
+ app:layout_constraintBottom_toBottomOf="@+id/power_type_tv_title"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toEndOf="@+id/power_type_tv_title"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/power_type_tv_title" />
|
|
|
+
|
|
|
+ <com.grkj.ui_base.widget.RequiredTextView
|
|
|
+ android:id="@+id/workstation_tv_title"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginLeft="55dp"
|
|
|
android:layout_marginTop="@dimen/common_spacing_2x"
|
|
|
- android:gravity="center_vertical"
|
|
|
- android:orientation="horizontal"
|
|
|
- android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
|
|
|
-
|
|
|
- <TextView
|
|
|
- android:layout_width="wrap_content"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:text="@string/point_manage_workstation"
|
|
|
- android:textColor="@color/black"
|
|
|
- android:textSize="@dimen/common_text_size" />
|
|
|
-
|
|
|
- <TextView
|
|
|
- android:id="@+id/workstation_tv"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:layout_marginLeft="@dimen/common_spacing"
|
|
|
- android:background="@drawable/bg_common_input"
|
|
|
- android:drawableRight="@mipmap/icon_drop_down"
|
|
|
- android:hint="@string/please_select_workstation"
|
|
|
- android:maxLines="1"
|
|
|
- android:paddingHorizontal="@dimen/common_spacing"
|
|
|
- android:paddingVertical="2dp"
|
|
|
- android:singleLine="true"
|
|
|
- android:textColor="@color/black"
|
|
|
- android:textSize="@dimen/common_text_size" />
|
|
|
- </LinearLayout>
|
|
|
-
|
|
|
- <LinearLayout
|
|
|
- android:layout_width="match_parent"
|
|
|
+ android:text="@string/point_manage_workstation"
|
|
|
+ android:textColor="@color/black"
|
|
|
+ android:textSize="@dimen/common_text_size"
|
|
|
+ app:layout_constraintEnd_toEndOf="@+id/power_type_tv_title"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/power_type_tv_title"
|
|
|
+ app:markPosition="end"
|
|
|
+ app:required="true" />
|
|
|
+
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/workstation_tv"
|
|
|
+ android:layout_width="0dp"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginLeft="@dimen/common_spacing"
|
|
|
+ android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
|
|
|
+ android:background="@drawable/bg_common_input"
|
|
|
+ android:drawableRight="@mipmap/icon_drop_down"
|
|
|
+ android:hint="@string/please_select_workstation"
|
|
|
+ android:maxLines="1"
|
|
|
+ android:paddingHorizontal="@dimen/common_spacing"
|
|
|
+ android:paddingVertical="2dp"
|
|
|
+ android:singleLine="true"
|
|
|
+ android:textColor="@color/black"
|
|
|
+ android:textSize="@dimen/common_text_size"
|
|
|
+ app:layout_constraintBottom_toBottomOf="@+id/workstation_tv_title"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toEndOf="@+id/workstation_tv_title"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/workstation_tv_title" />
|
|
|
+
|
|
|
+ <com.grkj.ui_base.widget.RequiredTextView
|
|
|
+ android:id="@+id/rfid_tag_tv_title"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginLeft="13dp"
|
|
|
android:layout_marginTop="@dimen/common_spacing_2x"
|
|
|
- android:gravity="center_vertical"
|
|
|
- android:orientation="horizontal"
|
|
|
- android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
|
|
|
-
|
|
|
- <TextView
|
|
|
- android:layout_width="wrap_content"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:text="@string/point_manage_rfid_tag"
|
|
|
- android:textColor="@color/black"
|
|
|
- android:textSize="@dimen/common_text_size" />
|
|
|
-
|
|
|
- <EditText
|
|
|
- android:id="@+id/rfid_tag_et"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:layout_marginLeft="@dimen/common_spacing"
|
|
|
- android:background="@drawable/bg_common_input"
|
|
|
- android:hint="@string/please_select_rfid_tag"
|
|
|
- android:maxLines="1"
|
|
|
- android:paddingHorizontal="@dimen/common_spacing"
|
|
|
- android:paddingVertical="2dp"
|
|
|
- android:singleLine="true"
|
|
|
- android:textColor="@color/black"
|
|
|
- android:textSize="@dimen/common_text_size" />
|
|
|
- </LinearLayout>
|
|
|
+ android:text="@string/point_manage_rfid_tag"
|
|
|
+ android:textColor="@color/black"
|
|
|
+ android:textSize="@dimen/common_text_size"
|
|
|
+ app:layout_constraintEnd_toEndOf="@+id/workstation_tv_title"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/workstation_tv_title"
|
|
|
+ app:markPosition="end"
|
|
|
+ app:required="true" />
|
|
|
+
|
|
|
+ <EditText
|
|
|
+ android:id="@+id/rfid_tag_et"
|
|
|
+ android:layout_width="0dp"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginLeft="@dimen/common_spacing"
|
|
|
+ android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
|
|
|
+ android:background="@drawable/bg_common_input"
|
|
|
+ android:hint="@string/please_input_rfid_tag"
|
|
|
+ android:maxLines="1"
|
|
|
+ android:paddingHorizontal="@dimen/common_spacing"
|
|
|
+ android:paddingVertical="2dp"
|
|
|
+ android:singleLine="true"
|
|
|
+ android:textColor="@color/black"
|
|
|
+ android:textSize="@dimen/common_text_size"
|
|
|
+ app:layout_constraintBottom_toBottomOf="@+id/rfid_tag_tv_title"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toEndOf="@+id/rfid_tag_tv_title"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/rfid_tag_tv_title" />
|
|
|
|
|
|
|
|
|
- </LinearLayout>
|
|
|
+ </androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
|
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
