From dd733d93677d093d86275fa92a5503073e9e8282 Mon Sep 17 00:00:00 2001 From: wlh <646507849@qq.com> Date: Fri, 12 Jan 2024 12:08:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA365-=E4=BA=8C=E6=9C=9F?= =?UTF-8?q?=E5=BC=80=E5=8F=91-=E4=BC=81=E4=B8=9A=E8=B5=84=E6=96=99/?= =?UTF-8?q?=E5=81=A5=E5=BA=B7=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zj365/dc/fragment/MineFrag.kt | 3 +- config.gradle | 8 +- health/src/main/AndroidManifest.xml | 3 + .../act/healthrecord/HealthRecordMainAct.kt | 15 +++- .../act/healthrecord/HealthRecordsListAct.kt | 8 +- .../act/healthrecord/UploadHealthRecordAct.kt | 88 ++++++++++++++++++- .../zj365/health/adapter/UploadPicAdapter.kt | 24 +++++ .../healthrecord/HealthRecordsAdapter.kt | 23 ++++- .../com/zj365/health/vm/HealthRecordMainVm.kt | 13 ++- .../zj365/health/vm/HealthRecordsListVm.kt | 18 ++++ .../zj365/health/vm/UploadHealthRecordVm.kt | 59 +++++++++++++ .../res/layout/act_health_record_main.xml | 6 ++ .../res/layout/act_health_records_list.xml | 4 +- .../res/layout/act_upload_health_record.xml | 7 +- .../res/layout/layout_health_record_test.xml | 1 + .../mime/act/EnterpriseInformationAct.kt | 21 +++-- .../adapter/EnterpriseInformationAdapter.kt | 10 ++- .../EnterpriseInformationChildAdapter.kt | 10 ++- .../zj365/mime/vm/EnterpriseInformationVm.kt | 19 ++++ .../res/layout/act_enterprise_information.xml | 1 + .../main/java/com/xty/network/ApiInterface.kt | 28 ++++++ .../network/model/EnterpriseInfoHomeBean.kt | 19 ++++ .../xty/network/model/HealthArchiveBean.kt | 6 ++ .../xty/network/model/HealthReportListBean.kt | 16 ++++ 24 files changed, 375 insertions(+), 35 deletions(-) create mode 100644 health/src/main/java/com/zj365/health/adapter/UploadPicAdapter.kt create mode 100644 health/src/main/java/com/zj365/health/vm/HealthRecordsListVm.kt create mode 100644 health/src/main/java/com/zj365/health/vm/UploadHealthRecordVm.kt create mode 100644 mine/src/main/java/com/zj365/mime/vm/EnterpriseInformationVm.kt create mode 100644 network/src/main/java/com/xty/network/model/EnterpriseInfoHomeBean.kt create mode 100644 network/src/main/java/com/xty/network/model/HealthArchiveBean.kt create mode 100644 network/src/main/java/com/xty/network/model/HealthReportListBean.kt diff --git a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt index 47d74f9..0fac389 100644 --- a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt @@ -309,7 +309,8 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ RouteManager.goAct(ARouterUrl.LOGIN_ACT) }else { - CommonToastUtils.showToast("敬请期待") + RouteManager.goAct(ARouterUrl.ENTERPRISE_INFO) +// CommonToastUtils.showToast("敬请期待") } } diff --git a/config.gradle b/config.gradle index 823c8c6..86dd0d5 100644 --- a/config.gradle +++ b/config.gradle @@ -25,17 +25,17 @@ ext { url = [ //正式环境 - debug_url : "https://app.zhongjian365.com/app/", + /*debug_url : "https://app.zhongjian365.com/app/", release_url: "https://app.zhongjian365.com/app/", h5_debug_url : "https://built.zhongjian365.com/", - h5_release_url : "https://built.zhongjian365.com/" + h5_release_url : "https://built.zhongjian365.com/"*/ //测试环境 - /* debug_url : "http://java01.zhongjian365.com/app/", + debug_url : "http://java01.zhongjian365.com/app/", release_url: "http://java01.zhongjian365.com/app/", h5_debug_url : "http://testbuilt.zhongjian365.com/", - h5_release_url : "http://testbuilt.zhongjian365.com/"*/ + h5_release_url : "http://testbuilt.zhongjian365.com/" ] diff --git a/health/src/main/AndroidManifest.xml b/health/src/main/AndroidManifest.xml index e9a2ea7..6d268be 100644 --- a/health/src/main/AndroidManifest.xml +++ b/health/src/main/AndroidManifest.xml @@ -315,6 +315,9 @@ + diff --git a/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordMainAct.kt b/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordMainAct.kt index 3bbeb1f..b472f5b 100644 --- a/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordMainAct.kt +++ b/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordMainAct.kt @@ -52,6 +52,15 @@ class HealthRecordMainAct : BaseVmAct() { binding.proCho.progress = it.data.cho_percent.toInt() binding.proFat.progress = it.data.fat_percent binding.proProtein.progress = it.data.protein_percent + binding.tvProteinPro.text = "${it.data.protein_percent}%" + binding.tvFatPro.text = "${it.data.fat_percent}%" + binding.tvChoPro.text = "${it.data.cho_percent}%" + } + + mViewModel.healthArchiveLiveData.observe(this){ + binding.tvBmi.text = "${it.data.bmiInfo.bmi}" + binding.tvBmiDesc.text = it.data.bmiInfo.levelName + mAdapter.setNewInstance(it.data.healData) } } @@ -66,6 +75,8 @@ class HealthRecordMainAct : BaseVmAct() { mViewModel.getBalanceDiet() + mViewModel.getHealthArchive() + initTab() initSurvey() initAdapter() @@ -155,10 +166,9 @@ class HealthRecordMainAct : BaseVmAct() { } binding.xTablayout.setOnTabSelectedListener(object : XTabLayout.OnTabSelectedListener{ - override fun onTabSelected(tab: XTabLayout.Tab?) { + override fun onTabSelected(tab: XTabLayout.Tab) { if (!isScrollTable) { - Log.e("HealthRecordMainAct", "选择的${tab?.position!!}") isSelectTable = true if (launch != null) { launch?.cancel() @@ -213,7 +223,6 @@ class HealthRecordMainAct : BaseVmAct() { binding.scrollView.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, _ -> if (mTitles.size > 0) { if (!isSelectTable) { - Log.e("HealthRecordMainAct", "移动的${scrollY}") isScrollTable = true val selectedTabPosition = binding.xTablayout.selectedTabPosition if (scrollY >= binding.clHealthRecording.top) { diff --git a/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordsListAct.kt b/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordsListAct.kt index a08ce83..c0e9465 100644 --- a/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordsListAct.kt +++ b/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordsListAct.kt @@ -10,9 +10,10 @@ import com.xty.common.arouter.RouteManager import com.zj365.health.adapter.healthrecord.HealthRecordsAdapter import com.zj365.health.databinding.ActHealthRecordBinding import com.zj365.health.databinding.ActHealthRecordsListBinding +import com.zj365.health.vm.HealthRecordsListVm @Route(path = ARouterUrl.FAMILY_REPORT_LIST_ACT) -class HealthRecordsListAct : BaseListAct() { +class HealthRecordsListAct : BaseListAct() { val binding by lazy { ActHealthRecordsListBinding.inflate(layoutInflater) } @@ -24,6 +25,8 @@ class HealthRecordsListAct : BaseListAct() { } override fun loadData() { + + mViewModel.getHealthRecordList() } override fun initView() { @@ -39,6 +42,9 @@ class HealthRecordsListAct : BaseListAct() { } override fun liveObserver() { + mViewModel.healthReportListLiveData.observe(this){ + mAdapter.setNewInstance(it.data.records) + } } override fun setLayout() = binding.root diff --git a/health/src/main/java/com/zj365/health/act/healthrecord/UploadHealthRecordAct.kt b/health/src/main/java/com/zj365/health/act/healthrecord/UploadHealthRecordAct.kt index 127a6b1..d072831 100644 --- a/health/src/main/java/com/zj365/health/act/healthrecord/UploadHealthRecordAct.kt +++ b/health/src/main/java/com/zj365/health/act/healthrecord/UploadHealthRecordAct.kt @@ -16,20 +16,39 @@ import com.xty.common.TimeSelect import com.xty.common.arouter.ARouterUrl import com.xty.common.picture.PictureUtils import com.xty.common.util.CommonToastUtils +import com.xty.network.model.EatTypeBean import com.zj365.health.R -import com.zj365.health.adapter.PictureAdapter +import com.zj365.health.adapter.UploadPicAdapter import com.zj365.health.databinding.ActUploadHealthRecordBinding +import com.zj365.health.vm.UploadHealthRecordVm +import com.zj365.health.weight.EatTypeDialog +import java.lang.StringBuilder @Route(path = ARouterUrl.FAMILY_REPORT_UPLOAD_ACT) -class UploadHealthRecordAct : BaseVmAct() { +class UploadHealthRecordAct : BaseVmAct() { val binding by lazy { ActUploadHealthRecordBinding.inflate(layoutInflater) } - private val mAdapter by lazy { PictureAdapter() } + private val mAdapter by lazy { UploadPicAdapter() } private var isCheck = false private var delete = arrayListOf() + var reportType : String = "" + + var reportTime:String = "" + var reportTitle:String = "" + + var reportExplain:String ="" + + private var result = mutableListOf() + + private val uploadTypeData = arrayOf( + EatTypeBean("体检报告", "1"), + EatTypeBean("病历报告", "2"), + EatTypeBean("CT或其他影像", "3") + ) + private val timSelect by lazy { TimeSelect(this) { @@ -45,6 +64,17 @@ class UploadHealthRecordAct : BaseVmAct() { } override fun liveObserver() { + mViewModel.imageLive1.observe(this){ + var strBuilder = StringBuilder() + it.data.forEachIndexed { index, s -> + strBuilder.append(it.data[index]) + if (index < it.data.size -1 ){ + strBuilder.append(",") + } + + } + mViewModel.submitReport(reportTitle,reportType,reportTime,strBuilder.toString(),reportExplain) + } } @@ -61,13 +91,19 @@ class UploadHealthRecordAct : BaseVmAct() { timSelect.selectTime(it, "yyyy-MM-dd HH:mm") } + binding.tvUploadType.setOnClickListener { + RxKeyboardTool.hideSoftInput(this) + uploadTypeSelect.setWheelViewData(uploadTypeData.toMutableList()) + uploadTypeSelect.show() + } + binding.recycler.layoutManager = GridLayoutManager(this, 4) binding.recycler.adapter = mAdapter mAdapter.addChildClickViewIds(R.id.ivImage, R.id.ivDelete) mAdapter.setOnItemChildClickListener { adapter, view, position -> when (view.id) { R.id.ivImage -> { - if (adapter.data.size < 5) { + if (adapter.data.size -1 < 5) { isCheck = true val item = adapter.getItem(position) as String if (TextUtils.isEmpty(item)) { @@ -91,6 +127,48 @@ class UploadHealthRecordAct : BaseVmAct() { } mAdapter.addData("") + binding.tvSave.setOnClickListener { + reportTime= binding.tvUploadTime.text.toString() + reportTitle = binding.etReportTitle.text.toString() + + if (TextUtils.isEmpty(reportTitle)) { + CommonToastUtils.showToast("请填写报告标题") + return@setOnClickListener + } + if (TextUtils.isEmpty(reportType)) { + CommonToastUtils.showToast("请选择报告类型") + return@setOnClickListener + } + if (TextUtils.isEmpty(reportTime)) { + CommonToastUtils.showToast("请选择报告时间") + return@setOnClickListener + } + result.clear() + for (datum in mAdapter.data) { + if (TextUtils.isEmpty(datum)) { + continue + } + if (!datum.contains("http")) { + result.add(datum) + } + } + if (result.size <= 0) { + CommonToastUtils.showToast("请上传报告图片") + return@setOnClickListener + } + reportExplain = binding.etReportExplain.text.toString() + if (result.size > 0) { + mViewModel.uploadImagesFiles(result) + } + } + + } + + private val uploadTypeSelect by lazy { + EatTypeDialog(this,"选择报告类型") { selectValue, selectKey -> + binding.tvUploadType.text = selectKey + reportType = selectValue + } } override fun setLayout() = binding.root @@ -113,6 +191,8 @@ class UploadHealthRecordAct : BaseVmAct() { } } } + + binding.tvNumDesc.text = "重要内容拍照存储（${mAdapter.data.size -1}/5）" } isCheck = false } diff --git a/health/src/main/java/com/zj365/health/adapter/UploadPicAdapter.kt b/health/src/main/java/com/zj365/health/adapter/UploadPicAdapter.kt new file mode 100644 index 0000000..9e5eb80 --- /dev/null +++ b/health/src/main/java/com/zj365/health/adapter/UploadPicAdapter.kt @@ -0,0 +1,24 @@ +package com.zj365.health.adapter + +import android.widget.ImageView +import com.chad.library.adapter.base.viewholder.BaseViewHolder +import com.xty.base.adapter.BaseAdapter +import com.xty.common.setRoundImage +import com.zj365.health.R + +class UploadPicAdapter : BaseAdapter(R.layout.item_picture) { + override fun convert(holder: BaseViewHolder, item: String) { + holder.setGone(R.id.tvNumb,true) + if (item.isEmpty()){ + holder.itemView.findViewById(R.id.ivImage).setImageResource(R.mipmap.changctup) + holder.setGone(R.id.ivDelete,true) + + } else { + holder.setGone(R.id.ivDelete,false) + holder.getView(R.id.ivImage) + .apply { + setRoundImage(context, item) + } + } + } +} \ No newline at end of file diff --git a/health/src/main/java/com/zj365/health/adapter/healthrecord/HealthRecordsAdapter.kt b/health/src/main/java/com/zj365/health/adapter/healthrecord/HealthRecordsAdapter.kt index 6b9262f..d82859d 100644 --- a/health/src/main/java/com/zj365/health/adapter/healthrecord/HealthRecordsAdapter.kt +++ b/health/src/main/java/com/zj365/health/adapter/healthrecord/HealthRecordsAdapter.kt @@ -4,10 +4,29 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.xty.base.adapter.BaseAdapter +import com.xty.network.model.HealthReportListBean import com.zj365.health.R -class HealthRecordsAdapter : BaseAdapter(R.layout.item_health_report_record) { - override fun convert(holder: BaseViewHolder, item: Any) { +class HealthRecordsAdapter : BaseAdapter(R.layout.item_health_report_record) { + + + override fun convert(holder: BaseViewHolder, item: HealthReportListBean.HealthReportBean) { + + holder.setText(R.id.tv_report_title,item.title) + holder.setText(R.id.tv_report_time,item.reportTime) + when(item.reportType){ + 1->{ + holder.setText(R.id.tv_report_type,"体检") + } + 2->{ + holder.setText(R.id.tv_report_type,"病例") + } + else->{ + holder.setText(R.id.tv_report_type,"CT或其他影像") + + } + } + var imgAdapter = HealthRecordsChildAdapter() var recycler = holder.getView(R.id.recycler) diff --git a/health/src/main/java/com/zj365/health/vm/HealthRecordMainVm.kt b/health/src/main/java/com/zj365/health/vm/HealthRecordMainVm.kt index 5775d0e..e9c93dd 100644 --- a/health/src/main/java/com/zj365/health/vm/HealthRecordMainVm.kt +++ b/health/src/main/java/com/zj365/health/vm/HealthRecordMainVm.kt @@ -3,15 +3,26 @@ package com.zj365.health.vm import androidx.lifecycle.MutableLiveData import com.xty.base.vm.BaseVm import com.xty.network.model.BalanceDietBean +import com.xty.network.model.HealthArchiveBean import com.xty.network.model.RespBody class HealthRecordMainVm : BaseVm() { val balanceDietBeanLiveData by lazy { MutableLiveData>() } + + val healthArchiveLiveData by lazy { MutableLiveData>() } + fun getBalanceDiet(){ - startHttp { + startHttp (false){ var response = apiInterface().getBalanceDiet() response.getCodeStatus(balanceDietBeanLiveData, nowData) } } + + fun getHealthArchive(){ + startHttp { + var response = apiInterface().getHealthArchive() + response.getCodeStatus(healthArchiveLiveData, nowData) + } + } } \ No newline at end of file diff --git a/health/src/main/java/com/zj365/health/vm/HealthRecordsListVm.kt b/health/src/main/java/com/zj365/health/vm/HealthRecordsListVm.kt new file mode 100644 index 0000000..934fff4 --- /dev/null +++ b/health/src/main/java/com/zj365/health/vm/HealthRecordsListVm.kt @@ -0,0 +1,18 @@ +package com.zj365.health.vm + +import androidx.lifecycle.MutableLiveData +import com.xty.base.vm.BaseVm +import com.xty.network.model.HealthReportListBean +import com.xty.network.model.RespBody + +class HealthRecordsListVm : BaseVm() { + + val healthReportListLiveData by lazy { MutableLiveData>() } + + fun getHealthRecordList(){ + startHttp { + var response = apiInterface().getHealthReportList() + response.getCodeStatus(healthReportListLiveData, nowData) + } + } +} \ No newline at end of file diff --git a/health/src/main/java/com/zj365/health/vm/UploadHealthRecordVm.kt b/health/src/main/java/com/zj365/health/vm/UploadHealthRecordVm.kt new file mode 100644 index 0000000..7494334 --- /dev/null +++ b/health/src/main/java/com/zj365/health/vm/UploadHealthRecordVm.kt @@ -0,0 +1,59 @@ +package com.zj365.health.vm + +import androidx.lifecycle.MutableLiveData +import com.alibaba.fastjson.JSONObject +import com.xty.base.vm.BaseVm +import com.xty.network.model.RespBody +import okhttp3.MultipartBody +import java.io.File + +class UploadHealthRecordVm : BaseVm() { + + val imageLive1 by lazy { MutableLiveData>>() } + + val submitLiveData by lazy { MutableLiveData>() } + + + /** + * 上传图片 + */ + fun uploadImagesFiles(path: List) { + if (path.isEmpty()) { + return + } + val list = mutableListOf() + for (s in path) { + if (s.contains("http")) { + continue + } + val f = File(s) + val rb = + MultipartBody.Part.createFormData("files", f.name, retrofits.getMultiPartFileRb(f)) + list.add(rb) + } + if (list.isEmpty()) { + return + } + startHttp { + val body = apiInterface().uploadImagesFile(list) + body.getCodeStatus(imageLive1, nowData) + } + } + + fun submitReport(title:String,reportType:String,reportTime:String,pic:String,remark:String){ + startHttp { + var json = JSONObject() + json.put("title",title) + json.put("reportType",reportType) + + json.put("reportTime",reportTime) + + json.put("pic",pic) + + json.put("remark",remark) + + var response = apiInterface().submitHealthReport(retrofits.getRequestBody(json.toString())) + response.getCodeStatus(submitLiveData, nowData) + } + } +} \ No newline at end of file diff --git a/health/src/main/res/layout/act_health_record_main.xml b/health/src/main/res/layout/act_health_record_main.xml index f4725f7..ce1f6c0 100644 --- a/health/src/main/res/layout/act_health_record_main.xml +++ b/health/src/main/res/layout/act_health_record_main.xml @@ -122,6 +122,7 @@ android:layout_height="wrap_content" android:textColor="@color/col_313" android:textSize="@dimen/sp_18" + android:text="--" tools:text="31"/> diff --git a/health/src/main/res/layout/act_health_records_list.xml b/health/src/main/res/layout/act_health_records_list.xml index 87d5cce..6c1e42a 100644 --- a/health/src/main/res/layout/act_health_records_list.xml +++ b/health/src/main/res/layout/act_health_records_list.xml @@ -15,10 +15,10 @@ android:layout_height="@dimen/dp_36" android:layout_marginLeft="@dimen/dp_16" android:layout_marginRight="@dimen/dp_16" - android:layout_marginTop="@dimen/dp_3" + android:layout_marginTop="@dimen/dp_12" app:corner_radius="@dimen/dp_18" android:layout_below="@+id/title" - app:background_normal="@color/col_2F2"> + app:background_normal="@color/white"> () { +class EnterpriseInformationAct : BaseListAct() { val binding by lazy { ActEnterpriseInformationBinding.inflate(layoutInflater) } val mAdapter by lazy { EnterpriseInformationAdapter() } @@ -23,20 +22,16 @@ class EnterpriseInformationAct : BaseListAct() { binding.recyclerView.layoutManager = LinearLayoutManager(this) binding.recyclerView.adapter = mAdapter setRecycleRefresh(binding.recyclerView,binding.mRefresh,true) - /* binding.recyclerView.addItemDecoration(object : RecyclerView.ItemDecoration() { + binding.recyclerView.addItemDecoration(object : RecyclerView.ItemDecoration() { override fun getItemOffsets(outRect: Rect, itemPosition: Int, parent: RecyclerView) { super.getItemOffsets(outRect, itemPosition, parent) - if (itemPosition == 0){ - - }else{ - outRect.set(0, SizeUtil.dp2px(this@EnterpriseInformationAct,12f)) - } + outRect.bottom = 12 } - })*/ + }) } override fun loadData() { - + mViewModel.getEnterpriseInformationHomeList() } override fun initView() { @@ -50,6 +45,10 @@ class EnterpriseInformationAct : BaseListAct() { override fun liveObserver() { + mViewModel.enterpriseInfoHomeLiveData.observe(this){ + mAdapter.setNewInstance(it.data) + } + } override fun setLayout() = binding.root diff --git a/mine/src/main/java/com/zj365/mime/adapter/EnterpriseInformationAdapter.kt b/mine/src/main/java/com/zj365/mime/adapter/EnterpriseInformationAdapter.kt index 25d276f..0555db6 100644 --- a/mine/src/main/java/com/zj365/mime/adapter/EnterpriseInformationAdapter.kt +++ b/mine/src/main/java/com/zj365/mime/adapter/EnterpriseInformationAdapter.kt @@ -4,17 +4,21 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.xty.base.adapter.BaseAdapter +import com.xty.network.model.EnterpriseInfoHomeBean import com.zj365.mime.R -class EnterpriseInformationAdapter : BaseAdapter(R.layout.item_enterprise_info) { +class EnterpriseInformationAdapter : BaseAdapter(R.layout.item_enterprise_info) { - val mAdapter by lazy { EnterpriseInformationChildAdapter() } - override fun convert(holder: BaseViewHolder, item: Any) { + override fun convert(holder: BaseViewHolder, item: EnterpriseInfoHomeBean) { + holder.setText(R.id.tv_info_name,item.typeName) + + var mAdapter = EnterpriseInformationChildAdapter() var recyclerView = holder.getView(R.id.recycler) recyclerView.layoutManager = LinearLayoutManager(context) recyclerView.adapter = mAdapter + mAdapter.setNewInstance(item.list) } diff --git a/mine/src/main/java/com/zj365/mime/adapter/EnterpriseInformationChildAdapter.kt b/mine/src/main/java/com/zj365/mime/adapter/EnterpriseInformationChildAdapter.kt index 74e737e..87d9b5d 100644 --- a/mine/src/main/java/com/zj365/mime/adapter/EnterpriseInformationChildAdapter.kt +++ b/mine/src/main/java/com/zj365/mime/adapter/EnterpriseInformationChildAdapter.kt @@ -1,11 +1,17 @@ package com.zj365.mime.adapter import com.chad.library.adapter.base.viewholder.BaseViewHolder +import com.ruffian.library.widget.RImageView import com.xty.base.adapter.BaseAdapter +import com.xty.common.setImage +import com.xty.network.model.EnterpriseInfoHomeBean import com.zj365.mime.R -class EnterpriseInformationChildAdapter : BaseAdapter(R.layout.item_enterprise_info_child) { - override fun convert(holder: BaseViewHolder, item: Any) { +class EnterpriseInformationChildAdapter : BaseAdapter(R.layout.item_enterprise_info_child) { + override fun convert(holder: BaseViewHolder, item: EnterpriseInfoHomeBean.EnterpriseInfoChildBean) { + holder.setText(R.id.tv_info_title,item.title) + holder.setText(R.id.mTime,item.createTime) + holder.getView(R.id.img_cover).setImage(context,item.pic) } } \ No newline at end of file diff --git a/mine/src/main/java/com/zj365/mime/vm/EnterpriseInformationVm.kt b/mine/src/main/java/com/zj365/mime/vm/EnterpriseInformationVm.kt new file mode 100644 index 0000000..8fd4063 --- /dev/null +++ b/mine/src/main/java/com/zj365/mime/vm/EnterpriseInformationVm.kt @@ -0,0 +1,19 @@ +package com.zj365.mime.vm + +import androidx.lifecycle.MutableLiveData +import com.xty.base.vm.BaseVm +import com.xty.network.model.EnterpriseInfoHomeBean +import com.xty.network.model.RespBody + +class EnterpriseInformationVm : BaseVm() { + + val enterpriseInfoHomeLiveData by lazy { MutableLiveData>>() } + + fun getEnterpriseInformationHomeList(){ + startHttp { + var response=apiInterface().getEnterpriseInfoHomeList() + response.getCodeStatus(enterpriseInfoHomeLiveData,nowData) + } + } + +} \ No newline at end of file diff --git a/mine/src/main/res/layout/act_enterprise_information.xml b/mine/src/main/res/layout/act_enterprise_information.xml index f333f25..595fce2 100644 --- a/mine/src/main/res/layout/act_enterprise_information.xml +++ b/mine/src/main/res/layout/act_enterprise_information.xml @@ -22,6 +22,7 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_marginTop="@dimen/dp_12" android:layout_marginLeft="@dimen/dp_14" android:layout_marginRight="@dimen/dp_14"/> diff --git a/network/src/main/java/com/xty/network/ApiInterface.kt b/network/src/main/java/com/xty/network/ApiInterface.kt index 2cdd428..90a6de5 100644 --- a/network/src/main/java/com/xty/network/ApiInterface.kt +++ b/network/src/main/java/com/xty/network/ApiInterface.kt @@ -1461,9 +1461,31 @@ interface ApiInterface { @POST("pay/toPay") suspend fun toPay(@Body rb: RequestBody):RespBody + /** + * 标准均衡饮食 + */ @POST("customer/meals/balanceDiet") suspend fun getBalanceDiet():RespBody + /** + * 获取健康档案数据 + */ + @POST("customer/user/getHealthArchive") + suspend fun getHealthArchive():RespBody + + /** + * 获取报告记录 + */ + @POST("customer/reportData/list") + suspend fun getHealthReportList():RespBody + + /** + * 添加报告记录 + */ + @POST("customer/reportData/add") + suspend fun submitHealthReport(@Body rb: RequestBody):RespBody + + /** * 商品信息接口 */ @@ -1800,4 +1822,10 @@ interface ApiInterface { */ @POST("customer/user/getDeviceTypeList") suspend fun getDeviceTypeList(@Body rb:RequestBody):RespBody> + + /** + * 企业资料首页 + */ + @POST("customer/material/index") + suspend fun getEnterpriseInfoHomeList():RespBody> } \ No newline at end of file diff --git a/network/src/main/java/com/xty/network/model/EnterpriseInfoHomeBean.kt b/network/src/main/java/com/xty/network/model/EnterpriseInfoHomeBean.kt new file mode 100644 index 0000000..38f4320 --- /dev/null +++ b/network/src/main/java/com/xty/network/model/EnterpriseInfoHomeBean.kt @@ -0,0 +1,19 @@ +package com.xty.network.model + +data class EnterpriseInfoHomeBean( + var typeName:String, + var type:Int, + var list:ArrayList +) { + + data class EnterpriseInfoChildBean( + var title:String, + var id:Long, + var fileFormat:Int, + var type:Int, + var pic:String, + var fileUrl:String, + var contentText:String, + var createTime:String + ) +} \ No newline at end of file diff --git a/network/src/main/java/com/xty/network/model/HealthArchiveBean.kt b/network/src/main/java/com/xty/network/model/HealthArchiveBean.kt new file mode 100644 index 0000000..7ae538e --- /dev/null +++ b/network/src/main/java/com/xty/network/model/HealthArchiveBean.kt @@ -0,0 +1,6 @@ +package com.xty.network.model + +data class HealthArchiveBean(var bmiInfo:BMIInfo,var healData:ArrayList){ + + data class BMIInfo(var levelName:String,var bmi:Float) +} diff --git a/network/src/main/java/com/xty/network/model/HealthReportListBean.kt b/network/src/main/java/com/xty/network/model/HealthReportListBean.kt new file mode 100644 index 0000000..1dadc6c --- /dev/null +++ b/network/src/main/java/com/xty/network/model/HealthReportListBean.kt @@ -0,0 +1,16 @@ +package com.xty.network.model + +data class HealthReportListBean(var records:ArrayList) { + + data class HealthReportBean( + var orgIds:Long, + var id:Long, + var userId:Long, + var title:String, + var reportType:Int, + var reportTime:String, + var pic:String, + var remark:String, + var createTime:String + ) +} \ No newline at end of file