From 3260b3483b8e064bac9c266674bb5b3ee6c2a39e Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 15 Mar 2022 12:36:35 +0800 Subject: [PATCH] fix class --- .../badcase/biz/BadCasePresenter.kt | 3 +- .../badcase/biz/BadCaseView.kt | 16 +++++------ .../badcase/biz/IBadCasePresenter.kt | 6 ++-- .../badcase/repository/net/api/BadCaseApi.kt | 19 ------------- .../net/api/entity/BadCaseResponse.kt | 28 ------------------- .../repository/net/api/entity/UploadResult.kt | 15 ---------- 6 files changed, 12 insertions(+), 75 deletions(-) delete mode 100644 core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/BadCaseApi.kt delete mode 100644 core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/BadCaseResponse.kt delete mode 100644 core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/UploadResult.kt diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCasePresenter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCasePresenter.kt index 39a600bdc6..6bd32d01fd 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCasePresenter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCasePresenter.kt @@ -2,8 +2,7 @@ package com.zhjt.mogo_core_function_devatools.badcase.biz import android.util.Log import com.zhjt.mogo_core_function_devatools.badcase.BadCaseManager -import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity.UploadResult -import com.zhjt.mogo_core_function_devatools.badcase.biz.IBadCasePresenter +import com.zhjt.mogo_core_function_devatools.badcase.api.entity.UploadResult import com.zhjt.mogo_core_function_devatools.badcase.repository.Repository import com.zhjt.mogo_core_function_devatools.badcase.repository.db.entity.AutoPilotRecord diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseView.kt index acba503a09..ace4779a78 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseView.kt @@ -21,7 +21,7 @@ import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.utilcode.kotlin.* import com.mogo.eagle.core.utilcode.rv.divider.CommonDividerItemDecoration import com.zhjt.mogo_core_function_devatools.R -import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity.BadCaseResponse.Reason +import com.zhjt.mogo_core_function_devatools.badcase.api.entity.BadCaseResponse import com.zhjt.mogo_core_function_devatools.badcase.repository.db.entity.AutoPilotRecord import kotlinx.android.synthetic.main.layout_badcase_collect.view.* import kotlinx.coroutines.launch @@ -31,17 +31,17 @@ import java.util.* internal class BadCaseView: ConstraintLayout { @Volatile - private var selectCase: Reason? = null + private var selectCase: BadCaseResponse.Reason? = null @Volatile - private var cases: List? = null + private var cases: List? = null private val presenter by lazy { BadCasePresenter() } private var onDismiss: (() -> Unit)? = null - private var onSelect:(suspend (reason: Reason) -> Unit)? = null + private var onSelect:(suspend (reason: BadCaseResponse.Reason) -> Unit)? = null private val scope by lazy { lifecycleOwner.lifecycleScope @@ -94,7 +94,7 @@ internal class BadCaseView: ConstraintLayout { } } - private fun refresh(causes: List) { + private fun refresh(causes: List) { cases = causes rv_take_over?.let { it.layoutManager = LinearLayoutManager(it.context, LinearLayoutManager.VERTICAL, false) @@ -146,7 +146,7 @@ internal class BadCaseView: ConstraintLayout { } @SuppressLint("NotifyDataSetChanged") - fun bindData(case: Reason) { + fun bindData(case: BadCaseResponse.Reason) { check.isSelected = case.isChecked reason.text = case.reason ?: "" if (case.isChecked) { @@ -163,7 +163,7 @@ internal class BadCaseView: ConstraintLayout { private fun hasCheckedItem(): Boolean = cases?.find { it.isChecked } != null - private fun cancelOtherChecked(case: Reason) { + private fun cancelOtherChecked(case: BadCaseResponse.Reason) { val cases = cases if (cases == null || cases.isEmpty()) { return @@ -174,7 +174,7 @@ internal class BadCaseView: ConstraintLayout { } } - fun register(record: AutoPilotRecord?, onDismiss: () -> Unit, onSelect:suspend (reason: Reason) -> Unit) { + fun register(record: AutoPilotRecord?, onDismiss: () -> Unit, onSelect:suspend (reason: BadCaseResponse.Reason) -> Unit) { this.record = record this.onDismiss = onDismiss this.onSelect = onSelect diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/IBadCasePresenter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/IBadCasePresenter.kt index 4660bdd1ac..f30877fd2a 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/IBadCasePresenter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/IBadCasePresenter.kt @@ -1,13 +1,13 @@ package com.zhjt.mogo_core_function_devatools.badcase.biz -import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity.BadCaseResponse.Reason -import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity.UploadResult +import com.zhjt.mogo_core_function_devatools.badcase.api.entity.BadCaseResponse +import com.zhjt.mogo_core_function_devatools.badcase.api.entity.UploadResult import com.zhjt.mogo_core_function_devatools.badcase.repository.db.entity.AutoPilotRecord internal interface IBadCasePresenter { - suspend fun loadBadCases(): List + suspend fun loadBadCases(): List suspend fun updateLastModified(timestamp: Long) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/BadCaseApi.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/BadCaseApi.kt deleted file mode 100644 index 989a46e1ad..0000000000 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/BadCaseApi.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.zhjt.mogo_core_function_devatools.badcase.repository.net.api - -import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity.BadCaseResponse -import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity.UploadResult -import retrofit2.Response -import retrofit2.http.FieldMap -import retrofit2.http.FormUrlEncoded -import retrofit2.http.GET -import retrofit2.http.POST - -internal interface BadCaseApi { - - @FormUrlEncoded - @POST("/yycp-vehicle-management-service/tool/badcase/add") - suspend fun post(@FieldMap map: Map): Response - - @GET("/yycp-vehicle-management-service/tool/badcase/reasons") - suspend fun get(): Response -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/BadCaseResponse.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/BadCaseResponse.kt deleted file mode 100644 index 4d7ed21428..0000000000 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/BadCaseResponse.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity - -import androidx.annotation.Keep -import com.google.gson.annotations.Expose - -@Keep -internal class BadCaseResponse { - var code: Int = -1 - var data: List? = null - var msg: String? = null - var success: Boolean = false - var total: Int = -1 - - @Expose(serialize = false, deserialize = false) - var isBuildIn: Boolean = false - - @Keep - class Reason { - var id: String? = null - var reason: String? = null - - /** - * 业务字段，不参与序列化和反序列化 - */ - @Expose(deserialize = false, serialize = false) - var isChecked: Boolean = false - } -} diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/UploadResult.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/UploadResult.kt deleted file mode 100644 index ac7babc0c3..0000000000 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/entity/UploadResult.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity - -import androidx.annotation.Keep - -@Keep -internal class UploadResult { - var code: Int = -1 - var msg: String? = null - var data: Array? = null - var success: Boolean = false - - override fun toString(): String { - return "UploadResult(code=$code, msg=$msg, data=${data?.contentToString()}, success=$success)" - } -}