From c2e6e14e8e68aca4f78f0fea028fc92ce15d3656 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 21 五月 2020 10:51:21 +0800
Subject: [PATCH] 请合并最新代码，调整了门锁推送功能
---
ZigbeeApp20200519/Shared/Phone/Device/Logic/SkipView.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp20200519/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp20200519/Shared/Phone/Device/Logic/SkipView.cs
old mode 100755
new mode 100644
index 852b7dc..270af1c
--- a/ZigbeeApp20200519/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp20200519/Shared/Phone/Device/Logic/SkipView.cs
@@ -8,7 +8,7 @@
namespace Shared.Phone.Device.Logic
{
- public class SkipView:FrameLayout
+ public class SkipView : FrameLayout
{
/// <summary>
/// 鍏跺畠鐣岄潰璺宠繘鏉ョ殑鍏ュ彛
@@ -60,12 +60,12 @@
doorLockLogicList.Show();
}
break;
-
+
}
}
-
+
#region 鈼� 鑷姩鍖朹_________________________
/// <summary>
/// 鑷姩鍖栧姛鑳戒唬鐮佸叆鍙�
@@ -322,7 +322,7 @@
/// <param name="refresview">Refresview.</param>
private static async void Automationview(VerticalRefreshLayout refresview, bool no)
{
-
+
refresview.RemoveAll();
if (Common.Logic.LogicList.Count == 0 && no == false)
{
@@ -411,7 +411,7 @@
//瀹炵幇android鏄剧ず閫昏緫鍒楄〃鐨勫渾瑙�;
fLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
logicRowlayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
-
+
}
i++;
var logicnameBtn = new Button
@@ -717,7 +717,7 @@
timeConditionsInfo.Add("DelayTime", "0");
timeConditionsInfo.Add("StartHour", h);
timeConditionsInfo.Add("StartMin", m);
- timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue*60*60).ToString());
+ timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 60).ToString());
//timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 3600).ToString());
Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
actionsInfo.Add("LinkType", 8);
--
Gitblit v1.8.0