From f5eb13458033b21a8cb436c8ed4ecd7957089de5 Mon Sep 17 00:00:00 2001 From: chenglifeng Date: Tue, 12 Nov 2024 17:12:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E9=87=8F=E8=AE=A1=E5=88=92=E5=88=97?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E8=BF=9B=E5=85=A5=E6=B5=8B=E9=87=8F=E3=80=81?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=B5=8B=E9=87=8F=E6=8C=89=E9=92=AE=E7=9A=84?= =?UTF-8?q?enable=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/project/survey/constants/Constants.kt | 1 + .../survey/logic/viewmodel/LoginViewModel.kt | 1 + .../com/project/survey/model/LoginBean.kt | 1 + .../com/project/survey/model/MeasureBean.kt | 1 + .../pointmeasure/PointMeasureListActivity.kt | 16 ++++++---- .../adapter/PointMeasureListAdapter.kt | 32 +++++++++++++------ .../com/project/survey/util/LogoutUtil.kt | 1 + .../res/layout/item_point_measure_list.xml | 8 +++-- 8 files changed, 42 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/project/survey/constants/Constants.kt b/app/src/main/java/com/project/survey/constants/Constants.kt index 5d2c91b..b57e2ce 100644 --- a/app/src/main/java/com/project/survey/constants/Constants.kt +++ b/app/src/main/java/com/project/survey/constants/Constants.kt @@ -13,6 +13,7 @@ object SPConstants { const val ACCOUNT = "account" const val MOBILE_PHONE = "mobilePhone" const val PERSON_ID = "personId" + const val PERSON_NAME = "personName" const val RECENTLY_PROJECT = "recentlyProject" const val PROJECT_ID = "projectId" diff --git a/app/src/main/java/com/project/survey/logic/viewmodel/LoginViewModel.kt b/app/src/main/java/com/project/survey/logic/viewmodel/LoginViewModel.kt index ce05b91..99b4223 100644 --- a/app/src/main/java/com/project/survey/logic/viewmodel/LoginViewModel.kt +++ b/app/src/main/java/com/project/survey/logic/viewmodel/LoginViewModel.kt @@ -64,6 +64,7 @@ class LoginViewModel : BaseViewModel() { SPUtils.put(SPConstants.TOKEN, res.data.token) SPUtils.put(SPConstants.PERSON_ID, res.data.personId) SPUtils.put(SPConstants.MOBILE_PHONE, res.data.mobilePhone) + SPUtils.put(SPConstants.PERSON_NAME, res.data.name) var userConfig = AppDataBase.getInstance().userConfigDao().findByLeanCloudUserId(res.data.personId) diff --git a/app/src/main/java/com/project/survey/model/LoginBean.kt b/app/src/main/java/com/project/survey/model/LoginBean.kt index 707a1bc..8bd7c21 100644 --- a/app/src/main/java/com/project/survey/model/LoginBean.kt +++ b/app/src/main/java/com/project/survey/model/LoginBean.kt @@ -12,5 +12,6 @@ import kotlinx.android.parcel.Parcelize data class LoginBean( val token: String, val mobilePhone: String, + val name: String, val personId: String? ) : Parcelable diff --git a/app/src/main/java/com/project/survey/model/MeasureBean.kt b/app/src/main/java/com/project/survey/model/MeasureBean.kt index 551bf26..4888421 100644 --- a/app/src/main/java/com/project/survey/model/MeasureBean.kt +++ b/app/src/main/java/com/project/survey/model/MeasureBean.kt @@ -67,6 +67,7 @@ data class MeasureBean( val CLJH_CLLX_NAME: String, //测量类型 // 无值或“待执行”为未开始测量，“执行中”为点击开始测量后至点击结束测量之间的状态，“已结束”为点击结束测量至点击生成报验单之间的状态，“报验单已生成”为生成报验单后的状态 var CLJH_WORKSTATUS: String?, //状态 + val CLJH_WJSCLRY:String, //"齐恒（施工1-1）,立锋," 根据当前账号名字是否在此字段 val GCJL_LCMC: String?, //流程名称（工程计量） val GCJL_BDLSH: String?, //流程编号 diff --git a/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt b/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt index 2300921..cd47eef 100644 --- a/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt +++ b/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt @@ -106,13 +106,15 @@ class PointMeasureListActivity : BaseBindingActivity bean.BD_CLJH_ID == it.id } - if (position > -1) { - adapter.getItem(position)?.let { bean -> - bean.CLJH_WORKSTATUS = it.status - adapter.notifyItemChanged(position, AdapterConstants.WORK_STATUS) - } - } +// val position = adapter.items.indexOfFirst { bean -> bean.BD_CLJH_ID == it.id } +// if (position > -1) { +// adapter.getItem(position)?.let { bean -> +// bean.CLJH_WORKSTATUS = it.status +// adapter.notifyItemChanged(position, AdapterConstants.WORK_STATUS) +// } +// } + //刷新数据 + fetchData() } // 获取列表数据 diff --git a/app/src/main/java/com/project/survey/ui/pointmeasure/adapter/PointMeasureListAdapter.kt b/app/src/main/java/com/project/survey/ui/pointmeasure/adapter/PointMeasureListAdapter.kt index 8acc390..e6e7810 100644 --- a/app/src/main/java/com/project/survey/ui/pointmeasure/adapter/PointMeasureListAdapter.kt +++ b/app/src/main/java/com/project/survey/ui/pointmeasure/adapter/PointMeasureListAdapter.kt @@ -7,7 +7,9 @@ import com.chad.library.adapter4.viewholder.QuickViewHolder import com.project.survey.R import com.project.survey.constants.AdapterConstants import com.project.survey.constants.Constants +import com.project.survey.constants.SPConstants import com.project.survey.model.MeasureBean +import com.project.survey.util.SPUtils class PointMeasureListAdapter(val type: String) : BaseQuickAdapter() { @@ -32,11 +34,16 @@ class PointMeasureListAdapter(val type: String) : BaseQuickAdapter + tools:text="内容名称内容名称内容名称内容名称内容名称内容名称内容名称内容名称内容名称" />