From a3eaa78c6d839b640c728f4c7d8eb27732627b07 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 14:51:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into qa
---
screen-common/src/main/java/com/moral/constant/Constants.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 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 0745402..a49dc6a 100644
--- a/screen-common/src/main/java/com/moral/constant/Constants.java
+++ b/screen-common/src/main/java/com/moral/constant/Constants.java
@@ -65,9 +65,14 @@
public static final String WEB_CHANNEL = "0";
/*
- * ������������������
+ * ������������������ web
* */
public static final String LOGIN_OPERTATE_TYPE = "0";
+
+ /*
+ * ������������������ app
+ * */
+ public static final String LOGIN_OPERTATE_APP = "1";
/*
* ������������������
@@ -114,6 +119,13 @@
* */
public static final String SYSTEM_DICT_TYPE_PURCHASER = "purchaser";
+ /**
+ * ������������������
+ */
+ public static final String WU_RAN_LEI_XING = "contaminate";
+
+
+
/*
* ������������������������
* */
@@ -133,6 +145,16 @@
* vocs code
* */
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
@@ -256,17 +278,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";
/*
* ������������
@@ -291,5 +313,15 @@
/*
* ������������
* */
- public static final String QOQ = "qoq";
+ public static final String MOM = "mom";
+
+ /*
+ * ���������������
+ * */
+ public static final String YEAR = "year";
+
+ /*
+ * ���������������
+ * */
+ public static final String MONTH = "month";
}
--
Gitblit v1.8.0