From ba9c4bca1bdf36f827ab258222d92c885ff890db Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 05 Sep 2023 08:43:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-common/src/main/java/com/moral/constant/Constants.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/constant/Constants.java b/screen-common/src/main/java/com/moral/constant/Constants.java
index 296db1a..37f82fb 100644
--- a/screen-common/src/main/java/com/moral/constant/Constants.java
+++ b/screen-common/src/main/java/com/moral/constant/Constants.java
@@ -135,6 +135,16 @@
public static final String SENSOR_CODE_VOCS = "a99054";
/*
+ * ������������ code
+ * */
+ public static final String SENSOR_CODE_CURRENT_SPEED = "a01011";
+
+ /*
+ * ������������ code
+ * */
+ public static final String SENSOR_CODE_CURRENT_FLOW = "a40001";
+
+ /*
* ������code
* */
public static final String SENSOR_CODE_TEMP = "a01001";
@@ -256,17 +266,17 @@
public static final String SERVER_WEATHER = "������������";
- public static final String EXCELLENT_WEATHER_CODE = "0";
+ public static final String EXCELLENT_WEATHER_CODE = "1";
- public static final String GOOD_WEATHER_CODE = "1";
+ public static final String GOOD_WEATHER_CODE = "2";
- public static final String MILD_WEATHER_CODE = "2";
+ public static final String MILD_WEATHER_CODE = "3";
- public static final String MIDDLE_WEATHER_CODE = "3";
+ public static final String MIDDLE_WEATHER_CODE = "4";
- public static final String SERIOUS_WEATHER_CODE = "4";
+ public static final String SERIOUS_WEATHER_CODE = "5";
- public static final String SERVER_WEATHER_CODE = "5";
+ public static final String SERVER_WEATHER_CODE = "6";
/*
* ������������
@@ -292,4 +302,14 @@
* ������������
* */
public static final String MOM = "mom";
+
+ /*
+ * ���������������
+ * */
+ public static final String YEAR = "year";
+
+ /*
+ * ���������������
+ * */
+ public static final String MONTH = "month";
}
--
Gitblit v1.8.0