2020-12-1

陈嘉乐

2020-12-01 e08a444a9d7acea0cf39f50d22d29179f6a59292

 HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs

@@ -23,8 +23,8 @@
                        {
                            bodyView.dimmerBar.Progress = uFunction.brightness;
                        }
                        bodyView.dimmerBar.ProgressBarColor = uFunction.trait_on_off.value.ToString() == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
                        bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.value.ToString() == "on";
                        bodyView.dimmerBar.ProgressBarColor = uFunction.trait_on_off.curValue.ToString() == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
                        bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.curValue.ToString() == "on";
                        bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.redColor * 256 * 256 + bodyView.light.greenColor * 256 + bodyView.light.blueColor);
                    }
                }
@@ -48,6 +48,7 @@
            actionRefresh = () => {
                btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
                light.SaveFunctionData();
            };
        }

@@ -68,7 +69,7 @@
                    //Control.Send(CommandType_A.write, this.light);
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add("color", (light.redColor * 256 * 256 + light.greenColor * 256 + light.blueColor).ToString());
                    Control.ins.SendWriteCommand(light, d);
                    Control.Ins.SendWriteCommand(light, d);
                }
            };
            colorPicker.MouseUpEventHandler = (sender, e) =>
@@ -103,7 +104,7 @@
                light.brightness = dimmerBar.Progress;
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add("brightness", light.brightness.ToString());
                Control.ins.SendWriteCommand(light, d);
                Control.Ins.SendWriteCommand(light, d);
                light.fadeTime = barFadeTime.Progress;
                //Control.Send(CommandType_A.write, light);
            };
@@ -115,14 +116,14 @@
                }
                btnSwitch.IsSelected = e > 0 ? true : false;
                light.brightness = e;
                light.trait_on_off.value = e > 0 ? "on" : "off";
                light.trait_on_off.curValue = e > 0 ? "on" : "off";

                if (e == 0 || e == 100)
                {
                    //Control.Send(CommandType_A.write, this.light);
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add("brightness", light.brightness.ToString());
                    Control.ins.SendWriteCommand(light, d);
                    Control.Ins.SendWriteCommand(light, d);
                }
                else
                {
@@ -134,7 +135,7 @@
                            //Control.Send(CommandType_A.write, light);
                            System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                            d.Add("brightness", light.brightness.ToString());
                            Control.ins.SendWriteCommand(light, d);
                            Control.Ins.SendWriteCommand(light, d);
                        })
                        { IsBackground = true }.Start();
                    }
@@ -168,10 +169,10 @@
                dimmerBar.ProgressBarColor = btnSwitch.IsSelected ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
                new System.Threading.Thread(() =>
                {
                    light.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
                    light.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add("on_off", light.trait_on_off.value.ToString());
                    Control.ins.SendWriteCommand(light, d);
                    d.Add("on_off", light.trait_on_off.curValue.ToString());
                    Control.Ins.SendWriteCommand(light, d);
                })
                { IsBackground = true }.Start();
            };
@@ -187,7 +188,7 @@
                btnCurColor.BackgroundColor = 0xFFFFFFFF;
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add("color", "FFFFFF");
                Control.ins.SendWriteCommand(light, d);
                Control.Ins.SendWriteCommand(light, d);
            };
        }