From aee280cf867e3d8cd93659df63169f5c0229eda4 Mon Sep 17 00:00:00 2001 From: zhangxiao <1441011491@qq.com> Date: Tue, 21 Jul 2026 08:56:38 +0800 Subject: [PATCH] =?UTF-8?q?refactor(tuichat):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98=E9=A1=B5=E9=9D=A2UI?= =?UTF-8?q?=E5=92=8C=E4=BA=A4=E4=BA=92=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将顶部标题栏改为白底黑字风格，调整返回按钮颜色 - 移除原有的Tab标签页，改为搜索框配合分段Tab布局 - 添加搜索框右侧"搜索"文字按钮功能 - 重新设计底部确认按钮为全宽度样式 - 调整导航面板宽度从220dp增加到280dp - 新增多个颜色值和图形资源用于支持新UI样式 - 更新通话图标和分隔线样式 - 修改应急救援相关API接口和数据模型 - 调整患者信息展示逻辑和界面元素可见性控制 --- .../bean/emergency/GroupInfo.kt | 15 + .../xjjk/healthyclients/bean/home/HomeBean.kt | 4 +- .../healthyclients/data/api/EmergencyApi.kt | 7 + .../xjjk/healthyclients/data/bean/PageBean.kt | 21 + .../data/repository/EmergencyRepository.kt | 5 + .../fragment/EmergencyFragment.kt | 3 +- .../ui/activity/ProposalActivity.kt | 66 +- .../res/drawable/bg_gradient_underline.xml | 10 + .../bg_gradient_underline_reverse.xml | 10 + .../bg_gradient_underline_vertical.xml | 12 + .../main/res/drawable/bg_gray_round_12.xml | 7 + app/src/main/res/drawable/bg_gray_round_8.xml | 6 + .../res/drawable/bg_patient_card_gradient.xml | 12 + app/src/main/res/drawable/bg_red_circle.xml | 8 + .../main/res/drawable/bg_table_data_cell.xml | 9 + .../res/drawable/bg_table_header_cell.xml | 9 + .../res/drawable/bg_teal_alpha_round_12.xml | 6 + .../main/res/drawable/bg_teal_gradient.xml | 11 + .../main/res/drawable/bg_teal_round_24.xml | 7 + .../res/drawable/bg_teal_solid_round_4.xml | 6 + .../main/res/drawable/bg_teal_strip_top.xml | 9 + .../main/res/drawable/bg_teal_tag_round_4.xml | 7 + .../drawable/bg_teal_tag_round_4_small.xml | 7 + app/src/main/res/drawable/bg_title_tag.xml | 11 + .../main/res/drawable/bg_white_round_12.xml | 6 + .../main/res/drawable/ic_blood_glucose.png | Bin 0 -> 4614 bytes app/src/main/res/drawable/ic_blood_lipids.png | Bin 0 -> 4023 bytes .../main/res/drawable/ic_blood_pressure.png | Bin 0 -> 4036 bytes app/src/main/res/drawable/ic_link.png | Bin 0 -> 2890 bytes app/src/main/res/drawable/ic_paramedic.png | Bin 0 -> 8612 bytes app/src/main/res/drawable/ic_uric_acid.png | Bin 0 -> 6135 bytes app/src/main/res/layout/activity_proposal.xml | 1256 ++++++++++------- .../main/res/layout/fragment_emergency.xml | 2 +- 33 files changed, 968 insertions(+), 564 deletions(-) create mode 100644 app/src/main/java/com/xjjk/healthyclients/bean/emergency/GroupInfo.kt create mode 100644 app/src/main/java/com/xjjk/healthyclients/data/bean/PageBean.kt create mode 100644 app/src/main/res/drawable/bg_gradient_underline.xml create mode 100644 app/src/main/res/drawable/bg_gradient_underline_reverse.xml create mode 100644 app/src/main/res/drawable/bg_gradient_underline_vertical.xml create mode 100644 app/src/main/res/drawable/bg_gray_round_12.xml create mode 100644 app/src/main/res/drawable/bg_gray_round_8.xml create mode 100644 app/src/main/res/drawable/bg_patient_card_gradient.xml create mode 100644 app/src/main/res/drawable/bg_red_circle.xml create mode 100644 app/src/main/res/drawable/bg_table_data_cell.xml create mode 100644 app/src/main/res/drawable/bg_table_header_cell.xml create mode 100644 app/src/main/res/drawable/bg_teal_alpha_round_12.xml create mode 100644 app/src/main/res/drawable/bg_teal_gradient.xml create mode 100644 app/src/main/res/drawable/bg_teal_round_24.xml create mode 100644 app/src/main/res/drawable/bg_teal_solid_round_4.xml create mode 100644 app/src/main/res/drawable/bg_teal_strip_top.xml create mode 100644 app/src/main/res/drawable/bg_teal_tag_round_4.xml create mode 100644 app/src/main/res/drawable/bg_teal_tag_round_4_small.xml create mode 100644 app/src/main/res/drawable/bg_title_tag.xml create mode 100644 app/src/main/res/drawable/bg_white_round_12.xml create mode 100644 app/src/main/res/drawable/ic_blood_glucose.png create mode 100644 app/src/main/res/drawable/ic_blood_lipids.png create mode 100644 app/src/main/res/drawable/ic_blood_pressure.png create mode 100644 app/src/main/res/drawable/ic_link.png create mode 100644 app/src/main/res/drawable/ic_paramedic.png create mode 100644 app/src/main/res/drawable/ic_uric_acid.png diff --git a/app/src/main/java/com/xjjk/healthyclients/bean/emergency/GroupInfo.kt b/app/src/main/java/com/xjjk/healthyclients/bean/emergency/GroupInfo.kt new file mode 100644 index 0000000..e58edd5 --- /dev/null +++ b/app/src/main/java/com/xjjk/healthyclients/bean/emergency/GroupInfo.kt @@ -0,0 +1,15 @@ +package com.xjjk.healthyclients.bean.emergency + +data class GroupInfo( + val orderId: String, + val sessionId: String, + val salvageUserName: String, + val salvageUserSex: String, + val salvageUserAvatar: String, + val salvageUserAge: Int, + val salvageUserMobile: String, + val orgName: String, + val deptName: String, + val orderStatus: String, + val initTime: String +) \ No newline at end of file diff --git a/app/src/main/java/com/xjjk/healthyclients/bean/home/HomeBean.kt b/app/src/main/java/com/xjjk/healthyclients/bean/home/HomeBean.kt index 7f28eb4..010837f 100644 --- a/app/src/main/java/com/xjjk/healthyclients/bean/home/HomeBean.kt +++ b/app/src/main/java/com/xjjk/healthyclients/bean/home/HomeBean.kt @@ -66,8 +66,8 @@ data class ProposalBean( val sexCode: String?, val workUnit: String?, val careLiaisonName: String?, - val idNo: String, - val phone: String, + val idNo: String?, + val phone: String?, val careStatus: String, val dataLevel: Int, val negativeList: 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 d241812..da9ba21 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 @@ -7,6 +7,7 @@ import com.xjjk.healthyclients.bean.emergency.BigDiseaseBean import com.xjjk.healthyclients.bean.emergency.BigDiseaseDetailsBean import com.xjjk.healthyclients.bean.emergency.EmergencyGroupInfo import com.xjjk.healthyclients.bean.emergency.GetOrderBySessionIdBean +import com.xjjk.healthyclients.bean.emergency.GroupInfo import com.xjjk.healthyclients.bean.emergency.HospitalBean import com.xjjk.healthyclients.bean.emergency.LocationResourceBean import com.xjjk.healthyclients.bean.emergency.OrderThroughBean @@ -128,4 +129,10 @@ interface EmergencyApi { */ @GET("/health-emergency/emergency/LargeScreenNew/isLiaisonUser") suspend fun isLiaisonUser(): ApiResponse + + /** + * 当前登录人参与的应急工单列表 + */ + @GET("/health-emergency/api/emergency/order/myParticipatedOrders") + suspend fun getParticipatedOrders (): ApiResponse> } \ No newline at end of file diff --git a/app/src/main/java/com/xjjk/healthyclients/data/bean/PageBean.kt b/app/src/main/java/com/xjjk/healthyclients/data/bean/PageBean.kt new file mode 100644 index 0000000..d5ebafc --- /dev/null +++ b/app/src/main/java/com/xjjk/healthyclients/data/bean/PageBean.kt @@ -0,0 +1,21 @@ +package com.xjjk.healthyclients.data.bean + +/** + * 通用分页数据包装类 + * + * 用于后端返回 MyBatis-Plus 风格的分页结构，实际列表数据位于 [records] 字段中。 + * + * @param T 列表元素类型 + */ +data class PageBean( + /** 数据列表 */ + val records: List?, + /** 总记录数 */ + val total: Int = 0, + /** 每页大小 */ + val size: Int = 0, + /** 当前页码 */ + val current: Int = 0, + /** 总页数 */ + val pages: Int = 0 +) 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 14151ce..01d5a06 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 @@ -10,6 +10,7 @@ import com.xjjk.healthyclients.bean.emergency.BigDiseaseBean import com.xjjk.healthyclients.bean.emergency.BigDiseaseDetailsBean import com.xjjk.healthyclients.bean.emergency.EmergencyGroupInfo import com.xjjk.healthyclients.bean.emergency.GetOrderBySessionIdBean +import com.xjjk.healthyclients.bean.emergency.GroupInfo import com.xjjk.healthyclients.bean.emergency.HospitalBean import com.xjjk.healthyclients.bean.emergency.LocationResourceBean import com.xjjk.healthyclients.bean.emergency.OrderThroughBean @@ -181,4 +182,8 @@ object EmergencyRepository : BaseRepository() { suspend fun isLiaisonUser(): ApiResponse { return apiCall { service.isLiaisonUser() } } + + suspend fun getParticipatedOrders(): ApiResponse> { + return apiCall { service.getParticipatedOrders() } + } } \ No newline at end of file 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 28a3e16..5b85c73 100644 --- a/app/src/main/java/com/xjjk/healthyclients/fragment/EmergencyFragment.kt +++ b/app/src/main/java/com/xjjk/healthyclients/fragment/EmergencyFragment.kt @@ -87,7 +87,6 @@ class EmergencyFragment : ) var mListener: LocationSource.OnLocationChangedListener? = null - private val paramedicOperateListener = object : OnParamedicOperateListener { override fun addGroupUser( groupId: String, @@ -233,6 +232,8 @@ class EmergencyFragment : // } } + titleId = mHeadType[0].value + mViewModel.getEmergencyData(mHeadType[0].value, mCurrentLat, mCurrentLon) } override fun createObserve() { diff --git a/app/src/main/java/com/xjjk/healthyclients/ui/activity/ProposalActivity.kt b/app/src/main/java/com/xjjk/healthyclients/ui/activity/ProposalActivity.kt index e8556fc..004379e 100644 --- a/app/src/main/java/com/xjjk/healthyclients/ui/activity/ProposalActivity.kt +++ b/app/src/main/java/com/xjjk/healthyclients/ui/activity/ProposalActivity.kt @@ -1,5 +1,6 @@ package com.xjjk.healthyclients.ui.activity +import android.graphics.Color import android.os.Bundle import android.view.View import androidx.lifecycle.Lifecycle @@ -28,6 +29,7 @@ class ProposalActivity : // 加载健康档案数据 } + override fun createObserve() { super.createObserve() lifecycleScope.launch { @@ -38,43 +40,52 @@ class ProposalActivity : } } } + private fun setProposalInfo(proposalBean: ProposalBean?) { proposalBean?.let { // 患者信息 mBinding.tvPatientName.text = it.name - mBinding.tvPatientGenderAge.text = it.sexCode + " · " + it.age - mBinding.tvDocumentStatus.text = it.careStatus - mBinding.tvPatientCompany.text = it.workUnit - mBinding.tvIdNumber.text = it.idNo - mBinding.tvPhone.text = it.phone + mBinding.tvPatientGenderAge.text = formatNullString(it.sexCode) + " · " + it.age + "岁" + //mBinding.tvDocumentStatus.text = it.careStatus + mBinding.tvPatientCompany.text = formatNullString(it.workUnit) + mBinding.tvIdNumber.text = formatNullString(it.idNo) + mBinding.tvPhone.text = formatNullString(it.phone) // 关爱管理信息 - mBinding.tvLevel.text = it.dataLevel.toString() - mBinding.tvLiaisonName.text = it.careLiaisonName - mBinding.tvNegativeList.text = it.negativeList + //mBinding.tvLevel.text = it.dataLevel.toString() + mBinding.tvLiaisonName.text = formatNullString(it.careLiaisonName) + mBinding.tvNegativeList.text = formatNullString(it.negativeList) + // 档案与标签 - mBinding.tvFlagFat.text = it.flagFat.toString() - mBinding.tvWeight.text = it.weight - mBinding.tvHeight.text = it.height - mBinding.tvBmi.text = it.bmiCurrent - mBinding.tvStandardWeight.text = it.targetWeight + if (it.flagFat != 1) { + mBinding.llFatTag.visibility = View.INVISIBLE + } + mBinding.tvWeight.text = formatNullString(it.weight) + mBinding.tvHeight.text = formatNullString(it.height) + mBinding.tvBmi.text = formatNullString(it.bmiCurrent) + mBinding.tvStandardWeight.text = formatNullString(it.targetWeight) // 心血管健康 - mBinding.tvBloodPressure.text = it.hypertension.toString() - mBinding.tvSystolicAvg.text = it.systolicPressureAvg - mBinding.tvSystolicTarget.text = it.systolicPressureTarget - mBinding.tvSystolic.text = it.systolicPressureAvg - mBinding.tvDiastolicAvg.text = it.diastolicPressureAvg - mBinding.tvDiastolicTarget.text = it.diastolicPressureTarget - mBinding.tvDiastolic.text = it.diastolicPressureAvg + if (it.hypertension != 1) { + mBinding.llHighPressureTag.visibility = View.INVISIBLE + } + mBinding.tvSystolicAvg.text = formatNullString(it.systolicPressureAvg) + mBinding.tvSystolicTarget.text = formatNullString(it.systolicPressureTarget) + mBinding.tvSystolic.text = formatNullString(it.systolicPressureAvg) + mBinding.tvDiastolicAvg.text = formatNullString(it.diastolicPressureAvg) + mBinding.tvDiastolicTarget.text = formatNullString(it.diastolicPressureTarget) + mBinding.tvDiastolic.text = formatNullString(it.diastolicPressureAvg) // 代谢指标 - mBinding.tvDiabetes.text = it.diabetes.toString() + // 心血管健康 + if (it.diabetes != 1) { + mBinding.llDiabetesTag.visibility = View.INVISIBLE + } mBinding.llDiabetesTag.visibility = if (it.diabetes != 0) View.VISIBLE else View.GONE - mBinding.tvFbsValue.text = it.glu - mBinding.tvFbsTarget.text = it.bloodSugarTarget - mBinding.tvFbsCurrent.text = it.glu + mBinding.tvFbsValue.text = formatNullString(it.glu) + mBinding.tvFbsTarget.text = formatNullString(it.bloodSugarTarget) + mBinding.tvFbsCurrent.text = formatNullString(it.glu) // 血脂四项 mBinding.tvTcValue.text = it.tc @@ -98,6 +109,7 @@ class ProposalActivity : mBinding.tvHcyCurrent.text = it.homocysteine // 医疗意见与记录 + mBinding.tvCabinOpinion.text = it.cabinOpinion mBinding.tvCabinTime.text = it.cabinOpinionTime mBinding.tvCabinReporter.text = it.cabinOpinionUserName mBinding.tvDoctorTime.text = it.expertOpinionTime @@ -105,6 +117,12 @@ class ProposalActivity : } } + fun formatNullString(input: String?): String { + return input?.ifEmpty { + "--" + } ?: "--" + } + override fun bindEvent() { // 绑定事件 } diff --git a/app/src/main/res/drawable/bg_gradient_underline.xml b/app/src/main/res/drawable/bg_gradient_underline.xml new file mode 100644 index 0000000..b4d9447 --- /dev/null +++ b/app/src/main/res/drawable/bg_gradient_underline.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_gradient_underline_reverse.xml b/app/src/main/res/drawable/bg_gradient_underline_reverse.xml new file mode 100644 index 0000000..f38593d --- /dev/null +++ b/app/src/main/res/drawable/bg_gradient_underline_reverse.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_gradient_underline_vertical.xml b/app/src/main/res/drawable/bg_gradient_underline_vertical.xml new file mode 100644 index 0000000..90b6d97 --- /dev/null +++ b/app/src/main/res/drawable/bg_gradient_underline_vertical.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_gray_round_12.xml b/app/src/main/res/drawable/bg_gray_round_12.xml new file mode 100644 index 0000000..16e1568 --- /dev/null +++ b/app/src/main/res/drawable/bg_gray_round_12.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_gray_round_8.xml b/app/src/main/res/drawable/bg_gray_round_8.xml new file mode 100644 index 0000000..535b702 --- /dev/null +++ b/app/src/main/res/drawable/bg_gray_round_8.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/bg_patient_card_gradient.xml b/app/src/main/res/drawable/bg_patient_card_gradient.xml new file mode 100644 index 0000000..3f16431 --- /dev/null +++ b/app/src/main/res/drawable/bg_patient_card_gradient.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_red_circle.xml b/app/src/main/res/drawable/bg_red_circle.xml new file mode 100644 index 0000000..eb9a477 --- /dev/null +++ b/app/src/main/res/drawable/bg_red_circle.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/app/src/main/res/drawable/bg_table_data_cell.xml b/app/src/main/res/drawable/bg_table_data_cell.xml new file mode 100644 index 0000000..5bacb84 --- /dev/null +++ b/app/src/main/res/drawable/bg_table_data_cell.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_table_header_cell.xml b/app/src/main/res/drawable/bg_table_header_cell.xml new file mode 100644 index 0000000..8bb46e1 --- /dev/null +++ b/app/src/main/res/drawable/bg_table_header_cell.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_teal_alpha_round_12.xml b/app/src/main/res/drawable/bg_teal_alpha_round_12.xml new file mode 100644 index 0000000..df1e42d --- /dev/null +++ b/app/src/main/res/drawable/bg_teal_alpha_round_12.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/bg_teal_gradient.xml b/app/src/main/res/drawable/bg_teal_gradient.xml new file mode 100644 index 0000000..79094ed --- /dev/null +++ b/app/src/main/res/drawable/bg_teal_gradient.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/app/src/main/res/drawable/bg_teal_round_24.xml b/app/src/main/res/drawable/bg_teal_round_24.xml new file mode 100644 index 0000000..f4768d3 --- /dev/null +++ b/app/src/main/res/drawable/bg_teal_round_24.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_teal_solid_round_4.xml b/app/src/main/res/drawable/bg_teal_solid_round_4.xml new file mode 100644 index 0000000..295bca4 --- /dev/null +++ b/app/src/main/res/drawable/bg_teal_solid_round_4.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/bg_teal_strip_top.xml b/app/src/main/res/drawable/bg_teal_strip_top.xml new file mode 100644 index 0000000..01e520d --- /dev/null +++ b/app/src/main/res/drawable/bg_teal_strip_top.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_teal_tag_round_4.xml b/app/src/main/res/drawable/bg_teal_tag_round_4.xml new file mode 100644 index 0000000..a6073e3 --- /dev/null +++ b/app/src/main/res/drawable/bg_teal_tag_round_4.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_teal_tag_round_4_small.xml b/app/src/main/res/drawable/bg_teal_tag_round_4_small.xml new file mode 100644 index 0000000..5b373da --- /dev/null +++ b/app/src/main/res/drawable/bg_teal_tag_round_4_small.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_title_tag.xml b/app/src/main/res/drawable/bg_title_tag.xml new file mode 100644 index 0000000..6feb8d0 --- /dev/null +++ b/app/src/main/res/drawable/bg_title_tag.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_white_round_12.xml b/app/src/main/res/drawable/bg_white_round_12.xml new file mode 100644 index 0000000..5243140 --- /dev/null +++ b/app/src/main/res/drawable/bg_white_round_12.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_blood_glucose.png b/app/src/main/res/drawable/ic_blood_glucose.png new file mode 100644 index 0000000000000000000000000000000000000000..eddb2e0219e650255f380b91fe81d02a9a3f2597 GIT binary patch literal 4614 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_blood_lipids.png b/app/src/main/res/drawable/ic_blood_lipids.png new file mode 100644 index 0000000000000000000000000000000000000000..cc527798c468a7a5e532416c7979408d6d4dab7e GIT binary patch literal 4023 zcmV;o4@mHdP) zhtNI{*i#lwlX(ZRx)G1!zy)l=N3RWp-9DR-AOG6gR{9XyS%cNq8rZtQRpi{RDAcZx zGpP{2FQfB804>$VQx_Y7^RFki+&brcTi7_8m-M8E)~~lMGx!oKwFwXsxb)+rz`G_# z>W2>V47_;}o@onrP@op&FZ;*~-+p=5G@Yk*R+inpcCDFc3|1?twkTG~2q&pQ8LBUL zEE(^;Fmr#wb>nw384nP%hh9@L{fZGfz!ns3LL z!Zk-k?@qpMyQTs)|HU`*j_ckH20w{60z9&m;@>vd-!lBo8xnLLnm7~Ck#Ou%83zBz zQZ<7DFszz}g*Rr^ff*-Mjs~FG3xIM z$$yxXoEu4jqJkuOdwI%y{KCxk>aY4Ho!L5R$#4x8^a_?Mnb^fF>nRodJ{E7%`39>! zJ#qK?x*#;RKmUUWEY@BvfX|9AB=T zL+1;u20FNQZLC@?eNBbxTBW3khn`UCJMBVloxOEy`AmZ{{NI60W()cw+>A$FVQLLS z`tHczuJ5FCZ0`fxyLz=H8iLQmeSaueIV{0FQa`N};$P>?wi2CXW2D@c7XNiD^e%i~ z1Yki@Ug%Zj-;dq+yD2({_J6=?7d0=4U&`9uB$E_M_)NZ035`FUckjJf`hbnsZS(tc zqmPpBZB`7e=DaGa6J!SlEYHds1%eTH8P-^vRqqm2Q1SLeQ5E|p5 z?Q}S{8kSy=@Y6wMULY5|I2_RG)r8BzCs(U5_%r2umkSjdqytPZI}8*FBv8wgq(hL& zL*G6UyqTto&vI*P@x5RpDT$)LG<#l1at;1O=0vg#`B~SehfV=~ZS4wcetcCzLPfbr!Fg`q2 z`Jq6Pk!Ex2L8GbV1RLfIGK^+i7X!@qs3G~3DrfH`H+}SUk49j}Zn-5vaylafHN$NL zrk)5mSl@c@V_ChBkvndP6B{>q7GEc%T27klk_;uKV4({P7)yo}eOf9=XW^32>Fk2N zq^(8=t(f_XsIfFXMC1zQ$R|pj zB$FPlTr$j-c53*-&15#VkiX|;MI$Fnv#y@GuHIxe*l^-~fj8O2k}Xn!9TW?*Ovf#- zFp=}rGzNT|Y$s2q(G7F_6M5ce0Qiu$uz*yVkf_TrufsL74noEs>B(&O)%x{LK*2^l z{v!Hgu%D=*Q&Djn>1Qp9Ft0}<7N`18T~B87Eb?D}k>tU>92Se|AfI1Mm5NDz6`nS8 zhUtt_;G@zcAq&NsvQl*jp21~PfDB&oj#3cr$H;r#%setv(BhvNXv7 z=>GBK?kwxF%JU3E(j5G4odT$%BVv(Kr@|ey)C`p5F1v*6#mh+^c$4Hid#DD$XH_lP zs!|E5T$TXovEvS)FO2%DdJq6XLn{U_wg`d}$X-xB00vc7zlcuJijg-r! zOa-L@{WMp#af+6te#&IjNnKN_Ztd~ika=5i28tr2l7~&3BoEW<*RUes64OC zp>|EkL2)`}JC;W?S~@8`Vk`pshj?WQ6 zPXipu__iEMyjPALJNA04DKrc=MNIm!k{xhz$wI?k{2Nb_@2wE|iC5W;l|iaBKJ22Q zzO35ua!@8Y@}5EOcD^#y8798Cq>2l5c%Z- zGCwvU=5iDM2UQ{QLL-vFbjA69)9UWQr;L_{E~bK;Fk)UyNl~53=UugOnIV$(Gu6b9 zlG#aC28`(Y0jv>H90A-pe-@dp0oNh>j80P9{5GE7-NwTMWOQJ>_D+}b*-nZj(h>WT z=~)ye>#10ngmjgl3{|A#xzIk!BS>U)P9dq$@eB5QLFyetHoK?JXZLgP!N+AH><$&T z8!Y28S;xiydXn4~t74!A2Zh2V!Z3@nR4B7wWzo=_<}0qbEQ){-IrfF8U!nekBdVC2 z8BR?!s_85liv^XyE8O;4Ml^>4US-#ZcmN*OXEYC|$Ei1>RD<8MmEC z^G{Mi*8{*Q*_-h-NUDY{H310q!CL9WS`X+%j48Hy0$$uJ0#R4yoFHkKm;MfLhi z2ZZgydzhk-t~C4<0kI;Eld(Nv4Q1nT`TtbYj>5CgTf9&>G*Q%ee5^+^_T*n~qU+&BX;!x(}M zq?@U6H`x0NTOQimCx7`?KcE=Abmd|MTf%?l`y3qZrCJJ9`UuL178Hx8$Z_J3H4Vfj z)3gEjsIV*=f{jLNVy_%*NiW{L?vkix82N)6;)=a*VJV%F=}zivEqf8YnfE=0_okG%()V1V7 zy71DKrGDu!PDQ*1;}uywn!a(yC{2i z_tWHPfhLA?v~SN|8XFv;+*Bb-4sNmy!Bs&?`HYci?jbK0=fgR_#aklg*I}ZiAgRT*3WiSZt0G3|1<3pq+1*RY=v+wQk%J`rkEj4?mqrJt zjbv&c++L1$14^cY(V_0}P_HQu_eucl{Y5{88%IfOz`Ny2%R|G2TCPre)kes z=Vi)Q?i0LydsqzPdr;Htg~c>?9Vz+N5*=^Sm|7owv{;$Zco(XqoAJ?0=$`^SRAvl4 zR#>_W!A;4PVo?6iANpjw(z)_#ltoU_wCqEiNbNxYLFAGDs~&}waytUiW*wABV<>*c z1!NadW+7{7FSt~#A~KK>+Piwlv`g^dx2UP980~x7rh+M0b~DUX(QHT5FQ^)^&FYTY zNlH65iVe-77WQcT`jY0#r=wKWf zp_ch=A#MCl1KH*eP+(sky!x}_{?4E5r*giCK${D>TZYVLBjR;D6*v~#WjIa+=CKg* z%J3^5r5YSszOtJ;7tJPpLK&#loJ!tzZg{x&<-Ah=-ZN(j}N;;uzA zjin#CfM(53pk(|RNOBW&w(r!|hTog1rbb^|Wk~TDZfC37TS(sOM;!W@bldTM&b(7S zE6`(ODN3a_L9+gYWnhMf-x0xn)VU{)OZJLKkRc9>M9QWa%}FtTb zNKb69{r_N724g)hQ0SP+O8X3M?O16f>uxvFjh8!DT`R1G%e358RRxR+d`q90uQ>A{_sR zkR^=T4<&%fgB>(c7^Jqg%BcEp_s2MSXmfK+J%0G9WXI88$*vc1E-s7gp5w>) zhTr~w0Ph`)78aNVwy>w<&|keAM`L1Il*)hUj8FUtZ9lw^{`O?F$ScmJhAT7hc7|>v z_$_y0>|lT6Zec+$^28A`;IiyH#qBeH%^l}y^vFz_yv*LY{4CWkwi|QOTZz+X_ijpw zj%f_Q+z!eN9B~_|4D_*M89kPguIsXr!wMx9j7|SOcibmQDM_goOgcZMCd*%HU9Fe7 z@OTN4C#vIFC$q@kj;L>qDpon_KjsUit|KaYMWw*o#q#KrvNZHN0PT|jB!fIml_!R) z&-(S+uU=IJ?FGV}|KW;5uLUB@joWYx1bj_J!0WkgAYG^EwAE^~;#aoIYW0hx(h})3 z2W^{H0G}3QW$23&75|f=kx}3>Z*GSWeZGI(sBa2a&0xO}h>mdgd8A0qy@1ZT%RG z;{a`CZCS*Q{aSMTgU)d21VEQFT3jFPep9#>M?No>{-85F{Ak!!k*IJn?6jXs$ z!f`|3Yf-QiSys|2L)eZ&#~Z#+IPOm)`6MX|Y=9Ogcn&`#hJq*I1qi_1VAK^f*Suwp zvzvmprMkG_fF+*QYd_*OZ`;V%nd=>f_>vW4Q;8(*r3X;pWH z{B3pUk;Q#SA3DMWp8=gFK_-7Zjze0Qo1=2=G)2)X#+WPkRrf{%_z>`3w0o{^S~|kW zZYzmoOCAWu-Cx4AySZu%iW&b!VXicjy9B%U*yDwR_uoT)FoKIN^`DpNf2t{s6Y}H= zb(`PD`LAFAZvuR{De&yD6|!-bEtVU?qpEPUfF*ICWJXVbvx8H_-q~&wIUdnNj}bli zI8mYC(#p~lHRk7$Cy1))5Mu!Aa}rKKQjVaFlXQL_*M5@1_TLz@`sa*Qu3q2u+OZaG z>qqL5vs$SH_PkpxAMz@tzh}mb)1cDDa9g)U1!_H z!1ars^Esw8rq&D|?I?m$g9)Dn=tB<@&3>Qgt=Cae6EHdutkcE1bfbBa$ub26fOj4to%{oS_>1WIvhDuEa)=d7=11WCsD$-^kar2jpMoCCte_0i zEI9l3Ge1l8DMb3+(?s9?7HHGNU}RpL!q8_c%Tp*&u*e~!BxaOGoRs~WGE%6~X%bPV zdlo^sK%5^1ZT{4lANd=A_sTn2%j%B#f)^@+Fw;`-FCcM-@i2D73b~vkEv+%gQ{G5s4VU#(W2$n=6#1h6R?!Iq)A<`lP9^re`jkAbX$M&0%Z8OGbAA<`qkaJKbAA$KpqIqAgMLXARz94}&EeXxF za-?|x(H=!f7@XS{*!Xr(?jX_JEYbOM;BJr)C^KWQC>oCynI+(?+pHVkzhaaDwWEXz z^$JZ)?>9lQ*1Y)M+oIF#6o-aA>UNf(G;_$0!_=*OYD2^?(U6cS$PsJV^i!mW`3#DN zJ21CVWT@Q%=sT_K5xxDrJo>s9>5K{+K7%fuGFw@yBBCkPCZ}lkfxERI)UKR6J$vQM z={crTjwoYg6&vKmJO=9$Q;)5y3JT8l?g(#&N=8GbGn)86!MR3e-Q4`Bnzxm+Wa6c zDGA$@6d59a4`1`#*aum3Pz3ydC7x2uFi4QD4xW@fCum7ksZzEgYAmiNHSQDjG5mauvy@!CuDOziStOUC1cz>*8?4QbIu=mnAq49stRLEv*%YY zz4G$xnCHghl_4V(rpfk^{RY6JuEuO3<4i%Wsfkx<{>z8g-BRFT5yEVUlTu3ap> z&=>c>cbnZj%z@i&vx>{us>`c!pxaKj!W5E{ZE2Bu>sS03RUC!Ifz7IH z=Y+7c03k~Oy1)1~hEd=6r;w=8@nNcOo5H|PQJ8*r-K%&`epAZ=F!9>P&X!cA|4_7l z{=59SkAEJO6A9K@=@qGDT_UZ@^rCMP_?5i%)yHI!@3hmb)Nb3k4^kbX$bE%|hns7_ zk&%W_zj?>neP&P;~$CkBH~Z{a$Z4Kmhz3F40zAmWYTC27EYj& zGHbXjwNgtLfQ}r-C-uHs2UbH zgrstsIkJ!T9|8`3h7A7#*1QY$32PCrH(jG8q{MMq;`^PrQ2r;wOe6CjT5rC8vetTL z$~r?Ui(maCqBmY8di1kIzx!uM*dqWB+ALkomvv!iHRCE~xIvwk{Y{LSiD+_1jUIgL zFx_$QE)3`miq+?^0=lr4lPBzWr$0@!&F82~s6mNzjVTG?zYp%YBI@2_@5?rsvk2+I zqHh1XZeI3ZJDFG1qmK~X_eeeqg<{TSm2`~|Kf+Q?(a5#}+jr+U9eHpc9Xa+18rz9! zVP7Me{ub7cv)8Wp*_x%@){={D2kW%NS1B)xl;Z`C9ts+lzbeD-(LD8UVgJU~g7#{z z?{^>uzwj*4;Ro{bX^f?s;@M|=-7cyfKQ(q$AGJ@x@_reP@jpIlmCx2+M15V7zuj3W zIj$o_pkj?(KJKzOoc5L$o)=N)5Ein|y6$b|r2^|IMV!yV#13Qbdw50N{m}Plq%NTb zC9G;X7{mv#8*i#k>))4O{l>X^{cM*#^P;*zkNsuaF+o=YVWaLz?I|ux@R23%_)gkt zj|I)e=VW{N32ZC-h|aBTomnrF#;Fm`h3-)8%eq*8O$pJJ+G!PQqa9lQu_A8|C^M3< z6DRb|y1HhSkM}dtOKfy#I$cUz%uSq*lAN(_QWm~@x$95-h3mNQc+KUfnTn^8Zf3h04jWI`%cF%vqK|!K6gdBeBw)mqW!u3ge>b?5T_iH`^{_*L0n8y;{Y7 zVM8|Bm{i#gK)8ZbrkHS<4bqFky}Z?U*a4Rgr2}E*J3D z#Ar{Xsm+)I*TPREER)v0NKB2Q&UUZUJP3<0g(Y4EJS}04tSyT1)F#UMRpq(wsi5>u zD*Y>ti+5f|LUmK@^`dknX_yKpjJhfw)wKknQZzZK?3=kBxB(+>k3RSrfS>Ei1_h4e zwXi1~cu5=w@D@Ix$<*Nv!{!ZkM5 zs-3RG;}F(Aj=V}-?-WzoJ)6=Cuc$uzHrrK|*Nh;qd3H6FeLjwL=%lH}vBt_@dC{s8 zh&@j!N;sUDN*snP6L3zcF_OhfFst?ejfIQOI|pzL;1Vrni7+g|wpHvoQRe?@!bwTA z6zyKf=wU$*x(&Sf{`d^uAVY1)8jvijYk`r&dr#uzPP=iDtw4KHfbkgG5^Ck;SARW z7i}&Q0LDNVk2u3iDRR^NH!wyEqc_Y$99T;T#c13ZGetKsITl-C8Xm4UF1bF?<3NrgHGTf+GTeJ$W? zfZRUdA2|>^hy%U1!{{WN~m@Vd?cemH2Y_4iDI%M|)>i?6Y_impd qnIV7B58LeL>%ZH-eQR+WkN*YW7t_~0W!h2z0000vYsG;+X+ zowZ{-j=k&b`#xr-XYP89?S0q@>_3k@UVHD{d%kmK=A3iqI|Rx!Aq05~Kne8q`586V z`*pfSC(8F#LY4^tiwiMi3Vz0NcvqI&|9s=biNssmwlTPlM#>4_J1}6}MCgVpUF-C# zbcL>}nyx5RRTP2)fC<5E&Y8)WmEulh(sG`uQ^es1moLx2Hvu4pcb^{*c>UR@YIX09 z0HuDfsuEpM0ksEZ>Mo9Ea0CYg0cpk{Zrh1CbN(9XzxMoNKWt6FjR26sj}L(-1*6Z@ zYIJAFFubTeXo><9yE11y$L{bPh?HYP%(5~u=DajyWy8N-xiSm$w7JiN&SS^aIJvy3 zTBAFvQFxGQ;89i3B>>c3S^%eDx=T<7UPlW-P}8AC*S#UCJ+V|(xAX`>uN%Of4YySX zRJyxL(}Vb#6D)-h;u?&BaJ4l#gDiL4PaCH}T0&aMkAQ=e2C8+>bE!xqI3Ivn2qofd zWN5ul)f%NnhAOpIP^5sERW_qZb!m15g%4zs@b{qsI65{08Ppcn2*QEsPidDl z0vR_=I2)gYcSZ-nhxa}ZTB5HG*8Kd1?(TPRNXZ2`YZ3luVxr2i?9&Y%UkmPc^5#%K z{9`zRre?U}#n*!gDY#ja3RV)ZF&*rI|vZ4kS3N>Mcvoh)m2**fMem{@K2=cIOHAG*W=ug|aBHv{HZ(NB zJ=L{PZ+P5k8qH?llh{=_GCB+wQwi58m7hE@$sP9K*^OI!3&x!kLi?zU0CP-*PK#Y`hsfM0Ll?Mdn^d&*)%eN-_uD9*Ky3kqZnxBqb$b2pduEjeDaz zi;md;@u1hc3_2%l^U0`fdZh4&>Xt&SVYu-iZx~!FuC@$av4tQqjEe~~lRYppc;vw7 z(2wz2RY^+_xS}$;y5#i(SFZ+rS?hU>3EQhREr{+J;{tI3*y*@s zzB+MD+toSv$*&Y5{)9t4B>*H*mEV+|s_x5|eIB7~@G0b33^L6aYz$0FFe}JGU~Vn| zj>#N5#q5EU&B6w6>h4%cvMu}fSNp3xAL78(P<%<4sKUOo;c|0RQyPOw*H~}w2i`zn zy-w6E7@+P^frR8kG53mEjGsXO-B}(u^!dPN$#BQbZs0++Gbna1E|T3)+zL{UI~VL} zaKF=20J;;6Qk({o!0zRo(`?pBEL&z3L_BmhcfEJ84QJ>$0x1@jrSq7WH(|&(k`v%8 zbiDNW_Pg(nP{n3Y+^?bXqDp}ZHa(N!P|m3mqE!?CgytPVDhpr%Z4tmCfSeydr_p%u zpm$j|t3eIGaK>YgY}%BWo4-|}DKbY}bM$cQ5>32rRe8?aj;D8tF81DW_;Bmo{H-DY z?)bsIw>yl#hnetC&^0YZ|I~m{YO6xU`)v=b`R>g8ts(#vhdqaL&;YaF<1kQ&Mk++O z9j68=*c3sOhtVMwiwW}8=pm5nqLKhGsgjYZl$i}yuT^#mpj`e~@jbBUh!z1X0$2pF z2w)MwA^Xey~H5vFe!ao9vq=H#_;bhOx4zHJ^tTwq{8n8xpWLu@Agxe z{l>hx1T>SePon1ERQTOJT_J9&{ZQsbJ(mrmAUu9a7b2^CTl52q02TpM6o3=YNK&HQ zjxD(eT7DIbm8mO!q6VK-B@HJA|W z>5$0P4>TY8TTK-W_Mm_}NwH}_J`sQKD_cL{_gha@>&A|trult}tRGNZj;LJyK$_Wq zi6^w(yDlAnR28rXhxtnAm_j`sqs4^F`T?Kc`Gb$rC&#UW{%TClSxJ9MiCWGx<(`^wC55_$NZ0syjppnb)P%@;G79Y{cVuQ|DV zq*mAAv0H9~bq&j0(n`sh5i=SwRZEbg_CJnY^&J_z{0L4DEhF5)TMt~*YYG?P8|Tk2 zxyqbVuMb^pmZqJVtVw?Gwm=Y>v*pkpLfXz_0Oth8khVK9IRS@8hoC>5oK18WHhD41 z73ZNZkV`J8ABguy*1a{>UvD$+YB-as4-nk#(Hy?LIHp=IV~DkL{xKB61haODe?se1-GI^6n_S)S1G zc&MRjYl2i$OFbb^*( zeF;xwxBc|rC(qA3gD!{#s15sB(+X%qj@Shu#0>$NqI`u*(-Lx8<#fZg6Q7+3hr=_o z@7Y%S2-#9$vrihl-d1g@grjSC&@JI`D^@HX1R5K1|FEcP+_}|*Kv0_Q? zEDJ;}i`kr=MKY3kR0@x;Y=zg>JP4Z`ZU!IKa&rwu>IbH*B;Ru6;_<60{HVT>|90i= z$Mm?l``o&9(NY=q>|KBaWI7T#Xfn1DJ2lX`H2VVZ`|o@Y9&c%d)3FKoJRWtcWv-Z6 zK(5%;Ab`AbqsIfQ0#&fOx(3<;A;>tkIc}P7ZmO?Oor2P>z?z3HU8&xLUCt;pe zbUmR*^swR4&KgzQ88URwtYWqq`#nGRG9u!-fi!0#md%MrFshToUrhZ`3GG9x3^j%x(>u;=_Z)TJA1DYc?1gI(t8k==Wb<7Dc@DVp9 zz|G0!jv?vY*Y@55NN3ysv=ao*sH{ON%5mHuzNS5kpnh;Cwf^0f_UniE|KTt&;G&mY4qW}N^07*qoM6N<$g19bVbpQYW literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_paramedic.png b/app/src/main/res/drawable/ic_paramedic.png new file mode 100644 index 0000000000000000000000000000000000000000..7687183740361da310c37bf013f0164bfdfdf90c GIT binary patch literal 8612 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≷+Uok3#@9EeU&Aa zgZaMQqjo-5eqY`ew|ekVW{@KfGaG9cSD;DSO5Rk=Tff4Q*~0Ib$W@=~@h_GzogljI zI--$6;eB~a+zH>ebSykW?a(+QCHnZTn`YQXAiYR(|lq!{+_%ImCXAJ7}TK$aq4kS5H zk{^Zd_7CG(?7P{1ndz`58u>Wrc{>_(>EhC7g2Gd&%X!L0|ET_BO`bo(t! z?19Xjm_WV$;=Mp^|Hb{{{?7bTu{KC*rj_iK0R`mdcx*XJZet)nd+3yWEU(C;gvpp$ zjIIgvOG|%-sd-vAtn5Q^h)f9}e@CS~VB6MPVZthw24uqyVILoEA@G|?d0OLV21hT1mVR|3hwx#&k zlSk>h$eoTF0XWE$frg=4>d>|%D7 zXmA%<12%mOb}<-aTGgC=*BGW$n7lutzbv@o=1Vu_?)f3nUygm3qWxI5^WCtRuaaEE z+UJlA=7-4Jjq2;wYl!|^HUBGT3DFHJ#&07%RglwN@?)bxDw}$W%-&uzZbBnJ?1Jc! zUPWN~DI`1s0<4%RnQAsQKeIZ=YQcs^u5=@-Q-SHXF>O~N{RWAF4^z{AGJIQQP<$YW zOq^kFVun+j?gqvkE{fmZdA$3b$q(n+w@2+;5H%*EUljvbt03bJ=s2nG zi4M-3EI<4ALA9~#7!?pT)L*x{?>5j>V>5Z~_nLz{tL~?Pxcb4Ukf}Bq zjY+v?!X{;u%ZPyY_kg&Hbjb&I>2HnnA^a-36oQ5BKrymM@{>5AH*OqhyzrK~`lmx< zg-7n%NsAx*30Y$eQln*xklM|`r^uWUpz4Te1*95(iQI0<{+?}udlZ>#V%JPfEYqq; z&5kt`Nov+x`X8HqzHVz+f&<+IWSqkkjb4_&4JhnQTs*{npI({ZT~d0%|?;4l3-LpP22 zG>Gik>RNQHWob{Vmyu9sP+IcuwFM2NbVwU&fQ1wa{)vl^FiZmZRHgGh&c1?!5OBkywry&Vq#rb&p#XM=UmdPaP0*|Y!6 zRf+j_S`elf5j+bxhmwMZvEjT^QAQv#rFG6lzdNjS5H{YX#!bx>(B?;Dq`PG^Gn8L#xSEYSP9*^)u+*ZO)t$k^z(*8wgOtg0w6REtsX+O zJpqdlSQ~4X_hX?etb-s}hdvlC6@ZJSUF~*-2kn=f&_hF!Nom8d6le*%@#6rZ1FTR>Viu=RL25iEyJ`Cz$E^1AdBs^z>-&a0qi2a@)O%z*>WdS+7x z<{l6db~M(duuvf|#f5pvw^h-%s|8>57lSgi=vIopkGYyDdo|FLM_zMFWboin=BSA3 z;4Vf>S+O6QwZcDRI7pe=T#gW7G#y&BXs(4ImDhB|u%K!V$<$9GG*XosF3=_8CECVm z92HX3(IP@$tbe#jm%{=o5K735hmo+`k$WUE@NgsUrKu_R49#+bYwsSQ4c0JVBU_j% zQ7{IilIsV!2H?&|)MaF%L^8($;dL(`#cxhQQ%9-e=7V>_gQmi)VmiHW$f_oAifBqZ zYRFU_Nv}0zEQAuGAvzaS$#Ds35@sQkp%QvcCECilA667%tvyf>7Z)7bjH+sD2+#sc z;w@AsqE2A!WoU7Nx{a%mo8>xYGYxZ9Kh5q0DE8K7!t`apRaceCE3Hs4JWoEl13u58 z?-T)On-Nqy(Pq+>{H!CR=-r`C>eaM#TP+QvRZ~vp*@uUbW=?_Gxt5HH;Zl<4gV3bH zG4WbIDKR5<4a5b4s}yq`6KsjH$X^hWPL4`aQcX>#G8JpqLK#?{>Fu`n#Ugqdma%m*qH}P}n8`0F9m~^x? zt=VeRRUmL!rezT`s&o?bv$Bw*XvVxs z0kX$h!w&<+!blQC;@3zk0K#DkNMdFq;(+7y6~xGLhfY2}tDh-umi;xC#^)L|!!lwP zJ#E4mxeHY!>TS4fG*V5kUOj@~!L1xN|vm1=GYbYX=Q5~yUMw;5rt(xdGA3fuH`nd%%3>YZb32OGB!lh0km~n*pJapK_ z!af&CA2ztuF=Dw(x$%3gRTusYeNwe^@Bc}xI7?AX9 zS12w}5X3|rxL#T?Vz591)dCggo94vx^K=MINnCnrleiL^?yu%)2u1v{O}PjSA%iE# zXDBg_H>TO6Xlrr{^%8srw6hUha&dC+=|mcHT4z!xbNsmpQl390sa)2ysbHYRMBDq0 zMD+A=O&oO#2)ifhhQ2=&(aaJWW2n35TV~(VTr>2TMt)Jz51#`1MR((lf70x@ah*tA@}t@{{`x7YR^50#e-j5=lylJ0n7AuCX}? z^+HkQ;cs3><*{P011_@wzxgtgm$7qR&Gw#xP2)&n|2`vkCMRy>KMU=^tn@NY-wM=x zxusu25@(#6)T=%F#NT^66X_gB-2Zr0(RMI;`z0YQwrx5Da9%?6Md_IIrtl+1H*vF0 z2rmp_D@rR1T{4p}YjEE$U~WghH(WK>MYnq!k4=F_zaNN~Y_ zk6F?;)R)wO5p><7B?ydrPr&d1=HsC@?-Xe}N1W#k1ip*l5+kUUuAp6Gnl2rTXc0l{ z7~mrdO=T1&Bu7%n6NrG#n0DY&VBrYx&?_sQzj7#?8ZAbH=m7o$HQJvSrBbK&c^fjj zd-rtwUd6aYvfLznyh6jBF#H!_&Fd?o@eQf-frXAgfP=F5Oekv38e!c5Nspw8Ty4H) zpG`{m>Vbw#O!jC~f<8f)0SE2cg#Hc|F@#+55>FDbg2f_0|EoX?0$11xqz_jx7nj3L z*Ny~N4i&k{`^f(fl+s;^clU(inL85d*(BN@L;UWnr5wT>ofX_q3D%u74stecassu z2I^WtK79pr{BWtOA1~P~XiiSar>psCiZlds-$b0?JB${>Hs_BMucRLVYkxImc!78I?Xj;(Ow4a(fgRK{F_mhe`KhuuU zm0BefXaP|J7n%$Y?x8?j;0tHxWft8Fdn-=&xRza1G+d8@y8s*-RporwDo{{D#W;u4 zvf-gP`70FG4)>;VxkA`zcsHS=@W+tNRd|qlc4pW2r+VhtM1P8~_t~f!KI@^2Tr3tm zHHTCFWeQJjqHr%a8m2eaX74y>fQr-31X2#pGZtWRFd@6TgX*2b>gg?8)B&$bri*kG z_ETh4$aow+x$`r?(bX1R(YC50e*_@#`&yt6XUsMPQCFvx-ddzy7sL20IY6|ZlT!W- zZv06YxG#oo4#- zbZc^&&d2puErEwEocQsJ9^8o>MS*pqv8Ei3-u$Kt70oXME&uoGBaQqIYfODPTsq5y+jAgRk=i(Q{+to{l58 zSO@YHRbNXkekdOt9f#KYjwG#{c->RUI=&F2ml)ibiScK}L40OL; zmvmU75Mez+0F2@jIkukNq^Gmi(CZlDf>xdHP0{S(rweC@1e-ORziPlmQTuj~rWB4e zJ$wDLD=uknw8I*V&Y?{PH;Ll`EG2%oc~9E)d;{+_Us&;edLQa+eW`36Gy7ojl4RD7 z<+dxQE->nYc)zXCPC_-;d$FnVJzm3W`8UicYcqb~ay{^TUE{(u`vyh~J0B#<%%2Cp zi9T9h|7 + + - - + android:orientation="horizontal"> - - + - + + + + + + + + @@ -136,7 +155,7 @@ @@ -161,7 +180,7 @@ @@ -190,138 +209,133 @@ - - - - - - - - + + android:layout_width="match_parent" + android:layout_height="48dp" + android:background="@color/white" + android:gravity="center_vertical" + android:orientation="horizontal"> + + + android:layout_marginStart="8dp" + android:text="关爱管理信息" + android:textColor="@color/text_primary_25" + android:textSize="16sp" + android:textStyle="bold" /> + + + + + + + + + - - - - - - - - - - + + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="@color/divider_ea" /> - - + + - - + - - + - + + + + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="@color/divider_ea" /> - + + + + + + + @@ -345,7 +359,7 @@ + android:background="@drawable/bg_title_tag" /> + android:background="@drawable/bg_title_tag" /> - + android:orientation="horizontal"> + + + + + + android:background="@drawable/bg_title_tag" /> - + android:orientation="horizontal"> + + + + + + android:background="@drawable/bg_title_tag" /> - - - - + + + + + + + + + android:background="@drawable/bg_title_tag" /> - - - - + + + + + + + + android:background="@drawable/bg_title_tag" /> - - - - - - - - - - - - - - + android:clipChildren="false"> - + android:layout_marginStart="16dp" + android:layout_marginTop="12dp" + android:layout_marginEnd="16dp" + android:background="@drawable/bg_white_round_12" + android:orientation="vertical" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + + + + + + + + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:background="@color/divider_ea" /> - + + + + android:background="@color/white" + android:gravity="center" + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp"> - + + + + + + + + + + + + + + + + + + + + - + + android:layout_marginStart="16dp" + android:layout_marginTop="12dp" + android:layout_marginEnd="16dp" + android:background="@drawable/bg_white_round_12" + android:orientation="vertical" + android:padding="16dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/ll_medical_advice"> - - + android:background="@drawable/bg_gradient_underline_vertical" + android:text="【健康综述】" + android:textColor="@color/text_primary_25" + android:textSize="14sp" + android:textStyle="bold" /> + + - - - - - - - - - + - + android:layout_marginStart="16dp" + android:layout_marginTop="12dp" + android:layout_marginEnd="16dp" + android:background="@drawable/bg_white_round_12" + android:orientation="vertical" + android:padding="16dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/ll_cabin_summary"> - - + - + + - - - + - + android:layout_marginStart="16dp" + android:layout_marginTop="12dp" + android:layout_marginEnd="16dp" + android:background="@drawable/bg_white_round_12" + android:orientation="vertical" + android:padding="16dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/ll_health_target"> - - + - + + - - - + - + android:layout_marginStart="16dp" + android:layout_marginTop="12dp" + android:layout_marginEnd="16dp" + android:background="@drawable/bg_white_round_12" + android:orientation="vertical" + android:padding="16dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/ll_health_suggest"> + + + + + + + + + + + + + + - - + android:clipChildren="false"> - + + android:layout_marginStart="16dp" + android:layout_marginTop="12dp" + android:layout_marginEnd="16dp" + android:background="@drawable/bg_white_round_12" + android:gravity="center" + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + + + + + + + + + + + + + + + + + + + + + - + - + + + android:layout_marginStart="16dp" + android:layout_marginTop="12dp" + android:layout_marginEnd="16dp" + android:background="@drawable/bg_white_round_12" + android:orientation="vertical" + android:padding="16dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/ll_doctor_assessment"> - - + android:background="@drawable/bg_gradient_underline_vertical" + android:text="【诊疗建议】" + android:textColor="@color/text_primary_25" + android:textSize="14sp" + android:textStyle="bold" /> + + - - - - - - - - - + - + android:layout_marginStart="16dp" + android:layout_marginTop="12dp" + android:layout_marginEnd="16dp" + android:background="@drawable/bg_white_round_12" + android:orientation="vertical" + android:padding="16dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/ll_doctor_advice"> - - + - + + - + - - + - - - - - - - - - - - - - - - - - - - + + diff --git a/app/src/main/res/layout/fragment_emergency.xml b/app/src/main/res/layout/fragment_emergency.xml index 661b34d..d99dfd6 100644 --- a/app/src/main/res/layout/fragment_emergency.xml +++ b/app/src/main/res/layout/fragment_emergency.xml @@ -79,7 +79,7 @@ android:layout_width="@dimen/dp_70" android:layout_height="@dimen/dp_70" android:layout_marginStart="@dimen/dp_16" - android:src="@drawable/ic_emergency_120" /> + android:src="@drawable/ic_paramedic" />