From 75f59fa9a615e3584694e820ff83503e8b72ea16 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 14 三月 2025 16:55:31 +0800
Subject: [PATCH] refactor(generallibrary):重构网络请求模块
---
generallibrary/src/main/java/com/dayu/general/bean/card/CardCommon.kt | 184 ++++++++++++++++++++-------------------------
1 files changed, 83 insertions(+), 101 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/bean/card/CardCommon.kt b/generallibrary/src/main/java/com/dayu/general/bean/card/CardCommon.kt
index fac205c..9031af7 100644
--- a/generallibrary/src/main/java/com/dayu/general/bean/card/CardCommon.kt
+++ b/generallibrary/src/main/java/com/dayu/general/bean/card/CardCommon.kt
@@ -7,106 +7,6 @@
val ERROR_MOVE: Int = -2
- /**
- * 鐢ㄦ埛鍒峰崱寮�娉靛墠
- */
-
- val USER_CARD_TYPE_1: String = "A1"
-
- /**
- * 鐢ㄦ埛鍒峰崱寮�娉靛悗
- */
-
- val USER_CARD_TYPE_2: String = "A8"
-
- /**
- * 鐢ㄦ埛鍙犲姞鍏呭��
- */
-
- val USER_CARD_TYPE_3: String = "A2"
-
-
- /**
- * 璁剧疆鍖哄煙琛ㄥ彿鍗�
- */
-
- val REGION: String = "B0"
-
-
- /**
- * 璁剧疆鐢ㄦ埛鐢甸噺鍗曚环鍗�
- */
-
- val ELECTRIC_PRICE: String = "B1"
-
-
- /**
- * 绠＄悊鍗�
- */
-
- val MANAGE_CRAD: String = "B2"
-
-
- /**
- * 娓呴浂鍗�
- */
-
- val CLEAN_CARD_TYPE: String = "C8"
-
-
- /**
- * 瀵嗙爜鍗�
- */
-
- val PASS_WORD_CRAD_TYPE: String = "B3"
-
-
- /**
- * 閰嶇疆榛戝崱 褰撶敤鎴蜂涪澶卞崱鏃讹紝闇�瑕佸湪瀵瑰簲鐨勬帶鍒跺櫒鎶婃鐢ㄦ埛閰嶇疆涓洪粦鎴凤紝闃叉闈炴硶鐢ㄦ按
- */
-
- val BLACK: String = "B4"
-
-
- /**
- * 浠ヤ笅鏈敤鍒�
- * *****************************************************************************************************************************************
- */
- /**
- * 閲嶆柊娉ㄥ唽璁惧鍗�
- */
-
- val REGISTERED_CARD_TYPE: String = "BA"
-
- /**
- * 鍒犻櫎鍏ㄩ儴鐢ㄦ埛鍗�
- */
-
- val CLEAN_ALL_USER_CARD_TYPE: String = "BB"
-
- /**
- * 璁剧疆鍩熷悕鍗�
- */
-
- val DOMAIN_CARD_TYPE: String = "C1"
-
- /**
- * 娴嬭瘯鍗�
- */
-
- val TEST_CARD_TYPE: String = "A4"
-
- /**
- * 閰嶇疆璁惧娉ㄥ唽淇℃伅鍗�
- */
-
- val CONFIGURATION_CARD_TYPE: String = "BC"
-
- /**
- * 閰嶇疆姘存车鍔熺巼鍗�
- */
-
- val CONFIGURATION_POWER_CARD_TYPE: String = "BD"
/**
* 鑾峰彇榛樿鐨勫崱鏍囪瘑
@@ -118,15 +18,97 @@
var cardData = ""
when (cardType) {
CLEAN_CARD_TYPE -> cardData = "3668F7A30119"
- MANAGE_CRAD, REGISTERED_CARD_TYPE, CLEAN_ALL_USER_CARD_TYPE, TEST_CARD_TYPE, CONFIGURATION_CARD_TYPE, CONFIGURATION_POWER_CARD_TYPE, PASS_WORD_CRAD_TYPE, BLACK, ELECTRIC_PRICE -> cardData =
+ MANAGE_CRAD, USER_CARD_TYPE_1, USER_CARD_TYPE_2, USER_CARD_TYPE_3, REGION_CARD, ELECTRIC_PRICE_CARD, MANAGE_CRAD, VALVE_TIME_CARD, GPS_CARD, AREA_CARD, IP_CARD, CHECK_CARD, DEBUG_CARD, CLEAN_CARD_TYPE -> cardData =
"A0B1C289"
}
return cardData
}
companion object {
+
+
+ /**
+ * 鐢ㄦ埛鍒峰崱寮�娉靛墠
+ */
+
+ const val USER_CARD_TYPE_1: String = "A1"
+
+ /**
+ * 鐢ㄦ埛鍒峰崱寮�娉靛悗
+ */
+
+ const val USER_CARD_TYPE_2: String = "A8"
+
+ /**
+ * 鐢ㄦ埛鍙犲姞鍏呭��
+ */
+
+ const val USER_CARD_TYPE_3: String = "A2"
+
+
+ /**
+ * 璁剧疆鍖哄煙琛ㄥ彿鍗�
+ */
+
+ const val REGION_CARD: String = "B0"
+
+
+ /**
+ * 鍙栨暟鍗★紙闇�瑕佸埛鍗″彇鏁帮級
+ */
+
+ const val ELECTRIC_PRICE_CARD: String = "B1"
+
+
+ /**
+ * 鍙栨暟鍗★紙鍒峰崱鍙栨暟杩斿啓鎴愬姛锛�
+ */
+
+ const val MANAGE_CRAD: String = "B2"
+
+
+ /**
+ * 妫�鏌ュ崱
+ */
+ const val CHECK_CARD: String = "B3"
+
+ /**
+ * 璋冭瘯鍗�
+ */
+ const val DEBUG_CARD = "B4"
+
+ /**
+ * 娓呴浂鍗�
+ */
+
+ const val CLEAN_CARD_TYPE: String = "C1"
+
+ /**
+ * IP鍦板潃璁剧疆鍗�
+ */
+
+ const val IP_CARD: String = "B5"
+
+ /**
+ * 鍖哄煙璁剧疆鍗�
+ */
+ const val AREA_CARD: String = "B6"
+
+
+ /**
+ * GPS璁剧疆鍗�
+ */
+ const val GPS_CARD: String = "B7"
+
+ /**
+ * 閰嶇疆寮�鍏抽榾鏃堕棿
+ */
+ const val VALVE_TIME_CARD: String = "B8"
+
+
fun getDefaultCardData(cardType: String?): String? {
return getDefaultCardData(cardType)
}
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0