20200127-英文版处理

wei

2021-01-27 7232642ff48a7fbde2018cde652f3e771fa58025

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

old mode 100755
new mode 100644
@@ -11,34 +11,51 @@
        /// </summary>
        public static void UpdataStates(Light uFunction)
        {
            Application.RunOnMainThread(() =>
            Application.RunOnMainThread((Action)(() =>
            {
                try
                {
                    if (bodyView == null)
                        return;
                    if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)
                    if (uFunction.spk == bodyView.light.spk && uFunction.sid == bodyView.light.sid)
                    {
                        if (!bodyView.onDimmerBar)

                        if (uFunction.trait_on_off.curValue.ToString() == "on")
                        {
                            bodyView.dimmerBar.Progress = uFunction.brightness;
                        }
                        //状态一样时,不再刷新视图
                        if (uFunction.trait_on_off.curValue.ToString() == "on" && bodyView.btnSwitch.IsSelected == false)
                        {
                            bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheel.png";
                            //解决部分安卓手机，刷新图片时会变小问题
                            if (bodyView.colorPicker.ColorImagePath != "FunctionIcon/Light/ColorWheel.png")
                            {
                                bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheel.png";
                            }
                            bodyView.dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
                            bodyView.btnSwitch.IsSelected = true;
                            bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.GetRGBcolor());
                            if (!bodyView.onDimmerBar)
                            {
                                bodyView.dimmerBar.Progress = uFunction.brightness;
                            }
                        }
                        //状态一样时,不再刷新视图
                        else if (uFunction.trait_on_off.curValue.ToString() == "off" && bodyView.btnSwitch.IsSelected == true)
                        {
                            bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
                            //解决部分安卓手机，刷新图片时会变小问题
                            if (bodyView.colorPicker.ColorImagePath != "FunctionIcon/Light/ColorWheelGray.png")
                            {
                                bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
                            }
                            //bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
                            bodyView.dimmerBar.ProgressBarColor = CSS.CSS_Color.PromptingColor2;
                            bodyView.btnSwitch.IsSelected = false;
                            //色盘的圆点隐藏
                            bodyView.btnWhiteRound.Visible = false;
                        }
                        bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.GetRGBcolor());
                        if (bodyView.light.GetRGBcolor() == 16777215 && bodyView.btnCurColor.BorderColor != 0x00000000)
                        {
                            bodyView.btnCurColor.BorderColor = CSS.CSS_Color.PromptingColor2;
                        }
                        else
                        {
                            bodyView.btnCurColor.BorderColor = 0x00000000;
                        }
                    }
                }
@@ -46,7 +63,7 @@
                {
                    MainPage.Log($"{bodyView.GetType().Name } UpdataStates error : {ex.Message}");
                }
            });
            }));
        }


@@ -62,7 +79,6 @@
            actionRefresh = () => {
                btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
                //light.SaveFunctionData(true);
            };
        }

@@ -90,7 +106,6 @@
                    light.SetRGBcolor(e2);
                    colorChangeTime = DateTime.Now;
                    btnCurColor.BackgroundColor = (uint)(0xFF000000 + light.GetRGBcolor());
                    //Control.Send(CommandType_A.write, this.light);
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.RGB, light.GetRGBcolorString());
                    Control.Ins.SendWriteCommand(light, d);
@@ -130,7 +145,7 @@
        {
            btnCollection.MouseUpEventHandler += (sender, e) => {
                btnCollection.IsSelected = light.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
                light.SaveFunctionData(true);
                light.CollectFunction();
            };
        }

