20200127-英文版处理

wei

2021-01-27 7232642ff48a7fbde2018cde652f3e771fa58025

 HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs

@@ -25,7 +25,7 @@
        /// <summary>
        /// 空调温度控制控件
        /// </summary>
        ArcSeekBar arcBar;
        DiyArcSeekBar arcBar;
        /// <summary>
        /// 减号按钮
        /// </summary>
@@ -128,42 +128,54 @@
                Height = Application.GetMinRealAverage(40),
                SelectedImagePath = "Collection/CollectionIcon.png",
                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                IsSelected = fh.collection
                IsSelected = fh.collect
            };
            controlView.AddChidren(btnCollection);
            //controlView.AddChidren(btnCollection);
            //2020-12-16 如果是成员隐藏收藏功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            {
                controlView.AddChidren(btnCollection);
            }

            arcBar = new ArcSeekBar()
            arcBar = new DiyArcSeekBar()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(120),
                Width = Application.GetRealWidth(280),
                Height = Application.GetRealWidth(280),
                Angle = 160,
                ThumbColor = CSS_Color.AuxiliaryColor1,
                ThumbModeFill = true,
                ProgressBarColor = fh.on_off == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2,
                ThumbRadius = Application.GetRealWidth(12),
                ArcWidthWithDefaultStyle = Application.GetRealWidth(12),
                MinValue = 5,
                MaxValue = 35,
                Progress = fh.curTemp,
                ProgressBarUnitSring = "°C",
                IsClickable = true,
                ProgressTextColor = 0x00000000,
                OpenAngle = 160,
                ThumbImagePath = fh.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/FloorHeating/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
                ThumbImageHeight = Application.GetRealWidth(50),
                ProgressBarColor = CSS_Color.AuxiliaryColor1, // 0xFFFC9C04,
                OfflineProgressBarColor = CSS_Color.PromptingColor2,
                IsOffline = fh.trait_on_off.curValue.ToString() == "off",
                MinValue = fh.trait_temp.min,
                MaxValue = fh.trait_temp.max,
                //IsClickable = fh.trait_on_off.curValue.ToString() == "on",
                ArcColor = CSS_Color.BackgroundColor,
                Progress = Convert.ToInt32(fh.trait_temp.curValue),
#if __IOS__
                Y = Application.GetRealHeight(120+25),
                Width = Application.GetRealWidth(260-40),
                Height = Application.GetRealWidth(260-40),
                SeekBarPadding = Application.GetRealWidth(8),
#else
                Y = Application.GetRealHeight(120 + 40),
                Width = Application.GetRealWidth(260 - 40),
                Height = Application.GetRealWidth(260 - 40),
                SeekBarPadding = Application.GetRealWidth(7),
#endif

            };
            controlView.AddChidren(arcBar);

            btnTemp = new Button()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(206),
                Width = Application.GetRealWidth(71),
                Y = Application.GetRealHeight(200),
                Width = Application.GetRealWidth(80),
                Height = Application.GetRealWidth(60),
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = 56,
                IsBold = true,
                Text = fh.curTemp.ToString(),
                Text = fh.trait_temp.curValue.ToString(),
                TextAlignment = TextAlignment.Center,
            };
            controlView.AddChidren(btnTemp);
@@ -173,19 +185,19 @@
                X = btnTemp.Right,
                Y = btnTemp.Y,
                Width = Application.GetRealWidth(30),
                Height = Application.GetRealWidth(20),
                Height = Application.GetRealWidth(25),
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
                IsBold = true,
                TextAlignment = TextAlignment.CenterLeft,
                Text = "°C",
                Text = fh.tempUnitString
            };
            controlView.AddChidren(btnTempUint);

            btnIndoorTemp = new Button()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = btnTemp.Bottom,
                Y = btnTemp.Bottom+ Application.GetRealWidth(10),
                Width = Application.GetRealWidth(100),
                Height = Application.GetRealHeight(20),
                Text = Language.StringByID(StringId.IndoorTemp) + "20°C",
