[6.4.0]工单上报面板调整交互UI

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt

@@ -12,9 +12,11 @@ import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
+import android.view.View.OnFocusChangeListener
 import android.view.WindowManager
 import android.view.animation.Animation
 import android.view.animation.ScaleAnimation
+import android.widget.EditText
 import android.widget.ImageView
 import android.widget.RadioGroup
 import android.widget.TextView
@@ -174,7 +176,15 @@ class WorkOrderWindow constructor(activity: Activity) : View.OnTouchListener,
             workOrderOccurrenceTime += 60000
             tvOccurrenceTime.text = millis2String(workOrderOccurrenceTime, TimeUtils.getHourMinFormat())
         }
-        etDescribeInput.requestFocus()
+//        etDescribeInput.requestFocus()
+        etDescribeInput.onFocusChangeListener = OnFocusChangeListener { v, hasFocus ->
+            val edit = v as EditText
+            if(hasFocus){
+                edit.hint = ""
+            }else{
+                edit.hint = "手动输入"
+            }
+        }
         etDescribeInput.addTextChangedListener(object: TextWatcher{
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
 
@@ -226,10 +236,6 @@ class WorkOrderWindow constructor(activity: Activity) : View.OnTouchListener,
                 CallerDevaToolsManager.workOrderReport(workOrderReportInfo)
             }
 
-
-
-
-
         }
         //取消
         tvWorkOrderCancel.setOnClickListener {

core/function-impl/mogo-core-function-devatools/src/main/res/drawable/type_radio_button_select.xml

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:top="@dimen/dp_2" android:bottom="@dimen/dp_2"
-        android:left="@dimen/dp_2" android:right="@dimen/dp_2">
-        <shape>
-            <solid android:color="#0056FF"/>
-            <corners android:radius="@dimen/dp_8"/>
-        </shape>
-    </item>
-</layer-list>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#0056FF"/>
+    <corners android:radius="@dimen/dp_8"/>
+</shape>

core/function-impl/mogo-core-function-devatools/src/main/res/drawable/work_order_input_cursor.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size android:width="@dimen/dp_1"/>
+    <solid android:color="#A3ABC0"/>
+</shape>

core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_work_order.xml

@@ -5,7 +5,7 @@
     android:layout_width="@dimen/dp_844"
     android:layout_height="@dimen/dp_808"
     app:roundLayoutRadius="@dimen/dp_36"
-    android:background="#111825">
+    android:background="@drawable/bg_work_order_window">
 
     <View
         android:id="@+id/view_title_bg"
@@ -50,7 +50,7 @@
         app:layout_constraintTop_toBottomOf="@id/view_title_bg"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginStart="@dimen/dp_33"
-        android:layout_marginTop="@dimen/dp_32"
+        android:layout_marginTop="@dimen/dp_40"
         />
 
     <TextView
@@ -73,9 +73,9 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         app:layout_constraintTop_toBottomOf="@id/view_type_label"
-        android:layout_marginTop="@dimen/dp_30"
-        android:layout_marginStart="@dimen/dp_33"
-        android:layout_marginEnd="@dimen/dp_33"
+        android:layout_marginTop="@dimen/dp_18"
+        android:layout_marginStart="@dimen/dp_25"
+        android:layout_marginEnd="@dimen/dp_25"
         >
 
         <RadioButton
@@ -128,7 +128,7 @@
         app:layout_constraintTop_toBottomOf="@id/rg_type"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginStart="@dimen/dp_33"
-        android:layout_marginTop="@dimen/dp_32"
+        android:layout_marginTop="@dimen/dp_40"
         />
 
     <TextView
@@ -152,7 +152,7 @@
         android:src="@drawable/icon_work_order_reduce"
         app:layout_constraintLeft_toLeftOf="@id/view_time_label"
         app:layout_constraintTop_toBottomOf="@id/view_time_label"
-        android:layout_marginTop="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_25"
         />
 
     <TextView
@@ -186,7 +186,7 @@
         app:layout_constraintTop_toBottomOf="@id/iv_time_reduce"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginStart="@dimen/dp_33"
-        android:layout_marginTop="@dimen/dp_32"
+        android:layout_marginTop="@dimen/dp_40"
         />
 
     <TextView
@@ -212,13 +212,14 @@
         app:layout_constraintRight_toRightOf="parent"
         android:hint="@string/work_order_describe_input"
         android:textColorHint="#A3ABC0"
+        android:textCursorDrawable="@drawable/work_order_input_cursor"
         android:textSize="@dimen/sp_27"
         android:textColor="@color/white"
         android:gravity="top|start"
         android:paddingStart="@dimen/dp_28"
-        android:paddingTop="@dimen/dp_33"
+        android:paddingTop="@dimen/dp_21"
         android:paddingEnd="@dimen/dp_80"
-        android:layout_marginTop="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_25"
         android:background="@drawable/bg_work_order_des_input"
         />