@@ -144,7 +159,7 @@
            };
            dimmerBar.OnStopTrackingTouchEvent = (sender, e) => {
                new System.Threading.Thread(() => {
                    System.Threading.Thread.Sleep(100);
                    System.Threading.Thread.Sleep(200);
                    onDimmerBar = false;
                })
                { IsBackground = true }.Start();
@@ -155,41 +170,40 @@
                light.fadeTime = barFadeTime.Progress;
            };
            dimmerBar.OnProgressChangedEvent = (sender, e) => {
                light.fadeTime = 0;
                if (!btnSwitch.IsSelected)
                {
                    dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
                }
                btnSwitch.IsSelected = e > 0 ? true : false;
                light.brightness = e;
                light.trait_on_off.curValue = e > 0 ? "on" : "off";
                //light.fadeTime = 0;
                //if (!btnSwitch.IsSelected)
                //{
                //    dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
                //}
                //btnSwitch.IsSelected = e > 0 ? true : false;
                //light.brightness = e;
                //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(FunctionAttributeKey.Brightness, light.brightness.ToString());
                    Control.Ins.SendWriteCommand(light, d);
                }
                else
                {
                    if (200 < (DateTime.Now - light.refreshTime).TotalMilliseconds)
                    {
                        light.refreshTime = DateTime.Now;
                        new System.Threading.Thread(() =>
                        {
                            //Control.Send(CommandType_A.write, light);
                            System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                            d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
                            Control.Ins.SendWriteCommand(light, d);
                        })
                        { IsBackground = true }.Start();
                    }
                    else
                    {
                        MainPage.Log("skip dimmer control!!");
                    }
                }
                //if (e == 0 || e == 100)
                //{
                //    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                //    d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
                //    Control.Ins.SendWriteCommand(light, d);
                //}
                //else
                //{
                //    if (200 < (DateTime.Now - light.refreshTime).TotalMilliseconds)
                //    {
                //        light.refreshTime = DateTime.Now;
                //        new System.Threading.Thread(() =>
                //        {
                //            //Control.Send(CommandType_A.write, light);
                //            System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                //            d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
                //            Control.Ins.SendWriteCommand(light, d);
                //        })
                //        { IsBackground = true }.Start();
                //    }
                //    else
                //    {
                //        MainPage.Log("skip dimmer control!!");
                //    }
                //}
            };
        }

@@ -198,10 +212,10 @@
        /// </summary>
        void LoadEvet_ChangeFadeTime()
        {
            barFadeTime.MouseUpEventHandler = (sender, e) =>
            barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
            {
                light.fadeTime = barFadeTime.Progress;
                light.SaveFunctionData(true);
                light.UpdataFuncitonInfo();
            };
        }
        /// <summary>
@@ -213,13 +227,20 @@
            {
                btnSwitch.IsSelected = !btnSwitch.IsSelected;
                dimmerBar.ProgressBarColor = btnSwitch.IsSelected ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
                bodyView.colorPicker.ColorImagePath = btnSwitch.IsSelected ? "FunctionIcon/Light/ColorWheel.png" : "FunctionIcon/Light/ColorWheelGray.png";
                new System.Threading.Thread(() =>
                {
                    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(FunctionAttributeKey.OnOff, light.trait_on_off.curValue.ToString());
                    d.Add(FunctionAttributeKey.FadeTime, light.fadeTime.ToString());
                    if (btnSwitch.IsSelected)
                    {
                        if(light.lastBrightness == 0)
                        {
                            light.lastBrightness = 100;
                            dimmerBar.Progress = 100;
                        }
                        d.Add(FunctionAttributeKey.Brightness, light.lastBrightness.ToString());
                    }
                    else
@@ -238,8 +259,16 @@
        {
            btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
            {
                if(light.trait_on_off.curValue.ToString() == "off")
                {
                    return;
                }
                btnWhiteRound.Visible = true;
                btnWhiteRound.Gravity = Gravity.Center;

                light.SetRGBcolor(new byte[] { 255, 255, 255 });
                btnCurColor.BackgroundColor = 0xFFFFFFFF;
                btnCurColor.BorderColor = CSS.CSS_Color.PromptingColor2;
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.RGB, light.GetRGBcolorString());
                Control.Ins.SendWriteCommand(light, d);