From 4e78c9c795dff269ebea37f4e7572d8c8b7d4a69 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 20 五月 2020 15:14:17 +0800
Subject: [PATCH] 请合并门锁最新代码【1、优化门锁常开模式推送和增加机械门锁开锁功能；2、优化面板调光目标】
---
ZigbeeApp20200519/Shared/Phone/Device/Logic/SkipView.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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..57e405f
--- 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>
/// 鑷姩鍖栧姛鑳戒唬鐮佸叆鍙�
@@ -315,14 +315,14 @@
Automationview(logicScrolView, no);
CommonPage.Loading.Hide();
}
- static RowLayout selectedRow = new RowLayout() { Tag = "0" };//璁板綍宸︽粦鐘舵��
+ //static RowLayout selectedRow = new RowLayout() { Tag = "0" };//璁板綍宸︽粦鐘舵��
/// <summary>
/// 鍔犺浇鑷姩鍖栧垪琛ㄧ晫闈�
/// </summary>
/// <param name="refresview">Refresview.</param>
private static async void Automationview(VerticalRefreshLayout refresview, bool no)
{
-
+
refresview.RemoveAll();
if (Common.Logic.LogicList.Count == 0 && no == false)
{
@@ -400,18 +400,18 @@
//宸︽粦鑿滃崟浜嬩欢
logicRowlayout.OpenMenuAction += () =>
{
- if (selectedRow.Tag.ToString() != logicRowlayout.Tag.ToString())
- { //淇濈暀宸︽粦鍙湁涓�涓�;
- selectedRow.HideMenu();//
- }
- selectedRow = logicRowlayout;
+ //if (selectedRow.Tag.ToString() != logicRowlayout.Tag.ToString())
+ //{ //淇濈暀宸︽粦鍙湁涓�涓�;
+ // selectedRow.HideMenu();//
+ //}
+ //selectedRow = logicRowlayout;
};
if (i == 1)
{
//瀹炵幇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