2020-4-27-1

陈嘉乐

2020-04-27 18b93d511dc764b469d7c4a7e755f7274f89cdb4

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

old mode 100644
new mode 100755
@@ -101,7 +101,7 @@
            addconditionview.iconBtn.Visible = true;
            addconditionview.titleBtn.TextID = MyInternationalizationString.ifcondition;
            middle.AddChidren(addconditionview.AddDeviceView());
         

            ///添加条件的点击事件
            addconditionview.clickBtn.MouseUpEventHandler+= (sender, e) =>
            {
@@ -162,7 +162,6 @@
                    LogicView.AddDeviceView addflview = new LogicView.AddDeviceView();
                    addflview.titleBtn.TextID = MyInternationalizationString.addconditions;
                    middle.AddChidren(addflview.AddFl());
               
                    addflview.clickBtn.MouseUpEventHandler += (sender, e) =>
                    {
                        if (Common.Logic.CurrentLogic.Conditions.Count == 1)
@@ -500,16 +499,18 @@
                                                        s = "≤";
                                                    }
                                                    break;
                                            }
                                            }

                                            ///转换温度值/100

                                            string srtValue = (int.Parse(conditions["AttriButeData1"]) / 100).ToString();
                                            if (conditions["Cluster_ID"] == "1026")
                                            {
                                                icon = "ZigeeLogic/temperature.png";
                                                state = s + conditions["AttriButeData1"] + "℃";
                                                state = s + srtValue + "℃";
                                            }
                                            else
                                            {
                                                icon = "ZigeeLogic/humidity.png";
                                                state = s + conditions["AttriButeData1"] + "%";
                                                state = s + srtValue + "%";
                                            }
                                            break;

@@ -682,7 +683,6 @@
            addactionview.iconBtn.Visible = true;
            addactionview.titleBtn.TextID = MyInternationalizationString.execute;
            middle.AddChidren(addactionview.AddDeviceView());
           

            addactionview.clickBtn.MouseUpEventHandler+= (sender, e) =>
            {
@@ -695,8 +695,6 @@
            ListActions.AddRange(Common.Logic.CurrentLogic.Actions);
            ListActions.Add(new Dictionary<string, object>());

         

            for (int i = 0; i < ListActions.Count; i++)
            {
                if (i == (ListActions.Count - 1))
@@ -705,8 +703,6 @@
                    LogicView.AddDeviceView addflview = new LogicView.AddDeviceView();
                    addflview.titleBtn.TextID = MyInternationalizationString.addfunction;
                    middle.AddChidren(addflview.AddFl());


                    addflview.clickBtn.MouseUpEventHandler += (sender, e) =>
                    {
                        Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();