diff --git a/app/src/main/java/com/casic/br/app/model/CheckManifestDetailModel.java b/app/src/main/java/com/casic/br/app/model/CheckManifestDetailModel.java index 7330c8f..e318bd0 100644 --- a/app/src/main/java/com/casic/br/app/model/CheckManifestDetailModel.java +++ b/app/src/main/java/com/casic/br/app/model/CheckManifestDetailModel.java @@ -52,6 +52,7 @@ private String createUserId; private String createUserName; private String id; + private int num; private String remark; private String scene; private String sceneName; @@ -141,6 +142,14 @@ this.id = id; } + public int getNum() { + return num; + } + + public void setNum(int num) { + this.num = num; + } + public String getRemark() { return remark; } @@ -207,17 +216,17 @@ public static class BasisListModel { private String chapter; - private int checkMenuId; + private String checkMenuId; private String content; private String createTime; - private int createUserId; + private String createUserId; private String createUserName; - private int id; - private int specificationId; - private int specificationItemId; + private String id; + private String specificationId; + private String specificationItemId; private String specificationName; private String updateTime; - private int updateUserId; + private String updateUserId; private String updateUserName; public String getChapter() { @@ -228,11 +237,11 @@ this.chapter = chapter; } - public int getCheckMenuId() { + public String getCheckMenuId() { return checkMenuId; } - public void setCheckMenuId(int checkMenuId) { + public void setCheckMenuId(String checkMenuId) { this.checkMenuId = checkMenuId; } @@ -252,11 +261,11 @@ this.createTime = createTime; } - public int getCreateUserId() { + public String getCreateUserId() { return createUserId; } - public void setCreateUserId(int createUserId) { + public void setCreateUserId(String createUserId) { this.createUserId = createUserId; } @@ -268,27 +277,27 @@ this.createUserName = createUserName; } - public int getId() { + public String getId() { return id; } - public void setId(int id) { + public void setId(String id) { this.id = id; } - public int getSpecificationId() { + public String getSpecificationId() { return specificationId; } - public void setSpecificationId(int specificationId) { + public void setSpecificationId(String specificationId) { this.specificationId = specificationId; } - public int getSpecificationItemId() { + public String getSpecificationItemId() { return specificationItemId; } - public void setSpecificationItemId(int specificationItemId) { + public void setSpecificationItemId(String specificationItemId) { this.specificationItemId = specificationItemId; } @@ -308,11 +317,11 @@ this.updateTime = updateTime; } - public int getUpdateUserId() { + public String getUpdateUserId() { return updateUserId; } - public void setUpdateUserId(int updateUserId) { + public void setUpdateUserId(String updateUserId) { this.updateUserId = updateUserId; } diff --git a/app/src/main/java/com/casic/br/app/model/CheckManifestDetailModel.java b/app/src/main/java/com/casic/br/app/model/CheckManifestDetailModel.java index 7330c8f..e318bd0 100644 --- a/app/src/main/java/com/casic/br/app/model/CheckManifestDetailModel.java +++ b/app/src/main/java/com/casic/br/app/model/CheckManifestDetailModel.java @@ -52,6 +52,7 @@ private String createUserId; private String createUserName; private String id; + private int num; private String remark; private String scene; private String sceneName; @@ -141,6 +142,14 @@ this.id = id; } + public int getNum() { + return num; + } + + public void setNum(int num) { + this.num = num; + } + public String getRemark() { return remark; } @@ -207,17 +216,17 @@ public static class BasisListModel { private String chapter; - private int checkMenuId; + private String checkMenuId; private String content; private String createTime; - private int createUserId; + private String createUserId; private String createUserName; - private int id; - private int specificationId; - private int specificationItemId; + private String id; + private String specificationId; + private String specificationItemId; private String specificationName; private String updateTime; - private int updateUserId; + private String updateUserId; private String updateUserName; public String getChapter() { @@ -228,11 +237,11 @@ this.chapter = chapter; } - public int getCheckMenuId() { + public String getCheckMenuId() { return checkMenuId; } - public void setCheckMenuId(int checkMenuId) { + public void setCheckMenuId(String checkMenuId) { this.checkMenuId = checkMenuId; } @@ -252,11 +261,11 @@ this.createTime = createTime; } - public int getCreateUserId() { + public String getCreateUserId() { return createUserId; } - public void setCreateUserId(int createUserId) { + public void setCreateUserId(String createUserId) { this.createUserId = createUserId; } @@ -268,27 +277,27 @@ this.createUserName = createUserName; } - public int getId() { + public String getId() { return id; } - public void setId(int id) { + public void setId(String id) { this.id = id; } - public int getSpecificationId() { + public String getSpecificationId() { return specificationId; } - public void setSpecificationId(int specificationId) { + public void setSpecificationId(String specificationId) { this.specificationId = specificationId; } - public int getSpecificationItemId() { + public String getSpecificationItemId() { return specificationItemId; } - public void setSpecificationItemId(int specificationItemId) { + public void setSpecificationItemId(String specificationItemId) { this.specificationItemId = specificationItemId; } @@ -308,11 +317,11 @@ this.updateTime = updateTime; } - public int getUpdateUserId() { + public String getUpdateUserId() { return updateUserId; } - public void setUpdateUserId(int updateUserId) { + public void setUpdateUserId(String updateUserId) { this.updateUserId = updateUserId; } diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestDetailActivity.kt index dc6403c..496175c 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestDetailActivity.kt @@ -5,10 +5,7 @@ import com.casic.br.app.R import com.casic.br.app.databinding.ActivityCheckManifestDetailBinding import com.casic.br.app.extensions.initImmersionBar -import com.casic.br.app.model.CheckManifestDetailModel import com.casic.br.app.vm.CheckManifestViewModel -import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant @@ -34,22 +31,23 @@ binding.checkItemsView.text = it.data.checkItem binding.checkStandardView.text = it.data.checkStandard binding.checkMethodView.text = it.data.checkMethod - val checkBaseAdapter = object : - NormalRecyclerAdapter( - R.layout.item_check_manifest_detail_l, it.data.basisList - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: CheckManifestDetailModel.DataModel.BasisListModel - ) { - //《燃气经营许可管理办法》第二条、第十一条、第十二条 - viewHolder.setText( - R.id.textView, - "${item.specificationName}${item.chapter}" - ) + + //依据 + 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 } - binding.checkBaseView.adapter = checkBaseAdapter + binding.remarkView.text = it.data.remark } } diff --git a/app/src/main/java/com/casic/br/app/model/CheckManifestDetailModel.java b/app/src/main/java/com/casic/br/app/model/CheckManifestDetailModel.java index 7330c8f..e318bd0 100644 --- a/app/src/main/java/com/casic/br/app/model/CheckManifestDetailModel.java +++ b/app/src/main/java/com/casic/br/app/model/CheckManifestDetailModel.java @@ -52,6 +52,7 @@ private String createUserId; private String createUserName; private String id; + private int num; private String remark; private String scene; private String sceneName; @@ -141,6 +142,14 @@ this.id = id; } + public int getNum() { + return num; + } + + public void setNum(int num) { + this.num = num; + } + public String getRemark() { return remark; } @@ -207,17 +216,17 @@ public static class BasisListModel { private String chapter; - private int checkMenuId; + private String checkMenuId; private String content; private String createTime; - private int createUserId; + private String createUserId; private String createUserName; - private int id; - private int specificationId; - private int specificationItemId; + private String id; + private String specificationId; + private String specificationItemId; private String specificationName; private String updateTime; - private int updateUserId; + private String updateUserId; private String updateUserName; public String getChapter() { @@ -228,11 +237,11 @@ this.chapter = chapter; } - public int getCheckMenuId() { + public String getCheckMenuId() { return checkMenuId; } - public void setCheckMenuId(int checkMenuId) { + public void setCheckMenuId(String checkMenuId) { this.checkMenuId = checkMenuId; } @@ -252,11 +261,11 @@ this.createTime = createTime; } - public int getCreateUserId() { + public String getCreateUserId() { return createUserId; } - public void setCreateUserId(int createUserId) { + public void setCreateUserId(String createUserId) { this.createUserId = createUserId; } @@ -268,27 +277,27 @@ this.createUserName = createUserName; } - public int getId() { + public String getId() { return id; } - public void setId(int id) { + public void setId(String id) { this.id = id; } - public int getSpecificationId() { + public String getSpecificationId() { return specificationId; } - public void setSpecificationId(int specificationId) { + public void setSpecificationId(String specificationId) { this.specificationId = specificationId; } - public int getSpecificationItemId() { + public String getSpecificationItemId() { return specificationItemId; } - public void setSpecificationItemId(int specificationItemId) { + public void setSpecificationItemId(String specificationItemId) { this.specificationItemId = specificationItemId; } @@ -308,11 +317,11 @@ this.updateTime = updateTime; } - public int getUpdateUserId() { + public String getUpdateUserId() { return updateUserId; } - public void setUpdateUserId(int updateUserId) { + public void setUpdateUserId(String updateUserId) { this.updateUserId = updateUserId; } diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestDetailActivity.kt index dc6403c..496175c 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestDetailActivity.kt @@ -5,10 +5,7 @@ import com.casic.br.app.R import com.casic.br.app.databinding.ActivityCheckManifestDetailBinding import com.casic.br.app.extensions.initImmersionBar -import com.casic.br.app.model.CheckManifestDetailModel import com.casic.br.app.vm.CheckManifestViewModel -import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant @@ -34,22 +31,23 @@ binding.checkItemsView.text = it.data.checkItem binding.checkStandardView.text = it.data.checkStandard binding.checkMethodView.text = it.data.checkMethod - val checkBaseAdapter = object : - NormalRecyclerAdapter( - R.layout.item_check_manifest_detail_l, it.data.basisList - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: CheckManifestDetailModel.DataModel.BasisListModel - ) { - //《燃气经营许可管理办法》第二条、第十一条、第十二条 - viewHolder.setText( - R.id.textView, - "${item.specificationName}${item.chapter}" - ) + + //依据 + 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 } - binding.checkBaseView.adapter = checkBaseAdapter + binding.remarkView.text = it.data.remark } } diff --git a/app/src/main/res/layout/activity_check_manifest.xml b/app/src/main/res/layout/activity_check_manifest.xml index 3e5faf0..42d085f 100644 --- a/app/src/main/res/layout/activity_check_manifest.xml +++ b/app/src/main/res/layout/activity_check_manifest.xml @@ -62,7 +62,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginEnd="@dimen/dp_5" - android:layout_weight="1" + android:layout_weight="1.25" android:background="@drawable/bg_stroke_white_1"> ( - R.layout.item_check_manifest_detail_l, it.data.basisList - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: CheckManifestDetailModel.DataModel.BasisListModel - ) { - //《燃气经营许可管理办法》第二条、第十一条、第十二条 - viewHolder.setText( - R.id.textView, - "${item.specificationName}${item.chapter}" - ) + + //依据 + 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 } - binding.checkBaseView.adapter = checkBaseAdapter + binding.remarkView.text = it.data.remark } } diff --git a/app/src/main/res/layout/activity_check_manifest.xml b/app/src/main/res/layout/activity_check_manifest.xml index 3e5faf0..42d085f 100644 --- a/app/src/main/res/layout/activity_check_manifest.xml +++ b/app/src/main/res/layout/activity_check_manifest.xml @@ -62,7 +62,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginEnd="@dimen/dp_5" - android:layout_weight="1" + android:layout_weight="1.25" android:background="@drawable/bg_stroke_white_1"> - + android:layout_weight="1" + android:text="中国航天科工集团二院二〇三所 版权所有" + android:textColor="@color/black" + android:textSize="@dimen/sp_16" /> ( - R.layout.item_check_manifest_detail_l, it.data.basisList - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: CheckManifestDetailModel.DataModel.BasisListModel - ) { - //《燃气经营许可管理办法》第二条、第十一条、第十二条 - viewHolder.setText( - R.id.textView, - "${item.specificationName}${item.chapter}" - ) + + //依据 + 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 } - binding.checkBaseView.adapter = checkBaseAdapter + binding.remarkView.text = it.data.remark } } diff --git a/app/src/main/res/layout/activity_check_manifest.xml b/app/src/main/res/layout/activity_check_manifest.xml index 3e5faf0..42d085f 100644 --- a/app/src/main/res/layout/activity_check_manifest.xml +++ b/app/src/main/res/layout/activity_check_manifest.xml @@ -62,7 +62,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginEnd="@dimen/dp_5" - android:layout_weight="1" + android:layout_weight="1.25" android:background="@drawable/bg_stroke_white_1"> - + android:layout_weight="1" + android:text="中国航天科工集团二院二〇三所 版权所有" + android:textColor="@color/black" + android:textSize="@dimen/sp_16" /> - \ No newline at end of file