Revert "Merge branch 'tzy' into NewFilePath"

wxr

2020-12-17 1a13c963a5fb8cad92bf03667e411f46d6a6a843

 HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs

@@ -132,9 +132,14 @@
                Height = Application.GetMinRealAverage(40),
                SelectedImagePath = "Collection/CollectionIcon.png",
                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                IsSelected = aC.collection
                IsSelected = aC.collect
            };
            controlView.AddChidren(btnCollection);
            //controlView.AddChidren(btnCollection);
            //2020-12-16 如果是成员隐藏收藏功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            {
                controlView.AddChidren(btnCollection);
            }

            arcBar = new DiyArcSeekBar()
            {
@@ -144,13 +149,13 @@
                Width = Application.GetRealWidth(260-40),
                Height = Application.GetRealWidth(260-40),
                OpenAngle = 160,
                ThumbImagePath = aC.on_off == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
                ThumbImagePath = aC.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
                ThumbImageHeight = Application.GetRealWidth(50),
                ProgressBarColor = aC.on_off == "on"? CSS_Color.MainColor :CSS_Color.PromptingColor2,
                ProgressBarColor = aC.trait_on_off.curValue.ToString() == "on"? CSS_Color.MainColor :CSS_Color.PromptingColor2,
                MinValue = 16,
                MaxValue = 38,
                Progress = aC.curTemp,
                IsClickable = true,
                Progress = Convert.ToInt32( aC.trait_temp.curValue),
                IsClickable =  aC.trait_on_off.curValue.ToString() == "on" ,
                ArcColor = CSS_Color.BackgroundColor,
                SeekBarPadding = Application.GetRealWidth(8),
#else
@@ -159,13 +164,13 @@
                Width = Application.GetRealWidth(260 - 40),
                Height = Application.GetRealWidth(260 - 40),
                OpenAngle = 160,
                ThumbImagePath = aC.on_off == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
                ThumbImagePath = aC.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
                ThumbImageHeight = Application.GetRealWidth(50),
                ProgressBarColor = aC.on_off == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2,
                ProgressBarColor = aC.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2,
                MinValue = 16,
                MaxValue = 38,
                Progress = aC.curTemp,
                IsClickable = true,
                Progress = Convert.ToInt32( aC.trait_temp.curValue),
                IsClickable = aC.trait_on_off.curValue.ToString() == "on",
                ArcColor = CSS_Color.BackgroundColor,
                SeekBarPadding = Application.GetRealWidth(7),
#endif
@@ -181,7 +186,7 @@
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = 50,
                IsBold = true,
                Text = aC.curTemp.ToString(),
                Text = aC.trait_temp.curValue.ToString(),
                TextAlignment = TextAlignment.Center,
            };
            controlView.AddChidren(btnTemp);
@@ -260,12 +265,17 @@
                Height = Application.GetRealWidth(40),
                UnSelectedImagePath = "Public/PowerClose.png",
                SelectedImagePath = "Public/PowerOpen.png",
                IsSelected = aC.on_off == "on"
                IsSelected = aC.trait_on_off.curValue.ToString() == "on"
            };
            controlView.AddChidren(btnSwitch);

            LoadEventList();
            new TopViewDiv(bodyView,aC.name).LoadTopView(aC, actionRefresh);
            new TopViewDiv(bodyView,Language.StringByID(StringId.AC)).LoadTopView_FunctionTop(aC, actionRefresh);
            new System.Threading.Thread(() =>
            {
                DriverLayer.Control.Ins.SendReadCommand(aC);
            })
            { IsBackground = true }.Start();
        }
        /// <summary>
        /// 加载修改模式区域
@@ -288,7 +298,7 @@
                Width = Application.GetRealWidth(160),
                Height = Application.GetRealHeight(287),
                BackgroundImagePath = "FunctionIcon/AC/DivBg1.png",
                Animate = Animate.DownToUp,
                Animate = Animate.UpToDown,
                AnimateSpeed = 0.3f
            };
            dialogView.AddChidren(modeChangeView);
@@ -317,28 +327,28 @@
            };
            modeChangeView.AddChidren(btnLine);

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

                Button btnModeText = new Button()
                {
                    X = Application.GetRealWidth(12) + btnModeIcon.Right,
                    Y = Application.GetRealHeight(44 * (aC.modeList.IndexOf(m) + 1) + 8),
                    Y = Application.GetRealHeight(44 * (aC.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 = aC.trait_mode.curValues == m,
                    IsSelected = aC.trait_mode.curValue.ToString() == m,
                    TextSize = CSS_FontSize.TextFontSize,
                };
                modeChangeView.AddChidren(btnModeText);
@@ -372,7 +382,7 @@
                        break;
                }

                if(aC.modeList.IndexOf(m) < aC.modeList.Count-1)
                if(aC.trait_mode.value.IndexOf(m) < aC.trait_mode.value.Count-1)
                {
                    modeChangeView.AddChidren(new Button()
                    {
@@ -413,7 +423,7 @@
                Height = Application.GetRealHeight(243),
                AnimateSpeed = 0.3f,
                BackgroundImagePath = "FunctionIcon/AC/DivBg2.png",
                Animate = Animate.DownToUp,
                Animate = Animate.UpToDown,
            };
            dialogView.AddChidren(modeChangeView);

@@ -441,28 +451,28 @@
            };
            modeChangeView.AddChidren(btnLine);

            foreach (var m in aC.fan_List)
            foreach (var m in aC.trait_fan.value)
            {
                Button btnFanIcon = new Button()
                {
                    X = btnTitle.X,
                    Y = Application.GetRealHeight(44 * (aC.fan_List.IndexOf(m) + 1) + 10 + 8),
                    Y = Application.GetRealHeight(44 * (aC.trait_fan.value.IndexOf(m) + 1) + 10 + 8),
                    Width = Application.GetRealWidth(24),
                    Height = Application.GetRealWidth(24),
                    IsSelected = aC.trait_fan.curValues.ToString() == m,
                    IsSelected = aC.trait_fan.curValue.ToString() == m,
                };
                modeChangeView.AddChidren(btnFanIcon);

                Button btnFanText = new Button()
                {
                    X = Application.GetRealWidth(12) + btnFanIcon.Right,
                    Y = Application.GetRealHeight(44 * (aC.fan_List.IndexOf(m) + 1) + 8),
                    Y = Application.GetRealHeight(44 * (aC.trait_fan.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 = aC.trait_fan.curValues.ToString() == m,
                    IsSelected = aC.trait_fan.curValue.ToString() == m,
                    TextSize = CSS_FontSize.TextFontSize,
                };
                modeChangeView.AddChidren(btnFanText);
@@ -491,7 +501,7 @@
                        break;
                }

                if (aC.fan_List.IndexOf(m) < aC.fan_List.Count - 1)
                if (aC.trait_fan.value.IndexOf(m) < aC.trait_fan.value.Count - 1)
                {
                    modeChangeView.AddChidren(new Button()
                    {