From 796c8eef0f690d0d04e14db1ecd3d365ed604017 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 19:01:57 +0800
Subject: [PATCH] 2020-05-18-3
---
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 5 +-
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 22 +++++++----
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 53 ++++++++++++++++++--------
4 files changed, 53 insertions(+), 27 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 09f7bee..a974e90 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,19 +1,21 @@
锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SoneLogicList.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="42" Column="36" />
- <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="786" Column="1" />
- <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="453" Column="14" />
+ <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="1088" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="744" Column="32" />
+ <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="302" Column="76" />
<File FileName="GateWay.Droid/Assets/Language.ini" Line="547" Column="13" />
<File FileName="Shared/R.cs" Line="842" Column="55" />
<File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="806" Column="15" />
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="224" Column="51" />
+ <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="61" Column="23" />
<File FileName="Shared/Common/Logic.cs" Line="1" Column="1" />
<File FileName="Shared/Phone/Device/Logic/OneLogic.cs" Line="328" Column="30" />
<File FileName="Shared/Phone/Device/Logic/Method.cs" Line="836" Column="41" />
<File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="67" Column="14" />
+ <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="1088" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -31,7 +33,7 @@
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True">
<Node name="DoorLockLogic" expanded="True" />
- <Node name="SoneLogicList.cs" selected="True" />
+ <Node name="LogicView" expanded="True" />
</Node>
</Node>
<Node name="UserCenter" expanded="True">
@@ -40,7 +42,9 @@
<Node name="MessageControls" expanded="True" />
</Node>
</Node>
- <Node name="DoorLock" expanded="True" />
+ <Node name="DoorLock" expanded="True">
+ <Node name="DoorLockCommonInfo.cs" selected="True" />
+ </Node>
</Node>
</Node>
</Node>
@@ -50,7 +54,9 @@
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
- <MonoDevelop.Ide.DebuggingService.PinnedWatches />
+ <MonoDevelop.Ide.DebuggingService.PinnedWatches>
+ <Watch file="../../../Shared/Phone/Device/Logic/SoneLogicList.cs" line="315" offsetX="-1" offsetY="-1" expression="timeLong" liveUpdate="False" />
+ </MonoDevelop.Ide.DebuggingService.PinnedWatches>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index f181be9..2410f58 100644
--- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index 52d5210..cf1beba 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -717,11 +717,12 @@
timeConditionsInfo.Add("DelayTime", "0");
timeConditionsInfo.Add("StartHour", h);
timeConditionsInfo.Add("StartMin", m);
- timeConditionsInfo.Add("DoorLockOpenDelayTime", timeVlaue.ToString());
+ timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue*60*60).ToString());
+ //timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 3600).ToString());
Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
actionsInfo.Add("LinkType", 8);
actionsInfo.Add("DeviceAddr", common.DeviceAddr);
- actionsInfo.Add("Epoint", common.DeviceEpoint);
+ actionsInfo.Add("Epoint", "200");
actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
Dictionary<string, string> accounts = new Dictionary<string, string>();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index 435cff9..41b7dc8 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -16,7 +16,7 @@
}
/// 缁欏緪姊呭埛鏂扮晫闈㈢敤鐨�
- public Action<bool> action;
+ public Action<bool> action;
///绗簩鍧楃涓�绾х埗鎺т欢
FrameLayout fLayout = new FrameLayout();
///绗笁鍧楃涓�绾х埗鎺т欢
@@ -31,9 +31,14 @@
/// 璁板綍閫変腑鏃堕棿
/// </summary>
public int timeValue = 0;
+
+ /// <summary>
+ /// 鏃堕棿鎴�
+ /// </summary>
+ public int timeLong = 0;
public async void Show()
{
-
+
#region 鐣岄潰鐨勫竷灞�浠ｇ爜
UserView.HomePage.Instance.ScrollEnabled = false;//閿佷綇宸︽粦
TopView view = new TopView();
@@ -60,12 +65,12 @@
this.AddChidren(middle);
#endregion
//鏄父寮�妯″紡鍐嶅幓璇诲彇
-
+
if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
{
//杩涙潵鏇存柊涓�娆�
//鏌ユ壘鏄惁瀛樺湪鏃舵晥鎬ц嚜鍔ㄥ寲锛涙湁鐨勮瘽灏辫繑鍥炶嚜鍔ㄥ寲瀵硅薄;
- var logic = await SkipView.GetLogicIfon(Send.CurrentDoorLock);
+ var logic = await SkipView.GetLogicIfon(Send.CurrentDoorLock);
if (logic != null)
{
try
@@ -73,6 +78,8 @@
//杩涙潵鏇存柊涓�娆″��
logicId = logic.LogicId;
timeValue = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
+ timeLong = int.Parse(logic.Conditions[0]["TriggerTime"]);
+
}
catch { }
}
@@ -221,7 +228,7 @@
/// <summary>
/// 甯稿紑妯″紡寮�鍏冲垏鎹㈠浘鏍囩晫闈�
/// </summary>
- public void ModeView()
+ public void ModeView()
{
fLayout.RemoveAll();
@@ -306,15 +313,16 @@
if (logicId != 0)
{
openModeFl.AddChidren(timeTextBtn);
+ var datetime = GetLocalTime(timeLong);
///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
- var y = DateTime.Now.Year.ToString();//閭ｄ竴骞�
- var m = DateTime.Now.Month.ToString();//閭ｄ竴鏈�
- var d = DateTime.Now.ToString("dd");//閭ｄ竴澶�
- var h = int.Parse(DateTime.Now.ToString("HH"));//灏忔椂
- int dayInt = (h + timeValue) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
- int hour = (h + timeValue) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
- int days = int.Parse(d) + dayInt;
- int minute = DateTime.Now.Minute;//鍒嗛挓
+ var y = datetime.Year.ToString();//閭ｄ竴骞�
+ var m = datetime.Month.ToString();//閭ｄ竴鏈�
+ var d = datetime.ToString("dd");//閭ｄ竴澶�
+ var h = int.Parse(datetime.ToString("HH"));//灏忔椂
+ // int dayInt = (h + timeValue) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
+ // int hour = (h + timeValue) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
+ // int days = int.Parse(d) + dayInt;
+ int minute = datetime.Minute;//鍒嗛挓
string text1 = Language.StringByID(MyInternationalizationString.timeSensitive);
string text2 = Language.StringByID(MyInternationalizationString.yearSone);
string text3 = Language.StringByID(MyInternationalizationString.monthSone);
@@ -322,7 +330,7 @@
string text5 = Language.StringByID(MyInternationalizationString.hour1);
string text6 = Language.StringByID(MyInternationalizationString.executeSone);
// timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6;
- timeTextBtn.Text = text1 + m + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6;
+ timeTextBtn.Text = text1 + m + text3 + d + text4 + h + text5 + minute.ToString() + text6;
}
@@ -447,7 +455,7 @@
/// 璇诲彇鑷姩鍖栧垪琛ㄦ暟鎹紱
/// </summary>
/// <param name="yes"></param>
- private async void Read( bool yes)
+ private async void Read(bool yes)
{
if (yes)
{
@@ -473,7 +481,7 @@
Common.Logic.SoneLogicList.Add(logic);
}
}
- }
+ }
}
}
catch (Exception e)
@@ -662,6 +670,17 @@
};
}
}
-
+
+ /// <summary>
+ /// 灏哢NIX鏃堕棿鎴宠浆鎹㈡垚绯荤粺鏃堕棿(绮剧‘鍒扮)
+ /// <returns></returns>
+ public DateTime GetLocalTime(int unixTimeStamp)
+ {
+ 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;
+ }
}
}
--
Gitblit v1.8.0