From e6c2c3f76d8c0c07974eb910bb36bb7a9e55675d Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Thu, 11 May 2023 16:36:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E7=AA=97=E4=BD=932=E5=A2=9E=E5=8A=A0=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=AE=AD=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EvaluationResultFragment.kt | 2 +- .../EvaluationResultViewModel.kt | 40 ++++++++++++------- .../res/layout/fragment_evaluation_result.xml | 3 +- .../main/res/layout/fragment_offline_map.xml | 20 +++++++--- app/src/main/res/layout/text_item_select.xml | 2 +- 5 files changed, 43 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt index f01bcb63..8e140472 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt +++ b/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()) } 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 29fd71db..c258da7b 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 @@ -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() { - viewModelScope.launch(Dispatchers.IO) { + fun deleteData(context: Context) { + 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() - Log.e("jingo", "realm hashCOde ${realm.hashCode()}") - realm.executeTransaction { - val objects = - it.where(QsRecordBean::class.java).equalTo("id", liveDataQsRecordBean.value?.id) - .findFirst() - objects?.deleteFromRealm() + val realm = Realm.getDefaultInstance() + Log.e("jingo", "realm hashCOde ${realm.hashCode()}") + realm.executeTransaction { + val objects = it.where(QsRecordBean::class.java) + .equalTo("id", liveDataQsRecordBean.value?.id).findFirst() + objects?.deleteFromRealm() + } + mapController.markerHandle.removeQsRecordMark(liveDataQsRecordBean.value!!) + mapController.mMapView.vtmMap.updateMap(true) + liveDataFinish.postValue(true) + } } -// realm.close() - mapController.markerHandle.removeQsRecordMark(liveDataQsRecordBean.value!!) - mapController.mMapView.vtmMap.updateMap(true) - liveDataFinish.postValue(true) - } + }) + mDialog.setNegativeButton("取消", null) + mDialog.show() } /** diff --git a/app/src/main/res/layout/fragment_evaluation_result.xml b/app/src/main/res/layout/fragment_evaluation_result.xml index e9274368..710d6523 100644 --- a/app/src/main/res/layout/fragment_evaluation_result.xml +++ b/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" /> diff --git a/app/src/main/res/layout/fragment_offline_map.xml b/app/src/main/res/layout/fragment_offline_map.xml index 62c43931..740710dd 100644 --- a/app/src/main/res/layout/fragment_offline_map.xml +++ b/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"> + + android:src="@drawable/ic_baseline_keyboard_arrow_left_24"> + + + app:layout_constraintBottom_toBottomOf="parent"> + + + + + + diff --git a/app/src/main/res/layout/text_item_select.xml b/app/src/main/res/layout/text_item_select.xml index 7b161041..7408cfc9 100644 --- a/app/src/main/res/layout/text_item_select.xml +++ b/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">