@@ -209,7 +221,7 @@
                X = Application.GetRealWidth(275),
                Y = Application.GetRealHeight(263),
                Width = Application.GetRealWidth(32),
                Height = Application.GetRealWidth(32),
               Height = Application.GetRealWidth(32),
                UnSelectedImagePath = "Public/PlusSignIcon.png",
            };
            controlView.AddChidren(btnPlus);
@@ -227,17 +239,22 @@
            btnSwitch = new Button()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(462),
                Width = Application.GetRealWidth(40),
                Height = Application.GetRealWidth(40),
                Y = Application.GetRealHeight(466),
                Width = Application.GetRealWidth(32),
                Height = Application.GetRealWidth(32),
                UnSelectedImagePath = "Public/PowerClose.png",
                SelectedImagePath = "Public/PowerOpen.png",
                IsSelected = fh.on_off == "on"
                IsSelected = fh.trait_on_off.curValue.ToString() == "on"
            };
            controlView.AddChidren(btnSwitch);

            LoadEventList();
            new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(fh, actionRefresh);
            new TopViewDiv(bodyView, Language.StringByID(StringId.FloorHeating)).LoadTopView_FunctionTop(fh, actionRefresh);
            new System.Threading.Thread(() =>
            {
                DriverLayer.Control.Ins.SendReadCommand(fh);
            })
            { IsBackground = true }.Start();
        }
        /// <summary>
        /// 加载修改模式区域
@@ -260,7 +277,6 @@
                Width = Application.GetRealWidth(160),
                Height = Application.GetRealHeight(287),
                BackgroundImagePath = "FunctionIcon/AC/DivBg1.png",
                Animate = Animate.DownToUp,
            };
            dialogView.AddChidren(modeChangeView);

@@ -288,28 +304,28 @@
            };
            modeChangeView.AddChidren(btnLine);

            foreach (var m in fh.modeList)
            foreach (var m in fh.trait_mode.value)
            {
                Button btnModeIcon = new Button()
                {
                    X = btnTitle.X,
                    Y = Application.GetRealHeight(44 * (fh.modeList.IndexOf(m) + 1) + 10 + 8),
                    Y = Application.GetRealHeight(44 * (fh.trait_mode.value.IndexOf(m) + 1) + 10 + 8),
                    Width = Application.GetRealWidth(24),
                    Height = Application.GetRealWidth(24),
                    IsSelected = fh.curMode == m,
                    IsSelected = fh.trait_mode.curValue.ToString() == m,
                };
                modeChangeView.AddChidren(btnModeIcon);

                Button btnModeText = new Button()
                {
                    X = Application.GetRealWidth(12) + btnModeIcon.Right,
                    Y = Application.GetRealHeight(44 * (fh.modeList.IndexOf(m) + 1) + 8),
                    Y = Application.GetRealHeight(44 * (fh.trait_mode.value.IndexOf(m) + 1) + 8),
                    Height = Application.GetRealHeight(44),
                    Width = Application.GetRealWidth(70),
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    SelectedTextColor = CSS_Color.MainColor,
                    IsSelected = fh.curMode == m,
                    IsSelected = fh.trait_mode.curValue.ToString() == m,
                };
                modeChangeView.AddChidren(btnModeText);

@@ -335,14 +351,14 @@
                        btnModeIcon.UnSelectedImagePath = "FunctionIcon/AC/AutoIconGray.png";
                        btnModeText.TextID = StringId.Auto;
                        break;
                    case "ordinary":
                    case "normal":
                        btnModeIcon.SelectedImagePath = "FunctionIcon/FloorHeating/OrdinaryIcon.png";
                        btnModeIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/OrdinaryIconGray.png";
                        btnModeText.TextID = StringId.Ordinary;
                        btnModeText.TextID = StringId.Normal;
                        break;
                }

                if (fh.modeList.IndexOf(m) < fh.modeList.Count - 1)
                if (fh.trait_mode.value.IndexOf(m) < fh.trait_mode.value.Count - 1)
                {
                    modeChangeView.AddChidren(new Button()
                    {