diff --git a/app/src/main/java/com/casic/br/app/model/StandardFileModel.java b/app/src/main/java/com/casic/br/app/model/StandardFileModel.java index 999b8ad..db88f88 100644 --- a/app/src/main/java/com/casic/br/app/model/StandardFileModel.java +++ b/app/src/main/java/com/casic/br/app/model/StandardFileModel.java @@ -4,27 +4,27 @@ public class StandardFileModel { - private Boolean success; - private Integer code; + private int code; + private DataModel data; private String message; - private List data; + private boolean success; - public Boolean getSuccess() { - return success; - } - - public void setSuccess(Boolean success) { - this.success = success; - } - - public Integer getCode() { + public int getCode() { return code; } - public void setCode(Integer code) { + public void setCode(int code) { this.code = code; } + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + public String getMessage() { return message; } @@ -33,50 +33,152 @@ this.message = message; } - public List getData() { - return data; + public boolean isSuccess() { + return success; } - public void setData(List data) { - this.data = data; + public void setSuccess(boolean success) { + this.success = success; } public static class DataModel { - private Integer id; - private Object fileCover; - private String fileTitle; - private String effectiveDate; + private List rows; + private int total; - public Integer getId() { - return id; + public List getRows() { + return rows; } - public void setId(Integer id) { - this.id = id; + public void setRows(List rows) { + this.rows = rows; } - public Object getFileCover() { - return fileCover; + public int getTotal() { + return total; } - public void setFileCover(Object fileCover) { - this.fileCover = fileCover; + public void setTotal(int total) { + this.total = total; } - public String getFileTitle() { - return fileTitle; - } + public static class RowsModel { + private String attachment; + private String attachmentName; + private String createTime; + private String createUserId; + private String createUserName; + private String id; + private String name; + private String publicDate; + private String type; + private String typeName; + private String updateTime; + private String updateUserId; + private String updateUserName; - public void setFileTitle(String fileTitle) { - this.fileTitle = fileTitle; - } + public String getAttachment() { + return attachment; + } - public String getEffectiveDate() { - return effectiveDate; - } + public void setAttachment(String attachment) { + this.attachment = attachment; + } - public void setEffectiveDate(String effectiveDate) { - this.effectiveDate = effectiveDate; + public String getAttachmentName() { + return attachmentName; + } + + public void setAttachmentName(String attachmentName) { + this.attachmentName = attachmentName; + } + + 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 getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPublicDate() { + return publicDate; + } + + public void setPublicDate(String publicDate) { + this.publicDate = publicDate; + } + + 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; + } } } } diff --git a/app/src/main/java/com/casic/br/app/model/StandardFileModel.java b/app/src/main/java/com/casic/br/app/model/StandardFileModel.java index 999b8ad..db88f88 100644 --- a/app/src/main/java/com/casic/br/app/model/StandardFileModel.java +++ b/app/src/main/java/com/casic/br/app/model/StandardFileModel.java @@ -4,27 +4,27 @@ public class StandardFileModel { - private Boolean success; - private Integer code; + private int code; + private DataModel data; private String message; - private List data; + private boolean success; - public Boolean getSuccess() { - return success; - } - - public void setSuccess(Boolean success) { - this.success = success; - } - - public Integer getCode() { + public int getCode() { return code; } - public void setCode(Integer code) { + public void setCode(int code) { this.code = code; } + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + public String getMessage() { return message; } @@ -33,50 +33,152 @@ this.message = message; } - public List getData() { - return data; + public boolean isSuccess() { + return success; } - public void setData(List data) { - this.data = data; + public void setSuccess(boolean success) { + this.success = success; } public static class DataModel { - private Integer id; - private Object fileCover; - private String fileTitle; - private String effectiveDate; + private List rows; + private int total; - public Integer getId() { - return id; + public List getRows() { + return rows; } - public void setId(Integer id) { - this.id = id; + public void setRows(List rows) { + this.rows = rows; } - public Object getFileCover() { - return fileCover; + public int getTotal() { + return total; } - public void setFileCover(Object fileCover) { - this.fileCover = fileCover; + public void setTotal(int total) { + this.total = total; } - public String getFileTitle() { - return fileTitle; - } + public static class RowsModel { + private String attachment; + private String attachmentName; + private String createTime; + private String createUserId; + private String createUserName; + private String id; + private String name; + private String publicDate; + private String type; + private String typeName; + private String updateTime; + private String updateUserId; + private String updateUserName; - public void setFileTitle(String fileTitle) { - this.fileTitle = fileTitle; - } + public String getAttachment() { + return attachment; + } - public String getEffectiveDate() { - return effectiveDate; - } + public void setAttachment(String attachment) { + this.attachment = attachment; + } - public void setEffectiveDate(String effectiveDate) { - this.effectiveDate = effectiveDate; + public String getAttachmentName() { + return attachmentName; + } + + public void setAttachmentName(String attachmentName) { + this.attachmentName = attachmentName; + } + + 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 getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPublicDate() { + return publicDate; + } + + public void setPublicDate(String publicDate) { + this.publicDate = publicDate; + } + + 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; + } } } } 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 06f3dfc..8f57ca5 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 @@ -52,12 +52,12 @@ /** * 获取标准规范文件列表 */ - @POST("/standardFile/listPage") + @GET("/standard-specification/listPage") suspend fun getStandardFileByPage( @Header("token") token: String, - @Body requestBody: RequestBody, - @QueryMap limit: Map, - @QueryMap offset: Map + @Query("name") name: String, + @Query("offset") offset: Int, + @Query("limit") limit: Int ): String /** diff --git a/app/src/main/java/com/casic/br/app/model/StandardFileModel.java b/app/src/main/java/com/casic/br/app/model/StandardFileModel.java index 999b8ad..db88f88 100644 --- a/app/src/main/java/com/casic/br/app/model/StandardFileModel.java +++ b/app/src/main/java/com/casic/br/app/model/StandardFileModel.java @@ -4,27 +4,27 @@ public class StandardFileModel { - private Boolean success; - private Integer code; + private int code; + private DataModel data; private String message; - private List data; + private boolean success; - public Boolean getSuccess() { - return success; - } - - public void setSuccess(Boolean success) { - this.success = success; - } - - public Integer getCode() { + public int getCode() { return code; } - public void setCode(Integer code) { + public void setCode(int code) { this.code = code; } + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + public String getMessage() { return message; } @@ -33,50 +33,152 @@ this.message = message; } - public List getData() { - return data; + public boolean isSuccess() { + return success; } - public void setData(List data) { - this.data = data; + public void setSuccess(boolean success) { + this.success = success; } public static class DataModel { - private Integer id; - private Object fileCover; - private String fileTitle; - private String effectiveDate; + private List rows; + private int total; - public Integer getId() { - return id; + public List getRows() { + return rows; } - public void setId(Integer id) { - this.id = id; + public void setRows(List rows) { + this.rows = rows; } - public Object getFileCover() { - return fileCover; + public int getTotal() { + return total; } - public void setFileCover(Object fileCover) { - this.fileCover = fileCover; + public void setTotal(int total) { + this.total = total; } - public String getFileTitle() { - return fileTitle; - } + public static class RowsModel { + private String attachment; + private String attachmentName; + private String createTime; + private String createUserId; + private String createUserName; + private String id; + private String name; + private String publicDate; + private String type; + private String typeName; + private String updateTime; + private String updateUserId; + private String updateUserName; - public void setFileTitle(String fileTitle) { - this.fileTitle = fileTitle; - } + public String getAttachment() { + return attachment; + } - public String getEffectiveDate() { - return effectiveDate; - } + public void setAttachment(String attachment) { + this.attachment = attachment; + } - public void setEffectiveDate(String effectiveDate) { - this.effectiveDate = effectiveDate; + public String getAttachmentName() { + return attachmentName; + } + + public void setAttachmentName(String attachmentName) { + this.attachmentName = attachmentName; + } + + 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 getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPublicDate() { + return publicDate; + } + + public void setPublicDate(String publicDate) { + this.publicDate = publicDate; + } + + 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; + } } } } 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 06f3dfc..8f57ca5 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 @@ -52,12 +52,12 @@ /** * 获取标准规范文件列表 */ - @POST("/standardFile/listPage") + @GET("/standard-specification/listPage") suspend fun getStandardFileByPage( @Header("token") token: String, - @Body requestBody: RequestBody, - @QueryMap limit: Map, - @QueryMap offset: Map + @Query("name") name: String, + @Query("offset") offset: Int, + @Query("limit") limit: Int ): String /** 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 4a27e34..3fab213 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 @@ -74,19 +74,8 @@ * 获取标准规范文件列表 */ suspend fun getStandardFileByPage(keywords: String, offset: Int): String { - val param = JsonObject() - param.addProperty("keywords", keywords) - val requestBody = param.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() - ) - - val limitMap = HashMap() - limitMap["limit"] = LocaleConstant.PAGE_LIMIT - - val offsetMap = HashMap() - offsetMap["offset"] = offset return api.getStandardFileByPage( - AuthenticationHelper.token, requestBody, limitMap, offsetMap + AuthenticationHelper.token, keywords, offset, LocaleConstant.PAGE_LIMIT ) } diff --git a/app/src/main/java/com/casic/br/app/model/StandardFileModel.java b/app/src/main/java/com/casic/br/app/model/StandardFileModel.java index 999b8ad..db88f88 100644 --- a/app/src/main/java/com/casic/br/app/model/StandardFileModel.java +++ b/app/src/main/java/com/casic/br/app/model/StandardFileModel.java @@ -4,27 +4,27 @@ public class StandardFileModel { - private Boolean success; - private Integer code; + private int code; + private DataModel data; private String message; - private List data; + private boolean success; - public Boolean getSuccess() { - return success; - } - - public void setSuccess(Boolean success) { - this.success = success; - } - - public Integer getCode() { + public int getCode() { return code; } - public void setCode(Integer code) { + public void setCode(int code) { this.code = code; } + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + public String getMessage() { return message; } @@ -33,50 +33,152 @@ this.message = message; } - public List getData() { - return data; + public boolean isSuccess() { + return success; } - public void setData(List data) { - this.data = data; + public void setSuccess(boolean success) { + this.success = success; } public static class DataModel { - private Integer id; - private Object fileCover; - private String fileTitle; - private String effectiveDate; + private List rows; + private int total; - public Integer getId() { - return id; + public List getRows() { + return rows; } - public void setId(Integer id) { - this.id = id; + public void setRows(List rows) { + this.rows = rows; } - public Object getFileCover() { - return fileCover; + public int getTotal() { + return total; } - public void setFileCover(Object fileCover) { - this.fileCover = fileCover; + public void setTotal(int total) { + this.total = total; } - public String getFileTitle() { - return fileTitle; - } + public static class RowsModel { + private String attachment; + private String attachmentName; + private String createTime; + private String createUserId; + private String createUserName; + private String id; + private String name; + private String publicDate; + private String type; + private String typeName; + private String updateTime; + private String updateUserId; + private String updateUserName; - public void setFileTitle(String fileTitle) { - this.fileTitle = fileTitle; - } + public String getAttachment() { + return attachment; + } - public String getEffectiveDate() { - return effectiveDate; - } + public void setAttachment(String attachment) { + this.attachment = attachment; + } - public void setEffectiveDate(String effectiveDate) { - this.effectiveDate = effectiveDate; + public String getAttachmentName() { + return attachmentName; + } + + public void setAttachmentName(String attachmentName) { + this.attachmentName = attachmentName; + } + + 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 getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPublicDate() { + return publicDate; + } + + public void setPublicDate(String publicDate) { + this.publicDate = publicDate; + } + + 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; + } } } } 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 06f3dfc..8f57ca5 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 @@ -52,12 +52,12 @@ /** * 获取标准规范文件列表 */ - @POST("/standardFile/listPage") + @GET("/standard-specification/listPage") suspend fun getStandardFileByPage( @Header("token") token: String, - @Body requestBody: RequestBody, - @QueryMap limit: Map, - @QueryMap offset: Map + @Query("name") name: String, + @Query("offset") offset: Int, + @Query("limit") limit: Int ): String /** 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 4a27e34..3fab213 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 @@ -74,19 +74,8 @@ * 获取标准规范文件列表 */ suspend fun getStandardFileByPage(keywords: String, offset: Int): String { - val param = JsonObject() - param.addProperty("keywords", keywords) - val requestBody = param.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() - ) - - val limitMap = HashMap() - limitMap["limit"] = LocaleConstant.PAGE_LIMIT - - val offsetMap = HashMap() - offsetMap["offset"] = offset return api.getStandardFileByPage( - AuthenticationHelper.token, requestBody, limitMap, offsetMap + AuthenticationHelper.token, keywords, offset, LocaleConstant.PAGE_LIMIT ) } diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index 155a191..071bb04 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -23,10 +23,11 @@ class StandardFileActivity : KotlinBaseActivity(), Handler.Callback { + private val context = this private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var standardFileViewModel: StandardFileViewModel - private lateinit var standardFileAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var standardFileAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var keywords = "" private var page = 1 private var isRefresh = false @@ -35,6 +36,7 @@ override fun initEvent() { binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() + getStandardFileByPage() } binding.refreshLayout.setOnRefreshListener { @@ -56,7 +58,7 @@ getStandardFileByPage() standardFileViewModel.fileListResult.observe(this) { if (it.code == 200) { - val dataRows = it.data!! + val dataRows = it.data.rows!! when { isRefresh -> { standardFileAdapter.setRefreshData(dataRows) @@ -90,25 +92,29 @@ when (msg.what) { 2024030401 -> { standardFileAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_standard_file, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: StandardFileModel.DataModel + item: StandardFileModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.fileTitleView, item.fileTitle) - .setText(R.id.dateView, item.effectiveDate) + viewHolder.setText(R.id.fileTitleView, item.name) + .setText(R.id.dateView, item.updateTime) } } binding.recyclerView.adapter = standardFileAdapter binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.WHITE)) standardFileAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { + NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( - position: Int, t: StandardFileModel.DataModel + position: Int, t: StandardFileModel.DataModel.RowsModel ) { - navigatePageTo(t.fileTitle) + if (t.attachment.isNullOrBlank()) { + "附件为空,无法查看".show(context) + return + } + navigatePageTo(t.attachment) } }) } @@ -122,6 +128,9 @@ override fun observeRequestState() { standardFileViewModel.loadState.observe(this) { + if (isRefresh || isLoadMore) { + return@observe + } when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") LoadState.Success -> { diff --git a/app/src/main/java/com/casic/br/app/model/StandardFileModel.java b/app/src/main/java/com/casic/br/app/model/StandardFileModel.java index 999b8ad..db88f88 100644 --- a/app/src/main/java/com/casic/br/app/model/StandardFileModel.java +++ b/app/src/main/java/com/casic/br/app/model/StandardFileModel.java @@ -4,27 +4,27 @@ public class StandardFileModel { - private Boolean success; - private Integer code; + private int code; + private DataModel data; private String message; - private List data; + private boolean success; - public Boolean getSuccess() { - return success; - } - - public void setSuccess(Boolean success) { - this.success = success; - } - - public Integer getCode() { + public int getCode() { return code; } - public void setCode(Integer code) { + public void setCode(int code) { this.code = code; } + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + public String getMessage() { return message; } @@ -33,50 +33,152 @@ this.message = message; } - public List getData() { - return data; + public boolean isSuccess() { + return success; } - public void setData(List data) { - this.data = data; + public void setSuccess(boolean success) { + this.success = success; } public static class DataModel { - private Integer id; - private Object fileCover; - private String fileTitle; - private String effectiveDate; + private List rows; + private int total; - public Integer getId() { - return id; + public List getRows() { + return rows; } - public void setId(Integer id) { - this.id = id; + public void setRows(List rows) { + this.rows = rows; } - public Object getFileCover() { - return fileCover; + public int getTotal() { + return total; } - public void setFileCover(Object fileCover) { - this.fileCover = fileCover; + public void setTotal(int total) { + this.total = total; } - public String getFileTitle() { - return fileTitle; - } + public static class RowsModel { + private String attachment; + private String attachmentName; + private String createTime; + private String createUserId; + private String createUserName; + private String id; + private String name; + private String publicDate; + private String type; + private String typeName; + private String updateTime; + private String updateUserId; + private String updateUserName; - public void setFileTitle(String fileTitle) { - this.fileTitle = fileTitle; - } + public String getAttachment() { + return attachment; + } - public String getEffectiveDate() { - return effectiveDate; - } + public void setAttachment(String attachment) { + this.attachment = attachment; + } - public void setEffectiveDate(String effectiveDate) { - this.effectiveDate = effectiveDate; + public String getAttachmentName() { + return attachmentName; + } + + public void setAttachmentName(String attachmentName) { + this.attachmentName = attachmentName; + } + + 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 getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPublicDate() { + return publicDate; + } + + public void setPublicDate(String publicDate) { + this.publicDate = publicDate; + } + + 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; + } } } } 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 06f3dfc..8f57ca5 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 @@ -52,12 +52,12 @@ /** * 获取标准规范文件列表 */ - @POST("/standardFile/listPage") + @GET("/standard-specification/listPage") suspend fun getStandardFileByPage( @Header("token") token: String, - @Body requestBody: RequestBody, - @QueryMap limit: Map, - @QueryMap offset: Map + @Query("name") name: String, + @Query("offset") offset: Int, + @Query("limit") limit: Int ): String /** 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 4a27e34..3fab213 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 @@ -74,19 +74,8 @@ * 获取标准规范文件列表 */ suspend fun getStandardFileByPage(keywords: String, offset: Int): String { - val param = JsonObject() - param.addProperty("keywords", keywords) - val requestBody = param.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() - ) - - val limitMap = HashMap() - limitMap["limit"] = LocaleConstant.PAGE_LIMIT - - val offsetMap = HashMap() - offsetMap["offset"] = offset return api.getStandardFileByPage( - AuthenticationHelper.token, requestBody, limitMap, offsetMap + AuthenticationHelper.token, keywords, offset, LocaleConstant.PAGE_LIMIT ) } diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index 155a191..071bb04 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -23,10 +23,11 @@ class StandardFileActivity : KotlinBaseActivity(), Handler.Callback { + private val context = this private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var standardFileViewModel: StandardFileViewModel - private lateinit var standardFileAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var standardFileAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var keywords = "" private var page = 1 private var isRefresh = false @@ -35,6 +36,7 @@ override fun initEvent() { binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() + getStandardFileByPage() } binding.refreshLayout.setOnRefreshListener { @@ -56,7 +58,7 @@ getStandardFileByPage() standardFileViewModel.fileListResult.observe(this) { if (it.code == 200) { - val dataRows = it.data!! + val dataRows = it.data.rows!! when { isRefresh -> { standardFileAdapter.setRefreshData(dataRows) @@ -90,25 +92,29 @@ when (msg.what) { 2024030401 -> { standardFileAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_standard_file, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: StandardFileModel.DataModel + item: StandardFileModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.fileTitleView, item.fileTitle) - .setText(R.id.dateView, item.effectiveDate) + viewHolder.setText(R.id.fileTitleView, item.name) + .setText(R.id.dateView, item.updateTime) } } binding.recyclerView.adapter = standardFileAdapter binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.WHITE)) standardFileAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { + NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( - position: Int, t: StandardFileModel.DataModel + position: Int, t: StandardFileModel.DataModel.RowsModel ) { - navigatePageTo(t.fileTitle) + if (t.attachment.isNullOrBlank()) { + "附件为空,无法查看".show(context) + return + } + navigatePageTo(t.attachment) } }) } @@ -122,6 +128,9 @@ override fun observeRequestState() { standardFileViewModel.loadState.observe(this) { + if (isRefresh || isLoadMore) { + return@observe + } when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") LoadState.Success -> { diff --git a/app/src/main/res/layout/activity_standard_file.xml b/app/src/main/res/layout/activity_standard_file.xml index ef5b550..cc9abf9 100644 --- a/app/src/main/res/layout/activity_standard_file.xml +++ b/app/src/main/res/layout/activity_standard_file.xml @@ -37,6 +37,7 @@ android:hint="文件名称" android:paddingHorizontal="@dimen/dp_5" android:singleLine="true" + android:textColor="@color/white" android:textColorHint="@color/white" android:textSize="@dimen/sp_14" />