Merge remote-tracking branch 'origin/wjc' into Dev-Branch

wxr

2022-06-10 cf145d2d389c9d45ec0fd8bfa853d3481c29910e

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

@@ -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>
@@ -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);
            }
        }
    }
}