diff --git a/app/src/main/java/com/casic/br/app/model/LibraryModel.java b/app/src/main/java/com/casic/br/app/model/LibraryModel.java new file mode 100644 index 0000000..72c42ce --- /dev/null +++ b/app/src/main/java/com/casic/br/app/model/LibraryModel.java @@ -0,0 +1,127 @@ +package com.casic.br.app.model; + +import java.util.List; + +public class LibraryModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List 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 String createTime; + private String createUserId; + private String createUserName; + private String id; + private String name; + private String num; + private String updateTime; + private String updateUserId; + private String updateUserName; + + 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 getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } + + 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/LibraryModel.java b/app/src/main/java/com/casic/br/app/model/LibraryModel.java new file mode 100644 index 0000000..72c42ce --- /dev/null +++ b/app/src/main/java/com/casic/br/app/model/LibraryModel.java @@ -0,0 +1,127 @@ +package com.casic.br.app.model; + +import java.util.List; + +public class LibraryModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List 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 String createTime; + private String createUserId; + private String createUserName; + private String id; + private String name; + private String num; + private String updateTime; + private String updateUserId; + private String updateUserName; + + 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 getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } + + 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 ab76720..06f3dfc 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 @@ -99,4 +99,10 @@ @Multipart @POST("detect") suspend fun getRecognizeResult(@PartMap body: MutableMap): String + + /** + * 获取知识库分类列表 + */ + @GET("/knowledge-class/list") + suspend fun getLibraryList(@Header("token") token: String): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/model/LibraryModel.java b/app/src/main/java/com/casic/br/app/model/LibraryModel.java new file mode 100644 index 0000000..72c42ce --- /dev/null +++ b/app/src/main/java/com/casic/br/app/model/LibraryModel.java @@ -0,0 +1,127 @@ +package com.casic.br.app.model; + +import java.util.List; + +public class LibraryModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List 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 String createTime; + private String createUserId; + private String createUserName; + private String id; + private String name; + private String num; + private String updateTime; + private String updateUserId; + private String updateUserName; + + 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 getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } + + 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 ab76720..06f3dfc 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 @@ -99,4 +99,10 @@ @Multipart @POST("detect") suspend fun getRecognizeResult(@PartMap body: MutableMap): String + + /** + * 获取知识库分类列表 + */ + @GET("/knowledge-class/list") + suspend fun getLibraryList(@Header("token") token: String): String } \ No newline at end of file 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 3cae5b6..4a27e34 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 @@ -159,4 +159,11 @@ map["scene"] = scene.toRequestBody() return aiApi.getRecognizeResult(map) } + + /** + * 获取知识库分类列表 + */ + suspend fun getLibraryList(): String { + return api.getLibraryList(AuthenticationHelper.token) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/model/LibraryModel.java b/app/src/main/java/com/casic/br/app/model/LibraryModel.java new file mode 100644 index 0000000..72c42ce --- /dev/null +++ b/app/src/main/java/com/casic/br/app/model/LibraryModel.java @@ -0,0 +1,127 @@ +package com.casic.br.app.model; + +import java.util.List; + +public class LibraryModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List 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 String createTime; + private String createUserId; + private String createUserName; + private String id; + private String name; + private String num; + private String updateTime; + private String updateUserId; + private String updateUserName; + + 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 getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } + + 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 ab76720..06f3dfc 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 @@ -99,4 +99,10 @@ @Multipart @POST("detect") suspend fun getRecognizeResult(@PartMap body: MutableMap): String + + /** + * 获取知识库分类列表 + */ + @GET("/knowledge-class/list") + suspend fun getLibraryList(@Header("token") token: String): String } \ No newline at end of file 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 3cae5b6..4a27e34 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 @@ -159,4 +159,11 @@ map["scene"] = scene.toRequestBody() return aiApi.getRecognizeResult(map) } + + /** + * 获取知识库分类列表 + */ + suspend fun getLibraryList(): String { + return api.getLibraryList(AuthenticationHelper.token) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index caf87cd..9428875 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -89,7 +89,7 @@ 2024030503 -> { checkHistoryAdapter = object : NormalRecyclerAdapter( - R.layout.item_check_history, dataBeans + R.layout.item_check_history_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, diff --git a/app/src/main/java/com/casic/br/app/model/LibraryModel.java b/app/src/main/java/com/casic/br/app/model/LibraryModel.java new file mode 100644 index 0000000..72c42ce --- /dev/null +++ b/app/src/main/java/com/casic/br/app/model/LibraryModel.java @@ -0,0 +1,127 @@ +package com.casic.br.app.model; + +import java.util.List; + +public class LibraryModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List 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 String createTime; + private String createUserId; + private String createUserName; + private String id; + private String name; + private String num; + private String updateTime; + private String updateUserId; + private String updateUserName; + + 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 getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } + + 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 ab76720..06f3dfc 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 @@ -99,4 +99,10 @@ @Multipart @POST("detect") suspend fun getRecognizeResult(@PartMap body: MutableMap): String + + /** + * 获取知识库分类列表 + */ + @GET("/knowledge-class/list") + suspend fun getLibraryList(@Header("token") token: String): String } \ No newline at end of file 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 3cae5b6..4a27e34 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 @@ -159,4 +159,11 @@ map["scene"] = scene.toRequestBody() return aiApi.getRecognizeResult(map) } + + /** + * 获取知识库分类列表 + */ + suspend fun getLibraryList(): String { + return api.getLibraryList(AuthenticationHelper.token) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index caf87cd..9428875 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -89,7 +89,7 @@ 2024030503 -> { checkHistoryAdapter = object : NormalRecyclerAdapter( - R.layout.item_check_history, dataBeans + R.layout.item_check_history_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt index fec55b7..1bda3b4 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt @@ -57,7 +57,7 @@ if (it.code == 200) { val detailAdapter = object : NormalRecyclerAdapter( - R.layout.item_check_history_detail, it.data + R.layout.item_check_history_detail_l, it.data ) { override fun convertView( viewHolder: ViewHolder, position: Int, diff --git a/app/src/main/java/com/casic/br/app/model/LibraryModel.java b/app/src/main/java/com/casic/br/app/model/LibraryModel.java new file mode 100644 index 0000000..72c42ce --- /dev/null +++ b/app/src/main/java/com/casic/br/app/model/LibraryModel.java @@ -0,0 +1,127 @@ +package com.casic.br.app.model; + +import java.util.List; + +public class LibraryModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List 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 String createTime; + private String createUserId; + private String createUserName; + private String id; + private String name; + private String num; + private String updateTime; + private String updateUserId; + private String updateUserName; + + 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 getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } + + 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 ab76720..06f3dfc 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 @@ -99,4 +99,10 @@ @Multipart @POST("detect") suspend fun getRecognizeResult(@PartMap body: MutableMap): String + + /** + * 获取知识库分类列表 + */ + @GET("/knowledge-class/list") + suspend fun getLibraryList(@Header("token") token: String): String } \ No newline at end of file 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 3cae5b6..4a27e34 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 @@ -159,4 +159,11 @@ map["scene"] = scene.toRequestBody() return aiApi.getRecognizeResult(map) } + + /** + * 获取知识库分类列表 + */ + suspend fun getLibraryList(): String { + return api.getLibraryList(AuthenticationHelper.token) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index caf87cd..9428875 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -89,7 +89,7 @@ 2024030503 -> { checkHistoryAdapter = object : NormalRecyclerAdapter( - R.layout.item_check_history, dataBeans + R.layout.item_check_history_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt index fec55b7..1bda3b4 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt @@ -57,7 +57,7 @@ if (it.code == 200) { val detailAdapter = object : NormalRecyclerAdapter( - R.layout.item_check_history_detail, it.data + R.layout.item_check_history_detail_l, it.data ) { override fun convertView( viewHolder: ViewHolder, position: Int, diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index bb3ccb8..e0a508c 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -1,35 +1,66 @@ package com.casic.br.app.view import android.os.Bundle +import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R import com.casic.br.app.databinding.ActivityLibraryBinding import com.casic.br.app.extensions.initImmersionBar +import com.casic.br.app.model.LibraryModel +import com.casic.br.app.vm.LibraryViewModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets +import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.widget.TitleBarView class LibraryActivity : KotlinBaseActivity() { + private val kTag = "LibraryActivity" + private val context = this + private val marginOffset by lazy { 5.dp2px(this) } + private lateinit var libraryViewModel: LibraryViewModel + override fun initEvent() { - binding.standardButton.setOnClickListener { - navigatePageTo() - } - binding.troubleButton.setOnClickListener { - navigatePageTo() - } - - binding.manifestButton.setOnClickListener { - navigatePageTo() - } - - binding.guideButton.setOnClickListener { - navigatePageTo() - } } override fun initOnCreate(savedInstanceState: Bundle?) { - + libraryViewModel = ViewModelProvider(this)[LibraryViewModel::class.java] + libraryViewModel.getLibraryList(this) + libraryViewModel.libraryListResult.observe(this) { + if (it.code == 200) { + val libraryAdapter = object : NormalRecyclerAdapter( + R.layout.item_library_g, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LibraryModel.DataModel + ) { + viewHolder.setText(R.id.typeButton, item.name) + } + } + binding.recyclerView.adapter = libraryAdapter + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) + ) + libraryAdapter.setOnItemClickedListener(object : + NormalRecyclerAdapter.OnItemClickedListener { + override fun onItemClicked(position: Int, t: LibraryModel.DataModel) { + when (position) { + 0 -> navigatePageTo() + 1 -> navigatePageTo() + 2 -> navigatePageTo() + 3 -> navigatePageTo() + else -> "未实现".show(context) + } + } + }) + } + } } override fun initViewBinding(): ActivityLibraryBinding { @@ -37,7 +68,19 @@ } override fun observeRequestState() { + libraryViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后...") + LoadState.Success -> { + LoadingDialogHub.dismiss() + } + LoadState.Fail -> { + LoadingDialogHub.dismiss() + "数据加载失败，请重试".show(this) + } + } + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/br/app/model/LibraryModel.java b/app/src/main/java/com/casic/br/app/model/LibraryModel.java new file mode 100644 index 0000000..72c42ce --- /dev/null +++ b/app/src/main/java/com/casic/br/app/model/LibraryModel.java @@ -0,0 +1,127 @@ +package com.casic.br.app.model; + +import java.util.List; + +public class LibraryModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List 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 String createTime; + private String createUserId; + private String createUserName; + private String id; + private String name; + private String num; + private String updateTime; + private String updateUserId; + private String updateUserName; + + 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 getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } + + 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 ab76720..06f3dfc 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 @@ -99,4 +99,10 @@ @Multipart @POST("detect") suspend fun getRecognizeResult(@PartMap body: MutableMap): String + + /** + * 获取知识库分类列表 + */ + @GET("/knowledge-class/list") + suspend fun getLibraryList(@Header("token") token: String): String } \ No newline at end of file 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 3cae5b6..4a27e34 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 @@ -159,4 +159,11 @@ map["scene"] = scene.toRequestBody() return aiApi.getRecognizeResult(map) } + + /** + * 获取知识库分类列表 + */ + suspend fun getLibraryList(): String { + return api.getLibraryList(AuthenticationHelper.token) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index caf87cd..9428875 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -89,7 +89,7 @@ 2024030503 -> { checkHistoryAdapter = object : NormalRecyclerAdapter( - R.layout.item_check_history, dataBeans + R.layout.item_check_history_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt index fec55b7..1bda3b4 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt @@ -57,7 +57,7 @@ if (it.code == 200) { val detailAdapter = object : NormalRecyclerAdapter( - R.layout.item_check_history_detail, it.data + R.layout.item_check_history_detail_l, it.data ) { override fun convertView( viewHolder: ViewHolder, position: Int, diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index bb3ccb8..e0a508c 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -1,35 +1,66 @@ package com.casic.br.app.view import android.os.Bundle +import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R import com.casic.br.app.databinding.ActivityLibraryBinding import com.casic.br.app.extensions.initImmersionBar +import com.casic.br.app.model.LibraryModel +import com.casic.br.app.vm.LibraryViewModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets +import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.widget.TitleBarView class LibraryActivity : KotlinBaseActivity() { + private val kTag = "LibraryActivity" + private val context = this + private val marginOffset by lazy { 5.dp2px(this) } + private lateinit var libraryViewModel: LibraryViewModel + override fun initEvent() { - binding.standardButton.setOnClickListener { - navigatePageTo() - } - binding.troubleButton.setOnClickListener { - navigatePageTo() - } - - binding.manifestButton.setOnClickListener { - navigatePageTo() - } - - binding.guideButton.setOnClickListener { - navigatePageTo() - } } override fun initOnCreate(savedInstanceState: Bundle?) { - + libraryViewModel = ViewModelProvider(this)[LibraryViewModel::class.java] + libraryViewModel.getLibraryList(this) + libraryViewModel.libraryListResult.observe(this) { + if (it.code == 200) { + val libraryAdapter = object : NormalRecyclerAdapter( + R.layout.item_library_g, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LibraryModel.DataModel + ) { + viewHolder.setText(R.id.typeButton, item.name) + } + } + binding.recyclerView.adapter = libraryAdapter + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) + ) + libraryAdapter.setOnItemClickedListener(object : + NormalRecyclerAdapter.OnItemClickedListener { + override fun onItemClicked(position: Int, t: LibraryModel.DataModel) { + when (position) { + 0 -> navigatePageTo() + 1 -> navigatePageTo() + 2 -> navigatePageTo() + 3 -> navigatePageTo() + else -> "未实现".show(context) + } + } + }) + } + } } override fun initViewBinding(): ActivityLibraryBinding { @@ -37,7 +68,19 @@ } override fun observeRequestState() { + libraryViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后...") + LoadState.Success -> { + LoadingDialogHub.dismiss() + } + LoadState.Fail -> { + LoadingDialogHub.dismiss() + "数据加载失败，请重试".show(this) + } + } + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/br/app/vm/LibraryViewModel.kt b/app/src/main/java/com/casic/br/app/vm/LibraryViewModel.kt new file mode 100644 index 0000000..74934ce --- /dev/null +++ b/app/src/main/java/com/casic/br/app/vm/LibraryViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.br.app.vm + +import android.content.Context +import androidx.lifecycle.MutableLiveData +import com.casic.br.app.extensions.getResponseCode +import com.casic.br.app.extensions.getResponseMessage +import com.casic.br.app.model.LibraryModel +import com.casic.br.app.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState + +class LibraryViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val libraryListResult = MutableLiveData() + + fun getLibraryList(context: Context) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getLibraryList() + when (response.getResponseCode()) { + 200 -> { + loadState.value = LoadState.Success + libraryListResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } + + else -> { + loadState.value = LoadState.Fail + response.getResponseMessage().show(context) + } + } + }, { + loadState.value = LoadState.Fail + it.localizedMessage?.show(context) + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/model/LibraryModel.java b/app/src/main/java/com/casic/br/app/model/LibraryModel.java new file mode 100644 index 0000000..72c42ce --- /dev/null +++ b/app/src/main/java/com/casic/br/app/model/LibraryModel.java @@ -0,0 +1,127 @@ +package com.casic.br.app.model; + +import java.util.List; + +public class LibraryModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List 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 String createTime; + private String createUserId; + private String createUserName; + private String id; + private String name; + private String num; + private String updateTime; + private String updateUserId; + private String updateUserName; + + 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 getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } + + 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 ab76720..06f3dfc 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 @@ -99,4 +99,10 @@ @Multipart @POST("detect") suspend fun getRecognizeResult(@PartMap body: MutableMap): String + + /** + * 获取知识库分类列表 + */ + @GET("/knowledge-class/list") + suspend fun getLibraryList(@Header("token") token: String): String } \ No newline at end of file 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 3cae5b6..4a27e34 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 @@ -159,4 +159,11 @@ map["scene"] = scene.toRequestBody() return aiApi.getRecognizeResult(map) } + + /** + * 获取知识库分类列表 + */ + suspend fun getLibraryList(): String { + return api.getLibraryList(AuthenticationHelper.token) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index caf87cd..9428875 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -89,7 +89,7 @@ 2024030503 -> { checkHistoryAdapter = object : NormalRecyclerAdapter( - R.layout.item_check_history, dataBeans + R.layout.item_check_history_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt index fec55b7..1bda3b4 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt @@ -57,7 +57,7 @@ if (it.code == 200) { val detailAdapter = object : NormalRecyclerAdapter( - R.layout.item_check_history_detail, it.data + R.layout.item_check_history_detail_l, it.data ) { override fun convertView( viewHolder: ViewHolder, position: Int, diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index bb3ccb8..e0a508c 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -1,35 +1,66 @@ package com.casic.br.app.view import android.os.Bundle +import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R import com.casic.br.app.databinding.ActivityLibraryBinding import com.casic.br.app.extensions.initImmersionBar +import com.casic.br.app.model.LibraryModel +import com.casic.br.app.vm.LibraryViewModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets +import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.widget.TitleBarView class LibraryActivity : KotlinBaseActivity() { + private val kTag = "LibraryActivity" + private val context = this + private val marginOffset by lazy { 5.dp2px(this) } + private lateinit var libraryViewModel: LibraryViewModel + override fun initEvent() { - binding.standardButton.setOnClickListener { - navigatePageTo() - } - binding.troubleButton.setOnClickListener { - navigatePageTo() - } - - binding.manifestButton.setOnClickListener { - navigatePageTo() - } - - binding.guideButton.setOnClickListener { - navigatePageTo() - } } override fun initOnCreate(savedInstanceState: Bundle?) { - + libraryViewModel = ViewModelProvider(this)[LibraryViewModel::class.java] + libraryViewModel.getLibraryList(this) + libraryViewModel.libraryListResult.observe(this) { + if (it.code == 200) { + val libraryAdapter = object : NormalRecyclerAdapter( + R.layout.item_library_g, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: LibraryModel.DataModel + ) { + viewHolder.setText(R.id.typeButton, item.name) + } + } + binding.recyclerView.adapter = libraryAdapter + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) + ) + libraryAdapter.setOnItemClickedListener(object : + NormalRecyclerAdapter.OnItemClickedListener { + override fun onItemClicked(position: Int, t: LibraryModel.DataModel) { + when (position) { + 0 -> navigatePageTo() + 1 -> navigatePageTo() + 2 -> navigatePageTo() + 3 -> navigatePageTo() + else -> "未实现".show(context) + } + } + }) + } + } } override fun initViewBinding(): ActivityLibraryBinding { @@ -37,7 +68,19 @@ } override fun observeRequestState() { + libraryViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后...") + LoadState.Success -> { + LoadingDialogHub.dismiss() + } + LoadState.Fail -> { + LoadingDialogHub.dismiss() + "数据加载失败，请重试".show(this) + } + } + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/br/app/vm/LibraryViewModel.kt b/app/src/main/java/com/casic/br/app/vm/LibraryViewModel.kt new file mode 100644 index 0000000..74934ce --- /dev/null +++ b/app/src/main/java/com/casic/br/app/vm/LibraryViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.br.app.vm + +import android.content.Context +import androidx.lifecycle.MutableLiveData +import com.casic.br.app.extensions.getResponseCode +import com.casic.br.app.extensions.getResponseMessage +import com.casic.br.app.model.LibraryModel +import com.casic.br.app.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState + +class LibraryViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val libraryListResult = MutableLiveData() + + fun getLibraryList(context: Context) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getLibraryList() + when (response.getResponseCode()) { + 200 -> { + loadState.value = LoadState.Success + libraryListResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } + + else -> { + loadState.value = LoadState.Fail + response.getResponseMessage().show(context) + } + } + }, { + loadState.value = LoadState.Fail + it.localizedMessage?.show(context) + }) +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_library.xml b/app/src/main/res/layout/activity_library.xml index ae57932..677cb36 100644 --- a/app/src/main/res/layout/activity_library.xml +++ b/app/src/main/res/layout/activity_library.xml @@ -20,87 +20,11 @@ app:tbv_text_color="@color/white" app:tbv_text_size="@dimen/sp_18" /> - - - - -