20200127-英文版处理

wei

2021-01-27 7232642ff48a7fbde2018cde652f3e771fa58025

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

@@ -37,7 +37,7 @@
        /// <summary>

        /// 渐变时间修改

        /// </summary>

        DiyImageSeekBar barFadeTime;

        //DiyImageSeekBar barFadeTime;

        /// <summary>

        /// 色温的滑动控件

        /// </summary>

@@ -141,9 +141,9 @@
            dimmerBar = new WaveSeekBarOn()

            {

                Gravity = Gravity.CenterHorizontal,

                Y = Application.GetRealHeight(74 + 16),

                Width = Application.GetRealWidth(142 - 40),

                Height = Application.GetRealHeight(222 - 16 - 16),

                Y = Application.GetRealHeight(108),

                Width = Application.GetRealWidth(142 - 16 -16),

                Height = Application.GetRealHeight(222),

                BorderColor = 0x00000000,

                CornerRadius = Application.GetRealWidth(20),

                BorderWidth = 0,

@@ -163,7 +163,7 @@
            btnBrightnessText = new Button()

            {

                Gravity = Gravity.CenterHorizontal,

                Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16 - 16) / 100) + Application.GetRealWidth(40),

                Y = ((100 - light.brightness) * Application.GetRealHeight(222  - 16) / 100) + Application.GetRealWidth(80),

                Width = Application.GetRealWidth(56),

                Height = Application.GetRealWidth(46),

                UnSelectedImagePath = "FunctionIcon/Light/BrightnessBg.png",

@@ -177,7 +177,7 @@
            //色温

            var btnTempClolor = new Button();

            btnTempClolor.X = Application.GetRealWidth(35);

            btnTempClolor.Y = Application.GetRealHeight(306);

            btnTempClolor.Y = Application.GetRealHeight(306 +60);

            btnTempClolor.Width = Application.GetRealWidth(224);

            btnTempClolor.Height = Application.GetRealHeight(21);

            btnTempClolor.TextAlignment = TextAlignment.CenterLeft;

@@ -218,6 +218,9 @@
            barColorTemplatrue.Y = btnTempClolorMin.Y - (barColorTemplatrue.Height - btnTempClolorMin.Height) / 2;

            //显示上方的Txt

            barColorTemplatrue.ShowCustomTextView(Application.GetRealWidth(50), CSS_FontSize.PromptFontSize_FirstLevel, CSS_Color.FirstLevelTitleColor);

            var cct = 27;
            int.TryParse(light.Attr_CCT.curValue.ToString(), out cct);

            barColorTemplatrue.Progress = cct;

            //设置初始值

            barColorTemplatrue.SetCustomText(barColorTemplatrue.Progress * 100 + "K");



