diff --git a/app/src/main/java/com/casic/br/extensions/String.kt b/app/src/main/java/com/casic/br/extensions/String.kt index b63113d..554e7e2 100644 --- a/app/src/main/java/com/casic/br/extensions/String.kt +++ b/app/src/main/java/com/casic/br/extensions/String.kt @@ -169,4 +169,89 @@ 4 -> return (this.toDouble()) / 10000 } return this.toDouble() +} + +fun String.toBrandName(): String { + when (this) { + "rs" -> return "万家乐" + "yyj" -> return "万家乐" + "bgl" -> return "万家乐" + "rq" -> return "万家乐" + "pc" -> return "涂鸦" + "cz" -> return "涂鸦" + "wg2" -> return "涂鸦" + "0204" -> return "涂鸦" + "wsdcg" -> return "涂鸦" + "ywbj" -> return "涂鸦" + "rqbj" -> return "涂鸦" + "cobj" -> return "涂鸦" + "yinsj" -> return "涂鸦" + "kj" -> return "涂鸦" + "sd" -> return "涂鸦" + else -> return "汉威" + } +} + +fun String.toInternationalCode(): String { + return when (this) { + "yyj" -> "6973046010620" + "rs" -> "6973046010606" + "bgl" -> "6973046010590" + "rq" -> "6973046010613" + else -> "" + } +} + +fun String.toProductSize(): String { + return when (this) { + "rs" -> "590*340*160" + "yyj" -> "800*420*318" + "bgl" -> "800*420*318" + "rq" -> "800*450*150" + "pc" -> "86*86*29" + "cz" -> "39*60*51" + "wg2" -> "" + "0204" -> "" + "wsdcg" -> "" + "ywbj" -> "" + "rqbj" -> "70x70x28" + "cobj" -> "60*60*49.2" + "yinsj" -> "20.5*20.5*16.0" + "kj" -> return "" + "sd" -> return "" + else -> "89×89×32" + } +} + +fun String.toProductWeight(): String { + return when (this) { + "rs" -> "13kg" + "yyj" -> "23kg" + "bgl" -> "41.5kg" + "rq" -> "14kg" + "pc" -> "0.5kg" + "yinsj" -> "2kg" + "kj" -> "2kg" + "sd" -> "2kg" + else -> "0.2kg" + } +} + +fun String.toProductQuality(): String { + return when (this) { + "yyj" -> "钢化玻璃+冷板喷涂" + "rs" -> "底盖Q235" + "bgl" -> "预涂板1.0" + "rq" -> "玻璃" + else -> "" + } +} + +fun String.toProductColor(): String { + return when (this) { + "yyj" -> "黑色" + "bgl" -> "高光白" + "rq" -> "黑色" + else -> "白色" + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/extensions/String.kt b/app/src/main/java/com/casic/br/extensions/String.kt index b63113d..554e7e2 100644 --- a/app/src/main/java/com/casic/br/extensions/String.kt +++ b/app/src/main/java/com/casic/br/extensions/String.kt @@ -169,4 +169,89 @@ 4 -> return (this.toDouble()) / 10000 } return this.toDouble() +} + +fun String.toBrandName(): String { + when (this) { + "rs" -> return "万家乐" + "yyj" -> return "万家乐" + "bgl" -> return "万家乐" + "rq" -> return "万家乐" + "pc" -> return "涂鸦" + "cz" -> return "涂鸦" + "wg2" -> return "涂鸦" + "0204" -> return "涂鸦" + "wsdcg" -> return "涂鸦" + "ywbj" -> return "涂鸦" + "rqbj" -> return "涂鸦" + "cobj" -> return "涂鸦" + "yinsj" -> return "涂鸦" + "kj" -> return "涂鸦" + "sd" -> return "涂鸦" + else -> return "汉威" + } +} + +fun String.toInternationalCode(): String { + return when (this) { + "yyj" -> "6973046010620" + "rs" -> "6973046010606" + "bgl" -> "6973046010590" + "rq" -> "6973046010613" + else -> "" + } +} + +fun String.toProductSize(): String { + return when (this) { + "rs" -> "590*340*160" + "yyj" -> "800*420*318" + "bgl" -> "800*420*318" + "rq" -> "800*450*150" + "pc" -> "86*86*29" + "cz" -> "39*60*51" + "wg2" -> "" + "0204" -> "" + "wsdcg" -> "" + "ywbj" -> "" + "rqbj" -> "70x70x28" + "cobj" -> "60*60*49.2" + "yinsj" -> "20.5*20.5*16.0" + "kj" -> return "" + "sd" -> return "" + else -> "89×89×32" + } +} + +fun String.toProductWeight(): String { + return when (this) { + "rs" -> "13kg" + "yyj" -> "23kg" + "bgl" -> "41.5kg" + "rq" -> "14kg" + "pc" -> "0.5kg" + "yinsj" -> "2kg" + "kj" -> "2kg" + "sd" -> "2kg" + else -> "0.2kg" + } +} + +fun String.toProductQuality(): String { + return when (this) { + "yyj" -> "钢化玻璃+冷板喷涂" + "rs" -> "底盖Q235" + "bgl" -> "预涂板1.0" + "rq" -> "玻璃" + else -> "" + } +} + +fun String.toProductColor(): String { + return when (this) { + "yyj" -> "黑色" + "bgl" -> "高光白" + "rq" -> "黑色" + else -> "白色" + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt index fe1e87d..5561680 100644 --- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt @@ -147,7 +147,7 @@ // 需要根据设备类型显示不同的页面 val deviceModel = dataBeans[position] val selectedCategory = deviceModel.selectCategory() - Log.d(kTag, "设备类型: $selectedCategory") + Log.d(kTag, "设备类型: $selectedCategory, 设备ID: ${deviceModel.devId}") when (selectedCategory) { "rs" -> { //热水器 diff --git a/app/src/main/java/com/casic/br/extensions/String.kt b/app/src/main/java/com/casic/br/extensions/String.kt index b63113d..554e7e2 100644 --- a/app/src/main/java/com/casic/br/extensions/String.kt +++ b/app/src/main/java/com/casic/br/extensions/String.kt @@ -169,4 +169,89 @@ 4 -> return (this.toDouble()) / 10000 } return this.toDouble() +} + +fun String.toBrandName(): String { + when (this) { + "rs" -> return "万家乐" + "yyj" -> return "万家乐" + "bgl" -> return "万家乐" + "rq" -> return "万家乐" + "pc" -> return "涂鸦" + "cz" -> return "涂鸦" + "wg2" -> return "涂鸦" + "0204" -> return "涂鸦" + "wsdcg" -> return "涂鸦" + "ywbj" -> return "涂鸦" + "rqbj" -> return "涂鸦" + "cobj" -> return "涂鸦" + "yinsj" -> return "涂鸦" + "kj" -> return "涂鸦" + "sd" -> return "涂鸦" + else -> return "汉威" + } +} + +fun String.toInternationalCode(): String { + return when (this) { + "yyj" -> "6973046010620" + "rs" -> "6973046010606" + "bgl" -> "6973046010590" + "rq" -> "6973046010613" + else -> "" + } +} + +fun String.toProductSize(): String { + return when (this) { + "rs" -> "590*340*160" + "yyj" -> "800*420*318" + "bgl" -> "800*420*318" + "rq" -> "800*450*150" + "pc" -> "86*86*29" + "cz" -> "39*60*51" + "wg2" -> "" + "0204" -> "" + "wsdcg" -> "" + "ywbj" -> "" + "rqbj" -> "70x70x28" + "cobj" -> "60*60*49.2" + "yinsj" -> "20.5*20.5*16.0" + "kj" -> return "" + "sd" -> return "" + else -> "89×89×32" + } +} + +fun String.toProductWeight(): String { + return when (this) { + "rs" -> "13kg" + "yyj" -> "23kg" + "bgl" -> "41.5kg" + "rq" -> "14kg" + "pc" -> "0.5kg" + "yinsj" -> "2kg" + "kj" -> "2kg" + "sd" -> "2kg" + else -> "0.2kg" + } +} + +fun String.toProductQuality(): String { + return when (this) { + "yyj" -> "钢化玻璃+冷板喷涂" + "rs" -> "底盖Q235" + "bgl" -> "预涂板1.0" + "rq" -> "玻璃" + else -> "" + } +} + +fun String.toProductColor(): String { + return when (this) { + "yyj" -> "黑色" + "bgl" -> "高光白" + "rq" -> "黑色" + else -> "白色" + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt index fe1e87d..5561680 100644 --- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt @@ -147,7 +147,7 @@ // 需要根据设备类型显示不同的页面 val deviceModel = dataBeans[position] val selectedCategory = deviceModel.selectCategory() - Log.d(kTag, "设备类型: $selectedCategory") + Log.d(kTag, "设备类型: $selectedCategory, 设备ID: ${deviceModel.devId}") when (selectedCategory) { "rs" -> { //热水器 diff --git a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt index bec22c5..f696ccb 100644 --- a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt @@ -1,6 +1,6 @@ package com.casic.br.utils.retrofit -import com.casic.br.extensions.toChineseTypeName +import com.casic.br.extensions.* import com.casic.br.model.UserDetailModel import com.casic.br.utils.AuthenticationHelper import com.casic.br.utils.LocaleConstant @@ -230,24 +230,36 @@ userModel: UserDetailModel.DataModel, iotDevice: String, deviceAddress: String ): String { + val selectedCategory = devResp.selectCategory() + val paramObject = JSONObject() + paramObject.put("snCode", "") paramObject.put("deviceId", devResp.devId) - paramObject.put("iotDevice", iotDevice) - paramObject.put("deviceAddress", deviceAddress) + paramObject.put("brandCode", "") + paramObject.put("brandName", selectedCategory.toBrandName()) paramObject.put("productCode", devResp.productId) + paramObject.put("productName", selectedCategory) + paramObject.put("produceDate", "2022-9-15 08:00:00") paramObject.put("deviceStatus", 1) paramObject.put("deviceActive", 1) paramObject.put("deviceActiveTime", (devResp.time * 1000L).timestampToCompleteDate()) paramObject.put("deviceBindUser", 1) - paramObject.put("deviceBindUser", 1) + paramObject.put("iotDevice", iotDevice) + paramObject.put("deviceAddress", deviceAddress) paramObject.put("deviceName", devResp.toChineseTypeName()) paramObject.put("deviceHardwareVersion", devResp.bv) paramObject.put("deviceSoftwareVersion", devResp.pv) + paramObject.put("deviceCoreParts", "") paramObject.put("deviceMac", devResp.mac) paramObject.put("deviceIp", devResp.ip) paramObject.put("productCategory", devResp.category) - paramObject.put("productCode", devResp.name) + paramObject.put("internationalCode", selectedCategory.toInternationalCode()) + paramObject.put("productSize", selectedCategory.toProductSize()) + paramObject.put("productWeight", selectedCategory.toProductWeight()) + paramObject.put("productStatus", devResp.connectionStatus) paramObject.put("productVersion", devResp.productBean.productVer) + paramObject.put("productQuality", selectedCategory.toProductQuality()) + paramObject.put("productColor", selectedCategory.toProductColor()) paramObject.put("userAccount", userModel.account) paramObject.put("userName", userModel.name) paramObject.put("userPhone", userModel.phone)