2024年07月25日17:24:45

mac

2024-07-25 3f6685c77beeb12baf840733fb890860f4c26e7c

 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs

@@ -104,7 +104,7 @@
            var temp = (int)Convert.ToDouble(setTempTemp);
            if (temp <= 0)
            {
                //默认值改成16,2022年06月10日10:03:19 成甫要求的
                //默认值改成16
                temp = 16;
                device.SetAttrState(FunctionAttributeKey.SetTemp, temp.ToString());
            }
@@ -156,7 +156,7 @@
                    TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
                    IsBold = true,
                    TextAlignment = TextAlignment.CenterLeft,
                    Text = "°C",
                    Text = acFunction.GetTempUnitString(device),
                };
                FrameWhiteCentet1.AddChidren(btnTempUint);

@@ -166,7 +166,7 @@
                    Y = btnTemp.Bottom,
                    Width = Application.GetRealWidth(120),
                    Height = Application.GetRealHeight(30),
                    Text = Language.StringByID(StringId.Indoor) + " 20°C",
                    Text = Language.StringByID(StringId.Indoor) + " 20" + acFunction.GetTempUnitString(device),
                    TextColor = CSS_Color.PromptingColor1,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    TextAlignment = TextAlignment.TopCenter,
@@ -305,15 +305,18 @@
            };
            setTempBar.OnStopTrackingTouchEvent = (sender, e) => {
                temp = e;
                Dictionary<string, string> d = new Dictionary<string, string>();
                device.SetAttrState(FunctionAttributeKey.SetTemp, e.ToString());
                if (setTempAttr.step == "0.5")
                {
                    e = e / 2;
                    btnTemp.Text = (setTempAttr.min + ((double)e)).ToString("0.0");
                    double ex = (double)e / 2;
                    btnTemp.Text = (setTempAttr.min + ((double)ex)).ToString("0.0");
                    d.Add(FunctionAttributeKey.SetTemp, (setTempAttr.min + ex).ToString());
                }
                else
                {
                    btnTemp.Text = (setTempAttr.min + e).ToString();
                    d.Add(FunctionAttributeKey.SetTemp, (setTempAttr.min + e).ToString());
                }

#if __IOS__
@@ -323,8 +326,6 @@
#endif
                btnTempUint.X = btnTemp.Right;
                controlTime = DateTime.Now;
                Dictionary<string, string> d = new Dictionary<string, string>();
                d.Add(FunctionAttributeKey.SetTemp, (setTempAttr.min + e).ToString());
                Control.Ins.SendWriteCommand(device, d);
            };

@@ -445,7 +446,7 @@
                    d.Add(FunctionAttributeKey.Mode, m);
                    Control.Ins.SendWriteCommand(device, d);
                    dialog.Close();
                    if (device.GetAttrState(FunctionAttributeKey.Mode) == "fan")
                    if (device.GetAttrState(FunctionAttributeKey.Mode) == "fan" || device.GetAttrState(FunctionAttributeKey.Mode) == "dry")
                    {

                        setTempBar.IsClickable = false;
@@ -1034,7 +1035,9 @@
                {
                    //device = FunctionList.List.Functions.Find((obj) => obj.sid == device.sid);

                    btnIndoorTemp.Text = Language.StringByID(StringId.Indoor) + " " + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", "."))) + "°C";
                    btnIndoorTemp.Text = Language.StringByID(StringId.Indoor) + " "
                    + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", ".")))
                     + acFunction.GetTempUnitString(device);
                    btnMode.SelectedImagePath = acFunction.GetModeIconPath(device.GetAttrState(FunctionAttributeKey.Mode));
                    btnSwing.SelectedImagePath = acFunction.GetSwingIconPath(device.GetAttrState(FunctionAttributeKey.Swing));
                    btnWindSpeed.SelectedImagePath = acFunction.GetFanIconPath(device.GetAttrState(FunctionAttributeKey.FanSpeed));
@@ -1066,18 +1069,19 @@
                    if (device.trait_on_off.curValue.ToString() == "on")
                    {
                        btnMode.IsSelected = btnSwing.IsSelected = btnWindSpeed.IsSelected = true;
                        setTempBar.Enable = true;
                        //setTempBar.Enable = true;
                        setTempBar.ProgressBarColor = CSS_Color.MainColor;

                        btnSwitch.IsSelected = true;
                        if (device.GetAttrState(FunctionAttributeKey.Mode) == "fan")
                        {
                            setTempBar.IsClickable = false;
                        }
                        else
                        {
                            setTempBar.IsClickable = true;
                        }
                        //if (device.GetAttrState(FunctionAttributeKey.Mode) == "fan")
                        //{
                        //    setTempBar.IsClickable = false;
                        //}
                        //else
                        //{
                        //    setTempBar.IsClickable = true;
                        //}

                    }
                    else
                    {
@@ -1089,11 +1093,15 @@
                        setTempBar.IsClickable = false;
                    }

                    if (device.GetAttrState(FunctionAttributeKey.Mode) == "dry")
                    if (device.GetAttrState(FunctionAttributeKey.Mode) == "dry" || device.GetAttrState(FunctionAttributeKey.Mode) == "fan")
                    {
                        setTempBar.IsOffline = true;
                        setTempBar.IsClickable = false;

                    }else
                    {
                        setTempBar.IsOffline = false;
                        setTempBar.IsClickable = true;
                    }
                }