2022年06月09日21:39:40

wjc

2022-06-09 7eb8b78a26accd059cf8e17d756f6d77e6b3f9dd

2022年06月09日21:39:40

地暖模式设置白天时，无法设置温度加减

 HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs

@@ -9,7 +9,6 @@
        {
            Tag = "Logic";
        }
       
        public void Show()
        {
            LogicView.TopView topView = new LogicView.TopView();
@@ -79,6 +78,7 @@
            //时间
            timeView.btnClick.MouseUpEventHandler += (sen, e) =>
             {

          TimeTpye timeTpye = new TimeTpye();
          MainPage.BasePageView.AddChidren(timeTpye);
          timeTpye.Show();

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

@@ -23,7 +23,7 @@
                    bodyView.btnTemp.Text = outinTemp.ToString();
                    bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", "."))) + "°C";
                    bodyView.btnMode.SelectedImagePath = bodyView.fhTemp.GetModeIconPath(updateTemp.GetAttrState(FunctionAttributeKey.Mode));
                    bodyView.btnMode.UnSelectedImagePath = bodyView.fhTemp.GetModeIconPath(updateTemp.GetAttrState(FunctionAttributeKey.Mode),false);
                    bodyView.btnMode.UnSelectedImagePath = bodyView.fhTemp.GetModeIconPath(updateTemp.GetAttrState(FunctionAttributeKey.Mode), false);
                    bodyView.arcBar.Progress = outinTemp;
                    //if (updateTemp.trait_on_off.curValue.ToString() == "on")
                    //{
@@ -73,15 +73,16 @@
                        bodyView.arcBar.IsClickable = false;
                        bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
                    }
                    //自动模式不允许调温度 2021-10-27 09:41:35 wxr 陈琳反馈
                    if (updateTemp.GetAttrState(FunctionAttributeKey.Mode) == "auto"|| updateTemp.GetAttrState(FunctionAttributeKey.Mode) == "timer")
                    {
                        bodyView.btnPlus.Enable = false;
                        bodyView.btnMinus.Enable = false;
                        bodyView.arcBar.IsClickable = false;
                        bodyView.arcBar.IsOffline = true;
                    }

                    ////自动模式不允许调温度 2021-10-27 09:41:35 wxr 陈琳反馈
                    //if (updateTemp.GetAttrState(FunctionAttributeKey.Mode) == "auto" || updateTemp.GetAttrState(FunctionAttributeKey.Mode) == "timer")
                    //{
                    //    bodyView.btnPlus.Enable = false;
                    //    bodyView.btnMinus.Enable = false;
                    //    bodyView.arcBar.IsClickable = false;
                    //    bodyView.arcBar.IsOffline = true;
                    //}
                    //更新不同界面状态 2022年06月09日19:22:55 wjc 修改
                    bodyView.updateStatusPage();
                });
            }
            catch (Exception ex)
@@ -102,14 +103,17 @@
                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();
                //function.SaveFunctionData(true);
            };
            //自动模式不允许调温度 2021-10-27 09:41:35 wxr 陈琳反馈
            if (function.GetAttrState(FunctionAttributeKey.Mode) == "auto" || function.GetAttrState(FunctionAttributeKey.Mode) == "timer")
            {
                btnPlus.Enable = false;
                btnMinus.Enable = false;
                arcBar.IsClickable = false;
                arcBar.IsOffline = true;
            }

            ////自动模式不允许调温度 2021-10-27 09:41:35 wxr 陈琳反馈
            //if (function.GetAttrState(FunctionAttributeKey.Mode) == "auto" || function.GetAttrState(FunctionAttributeKey.Mode) == "timer")
            //{
            //    btnPlus.Enable = false;
            //    btnMinus.Enable = false;
            //    arcBar.IsClickable = false;
            //    arcBar.IsOffline = true;
            //}
            //初始化不同界面状态 2022年06月09日19:22:55 wjc 修改
            this.updateStatusPage();
        }

        /// <summary>
@@ -141,7 +145,7 @@
            //}
            btnMinus.MouseUpEventHandler = (sender, e) =>
            {
                if(function.trait_on_off.curValue.ToString() == "off")
                if (function.trait_on_off.curValue.ToString() == "off")
                {
                    return;
                }
@@ -166,7 +170,7 @@
                {
                    return;
                }
                var temp =(int) Convert.ToDouble(function.GetAttrState(FunctionAttributeKey.SetTemp).Replace(",", "."));
                var temp = (int)Convert.ToDouble(function.GetAttrState(FunctionAttributeKey.SetTemp).Replace(",", "."));
                if (temp >= Convert.ToDouble(function.GetAttribute(FunctionAttributeKey.SetTemp).max))
                {
                    return;
@@ -182,7 +186,7 @@
            };
            arcBar.OnStopTrackingTouchEvent = (sender, e) =>
            {
                function.SetAttrState(FunctionAttributeKey.SetTemp,arcBar.Progress);
                function.SetAttrState(FunctionAttributeKey.SetTemp, arcBar.Progress);
                btnTemp.Text = arcBar.Progress.ToString();
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.SetTemp, arcBar.Progress.ToString());
@@ -191,7 +195,7 @@
            arcBar.OnProgressChangedEvent = (sender, e) =>
            {
                function.SetAttrState(FunctionAttributeKey.SetTemp, e);
                btnTemp.Text = Convert.ToDouble( function.GetAttrState(FunctionAttributeKey.SetTemp).Replace(",", ".")).ToString();
                btnTemp.Text = Convert.ToDouble(function.GetAttrState(FunctionAttributeKey.SetTemp).Replace(",", ".")).ToString();
            };
        }
        /// <summary>
@@ -229,7 +233,7 @@
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                Control.Ins.SendWriteCommand(function, d);
               

            };
        }

@@ -246,7 +250,7 @@
            EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
            {
                btn1.IsSelected = btn2.IsSelected = true;
                function.SetAttrState(FunctionAttributeKey.Mode,curMode);
                function.SetAttrState(FunctionAttributeKey.Mode, curMode);
                btnMode.UnSelectedImagePath = btn1.SelectedImagePath;
                //byte pro = 6;//不处理温度显示，等待回复数据再处理
                //function.Fh_Mode_Temp.TryGetValue(curMode, out pro);
@@ -260,5 +264,37 @@
            btn2.MouseUpEventHandler = eventHandler1;
            dialogView.MouseUpEventHandler = eventHandler;
        }

        /// <summary>
        /// 更新不同界面状态
        /// </summary>
       private void updateStatusPage() 
        {
            btnPlus.Enable = true;
            btnMinus.Enable = true;
            arcBar.IsClickable = true;
            arcBar.IsOffline = false;
            switch (getModeValue)
            {
                case "auto"://自动
                case "timer"://
                    btnPlus.Enable = false;
                    btnMinus.Enable = false;
                    arcBar.IsClickable = false;
                    arcBar.IsOffline = true;
                    break;

            }
        }
        /// <summary>
        /// 获取模式value值
        /// </summary>
        private string getModeValue
        {
            get
            {
                return function.GetAttrState(FunctionAttributeKey.Mode);
            }
        }
    }
}