diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt index 753f4af..b474060 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt @@ -38,7 +38,12 @@ wellNameView.text = wellDetail.wellName wellCodeView.text = wellDetail.wellCode - wellTypeView.text = wellDetail.wellTypeName + val typeName = if (wellDetail.wellTypeName.toString().isBlank()) { + resources.getString(R.string.unknown) + } else { + wellDetail.wellTypeName.toString() + } + wellTypeView.text = typeName ownershipView.text = wellDetail.deptName val depth = wellDetail.deep.toString() if (depth.isBlank()) { @@ -46,7 +51,6 @@ } else { wellDepthView.text = depth } - wellStateView.text = wellDetail.bfztName //绑定窨井位置 val wellPosition = wellDetail.position.toString() wellLocationView.text = wellPosition diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt index 753f4af..b474060 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt @@ -38,7 +38,12 @@ wellNameView.text = wellDetail.wellName wellCodeView.text = wellDetail.wellCode - wellTypeView.text = wellDetail.wellTypeName + val typeName = if (wellDetail.wellTypeName.toString().isBlank()) { + resources.getString(R.string.unknown) + } else { + wellDetail.wellTypeName.toString() + } + wellTypeView.text = typeName ownershipView.text = wellDetail.deptName val depth = wellDetail.deep.toString() if (depth.isBlank()) { @@ -46,7 +51,6 @@ } else { wellDepthView.text = depth } - wellStateView.text = wellDetail.bfztName //绑定窨井位置 val wellPosition = wellDetail.position.toString() wellLocationView.text = wellPosition diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml index 1b47b97..7af8ac8 100644 --- a/app/src/main/res/layout/activity_well_detail.xml +++ b/app/src/main/res/layout/activity_well_detail.xml @@ -121,24 +121,6 @@ - - - - - - - - - -