From f8530cf7edf28799718f2b95b3b9492ab5cc26c6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 28 十一月 2023 09:35:25 +0800
Subject: [PATCH] 空调更新异常问题
---
HDL_ON/Common/HDLCommon.cs | 1 +
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 25 +++++++++++++++----------
HDL_ON/DAL/Server/HttpServerRequest.cs | 17 +++++++++++++++++
HDL_ON/UI/UI1-Login/LoginPage.cs | 3 +++
4 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 8f2739d..75dcc1b 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -473,6 +473,7 @@
case "13580507523":
case "15626203746":
case "18316672920":
+
return;
}
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 46ccea0..3b78fb1 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -2319,6 +2319,23 @@
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditDevice, requestJson);
}
+
+ /// <summary>
+ /// 缂栬緫璁惧淇℃伅
+ /// 缁戝畾鍏崇郴銆佸悕绉般�佹敹钘�
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew UpdataDevcieName(string deviceId,string name)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("deviceId", deviceId);
+ d.Add("name", name);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditDevice, requestJson);
+ }
+
/// <summary>
/// 缂栬緫璁惧淇℃伅
/// 缁戝畾鍏崇郴銆佸悕绉般�佹敹钘�
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 87bea6c..dde7691 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -331,6 +331,9 @@
etAccount.Text = "13682244600";
etAccount.Text = "marketing@australindo.co.id";
etAccount.Text = "support7@hdlautomation.com";
+ etAccount.Text = "13922115008";//鍒樻��
+ etAccount.Text = "1272061968@qq.com";
+
}
else
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index 1b55639..f7d63d1 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -1069,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
{
@@ -1092,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;
}
}
--
Gitblit v1.8.0