2023年07月19日13:56:19

wjc

2023-07-19 6298598b5b957e5ab6fde50b161afd205f9a8b2a

2023年07月19日13:56:19

温度单位改为动态

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -18,8 +18,8 @@
        /// 固定域名,正式环境
        /// 公共域名就近解析
        /// </summary>
        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        const string APP_KEY = "HDL-HOME-APP-TEST";
        const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
        //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm

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

@@ -1216,11 +1216,7 @@

                                        if (set_temp != "")
                                        {
                                            string unit = device.GetAttribute("temperature_type") == null ? "℃" : device.GetAttribute("temperature_type").state;
                                            if (string.IsNullOrEmpty(unit))
                                            {
                                                unit = "℃";
                                            }
                                            string unit =GetTemperatureUnit(device);
                                            stateStr += set_temp + unit + ",";
                                        }

@@ -1318,11 +1314,7 @@
                                        }
                                        if (set_temp != "")
                                        {
                                            string unit = device.GetAttribute("temperature_type") == null ? "℃" : device.GetAttribute("temperature_type").state;
                                            if (string.IsNullOrEmpty(unit))
                                            {
                                                unit = "℃";
                                            }
                                            string unit = GetTemperatureUnit(device);
                                            stateStr += set_temp + unit + ",";
                                        }
                                        if (mode != "")
@@ -1827,7 +1819,7 @@
                                            //怕调试软件乱上东西导致抛异常
                                            break;
                                        }
                                        button2.Text = value + "℃";
                                        button2.Text = value + GetTemperatureUnit(device); ;
                                    }
                                    break;
                                case "mode":
@@ -1940,7 +1932,7 @@
                                            //怕调试软件乱上东西导致抛异常
                                            break;
                                        }
                                        button2.Text = value + "℃";
                                        button2.Text = value + GetTemperatureUnit(device); ;
                                    }
                                    break;
                                case "mode":
@@ -2392,6 +2384,25 @@
            return dicList[0]["value"].ToString();
        }
        /// <summary>
        /// 获取温度单位
        /// </summary>
        /// <param name="device"></param>
        /// <returns></returns>
        public string GetTemperatureUnit(Entity.Function device)
        {
            string unit = string.Empty;
            if (device.GetAttribute("temperature_type") != null && device.GetAttribute("temperature_type").value.Count > 0)
            {
                unit = device.GetAttribute("temperature_type").value[0];
            }
            if (string.IsNullOrEmpty(unit))
            {
                //调试软件有空能上传为空
                unit = "℃";
            }
            return unit;
        }
        /// <summary>
        ///获取自动化名称
        /// </summary>
        /// <returns> 新建自动化命名规则</returns>

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

@@ -388,12 +388,7 @@
                        };
                        int min = device.GetAttribute("set_temp") == null ? 16 : device.GetAttribute("set_temp").min;
                        int max = device.GetAttribute("set_temp") == null ? 32 : device.GetAttribute("set_temp").max;
                        string unit = device.GetAttribute("temperature_type") == null ? "℃" : device.GetAttribute("temperature_type").state;
                        if (string.IsNullOrEmpty(unit))
                        {
                            //调试软件有空能上传为空
                            unit = "℃";
                        }
                        string unit = InpOrOutLogicMethod.Current.GetTemperatureUnit(device);
                        ///温度点击事件
                        temperatureView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
@@ -499,11 +494,7 @@
                        {
                            int min = device.GetAttribute("set_temp") == null ? 16 : device.GetAttribute("set_temp").min;
                            int max = device.GetAttribute("set_temp") == null ? 32 : device.GetAttribute("set_temp").max;
                            string unit = device.GetAttribute("temperature_type") == null ? "℃" : device.GetAttribute("temperature_type").state;
                            if (string.IsNullOrEmpty(unit)) {
                                //调试软件有空能上传为空
                                unit = "℃";
                            }
                            string unit = InpOrOutLogicMethod.Current.GetTemperatureUnit(device);
                            string tempValue = temperatureView.btnState.Text;
                            LogicView.TemperatureView tempView = new LogicView.TemperatureView();
                            tempView.FLayoutView(this, tempValue, (stateStr) =>