From 2e7e5f9af5b32cfe1fc3c6ba40bf7eb984bbd0a4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 11 五月 2020 17:52:06 +0800
Subject: [PATCH] ???????
---
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index 432bf77..a86c900 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -242,8 +242,7 @@
logicScrolView.BeginHeaderRefreshingAction += () =>
{
if (!Config.Instance.Home.IsVirtually)
- {
- //铏氭嫙鐨勪笉鑾峰彇缃戝叧閫昏緫鍒楄〃
+ {//铏氭嫙鐨勪笉鑾峰彇缃戝叧閫昏緫鍒楄〃
//閲嶆柊鍒锋柊logic鍒楄〃
Common.Logic.LogicList.Clear();
Read(logicScrolView, no);
@@ -262,6 +261,14 @@
/// <param name="logicScrolView"></param>
private static async void Read(VerticalRefreshLayout logicScrolView, bool no)
{
+ //if (Config.Instance.HomeId != UserCenter.UserCenterResourse.AccountOption.OldHomeStringId)
+ //{
+ // //鍒囨崲浣忓畢娓呴櫎涔嬪墠缂撳瓨鏁版嵁;
+ // Common.Logic.LogicList.Clear();
+ // Common.Logic.LockLogicList.Clear();
+ // Common.Logic.SoneLogicList.Clear();
+ //}
+
CommonPage.Loading.Start();
try
{
@@ -696,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");
@@ -729,9 +736,9 @@
{
//娣诲姞闂ㄩ攣澶辨晥鏃堕棿鐨勫巻鍙茶褰�
UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog((DoorLock)common, 9003, timeVlaue.ToString());
- return true;//琛ㄧず娣诲姞鎴愬姛;
+ return logicIfon.LogicId;//琛ㄧず娣诲姞鎴愬姛;
}
- return false;//琛ㄧず娣诲姞澶辫触;
+ return 0;//琛ㄧず娣诲姞澶辫触;
}
@@ -752,7 +759,7 @@
}
return exist;
}
-
+
///<summary>
///鑾峰彇閫昏緫淇℃伅
/// 杩斿洖鍊硷細null涓嶅瓨鍦�;鍏跺畠鍊奸兘瀛樺湪;
@@ -792,7 +799,9 @@
}
return _if;
}
-
+
+
+
}
}
--
Gitblit v1.8.0