yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.10.0]接管问题上报工具优化修改

Browse Source
This commit is contained in:
xuxinchao
2025-02-07 18:26:09 +08:00
parent c1c62d38cb
commit c7fb6f8067
6 changed files with 212 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt
View File

@@ -326,6 +326,11 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene
if(takeOverSceneWindow == null){
takeOverSceneWindow = TakeOverSceneWindow(mActivity)
}
takeOverSceneWindow?.setClickListener(object: TakeOverSceneWindow.ClickListener{
override fun closeWindow() {
takeOverSceneWindow = null
}
})
takeOverSceneWindow?.showFloatWindow(frontCameraUri,rearCameraUri,mapScreenUri,currentItem)
}

10
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverSceneWindow.kt
View File

@@ -35,6 +35,7 @@ class TakeOverSceneWindow constructor(activity: Activity) {
private lateinit var ivSceneNext: ImageView
private val takeOverSceneAdapter = TakeOverSceneAdapter()
private var currentIndex = 0
private var clickListener: ClickListener? = null
init {
initFloatWindow()
@@ -67,6 +68,7 @@ class TakeOverSceneWindow constructor(activity: Activity) {
vpSceneImage.adapter =takeOverSceneAdapter
//关闭弹窗
ivSceneClose.setOnClickListener {
clickListener?.closeWindow()
hideFloatWindow()
}
//前一个场景
@@ -110,4 +112,12 @@ class TakeOverSceneWindow constructor(activity: Activity) {
}
}
interface ClickListener{
fun closeWindow()
}
fun setClickListener(clickListener: ClickListener) {
this.clickListener = clickListener
}
}

BIN
core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_image_load_fail.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.5 KiB

15
core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_image.xml Normal file
View File

@@ -0,0 +1,15 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 背景颜色 -->
<item>
<shape android:shape="rectangle">
<solid android:color="#3C3C3C"/>
</shape>
</item>
<!-- 图片 -->
<item
android:drawable="@drawable/icon_image_load_fail"
android:width="@dimen/dp_280"
android:height="@dimen/dp_215"
android:gravity="center"
/>
</layer-list>

1
core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_scene_pager.xml
View File

@@ -9,6 +9,7 @@
android:layout_height="match_parent"
android:contentDescription="@string/take_over_scene_image"
android:scaleType="fitXY"
android:background="@drawable/bg_take_over_image"
/>
<TextView

359
core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_take_over_reason.xml
View File

@@ -5,180 +5,178 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/bg_take_over_reason">
<TextView
android:id="@+id/tvTakeOverTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/take_over_reason"
android:textSize="@dimen/sp_45"
android:textColor="@color/white"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:layout_marginStart="@dimen/dp_60"
android:layout_marginTop="@dimen/dp_100"
/>
<TextView
android:id="@+id/tvTakeOverTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/take_over_time"
android:textColor="@color/white"
android:textSize="@dimen/sp_32"
app:layout_constraintTop_toTopOf="@id/tvTakeOverTitle"
app:layout_constraintBottom_toBottomOf="@id/tvTakeOverTitle"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginEnd="@dimen/dp_62"
/>
<TextView
android:id="@+id/tvTypeTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/take_over_type"
android:textSize="@dimen/sp_38"
android:textColor="@color/white"
app:layout_constraintTop_toBottomOf="@id/tvTakeOverTitle"
app:layout_constraintLeft_toLeftOf="@id/tvTakeOverTitle"
android:layout_marginTop="@dimen/dp_65"
/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvTakeOverType"
android:layout_width="@dimen/dp_781"
android:layout_height="@dimen/dp_70"
app:layout_constraintTop_toBottomOf="@id/tvTypeTitle"
app:layout_constraintLeft_toLeftOf="@id/tvTypeTitle"
android:layout_marginTop="@dimen/dp_12"
android:background="@drawable/bg_fault_type"
android:elevation="@dimen/dp_10"
android:textSize="@dimen/sp_30"
android:gravity="start|center_vertical"
android:textColor="@color/white"
android:paddingStart="@dimen/dp_21"
android:paddingEnd="@dimen/dp_21"
app:drawableEndCompat="@drawable/icon_fault_expand"
/>
<TextView
android:id="@+id/tvTakeOverReasonTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/take_over_reason"
android:textSize="@dimen/sp_38"
android:textColor="@color/white"
app:layout_constraintTop_toBottomOf="@id/tvTakeOverType"
app:layout_constraintLeft_toLeftOf="@id/tvTakeOverType"
android:layout_marginTop="@dimen/dp_36"
/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvTakeOverReason"
android:layout_width="@dimen/dp_781"
android:layout_height="@dimen/dp_70"
android:background="@drawable/bg_fault_type"
app:layout_constraintTop_toBottomOf="@id/tvTakeOverReasonTitle"
app:layout_constraintLeft_toLeftOf="@id/tvTakeOverReasonTitle"
android:layout_marginTop="@dimen/dp_12"
android:paddingStart="@dimen/dp_21"
android:paddingEnd="@dimen/dp_21"
app:drawableEndCompat="@drawable/icon_fault_expand"
android:textSize="@dimen/sp_30"
android:textColor="@color/white"
android:gravity="center_vertical"
/>
<TextView
android:id="@+id/tvTakeOverNoteTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/fault_note"
android:textSize="@dimen/sp_38"
android:textColor="@color/white"
app:layout_constraintTop_toBottomOf="@id/tvTakeOverReason"
app:layout_constraintLeft_toLeftOf="@id/tvTakeOverReason"
android:layout_marginTop="@dimen/dp_36"
/>
<TextView
android:id="@+id/tvTakeOverNoteSupplement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@id/tvTakeOverNoteTitle"
app:layout_constraintBottom_toBottomOf="@id/tvTakeOverNoteTitle"
app:layout_constraintLeft_toRightOf="@id/tvTakeOverNoteTitle"
android:text="@string/fault_note_supplement"
android:textSize="@dimen/sp_30"
android:textColor="#CCCCCC"
/>
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/etNoteInput"
android:layout_width="@dimen/dp_779"
android:layout_height="@dimen/dp_115"
app:layout_constraintTop_toBottomOf="@id/tvTakeOverNoteTitle"
app:layout_constraintLeft_toLeftOf="@id/tvTakeOverNoteTitle"
android:hint="@string/take_over_note_input"
android:textColorHint="#A3ABC0"
android:textCursorDrawable="@drawable/work_order_input_cursor"
android:textSize="@dimen/sp_30"
android:textColor="@color/white"
android:gravity="top|start"
android:paddingStart="@dimen/dp_28"
android:paddingTop="@dimen/dp_21"
android:paddingEnd="@dimen/dp_80"
android:layout_marginTop="@dimen/dp_25"
android:background="@drawable/bg_work_order_des_input"
/>
<ImageView
android:id="@+id/ivNoteAudio"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_reason_audio_normal"
app:layout_constraintTop_toTopOf="@id/etNoteInput"
app:layout_constraintBottom_toBottomOf="@id/etNoteInput"
app:layout_constraintEnd_toEndOf="@id/etNoteInput"
android:padding="@dimen/dp_30"
android:contentDescription="@string/take_over_note_audio"
/>
<TextView
android:id="@+id/tvTakeOverSceneImageTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/take_over_scene_image"
android:textSize="@dimen/sp_38"
android:textColor="@color/white"
app:layout_constraintTop_toBottomOf="@id/etNoteInput"
app:layout_constraintLeft_toLeftOf="@id/etNoteInput"
android:layout_marginTop="@dimen/dp_36"
/>
<ScrollView
android:layout_width="@dimen/dp_779"
android:layout_height="@dimen/dp_0"
app:layout_constraintTop_toBottomOf="@id/tvTakeOverSceneImageTitle"
app:layout_constraintLeft_toLeftOf="@id/tvTakeOverSceneImageTitle"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginTop="@dimen/dp_13"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="none"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tvTakeOverTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/take_over_reason"
android:textSize="@dimen/sp_45"
android:textColor="@color/white"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:layout_marginStart="@dimen/dp_60"
android:layout_marginTop="@dimen/dp_100"
/>
<TextView
android:id="@+id/tvTakeOverTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/take_over_time"
android:textColor="@color/white"
android:textSize="@dimen/sp_32"
app:layout_constraintTop_toTopOf="@id/tvTakeOverTitle"
app:layout_constraintBottom_toBottomOf="@id/tvTakeOverTitle"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginEnd="@dimen/dp_62"
/>
<TextView
android:id="@+id/tvTypeTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/take_over_type"
android:textSize="@dimen/sp_38"
android:textColor="@color/white"
app:layout_constraintTop_toBottomOf="@id/tvTakeOverTitle"
app:layout_constraintLeft_toLeftOf="@id/tvTakeOverTitle"
android:layout_marginTop="@dimen/dp_65"
/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvTakeOverType"
android:layout_width="@dimen/dp_781"
android:layout_height="@dimen/dp_70"
app:layout_constraintTop_toBottomOf="@id/tvTypeTitle"
app:layout_constraintLeft_toLeftOf="@id/tvTypeTitle"
android:layout_marginTop="@dimen/dp_12"
android:background="@drawable/bg_fault_type"
android:elevation="@dimen/dp_10"
android:textSize="@dimen/sp_30"
android:gravity="start|center_vertical"
android:textColor="@color/white"
android:paddingStart="@dimen/dp_21"
android:paddingEnd="@dimen/dp_21"
app:drawableEndCompat="@drawable/icon_fault_expand"
/>
<TextView
android:id="@+id/tvTakeOverReasonTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/take_over_reason"
android:textSize="@dimen/sp_38"
android:textColor="@color/white"
app:layout_constraintTop_toBottomOf="@id/tvTakeOverType"
app:layout_constraintLeft_toLeftOf="@id/tvTakeOverType"
android:layout_marginTop="@dimen/dp_36"
/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvTakeOverReason"
android:layout_width="@dimen/dp_781"
android:layout_height="@dimen/dp_70"
android:background="@drawable/bg_fault_type"
app:layout_constraintTop_toBottomOf="@id/tvTakeOverReasonTitle"
app:layout_constraintLeft_toLeftOf="@id/tvTakeOverReasonTitle"
android:layout_marginTop="@dimen/dp_12"
android:paddingStart="@dimen/dp_21"
android:paddingEnd="@dimen/dp_21"
app:drawableEndCompat="@drawable/icon_fault_expand"
android:textSize="@dimen/sp_30"
android:textColor="@color/white"
android:gravity="center_vertical"
/>
<TextView
android:id="@+id/tvTakeOverNoteTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/fault_note"
android:textSize="@dimen/sp_38"
android:textColor="@color/white"
app:layout_constraintTop_toBottomOf="@id/tvTakeOverReason"
app:layout_constraintLeft_toLeftOf="@id/tvTakeOverReason"
android:layout_marginTop="@dimen/dp_36"
/>
<TextView
android:id="@+id/tvTakeOverNoteSupplement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@id/tvTakeOverNoteTitle"
app:layout_constraintBottom_toBottomOf="@id/tvTakeOverNoteTitle"
app:layout_constraintLeft_toRightOf="@id/tvTakeOverNoteTitle"
android:text="@string/fault_note_supplement"
android:textSize="@dimen/sp_30"
android:textColor="#CCCCCC"
/>
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/etNoteInput"
android:layout_width="@dimen/dp_779"
android:layout_height="@dimen/dp_115"
app:layout_constraintTop_toBottomOf="@id/tvTakeOverNoteTitle"
app:layout_constraintLeft_toLeftOf="@id/tvTakeOverNoteTitle"
android:hint="@string/take_over_note_input"
android:textColorHint="#A3ABC0"
android:textCursorDrawable="@drawable/work_order_input_cursor"
android:textSize="@dimen/sp_30"
android:textColor="@color/white"
android:gravity="top|start"
android:paddingStart="@dimen/dp_28"
android:paddingTop="@dimen/dp_21"
android:paddingEnd="@dimen/dp_80"
android:layout_marginTop="@dimen/dp_25"
android:background="@drawable/bg_work_order_des_input"
/>
<ImageView
android:id="@+id/ivNoteAudio"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_reason_audio_normal"
app:layout_constraintTop_toTopOf="@id/etNoteInput"
app:layout_constraintBottom_toBottomOf="@id/etNoteInput"
app:layout_constraintEnd_toEndOf="@id/etNoteInput"
android:padding="@dimen/dp_30"
android:contentDescription="@string/take_over_note_audio"
/>
<TextView
android:id="@+id/tvTakeOverSceneImageTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/take_over_scene_image"
android:textSize="@dimen/sp_38"
android:textColor="@color/white"
app:layout_constraintTop_toBottomOf="@id/etNoteInput"
app:layout_constraintLeft_toLeftOf="@id/etNoteInput"
android:layout_marginTop="@dimen/dp_36"
/>
<ImageView
android:id="@+id/ivFrontCamera"
android:layout_width="@dimen/dp_779"
android:layout_height="@dimen/dp_422"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvTakeOverSceneImageTitle"
app:layout_constraintLeft_toLeftOf="@id/tvTakeOverSceneImageTitle"
android:layout_marginTop="@dimen/dp_13"
android:contentDescription="@string/take_over_front_camera"
android:scaleType="fitXY"
android:background="@drawable/bg_take_over_image"
/>
<TextView
@@ -204,6 +202,7 @@
android:contentDescription="@string/take_over_rear_camera"
android:layout_marginTop="@dimen/dp_13"
android:scaleType="fitXY"
android:background="@drawable/bg_take_over_image"
/>
<TextView
@@ -231,6 +230,7 @@
android:layout_marginTop="@dimen/dp_13"
android:layout_marginBottom="@dimen/dp_160"
android:scaleType="fitXY"
android:background="@drawable/bg_take_over_image"
/>
<TextView
@@ -246,16 +246,32 @@
android:gravity="center"
/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvTakeOverList"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_0"
app:layout_constraintLeft_toLeftOf="@id/tvTakeOverType"
app:layout_constraintRight_toRightOf="@id/tvTakeOverType"
app:layout_constraintTop_toBottomOf="@id/tvTakeOverType"
app:layout_constraintBottom_toBottomOf="parent"
android:background="@drawable/bg_reason_list"
android:visibility="gone"
android:layout_marginTop="@dimen/dp_m_5"
android:paddingTop="@dimen/dp_5"
android:layout_marginBottom="@dimen/dp_920"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
<TextView
android:id="@+id/tvTakeOverSave"
android:layout_width="@dimen/dp_380"
android:layout_height="@dimen/dp_80"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/etNoteInput"
app:layout_constraintLeft_toLeftOf="parent"
android:background="@drawable/bg_take_over_reason_save"
android:text="@string/take_over_save"
android:textColor="#FFFFFF"
@@ -263,6 +279,7 @@
android:textStyle="bold"
android:gravity="center"
android:layout_marginBottom="@dimen/dp_75"
android:layout_marginStart="@dimen/dp_60"
/>
<TextView
@@ -270,7 +287,7 @@
android:layout_width="@dimen/dp_380"
android:layout_height="@dimen/dp_80"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="@id/etNoteInput"
app:layout_constraintRight_toRightOf="parent"
android:text="@string/take_over_cancel"
android:textColor="#FFFFFF"
android:textSize="@dimen/sp_36"
@@ -278,21 +295,7 @@
android:gravity="center"
android:background="@drawable/bg_take_over_reason_cancel"
android:layout_marginBottom="@dimen/dp_75"
/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvTakeOverList"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_0"
app:layout_constraintLeft_toLeftOf="@id/tvTakeOverType"
app:layout_constraintRight_toRightOf="@id/tvTakeOverType"
app:layout_constraintTop_toBottomOf="@id/tvTakeOverType"
app:layout_constraintBottom_toTopOf="@id/tvTakeOverSave"
android:layout_marginBottom="@dimen/dp_39"
android:background="@drawable/bg_reason_list"
android:visibility="gone"
android:layout_marginTop="@dimen/dp_m_5"
android:paddingTop="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_60"
/>
</androidx.constraintlayout.widget.ConstraintLayout>