@@ -239,71 +242,71 @@
            #endregion



            #region 渐变时间调节

            var btnGradualChangeText = new Button()

            {

                X = Application.GetRealWidth(35),

                Y = Application.GetRealHeight(385),

                Width = Application.GetRealWidth(224),

                Height = Application.GetRealHeight(21),

                TextAlignment = TextAlignment.CenterLeft,

                TextColor = CSS_Color.FirstLevelTitleColor,

                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,

                TextID = StringId.SpeedOfChange,

            };

            controlView.AddChidren(btnGradualChangeText);

            //var btnGradualChangeText = new Button()

            //{

            //    X = Application.GetRealWidth(35),

            //    Y = Application.GetRealHeight(385),

            //    Width = Application.GetRealWidth(224),

            //    Height = Application.GetRealHeight(21),

            //    TextAlignment = TextAlignment.CenterLeft,

            //    TextColor = CSS_Color.FirstLevelTitleColor,

            //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,

            //    TextID = StringId.SpeedOfChange,

            //};

            //controlView.AddChidren(btnGradualChangeText);



            var btnGradualChangeMinValuesText = new Button()

            {

                X = Application.GetRealWidth(35),

                Y = btnGradualChangeText.Bottom + Application.GetRealHeight(8),

                Width = Application.GetRealWidth(22),

                Height = Application.GetRealHeight(21),

                Text = "0s",

                TextAlignment = TextAlignment.CenterLeft,

                TextColor = CSS_Color.PromptingColor1,

                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,

            };

            controlView.AddChidren(btnGradualChangeMinValuesText);

            //var btnGradualChangeMinValuesText = new Button()

            //{

            //    X = Application.GetRealWidth(35),

            //    Y = btnGradualChangeText.Bottom + Application.GetRealHeight(8),

            //    Width = Application.GetRealWidth(22),

            //    Height = Application.GetRealHeight(21),

            //    Text = "0s",

            //    TextAlignment = TextAlignment.CenterLeft,

            //    TextColor = CSS_Color.PromptingColor1,

            //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,

            //};

            //controlView.AddChidren(btnGradualChangeMinValuesText);



            barFadeTime = new DiyImageSeekBar()

            {

                X = btnGradualChangeMinValuesText.Right,

                Y = Application.GetRealHeight(412 - 21) + Application.GetRealHeight(8),

                Width = Application.GetRealWidth(210),

                Height = Application.GetRealHeight(54),

                SeekBarViewHeight = Application.GetRealHeight(8),

                ThumbImagePath = "Public/ThumbImage.png",

                ThumbImageHeight = Application.GetRealHeight(54),

                ProgressBarColor = CSS_Color.MainColor,

                ProgressTextColor = CSS_Color.FirstLevelTitleColor,

                ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,

                ProgressBarUnitSring = "s",

                MaxValue = 10,

                Progress = light.fadeTime,

                SeekBarPadding = Application.GetRealWidth(20),

            };

            controlView.AddChidren(barFadeTime);

            //barFadeTime = new DiyImageSeekBar()

            //{

            //    X = btnGradualChangeMinValuesText.Right,

            //    Y = Application.GetRealHeight(412 - 21) + Application.GetRealHeight(8),

            //    Width = Application.GetRealWidth(210),

            //    Height = Application.GetRealHeight(54),

            //    SeekBarViewHeight = Application.GetRealHeight(8),

            //    ThumbImagePath = "Public/ThumbImage.png",

            //    ThumbImageHeight = Application.GetRealHeight(54),

            //    ProgressBarColor = CSS_Color.MainColor,

            //    ProgressTextColor = CSS_Color.FirstLevelTitleColor,

            //    ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,

            //    ProgressBarUnitSring = "s",

            //    MaxValue = 10,

            //    Progress = light.fadeTime,

            //    SeekBarPadding = Application.GetRealWidth(20),

            //};

            //controlView.AddChidren(barFadeTime);



            var btnGradualChangeMaxValuesText = new Button()

            {

                X = barFadeTime.Right,

                Y = btnGradualChangeText.Bottom + Application.GetRealHeight(8),

                Width = Application.GetRealWidth(35),

                Height = Application.GetRealHeight(21),

                Text = "10s",

                TextAlignment = TextAlignment.CenterLeft,

                TextColor = CSS_Color.PromptingColor1,

                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,

            };

            controlView.AddChidren(btnGradualChangeMaxValuesText);

            //var btnGradualChangeMaxValuesText = new Button()

            //{

            //    X = barFadeTime.Right,

            //    Y = btnGradualChangeText.Bottom + Application.GetRealHeight(8),

            //    Width = Application.GetRealWidth(35),

            //    Height = Application.GetRealHeight(21),

            //    Text = "10s",

            //    TextAlignment = TextAlignment.CenterLeft,

            //    TextColor = CSS_Color.PromptingColor1,

            //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,

            //};

            //controlView.AddChidren(btnGradualChangeMaxValuesText);

            #endregion



            btnSwitch = new Button()

            {

                X = Application.GetRealWidth(184),

                Y = Application.GetRealHeight(462),

                Width = Application.GetRealWidth(40),

                Height = Application.GetRealWidth(40),

                X = Application.GetRealWidth(180),

                Y = Application.GetRealHeight(466),

                Width = Application.GetRealWidth(32),

                Height = Application.GetRealWidth(32),

                UnSelectedImagePath = "Public/PowerClose.png",

                SelectedImagePath = "Public/PowerOpen.png",

                IsSelected = light.trait_on_off.curValue.ToString() == "on",

@@ -312,11 +315,11 @@


            //色温的快捷方式图标

            btnShortcut = new Button();

            btnShortcut.X = Application.GetRealWidth(104);

            btnShortcut.X = Application.GetRealWidth(116);

            btnShortcut.Y = btnSwitch.Y;

            btnShortcut.Width = Application.GetRealWidth(40);

            btnShortcut.Height = Application.GetRealWidth(40);

            btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/ColorTemperatrueQuick.png";

            btnShortcut.Width = Application.GetRealWidth(32);

            btnShortcut.Height = Application.GetRealWidth(32);

            btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/CozyIconOn.png";

            controlView.AddChidren(btnShortcut);

            btnShortcut.MouseUpEventHandler += (sender, e) =>

            {

@@ -396,6 +399,7 @@
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.CCT, light.Attr_CCT.curValue.ToString());

                DriverLayer.Control.Ins.SendWriteCommand(light, d);

                btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/CozyIconOn.png";

            };

            //温馨 2700k

            var btnCozy = new Button();

@@ -420,6 +424,7 @@
                DriverLayer.Control.Ins.SendWriteCommand(light, d); barColorTemplatrue.Progress = 27;

                barColorTemplatrue.SetCustomText(barColorTemplatrue.Progress * 100 + "K");

                frameBack.Close();

                btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/CozyIconOn.png";

            };



            //会客图标

@@ -440,6 +445,7 @@
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.CCT, light.Attr_CCT.curValue.ToString());

                DriverLayer.Control.Ins.SendWriteCommand(light, d);

                btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/MeetingGuestsIconOn.png";

            };



            //会客 3000k

@@ -463,6 +469,7 @@
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.CCT, light.Attr_CCT.curValue.ToString());

                DriverLayer.Control.Ins.SendWriteCommand(light, d);

                btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/MeetingGuestsIconOn.png";

            };



            //阅读图标

@@ -483,6 +490,7 @@
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.CCT, light.Attr_CCT.curValue.ToString());

                DriverLayer.Control.Ins.SendWriteCommand(light, d);

                btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/ReadIconOn.png";

            };

            //阅读 6500k

            var btnRead = new Button();

@@ -505,6 +513,7 @@
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.CCT, light.Attr_CCT.curValue.ToString());

                DriverLayer.Control.Ins.SendWriteCommand(light, d);

                btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/ReadIconOn.png";

            };
            btnCozy.IsSelected = false;
            btnCozyIcon.IsSelected = false;