From a170a2ecef6d5c87883ed552dbbc81cfb0358d13 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 19 十一月 2021 16:43:53 +0800
Subject: [PATCH] Merge branch 'WJC' into newBranch1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 352 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 335 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index f55167c..7b289d7 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -8,9 +8,13 @@
public class LogicMethod
{
-
+ /// <summary>
+ /// 瀹氫箟涓�涓潤鎬佸璞�
+ /// </summary>
private static LogicMethod logicMethod = null;
-
+ /// <summary>
+ /// 鑾峰彇闈欐�佸璞�
+ /// </summary>
public static LogicMethod CurrLogicMethod
{
get
@@ -179,12 +183,21 @@
return Entity.FunctionList.List.GetDeviceFunctionList();
}
/// <summary>
- /// 鑾峰彇缃戝叧鍦烘櫙鍒楄〃
+ /// 鑾峰彇鍦烘櫙鍒楄〃
/// </summary>
/// <returns></returns>
public List<HDL_ON.Entity.Scene> GetSceneList()
{
return HDL_ON.Entity.FunctionList.List.scenes;
+ }
+
+ /// <summary>
+ /// 鑾峰彇瀹夐槻鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<HDL_ON.Entity.SecurityAlarm> GetSecurityList()
+ {
+ return FunctionList.List.securities;
}
/// <summary>
/// 鑾峰彇鎴块棿鐨勮澶囧垪琛�
@@ -217,7 +230,7 @@
return deviceLists;
}
/// <summary>
- /// 鑾峰彇褰撲釜璁惧
+ /// 鑾峰彇璁惧锛堝姛鑳斤級瀵硅薄
/// </summary>
/// <param name="sid">璁惧鍞竴鏍囪瘑</param>
/// <returns></returns>
@@ -238,7 +251,7 @@
}
/// <summary>
- /// 鑾峰彇褰撲釜鍦烘櫙
+ /// 鑾峰彇鍦烘櫙瀵硅薄
/// </summary>
/// <param name="sid">鍦烘櫙鍞竴鏍囪瘑</param>
/// <returns></returns>
@@ -256,6 +269,26 @@
}
}
return scene;
+ }
+ /// <summary>
+ /// 鑾峰彇瀹夐槻瀵硅薄
+ /// </summary>
+ /// <param name="sid">瀹夐槻鍞竴鏍囪瘑</param>
+ /// <returns></returns>
+ public HDL_ON.Entity.SecurityAlarm GetSecurity(string sid)
+ {
+ HDL_ON.Entity.SecurityAlarm security = new Entity.SecurityAlarm() { name = "Unknown" };
+ List<HDL_ON.Entity.SecurityAlarm> SecurityLists = GetSecurityList();
+ for (int i = 0; i < SecurityLists.Count; i++)
+ {
+ var sce = SecurityLists[i];
+ if (sce.sid == sid)
+ {
+ security = sce;
+ break;
+ }
+ }
+ return security;
}
/// <summary>
/// 鑾峰彇鎴块棿鍚�(鍗虫槸=鍖哄煙鍚嶇О)
@@ -289,6 +322,18 @@
string strPath = "";
switch (functionType)
{
+
+ case SPK.AirSwitch:
+ {
+ strPath = "FunctionIcon/Icon/electricalbreaker.png";
+ }
+ break;
+ case SPK.PanelSocket:
+ case SPK.ElectricSocket:
+ {
+ strPath = "FunctionIcon/Icon/electricalsocket.png";
+ }
+ break;
case SPK.LightSwitch:
case SPK.LightRGB:
case SPK.LightRGBW:
@@ -306,11 +351,19 @@
}
break;
case SPK.AcStandard:
+ case SPK.HvacAC:
{
strPath = "LogicIcon/airconditionerlogic.png";
}
break;
case SPK.FloorHeatStandard:
+ case SPK.HvacFloorHeat:
+ {
+ strPath = "LogicIcon/heatlogic.png";
+ }
+ break;
+ case SPK.AirFreshStandard:
+ case SPK.HvacAirFresh:
{
strPath = "LogicIcon/heatlogic.png";
}
@@ -319,15 +372,23 @@
case SPK.SensorWater:
case SPK.SensorGas:
case SPK.SensorDryContact:
+ case SPK.SensorDryContact2:
case SPK.SensorShanLan:
case SPK.SensorDuiShe:
case SPK.SensorPir:
case SPK.SensorDoorWindow:
case SPK.SensorUtrasonic:
case SPK.SenesorMegahealth:
+ case SPK.SenesorMegahealth2:
case SPK.SensorEnvironment:
case SPK.SensorEnvironment2:
case SPK.SensorEnvironment3:
+ case SPK.SensorTemperature:
+ case SPK.SensorHumidity:
+ case SPK.SensorCO2:
+ case SPK.SensorPm25:
+ case SPK.SensorTVOC:
+ case SPK.SensorHcho:
{
strPath = "LogicIcon/sensor.png";
}
@@ -345,17 +406,20 @@
{
List<string> deviceStrTypeList = new List<string>();
deviceStrTypeList.Clear();
+ ///鐏厜绫�
var lightjosn = deviceList.Find((device) =>
device.spk == SPK.LightSwitch
|| device.spk == SPK.LightDimming
|| device.spk == SPK.LightCCT
|| device.spk == SPK.LightRGB
- || device.spk == SPK.LightRGBW);
+ || device.spk == SPK.LightRGBW
+ );
if (lightjosn != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.Lights));
}
+ ///绐楀笜绫�
var curtainjosn = deviceList.Find((device) =>
device.spk == SPK.CurtainSwitch
|| device.spk == SPK.CurtainTrietex
@@ -364,35 +428,60 @@
{
deviceStrTypeList.Add(Language.StringByID(StringId.Curtain));
}
-
- var ac = deviceList.Find((device) => device.spk == SPK.AcStandard);
+ ///绌鸿皟绫�
+ var ac = deviceList.Find((device) => device.spk == SPK.AcStandard || device.spk == SPK.HvacAC);
if (ac != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.AC));
}
- var floorHeating = deviceList.Find((device) => device.spk == SPK.FloorHeatStandard);
+ ///鍦版殩绫�
+ var floorHeating = deviceList.Find((device) => device.spk == SPK.FloorHeatStandard || device.spk == SPK.HvacFloorHeat);
if (floorHeating != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.FloorHeating));
}
+ ///鏂伴绫�
+ var airFresh = deviceList.Find((device) => device.spk == SPK.AirFreshStandard || device.spk == SPK.HvacAirFresh);
+ if (airFresh != null)
+ {
+ deviceStrTypeList.Add(Language.StringByID(StringId.AirFresh));
+ }
+ ///浼犳劅鍣ㄧ被
var sensor = deviceList.Find((device) =>
device.spk == SPK.SensorWater
|| device.spk == SPK.SensorGas
|| device.spk == SPK.SensorSmoke
- || device.spk == SPK.SensorDryContact
+ || device.spk == SPK.SensorDryContact || device.spk == SPK.SensorDryContact2
|| device.spk == SPK.SensorShanLan
|| device.spk == SPK.SensorDuiShe
|| device.spk == SPK.SensorPir
|| device.spk == SPK.SensorDoorWindow
|| device.spk == SPK.SensorUtrasonic
|| device.spk == SPK.SenesorMegahealth
+ || device.spk == SPK.SenesorMegahealth2
|| device.spk == SPK.SensorEnvironment
|| device.spk == SPK.SensorEnvironment2
|| device.spk == SPK.SensorEnvironment3
+ || device.spk == SPK.SensorTemperature
+ || device.spk == SPK.SensorHumidity
+ || device.spk == SPK.SensorCO2
+ || device.spk == SPK.SensorPm25
+ || device.spk == SPK.SensorTVOC
+ || device.spk == SPK.SensorHcho
);
if (sensor != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.Sensor));
+ }
+ ///瀹剁數绫�
+ var electric = deviceList.Find((device) =>
+ device.spk == SPK.AirSwitch
+ || device.spk == SPK.PanelSocket
+ || device.spk == SPK.ElectricSocket
+ );
+ if (electric != null)
+ {
+ deviceStrTypeList.Add(Language.StringByID(StringId.Electric));
}
return deviceStrTypeList;
@@ -405,6 +494,7 @@
public List<string> GetDeviceTypeFunctionList(string deviceType)
{
List<string> functionTypeList = new List<string>();
+ ///鐏厜绫�
if (deviceType == Language.StringByID(StringId.Lights))
{
functionTypeList.Add(SPK.LightSwitch);
@@ -412,39 +502,68 @@
functionTypeList.Add(SPK.LightRGB);
functionTypeList.Add(SPK.LightRGBW);
functionTypeList.Add(SPK.LightCCT);
+ functionTypeList.Add(SPK.AirSwitch);
+ functionTypeList.Add(SPK.PanelSocket);
+ functionTypeList.Add(SPK.ElectricSocket);
}
+ ///绐楀笜绫�
else if (deviceType == Language.StringByID(StringId.Curtain))
{
functionTypeList.Add(SPK.CurtainSwitch);
functionTypeList.Add(SPK.CurtainRoller);
functionTypeList.Add(SPK.CurtainTrietex);
}
+ ///绌鸿皟绫�
else if (deviceType == Language.StringByID(StringId.AC))
{
functionTypeList.Add(SPK.AcStandard);
+ functionTypeList.Add(SPK.HvacAC);
}
+ ///鍦版殩绫�
else if (deviceType == Language.StringByID(StringId.FloorHeating))
{
- functionTypeList.Add(SPK.FloorHeatStandard);
+ functionTypeList.Add(SPK.FloorHeatStandard); functionTypeList.Add(SPK.HvacFloorHeat);
}
+ ///鏂伴绫�
+ else if (deviceType == Language.StringByID(StringId.AirFresh))
+ {
+ functionTypeList.Add(SPK.AirFreshStandard); functionTypeList.Add(SPK.HvacAirFresh);
+ }
+ ///浼犳劅鍣ㄧ被
else if (deviceType == Language.StringByID(StringId.Sensor))
{
functionTypeList.Add(SPK.SensorSmoke);
functionTypeList.Add(SPK.SensorWater);
functionTypeList.Add(SPK.SensorGas);
- functionTypeList.Add(SPK.SensorDryContact);
+ functionTypeList.Add(SPK.SensorDryContact); functionTypeList.Add(SPK.SensorDryContact2);
functionTypeList.Add(SPK.SensorShanLan);
functionTypeList.Add(SPK.SensorDuiShe);
functionTypeList.Add(SPK.SensorPir);
functionTypeList.Add(SPK.SensorDoorWindow);
functionTypeList.Add(SPK.SensorUtrasonic);
functionTypeList.Add(SPK.SenesorMegahealth);
+ functionTypeList.Add(SPK.SenesorMegahealth2);
functionTypeList.Add(SPK.SensorEnvironment);
functionTypeList.Add(SPK.SensorEnvironment2);
functionTypeList.Add(SPK.SensorEnvironment3);
+ functionTypeList.Add(SPK.SensorTemperature);
+ functionTypeList.Add(SPK.SensorHumidity);
+ functionTypeList.Add(SPK.SensorCO2);
+ functionTypeList.Add(SPK.SensorPm25);
+ functionTypeList.Add(SPK.SensorTVOC);
+ functionTypeList.Add(SPK.SensorHcho);
}
+ ///瀹剁數绫�
+ else if (deviceType == Language.StringByID(StringId.Electric))
+ {
+ functionTypeList.Add(SPK.AirSwitch);
+ functionTypeList.Add(SPK.PanelSocket);
+ functionTypeList.Add(SPK.ElectricSocket);
+ }
+
+
return functionTypeList;
}
@@ -467,21 +586,32 @@
deviceTypeList.Add(SPK.CurtainSwitch);
deviceTypeList.Add(SPK.CurtainRoller);
deviceTypeList.Add(SPK.CurtainTrietex);
- deviceTypeList.Add(SPK.AcStandard);
- deviceTypeList.Add(SPK.FloorHeatStandard);
+ deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC);
+ deviceTypeList.Add(SPK.AirFreshStandard); deviceTypeList.Add(SPK.HvacAirFresh);
+ deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat);
deviceTypeList.Add(SPK.SensorSmoke);
deviceTypeList.Add(SPK.SensorWater);
deviceTypeList.Add(SPK.SensorGas);
- deviceTypeList.Add(SPK.SensorDryContact);
+ deviceTypeList.Add(SPK.SensorDryContact); deviceTypeList.Add(SPK.SensorDryContact2);
deviceTypeList.Add(SPK.SensorShanLan);
deviceTypeList.Add(SPK.SensorDuiShe);
deviceTypeList.Add(SPK.SensorPir);
deviceTypeList.Add(SPK.SensorDoorWindow);
deviceTypeList.Add(SPK.SensorUtrasonic);
deviceTypeList.Add(SPK.SenesorMegahealth);
+ deviceTypeList.Add(SPK.SenesorMegahealth2);
deviceTypeList.Add(SPK.SensorEnvironment);
deviceTypeList.Add(SPK.SensorEnvironment2);
deviceTypeList.Add(SPK.SensorEnvironment3);
+ deviceTypeList.Add(SPK.SensorTemperature);
+ deviceTypeList.Add(SPK.SensorHumidity);
+ deviceTypeList.Add(SPK.SensorCO2);
+ deviceTypeList.Add(SPK.SensorPm25);
+ deviceTypeList.Add(SPK.SensorTVOC);
+ deviceTypeList.Add(SPK.SensorHcho);
+ deviceTypeList.Add(SPK.AirSwitch);
+ deviceTypeList.Add(SPK.PanelSocket);
+ deviceTypeList.Add(SPK.ElectricSocket);
}
break;
@@ -495,8 +625,12 @@
deviceTypeList.Add(SPK.CurtainSwitch);
deviceTypeList.Add(SPK.CurtainRoller);
deviceTypeList.Add(SPK.CurtainTrietex);
- deviceTypeList.Add(SPK.AcStandard);
- deviceTypeList.Add(SPK.FloorHeatStandard);
+ deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC);
+ deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat);
+ deviceTypeList.Add(SPK.AirFreshStandard); deviceTypeList.Add(SPK.HvacAirFresh);
+ deviceTypeList.Add(SPK.AirSwitch);
+ deviceTypeList.Add(SPK.PanelSocket);
+ deviceTypeList.Add(SPK.ElectricSocket);
}
break;
}
@@ -575,6 +709,190 @@
}
}
+ #region 楂樺痉鍧愭爣杞琖GS84鍧愭爣
+ /// <summary>
+ /// 楂樺痉鍧愭爣杞琖GS84鍧愭爣
+ /// </summary>
+ /// <param name="in_lng"></param>
+ /// <param name="in_lat"></param>
+ /// <param name="out_lng"></param>
+ /// <param name="out_lat"></param>
+ public void GCJ02_to_WGS84(double in_lng, double in_lat, out double out_lng, out double out_lat)
+ {
+ if (OutOfChina(in_lat, in_lng))
+ {
+ out_lng = in_lng;
+ out_lat = in_lat;
+ return;
+ }
+
+ CalculateDev(in_lng, in_lat, out out_lng, out out_lat);
+ out_lng = in_lng - out_lng;
+ out_lat = in_lat - out_lat;
+ }
+ #endregion
+
+ #region WGS84鍧愭爣杞珮寰峰潗鏍�
+ /// <summary>
+ /// WGS84鍧愭爣杞珮寰峰潗鏍�
+ /// </summary>
+ /// <param name="in_lng">缁忓害</param>
+ /// <param name="in_lat">绾害</param>
+ /// <param name="out_lng"></param>
+ /// <param name="out_lat"></param>
+ public void WGS84_to_GCJ02(double in_lng, double in_lat, out double out_lng, out double out_lat)
+ {
+ if (OutOfChina(in_lat, in_lng))
+ {
+ out_lng = in_lng;
+ out_lat = in_lat;
+ return;
+ }
+
+ CalculateDev(in_lng, in_lat, out out_lng, out out_lat);
+ out_lng = in_lng + out_lng;
+ out_lat = in_lat + out_lat;
+ }
+ #endregion
+
+ /// <summary>
+ /// 鍧愭爣鏄惁鍦ㄤ腑鍥藉鍐�
+ /// </summary>
+ /// <param name="lat"></param>
+ /// <param name="lng"></param>
+ /// <returns></returns>
+ public bool OutOfChina(double lat, double lng)
+ {
+ if (lng < 72.004 || lng > 137.8347)
+ return true;
+ if (lat < 0.8293 || lat > 55.8271)
+ return true;
+ return false;
+ }
+ /// <summary>
+ /// 璁＄畻鍋忓樊
+ /// </summary>
+ /// <param name="in_lng"></param>
+ /// <param name="in_lat"></param>
+ /// <param name="dLng"></param>
+ /// <param name="dLat"></param>
+ private void CalculateDev(double in_lng, double in_lat, out double dLng, out double dLat)
+ {
+ dLat = TransformLat(in_lng - 105.0, in_lat - 35.0);
+ dLng = TransformLng(in_lng - 105.0, in_lat - 35.0);
+
+ double radLat = in_lat / 180.0 * pi;
+ double magic = Math.Sin(radLat);
+ magic = 1 - ee * magic * magic;
+ double sqrtMagic = Math.Sqrt(magic);
+ dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi);
+ dLng = (dLng * 180.0) / (a / sqrtMagic * Math.Cos(radLat) * pi);
+ }
+
+ private double TransformLat(double x, double y)
+ {
+ double ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.Sqrt(Math.Abs(x));
+ ret += (20.0 * Math.Sin(6.0 * x * pi) + 20.0 * Math.Sin(2.0 * x * pi)) * 2.0 / 3.0;
+ ret += (20.0 * Math.Sin(y * pi) + 40.0 * Math.Sin(y / 3.0 * pi)) * 2.0 / 3.0;
+ ret += (160.0 * Math.Sin(y / 12.0 * pi) + 320 * Math.Sin(y * pi / 30.0)) * 2.0 / 3.0;
+ return ret;
+ }
+ private double TransformLng(double x, double y)
+ {
+ double ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.Sqrt(Math.Abs(x));
+ ret += (20.0 * Math.Sin(6.0 * x * pi) + 20.0 * Math.Sin(2.0 * x * pi)) * 2.0 / 3.0;
+ ret += (20.0 * Math.Sin(x * pi) + 40.0 * Math.Sin(x / 3.0 * pi)) * 2.0 / 3.0;
+ ret += (150.0 * Math.Sin(x / 12.0 * pi) + 300.0 * Math.Sin(x / 30.0 * pi)) * 2.0 / 3.0;
+ return ret;
+ }
+ // 妞悆鍙傛暟-鍦嗗懆鐜�
+ private const double pi = 3.14159265358979324;
+
+ // (鍖椾含54)妞悆闀垮崐杞达紝鍗槦妞悆鍧愭爣鎶曞奖鍒板钩闈㈠湴鍥惧潗鏍囩郴鐨勬姇褰卞洜瀛�
+ private const double a = 6378245.0;
+ /*
+ * Krasovsky 1940 (鍖椾含54)妞悆闀垮崐杞寸涓�鍋忓績鐜囧钩鏂�
+ * 璁＄畻鏂瑰紡锛�
+ * 闀垮崐杞达細
+ * a = 6378245.0
+ * 鎵佺巼锛�
+ * 1/f = 298.3锛堝彉閲忕浉鍏宠绠椾负锛�(a-b)/a锛�
+ * 鐭崐杞达細
+ * b = 6356863.0188 (鍙橀噺鐩稿叧璁＄畻鏂规硶涓猴細b = a * (1 - f))
+ * 绗竴鍋忓績鐜囧钩鏂�:
+ * e2 = (a^2 - b^2) / a^2;
+ */
+ private const double ee = 0.00669342162296594323;
+
+ /// <summary>
+ /// APP涓婃姤GPS缁忕含搴�
+ /// </summary>
+ public void AppLatAndLonEvent()
+ {
+ Application.LocationAction += (lon, lat) =>
+ {
+ ////GPS鍧愭爣杞垚楂樺痉鍧愭爣
+ //double out_lng, out_lat;
+ //this.WGS84_to_GCJ02(lon, lat, out out_lng, out out_lat);
+ //涓婃姤缁忕含搴�
+ this.AutomatedGeofenceStatusReporting(lon, lat);
+ };
+ }
+
+ /// <summary>
+ /// 鑷姩鍖栧湴鐞嗗洿鏍忕姸鎬佷笂鎶ヤ簯绔�
+ /// </summary>
+ /// <param name="out_lng">APP GPS缁忓害</param>
+ /// <param name="out_lat">APP GPS绾害</param>
+ private void AutomatedGeofenceStatusReporting(double out_lng, double out_lat)
+ {
+ List<LogicData> logicDataList = new List<LogicData>();
+ logicDataList.Clear();
+ //鑾峰彇閫昏緫ID鍒楄〃
+ var idStr = Send.GetLogicIdList();
+ if (idStr.Code == "0" && idStr.Data != null && idStr.Data.ToString() != "")
+ {
+ var date = Newtonsoft.Json.JsonConvert.SerializeObject(idStr.Data);
+ logicDataList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<LogicData>>(date);
+ }
+ ///鏈夎嚜鍔ㄥ垪琛ㄦ墠澶勭悊
+ if (logicDataList.Count>0) {
+ ///閬嶅巻鎵�鏈夊垪琛�
+ for (int i = 0; i < logicDataList.Count; i++)
+ {
+ var logicDate = logicDataList[i];
+ ///鑷姩鍖栨病鏈夐厤缃湴鐞嗗洿鏍忎笉澶勭悊
+ if (string.IsNullOrEmpty(logicDate.geo_fence.latitude) || string.IsNullOrEmpty(logicDate.geo_fence.longitude))
+ {
+ //缁忕含搴︿负绌�,璁や负鑷姩鍖栨病鏈夐厤缃湴鐞嗗洿鏍忥紝涓嶅鐞�;
+ continue;
+ }
+ //鑷姩鍖栫含搴�
+ double lat = Convert.ToDouble(logicDate.geo_fence.latitude);
+ //鑷姩鍖栫粡搴�
+ double lon = Convert.ToDouble(logicDate.geo_fence.longitude);
+ //鑷姩鍖栭厤缃緭鍏ユ潯浠�<鍦扮悊鍥存爮鍗婂緞><鍗曚綅锛屽叕閲屻�佸崈绫�.绫�>
+ int radius = int.Parse(logicDate.geo_fence.radius);
+ //璁＄畻2涓粡绾害涔嬮棿鐨勮窛绂�
+ int r =Infrastructure.Service.Helper.CalculatedDistance.Distance(out_lat, out_lng, lat, lon);
+ //瀹氫箟涓�涓眬閮ㄥ彉閲�
+ string direction = string.Empty;
+ //涓ょ偣璺濈灏忎簬閰嶇疆璺濈<鏃㈣嚜鍔ㄥ寲閰嶇疆杈撳叆鏉′欢鍦扮悊鍥存爮鍗婂緞>,璇存槑杩涘叆鍖哄煙
+ if (r<radius) {
+ //鍒拌揪鏌愬湴
+ direction = "arrive";
+ } else {
+ //绂诲紑
+ direction = "leave";
+ }
+ bool f= Send.GeoFenceStateReport(logicDate.userLogicId,logicDate.sid, direction);
+ //if () { }
+ //Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
+ }
+
+ }
+
+ }
}
}
--
Gitblit v1.8.0