2020-12-01-1

陈嘉乐

2020-12-01 307e554fb2ef6491d08afc58a6c0a852f44b4f46

 HDL_ON/UI/UI2/3-Intelligence/Automation/DeviceFunList.cs

File was renamed from HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/DeviceFunList.cs
@@ -37,6 +37,8 @@
            List<Dictionary<string, string>> dicSateteList = new List<Dictionary<string, string>>();
            //定义一个变量，记录选中状态
            string selectedState = "unknown";
            //定义一个变量，记录选中状态记录属性
            string keyVlaue = "";
            switch (device.functionType)
            {
                //开关灯光
@@ -98,16 +100,31 @@
                            switchView.frameLayout.AddChidren(btnOff);

                            Dictionary<string, string> dic = new Dictionary<string, string>();
                            LogicMethod.dictionary(dic, "key", "on_off");
                            LogicMethod.dictionary(dic, "comparator", "=");
                            LogicMethod.dictionary(dic, "data_type", "string");
                            switch (if_type)
                            {
                                case LogicMethod.condition_if:
                                    {
                                        LogicMethod.dictionary(dic, "key", "on_off");
                                        LogicMethod.dictionary(dic, "comparator", "=");
                                        LogicMethod.dictionary(dic, "data_type", "string");
                                        keyVlaue = "on_off";
                                    }
                                    break;
                                case LogicMethod.target_if:
                                    {
                                        LogicMethod.dictionary(dic, "key", "on_off");
                                        keyVlaue = "on_off";
                                    }
                                    break;
                            }

                            btnOn.MouseUpEventHandler += (sender2, e2) =>
                            {
                                LogicMethod.dictionary(dic, "value", "on");
                                RemView(relayFunView);
                                relayView.btnState.TextID = StringId.onLogic;
                                selectedState = device.functionType + "_on";
                                AddDictionaryData(dicSateteList, "on_off", dic);
                                AddDictionaryData(dicSateteList, keyVlaue, dic);
                            };
                            btnOff.MouseUpEventHandler += (sender3, e3) =>
                            {
@@ -115,7 +132,7 @@
                                RemView(relayFunView);
                                relayView.btnState.TextID = StringId.offLogic;
                                selectedState = device.functionType + "_off";
                                AddDictionaryData(dicSateteList, "on_off", dic);
                                AddDictionaryData(dicSateteList, keyVlaue, dic);
                            };

                            if (relayView.btnState.Text != "")