2020-04-30

陈嘉乐

2020-04-30 ee888ab45a850245b1e1372375ba9040316086ab

 ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs

@@ -36,7 +36,7 @@
                        var addLogicPage = new SoneLogicList();
                        UserView.HomePage.Instance.AddChidren(addLogicPage);
                        UserView.HomePage.Instance.PageIndex += 1;
                        addLogicPage.Show();
                        addLogicPage.Show(()=> { },false);

                        ////new一个新逻辑对象；
                        ////新增正常自动化入口
@@ -78,28 +78,7 @@
                        doorLockLogicList.Show();
                    }
                    break;
                case 2:
                    {
                        ///Sone门锁主入口
                        if (doorLock == null)
                        {
                            ///防止抛异常
                            doorLock = new DoorLock();
                        }
                        Send.CurrentDoorLock = doorLock;
                        ///进来刷新一次设备列表；
                        Common.Logic.LogicDviceList.Clear();
                        if (Common.Logic.LogicDviceList.Count == 0)
                        {
                            Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
                        }
                        var addLogicPage = new SoneLogicList();
                        UserView.HomePage.Instance.AddChidren(addLogicPage);
                        UserView.HomePage.Instance.PageIndex += 1;
                        addLogicPage.Show();
                     
                    }
                    break;
              
            }

        }
@@ -716,7 +695,7 @@
        #endregion

        /// <summary>
        /// 门锁取消设置用的方法(相当一个关闭常开模式按钮,分类-自动化-不需要显示该自动化)
        /// 门锁失效设置用的方法(相当一个关闭常开模式按钮,分类-自动化-不需要显示该自动化)
        /// </summary>
        /// <param name="timeVlaue">时间值</param>
        /// <param name="common">设备</param>
@@ -818,7 +797,25 @@
            return _if;
        }

     
        /// <summary>
        /// 常开模式开关
        /// </summary>
        /// <returns></returns>
        public static async System.Threading.Tasks.Task<bool> OpenMode(bool _if, DoorLock doorLock)
        {
            var result = await doorLock.SetNormallyOpenModeFuncAsync(_if);
            
            if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
            {
                return false;
            }
            if (result.defaultControlResponseData.status == 0)
            {
                //app确认取消“常开模式”成功 
                return true;
            }
            return false;
        }
    }
}