diff --git a/app/src/main/java/com/xjjk/healthyclients/MainActivity.kt b/app/src/main/java/com/xjjk/healthyclients/MainActivity.kt index 6f0c80b..bba7f4f 100644 --- a/app/src/main/java/com/xjjk/healthyclients/MainActivity.kt +++ b/app/src/main/java/com/xjjk/healthyclients/MainActivity.kt @@ -26,7 +26,6 @@ import com.xjjk.healthyclients.base.BaseVMBActivity import com.xjjk.healthyclients.bottomtab.HomeBottomTabLayout import com.xjjk.healthyclients.databinding.ActivityMainBinding import com.xjjk.healthyclients.event.RefreshEvent -import com.xjjk.healthyclients.event.UserNoticeBean import com.xjjk.healthyclients.fragment.EmergencyFragment import com.xjjk.healthyclients.fragment.GuidanceFragment import com.xjjk.healthyclients.fragment.MonitorFragment diff --git a/app/src/main/java/com/xjjk/healthyclients/bean/emergency/EmergencyBean.kt b/app/src/main/java/com/xjjk/healthyclients/bean/emergency/EmergencyBean.kt index 1fbb408..2cc86f1 100644 --- a/app/src/main/java/com/xjjk/healthyclients/bean/emergency/EmergencyBean.kt +++ b/app/src/main/java/com/xjjk/healthyclients/bean/emergency/EmergencyBean.kt @@ -1,7 +1,5 @@ package com.xjjk.healthyclients.bean.emergency data class EmergencyBean( - val dicts: MutableList?, val resources: MutableList?, - val sessionId: String? ) \ No newline at end of file diff --git a/app/src/main/java/com/xjjk/healthyclients/bean/emergency/LocationResourceBean.kt b/app/src/main/java/com/xjjk/healthyclients/bean/emergency/LocationResourceBean.kt index 6df3382..a078a75 100644 --- a/app/src/main/java/com/xjjk/healthyclients/bean/emergency/LocationResourceBean.kt +++ b/app/src/main/java/com/xjjk/healthyclients/bean/emergency/LocationResourceBean.kt @@ -21,6 +21,7 @@ data class LocationResourceBean( val longitude: Double = 0.0, val memo: Any = "", val mobile: String = "", + val managePhone: String = "", val name: String = "", val province: String = "", val resourceDesc: String = "", diff --git a/app/src/main/java/com/xjjk/healthyclients/data/api/EmergencyApi.kt b/app/src/main/java/com/xjjk/healthyclients/data/api/EmergencyApi.kt index f9e3752..eb19b7b 100644 --- a/app/src/main/java/com/xjjk/healthyclients/data/api/EmergencyApi.kt +++ b/app/src/main/java/com/xjjk/healthyclients/data/api/EmergencyApi.kt @@ -2,10 +2,10 @@ package com.xjjk.healthyclients.data.api import com.xjjk.healthyclients.bean.emergency.BigDiseaseBean import com.xjjk.healthyclients.bean.emergency.BigDiseaseDetailsBean -import com.xjjk.healthyclients.bean.emergency.EmergencyBean import com.xjjk.healthyclients.bean.emergency.EmergencyGroupInfo import com.xjjk.healthyclients.bean.emergency.GetOrderBySessionIdBean import com.xjjk.healthyclients.bean.emergency.HospitalBean +import com.xjjk.healthyclients.bean.emergency.LocationResourceBean import com.xjjk.healthyclients.bean.emergency.OrderThroughBean import com.xjjk.healthyclients.bean.emergency.initUserOrderPageBean import com.xjjk.healthyclients.data.bean.ApiResponse @@ -20,7 +20,7 @@ interface EmergencyApi { * 应急首页数据获取 */ @GET("/health-emergency/api/emergency/resource/home") - suspend fun getEmergencyData(@QueryMap params: MutableMap): ApiResponse + suspend fun getEmergencyData(@QueryMap params: MutableMap): ApiResponse> /** * 大病就医列表 diff --git a/app/src/main/java/com/xjjk/healthyclients/data/repository/EmergencyRepository.kt b/app/src/main/java/com/xjjk/healthyclients/data/repository/EmergencyRepository.kt index 735ab0b..f3da36a 100644 --- a/app/src/main/java/com/xjjk/healthyclients/data/repository/EmergencyRepository.kt +++ b/app/src/main/java/com/xjjk/healthyclients/data/repository/EmergencyRepository.kt @@ -5,10 +5,10 @@ import com.xjjk.healthyclients.bean.CommonSettingMenuBean import com.xjjk.healthyclients.bean.emergency.AddBigDiseaseSubmitBean import com.xjjk.healthyclients.bean.emergency.BigDiseaseBean import com.xjjk.healthyclients.bean.emergency.BigDiseaseDetailsBean -import com.xjjk.healthyclients.bean.emergency.EmergencyBean import com.xjjk.healthyclients.bean.emergency.EmergencyGroupInfo import com.xjjk.healthyclients.bean.emergency.GetOrderBySessionIdBean import com.xjjk.healthyclients.bean.emergency.HospitalBean +import com.xjjk.healthyclients.bean.emergency.LocationResourceBean import com.xjjk.healthyclients.bean.emergency.OrderThroughBean import com.xjjk.healthyclients.bean.emergency.initUserOrderPageBean import com.xjjk.healthyclients.data.api.EmergencyApi @@ -19,11 +19,15 @@ import com.xjjk.healthyclients.superfuntion.toJson object EmergencyRepository : BaseRepository() { private val service by lazy { RetrofitManager.getService(EmergencyApi::class.java) } + + /** + * 1:油田医院 3:健康小屋 4:aed 5:救护车 不传则全部 + */ suspend fun getEmergencyData( type: String, latitude: Double, longitude: Double - ): ApiResponse { + ): ApiResponse> { val map = mutableMapOf() map["type"] = type map["longitude"] = longitude diff --git a/app/src/main/java/com/xjjk/healthyclients/fragment/EmergencyFragment.kt b/app/src/main/java/com/xjjk/healthyclients/fragment/EmergencyFragment.kt index 1a4a96f..089c43d 100644 --- a/app/src/main/java/com/xjjk/healthyclients/fragment/EmergencyFragment.kt +++ b/app/src/main/java/com/xjjk/healthyclients/fragment/EmergencyFragment.kt @@ -100,7 +100,7 @@ class EmergencyFragment : var mHeadType= mutableListOf() // mHeadType.add(EmergencyDictBean("全部","全部","全部","0",true)) mHeadType.add(EmergencyDictBean("油田医院","油田医院","油田医院","1",true)) - mHeadType.add(EmergencyDictBean("合作医院","合作医院","合作医院","2",false)) +// mHeadType.add(EmergencyDictBean("合作医院","合作医院","合作医院","2",false)) mHeadType.add(EmergencyDictBean("健康小屋","健康小屋","健康小屋","3",false)) mHeadType.add(EmergencyDictBean("AED","AED","AED","4",false)) mHeadType.add(EmergencyDictBean("救护车","救护车","救护车","5",false)) @@ -372,14 +372,14 @@ class EmergencyFragment : it.fragmentEmergencyHospitalTag.text = bean?.level_dictText } it.fragmentEmergencyHospitalName.text = bean?.name - if (bean?.mobile == null) { + if (bean?.managePhone == null) { it.fragmentEmergencyPhone.visibility = View.GONE it.fragmentEmergencyHospitalLandline.visibility = View.GONE } else { it.fragmentEmergencyPhone.visibility = View.VISIBLE it.fragmentEmergencyHospitalLandline.visibility = View.VISIBLE } - it.fragmentEmergencyHospitalLandline.text = bean?.mobile + it.fragmentEmergencyHospitalLandline.text = bean?.managePhone it.fragmentEmergencyHospitalAddress.text = bean?.address it.fragmentEmergencyCardNavigation.visibility = View.VISIBLE } diff --git a/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/ArchivesDetailActivity.kt b/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/ArchivesDetailActivity.kt index e6f2146..caac37a 100644 --- a/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/ArchivesDetailActivity.kt +++ b/app/src/main/java/com/xjjk/healthyclients/ui/activity/guidance/ArchivesDetailActivity.kt @@ -80,7 +80,7 @@ class ArchivesDetailActivity : ViewCompat.setNestedScrollingEnabled(layInspectionReport.rvList, false) mBinding.viewQuestionDiseaseDuration.setTitle(getString(R.string.archives_detail_question_disease_duration)) mBinding.viewQuestionHaveDoctor.setTitle(getString(R.string.archives_detail_question_have_doctor)) - mBinding.viewQuestionPhysicalExaminationReport.setTitle(getString(R.string.archives_detail_question_physical_examination_report)) +// mBinding.viewQuestionPhysicalExaminationReport.setTitle(getString(R.string.archives_detail_question_physical_examination_report)) } } @@ -98,7 +98,7 @@ class ArchivesDetailActivity : mBinding.etLookMedicalName.setText(it.lookMedicalName) mBinding.viewQuestionDiseaseDuration.setDefaultValue(it.haveTime) mBinding.viewQuestionHaveDoctor.setDefaultValue(it.tfLook) - mBinding.viewQuestionPhysicalExaminationReport.setDefaultValue(it.tfPermission) +// mBinding.viewQuestionPhysicalExaminationReport.setDefaultValue(it.tfPermission) it.tfLook?.let { tfLook -> isShowSeeDoctorExplainLay(tfLook) } } } @@ -131,8 +131,8 @@ class ArchivesDetailActivity : if (it.isNullOrEmpty()) { return@collectLatest } - mBinding.viewQuestionPhysicalExaminationReport.setData(it) - mBinding.viewQuestionPhysicalExaminationReport.disableRadioGroup(mViewModel.noEdit.value) +// mBinding.viewQuestionPhysicalExaminationReport.setData(it) +// mBinding.viewQuestionPhysicalExaminationReport.disableRadioGroup(mViewModel.noEdit.value) } } } @@ -156,7 +156,7 @@ class ArchivesDetailActivity : etLookOffice.isFocusable = !noEdit etLookOffice.isFocusableInTouchMode = !noEdit viewQuestionHaveDoctor.disableRadioGroup(noEdit) - viewQuestionPhysicalExaminationReport.disableRadioGroup(noEdit) +// viewQuestionPhysicalExaminationReport.disableRadioGroup(noEdit) viewQuestionDiseaseDuration.disableRadioGroup(noEdit) imageAdapter.isEditModel(!noEdit) } diff --git a/app/src/main/java/com/xjjk/healthyclients/ui/viewmodel/EmergencyViewModel.kt b/app/src/main/java/com/xjjk/healthyclients/ui/viewmodel/EmergencyViewModel.kt index 69addea..855b26d 100644 --- a/app/src/main/java/com/xjjk/healthyclients/ui/viewmodel/EmergencyViewModel.kt +++ b/app/src/main/java/com/xjjk/healthyclients/ui/viewmodel/EmergencyViewModel.kt @@ -6,7 +6,6 @@ import com.xjjk.healthyclients.bean.emergency.LocationResourceBean import com.xjjk.healthyclients.data.repository.EmergencyRepository import com.xjjk.healthyclients.superfuntion.handleRequest import com.xjjk.healthyclients.superfuntion.launch -import com.xjjk.healthyclients.superfuntion.orEmptyDefault import kotlinx.coroutines.flow.MutableStateFlow /** @@ -22,7 +21,7 @@ class EmergencyViewModel : BaseViewModel() { // var titleList = MutableStateFlow(mutableListOf()) var markList = MutableStateFlow(mutableListOf()) - var sessionId = MutableStateFlow("") +// var sessionId = MutableStateFlow("") override fun init() { @@ -33,10 +32,11 @@ class EmergencyViewModel : BaseViewModel() { { handleRequest( EmergencyRepository.getEmergencyData(type, latitude, longitude), - successBlock = { + successBlock = { response -> // it.result?.dicts?.let { list -> titleList.emit(list) } - it.result?.resources?.let { list -> markList.emit(list) } - it.result?.sessionId?.let { it1 -> sessionId.emit(it1) } +// it.result?.resources?.let { list -> markList.emit(list) } +// it.result?.sessionId?.let { it1 -> sessionId.emit(it1) } + response.result?.let { markList.emit(it) } }) } ) diff --git a/app/src/main/java/com/xjjk/healthyclients/utils/IMInputActionSettingUtils.kt b/app/src/main/java/com/xjjk/healthyclients/utils/IMInputActionSettingUtils.kt index 45207c4..6f5c378 100644 --- a/app/src/main/java/com/xjjk/healthyclients/utils/IMInputActionSettingUtils.kt +++ b/app/src/main/java/com/xjjk/healthyclients/utils/IMInputActionSettingUtils.kt @@ -1,8 +1,8 @@ package com.xjjk.healthyclients.utils -import com.xjjk.healthyclients.retrofit.UrlConfig import com.tencent.qcloud.tuikit.tuichat.classicui.setting.InputActionSetting import com.xjjk.healthyclients.BuildConfig +import com.xjjk.healthyclients.retrofit.UrlConfig object IMInputActionSettingUtils { /** @@ -33,7 +33,7 @@ object IMInputActionSettingUtils { inputActionSetting.isDisableArchives = false inputActionSetting.disableFinishName = false inputActionSetting.disableEvaluate = disableEvaluate - inputActionSetting.isDisableMedicalExaminationReport = !isSelf + inputActionSetting.isDisableMedicalExaminationReport = true inputActionSetting.isDisableSendMessage = disableSendMessage inputActionSetting.isDisableFinishSession = false } @@ -53,20 +53,20 @@ object IMInputActionSettingUtils { inputActionSetting.isDisableSendMessage = false inputActionSetting.isDisableFinishSession = false } - /** - * 急救联动IM功能配置 - */ - fun createEmergencyLinkageSetting(){ - var inputActionSetting = InputActionSetting.createInstance() - inputActionSetting.packageName = BuildConfig.APPLICATION_ID - inputActionSetting.CurrentResourceHost = UrlConfig.IMAGE_BASE_URL - inputActionSetting.isDisableAudioCall = false - inputActionSetting.isDisableVideoCall = false - inputActionSetting.isDisableArchives = true - inputActionSetting.disableFinishName = false - inputActionSetting.disableEvaluate = false - inputActionSetting.isDisableMedicalExaminationReport = true - inputActionSetting.isDisableSendMessage = false - inputActionSetting.isDisableFinishSession = false - } +// /** +// * 急救联动IM功能配置 +// */ +// fun createEmergencyLinkageSetting(){ +// var inputActionSetting = InputActionSetting.createInstance() +// inputActionSetting.packageName = BuildConfig.APPLICATION_ID +// inputActionSetting.CurrentResourceHost = UrlConfig.IMAGE_BASE_URL +// inputActionSetting.isDisableAudioCall = false +// inputActionSetting.isDisableVideoCall = false +// inputActionSetting.isDisableArchives = true +// inputActionSetting.disableFinishName = false +// inputActionSetting.disableEvaluate = false +// inputActionSetting.isDisableMedicalExaminationReport = true +// inputActionSetting.isDisableSendMessage = false +// inputActionSetting.isDisableFinishSession = false +// } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_archives_detail.xml b/app/src/main/res/layout/activity_archives_detail.xml index b4e800e..d7db577 100644 --- a/app/src/main/res/layout/activity_archives_detail.xml +++ b/app/src/main/res/layout/activity_archives_detail.xml @@ -218,11 +218,11 @@ app:minLines="@{5}" app:context="@={viewModel.archivesBean.desire}" app:noEdit="@{viewModel.noEdit}"/> - + + + + +