diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/WellListAdapter.kt index afdf817..1fbbad2 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/WellListAdapter.kt @@ -37,7 +37,12 @@ } holder.wellTypeView.text = wellType holder.wellCodeView.text = rowsBean.wellCode - holder.wellDepthView.text = String.format("${rowsBean.deep}m") + val deep = if (rowsBean.deep.isBlank()) { + 0 + } else { + rowsBean.deep + } + holder.wellDepthView.text = String.format("${deep}m") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("详细地址：${rowsBean.position}") holder.wellDeviceView.text = String.format("井下设备数：${rowsBean.deviceCount}") diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/WellListAdapter.kt index afdf817..1fbbad2 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/WellListAdapter.kt @@ -37,7 +37,12 @@ } holder.wellTypeView.text = wellType holder.wellCodeView.text = rowsBean.wellCode - holder.wellDepthView.text = String.format("${rowsBean.deep}m") + val deep = if (rowsBean.deep.isBlank()) { + 0 + } else { + rowsBean.deep + } + holder.wellDepthView.text = String.format("${deep}m") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("详细地址：${rowsBean.position}") holder.wellDeviceView.text = String.format("井下设备数：${rowsBean.deviceCount}") diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/model/WellListPageModel.java b/app/src/main/java/com/casic/app/smartwell/sanxi/model/WellListPageModel.java index 3370c22..57a187c 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/model/WellListPageModel.java +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/model/WellListPageModel.java @@ -67,7 +67,7 @@ private String bfztName; private String coordinateX; private String coordinateY; - private int deep; + private String deep; private String deptName; private String deptid; private int deviceCount; @@ -132,11 +132,11 @@ this.coordinateY = coordinateY; } - public int getDeep() { + public String getDeep() { return deep; } - public void setDeep(int deep) { + public void setDeep(String deep) { this.deep = deep; } diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/WellListAdapter.kt index afdf817..1fbbad2 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/WellListAdapter.kt @@ -37,7 +37,12 @@ } holder.wellTypeView.text = wellType holder.wellCodeView.text = rowsBean.wellCode - holder.wellDepthView.text = String.format("${rowsBean.deep}m") + val deep = if (rowsBean.deep.isBlank()) { + 0 + } else { + rowsBean.deep + } + holder.wellDepthView.text = String.format("${deep}m") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("详细地址：${rowsBean.position}") holder.wellDeviceView.text = String.format("井下设备数：${rowsBean.deviceCount}") diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/model/WellListPageModel.java b/app/src/main/java/com/casic/app/smartwell/sanxi/model/WellListPageModel.java index 3370c22..57a187c 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/model/WellListPageModel.java +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/model/WellListPageModel.java @@ -67,7 +67,7 @@ private String bfztName; private String coordinateX; private String coordinateY; - private int deep; + private String deep; private String deptName; private String deptid; private int deviceCount; @@ -132,11 +132,11 @@ this.coordinateY = coordinateY; } - public int getDeep() { + public String getDeep() { return deep; } - public void setDeep(int deep) { + public void setDeep(String deep) { this.deep = deep; } diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/view/WellManageActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/view/WellManageActivity.kt index 173e216..57eb129 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/view/WellManageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/view/WellManageActivity.kt @@ -12,6 +12,7 @@ import com.casic.app.smartwell.sanxi.R import com.casic.app.smartwell.sanxi.adapter.WellListAdapter import com.casic.app.smartwell.sanxi.base.BaseActivity +import com.casic.app.smartwell.sanxi.extensions.navigatePageTo import com.casic.app.smartwell.sanxi.extensions.show import com.casic.app.smartwell.sanxi.extensions.showEmptyPage import com.casic.app.smartwell.sanxi.model.OwnerShipModel @@ -30,6 +31,8 @@ private lateinit var wellViewModel: WellViewModel private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var wellListAdapter: WellListAdapter + private lateinit var wellTypeView: TextView + private lateinit var ownerShipView: TextView private var dataBeans: MutableList = ArrayList() private var keywords = "" private var wellType = "" @@ -110,7 +113,7 @@ sheetBuilder.setGravityCenter(true) .setOnSheetItemClickListener { dialog, _, position, tag -> wellTypeView.text = tag - this.wellType = it.data[position].id.toString() + this.wellType = it.data[position].value.toString() dialog.dismiss() }.build().show() @@ -145,8 +148,8 @@ override fun onDrawerOpened(drawerView: View) { val wellCodeView = drawerView.findViewById(R.id.wellCodeView) - val wellTypeView = drawerView.findViewById(R.id.wellTypeView) - val ownerShipView = drawerView.findViewById(R.id.ownerShipView) + wellTypeView = drawerView.findViewById(R.id.wellTypeView) + ownerShipView = drawerView.findViewById(R.id.ownerShipView) val searchButton = drawerView.findViewById