From 3f87bf0ae7394cdd7d52428f1f6b4361434c7cc4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 15 五月 2020 13:28:33 +0800
Subject: [PATCH] hhhhhhhhh

---
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs |   46 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index 449c8e2..9989e00 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -151,11 +151,6 @@
         public static void NormallyOpenModeValue(ZigBee.Device.DoorLock doorLock, bool value)
         {
             doorLock.IsDoorLockNormallyMode = value;
-
-            if (LogicAction != null)
-            {
-                LogicAction(value);
-            }
         }
 
         /// <summary>
@@ -196,10 +191,14 @@
                 {
                     //涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑堬紝app榛樿浜嗏�滃父寮�妯″紡鈥濊鍙栨秷 
                     DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
+                    if (LogicAction != null)
+                    {
+                        LogicAction(false);
+                    }
                     if (haveLogic)
                     {
                         //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
-                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
+                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
                     }
                 }
                 else
@@ -221,7 +220,7 @@
                     if (haveLogic)
                     {
                         //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
-                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
+                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
                     }
 
                     //app閲嶆柊寮�鍚�滃父寮�妯″紡鈥�
@@ -237,6 +236,10 @@
                         });
                         action?.Invoke(doorLock.IsDoorLockNormallyMode);
                         action = null;
+                        if (LogicAction != null)
+                        {
+                            LogicAction(false);
+                        }
                         return;
                     }
                     if (result.defaultControlResponseData.status != 0)
@@ -248,8 +251,13 @@
                             NormallyOpenModeValue(doorLock, false);
                             CommonPage.Loading.Hide();
                         });
+
                         action?.Invoke(doorLock.IsDoorLockNormallyMode);
                         action = null;
+                        if (LogicAction != null)
+                        {
+                            LogicAction(false);
+                        }
                         return;
                     }
                     else
@@ -262,6 +270,10 @@
                             ShowTipMsg(msg0);
                             NormallyOpenModeValue(doorLock, true);
                             CommonPage.Loading.Hide();
+                            if (LogicAction != null)
+                            {
+                                LogicAction(true);
+                            }
                         });
                     }
                 }
@@ -279,10 +291,14 @@
                 if (doorLockMessType == DoorLockMessType.DeviceReport || doorLockMessType == DoorLockMessType.ServicePush)
                 {
                     NormallyOpenModeValue(doorLock, false);
+                    if (LogicAction != null)
+                    {
+                        LogicAction(false);
+                    }
                     if (haveLogic)
                     {
                         //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
-                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
+                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
                     }
                 }
                 else
@@ -299,6 +315,10 @@
                         });
                         action?.Invoke(doorLock.IsDoorLockNormallyMode);
                         action = null;
+                        if (LogicAction != null)
+                        {
+                            LogicAction(false);
+                        }
                         return;
                     }
                     if (result.defaultControlResponseData.status != 0)
@@ -311,6 +331,10 @@
                         });
                         action?.Invoke(doorLock.IsDoorLockNormallyMode);
                         action = null;
+                        if (LogicAction != null)
+                        {
+                            LogicAction(false);
+                        }
                         return;
                     }
                     else
@@ -323,7 +347,7 @@
                         if (haveLogic)
                         {
                             //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
-                            var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
+                            var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
                         }
                         Application.RunOnMainThread(() =>
                         {
@@ -331,6 +355,10 @@
                             ShowTipMsg(msg2);
                             CommonPage.Loading.Hide();
                         });
+                        if (LogicAction != null)
+                        {
+                            LogicAction(false);
+                        }
                     }
                 }
                 action?.Invoke(doorLock.IsDoorLockNormallyMode);

--
Gitblit v1.8.0