From e238b9cc3caef879fd907ceab8997d08ae891ea3 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 04 十一月 2021 09:22:08 +0800
Subject: [PATCH] BUG修复
---
HDL_ON/Entity/DB_ResidenceData.cs | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 896cb34..7e9c6f8 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -19,7 +19,6 @@
/// </summary>
public string MasterToken;
- //RegionInfoRes _residecenInfo;
RegionInfoRes _residecenInfo = new RegionInfoRes();
/// <summary>
/// 浣忓畢鍩虹淇℃伅
@@ -122,6 +121,7 @@
ShowFunction.Sensor,ShowFunction.VideoIntercom,
ShowFunction.SecurityCenter
});
+ instance.SupportFacePass = false;
instance.SaveResidenceData();
}
catch (Exception ex)
@@ -156,6 +156,10 @@
HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
}
+ /// <summary>
+ /// 鏄惁鏀寔浜鸿劯閫氳
+ /// </summary>
+ public bool SupportFacePass = false;
/// <summary>
/// 缃戝叧璇︾粏淇℃伅
@@ -163,8 +167,8 @@
public HomeGatewayInfo HomeGateway;
/// <summary>
- /// 0:bus缃戝叧
- /// 1:A鍗忚缃戝叧
+ /// 0:涓�绔彛
+ /// 1:Link鍗忚缃戝叧
/// </summary>
public int GatewayType
{
@@ -175,7 +179,7 @@
//#endif
if (HomeGateway == null)
return -1;
- if (HomeGateway.gatewayType == "AGATEWAY")
+ if (HomeGateway.gatewayType != "BUSUDPGATEWAY")
{
return 1;
}
@@ -251,6 +255,11 @@
}
}
+
+ ///// <summary>
+ ///// 鍩庡競淇℃伅
+ ///// </summary>
+ //public static Entity.CityInfo cityInfo = new Entity.CityInfo();
/// <summary>
/// 浣忓畢鍥剧墖
@@ -443,5 +452,23 @@
}
#endregion
+
+
+
+ /// <summary>
+ /// 涓婁竴娆℃彁绀虹殑鏃堕棿
+ /// </summary>
+ public DateTime LastTipTime = DateTime.MinValue;
+ /// <summary>
+ /// 鏄惁闇�瑕佹彁绀�
+ /// </summary>
+ public bool NeedTip
+ {
+ get
+ {
+ return (DateTime.Now - LastTipTime).TotalDays > 2;
+ }
+ }
+
}
}
--
Gitblit v1.8.0