增加删除确认窗体2增加返回箭头

app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt

@@ -72,7 +72,7 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
         //删除事件
         binding.evaluationBarDelete.setOnClickListener() {
 
-            viewModel.deleteData()
+            viewModel.deleteData(requireContext())
 
         }
 

app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt

@@ -1,6 +1,7 @@
 package com.navinfo.omqs.ui.fragment.evaluationresult
 
 import android.app.Activity
+import android.app.Dialog
 import android.content.Context
 import android.graphics.drawable.AnimationDrawable
 import android.graphics.drawable.BitmapDrawable
@@ -22,12 +23,13 @@ import com.navinfo.collect.library.data.entity.QsRecordBean
 import com.navinfo.collect.library.data.entity.RenderEntity.Companion.LinkTable
 import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.collect.library.utils.GeometryTools
-import com.navinfo.omqs.bean.SignBean
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
 import com.navinfo.omqs.bean.ChatMsgEntity
+import com.navinfo.omqs.bean.SignBean
 import com.navinfo.omqs.db.RealmOperateHelper
 import com.navinfo.omqs.db.RoomAppDatabase
+import com.navinfo.omqs.ui.dialog.FirstDialog
 import com.navinfo.omqs.util.DateTimeUtil
 import com.navinfo.omqs.util.SoundMeter
 import com.navinfo.omqs.util.SpeakMode
@@ -323,22 +325,30 @@ class EvaluationResultViewModel @Inject constructor(
         }
     }
 
-    fun deleteData() {
+    fun deleteData(context: Context) {
-        viewModelScope.launch(Dispatchers.IO) {
+        val mDialog = FirstDialog(context)
+        mDialog.setTitle("提示？")
+        mDialog.setMessage("是否删除")
+        mDialog.setPositiveButton("确定", object : FirstDialog.OnClickListener {
+            override fun onClick(dialog: Dialog?, which: Int) {
+                mDialog.dismiss()
+                viewModelScope.launch(Dispatchers.IO) {
 
-            val realm = Realm.getDefaultInstance()
+                    val realm = Realm.getDefaultInstance()
-            Log.e("jingo", "realm hashCOde ${realm.hashCode()}")
+                    Log.e("jingo", "realm hashCOde ${realm.hashCode()}")
-            realm.executeTransaction {
+                    realm.executeTransaction {
-                val objects =
+                        val objects = it.where(QsRecordBean::class.java)
-                    it.where(QsRecordBean::class.java).equalTo("id", liveDataQsRecordBean.value?.id)
+                            .equalTo("id", liveDataQsRecordBean.value?.id).findFirst()
-                        .findFirst()
+                        objects?.deleteFromRealm()
-                objects?.deleteFromRealm()
+                    }
+                    mapController.markerHandle.removeQsRecordMark(liveDataQsRecordBean.value!!)
+                    mapController.mMapView.vtmMap.updateMap(true)
+                    liveDataFinish.postValue(true)
+                }
             }
-//            realm.close()
+        })
-            mapController.markerHandle.removeQsRecordMark(liveDataQsRecordBean.value!!)
+        mDialog.setNegativeButton("取消", null)
-            mapController.mMapView.vtmMap.updateMap(true)
+        mDialog.show()
-            liveDataFinish.postValue(true)
-        }
     }
 
     /**

app/src/main/res/layout/fragment_evaluation_result.xml

@@ -36,6 +36,7 @@
                     style="@style/card_title_font_default"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:drawableLeft="@drawable/btn_back_xml"
                     android:layout_alignParentLeft="true"
                     android:text="Mark" />
 
@@ -51,7 +52,7 @@
                     android:id="@+id/evaluation_bar_delete"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingRight="5dp"
+                    android:padding="10dp"
                     android:layout_centerInParent="true"
                     android:layout_toLeftOf="@+id/evaluation_bar_save"
                     android:background="@drawable/btn_delete_xml" />

app/src/main/res/layout/fragment_offline_map.xml

@@ -13,6 +13,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
         style="@style/left_pannel_title_layout">
+
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/offline_map_back"
             android:layout_width="wrap_content"
@@ -24,7 +25,9 @@
             android:background="@drawable/selector_bg_round_button"
             android:foreground="@drawable/ripple_btn_press"
             style="@style/btn_round"
-            android:src="@drawable/ic_baseline_keyboard_arrow_left_24"></androidx.appcompat.widget.AppCompatImageView>
+            android:src="@drawable/ic_baseline_keyboard_arrow_left_24">
+
+        </androidx.appcompat.widget.AppCompatImageView>
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_title"
@@ -36,19 +39,24 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"></androidx.appcompat.widget.AppCompatTextView>
+            app:layout_constraintBottom_toBottomOf="parent">
+
+        </androidx.appcompat.widget.AppCompatTextView>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
+
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintTop_toBottomOf="@id/title_layout"
         app:layout_constraintBottom_toBottomOf="parent"
         style="@style/default_card_view">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical">
+
             <com.google.android.material.tabs.TabLayout
                 android:id="@+id/offline_map_tab_layout"
                 android:layout_width="match_parent"
@@ -60,22 +68,22 @@
                 app:tabPadding="0dp"
                 app:tabIndicator="@null"
                 app:tabMode="scrollable"
+                app:tabMinWidth="120dp"
                 app:tabIndicatorHeight="0dp"
                 app:tabSelectedTextColor="@color/white"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/title_layout">
 
                 <com.google.android.material.tabs.TabItem
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="@dimen/default_widget_padding"
                     android:text="下载管理" />
 
                 <com.google.android.material.tabs.TabItem
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="@dimen/default_widget_padding"
                     android:text="城市列表" />
+
             </com.google.android.material.tabs.TabLayout>
 
 

app/src/main/res/layout/text_item_select.xml

@@ -13,7 +13,7 @@
         android:padding = "3dp"
         android:gravity="center"
         android:textColor="@color/black"
-        android:textSize="18sp">
+        android:textSize="@dimen/default_font_size">
 
     </TextView>