From 49ecdeae6cafbfbed6edcf2c209b674e2fe8c31e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 02 六月 2020 17:51:57 +0800
Subject: [PATCH] 2020-06-02-1
---
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 1 +
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 25 +++++++++++--------------
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 17 +++++++++--------
4 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index dea838f..24b7df4 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,30 +1,25 @@
锘�<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/LogicCommunalPage.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SoneLogicList.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/TemplatePage.cs" Line="230" Column="57" />
- <File FileName="Shared/Phone/Device/Logic/LogicView/SelectedDeviceView.cs" Line="1" Column="1" />
- <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="448" Column="55" />
- <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="1260" Column="49" />
- <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="734" Column="34" />
- <File FileName="Shared/Phone/Device/Logic/IgnoreTime.cs" Line="147" Column="22" />
- <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="196" Column="29" />
+ <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="244" Column="31" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="656" Column="36" />
+ <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="155" Column="18" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
- <Node name="GateWay.Droid" expanded="True">
- <Node name="Assets" expanded="True" />
- </Node>
<Node name="Shared" expanded="True">
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True">
- <Node name="LogicView" expanded="True" />
- <Node name="LogicCommunalPage.cs" selected="True" />
+ <Node name="SoneLogicList.cs" selected="True" />
</Node>
+ </Node>
+ <Node name="UserCenter" expanded="True">
+ <Node name="DoorLock" expanded="True" />
</Node>
</Node>
</Node>
@@ -34,7 +29,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="354" offsetX="-1" offsetY="-1" expression="timeLong" liveUpdate="False" />
+ </MonoDevelop.Ide.DebuggingService.PinnedWatches>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 286bc65..11906c7 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 1c7f1b2..7fff6c6 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -20,6 +20,7 @@
{
case 0:
{
+
//new涓�涓柊閫昏緫瀵硅薄锛�
//鏂板姝ｅ父鑷姩鍖栧叆鍙�
Common.Logic.CurrentLogic = new Common.Logic();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index caeb202..5bb8a14 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -282,6 +282,7 @@
openModeFl.AddChidren(closeBtn);
closeBtn.MouseUpEventHandler += async (sender, e) =>
{
+
CommonPage.Loading.Start();
try
{
@@ -312,8 +313,7 @@
});
}
};
-
-
+
if (logicId != 0)
{
///鏄剧ず澶辨晥璁剧疆鏃堕棿鏂囨湰鎺т欢
@@ -347,15 +347,15 @@
///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
year = datetime.Year.ToString();//閭ｄ竴骞�
month = datetime.Month.ToString();//閭ｄ竴鏈�
- var d = int.Parse(datetime.ToString("dd"));//閭ｄ竴澶�
- var h = int.Parse(datetime.ToString("HH"));//灏忔椂
- int dayInt = (h + timeValue) / 24;//璁剧疆鏃堕棿+褰撳墠绯荤粺鏃堕棿鏄惁瓒呭嚭24灏忔椂
- hour = (h + timeValue) % 24;//璁剧疆鏃堕棿+褰撳墠绯荤粺鏃堕棿鏄惁瓒呭嚭24灏忔椂鍓╀笅澶氬皯灏忔椂
- days = d + dayInt;//褰撳墠绯荤粺澶╂暟+鎵ц鍚庡ぉ鏁�
+ days = int.Parse(datetime.ToString("dd"));//閭ｄ竴澶�
+ hour = int.Parse(datetime.ToString("HH"));//灏忔椂
minute = datetime.Minute;//鍒嗛挓
+ timeLong = 0;
}
else
{
+
+
///璇诲彇绯荤粺鏃堕棿
year = DateTime.Now.Year.ToString();//閭ｄ竴骞�
month = DateTime.Now.Month.ToString();//閭ｄ竴鏈�
var d = DateTime.Now.ToString("dd");//閭ｄ竴澶�
@@ -421,12 +421,13 @@
modeFl.AddChidren(clickBtn);
clickBtn.MouseUpEventHandler += (sender, e) =>
{
-
+
LogicView.TipView.ShowConfrimTip(() =>
{///鍐嶆纭
LogicView.TipView.ShowInputTip(true, async (str) =>
{///纭鍙戦�佸懡浠�
+
CommonPage.Loading.Start();
try
{
--
Gitblit v1.8.0