2020-12-03-3

陈嘉乐

2020-12-03 3037541d683de2f9dd775870055d244ba15839f2

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

@@ -188,6 +188,8 @@
                            targetView.btnText.Text = device.name;
                            //改变设备名称显示控件宽度
                            targetView.btnText.Width = Application.GetRealWidth(80);
                            //第一个变量显示状态值
                            string stateStr = "";
                            //区别不同设备，显示不同设备状态
                            switch (device.functionType)
                            {
@@ -199,12 +201,48 @@
                                            string value = dic["value"];
                                            if (value == "on")
                                            {
                                                targetView.btnState.Text = Language.StringByID(StringId.onLogic);
                                                stateStr = Language.StringByID(StringId.onLogic);

                                            }
                                            else
                                            {
                                                targetView.btnState.Text = Language.StringByID(StringId.offLogic);
                                                stateStr = Language.StringByID(StringId.offLogic);
                                            }
                                        }
                                        targetView.btnState.Text = stateStr;
                                    }
                                    break;
                                case FunctionType.Dimmer:
                                    {
                                        bool _if = false;
                                        foreach (var dic in dicList)
                                        {

                                            if (dic["key"] == "on_off")
                                            {
                                                string value = dic["value"];
                                                if (value == "on")
                                                {
                                                    targetView.btnState.Text = Language.StringByID(StringId.onLogic);
                                                    _if = false;
                                                }
                                                else
                                                {
                                                    targetView.btnState.Text = Language.StringByID(StringId.offLogic);
                                                    _if = true;
                                                }
                                            }

                                        }
                                        foreach (var dic in dicList)
                                        {
                                            if (dic["key"] == "brightness")
                                            {
                                                string value = dic["value"];
                                                if (!_if)
                                                {
                                                    targetView.btnState.Text += value;
                                                }
                                            }
                                        }
                                    }