From c1de48884fa145a16a0f8bcee93274dcfaa0ff82 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 07 五月 2020 10:40:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 60 ++++++++++++++++++++++++++++++++----------------------------
1 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index ca15989..e358680 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -8,7 +8,7 @@
namespace Shared.Phone.Device.Logic
{
- public class SkipView
+ public class SkipView:FrameLayout
{
/// <summary>
/// 鍏跺畠鐣岄潰璺宠繘鏉ョ殑鍏ュ彛
@@ -20,8 +20,10 @@
{
case 0:
{
- //new涓�涓柊閫昏緫瀵硅薄锛�
- //鏂板姝ｅ父鑷姩鍖栧叆鍙�
+
+
+ ////new涓�涓柊閫昏緫瀵硅薄锛�
+ ////鏂板姝ｅ父鑷姩鍖栧叆鍙�
Common.Logic.CurrentLogic = new Common.Logic();
Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
Common.Logic.CurrentLogic.LogicType = 0;//鏍囪閫昏緫绫诲瀷
@@ -60,28 +62,7 @@
doorLockLogicList.Show();
}
break;
- case 2:
- {
- ///Sone闂ㄩ攣涓诲叆鍙�
- if (doorLock == null)
- {
- ///闃叉鎶涘紓甯�
- doorLock = new DoorLock();
- }
- Send.CurrentDoorLock = doorLock;
- ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
- Common.Logic.LogicDviceList.Clear();
- if (Common.Logic.LogicDviceList.Count == 0)
- {
- Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
- }
- var addLogicPage = new SoneLogicList();
- UserView.HomePage.Instance.AddChidren(addLogicPage);
- UserView.HomePage.Instance.PageIndex += 1;
- addLogicPage.Show();
-
- }
- break;
+
}
}
@@ -417,7 +398,7 @@
//瀹炵幇android鏄剧ず閫昏緫鍒楄〃鐨勫渾瑙�;
fLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
logicRowlayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
-
+
}
i++;
var logicnameBtn = new Button
@@ -698,7 +679,7 @@
#endregion
/// <summary>
- /// 闂ㄩ攣鍙栨秷璁剧疆鐢ㄧ殑鏂规硶(鐩稿綋涓�涓叧闂父寮�妯″紡鎸夐挳,鍒嗙被-鑷姩鍖�-涓嶉渶瑕佹樉绀鸿鑷姩鍖�)
+ /// 闂ㄩ攣澶辨晥璁剧疆鐢ㄧ殑鏂规硶(鐩稿綋涓�涓叧闂父寮�妯″紡鎸夐挳,鍒嗙被-鑷姩鍖�-涓嶉渶瑕佹樉绀鸿鑷姩鍖�)
/// </summary>
/// <param name="timeVlaue">鏃堕棿鍊�</param>
/// <param name="common">璁惧</param>
@@ -776,6 +757,29 @@
}
return logic;
}
+
+ ///<summary>
+ ///鍒犻櫎鎵�鏈夋椂鏁堟�ц嚜鍔ㄥ寲
+ /// 杩斿洖鍊硷細true鎴愬姛;false澶辫触;
+ /// </summary>
+ public static async System.Threading.Tasks.Task<bool> GetLogicAll()
+ {
+ bool _if = false;
+ var Idlist = await Send.GetLogicId(3);
+ if (Idlist.Count != 0)
+ {
+ _if = true;
+
+ for (int i = 0; i < Idlist.Count; i++)
+ {
+ int id = Idlist[i];
+ //鏈潵鍙湁涓�鏉℃椂鏁堟�ц嚜鍔ㄥ寲锛�
+ //闃叉鐗规畩鎯呭喌,鎵惧埌灏卞垹闄ゆ帀;
+ Send.DelLogic(id);
+ }
+ }
+ return _if;
+ }
+
}
}
-
--
Gitblit v1.8.0