2020-5-21-1

陈嘉乐

2020-05-21 2fc1b7cbf8ae63ebc4b92fde4203317b7f3e0f33

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

@@ -13,13 +13,14 @@
        /// <summary>
        /// 其它界面跳进来的入口
        /// </summary>
        public static void SkipAddLogic(int intvalue, DoorLock doorLock = null, UserCenter.MemberInfoRes accountObj = null)
        public async static void SkipAddLogic(int intvalue, DoorLock doorLock = null, UserCenter.MemberInfoRes accountObj = null) 
        {
            /// 0.正常自动化;1.门锁自动化;2.Sone门锁;
            switch (intvalue)
            {
                case 0:
                    {

                        //new一个新逻辑对象；
                        //新增正常自动化入口
                        Common.Logic.CurrentLogic = new Common.Logic();
@@ -60,7 +61,7 @@
                        doorLockLogicList.Show();
                    }
                    break;
              

            }

        }
@@ -240,7 +241,7 @@
            };
            //下拉刷新自动化列表的事件
            logicScrolView.BeginHeaderRefreshingAction += () =>
            {
            {

                if (!Config.Instance.Home.IsVirtually)
                {//虚拟的不获取网关逻辑列表
                    //重新刷新logic列表
@@ -716,9 +717,16 @@
            timeConditionsInfo.Add("EnDelay", "0");
            timeConditionsInfo.Add("DelayTime", "0");
            timeConditionsInfo.Add("StartHour", h);
            timeConditionsInfo.Add("StartMin", m);
            timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue*60*60).ToString());
            //timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 3600).ToString());
            timeConditionsInfo.Add("StartMin", m);

            if (UserCenter.UserCenterResourse.HideOption.DoorLockNomallyOpenTimeMode == 1)

            {

                //强制变更时间模式为分钟

                timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 60).ToString());

            }
            else

            {

                timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 3600).ToString());

            }
            Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
            actionsInfo.Add("LinkType", 8);
            actionsInfo.Add("DeviceAddr", common.DeviceAddr);