diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ec6697f..a2bc167 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -79,6 +79,7 @@ + + basisList; + private String checkItem; + private String checkMethod; + private String checkObject; + private String checkObjectName; + private String checkStandard; + private String createTime; + private String createUserId; + private String createUserName; + private String id; + private String remark; + private String scene; + private String sceneName; + private String type; + private String typeName; + private String updateTime; + private String updateUserId; + private String updateUserName; + + public List getBasisList() { + return basisList; + } + + public void setBasisList(List basisList) { + this.basisList = basisList; + } + + public String getCheckItem() { + return checkItem; + } + + public void setCheckItem(String checkItem) { + this.checkItem = checkItem; + } + + public String getCheckMethod() { + return checkMethod; + } + + public void setCheckMethod(String checkMethod) { + this.checkMethod = checkMethod; + } + + public String getCheckObject() { + return checkObject; + } + + public void setCheckObject(String checkObject) { + this.checkObject = checkObject; + } + + public String getCheckObjectName() { + return checkObjectName; + } + + public void setCheckObjectName(String checkObjectName) { + this.checkObjectName = checkObjectName; + } + + public String getCheckStandard() { + return checkStandard; + } + + public void setCheckStandard(String checkStandard) { + this.checkStandard = checkStandard; + } + + 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 getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getScene() { + return scene; + } + + public void setScene(String scene) { + this.scene = scene; + } + + public String getSceneName() { + return sceneName; + } + + public void setSceneName(String sceneName) { + this.sceneName = sceneName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + 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; + } + + public static class BasisListModel { + private String chapter; + private int checkMenuId; + private String content; + private String createTime; + private int createUserId; + private String createUserName; + private int id; + private int specificationId; + private int specificationItemId; + private String specificationName; + private String updateTime; + private int updateUserId; + private String updateUserName; + + public String getChapter() { + return chapter; + } + + public void setChapter(String chapter) { + this.chapter = chapter; + } + + public int getCheckMenuId() { + return checkMenuId; + } + + public void setCheckMenuId(int checkMenuId) { + this.checkMenuId = checkMenuId; + } + + 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 int getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(int createUserId) { + this.createUserId = createUserId; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getSpecificationId() { + return specificationId; + } + + public void setSpecificationId(int specificationId) { + this.specificationId = specificationId; + } + + public int getSpecificationItemId() { + return specificationItemId; + } + + public void setSpecificationItemId(int 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 int getUpdateUserId() { + return updateUserId; + } + + public void setUpdateUserId(int updateUserId) { + this.updateUserId = updateUserId; + } + + public String getUpdateUserName() { + return updateUserName; + } + + public void setUpdateUserName(String updateUserName) { + this.updateUserName = updateUserName; + } + } + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ec6697f..a2bc167 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -79,6 +79,7 @@ + basisList; + private String checkItem; + private String checkMethod; + private String checkObject; + private String checkObjectName; + private String checkStandard; + private String createTime; + private String createUserId; + private String createUserName; + private String id; + private String remark; + private String scene; + private String sceneName; + private String type; + private String typeName; + private String updateTime; + private String updateUserId; + private String updateUserName; + + public List getBasisList() { + return basisList; + } + + public void setBasisList(List basisList) { + this.basisList = basisList; + } + + public String getCheckItem() { + return checkItem; + } + + public void setCheckItem(String checkItem) { + this.checkItem = checkItem; + } + + public String getCheckMethod() { + return checkMethod; + } + + public void setCheckMethod(String checkMethod) { + this.checkMethod = checkMethod; + } + + public String getCheckObject() { + return checkObject; + } + + public void setCheckObject(String checkObject) { + this.checkObject = checkObject; + } + + public String getCheckObjectName() { + return checkObjectName; + } + + public void setCheckObjectName(String checkObjectName) { + this.checkObjectName = checkObjectName; + } + + public String getCheckStandard() { + return checkStandard; + } + + public void setCheckStandard(String checkStandard) { + this.checkStandard = checkStandard; + } + + 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 getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getScene() { + return scene; + } + + public void setScene(String scene) { + this.scene = scene; + } + + public String getSceneName() { + return sceneName; + } + + public void setSceneName(String sceneName) { + this.sceneName = sceneName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + 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; + } + + public static class BasisListModel { + private String chapter; + private int checkMenuId; + private String content; + private String createTime; + private int createUserId; + private String createUserName; + private int id; + private int specificationId; + private int specificationItemId; + private String specificationName; + private String updateTime; + private int updateUserId; + private String updateUserName; + + public String getChapter() { + return chapter; + } + + public void setChapter(String chapter) { + this.chapter = chapter; + } + + public int getCheckMenuId() { + return checkMenuId; + } + + public void setCheckMenuId(int checkMenuId) { + this.checkMenuId = checkMenuId; + } + + 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 int getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(int createUserId) { + this.createUserId = createUserId; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getSpecificationId() { + return specificationId; + } + + public void setSpecificationId(int specificationId) { + this.specificationId = specificationId; + } + + public int getSpecificationItemId() { + return specificationItemId; + } + + public void setSpecificationItemId(int 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 int getUpdateUserId() { + return updateUserId; + } + + public void setUpdateUserId(int 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/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt index 4c89f53..925ef91 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt @@ -132,6 +132,15 @@ ): String /** + * 获取检查清单详情 + */ + @GET("/check-menu/detail") + suspend fun getCheckManifestDetailById( + @Header("token") token: String, + @Query("id") id: String + ): String + + /** * 获取指导视频 */ @GET("/knowledge-base/listPage") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ec6697f..a2bc167 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -79,6 +79,7 @@ + basisList; + private String checkItem; + private String checkMethod; + private String checkObject; + private String checkObjectName; + private String checkStandard; + private String createTime; + private String createUserId; + private String createUserName; + private String id; + private String remark; + private String scene; + private String sceneName; + private String type; + private String typeName; + private String updateTime; + private String updateUserId; + private String updateUserName; + + public List getBasisList() { + return basisList; + } + + public void setBasisList(List basisList) { + this.basisList = basisList; + } + + public String getCheckItem() { + return checkItem; + } + + public void setCheckItem(String checkItem) { + this.checkItem = checkItem; + } + + public String getCheckMethod() { + return checkMethod; + } + + public void setCheckMethod(String checkMethod) { + this.checkMethod = checkMethod; + } + + public String getCheckObject() { + return checkObject; + } + + public void setCheckObject(String checkObject) { + this.checkObject = checkObject; + } + + public String getCheckObjectName() { + return checkObjectName; + } + + public void setCheckObjectName(String checkObjectName) { + this.checkObjectName = checkObjectName; + } + + public String getCheckStandard() { + return checkStandard; + } + + public void setCheckStandard(String checkStandard) { + this.checkStandard = checkStandard; + } + + 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 getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getScene() { + return scene; + } + + public void setScene(String scene) { + this.scene = scene; + } + + public String getSceneName() { + return sceneName; + } + + public void setSceneName(String sceneName) { + this.sceneName = sceneName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + 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; + } + + public static class BasisListModel { + private String chapter; + private int checkMenuId; + private String content; + private String createTime; + private int createUserId; + private String createUserName; + private int id; + private int specificationId; + private int specificationItemId; + private String specificationName; + private String updateTime; + private int updateUserId; + private String updateUserName; + + public String getChapter() { + return chapter; + } + + public void setChapter(String chapter) { + this.chapter = chapter; + } + + public int getCheckMenuId() { + return checkMenuId; + } + + public void setCheckMenuId(int checkMenuId) { + this.checkMenuId = checkMenuId; + } + + 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 int getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(int createUserId) { + this.createUserId = createUserId; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getSpecificationId() { + return specificationId; + } + + public void setSpecificationId(int specificationId) { + this.specificationId = specificationId; + } + + public int getSpecificationItemId() { + return specificationItemId; + } + + public void setSpecificationItemId(int 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 int getUpdateUserId() { + return updateUserId; + } + + public void setUpdateUserId(int 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/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt index 4c89f53..925ef91 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt @@ -132,6 +132,15 @@ ): String /** + * 获取检查清单详情 + */ + @GET("/check-menu/detail") + suspend fun getCheckManifestDetailById( + @Header("token") token: String, + @Query("id") id: String + ): String + + /** * 获取指导视频 */ @GET("/knowledge-base/listPage") diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt index 0d76a8e..fd274fb 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt @@ -181,6 +181,13 @@ } /** + * 获取检查清单详情 + */ + suspend fun getCheckManifestDetailById(id: String): String { + return api.getCheckManifestDetailById(AuthenticationHelper.token, id) + } + + /** * 获取指导视频 */ suspend fun getGuideVideoByPage(keywords: String, classId: String, offset: Int): String { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ec6697f..a2bc167 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -79,6 +79,7 @@ + basisList; + private String checkItem; + private String checkMethod; + private String checkObject; + private String checkObjectName; + private String checkStandard; + private String createTime; + private String createUserId; + private String createUserName; + private String id; + private String remark; + private String scene; + private String sceneName; + private String type; + private String typeName; + private String updateTime; + private String updateUserId; + private String updateUserName; + + public List getBasisList() { + return basisList; + } + + public void setBasisList(List basisList) { + this.basisList = basisList; + } + + public String getCheckItem() { + return checkItem; + } + + public void setCheckItem(String checkItem) { + this.checkItem = checkItem; + } + + public String getCheckMethod() { + return checkMethod; + } + + public void setCheckMethod(String checkMethod) { + this.checkMethod = checkMethod; + } + + public String getCheckObject() { + return checkObject; + } + + public void setCheckObject(String checkObject) { + this.checkObject = checkObject; + } + + public String getCheckObjectName() { + return checkObjectName; + } + + public void setCheckObjectName(String checkObjectName) { + this.checkObjectName = checkObjectName; + } + + public String getCheckStandard() { + return checkStandard; + } + + public void setCheckStandard(String checkStandard) { + this.checkStandard = checkStandard; + } + + 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 getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getScene() { + return scene; + } + + public void setScene(String scene) { + this.scene = scene; + } + + public String getSceneName() { + return sceneName; + } + + public void setSceneName(String sceneName) { + this.sceneName = sceneName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + 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; + } + + public static class BasisListModel { + private String chapter; + private int checkMenuId; + private String content; + private String createTime; + private int createUserId; + private String createUserName; + private int id; + private int specificationId; + private int specificationItemId; + private String specificationName; + private String updateTime; + private int updateUserId; + private String updateUserName; + + public String getChapter() { + return chapter; + } + + public void setChapter(String chapter) { + this.chapter = chapter; + } + + public int getCheckMenuId() { + return checkMenuId; + } + + public void setCheckMenuId(int checkMenuId) { + this.checkMenuId = checkMenuId; + } + + 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 int getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(int createUserId) { + this.createUserId = createUserId; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getSpecificationId() { + return specificationId; + } + + public void setSpecificationId(int specificationId) { + this.specificationId = specificationId; + } + + public int getSpecificationItemId() { + return specificationItemId; + } + + public void setSpecificationItemId(int 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 int getUpdateUserId() { + return updateUserId; + } + + public void setUpdateUserId(int 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/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt index 4c89f53..925ef91 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt @@ -132,6 +132,15 @@ ): String /** + * 获取检查清单详情 + */ + @GET("/check-menu/detail") + suspend fun getCheckManifestDetailById( + @Header("token") token: String, + @Query("id") id: String + ): String + + /** * 获取指导视频 */ @GET("/knowledge-base/listPage") diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt index 0d76a8e..fd274fb 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt @@ -181,6 +181,13 @@ } /** + * 获取检查清单详情 + */ + suspend fun getCheckManifestDetailById(id: String): String { + return api.getCheckManifestDetailById(AuthenticationHelper.token, id) + } + + /** * 获取指导视频 */ suspend fun getGuideVideoByPage(keywords: String, classId: String, offset: Int): String { diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 127f1c1..1f3a4f0 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState @@ -143,6 +144,10 @@ } } } + + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(3.dp2px(this), 0, 7.dp2px(this), 7.dp2px(this)) + ) } private fun getCheckManifestByPage() { @@ -167,15 +172,12 @@ } } binding.recyclerView.adapter = checkManifestAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(5.dp2px(this) shr 1, 7, 5.dp2px(this), 7) - ) checkManifestAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( position: Int, t: CheckManifestModel.DataModel.RowsModel ) { - //TODO 查看检查清单详情 + navigatePageTo(t.id) } }) } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ec6697f..a2bc167 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -79,6 +79,7 @@ + basisList; + private String checkItem; + private String checkMethod; + private String checkObject; + private String checkObjectName; + private String checkStandard; + private String createTime; + private String createUserId; + private String createUserName; + private String id; + private String remark; + private String scene; + private String sceneName; + private String type; + private String typeName; + private String updateTime; + private String updateUserId; + private String updateUserName; + + public List getBasisList() { + return basisList; + } + + public void setBasisList(List basisList) { + this.basisList = basisList; + } + + public String getCheckItem() { + return checkItem; + } + + public void setCheckItem(String checkItem) { + this.checkItem = checkItem; + } + + public String getCheckMethod() { + return checkMethod; + } + + public void setCheckMethod(String checkMethod) { + this.checkMethod = checkMethod; + } + + public String getCheckObject() { + return checkObject; + } + + public void setCheckObject(String checkObject) { + this.checkObject = checkObject; + } + + public String getCheckObjectName() { + return checkObjectName; + } + + public void setCheckObjectName(String checkObjectName) { + this.checkObjectName = checkObjectName; + } + + public String getCheckStandard() { + return checkStandard; + } + + public void setCheckStandard(String checkStandard) { + this.checkStandard = checkStandard; + } + + 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 getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getScene() { + return scene; + } + + public void setScene(String scene) { + this.scene = scene; + } + + public String getSceneName() { + return sceneName; + } + + public void setSceneName(String sceneName) { + this.sceneName = sceneName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + 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; + } + + public static class BasisListModel { + private String chapter; + private int checkMenuId; + private String content; + private String createTime; + private int createUserId; + private String createUserName; + private int id; + private int specificationId; + private int specificationItemId; + private String specificationName; + private String updateTime; + private int updateUserId; + private String updateUserName; + + public String getChapter() { + return chapter; + } + + public void setChapter(String chapter) { + this.chapter = chapter; + } + + public int getCheckMenuId() { + return checkMenuId; + } + + public void setCheckMenuId(int checkMenuId) { + this.checkMenuId = checkMenuId; + } + + 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 int getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(int createUserId) { + this.createUserId = createUserId; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getSpecificationId() { + return specificationId; + } + + public void setSpecificationId(int specificationId) { + this.specificationId = specificationId; + } + + public int getSpecificationItemId() { + return specificationItemId; + } + + public void setSpecificationItemId(int 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 int getUpdateUserId() { + return updateUserId; + } + + public void setUpdateUserId(int 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/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt index 4c89f53..925ef91 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt @@ -132,6 +132,15 @@ ): String /** + * 获取检查清单详情 + */ + @GET("/check-menu/detail") + suspend fun getCheckManifestDetailById( + @Header("token") token: String, + @Query("id") id: String + ): String + + /** * 获取指导视频 */ @GET("/knowledge-base/listPage") diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt index 0d76a8e..fd274fb 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt @@ -181,6 +181,13 @@ } /** + * 获取检查清单详情 + */ + suspend fun getCheckManifestDetailById(id: String): String { + return api.getCheckManifestDetailById(AuthenticationHelper.token, id) + } + + /** * 获取指导视频 */ suspend fun getGuideVideoByPage(keywords: String, classId: String, offset: Int): String { diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 127f1c1..1f3a4f0 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState @@ -143,6 +144,10 @@ } } } + + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(3.dp2px(this), 0, 7.dp2px(this), 7.dp2px(this)) + ) } private fun getCheckManifestByPage() { @@ -167,15 +172,12 @@ } } binding.recyclerView.adapter = checkManifestAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(5.dp2px(this) shr 1, 7, 5.dp2px(this), 7) - ) checkManifestAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( position: Int, t: CheckManifestModel.DataModel.RowsModel ) { - //TODO 查看检查清单详情 + navigatePageTo(t.id) } }) } 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 new file mode 100644 index 0000000..dc6403c --- /dev/null +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestDetailActivity.kt @@ -0,0 +1,90 @@ +package com.casic.br.app.view + +import android.os.Bundle +import androidx.lifecycle.ViewModelProvider +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 +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView + +class CheckManifestDetailActivity : KotlinBaseActivity() { + + private lateinit var checkManifestViewModel: CheckManifestViewModel + + override fun initEvent() { + + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + val id = intent.getStringExtra(Constant.INTENT_PARAM) as String + checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java] + checkManifestViewModel.getCheckManifestDetailById(this, id) + checkManifestViewModel.manifestDetailResult.observe(this) { + if (it.code == 200) { + binding.classView.text = it.data.typeName + 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}" + ) + } + } + binding.checkBaseView.adapter = checkBaseAdapter + binding.remarkView.text = it.data.remark + } + } + } + + override fun initViewBinding(): ActivityCheckManifestDetailBinding { + return ActivityCheckManifestDetailBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + checkManifestViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") + LoadState.Success -> { + LoadingDialogHub.dismiss() + } + + LoadState.Fail -> { + LoadingDialogHub.dismiss() + "数据加载失败,请重试".show(this) + } + } + } + } + + override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ec6697f..a2bc167 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -79,6 +79,7 @@ + basisList; + private String checkItem; + private String checkMethod; + private String checkObject; + private String checkObjectName; + private String checkStandard; + private String createTime; + private String createUserId; + private String createUserName; + private String id; + private String remark; + private String scene; + private String sceneName; + private String type; + private String typeName; + private String updateTime; + private String updateUserId; + private String updateUserName; + + public List getBasisList() { + return basisList; + } + + public void setBasisList(List basisList) { + this.basisList = basisList; + } + + public String getCheckItem() { + return checkItem; + } + + public void setCheckItem(String checkItem) { + this.checkItem = checkItem; + } + + public String getCheckMethod() { + return checkMethod; + } + + public void setCheckMethod(String checkMethod) { + this.checkMethod = checkMethod; + } + + public String getCheckObject() { + return checkObject; + } + + public void setCheckObject(String checkObject) { + this.checkObject = checkObject; + } + + public String getCheckObjectName() { + return checkObjectName; + } + + public void setCheckObjectName(String checkObjectName) { + this.checkObjectName = checkObjectName; + } + + public String getCheckStandard() { + return checkStandard; + } + + public void setCheckStandard(String checkStandard) { + this.checkStandard = checkStandard; + } + + 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 getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getScene() { + return scene; + } + + public void setScene(String scene) { + this.scene = scene; + } + + public String getSceneName() { + return sceneName; + } + + public void setSceneName(String sceneName) { + this.sceneName = sceneName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + 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; + } + + public static class BasisListModel { + private String chapter; + private int checkMenuId; + private String content; + private String createTime; + private int createUserId; + private String createUserName; + private int id; + private int specificationId; + private int specificationItemId; + private String specificationName; + private String updateTime; + private int updateUserId; + private String updateUserName; + + public String getChapter() { + return chapter; + } + + public void setChapter(String chapter) { + this.chapter = chapter; + } + + public int getCheckMenuId() { + return checkMenuId; + } + + public void setCheckMenuId(int checkMenuId) { + this.checkMenuId = checkMenuId; + } + + 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 int getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(int createUserId) { + this.createUserId = createUserId; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getSpecificationId() { + return specificationId; + } + + public void setSpecificationId(int specificationId) { + this.specificationId = specificationId; + } + + public int getSpecificationItemId() { + return specificationItemId; + } + + public void setSpecificationItemId(int 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 int getUpdateUserId() { + return updateUserId; + } + + public void setUpdateUserId(int 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/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt index 4c89f53..925ef91 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt @@ -132,6 +132,15 @@ ): String /** + * 获取检查清单详情 + */ + @GET("/check-menu/detail") + suspend fun getCheckManifestDetailById( + @Header("token") token: String, + @Query("id") id: String + ): String + + /** * 获取指导视频 */ @GET("/knowledge-base/listPage") diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt index 0d76a8e..fd274fb 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt @@ -181,6 +181,13 @@ } /** + * 获取检查清单详情 + */ + suspend fun getCheckManifestDetailById(id: String): String { + return api.getCheckManifestDetailById(AuthenticationHelper.token, id) + } + + /** * 获取指导视频 */ suspend fun getGuideVideoByPage(keywords: String, classId: String, offset: Int): String { diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 127f1c1..1f3a4f0 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState @@ -143,6 +144,10 @@ } } } + + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(3.dp2px(this), 0, 7.dp2px(this), 7.dp2px(this)) + ) } private fun getCheckManifestByPage() { @@ -167,15 +172,12 @@ } } binding.recyclerView.adapter = checkManifestAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(5.dp2px(this) shr 1, 7, 5.dp2px(this), 7) - ) checkManifestAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( position: Int, t: CheckManifestModel.DataModel.RowsModel ) { - //TODO 查看检查清单详情 + navigatePageTo(t.id) } }) } 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 new file mode 100644 index 0000000..dc6403c --- /dev/null +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestDetailActivity.kt @@ -0,0 +1,90 @@ +package com.casic.br.app.view + +import android.os.Bundle +import androidx.lifecycle.ViewModelProvider +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 +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView + +class CheckManifestDetailActivity : KotlinBaseActivity() { + + private lateinit var checkManifestViewModel: CheckManifestViewModel + + override fun initEvent() { + + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + val id = intent.getStringExtra(Constant.INTENT_PARAM) as String + checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java] + checkManifestViewModel.getCheckManifestDetailById(this, id) + checkManifestViewModel.manifestDetailResult.observe(this) { + if (it.code == 200) { + binding.classView.text = it.data.typeName + 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}" + ) + } + } + binding.checkBaseView.adapter = checkBaseAdapter + binding.remarkView.text = it.data.remark + } + } + } + + override fun initViewBinding(): ActivityCheckManifestDetailBinding { + return ActivityCheckManifestDetailBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + checkManifestViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") + LoadState.Success -> { + LoadingDialogHub.dismiss() + } + + LoadState.Fail -> { + LoadingDialogHub.dismiss() + "数据加载失败,请重试".show(this) + } + } + } + } + + override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt b/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt index c16ee54..e17e84c 100644 --- a/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt +++ b/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.br.app.extensions.getResponseCode import com.casic.br.app.extensions.getResponseMessage +import com.casic.br.app.model.CheckManifestDetailModel import com.casic.br.app.model.CheckManifestModel import com.casic.br.app.retrofit.RetrofitServiceManager import com.google.gson.Gson @@ -17,6 +18,7 @@ private val gson by lazy { Gson() } val manifestResult = MutableLiveData() + val manifestDetailResult = MutableLiveData() fun getCheckManifestByPage( context: Context, keywords: String, type: String, scene: String, offset: Int @@ -40,4 +42,25 @@ loadState.value = LoadState.Fail it.localizedMessage?.show(context) }) + + fun getCheckManifestDetailById(context: Context, id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCheckManifestDetailById(id) + when (response.getResponseCode()) { + 200 -> { + loadState.value = LoadState.Success + manifestDetailResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } + + else -> { + loadState.value = LoadState.Fail + response.getResponseMessage().show(context) + } + } + }, { + loadState.value = LoadState.Fail + it.localizedMessage?.show(context) + }) } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ec6697f..a2bc167 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -79,6 +79,7 @@ + basisList; + private String checkItem; + private String checkMethod; + private String checkObject; + private String checkObjectName; + private String checkStandard; + private String createTime; + private String createUserId; + private String createUserName; + private String id; + private String remark; + private String scene; + private String sceneName; + private String type; + private String typeName; + private String updateTime; + private String updateUserId; + private String updateUserName; + + public List getBasisList() { + return basisList; + } + + public void setBasisList(List basisList) { + this.basisList = basisList; + } + + public String getCheckItem() { + return checkItem; + } + + public void setCheckItem(String checkItem) { + this.checkItem = checkItem; + } + + public String getCheckMethod() { + return checkMethod; + } + + public void setCheckMethod(String checkMethod) { + this.checkMethod = checkMethod; + } + + public String getCheckObject() { + return checkObject; + } + + public void setCheckObject(String checkObject) { + this.checkObject = checkObject; + } + + public String getCheckObjectName() { + return checkObjectName; + } + + public void setCheckObjectName(String checkObjectName) { + this.checkObjectName = checkObjectName; + } + + public String getCheckStandard() { + return checkStandard; + } + + public void setCheckStandard(String checkStandard) { + this.checkStandard = checkStandard; + } + + 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 getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getScene() { + return scene; + } + + public void setScene(String scene) { + this.scene = scene; + } + + public String getSceneName() { + return sceneName; + } + + public void setSceneName(String sceneName) { + this.sceneName = sceneName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + 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; + } + + public static class BasisListModel { + private String chapter; + private int checkMenuId; + private String content; + private String createTime; + private int createUserId; + private String createUserName; + private int id; + private int specificationId; + private int specificationItemId; + private String specificationName; + private String updateTime; + private int updateUserId; + private String updateUserName; + + public String getChapter() { + return chapter; + } + + public void setChapter(String chapter) { + this.chapter = chapter; + } + + public int getCheckMenuId() { + return checkMenuId; + } + + public void setCheckMenuId(int checkMenuId) { + this.checkMenuId = checkMenuId; + } + + 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 int getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(int createUserId) { + this.createUserId = createUserId; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getSpecificationId() { + return specificationId; + } + + public void setSpecificationId(int specificationId) { + this.specificationId = specificationId; + } + + public int getSpecificationItemId() { + return specificationItemId; + } + + public void setSpecificationItemId(int 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 int getUpdateUserId() { + return updateUserId; + } + + public void setUpdateUserId(int 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/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt index 4c89f53..925ef91 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt @@ -132,6 +132,15 @@ ): String /** + * 获取检查清单详情 + */ + @GET("/check-menu/detail") + suspend fun getCheckManifestDetailById( + @Header("token") token: String, + @Query("id") id: String + ): String + + /** * 获取指导视频 */ @GET("/knowledge-base/listPage") diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt index 0d76a8e..fd274fb 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt @@ -181,6 +181,13 @@ } /** + * 获取检查清单详情 + */ + suspend fun getCheckManifestDetailById(id: String): String { + return api.getCheckManifestDetailById(AuthenticationHelper.token, id) + } + + /** * 获取指导视频 */ suspend fun getGuideVideoByPage(keywords: String, classId: String, offset: Int): String { diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 127f1c1..1f3a4f0 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState @@ -143,6 +144,10 @@ } } } + + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(3.dp2px(this), 0, 7.dp2px(this), 7.dp2px(this)) + ) } private fun getCheckManifestByPage() { @@ -167,15 +172,12 @@ } } binding.recyclerView.adapter = checkManifestAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(5.dp2px(this) shr 1, 7, 5.dp2px(this), 7) - ) checkManifestAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( position: Int, t: CheckManifestModel.DataModel.RowsModel ) { - //TODO 查看检查清单详情 + navigatePageTo(t.id) } }) } 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 new file mode 100644 index 0000000..dc6403c --- /dev/null +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestDetailActivity.kt @@ -0,0 +1,90 @@ +package com.casic.br.app.view + +import android.os.Bundle +import androidx.lifecycle.ViewModelProvider +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 +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView + +class CheckManifestDetailActivity : KotlinBaseActivity() { + + private lateinit var checkManifestViewModel: CheckManifestViewModel + + override fun initEvent() { + + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + val id = intent.getStringExtra(Constant.INTENT_PARAM) as String + checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java] + checkManifestViewModel.getCheckManifestDetailById(this, id) + checkManifestViewModel.manifestDetailResult.observe(this) { + if (it.code == 200) { + binding.classView.text = it.data.typeName + 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}" + ) + } + } + binding.checkBaseView.adapter = checkBaseAdapter + binding.remarkView.text = it.data.remark + } + } + } + + override fun initViewBinding(): ActivityCheckManifestDetailBinding { + return ActivityCheckManifestDetailBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + checkManifestViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") + LoadState.Success -> { + LoadingDialogHub.dismiss() + } + + LoadState.Fail -> { + LoadingDialogHub.dismiss() + "数据加载失败,请重试".show(this) + } + } + } + } + + override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt b/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt index c16ee54..e17e84c 100644 --- a/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt +++ b/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.br.app.extensions.getResponseCode import com.casic.br.app.extensions.getResponseMessage +import com.casic.br.app.model.CheckManifestDetailModel import com.casic.br.app.model.CheckManifestModel import com.casic.br.app.retrofit.RetrofitServiceManager import com.google.gson.Gson @@ -17,6 +18,7 @@ private val gson by lazy { Gson() } val manifestResult = MutableLiveData() + val manifestDetailResult = MutableLiveData() fun getCheckManifestByPage( context: Context, keywords: String, type: String, scene: String, offset: Int @@ -40,4 +42,25 @@ loadState.value = LoadState.Fail it.localizedMessage?.show(context) }) + + fun getCheckManifestDetailById(context: Context, id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCheckManifestDetailById(id) + when (response.getResponseCode()) { + 200 -> { + loadState.value = LoadState.Success + manifestDetailResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } + + else -> { + loadState.value = LoadState.Fail + response.getResponseMessage().show(context) + } + } + }, { + loadState.value = LoadState.Fail + it.localizedMessage?.show(context) + }) } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_manifest_detail.xml b/app/src/main/res/layout/activity_check_manifest_detail.xml new file mode 100644 index 0000000..0b91b15 --- /dev/null +++ b/app/src/main/res/layout/activity_check_manifest_detail.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ec6697f..a2bc167 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -79,6 +79,7 @@ + basisList; + private String checkItem; + private String checkMethod; + private String checkObject; + private String checkObjectName; + private String checkStandard; + private String createTime; + private String createUserId; + private String createUserName; + private String id; + private String remark; + private String scene; + private String sceneName; + private String type; + private String typeName; + private String updateTime; + private String updateUserId; + private String updateUserName; + + public List getBasisList() { + return basisList; + } + + public void setBasisList(List basisList) { + this.basisList = basisList; + } + + public String getCheckItem() { + return checkItem; + } + + public void setCheckItem(String checkItem) { + this.checkItem = checkItem; + } + + public String getCheckMethod() { + return checkMethod; + } + + public void setCheckMethod(String checkMethod) { + this.checkMethod = checkMethod; + } + + public String getCheckObject() { + return checkObject; + } + + public void setCheckObject(String checkObject) { + this.checkObject = checkObject; + } + + public String getCheckObjectName() { + return checkObjectName; + } + + public void setCheckObjectName(String checkObjectName) { + this.checkObjectName = checkObjectName; + } + + public String getCheckStandard() { + return checkStandard; + } + + public void setCheckStandard(String checkStandard) { + this.checkStandard = checkStandard; + } + + 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 getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getScene() { + return scene; + } + + public void setScene(String scene) { + this.scene = scene; + } + + public String getSceneName() { + return sceneName; + } + + public void setSceneName(String sceneName) { + this.sceneName = sceneName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + 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; + } + + public static class BasisListModel { + private String chapter; + private int checkMenuId; + private String content; + private String createTime; + private int createUserId; + private String createUserName; + private int id; + private int specificationId; + private int specificationItemId; + private String specificationName; + private String updateTime; + private int updateUserId; + private String updateUserName; + + public String getChapter() { + return chapter; + } + + public void setChapter(String chapter) { + this.chapter = chapter; + } + + public int getCheckMenuId() { + return checkMenuId; + } + + public void setCheckMenuId(int checkMenuId) { + this.checkMenuId = checkMenuId; + } + + 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 int getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(int createUserId) { + this.createUserId = createUserId; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getSpecificationId() { + return specificationId; + } + + public void setSpecificationId(int specificationId) { + this.specificationId = specificationId; + } + + public int getSpecificationItemId() { + return specificationItemId; + } + + public void setSpecificationItemId(int 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 int getUpdateUserId() { + return updateUserId; + } + + public void setUpdateUserId(int 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/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt index 4c89f53..925ef91 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt @@ -132,6 +132,15 @@ ): String /** + * 获取检查清单详情 + */ + @GET("/check-menu/detail") + suspend fun getCheckManifestDetailById( + @Header("token") token: String, + @Query("id") id: String + ): String + + /** * 获取指导视频 */ @GET("/knowledge-base/listPage") diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt index 0d76a8e..fd274fb 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt @@ -181,6 +181,13 @@ } /** + * 获取检查清单详情 + */ + suspend fun getCheckManifestDetailById(id: String): String { + return api.getCheckManifestDetailById(AuthenticationHelper.token, id) + } + + /** * 获取指导视频 */ suspend fun getGuideVideoByPage(keywords: String, classId: String, offset: Int): String { diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 127f1c1..1f3a4f0 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState @@ -143,6 +144,10 @@ } } } + + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(3.dp2px(this), 0, 7.dp2px(this), 7.dp2px(this)) + ) } private fun getCheckManifestByPage() { @@ -167,15 +172,12 @@ } } binding.recyclerView.adapter = checkManifestAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(5.dp2px(this) shr 1, 7, 5.dp2px(this), 7) - ) checkManifestAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( position: Int, t: CheckManifestModel.DataModel.RowsModel ) { - //TODO 查看检查清单详情 + navigatePageTo(t.id) } }) } 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 new file mode 100644 index 0000000..dc6403c --- /dev/null +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestDetailActivity.kt @@ -0,0 +1,90 @@ +package com.casic.br.app.view + +import android.os.Bundle +import androidx.lifecycle.ViewModelProvider +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 +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView + +class CheckManifestDetailActivity : KotlinBaseActivity() { + + private lateinit var checkManifestViewModel: CheckManifestViewModel + + override fun initEvent() { + + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + val id = intent.getStringExtra(Constant.INTENT_PARAM) as String + checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java] + checkManifestViewModel.getCheckManifestDetailById(this, id) + checkManifestViewModel.manifestDetailResult.observe(this) { + if (it.code == 200) { + binding.classView.text = it.data.typeName + 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}" + ) + } + } + binding.checkBaseView.adapter = checkBaseAdapter + binding.remarkView.text = it.data.remark + } + } + } + + override fun initViewBinding(): ActivityCheckManifestDetailBinding { + return ActivityCheckManifestDetailBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + checkManifestViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") + LoadState.Success -> { + LoadingDialogHub.dismiss() + } + + LoadState.Fail -> { + LoadingDialogHub.dismiss() + "数据加载失败,请重试".show(this) + } + } + } + } + + override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt b/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt index c16ee54..e17e84c 100644 --- a/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt +++ b/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.br.app.extensions.getResponseCode import com.casic.br.app.extensions.getResponseMessage +import com.casic.br.app.model.CheckManifestDetailModel import com.casic.br.app.model.CheckManifestModel import com.casic.br.app.retrofit.RetrofitServiceManager import com.google.gson.Gson @@ -17,6 +18,7 @@ private val gson by lazy { Gson() } val manifestResult = MutableLiveData() + val manifestDetailResult = MutableLiveData() fun getCheckManifestByPage( context: Context, keywords: String, type: String, scene: String, offset: Int @@ -40,4 +42,25 @@ loadState.value = LoadState.Fail it.localizedMessage?.show(context) }) + + fun getCheckManifestDetailById(context: Context, id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCheckManifestDetailById(id) + when (response.getResponseCode()) { + 200 -> { + loadState.value = LoadState.Success + manifestDetailResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } + + else -> { + loadState.value = LoadState.Fail + response.getResponseMessage().show(context) + } + } + }, { + loadState.value = LoadState.Fail + it.localizedMessage?.show(context) + }) } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_manifest_detail.xml b/app/src/main/res/layout/activity_check_manifest_detail.xml new file mode 100644 index 0000000..0b91b15 --- /dev/null +++ b/app/src/main/res/layout/activity_check_manifest_detail.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_library.xml b/app/src/main/res/layout/activity_library.xml index 2ceb962..be4bb7a 100644 --- a/app/src/main/res/layout/activity_library.xml +++ b/app/src/main/res/layout/activity_library.xml @@ -63,7 +63,9 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_margin="@dimen/dp_10" + android:layout_marginHorizontal="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_5" + android:layout_marginBottom="@dimen/dp_10" android:layout_weight="1" app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" app:spanCount="3" /> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ec6697f..a2bc167 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -79,6 +79,7 @@ + basisList; + private String checkItem; + private String checkMethod; + private String checkObject; + private String checkObjectName; + private String checkStandard; + private String createTime; + private String createUserId; + private String createUserName; + private String id; + private String remark; + private String scene; + private String sceneName; + private String type; + private String typeName; + private String updateTime; + private String updateUserId; + private String updateUserName; + + public List getBasisList() { + return basisList; + } + + public void setBasisList(List basisList) { + this.basisList = basisList; + } + + public String getCheckItem() { + return checkItem; + } + + public void setCheckItem(String checkItem) { + this.checkItem = checkItem; + } + + public String getCheckMethod() { + return checkMethod; + } + + public void setCheckMethod(String checkMethod) { + this.checkMethod = checkMethod; + } + + public String getCheckObject() { + return checkObject; + } + + public void setCheckObject(String checkObject) { + this.checkObject = checkObject; + } + + public String getCheckObjectName() { + return checkObjectName; + } + + public void setCheckObjectName(String checkObjectName) { + this.checkObjectName = checkObjectName; + } + + public String getCheckStandard() { + return checkStandard; + } + + public void setCheckStandard(String checkStandard) { + this.checkStandard = checkStandard; + } + + 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 getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getScene() { + return scene; + } + + public void setScene(String scene) { + this.scene = scene; + } + + public String getSceneName() { + return sceneName; + } + + public void setSceneName(String sceneName) { + this.sceneName = sceneName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + 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; + } + + public static class BasisListModel { + private String chapter; + private int checkMenuId; + private String content; + private String createTime; + private int createUserId; + private String createUserName; + private int id; + private int specificationId; + private int specificationItemId; + private String specificationName; + private String updateTime; + private int updateUserId; + private String updateUserName; + + public String getChapter() { + return chapter; + } + + public void setChapter(String chapter) { + this.chapter = chapter; + } + + public int getCheckMenuId() { + return checkMenuId; + } + + public void setCheckMenuId(int checkMenuId) { + this.checkMenuId = checkMenuId; + } + + 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 int getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(int createUserId) { + this.createUserId = createUserId; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getSpecificationId() { + return specificationId; + } + + public void setSpecificationId(int specificationId) { + this.specificationId = specificationId; + } + + public int getSpecificationItemId() { + return specificationItemId; + } + + public void setSpecificationItemId(int 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 int getUpdateUserId() { + return updateUserId; + } + + public void setUpdateUserId(int 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/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt index 4c89f53..925ef91 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt @@ -132,6 +132,15 @@ ): String /** + * 获取检查清单详情 + */ + @GET("/check-menu/detail") + suspend fun getCheckManifestDetailById( + @Header("token") token: String, + @Query("id") id: String + ): String + + /** * 获取指导视频 */ @GET("/knowledge-base/listPage") diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt index 0d76a8e..fd274fb 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt @@ -181,6 +181,13 @@ } /** + * 获取检查清单详情 + */ + suspend fun getCheckManifestDetailById(id: String): String { + return api.getCheckManifestDetailById(AuthenticationHelper.token, id) + } + + /** * 获取指导视频 */ suspend fun getGuideVideoByPage(keywords: String, classId: String, offset: Int): String { diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 127f1c1..1f3a4f0 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState @@ -143,6 +144,10 @@ } } } + + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(3.dp2px(this), 0, 7.dp2px(this), 7.dp2px(this)) + ) } private fun getCheckManifestByPage() { @@ -167,15 +172,12 @@ } } binding.recyclerView.adapter = checkManifestAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(5.dp2px(this) shr 1, 7, 5.dp2px(this), 7) - ) checkManifestAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( position: Int, t: CheckManifestModel.DataModel.RowsModel ) { - //TODO 查看检查清单详情 + navigatePageTo(t.id) } }) } 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 new file mode 100644 index 0000000..dc6403c --- /dev/null +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestDetailActivity.kt @@ -0,0 +1,90 @@ +package com.casic.br.app.view + +import android.os.Bundle +import androidx.lifecycle.ViewModelProvider +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 +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView + +class CheckManifestDetailActivity : KotlinBaseActivity() { + + private lateinit var checkManifestViewModel: CheckManifestViewModel + + override fun initEvent() { + + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + val id = intent.getStringExtra(Constant.INTENT_PARAM) as String + checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java] + checkManifestViewModel.getCheckManifestDetailById(this, id) + checkManifestViewModel.manifestDetailResult.observe(this) { + if (it.code == 200) { + binding.classView.text = it.data.typeName + 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}" + ) + } + } + binding.checkBaseView.adapter = checkBaseAdapter + binding.remarkView.text = it.data.remark + } + } + } + + override fun initViewBinding(): ActivityCheckManifestDetailBinding { + return ActivityCheckManifestDetailBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + checkManifestViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") + LoadState.Success -> { + LoadingDialogHub.dismiss() + } + + LoadState.Fail -> { + LoadingDialogHub.dismiss() + "数据加载失败,请重试".show(this) + } + } + } + } + + override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt b/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt index c16ee54..e17e84c 100644 --- a/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt +++ b/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.br.app.extensions.getResponseCode import com.casic.br.app.extensions.getResponseMessage +import com.casic.br.app.model.CheckManifestDetailModel import com.casic.br.app.model.CheckManifestModel import com.casic.br.app.retrofit.RetrofitServiceManager import com.google.gson.Gson @@ -17,6 +18,7 @@ private val gson by lazy { Gson() } val manifestResult = MutableLiveData() + val manifestDetailResult = MutableLiveData() fun getCheckManifestByPage( context: Context, keywords: String, type: String, scene: String, offset: Int @@ -40,4 +42,25 @@ loadState.value = LoadState.Fail it.localizedMessage?.show(context) }) + + fun getCheckManifestDetailById(context: Context, id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCheckManifestDetailById(id) + when (response.getResponseCode()) { + 200 -> { + loadState.value = LoadState.Success + manifestDetailResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } + + else -> { + loadState.value = LoadState.Fail + response.getResponseMessage().show(context) + } + } + }, { + loadState.value = LoadState.Fail + it.localizedMessage?.show(context) + }) } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_manifest_detail.xml b/app/src/main/res/layout/activity_check_manifest_detail.xml new file mode 100644 index 0000000..0b91b15 --- /dev/null +++ b/app/src/main/res/layout/activity_check_manifest_detail.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_library.xml b/app/src/main/res/layout/activity_library.xml index 2ceb962..be4bb7a 100644 --- a/app/src/main/res/layout/activity_library.xml +++ b/app/src/main/res/layout/activity_library.xml @@ -63,7 +63,9 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_margin="@dimen/dp_10" + android:layout_marginHorizontal="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_5" + android:layout_marginBottom="@dimen/dp_10" android:layout_weight="1" app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" app:spanCount="3" /> diff --git a/app/src/main/res/layout/item_check_manifest.xml b/app/src/main/res/layout/item_check_manifest.xml index e74c47b..f6e68c2 100644 --- a/app/src/main/res/layout/item_check_manifest.xml +++ b/app/src/main/res/layout/item_check_manifest.xml @@ -1,6 +1,5 @@ - - - - - - - + android:text="中国航天科工集团二院二〇三所版权所有中国航天科工集团二院二〇三所" + android:textColor="@color/white" + android:textSize="@dimen/sp_16" /> + basisList; + private String checkItem; + private String checkMethod; + private String checkObject; + private String checkObjectName; + private String checkStandard; + private String createTime; + private String createUserId; + private String createUserName; + private String id; + private String remark; + private String scene; + private String sceneName; + private String type; + private String typeName; + private String updateTime; + private String updateUserId; + private String updateUserName; + + public List getBasisList() { + return basisList; + } + + public void setBasisList(List basisList) { + this.basisList = basisList; + } + + public String getCheckItem() { + return checkItem; + } + + public void setCheckItem(String checkItem) { + this.checkItem = checkItem; + } + + public String getCheckMethod() { + return checkMethod; + } + + public void setCheckMethod(String checkMethod) { + this.checkMethod = checkMethod; + } + + public String getCheckObject() { + return checkObject; + } + + public void setCheckObject(String checkObject) { + this.checkObject = checkObject; + } + + public String getCheckObjectName() { + return checkObjectName; + } + + public void setCheckObjectName(String checkObjectName) { + this.checkObjectName = checkObjectName; + } + + public String getCheckStandard() { + return checkStandard; + } + + public void setCheckStandard(String checkStandard) { + this.checkStandard = checkStandard; + } + + 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 getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getScene() { + return scene; + } + + public void setScene(String scene) { + this.scene = scene; + } + + public String getSceneName() { + return sceneName; + } + + public void setSceneName(String sceneName) { + this.sceneName = sceneName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + 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; + } + + public static class BasisListModel { + private String chapter; + private int checkMenuId; + private String content; + private String createTime; + private int createUserId; + private String createUserName; + private int id; + private int specificationId; + private int specificationItemId; + private String specificationName; + private String updateTime; + private int updateUserId; + private String updateUserName; + + public String getChapter() { + return chapter; + } + + public void setChapter(String chapter) { + this.chapter = chapter; + } + + public int getCheckMenuId() { + return checkMenuId; + } + + public void setCheckMenuId(int checkMenuId) { + this.checkMenuId = checkMenuId; + } + + 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 int getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(int createUserId) { + this.createUserId = createUserId; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getSpecificationId() { + return specificationId; + } + + public void setSpecificationId(int specificationId) { + this.specificationId = specificationId; + } + + public int getSpecificationItemId() { + return specificationItemId; + } + + public void setSpecificationItemId(int 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 int getUpdateUserId() { + return updateUserId; + } + + public void setUpdateUserId(int 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/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt index 4c89f53..925ef91 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitService.kt @@ -132,6 +132,15 @@ ): String /** + * 获取检查清单详情 + */ + @GET("/check-menu/detail") + suspend fun getCheckManifestDetailById( + @Header("token") token: String, + @Query("id") id: String + ): String + + /** * 获取指导视频 */ @GET("/knowledge-base/listPage") diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt index 0d76a8e..fd274fb 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt @@ -181,6 +181,13 @@ } /** + * 获取检查清单详情 + */ + suspend fun getCheckManifestDetailById(id: String): String { + return api.getCheckManifestDetailById(AuthenticationHelper.token, id) + } + + /** * 获取指导视频 */ suspend fun getGuideVideoByPage(keywords: String, classId: String, offset: Int): String { diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 127f1c1..1f3a4f0 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState @@ -143,6 +144,10 @@ } } } + + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(3.dp2px(this), 0, 7.dp2px(this), 7.dp2px(this)) + ) } private fun getCheckManifestByPage() { @@ -167,15 +172,12 @@ } } binding.recyclerView.adapter = checkManifestAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(5.dp2px(this) shr 1, 7, 5.dp2px(this), 7) - ) checkManifestAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( position: Int, t: CheckManifestModel.DataModel.RowsModel ) { - //TODO 查看检查清单详情 + navigatePageTo(t.id) } }) } 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 new file mode 100644 index 0000000..dc6403c --- /dev/null +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestDetailActivity.kt @@ -0,0 +1,90 @@ +package com.casic.br.app.view + +import android.os.Bundle +import androidx.lifecycle.ViewModelProvider +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 +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView + +class CheckManifestDetailActivity : KotlinBaseActivity() { + + private lateinit var checkManifestViewModel: CheckManifestViewModel + + override fun initEvent() { + + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + val id = intent.getStringExtra(Constant.INTENT_PARAM) as String + checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java] + checkManifestViewModel.getCheckManifestDetailById(this, id) + checkManifestViewModel.manifestDetailResult.observe(this) { + if (it.code == 200) { + binding.classView.text = it.data.typeName + 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}" + ) + } + } + binding.checkBaseView.adapter = checkBaseAdapter + binding.remarkView.text = it.data.remark + } + } + } + + override fun initViewBinding(): ActivityCheckManifestDetailBinding { + return ActivityCheckManifestDetailBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + checkManifestViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") + LoadState.Success -> { + LoadingDialogHub.dismiss() + } + + LoadState.Fail -> { + LoadingDialogHub.dismiss() + "数据加载失败,请重试".show(this) + } + } + } + } + + override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt b/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt index c16ee54..e17e84c 100644 --- a/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt +++ b/app/src/main/java/com/casic/br/app/vm/CheckManifestViewModel.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.br.app.extensions.getResponseCode import com.casic.br.app.extensions.getResponseMessage +import com.casic.br.app.model.CheckManifestDetailModel import com.casic.br.app.model.CheckManifestModel import com.casic.br.app.retrofit.RetrofitServiceManager import com.google.gson.Gson @@ -17,6 +18,7 @@ private val gson by lazy { Gson() } val manifestResult = MutableLiveData() + val manifestDetailResult = MutableLiveData() fun getCheckManifestByPage( context: Context, keywords: String, type: String, scene: String, offset: Int @@ -40,4 +42,25 @@ loadState.value = LoadState.Fail it.localizedMessage?.show(context) }) + + fun getCheckManifestDetailById(context: Context, id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCheckManifestDetailById(id) + when (response.getResponseCode()) { + 200 -> { + loadState.value = LoadState.Success + manifestDetailResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } + + else -> { + loadState.value = LoadState.Fail + response.getResponseMessage().show(context) + } + } + }, { + loadState.value = LoadState.Fail + it.localizedMessage?.show(context) + }) } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_manifest_detail.xml b/app/src/main/res/layout/activity_check_manifest_detail.xml new file mode 100644 index 0000000..0b91b15 --- /dev/null +++ b/app/src/main/res/layout/activity_check_manifest_detail.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_library.xml b/app/src/main/res/layout/activity_library.xml index 2ceb962..be4bb7a 100644 --- a/app/src/main/res/layout/activity_library.xml +++ b/app/src/main/res/layout/activity_library.xml @@ -63,7 +63,9 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_margin="@dimen/dp_10" + android:layout_marginHorizontal="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_5" + android:layout_marginBottom="@dimen/dp_10" android:layout_weight="1" app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" app:spanCount="3" /> diff --git a/app/src/main/res/layout/item_check_manifest.xml b/app/src/main/res/layout/item_check_manifest.xml index e74c47b..f6e68c2 100644 --- a/app/src/main/res/layout/item_check_manifest.xml +++ b/app/src/main/res/layout/item_check_manifest.xml @@ -1,6 +1,5 @@ - - - - - - - + android:text="中国航天科工集团二院二〇三所版权所有中国航天科工集团二院二〇三所" + android:textColor="@color/white" + android:textSize="@dimen/sp_16" /> + \ No newline at end of file