From c8df02a7b07086e17bacda6cdc015d76ac1f82fe Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 17:16:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-common/src/main/java/constant/ApiConstants.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/ycl-common/src/main/java/constant/ApiConstants.java b/ycl-common/src/main/java/constant/ApiConstants.java
index 9037425..7ecdf3f 100644
--- a/ycl-common/src/main/java/constant/ApiConstants.java
+++ b/ycl-common/src/main/java/constant/ApiConstants.java
@@ -59,24 +59,21 @@
public final static Integer UY_OnlineStatus_Offline = -1;
public final static Integer UY_OnlineStatus_Unknown = 0;
- //Python鏍￠獙鏍囪瘑
- public final static Integer PY_OSD_Correct = 1;
- public final static Integer PY_OSD_Unknown = 0;
- public final static Integer PY_OSD_Error = -1;
+ //OSD鏍￠獙鏍囪瘑
+ public final static Integer OSD_Correct = 1;
+ public final static Integer OSD_Unknown = 0;
+ public final static Integer OSD_Error = -1;
//鑷础琛屾斂缂栫爜
public final static String AreaNo = "5103";
//鐪佸巺鍓嶇紑
public final static String Province = "Province_";
+ public final static String County = "County_";
+ //娴峰悍璁块棶OSD璺緞
+ public final static String HK_OSD_PATH = "/ISAPI/System/Video/inputs/channels/1/overlays";
+ //娴峰悍璁块棶鏃堕棿璺緞
+ public final static String HK_OSD_TIME = "/ISAPI/System/time";
-
- /** 鑰冩牳鎸囨爣 鏉′欢鍙傛暟 */
- //杞﹁締鑰冩牳锛岀偣浣嶅湪绾跨巼锛屽尯鍘夸笉灏戜簬40璺�
- public final static Integer Check_Car_SiteOnline = 40;
- public final static Integer Check_Face_SiteOnline = 40;
- //杞﹁締鍦ㄧ嚎鐜� Redis 姣忔湀鏁版嵁涓柇娆℃暟 Hash key
- public final static String Check_Car_ViewConnect = "CarViewConnectNoData";
- public final static String Check_Face_ViewConnect = "FaceViewConnectNoData";
}
--
Gitblit v1.8.0