diff --git a/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java b/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java index 60ce63e..c28a76e 100644 --- a/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java +++ b/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java @@ -1,4 +1,229 @@ package com.casic.br.app.model; +import java.util.List; + public class CheckManifestModel { + + private int code; + private DataModel data; + private String message; + private boolean success; + + public int getCode() { + return 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; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String 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 String getBasisList() { + return basisList; + } + + public void setBasisList(String 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; + } + } + } } diff --git a/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java b/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java index 60ce63e..c28a76e 100644 --- a/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java +++ b/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java @@ -1,4 +1,229 @@ package com.casic.br.app.model; +import java.util.List; + public class CheckManifestModel { + + private int code; + private DataModel data; + private String message; + private boolean success; + + public int getCode() { + return 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; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String 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 String getBasisList() { + return basisList; + } + + public void setBasisList(String 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; + } + } + } } 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 c1df2b1..41f8f85 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 @@ -83,12 +83,14 @@ /** * 获取检查清单 */ - @POST("/meter/file/listPage") + @GET("/check-menu/listPage") suspend fun getCheckManifestByPage( @Header("token") token: String, - @Body requestBody: RequestBody, - @QueryMap limit: Map, - @QueryMap offset: Map + @Query("keyword") keyword: String, + @Query("type") type: String, + @Query("scene") scene: String, + @Query("offset") offset: Int, + @Query("limit") limit: Int ): String /** diff --git a/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java b/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java index 60ce63e..c28a76e 100644 --- a/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java +++ b/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java @@ -1,4 +1,229 @@ package com.casic.br.app.model; +import java.util.List; + public class CheckManifestModel { + + private int code; + private DataModel data; + private String message; + private boolean success; + + public int getCode() { + return 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; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String 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 String getBasisList() { + return basisList; + } + + public void setBasisList(String 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; + } + } + } } 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 c1df2b1..41f8f85 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 @@ -83,12 +83,14 @@ /** * 获取检查清单 */ - @POST("/meter/file/listPage") + @GET("/check-menu/listPage") suspend fun getCheckManifestByPage( @Header("token") token: String, - @Body requestBody: RequestBody, - @QueryMap limit: Map, - @QueryMap offset: Map + @Query("keyword") keyword: String, + @Query("type") type: String, + @Query("scene") scene: 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 efa0f55..94d44e9 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 @@ -98,20 +98,11 @@ /** * 获取检查清单 */ - suspend fun getCheckManifestByPage(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 + suspend fun getCheckManifestByPage( + keywords: String, type: String, scene: String, offset: Int + ): String { return api.getCheckManifestByPage( - AuthenticationHelper.token, requestBody, limitMap, offsetMap + AuthenticationHelper.token, keywords, type, scene, offset, LocaleConstant.PAGE_LIMIT ) } diff --git a/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java b/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java index 60ce63e..c28a76e 100644 --- a/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java +++ b/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java @@ -1,4 +1,229 @@ package com.casic.br.app.model; +import java.util.List; + public class CheckManifestModel { + + private int code; + private DataModel data; + private String message; + private boolean success; + + public int getCode() { + return 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; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String 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 String getBasisList() { + return basisList; + } + + public void setBasisList(String 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; + } + } + } } 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 c1df2b1..41f8f85 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 @@ -83,12 +83,14 @@ /** * 获取检查清单 */ - @POST("/meter/file/listPage") + @GET("/check-menu/listPage") suspend fun getCheckManifestByPage( @Header("token") token: String, - @Body requestBody: RequestBody, - @QueryMap limit: Map, - @QueryMap offset: Map + @Query("keyword") keyword: String, + @Query("type") type: String, + @Query("scene") scene: 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 efa0f55..94d44e9 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 @@ -98,20 +98,11 @@ /** * 获取检查清单 */ - suspend fun getCheckManifestByPage(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 + suspend fun getCheckManifestByPage( + keywords: String, type: String, scene: String, offset: Int + ): String { return api.getCheckManifestByPage( - AuthenticationHelper.token, requestBody, limitMap, offsetMap + AuthenticationHelper.token, keywords, type, scene, offset, LocaleConstant.PAGE_LIMIT ) } 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 f5ec22e..c6daec2 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 @@ -3,6 +3,8 @@ import android.os.Bundle import android.os.Handler import android.os.Message +import android.view.View +import android.widget.AdapterView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R import com.casic.br.app.databinding.ActivityCheckManifestBinding @@ -23,16 +25,44 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var checkManifestViewModel: CheckManifestViewModel - private lateinit var checkManifestAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var checkManifestAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var keywords = "" + private var type = "" + private var scene = "" private var page = 1 private var isRefresh = false private var isLoadMore = false override fun initEvent() { + binding.typeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { + override fun onItemSelected( + parent: AdapterView<*>?, view: View?, position: Int, id: Long + ) { + type = position.toString() + } + + override fun onNothingSelected(parent: AdapterView<*>?) { + + } + } + + binding.contentSpinner.onItemSelectedListener = + object : AdapterView.OnItemSelectedListener { + override fun onItemSelected( + parent: AdapterView<*>?, view: View?, position: Int, id: Long + ) { + scene = resources.getStringArray(R.array.type_data)[position] + } + + override fun onNothingSelected(parent: AdapterView<*>?) { + + } + } + binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() + getCheckManifestByPage() } binding.refreshLayout.setOnRefreshListener { @@ -51,48 +81,49 @@ override fun initOnCreate(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(this) checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java] + getCheckManifestByPage() checkManifestViewModel.manifestResult.observe(this) { -// if (it.code == 200) { -// val dataRows = it.data?.rows!! -// when { -// isRefresh -> { -// checkManifestAdapter.setRefreshData(dataRows) -// binding.refreshLayout.finishRefresh() -// isRefresh = false -// } -// -// isLoadMore -> { -// if (dataRows.size == 0) { -// "到底了，别拉了".show(this) -// } -// checkManifestAdapter.setLoadMoreData(dataRows) -// binding.refreshLayout.finishLoadMore() -// isLoadMore = false -// } -// -// else -> { -// dataBeans = dataRows -// weakReferenceHandler.sendEmptyMessage(2024030501) -// } -// } -// } + if (it.code == 200) { + val dataRows = it.data?.rows!! + when { + isRefresh -> { + checkManifestAdapter.setRefreshData(dataRows) + binding.refreshLayout.finishRefresh() + isRefresh = false + } + + isLoadMore -> { + if (dataRows.size == 0) { + "到底了，别拉了".show(this) + } + checkManifestAdapter.setLoadMoreData(dataRows) + binding.refreshLayout.finishLoadMore() + isLoadMore = false + } + + else -> { + dataBeans = dataRows + weakReferenceHandler.sendEmptyMessage(2024030501) + } + } + } } } private fun getCheckManifestByPage() { - checkManifestViewModel.getCheckManifestByPage(this, keywords, page) + checkManifestViewModel.getCheckManifestByPage(this, keywords, type, scene, page) } override fun handleMessage(msg: Message): Boolean { when (msg.what) { 2024030501 -> { checkManifestAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_check_manifest, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CheckManifestModel + item: CheckManifestModel.DataModel.RowsModel ) { } @@ -100,9 +131,9 @@ binding.recyclerView.adapter = checkManifestAdapter binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 7, 0, 7)) checkManifestAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { + NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( - position: Int, t: CheckManifestModel + position: Int, t: CheckManifestModel.DataModel.RowsModel ) { //TODO 查看检查清单详情 } diff --git a/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java b/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java index 60ce63e..c28a76e 100644 --- a/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java +++ b/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java @@ -1,4 +1,229 @@ package com.casic.br.app.model; +import java.util.List; + public class CheckManifestModel { + + private int code; + private DataModel data; + private String message; + private boolean success; + + public int getCode() { + return 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; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String 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 String getBasisList() { + return basisList; + } + + public void setBasisList(String 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; + } + } + } } 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 c1df2b1..41f8f85 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 @@ -83,12 +83,14 @@ /** * 获取检查清单 */ - @POST("/meter/file/listPage") + @GET("/check-menu/listPage") suspend fun getCheckManifestByPage( @Header("token") token: String, - @Body requestBody: RequestBody, - @QueryMap limit: Map, - @QueryMap offset: Map + @Query("keyword") keyword: String, + @Query("type") type: String, + @Query("scene") scene: 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 efa0f55..94d44e9 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 @@ -98,20 +98,11 @@ /** * 获取检查清单 */ - suspend fun getCheckManifestByPage(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 + suspend fun getCheckManifestByPage( + keywords: String, type: String, scene: String, offset: Int + ): String { return api.getCheckManifestByPage( - AuthenticationHelper.token, requestBody, limitMap, offsetMap + AuthenticationHelper.token, keywords, type, scene, offset, LocaleConstant.PAGE_LIMIT ) } 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 f5ec22e..c6daec2 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 @@ -3,6 +3,8 @@ import android.os.Bundle import android.os.Handler import android.os.Message +import android.view.View +import android.widget.AdapterView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R import com.casic.br.app.databinding.ActivityCheckManifestBinding @@ -23,16 +25,44 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var checkManifestViewModel: CheckManifestViewModel - private lateinit var checkManifestAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var checkManifestAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var keywords = "" + private var type = "" + private var scene = "" private var page = 1 private var isRefresh = false private var isLoadMore = false override fun initEvent() { + binding.typeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { + override fun onItemSelected( + parent: AdapterView<*>?, view: View?, position: Int, id: Long + ) { + type = position.toString() + } + + override fun onNothingSelected(parent: AdapterView<*>?) { + + } + } + + binding.contentSpinner.onItemSelectedListener = + object : AdapterView.OnItemSelectedListener { + override fun onItemSelected( + parent: AdapterView<*>?, view: View?, position: Int, id: Long + ) { + scene = resources.getStringArray(R.array.type_data)[position] + } + + override fun onNothingSelected(parent: AdapterView<*>?) { + + } + } + binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() + getCheckManifestByPage() } binding.refreshLayout.setOnRefreshListener { @@ -51,48 +81,49 @@ override fun initOnCreate(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(this) checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java] + getCheckManifestByPage() checkManifestViewModel.manifestResult.observe(this) { -// if (it.code == 200) { -// val dataRows = it.data?.rows!! -// when { -// isRefresh -> { -// checkManifestAdapter.setRefreshData(dataRows) -// binding.refreshLayout.finishRefresh() -// isRefresh = false -// } -// -// isLoadMore -> { -// if (dataRows.size == 0) { -// "到底了，别拉了".show(this) -// } -// checkManifestAdapter.setLoadMoreData(dataRows) -// binding.refreshLayout.finishLoadMore() -// isLoadMore = false -// } -// -// else -> { -// dataBeans = dataRows -// weakReferenceHandler.sendEmptyMessage(2024030501) -// } -// } -// } + if (it.code == 200) { + val dataRows = it.data?.rows!! + when { + isRefresh -> { + checkManifestAdapter.setRefreshData(dataRows) + binding.refreshLayout.finishRefresh() + isRefresh = false + } + + isLoadMore -> { + if (dataRows.size == 0) { + "到底了，别拉了".show(this) + } + checkManifestAdapter.setLoadMoreData(dataRows) + binding.refreshLayout.finishLoadMore() + isLoadMore = false + } + + else -> { + dataBeans = dataRows + weakReferenceHandler.sendEmptyMessage(2024030501) + } + } + } } } private fun getCheckManifestByPage() { - checkManifestViewModel.getCheckManifestByPage(this, keywords, page) + checkManifestViewModel.getCheckManifestByPage(this, keywords, type, scene, page) } override fun handleMessage(msg: Message): Boolean { when (msg.what) { 2024030501 -> { checkManifestAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_check_manifest, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CheckManifestModel + item: CheckManifestModel.DataModel.RowsModel ) { } @@ -100,9 +131,9 @@ binding.recyclerView.adapter = checkManifestAdapter binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 7, 0, 7)) checkManifestAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { + NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( - position: Int, t: CheckManifestModel + position: Int, t: CheckManifestModel.DataModel.RowsModel ) { //TODO 查看检查清单详情 } 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 a8646e8..c16ee54 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 @@ -18,9 +18,11 @@ private val gson by lazy { Gson() } val manifestResult = MutableLiveData() - fun getCheckManifestByPage(context: Context, keywords: String, offset: Int) = launch({ + fun getCheckManifestByPage( + context: Context, keywords: String, type: String, scene: String, offset: Int + ) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getCheckManifestByPage(keywords, offset) + val response = RetrofitServiceManager.getCheckManifestByPage(keywords, type, scene, offset) when (response.getResponseCode()) { 200 -> { loadState.value = LoadState.Success diff --git a/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java b/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java index 60ce63e..c28a76e 100644 --- a/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java +++ b/app/src/main/java/com/casic/br/app/model/CheckManifestModel.java @@ -1,4 +1,229 @@ package com.casic.br.app.model; +import java.util.List; + public class CheckManifestModel { + + private int code; + private DataModel data; + private String message; + private boolean success; + + public int getCode() { + return 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; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String 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 String getBasisList() { + return basisList; + } + + public void setBasisList(String 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; + } + } + } } 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 c1df2b1..41f8f85 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 @@ -83,12 +83,14 @@ /** * 获取检查清单 */ - @POST("/meter/file/listPage") + @GET("/check-menu/listPage") suspend fun getCheckManifestByPage( @Header("token") token: String, - @Body requestBody: RequestBody, - @QueryMap limit: Map, - @QueryMap offset: Map + @Query("keyword") keyword: String, + @Query("type") type: String, + @Query("scene") scene: 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 efa0f55..94d44e9 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 @@ -98,20 +98,11 @@ /** * 获取检查清单 */ - suspend fun getCheckManifestByPage(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 + suspend fun getCheckManifestByPage( + keywords: String, type: String, scene: String, offset: Int + ): String { return api.getCheckManifestByPage( - AuthenticationHelper.token, requestBody, limitMap, offsetMap + AuthenticationHelper.token, keywords, type, scene, offset, LocaleConstant.PAGE_LIMIT ) } 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 f5ec22e..c6daec2 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 @@ -3,6 +3,8 @@ import android.os.Bundle import android.os.Handler import android.os.Message +import android.view.View +import android.widget.AdapterView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R import com.casic.br.app.databinding.ActivityCheckManifestBinding @@ -23,16 +25,44 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var checkManifestViewModel: CheckManifestViewModel - private lateinit var checkManifestAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var checkManifestAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var keywords = "" + private var type = "" + private var scene = "" private var page = 1 private var isRefresh = false private var isLoadMore = false override fun initEvent() { + binding.typeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { + override fun onItemSelected( + parent: AdapterView<*>?, view: View?, position: Int, id: Long + ) { + type = position.toString() + } + + override fun onNothingSelected(parent: AdapterView<*>?) { + + } + } + + binding.contentSpinner.onItemSelectedListener = + object : AdapterView.OnItemSelectedListener { + override fun onItemSelected( + parent: AdapterView<*>?, view: View?, position: Int, id: Long + ) { + scene = resources.getStringArray(R.array.type_data)[position] + } + + override fun onNothingSelected(parent: AdapterView<*>?) { + + } + } + binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() + getCheckManifestByPage() } binding.refreshLayout.setOnRefreshListener { @@ -51,48 +81,49 @@ override fun initOnCreate(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(this) checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java] + getCheckManifestByPage() checkManifestViewModel.manifestResult.observe(this) { -// if (it.code == 200) { -// val dataRows = it.data?.rows!! -// when { -// isRefresh -> { -// checkManifestAdapter.setRefreshData(dataRows) -// binding.refreshLayout.finishRefresh() -// isRefresh = false -// } -// -// isLoadMore -> { -// if (dataRows.size == 0) { -// "到底了，别拉了".show(this) -// } -// checkManifestAdapter.setLoadMoreData(dataRows) -// binding.refreshLayout.finishLoadMore() -// isLoadMore = false -// } -// -// else -> { -// dataBeans = dataRows -// weakReferenceHandler.sendEmptyMessage(2024030501) -// } -// } -// } + if (it.code == 200) { + val dataRows = it.data?.rows!! + when { + isRefresh -> { + checkManifestAdapter.setRefreshData(dataRows) + binding.refreshLayout.finishRefresh() + isRefresh = false + } + + isLoadMore -> { + if (dataRows.size == 0) { + "到底了，别拉了".show(this) + } + checkManifestAdapter.setLoadMoreData(dataRows) + binding.refreshLayout.finishLoadMore() + isLoadMore = false + } + + else -> { + dataBeans = dataRows + weakReferenceHandler.sendEmptyMessage(2024030501) + } + } + } } } private fun getCheckManifestByPage() { - checkManifestViewModel.getCheckManifestByPage(this, keywords, page) + checkManifestViewModel.getCheckManifestByPage(this, keywords, type, scene, page) } override fun handleMessage(msg: Message): Boolean { when (msg.what) { 2024030501 -> { checkManifestAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_check_manifest, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CheckManifestModel + item: CheckManifestModel.DataModel.RowsModel ) { } @@ -100,9 +131,9 @@ binding.recyclerView.adapter = checkManifestAdapter binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 7, 0, 7)) checkManifestAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { + NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( - position: Int, t: CheckManifestModel + position: Int, t: CheckManifestModel.DataModel.RowsModel ) { //TODO 查看检查清单详情 } 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 a8646e8..c16ee54 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 @@ -18,9 +18,11 @@ private val gson by lazy { Gson() } val manifestResult = MutableLiveData() - fun getCheckManifestByPage(context: Context, keywords: String, offset: Int) = launch({ + fun getCheckManifestByPage( + context: Context, keywords: String, type: String, scene: String, offset: Int + ) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getCheckManifestByPage(keywords, offset) + val response = RetrofitServiceManager.getCheckManifestByPage(keywords, type, scene, offset) when (response.getResponseCode()) { 200 -> { loadState.value = LoadState.Success diff --git a/app/src/main/res/layout/activity_check_manifest.xml b/app/src/main/res/layout/activity_check_manifest.xml index 77d2213..54ba04f 100644 --- a/app/src/main/res/layout/activity_check_manifest.xml +++ b/app/src/main/res/layout/activity_check_manifest.xml @@ -72,7 +72,8 @@ android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_5" android:layout_weight="1" - android:background="@color/white" /> + android:background="@color/white" + android:entries="@array/content_data" /> rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String 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 String getBasisList() { + return basisList; + } + + public void setBasisList(String 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; + } + } + } } 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 c1df2b1..41f8f85 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 @@ -83,12 +83,14 @@ /** * 获取检查清单 */ - @POST("/meter/file/listPage") + @GET("/check-menu/listPage") suspend fun getCheckManifestByPage( @Header("token") token: String, - @Body requestBody: RequestBody, - @QueryMap limit: Map, - @QueryMap offset: Map + @Query("keyword") keyword: String, + @Query("type") type: String, + @Query("scene") scene: 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 efa0f55..94d44e9 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 @@ -98,20 +98,11 @@ /** * 获取检查清单 */ - suspend fun getCheckManifestByPage(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 + suspend fun getCheckManifestByPage( + keywords: String, type: String, scene: String, offset: Int + ): String { return api.getCheckManifestByPage( - AuthenticationHelper.token, requestBody, limitMap, offsetMap + AuthenticationHelper.token, keywords, type, scene, offset, LocaleConstant.PAGE_LIMIT ) } 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 f5ec22e..c6daec2 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 @@ -3,6 +3,8 @@ import android.os.Bundle import android.os.Handler import android.os.Message +import android.view.View +import android.widget.AdapterView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R import com.casic.br.app.databinding.ActivityCheckManifestBinding @@ -23,16 +25,44 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var checkManifestViewModel: CheckManifestViewModel - private lateinit var checkManifestAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var checkManifestAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var keywords = "" + private var type = "" + private var scene = "" private var page = 1 private var isRefresh = false private var isLoadMore = false override fun initEvent() { + binding.typeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { + override fun onItemSelected( + parent: AdapterView<*>?, view: View?, position: Int, id: Long + ) { + type = position.toString() + } + + override fun onNothingSelected(parent: AdapterView<*>?) { + + } + } + + binding.contentSpinner.onItemSelectedListener = + object : AdapterView.OnItemSelectedListener { + override fun onItemSelected( + parent: AdapterView<*>?, view: View?, position: Int, id: Long + ) { + scene = resources.getStringArray(R.array.type_data)[position] + } + + override fun onNothingSelected(parent: AdapterView<*>?) { + + } + } + binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() + getCheckManifestByPage() } binding.refreshLayout.setOnRefreshListener { @@ -51,48 +81,49 @@ override fun initOnCreate(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(this) checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java] + getCheckManifestByPage() checkManifestViewModel.manifestResult.observe(this) { -// if (it.code == 200) { -// val dataRows = it.data?.rows!! -// when { -// isRefresh -> { -// checkManifestAdapter.setRefreshData(dataRows) -// binding.refreshLayout.finishRefresh() -// isRefresh = false -// } -// -// isLoadMore -> { -// if (dataRows.size == 0) { -// "到底了，别拉了".show(this) -// } -// checkManifestAdapter.setLoadMoreData(dataRows) -// binding.refreshLayout.finishLoadMore() -// isLoadMore = false -// } -// -// else -> { -// dataBeans = dataRows -// weakReferenceHandler.sendEmptyMessage(2024030501) -// } -// } -// } + if (it.code == 200) { + val dataRows = it.data?.rows!! + when { + isRefresh -> { + checkManifestAdapter.setRefreshData(dataRows) + binding.refreshLayout.finishRefresh() + isRefresh = false + } + + isLoadMore -> { + if (dataRows.size == 0) { + "到底了，别拉了".show(this) + } + checkManifestAdapter.setLoadMoreData(dataRows) + binding.refreshLayout.finishLoadMore() + isLoadMore = false + } + + else -> { + dataBeans = dataRows + weakReferenceHandler.sendEmptyMessage(2024030501) + } + } + } } } private fun getCheckManifestByPage() { - checkManifestViewModel.getCheckManifestByPage(this, keywords, page) + checkManifestViewModel.getCheckManifestByPage(this, keywords, type, scene, page) } override fun handleMessage(msg: Message): Boolean { when (msg.what) { 2024030501 -> { checkManifestAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_check_manifest, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CheckManifestModel + item: CheckManifestModel.DataModel.RowsModel ) { } @@ -100,9 +131,9 @@ binding.recyclerView.adapter = checkManifestAdapter binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 7, 0, 7)) checkManifestAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { + NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( - position: Int, t: CheckManifestModel + position: Int, t: CheckManifestModel.DataModel.RowsModel ) { //TODO 查看检查清单详情 } 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 a8646e8..c16ee54 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 @@ -18,9 +18,11 @@ private val gson by lazy { Gson() } val manifestResult = MutableLiveData() - fun getCheckManifestByPage(context: Context, keywords: String, offset: Int) = launch({ + fun getCheckManifestByPage( + context: Context, keywords: String, type: String, scene: String, offset: Int + ) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getCheckManifestByPage(keywords, offset) + val response = RetrofitServiceManager.getCheckManifestByPage(keywords, type, scene, offset) when (response.getResponseCode()) { 200 -> { loadState.value = LoadState.Success diff --git a/app/src/main/res/layout/activity_check_manifest.xml b/app/src/main/res/layout/activity_check_manifest.xml index 77d2213..54ba04f 100644 --- a/app/src/main/res/layout/activity_check_manifest.xml +++ b/app/src/main/res/layout/activity_check_manifest.xml @@ -72,7 +72,8 @@ android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_5" android:layout_weight="1" - android:background="@color/white" /> + android:background="@color/white" + android:entries="@array/content_data" /> 现场作业类 + + 请选择分类 + + 请选择场景 配电箱