2020-05-19-4

陈嘉乐

2020-05-19 0e0584b87851c56745bf73b1a961b80613dd0721

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs

old mode 100644
new mode 100755
@@ -13,7 +13,7 @@
        /// <summary>
        /// 更新“逻辑常开”界面的回调
        /// </summary>
        public static Action<bool> LogicAction= null;
        public static Action<bool> LogicAction = null;
        /// <summary>
        /// 网关（门锁）所在的时间
        /// </summary>
@@ -132,7 +132,7 @@
        /// 门锁是否支持常开[这里暂时只有S-One门锁支持，H06C不支持, 后期通过能力值支持]
        /// </summary>
        /// <param name="doorLock:当前门锁"></param> 
        /// <returns></returns> 
        /// <returns>true:支持常开；false： 不支持常开</returns> 
        public static bool CanNormallyOpen(ZigBee.Device.DoorLock doorLock)
        {
            var listDevice = new List<CommonDevice> { };
@@ -151,11 +151,6 @@
        public static void NormallyOpenModeValue(ZigBee.Device.DoorLock doorLock, bool value)
        {
            doorLock.IsDoorLockNormallyMode = value;

            if (LogicAction != null)
            {
                LogicAction(value);
            }
        }

        /// <summary>
@@ -165,7 +160,7 @@
        /// <param name="doorLockMessType">导致门锁失效的操作类型</param>
        /// <param name="haveLogic">网关中是否存在逻辑常开模式</param>
        /// <param name="action">回调处理更新内容</param>
        public static async void NomallyOpenModeInvalidDialog(ZigBee.Device.DoorLock doorLock, DoorLockMessType doorLockMessType, bool haveLogic, Action action = null)
        public static async void NomallyOpenModeInvalidDialog(ZigBee.Device.DoorLock doorLock, DoorLockMessType doorLockMessType, bool haveLogic, Action<bool> action = null)
        {
            //常开模式只能主人操作
            if (UserCenterResourse.UserInfo.AuthorityNo != 1)
@@ -196,13 +191,23 @@
                {
                    //上报“常开模式”已被取消，app默认了“常开模式”被取消 
                    DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
                    if (LogicAction != null)
                    {
                        LogicAction(false);
                    }
                    if (haveLogic)
                    {
                        //此处删除温居城的常开模式特殊逻辑
                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
                    }
                }
                else
                {
                    //保持常开
                    NormallyOpenModeValue(doorLock, true);
                }
                action?.Invoke();
                action?.Invoke(doorLock.IsDoorLockNormallyMode);
                action = null;
            };

            alert.CancelClickEvent += async () =>
@@ -212,8 +217,11 @@
                    //上报“常开模式”已被取消
                    Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });

                    //温居城方法？？？
                    //此处是否要删除温居城的特殊逻辑
                    if (haveLogic)
                    {
                        //此处删除温居城的常开模式特殊逻辑
                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
                    }

                    //app重新开启“常开模式”
                    var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
@@ -226,7 +234,12 @@
                            NormallyOpenModeValue(doorLock, false);
                            CommonPage.Loading.Hide();
                        });
                        action?.Invoke();
                        action?.Invoke(doorLock.IsDoorLockNormallyMode);
                        action = null;
                        if (LogicAction != null)
                        {
                            LogicAction(false);
                        }
                        return;
                    }
                    if (result.defaultControlResponseData.status != 0)
@@ -238,7 +251,13 @@
                            NormallyOpenModeValue(doorLock, false);
                            CommonPage.Loading.Hide();
                        });
                        action?.Invoke();

                        action?.Invoke(doorLock.IsDoorLockNormallyMode);
                        action = null;
                        if (LogicAction != null)
                        {
                            LogicAction(false);
                        }
                        return;
                    }
                    else
@@ -251,6 +270,10 @@
                            ShowTipMsg(msg0);
                            NormallyOpenModeValue(doorLock, true);
                            CommonPage.Loading.Hide();
                            if (LogicAction != null)
                            {
                                LogicAction(true);
                            }
                        });
                    }
                }
@@ -259,7 +282,8 @@
                    //app操作不取消“常开模式” 
                    DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
                }
                action?.Invoke();
                action?.Invoke(doorLock.IsDoorLockNormallyMode);
                action = null;
            };

            alert.ConfirmClickEvent += async () =>
@@ -267,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(doorLock);
                    }
                }
                else
@@ -285,7 +313,12 @@
                            ShowTipMsg(Language.StringByID(R.MyInternationalizationString.GwResponseOvertime));
                            CommonPage.Loading.Hide();
                        });
                        action?.Invoke();
                        action?.Invoke(doorLock.IsDoorLockNormallyMode);
                        action = null;
                        if (LogicAction != null)
                        {
                            LogicAction(false);
                        }
                        return;
                    }
                    if (result.defaultControlResponseData.status != 0)
@@ -296,7 +329,12 @@
                            ShowTipMsg(msg1);
                            CommonPage.Loading.Hide();
                        });
                        action?.Invoke();
                        action?.Invoke(doorLock.IsDoorLockNormallyMode);
                        action = null;
                        if (LogicAction != null)
                        {
                            LogicAction(false);
                        }
                        return;
                    }
                    else
@@ -308,9 +346,8 @@
                        //删除设置常开模式创建的逻辑
                        if (haveLogic)
                        {
                            var resTemp1 = await Shared.Phone.Device.Logic.SkipView.Exist(3, doorLock);
                            //温居城方法？？？
                            //此处是否要删除温居城的特殊逻辑 
                            //此处删除温居城的常开模式特殊逻辑
                            var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
                        }
                        Application.RunOnMainThread(() =>
                        {
@@ -318,12 +355,16 @@
                            ShowTipMsg(msg2);
                            CommonPage.Loading.Hide();
                        });
                        if (LogicAction != null)
                        {
                            LogicAction(false);
                        }
                    }
                }
                action?.Invoke();
                action?.Invoke(doorLock.IsDoorLockNormallyMode);
                action = null;
            };
        }


        /// <summary>

        /// 删除常开模式

@@ -349,9 +390,8 @@
                return true;

            }

            return false;

        }


        }



        /// <summary>

        /// 设置常开模式

        /// </summary>

@@ -375,6 +415,7 @@
            }

            return false;

        }

        /// <summary>
        /// 启动常开模式【弹窗】
        /// </summary>
@@ -1220,7 +1261,6 @@
                var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
                contr.Show();
            });
          
        }

        #endregion