From 446b27177064d14561d43e5ce33cde5d7df075c7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 五月 2020 17:53:36 +0800
Subject: [PATCH] 2020-05-11-2
---
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 39 ++++++++-------------------------------
1 files changed, 8 insertions(+), 31 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index 6d11569..b90af36 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -20,31 +20,6 @@
{
case 0:
{
- // if (doorLock == null)
- // {
- // ///闃叉鎶涘紓甯�
- // Send.CurrentDoorLock = new DoorLock();
- // }
- // ///澶囨敞锛歐JC鐨�
- //// Shared.Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
- // ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
- // Common.Logic.LogicDviceList.Clear();
- // if (Common.Logic.LogicDviceList.Count == 0)
- // {
- // Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
- // }
- // var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList();
- // UserView.HomePage.Instance.AddChidren(addLogicPage);
- // UserView.HomePage.Instance.PageIndex += 1;
- // addLogicPage.Show();
- // addLogicPage.action += (w) =>
- // {
- // //doorLock.IsDoorLockNormallyMode = w;
- // /////鐣欑粰寰愭鐢ㄧ殑
- // //UpdateNomallyOpenStatus();
- // };
-
-
//new涓�涓柊閫昏緫瀵硅薄锛�
//鏂板姝ｅ父鑷姩鍖栧叆鍙�
Common.Logic.CurrentLogic = new Common.Logic();
@@ -97,7 +72,7 @@
/// </summary>
public static void ShowAutotionView(FrameLayout functionSceneAutoBodyView)
{
- // functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+ //functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
#region ---鎺ㄨ崘妯℃澘鐨勭粍浠�
//鎺ㄨ崘妯℃澘鑳屾櫙鎺т欢
var bjFrameLayout = new FrameLayout
@@ -728,7 +703,7 @@
/// <param name="timeVlaue">鏃堕棿鍊�</param>
/// <param name="common">璁惧</param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<bool> LockAddModifyLogic(int timeVlaue, CommonDevice common)
+ public static async System.Threading.Tasks.Task<int> LockAddModifyLogic(int timeVlaue, CommonDevice common)
{
//璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
var h = DateTime.Now.ToString("HH");
@@ -761,9 +736,9 @@
{
//娣诲姞闂ㄩ攣澶辨晥鏃堕棿鐨勫巻鍙茶褰�
UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog((DoorLock)common, 9003, timeVlaue.ToString());
- return true;//琛ㄧず娣诲姞鎴愬姛;
+ return logicIfon.LogicId;//琛ㄧず娣诲姞鎴愬姛;
}
- return false;//琛ㄧず娣诲姞澶辫触;
+ return 0;//琛ㄧず娣诲姞澶辫触;
}
@@ -784,7 +759,7 @@
}
return exist;
}
-
+
///<summary>
///鑾峰彇閫昏緫淇℃伅
/// 杩斿洖鍊硷細null涓嶅瓨鍦�;鍏跺畠鍊奸兘瀛樺湪;
@@ -824,7 +799,9 @@
}
return _if;
}
-
+
+
+
}
}
--
Gitblit v1.8.0