上传一个合并的版本

黄学彪

2020-06-01 0bf9e65bc3ba98391e7835c922b15baab3c77876

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

@@ -16,7 +16,7 @@

        }
        Button selectedIcon = new Button();
        public void Show(CommonDevice common, string name, bool edit, int timevalue)
        public void Show(CommonDevice common, string name, bool edit, int timevalue,string _if)
        {

            #region  上面的布局代码
@@ -107,7 +107,7 @@
                        PickerView.ShowNormal(minuteList, secondList, null, (Index1, Index2, Index3) =>
                          {
                              selectetimedvalue = int.Parse(minuteList[Index1].Split(' ')[0]) * 60 + int.Parse(secondList[Index2].Split(' ')[0]);
                              TimeMethod(common, selectetimedvalue, timevalue, edit);
                              TimeMethod(common, selectetimedvalue, timevalue, edit, _if);
                          }, selectIndex1, selectIndex2, 0, Language.StringByID(MyInternationalizationString.logiccustom));
                    }
                    else
@@ -120,11 +120,11 @@

            saveView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {
                TimeMethod(common, selectetimedvalue, timevalue, edit);
                TimeMethod(common, selectetimedvalue, timevalue, edit,_if);
            };
        }

        public void TimeMethod(CommonDevice common, int selectetimedvalue, int timevalue, bool edit)
        public void TimeMethod(CommonDevice common, int selectetimedvalue, int timevalue, bool edit,string  _if)
        {

            var deviceConditionsInfo = new Dictionary<string, string>();
@@ -134,9 +134,9 @@
            deviceConditionsInfo.Add("Epoint", common.DeviceEpoint.ToString());
            deviceConditionsInfo.Add("Cluster_ID", "1280");
            deviceConditionsInfo.Add("AttriButeId", "1281");
            deviceConditionsInfo.Add("AttriButeData1", "0");
            deviceConditionsInfo.Add("AttriButeData1", "1");
            deviceConditionsInfo.Add("AttriButeData2", "0");
            deviceConditionsInfo.Add("Range", "1");
            deviceConditionsInfo.Add("Range", "5");
            if (selectetimedvalue != 0)
            {
                if (timevalue != selectetimedvalue)
@@ -163,10 +163,35 @@
                }

            }
            var logicCommunalPage = new LogicCommunalPage();
            UserView.HomePage.Instance.AddChidren(logicCommunalPage);
            UserView.HomePage.Instance.PageIndex += 1;
            logicCommunalPage.Show(() => { });

            switch (_if)
            {
                case "logic":
                    {
                        //自动化
                        var logicCommunalPage = new LogicCommunalPage();
                        UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                        UserView.HomePage.Instance.PageIndex += 1;
                        logicCommunalPage.Show(() => { });
                    }
                    break;
                case "mould":
                    {
                        //自动化推荐模板
                        var templatePage = new TemplatePage();
                        UserView.HomePage.Instance.AddChidren(templatePage);
                        UserView.HomePage.Instance.PageIndex += 1;
                        templatePage.Show();
                    }
                    break;

            }


            //var logicCommunalPage = new LogicCommunalPage();
            //UserView.HomePage.Instance.AddChidren(logicCommunalPage);
            //UserView.HomePage.Instance.PageIndex += 1;
            //logicCommunalPage.Show(() => { });

        }
    }