改版是门锁新功能需要给测试部的版本

xm

2020-05-13 edf7c324bea0556a3df9096dd41d668a9d41bf51

 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,6 +191,10 @@
                {
                    //上报“常开模式”已被取消，app默认了“常开模式”被取消 
                    DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
                    if (LogicAction != null)
                    {
                        LogicAction(false);
                    }
                    if (haveLogic)
                    {
                        //此处删除温居城的常开模式特殊逻辑
@@ -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,6 +291,10 @@
                if (doorLockMessType == DoorLockMessType.DeviceReport || doorLockMessType == DoorLockMessType.ServicePush)
                {
                    NormallyOpenModeValue(doorLock, false);
                    if (LogicAction != null)
                    {
                        LogicAction(false);
                    }
                    if (haveLogic)
                    {
                        //此处删除温居城的常开模式特殊逻辑
@@ -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
@@ -331,6 +355,10 @@
                            ShowTipMsg(msg2);
                            CommonPage.Loading.Hide();
                        });
                        if (LogicAction != null)
                        {
                            LogicAction(false);
                        }
                    }
                }
                action?.Invoke(doorLock.IsDoorLockNormallyMode);