From c8bc5dd436c109edea7aa6459bce6253f8feaa68 Mon Sep 17 00:00:00 2001 From: wlh <646507849@qq.com> Date: Sun, 4 Feb 2024 16:55:02 +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=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dc/fragment/DynamicManagementFrag.kt | 2 +- .../com/zj365/dc/fragment/HealthHomeFrag.kt | 4 +- .../java/com/zj365/dc/fragment/MineFrag.kt | 54 +++++++--- .../com/zj365/dc/fragment/ShopFragment.kt | 6 +- .../com/zj365/dc/vm/DynamicManagementVm.kt | 12 --- app/src/main/java/com/zj365/dc/vm/MainVm.kt | 11 +- .../main/java/com/zj365/dc/vm/ShopMallVm.kt | 2 +- app/src/main/res/layout/act_shop_category.xml | 2 +- app/src/main/res/layout/frag_health.xml | 16 --- app/src/main/res/layout/frag_shop.xml | 84 +++++++++------ .../main/res/layout/item_category_child.xml | 9 +- .../res/layout/item_goods_list_two_style.xml | 29 ++--- .../main/res/layout/item_shop_categroy.xml | 7 +- app/src/main/res/layout/item_shop_list.xml | 11 +- .../base/act/BaseTenCentWebViewActivity.kt | 5 +- .../java/com/xty/base/h5/CloudJSBridge.kt | 1 + .../common/weight/ExpandStaggeredManager.java | 44 ++++++++ .../health/act/UricCalibrationSubmitAct.kt | 46 ++------ .../adapter/UricCalibrationListAdapter.kt | 58 ++++++---- .../java/com/zj365/health/vm/UricAcidVm.kt | 2 - .../res/layout/item_uric_calibration_list.xml | 61 +++-------- .../layout/item_uric_calibration_submit.xml | 101 ++---------------- .../main/java/com/zj365/mime/vm/SettingVm.kt | 2 + .../network/model/PsychologicalResultBean.kt | 1 + 24 files changed, 243 insertions(+), 327 deletions(-) create mode 100644 common/src/main/java/com/xty/common/weight/ExpandStaggeredManager.java diff --git a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt index 5d20313..4b577f0 100644 --- a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt @@ -479,7 +479,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission mViewModel.getAllInfo(showIdInfo, false) // mViewModel.getMySetting() mViewModel.getTips() - mViewModel.getRank(2) + // mViewModel.getRank(2) if(MMkvHelper.contains(Const.LATITUDE) && MMkvHelper.contains(Const.LONGITUDE)){ diff --git a/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt b/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt index 2b5a0c1..042b06c 100644 --- a/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt @@ -566,9 +566,9 @@ HealthHomeFrag : BaseVmFrag() { // 刷新注册 private fun refresh() { - refresh.setRefresh(binding.mRefresh) { + /* refresh.setRefresh(binding.mRefresh) { request() - } + }*/ } private fun request() { 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 8b4ab1f..2f614f3 100644 --- a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt @@ -103,6 +103,24 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ //刷新注册 refresh() + Const.mainLiveData.value?.let { + user = it.user + binding.mName.text = it.user.name + binding.mPhone.text = "${it.user.phone}" +// binding.mDk.text = it.clock.toString() +// binding.mLevel.text = it.grade + if (it.user.avatarUrl.isNullOrEmpty()) { + binding.mImage.setImageResource(defaultIcon[if (it.user.sex - 1 < 0) 0 else it.user.sex - 1]) + } else { + binding.mImage.setImageUser( + requireContext(), + it.user.avatarUrl, + it.user.sex.toString() + ) + Const.CHAT_IMAGE = it.user.avatarUrl + } + } + binding.mNoNetwork.mRefreshBtn.isSelected = true binding.mNoNetwork.mRefreshBtn.setOnClickListener { mViewModel.getMySetting() @@ -489,7 +507,9 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ override fun onResume() { super.onResume() if (!TextUtils.isEmpty(showIdInfo)){ - mViewModel.getMySetting() + + Const.mainLiveData.value?: mViewModel.getMySetting() + // mViewModel.getAllInfo(showIdInfo,false) mViewModel.searchInviteInfo() // mViewModel.getUserOtherInfo() @@ -551,21 +571,7 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ if (null == it) { return@observe } - user = it.user - binding.mName.text = it.user.name - binding.mPhone.text = "${it.user.phone}" -// binding.mDk.text = it.clock.toString() -// binding.mLevel.text = it.grade - if (it.user.avatarUrl.isNullOrEmpty()) { - binding.mImage.setImageResource(defaultIcon[if (it.user.sex - 1 < 0) 0 else it.user.sex - 1]) - } else { - binding.mImage.setImageUser( - requireContext(), - it.user.avatarUrl, - it.user.sex.toString() - ) - Const.CHAT_IMAGE = it.user.avatarUrl - } + } @@ -583,6 +589,22 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ ) } Const.mainLiveData.value = settingBean + + user = settingBean.user + binding.mName.text = settingBean.user.name + binding.mPhone.text = "${settingBean.user.phone}" +// binding.mDk.text = it.clock.toString() +// binding.mLevel.text = it.grade + if (settingBean.user.avatarUrl.isNullOrEmpty()) { + binding.mImage.setImageResource(defaultIcon[if (settingBean.user.sex - 1 < 0) 0 else settingBean.user.sex - 1]) + } else { + binding.mImage.setImageUser( + requireContext(), + settingBean.user.avatarUrl, + settingBean.user.sex.toString() + ) + Const.CHAT_IMAGE = settingBean.user.avatarUrl + } // binding.mNoNetwork.root.visibility = View.GONE } } diff --git a/app/src/main/java/com/zj365/dc/fragment/ShopFragment.kt b/app/src/main/java/com/zj365/dc/fragment/ShopFragment.kt index 3245c0c..8034be8 100644 --- a/app/src/main/java/com/zj365/dc/fragment/ShopFragment.kt +++ b/app/src/main/java/com/zj365/dc/fragment/ShopFragment.kt @@ -6,10 +6,12 @@ import android.text.TextUtils import android.view.KeyEvent import android.view.View import android.view.inputmethod.EditorInfo +import android.widget.LinearLayout import android.widget.TextView import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import androidx.recyclerview.widget.StaggeredGridLayoutManager import com.tamsiree.rxkit.RxKeyboardTool import com.xty.base.fragment.BaseFragList import com.xty.base.fragment.BaseVmFrag @@ -17,6 +19,7 @@ import com.xty.base.vm.BaseVm import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager import com.xty.common.util.CommonToastUtils +import com.xty.common.weight.ExpandStaggeredManager import com.xty.network.model.GoodsRecordsBean import com.xty.network.model.ShopCategoryBean import com.zj365.dc.BuildConfig @@ -38,7 +41,8 @@ class ShopFragment: BaseFragList() { override fun initAdapter() { binding.recyclerView.adapter = mGoodsAdapter - binding.recyclerView.layoutManager = GridLayoutManager(requireContext(),2) + binding.recyclerView.layoutManager = ExpandStaggeredManager(2, + StaggeredGridLayoutManager.VERTICAL) binding.categoryRecyclerView.adapter = mCategoryAdapter diff --git a/app/src/main/java/com/zj365/dc/vm/DynamicManagementVm.kt b/app/src/main/java/com/zj365/dc/vm/DynamicManagementVm.kt index d7d844e..8f96836 100644 --- a/app/src/main/java/com/zj365/dc/vm/DynamicManagementVm.kt +++ b/app/src/main/java/com/zj365/dc/vm/DynamicManagementVm.kt @@ -154,18 +154,6 @@ class DynamicManagementVm : BaseVm() { } } - /** - * 获取家人 - */ - fun getMyFamilyList() { - startHttp(false) { - val json = JSONObject() - /* json.put("pageNum","1") - json.put("pageSize",Const.PAGE_SIZE)*/ - val request = apiInterface().getMyFamily(retrofits.getRequestBody(json.toString())) - request.getCodeStatus(familyLive, nowData) - } - } /** * 首页小贴士 diff --git a/app/src/main/java/com/zj365/dc/vm/MainVm.kt b/app/src/main/java/com/zj365/dc/vm/MainVm.kt index bd93640..ab740ba 100644 --- a/app/src/main/java/com/zj365/dc/vm/MainVm.kt +++ b/app/src/main/java/com/zj365/dc/vm/MainVm.kt @@ -6,6 +6,7 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope import com.xty.base.vm.BaseVm import com.xty.common.Const +import com.xty.common.LogUtils import com.xty.common.MMkvHelper import com.xty.common.util.CommonUtils import com.xty.network.model.BannerBean @@ -154,14 +155,6 @@ class MainVm : BaseVm() { } } - fun searchInviteInfo(){ - startHttp(false) { - var json = JSONObject() - val response = apiInterface().findConfirmInfo(retrofits.getRequestBody(json.toString())) - response.getCodeStatus(findInfoLiveData, nowData) - } - } - fun confirmInvite(id:String, status:String){ startHttp(false) { var json = JSONObject() @@ -193,6 +186,8 @@ class MainVm : BaseVm() { */ fun getMySetting() { startHttp(false) { + + LogUtils.e("eeeeee","主界面请求个人中心数据啦") val body = apiInterface().getMySetting() body.getCodeStatus(settingLive, nowData) } diff --git a/app/src/main/java/com/zj365/dc/vm/ShopMallVm.kt b/app/src/main/java/com/zj365/dc/vm/ShopMallVm.kt index 03172df..48f2f75 100644 --- a/app/src/main/java/com/zj365/dc/vm/ShopMallVm.kt +++ b/app/src/main/java/com/zj365/dc/vm/ShopMallVm.kt @@ -39,7 +39,7 @@ class ShopMallVm : BaseVm() { } json.put("categoryId",categoryId) json.put("isRec",isRec) - json.put("pageSize",20) + json.put("pageSize",10) json.put("pageNum",pageSize) var code = apiInterface().getGoodsList(retrofits.getRequestBody(json.toString())) code.getCodeStatus(goodsLiveData, nowData) diff --git a/app/src/main/res/layout/act_shop_category.xml b/app/src/main/res/layout/act_shop_category.xml index 2e6603c..860e106 100644 --- a/app/src/main/res/layout/act_shop_category.xml +++ b/app/src/main/res/layout/act_shop_category.xml @@ -64,7 +64,7 @@ diff --git a/app/src/main/res/layout/frag_health.xml b/app/src/main/res/layout/frag_health.xml index a09236e..a8feedd 100644 --- a/app/src/main/res/layout/frag_health.xml +++ b/app/src/main/res/layout/frag_health.xml @@ -17,21 +17,6 @@ - - - - - - diff --git a/app/src/main/res/layout/frag_shop.xml b/app/src/main/res/layout/frag_shop.xml index e430e29..f65b142 100644 --- a/app/src/main/res/layout/frag_shop.xml +++ b/app/src/main/res/layout/frag_shop.xml @@ -13,6 +13,7 @@ android:layout_marginLeft="@dimen/dp_16" android:layout_marginRight="@dimen/dp_16" android:layout_marginTop="@dimen/dp_56" + android:layout_marginBottom="@dimen/dp_17" app:corner_radius="@dimen/dp_18" android:focusable="true" android:focusableInTouchMode="true" @@ -44,42 +45,61 @@ android:layout_marginLeft="@dimen/dp_7"/> - - + android:layout_height="match_parent"> + + + - + - + - - + + + + + + + + + + + + + - \ No newline at end of file diff --git a/app/src/main/res/layout/item_category_child.xml b/app/src/main/res/layout/item_category_child.xml index 198eb47..accaabb 100644 --- a/app/src/main/res/layout/item_category_child.xml +++ b/app/src/main/res/layout/item_category_child.xml @@ -2,12 +2,15 @@ diff --git a/app/src/main/res/layout/item_goods_list_two_style.xml b/app/src/main/res/layout/item_goods_list_two_style.xml index f28ec23..797cbdf 100644 --- a/app/src/main/res/layout/item_goods_list_two_style.xml +++ b/app/src/main/res/layout/item_goods_list_two_style.xml @@ -5,6 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/shape_round_white" + android:layout_marginTop="@dimen/dp_15" tools:ignore="MissingDefaultResource"> + app:corner_radius="@dimen/dp_5"/> \ No newline at end of file diff --git a/app/src/main/res/layout/item_shop_categroy.xml b/app/src/main/res/layout/item_shop_categroy.xml index 5e4772f..d6aa9ed 100644 --- a/app/src/main/res/layout/item_shop_categroy.xml +++ b/app/src/main/res/layout/item_shop_categroy.xml @@ -6,7 +6,7 @@ android:layout_gravity="center" android:id="@+id/root" android:gravity="center" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content"> + tools:text="低卡零食低卡零食"/> \ No newline at end of file diff --git a/app/src/main/res/layout/item_shop_list.xml b/app/src/main/res/layout/item_shop_list.xml index dccd992..851f756 100644 --- a/app/src/main/res/layout/item_shop_list.xml +++ b/app/src/main/res/layout/item_shop_list.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/shape_round_white" - android:paddingBottom="@dimen/dp_21" + android:paddingBottom="@dimen/dp_11" tools:ignore="MissingDefaultResource"> @@ -46,7 +49,7 @@ android:textColor="@color/col_2621" android:textSize="@dimen/sp_15" android:layout_marginLeft="@dimen/dp_10" - android:layout_marginTop="@dimen/dp_16" + android:layout_marginTop="@dimen/dp_10" tools:text="￥1999.00"/> \ No newline at end of file diff --git a/base/src/main/java/com/xty/base/act/BaseTenCentWebViewActivity.kt b/base/src/main/java/com/xty/base/act/BaseTenCentWebViewActivity.kt index 69d62b3..e392145 100644 --- a/base/src/main/java/com/xty/base/act/BaseTenCentWebViewActivity.kt +++ b/base/src/main/java/com/xty/base/act/BaseTenCentWebViewActivity.kt @@ -60,13 +60,10 @@ import org.json.JSONObject } var data = Bundle() -//true表示标准全屏，false表示X5全屏；不设置默认false， //true表示标准全屏，false表示X5全屏；不设置默认false， data.putBoolean("standardFullScreen", false) -//false：关闭小窗；true：开启小窗；不设置默认true， //false：关闭小窗；true：开启小窗；不设置默认true， data.putBoolean("supportLiteWnd", false) -//1：以页面内开始播放，2：以全屏开始播放；不设置默认：1 //1：以页面内开始播放，2：以全屏开始播放；不设置默认：1 data.putInt("DefaultVideoScreen", 2) @@ -127,7 +124,7 @@ import org.json.JSONObject mWebSetting!!.layoutAlgorithm = WebSettings.LayoutAlgorithm.NARROW_COLUMNS - mWebSetting!!.setSupportZoom(true) //设置支持缩放 + mWebSetting!!.setSupportZoom(false) //设置支持缩放 mWebSetting!!.builtInZoomControls = true mWebSetting!!.useWideViewPort = true //将图片调整到合适的webView大小 diff --git a/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt b/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt index a97cb3f..3e639f6 100644 --- a/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt +++ b/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt @@ -187,6 +187,7 @@ open class CloudJSBridge(val context: Context, val listener: IJsBridge) { baseActivity.bundle.clear() baseActivity.bundle.putLong("answerId", bean.id) RouteManager.goAct(ARouterUrl.PSYCHOLOGICAL_RESULT_ACT, baseActivity.bundle) + baseActivity.finish() } } diff --git a/common/src/main/java/com/xty/common/weight/ExpandStaggeredManager.java b/common/src/main/java/com/xty/common/weight/ExpandStaggeredManager.java new file mode 100644 index 0000000..132c781 --- /dev/null +++ b/common/src/main/java/com/xty/common/weight/ExpandStaggeredManager.java @@ -0,0 +1,44 @@ +package com.xty.common.weight; + +import android.content.Context; +import android.util.AttributeSet; + +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; + +public class ExpandStaggeredManager extends StaggeredGridLayoutManager { + public ExpandStaggeredManager(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + } + + + + public ExpandStaggeredManager(int spanCount, int orientation) { + super(spanCount, orientation); + } + + @Override + public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) { + try { + super.onLayoutChildren(recycler, state); + }catch (Exception e){ + e.printStackTrace(); + } + + } + + /** + * 通过 try catch 捕捉错误 + * @param state + */ + @Override + public void onScrollStateChanged(int state) { + try { + super.onScrollStateChanged(state); + }catch (Exception e){ + e.printStackTrace(); + } + + } + +} diff --git a/health/src/main/java/com/zj365/health/act/UricCalibrationSubmitAct.kt b/health/src/main/java/com/zj365/health/act/UricCalibrationSubmitAct.kt index f153ef9..5a6c1f0 100644 --- a/health/src/main/java/com/zj365/health/act/UricCalibrationSubmitAct.kt +++ b/health/src/main/java/com/zj365/health/act/UricCalibrationSubmitAct.kt @@ -33,8 +33,6 @@ class UricCalibrationSubmitAct : BaseVmAct() { private var userId: String = "" private val MAX_LENGTH = 10 - private var recordNumber = 0 - private val timSelect by lazy { TimeSelect(this) { }.apply { @@ -47,6 +45,7 @@ class UricCalibrationSubmitAct : BaseVmAct() { override fun initData() { super.initData() addChildViews() + userId = intent.getStringExtra("userId").toString() } @@ -103,11 +102,9 @@ class UricCalibrationSubmitAct : BaseVmAct() { PointLengthFilter(2) ) val mTvTimeView = childView.findViewById(R.id.mVTimeView) - mTvTimeView.tag = viewNum - 1 mTvTimeView.setOnClickListener { RxKeyboardTool.hideSoftInput(this) timSelect.selectTime(it, "yyyy-MM-dd HH:mm") - recordNumber = it.tag.toString().toInt() } childView.setPadding(0, 0, 0, dp2px(0)) @@ -120,14 +117,10 @@ class UricCalibrationSubmitAct : BaseVmAct() { val list: MutableList = mutableListOf() for (i in 0 until binding.childLayout.childCount) { val uricCalibrationBean = UricCalibrationBean() - uricCalibrationBean.bpTime = (getChildView( - i, - R.id.mVTimeView - ) as TextView).text.toString() - uricCalibrationBean.uaValue = (getChildView( - i, - R.id.edUricValue - ) as TextView).text.toString() + uricCalibrationBean.bpTime = + (getChildView(i, R.id.mVTimeView) as TextView).text.toString() + uricCalibrationBean.uaValue = + (getChildView(i, R.id.edUricValue) as TextView).text.toString() if (uricCalibrationBean.bpTime.isNullOrEmpty()) { CommonToastUtils.showToast("请选择测量时间") @@ -146,11 +139,8 @@ class UricCalibrationSubmitAct : BaseVmAct() { } private fun getChildView(index: Int, childId: Int = 0): View { - return if (childId == 0) { - binding.childLayout[index] - } else { - binding.childLayout[index].findViewById(childId) - } + return if (childId == 0) binding.childLayout[index] + else binding.childLayout[index].findViewById(childId) } override fun liveObserver() { @@ -165,27 +155,5 @@ class UricCalibrationSubmitAct : BaseVmAct() { CommonToastUtils.showToast("提交失败：${it.msg}") } } - - //获取尿酸检测数据 - mViewModel.getUricAcidMeasurementRecordLive.observe(this) { - if (it.code == 0) { - if (it.data != null) { - val data = it.data - val line = getChildView(recordNumber, R.id.vUricAcidLine) - line.isVisible = false - val lastLayout = getChildView(recordNumber, R.id.llUricAcidLyout) - lastLayout.isVisible = true - (getChildView( - recordNumber, - R.id.tvUricAcidLastValue - ) as TextView).text = data.uaValue.toString() - } else { - val line = getChildView(recordNumber, R.id.vUricAcidLine) - line.isVisible = true - val lastLayout = getChildView(recordNumber, R.id.llUricAcidLyout) - lastLayout.isVisible = false - } - } - } } } \ No newline at end of file diff --git a/health/src/main/java/com/zj365/health/adapter/UricCalibrationListAdapter.kt b/health/src/main/java/com/zj365/health/adapter/UricCalibrationListAdapter.kt index 8e1eac4..78a88a0 100644 --- a/health/src/main/java/com/zj365/health/adapter/UricCalibrationListAdapter.kt +++ b/health/src/main/java/com/zj365/health/adapter/UricCalibrationListAdapter.kt @@ -19,7 +19,7 @@ class UricCalibrationListAdapter : BaseAdapter( val textColor by lazy { arrayOf( R.color.col_9BD, - R.color.col_25C, + R.color.col_02c, R.color.col_FDA481 ) } @@ -36,25 +36,45 @@ class UricCalibrationListAdapter : BaseAdapter( val view = holder.getView(R.id.ivSelected) view.isSelected = item.isSelected + var result = "" val colorIndex = when (item.upType) { - 1 -> 0 - 2, 5 -> 1 - else -> 2 + 1 -> { + 0 + } + + 2, 5 -> { + 1 + } + + else -> { + 2 + } } - val result = when (item.upType) { - 1 -> "用户上传" - 2 -> "管家上传" - 3 -> "物联网上传" - 4 -> "管理员上传" - else -> "家人上传" + when (item.upType) { + 1 -> { + result = "用户上传" + } + + 2 -> { + result = "管家上传" + } + + 3 -> { + result = "物联网上传" + } + + 4 -> { + result = "管理员上传" + } + + else -> { + result = "家人上传" + } } holder.setBackgroundResource(R.id.tvStatus, bg[colorIndex]) holder.setTextColor( R.id.tvStatus, - ContextCompat.getColor( - context, - textColor[colorIndex] - ) + ContextCompat.getColor(context, textColor[colorIndex]) ) holder.getView(R.id.tvStatus).apply { text = result @@ -70,15 +90,7 @@ class UricCalibrationListAdapter : BaseAdapter( holder.setText(R.id.tvUploadingName, "上传人：${item.upName}") holder.setText(R.id.tvMeasurementTime, "测量时间：${item.bpTime}") - holder.setText(R.id.tvMeasurementValue, "尿酸数值：${item.uaValue.toFloat().toInt()}μmol/L") - - val sysValue = item.sysValue - if (sysValue > 0) { - holder.setGone(R.id.llLastValueLayout, false) - holder.setText(R.id.tvItemLastUricAcidValue, "尿酸数值：${sysValue}μmol/L") - } else { - holder.setGone(R.id.llLastValueLayout, true) - } + holder.setText(R.id.tvMeasurementValue, "测量值：${item.uaValue.toFloat().toInt()}μmol/L") } fun getSelectData(): MutableList { diff --git a/health/src/main/java/com/zj365/health/vm/UricAcidVm.kt b/health/src/main/java/com/zj365/health/vm/UricAcidVm.kt index 0aee45b..aeb9aac 100644 --- a/health/src/main/java/com/zj365/health/vm/UricAcidVm.kt +++ b/health/src/main/java/com/zj365/health/vm/UricAcidVm.kt @@ -27,8 +27,6 @@ class UricAcidVm : BaseVm() { val submitUricCalibrationLive by lazy { MutableLiveData>() } val getUricCalibrationListLive by lazy { MutableLiveData>>() } val deteleUricCalibrationLive by lazy { MutableLiveData>() } - val servicePeriodData by lazy { MutableLiveData>() } - val getUricAcidMeasurementRecordLive by lazy { MutableLiveData>() } fun getUserInfo(id:String){ startHttp(false) { diff --git a/health/src/main/res/layout/item_uric_calibration_list.xml b/health/src/main/res/layout/item_uric_calibration_list.xml index 3b2629d..dd24ca4 100644 --- a/health/src/main/res/layout/item_uric_calibration_list.xml +++ b/health/src/main/res/layout/item_uric_calibration_list.xml @@ -8,12 +8,11 @@ + android:orientation="vertical"> + tools:text="上传人：张晓峰"/> + android:textStyle="bold" /> @@ -72,7 +71,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_1" android:layout_marginTop="@dimen/dp_14" - android:background="@color/col_0F2" /> + android:background="@color/col_0F2"/> - - + tools:text="测量时间：2023-03-09 14:46"/> - - - - - - - - + tools:text="测量值：380"/> diff --git a/health/src/main/res/layout/item_uric_calibration_submit.xml b/health/src/main/res/layout/item_uric_calibration_submit.xml index c1cd73d..f43171f 100644 --- a/health/src/main/res/layout/item_uric_calibration_submit.xml +++ b/health/src/main/res/layout/item_uric_calibration_submit.xml @@ -60,37 +60,28 @@ android:drawablePadding="@dimen/dp_4" android:gravity="end|center_vertical" android:hint="@string/please_select_time" + android:textColorHint="@color/col_c7c" android:paddingTop="@dimen/dp_10" android:paddingBottom="@dimen/dp_10" android:textColor="@color/col_3a4" - android:textColorHint="@color/col_c7c" android:textSize="@dimen/sp_15" tools:ignore="UseCompatTextViewDrawableXml" /> - - @@ -99,16 +90,16 @@ android:id="@+id/edUricValue" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/dp_6" android:layout_weight="1" android:background="@null" android:gravity="end" android:hint="@string/please_input_gdbp" - android:inputType="number" android:paddingVertical="@dimen/dp_10" - android:textColor="@color/col_3a4" + android:layout_marginHorizontal="@dimen/dp_6" + android:inputType="number" android:textColorHint="@color/col_c7c" android:textSize="@dimen/sp_15" + android:textColor="@color/col_3a4" app:layout_constraintRight_toLeftOf="@+id/mUnit" /> - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mine/src/main/java/com/zj365/mime/vm/SettingVm.kt b/mine/src/main/java/com/zj365/mime/vm/SettingVm.kt index 87e863a..6af4e1e 100644 --- a/mine/src/main/java/com/zj365/mime/vm/SettingVm.kt +++ b/mine/src/main/java/com/zj365/mime/vm/SettingVm.kt @@ -3,6 +3,7 @@ package com.zj365.mime.vm import androidx.lifecycle.MutableLiveData import com.xty.base.vm.BaseVm import com.xty.common.Const +import com.xty.common.LogUtils import com.xty.network.model.FamilyBean import com.xty.network.model.InviteCustodyBean import com.xty.network.model.MainBean @@ -73,6 +74,7 @@ class SettingVm : BaseVm() { */ fun getMySetting() { startHttp { + LogUtils.e("eeeeee","请求个人中心数据啦") val body = apiInterface().getMySetting() body.getCodeStatus(settingLive, nowData) } diff --git a/network/src/main/java/com/xty/network/model/PsychologicalResultBean.kt b/network/src/main/java/com/xty/network/model/PsychologicalResultBean.kt index f59b031..da2e345 100644 --- a/network/src/main/java/com/xty/network/model/PsychologicalResultBean.kt +++ b/network/src/main/java/com/xty/network/model/PsychologicalResultBean.kt @@ -2,6 +2,7 @@ package com.xty.network.model data class PsychologicalResultBean( + var title:String, var conclusionText:String, var recList:ArrayList