Commit 0ded4341 authored by tongzifang's avatar tongzifang

update

parent b196d37f
package com.qmai.zqtoolkit.config package com.qmai.zqtoolkit.config
import com.qmai.zqtoolkit.base.AclasScaleKit import com.qmai.zqtoolkit.base.AclasScaleKit
import com.qmai.zqtoolkit.base.GiLongScaleKit
import com.qmai.zqtoolkit.base.SunmiScaleKit import com.qmai.zqtoolkit.base.SunmiScaleKit
import com.qmai.zqtoolkit.base.ZqScaleKit import com.qmai.zqtoolkit.base.ZqScaleKit
import com.qmai.zqtoolkit.base.scale.ScaleBaseKit import com.qmai.zqtoolkit.base.scale.ScaleBaseKit
...@@ -12,16 +13,19 @@ import com.qmai.zqtoolkit.base.scale.ScaleBaseKit ...@@ -12,16 +13,19 @@ import com.qmai.zqtoolkit.base.scale.ScaleBaseKit
enum class QmScaleBrand( enum class QmScaleBrand(
val brand: String, val brand: String,
) { ) {
SUNMI("商米"), ZQEB("中崎"), ACLAS("顶尖"),GILONG("巨隆"); SUNMI("商米"), ZQEB("中崎"), ACLAS("顶尖"), GILONG("巨隆");
companion object { companion object {
fun list(): List<QmScaleBrandValue> { fun list(): List<QmScaleBrandValue> {
return values().map { QmScaleBrandValue(it) } return values().map { QmScaleBrandValue(it) }
} }
fun find(kit: ScaleBaseKit?): QmScaleBrandValue? { fun find(kit: ScaleBaseKit?): QmScaleBrandValue? {
return when (kit) { return when (kit) {
ZqScaleKit -> QmScaleBrandValue(ZQEB) ZqScaleKit -> QmScaleBrandValue(ZQEB)
AclasScaleKit -> QmScaleBrandValue(ACLAS) AclasScaleKit -> QmScaleBrandValue(ACLAS)
SunmiScaleKit -> QmScaleBrandValue(SUNMI) SunmiScaleKit -> QmScaleBrandValue(SUNMI)
GiLongScaleKit -> QmScaleBrandValue(GILONG)
else -> null else -> null
} }
} }
...@@ -44,7 +48,8 @@ enum class QmScaleModel( ...@@ -44,7 +48,8 @@ enum class QmScaleModel(
PX1("PX1", QmScaleBrand.ACLAS.brand), PX1("PX1", QmScaleBrand.ACLAS.brand),
DEFAULT_SUNMI("商米通用", QmScaleBrand.SUNMI.brand), DEFAULT_SUNMI("商米通用", QmScaleBrand.SUNMI.brand),
S2_CC("S2_CC", QmScaleBrand.SUNMI.brand), S2_CC("S2_CC", QmScaleBrand.SUNMI.brand),
DEFAULT_GILONG("巨隆通用",QmScaleBrand.GILONG.brand); DEFAULT_GILONG("巨隆通用", QmScaleBrand.GILONG.brand);
companion object { companion object {
fun list(sort: QmScaleBrandValue): List<QmScaleModelValue> { fun list(sort: QmScaleBrandValue): List<QmScaleModelValue> {
return values().filter { return values().filter {
...@@ -59,6 +64,7 @@ enum class QmScaleModel( ...@@ -59,6 +64,7 @@ enum class QmScaleModel(
ZqScaleKit -> QmScaleModelValue(DEFAULT_ZQ) ZqScaleKit -> QmScaleModelValue(DEFAULT_ZQ)
AclasScaleKit -> QmScaleModelValue(DEFAULT_ACLAS) AclasScaleKit -> QmScaleModelValue(DEFAULT_ACLAS)
SunmiScaleKit -> QmScaleModelValue(DEFAULT_SUNMI) SunmiScaleKit -> QmScaleModelValue(DEFAULT_SUNMI)
GiLongScaleKit -> QmScaleModelValue(DEFAULT_GILONG)
else -> null else -> null
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment