merge code

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 {

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" />

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">