From 4ec107b359d83b61cdb93433b86a8448a46e3f12 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Fri, 19 May 2023 09:27:11 +0800
Subject: [PATCH] merge code

---
 .../ui/fragment/evaluationresult/EvaluationResultViewModel.kt  | 3 +--
 app/src/main/res/layout/adapter_offline_map_city.xml           | 2 +-
 app/src/main/res/layout/fragment_evaluation_result.xml         | 3 +++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
index c258da7b..ccc9acdc 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
@@ -328,12 +328,11 @@ class EvaluationResultViewModel @Inject constructor(
     fun deleteData(context: Context) {
         val mDialog = FirstDialog(context)
         mDialog.setTitle("提示？")
-        mDialog.setMessage("是否删除")
+        mDialog.setMessage("是否删除Mark，请确认！")
         mDialog.setPositiveButton("确定", object : FirstDialog.OnClickListener {
             override fun onClick(dialog: Dialog?, which: Int) {
                 mDialog.dismiss()
                 viewModelScope.launch(Dispatchers.IO) {
-
                     val realm = Realm.getDefaultInstance()
                     Log.e("jingo", "realm hashCOde ${realm.hashCode()}")
                     realm.executeTransaction {
diff --git a/app/src/main/res/layout/adapter_offline_map_city.xml b/app/src/main/res/layout/adapter_offline_map_city.xml
index 68d56864..3ac1686e 100644
--- a/app/src/main/res/layout/adapter_offline_map_city.xml
+++ b/app/src/main/res/layout/adapter_offline_map_city.xml
@@ -58,7 +58,7 @@
         style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="match_parent"
         android:layout_height="16dp"
-        android:layout_below="@id/offline_map_download_btn"
+        android:layout_below="@id/offline_map_city_size"
         android:paddingTop="10dp"
         android:progressDrawable="@drawable/progress_bg"
         android:visibility="invisible" />
diff --git a/app/src/main/res/layout/fragment_evaluation_result.xml b/app/src/main/res/layout/fragment_evaluation_result.xml
index 710d6523..b199898b 100644
--- a/app/src/main/res/layout/fragment_evaluation_result.xml
+++ b/app/src/main/res/layout/fragment_evaluation_result.xml
@@ -27,6 +27,9 @@
             app:layout_constraintTop_toTopOf="parent">
 
             <RelativeLayout
+                android:focusableInTouchMode="true"
+                android:focusable="true"
+                android:clickable="true"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">