From 2fc1b7cbf8ae63ebc4b92fde4203317b7f3e0f33 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 21 五月 2020 11:33:49 +0800
Subject: [PATCH] 2020-5-21-1
---
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index 431837d..4e0ee88 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -13,13 +13,14 @@
/// <summary>
/// 鍏跺畠鐣岄潰璺宠繘鏉ョ殑鍏ュ彛
/// </summary>
- public static void SkipAddLogic(int intvalue, DoorLock doorLock = null, UserCenter.MemberInfoRes accountObj = null)
+ public async static void SkipAddLogic(int intvalue, DoorLock doorLock = null, UserCenter.MemberInfoRes accountObj = null)
{
/// 0.姝ｅ父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�;2.Sone闂ㄩ攣;
switch (intvalue)
{
case 0:
{
+
//new涓�涓柊閫昏緫瀵硅薄锛�
//鏂板姝ｅ父鑷姩鍖栧叆鍙�
Common.Logic.CurrentLogic = new Common.Logic();
@@ -60,7 +61,7 @@
doorLockLogicList.Show();
}
break;
-
+
}
}
@@ -240,7 +241,7 @@
};
//涓嬫媺鍒锋柊鑷姩鍖栧垪琛ㄧ殑浜嬩欢
logicScrolView.BeginHeaderRefreshingAction += () =>
- {
+ {
if (!Config.Instance.Home.IsVirtually)
{//铏氭嫙鐨勪笉鑾峰彇缃戝叧閫昏緫鍒楄〃
//閲嶆柊鍒锋柊logic鍒楄〃
@@ -716,17 +717,26 @@
timeConditionsInfo.Add("EnDelay", "0");
timeConditionsInfo.Add("DelayTime", "0");
timeConditionsInfo.Add("StartHour", h);
- timeConditionsInfo.Add("StartMin", m);
- timeConditionsInfo.Add("DoorLockOpenDelayTime", timeVlaue.ToString());
+ timeConditionsInfo.Add("StartMin", m);
+ if (UserCenter.UserCenterResourse.HideOption.DoorLockNomallyOpenTimeMode == 1)
+ {
+ //寮哄埗鍙樻洿鏃堕棿妯″紡涓哄垎閽�
+ timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 60).ToString());
+ }
+ else
+ {
+ timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 3600).ToString());
+ }
Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
actionsInfo.Add("LinkType", 8);
actionsInfo.Add("DeviceAddr", common.DeviceAddr);
- actionsInfo.Add("Epoint", common.DeviceEpoint);
+ actionsInfo.Add("Epoint", "200");
actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
Dictionary<string, string> accounts = new Dictionary<string, string>();
- accounts.Add("DeviceAddr", common.DeviceAddr.ToString());//鐢ㄤ簬鍒ゆ柇璇嗗埆鏄摢涓棬閿�;
- accounts.Add("Epoint", common.DeviceEpoint.ToString());
+ accounts.Add("Type", "8");
+ accounts.Add("Option4", common.DeviceAddr.ToString());//鐢ㄤ簬鍒ゆ柇璇嗗埆鏄摢涓棬閿�;
+ accounts.Add("Option2", common.DeviceEpoint.ToString());
Common.Logic currentLogic = new Common.Logic();
currentLogic.IsEnable = 1;//榛樿涓哄紑
@@ -752,7 +762,7 @@
/// 娉ㄦ剰(鍙傛暟:2-甯稿紑鑷姩鍖�;3-澶辨晥鏃堕棿鑷姩鍖�);
/// 杩斿洖鍊硷細0涓嶅瓨鍦�;鍏跺畠鍊奸兘瀛樺湪;
/// </summary>
- public static async System.Threading.Tasks.Task<int> Exist(int valueInt)
+ public static async System.Threading.Tasks.Task<int> Exist(int valueInt, ZigBee.Device.DoorLock doorLock)
{
int exist = 0;
var Idlist = await Send.GetLogicId(valueInt);
@@ -769,7 +779,7 @@
var logic = await Send.GetLogic(id, 3);
if (logic != null)
{
- if (ExistLogic(logic))
+ if (ExistLogic(logic, doorLock))
{
exist = id;
}
@@ -787,7 +797,7 @@
///鑾峰彇闂ㄩ攣閫昏緫淇℃伅
/// 杩斿洖鍊硷細null涓嶅瓨鍦�;鍏跺畠鍊奸兘瀛樺湪;
/// </summary>
- public static async System.Threading.Tasks.Task<Common.Logic> GetLogicIfon()
+ public static async System.Threading.Tasks.Task<Common.Logic> GetLogicIfon(ZigBee.Device.DoorLock doorLock)
{
Common.Logic logic = null;
var Idlist = await Send.GetLogicId(3);
@@ -796,7 +806,7 @@
//榛樿鍙栫涓�涓�昏緫ID(鏃舵晥鎬у彧鏈変竴鏉￠�昏緫)
int exist = Idlist[0];
logic = await Send.GetLogic(exist, 3);
- if (!ExistLogic(logic))
+ if (!ExistLogic(logic, doorLock))
{
logic = null;
}
@@ -808,7 +818,7 @@
///鍒犻櫎璇ラ棬閿佹墍鏈夋椂鏁堟�ц嚜鍔ㄥ寲
/// 杩斿洖鍊硷細true鎴愬姛;false澶辫触;
/// </summary>
- public static async System.Threading.Tasks.Task<bool> GetLogicAll()
+ public static async System.Threading.Tasks.Task<bool> GetLogicAll(ZigBee.Device.DoorLock doorLock)
{
bool _if = false;
var Idlist = await Send.GetLogicId(3);
@@ -822,7 +832,7 @@
var logic = await Send.GetLogic(id, 3);
if (logic != null)
{
- if (ExistLogic(logic))
+ if (ExistLogic(logic, doorLock))
{
//鏈潵鍙湁涓�鏉℃椂鏁堟�ц嚜鍔ㄥ寲锛�
//闃叉鐗规畩鎯呭喌,鎵惧埌灏卞垹闄ゆ帀;
@@ -838,24 +848,20 @@
/// 鏌ユ壘杩欎竴鏉¤嚜鍔ㄥ寲鏄惁灞炰簬璇ラ棬閿�
/// </summary>
/// <returns></returns>
- public static bool ExistLogic(Common.Logic logic)
+ public static bool ExistLogic(Common.Logic logic, ZigBee.Device.DoorLock doorLock)
{
- bool yes = false;
for (int j = 0; j < logic.Accounts.Count; j++)
{
//Option4鏄澶噈ac锛汷ption2鏄澶囩鍙ｏ紱
- if (logic.Accounts[j]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[j]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
+ if (logic.Accounts[j]["Option4"].ToString() == doorLock.DeviceAddr)
{
//鏌ユ壘鏄惁鏄偅涓棬閿侊紱
//濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
- yes = false;
+ return true;
}
- else
- {
- yes = true;
- }
+
}
- return yes;
+ return false;
}
}
--
Gitblit v1.8.0