2020-05-18-2

陈嘉乐

2020-05-18 5da99fed2eb0d08b6338064da5f998891252c7b8

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

old mode 100755
new mode 100644
@@ -684,7 +684,7 @@
                            DoorLockCommonInfo.NormallyOpenModeValue(doorLock, tempRes);
                            Application.RunOnMainThread(async () =>
                            {
                                var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(2);
                                var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
                                if (resTemp == 1)
                                {
                                    HaveLogicNormallyOpenMode = true;
@@ -770,6 +770,7 @@
        /// </summary>
        public void ClickHandle()
        {
          
            //门锁标题
            btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);

@@ -1024,18 +1025,17 @@
        /// </summary>
        private async void NomallyOpenDialog()
        {
            #region 后续版本
            //if (UserCenterResourse.UserInfo.AuthorityNo != 1)
            //{
            //    this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
            //    return;
            //}
            if (UserCenterResourse.UserInfo.AuthorityNo != 1)
            {
                this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
                return;
            }

            //if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
            //{
            //    SystemSecondAuthentication();
            //    return;
            //}
            if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
            {
                SystemSecondAuthentication();
                return;
            }

            action = () =>
            {
@@ -1052,20 +1052,21 @@
                if (Common.Logic.LogicDviceList.Count == 0)

                {

                    Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());

                }

                var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList();

                UserView.HomePage.Instance.AddChidren(addLogicPage);

                UserView.HomePage.Instance.PageIndex += 1;

                addLogicPage.Show();

                addLogicPage.action += (w) =>

                {

                    doorLock.IsDoorLockNormallyMode = w;

                }
            
                var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList();
                UserView.HomePage.Instance.AddChidren(addLogicPage);
                UserView.HomePage.Instance.PageIndex += 1;
                addLogicPage.Show();
                addLogicPage.action += (w) =>
                {
                    doorLock.IsDoorLockNormallyMode = w;
                    ///留给徐梅用的

                    UpdateNomallyOpenStatus();

                };

                    UpdateNomallyOpenStatus();
                };

            };

            //HdlCheckLogic.Current.CheckSecondarySecurity(action);

            #endregion
            HdlCheckLogic.Current.CheckSecondarySecurity(action);





        }
@@ -1103,7 +1104,7 @@
                    //删除已经失效的“常开模式”的逻辑
                    if (HaveLogicNormallyOpenMode)
                    {
                        var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
                        var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
                        //if (resTemp == 3)
                        //{
                        //    string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed);
@@ -1131,7 +1132,7 @@
                    //先删除已失效的“常开模式”的逻辑
                    if (HaveLogicNormallyOpenMode)
                    {
                        var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
                        var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
                        //if (resTemp == 3)
                        //{
                        //    string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed2);
@@ -1208,7 +1209,7 @@
                    //删除已经失效的“常开模式”的逻辑
                    if (HaveLogicNormallyOpenMode)
                    {
                        var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
                        var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
                        //if (resTemp == 3)
                        //{
                        //    string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed);
@@ -1247,7 +1248,7 @@
                        //删除设置常开模式创建的逻辑
                        if (HaveLogicNormallyOpenMode)
                        {
                            var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
                            var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
                            //因为目前机制问题，逻辑经常失败，所以不提示，后期机制要改，重新做一个这个界面
                            //if (resTemp == 3)
                            //{
@@ -1320,7 +1321,7 @@
                 DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;
                 //默认创建常开模式的特殊逻辑 
                 var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
                 if (!res)
                 if (res==0)
                 {
                     //默认创建常开模式失败
                     string msg0 = Language.StringByID(R.MyInternationalizationString.AddLogicNormallyModeFailed);