From 97e259d966cb5cb5d73c105d5dbaadcc1f920614 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 十月 2019 13:48:43 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index 43f56ba..c66ac64 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -6,20 +6,58 @@
{
public class DoorLockCommonInfo : ZigBee.Device.DoorLock
{
- public DoorLockCommonInfo()
+ #region 鏈湴鍙橀噺
+ public static bool InTempPasswordVisiable = false;
+ public static int ValidDateYear = 0;
+ public static int ValidDateMonth = 0;
+ public static int ValidDateDay = 0;
+ public static int ValidDateHour = 100;
+ public static int ValidDateMinute = 100;
+ public static int ValidDateSecond = 0;
+ public static int InValidDateYear = 0;
+ public static int InValidDateMonth = 0;
+ public static int InValidDateDay = 0;
+ public static int InValidDateHour = 100;
+ public static int InValidDateMinute = 100;
+ public static int InValidDateSecond = 0;
+ #endregion
+ /// <summary>
+ /// 鐢熸垚6浣嶄复鏃跺瘑鐮�
+ /// </summary>
+ /// <returns></returns>
+ public static string GetTempPassword()
{
+ string password = "";
+ password = new Random().Next(100000, 999999).ToString();
+ return password;
}
- public class DoorLockFingerprintInfo
+ /// <summary>
+ /// 灏哢NIX鏃堕棿鎴宠浆鎹㈡垚绯荤粺鏃堕棿(绮剧‘鍒扮)
+ /// <returns></returns>
+ public static DateTime GetLocalTime(int unixTimeStamp)
{
- /// <summary>
- /// 鎸囩汗澶囨敞
- /// </summary>
- public string fingerprintRemark = string.Empty;
- /// <summary>
- /// 鎸囩汗鍥剧墖
- /// </summary>
- public string fingerprintImage = string.Empty;
+ DateTime dtStart = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
+ long lTime = long.Parse(unixTimeStamp + "0000000");
+ TimeSpan toNow = new TimeSpan(lTime);
+ DateTime dtResult = dtStart.Add(toNow);
+ return dtResult;
+ }
+
+ /// <summary>
+ /// 灏嗙郴缁熸椂闂磋浆鎹㈡垚UNIX鏃堕棿鎴�(绮剧‘鍒扮)
+ /// </summary>
+ /// <param name="dateTime">鍖椾含鏃堕棿</param>
+ /// <param name="accurateToMilliseconds">绮剧‘鍒版绉掞紝鍚﹀埌绉�</param>
+ /// <returns>杩斿洖涓�涓暱鏁存暟鏃堕棿鎴�</returns>
+ public static string GetUnixTimeStamp(DateTime dateTime)
+ {
+ DateTime dtStart = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
+ //DateTime dtNow = DateTime.Parse(DateTime.Now.ToString());
+ TimeSpan toNow = dateTime.Subtract(dtStart);
+ string timeStamp = toNow.Ticks.ToString();
+ timeStamp = timeStamp.Substring(0, timeStamp.Length - 7);
+ return timeStamp;
}
/// <summary>
--
Gitblit v1.8.0