diff --git a/app/src/main/java/com/casic/br/app/model/HiddenTroubleDetailModel.java b/app/src/main/java/com/casic/br/app/model/HiddenTroubleDetailModel.java index cefaba7..8e6a870 100644 --- a/app/src/main/java/com/casic/br/app/model/HiddenTroubleDetailModel.java +++ b/app/src/main/java/com/casic/br/app/model/HiddenTroubleDetailModel.java @@ -42,9 +42,10 @@ } public static class DataModel { + private String alarmCode; private String alarmImageCount; private List alarmImageList; - private String basis; + private List basisList; private String content; private String createTime; private String createUserId; @@ -63,6 +64,14 @@ private String updateUserId; private String updateUserName; + public String getAlarmCode() { + return alarmCode; + } + + public void setAlarmCode(String alarmCode) { + this.alarmCode = alarmCode; + } + public String getAlarmImageCount() { return alarmImageCount; } @@ -79,12 +88,12 @@ this.alarmImageList = alarmImageList; } - public String getBasis() { - return basis; + public List getBasisList() { + return basisList; } - public void setBasis(String basis) { - this.basis = basis; + public void setBasisList(List basisList) { + this.basisList = basisList; } public String getContent() { @@ -315,5 +324,125 @@ this.updateUserName = updateUserName; } } + + public static class BasisListModel { + private String alarmMenuId; + private String chapter; + private String content; + private String createTime; + private String createUserId; + private String createUserName; + private String id; + private String specificationId; + private String specificationItemId; + private String specificationName; + private String updateTime; + private String updateUserId; + private String updateUserName; + + public String getAlarmMenuId() { + return alarmMenuId; + } + + public void setAlarmMenuId(String alarmMenuId) { + this.alarmMenuId = alarmMenuId; + } + + public String getChapter() { + return chapter; + } + + public void setChapter(String chapter) { + this.chapter = chapter; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSpecificationId() { + return specificationId; + } + + public void setSpecificationId(String specificationId) { + this.specificationId = specificationId; + } + + public String getSpecificationItemId() { + return specificationItemId; + } + + public void setSpecificationItemId(String specificationItemId) { + this.specificationItemId = specificationItemId; + } + + public String getSpecificationName() { + return specificationName; + } + + public void setSpecificationName(String specificationName) { + this.specificationName = specificationName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUserId() { + return updateUserId; + } + + public void setUpdateUserId(String updateUserId) { + this.updateUserId = updateUserId; + } + + public String getUpdateUserName() { + return updateUserName; + } + + public void setUpdateUserName(String updateUserName) { + this.updateUserName = updateUserName; + } + } } } diff --git a/app/src/main/java/com/casic/br/app/model/HiddenTroubleDetailModel.java b/app/src/main/java/com/casic/br/app/model/HiddenTroubleDetailModel.java index cefaba7..8e6a870 100644 --- a/app/src/main/java/com/casic/br/app/model/HiddenTroubleDetailModel.java +++ b/app/src/main/java/com/casic/br/app/model/HiddenTroubleDetailModel.java @@ -42,9 +42,10 @@ } public static class DataModel { + private String alarmCode; private String alarmImageCount; private List alarmImageList; - private String basis; + private List basisList; private String content; private String createTime; private String createUserId; @@ -63,6 +64,14 @@ private String updateUserId; private String updateUserName; + public String getAlarmCode() { + return alarmCode; + } + + public void setAlarmCode(String alarmCode) { + this.alarmCode = alarmCode; + } + public String getAlarmImageCount() { return alarmImageCount; } @@ -79,12 +88,12 @@ this.alarmImageList = alarmImageList; } - public String getBasis() { - return basis; + public List getBasisList() { + return basisList; } - public void setBasis(String basis) { - this.basis = basis; + public void setBasisList(List basisList) { + this.basisList = basisList; } public String getContent() { @@ -315,5 +324,125 @@ this.updateUserName = updateUserName; } } + + public static class BasisListModel { + private String alarmMenuId; + private String chapter; + private String content; + private String createTime; + private String createUserId; + private String createUserName; + private String id; + private String specificationId; + private String specificationItemId; + private String specificationName; + private String updateTime; + private String updateUserId; + private String updateUserName; + + public String getAlarmMenuId() { + return alarmMenuId; + } + + public void setAlarmMenuId(String alarmMenuId) { + this.alarmMenuId = alarmMenuId; + } + + public String getChapter() { + return chapter; + } + + public void setChapter(String chapter) { + this.chapter = chapter; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSpecificationId() { + return specificationId; + } + + public void setSpecificationId(String specificationId) { + this.specificationId = specificationId; + } + + public String getSpecificationItemId() { + return specificationItemId; + } + + public void setSpecificationItemId(String specificationItemId) { + this.specificationItemId = specificationItemId; + } + + public String getSpecificationName() { + return specificationName; + } + + public void setSpecificationName(String specificationName) { + this.specificationName = specificationName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUserId() { + return updateUserId; + } + + public void setUpdateUserId(String updateUserId) { + this.updateUserId = updateUserId; + } + + public String getUpdateUserName() { + return updateUserName; + } + + public void setUpdateUserName(String updateUserName) { + this.updateUserName = updateUserName; + } + } } } diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt index 0fcc91b..d76781b 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt @@ -41,7 +41,22 @@ binding.troubleSubClassView.text = it.data.subClassName binding.troubleNameView.text = it.data.name binding.troubleContentView.text = it.data.content - binding.basisView.text = it.data.basis + + //依据 + if (it.data.basisList.isNullOrEmpty()) { + binding.basisView.text = "暂无" + } else { + val stringBuilder = StringBuilder() + it.data.basisList.forEachIndexed { index, base -> + val line = "《${base.specificationName}》-${base.chapter}-${base.content}" + if (index == it.data.basisList.size - 1) { + stringBuilder.append(line) + } else { + stringBuilder.append(line).append("\r\n") + } + } + binding.basisView.text = stringBuilder + } val alarmImageList = it.data.alarmImageList if (alarmImageList.isNotEmpty()) {