2020-04-02-1

WJC

2020-04-02 01766e8a9461f412012eac532f5e60693b3ef7ad

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

@@ -13,7 +13,7 @@
        /// <summary>
        /// 其它界面跳进来的入口
        /// </summary>
        public static void SkipAddLogic(int intvalue,UserCenter.MemberInfoRes accountObj = null,DoorLock doorLock=null)
        public static void SkipAddLogic(int intvalue,DoorLock doorLock=null,UserCenter.MemberInfoRes accountObj = null)
        {
            /// 0.正常自动化;1.门锁自动化;2.门锁常开.关;
            switch (intvalue)
@@ -56,22 +56,50 @@
                        doorLockLogicList.Show();
                    } break;
                case 2: {
                        ///进来刷新一次设备列表；

                        Common.Logic.LogicDviceList.Clear();

                        if (Common.Logic.LogicDviceList.Count == 0)

                        {

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

                        Common.Logic.LogicDviceList.Clear();
                        if (Common.Logic.LogicDviceList.Count == 0)
                        {
                            Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
                        }
                        int h =int.Parse(DateTime.Now.ToString("hh"));
                        int m = int.Parse(DateTime.Now.ToString("mm"));
                        //默认一个时间段(开始时间为:系统当前，结束时间为:开始时间+1个时间)
                        Dictionary<string, string> timeDictionary = new Dictionary<string, string>();
                        timeDictionary.Add("Type", "5");
                        timeDictionary.Add("IsValid", "1");
                        timeDictionary.Add("StartHour", h.ToString());
                        timeDictionary.Add("StartMin", m.ToString());
                        if (h + 1 == 24)
                        {
                            //结束时间超出24小时处理方法;
                            timeDictionary.Add("StopHour", h.ToString());
                            timeDictionary.Add("StopMin", "59");
                        }
                        else
                        {
                            timeDictionary.Add("StopHour", (h + 1).ToString());
                            timeDictionary.Add("StopMin", m.ToString());
                        }
                        Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
                        actionsInfo.Add("LinkType", 8);
                        //actionsInfo.Add("DeviceAddr", doorLock.DeviceAddr);
                        //actionsInfo.Add("Epoint", doorLock.DeviceEpoint);
                        actionsInfo.Add("DeviceAddr","jtghkh123");
                        actionsInfo.Add("Epoint", "1");
                        actionsInfo.Add("PassData", "055704010112");//默认门锁常开
                  
                        //new一个新逻辑对象；
                        //新增门锁常开模式自动化入口；
                        Common.Logic.CurrentLogic = new Common.Logic();
                        Common.Logic.CurrentLogic.IsEnable = 1;//默认为开
                        Common.Logic.CurrentLogic.LogicType = 2;//标记逻辑类型
                        Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.openmode);
                        var logicCommunalPage = new LogicCommunalPage();
                        UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                        Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1);
                        Common.Logic.CurrentLogic.Conditions.Add(timeDictionary);//添加条件
                        Common.Logic.CurrentLogic.Actions.Add(actionsInfo);//添加目标
                        var oneLogic = new OneLogic();
                        UserView.HomePage.Instance.AddChidren(oneLogic);
                        UserView.HomePage.Instance.PageIndex += 1;
                        logicCommunalPage.Show(() => { });
                        oneLogic.Show(false);
                    } break;
            }

@@ -458,11 +486,20 @@
                edit.MouseUpEventHandler += (sender, e) =>
                {
                    Common.Logic.CurrentLogic = logic;
                    var logicCommunalPage = new LogicCommunalPage();
                    HomePage.Instance.AddChidren(logicCommunalPage);
                    HomePage.Instance.PageIndex += 1;
                    logicCommunalPage.Show(() => { logicnameBtn.Text = logic.LogicName; Automationview(refresview, no); });

                    if (Common.Logic.CurrentLogic.LogicType == 2)
                    {
                        var oneLogic = new OneLogic();
                        UserView.HomePage.Instance.AddChidren(oneLogic);
                        UserView.HomePage.Instance.PageIndex += 1;
                        oneLogic.Show(true);
                    }
                    else
                    {
                        var logicCommunalPage = new LogicCommunalPage();
                        HomePage.Instance.AddChidren(logicCommunalPage);
                        HomePage.Instance.PageIndex += 1;
                        logicCommunalPage.Show(() => { logicnameBtn.Text = logic.LogicName; Automationview(refresview, no); });
                    }
                };

                ///删除
@@ -658,14 +695,15 @@
        #endregion

        /// <summary>
        /// 门锁取消设置用的方法
        /// 门锁取消设置用的方法(相当一个关闭常开模式按钮,不需要显示该自动化)
        /// </summary>
        /// <param name="timeVlaue">时间值</param>
        /// <param name="common">设备</param>
        /// <returns></returns>
        public static void LockAddModifyLogic(int timeVlaue, CommonDevice common)
        {

            var h = DateTime.Now.ToString("hh");
            var m = DateTime.Now.ToString("mm");
            Dictionary<string, string> timeConditionsInfo = new Dictionary<string, string>();
            timeConditionsInfo.Add("Type", "0");
            timeConditionsInfo.Add("IsValid", "1");
@@ -673,18 +711,19 @@
            timeConditionsInfo.Add("RemindTime", "0");
            timeConditionsInfo.Add("EnDelay", "0");
            timeConditionsInfo.Add("DelayTime", "0"); 
            timeConditionsInfo.Add("StartHour", timeVlaue.ToString());
            timeConditionsInfo.Add("StartMin", "0");
            timeConditionsInfo.Add("StartHour", h);
            timeConditionsInfo.Add("StartMin", m);
            timeConditionsInfo.Add("DoorLockOpenDelayTime", timeVlaue.ToString());
            Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
            actionsInfo.Add("LinkType", 8);
            actionsInfo.Add("DeviceAddr", common.DeviceAddr);
            actionsInfo.Add("Epoint", common.DeviceEpoint);
            actionsInfo.Add("PassData", "055704010112");//默认门锁常开
            actionsInfo.Add("PassData", "055704010113");//默认门锁常关

            Common.Logic currentLogic = new Common.Logic();
            currentLogic.IsEnable = 1;//默认为开
            currentLogic.TimeAttribute.Repeat = 0;//执行一次
            currentLogic.LogicType = 2;//标记逻辑类型
            currentLogic.LogicType = 3;//标记逻辑类型
            currentLogic.LogicName = Language.StringByID(R.MyInternationalizationString.openmode);
            currentLogic.Conditions.Add(timeConditionsInfo);
            currentLogic.Actions.Add(actionsInfo);