2020-05-18-2

陈嘉乐

2020-05-18 5da99fed2eb0d08b6338064da5f998891252c7b8

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

old mode 100755
new mode 100644
@@ -13,7 +13,7 @@
        /// <summary>
        /// 更新“逻辑常开”界面的回调
        /// </summary>
        public static Action<bool> LogicAction = null;
        public static Action<bool> LogicAction= null;
        /// <summary>
        /// 网关（门锁）所在的时间
        /// </summary>
@@ -308,7 +308,7 @@
                        //删除设置常开模式创建的逻辑
                        if (haveLogic)
                        {
                            var resTemp1 = await Shared.Phone.Device.Logic.SkipView.Exist(3);
                            var resTemp1 = await Shared.Phone.Device.Logic.SkipView.Exist(3, doorLock);
                            //温居城方法？？？
                            //此处是否要删除温居城的特殊逻辑 
                        }
@@ -324,8 +324,8 @@
            };
        }

    
/// <summary>


        /// <summary>

        /// 删除常开模式

        /// </summary>

        /// <param name="doorLock">当前门锁</param>

@@ -349,10 +349,10 @@
                return true;

            }

            return false;

        }



      
         /// <summary>

        }


        /// <summary>

        /// 设置常开模式

        /// </summary>

        /// <param name="doorLock">当前门锁</param>

@@ -361,7 +361,7 @@
        public static async System.Threading.Tasks.Task<bool> SetNormallyOpenModeFuncAsync(ZigBee.Device.DoorLock doorLock)

        {

            //app设置“常开模式”失败 

            var result = await doorLock.SetNormallyOpenModeFuncAsync(false);

            var result = await doorLock.SetNormallyOpenModeFuncAsync(true);

            if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)

            {

                return false;

@@ -1220,6 +1220,7 @@
                var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
                contr.Show();
            });
          
        }

        #endregion