From e06fc993ab4bc39cdd242953c1fb3c0093043cc5 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 26 七月 2023 09:17:16 +0800
Subject: [PATCH] 2023年07月26日09:16:49
---
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 2 +-
HDL_ON/Entity/Function/Function.cs | 4 ++++
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 4 ++--
HDL_ON/UI/MainPage.cs | 1 +
HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs | 2 +-
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index c5bd54b..953f33a 100644
--- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -234,7 +234,7 @@
//鍏堟竻绌哄懠鍙拰鐩戣璁惧淇℃伅
if (clearCallInfo)
{
- InitCallInfo(null);
+ //InitCallInfo(null);
}
HDLSipInfo mHDLSipInfo = GetHDLSipInfo(mHDLCallVideoInfo.HomeId);
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 8f4f3c3..5b7f073 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1142,6 +1142,10 @@
/// 褰撳墠鍊�
/// </summary>
public object curValue = new object();
+ /// <summary>
+ /// 灞炴�у崟浣�
+ /// </summary>
+ public string unit=string.Empty;
}
/// <summary>
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 9ba4beb..a7cf3b9 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -620,6 +620,7 @@
#if DEBUG
if (msg.Contains("鏀跺埌鏁版嵁")
|| msg.Contains("鍙戦��")
+ || msg.Contains("鎺ユ敹鍒版帹閫�")
)
Console.WriteLine(msg);
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 86821a9..f4790cf 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -2506,9 +2506,9 @@
public string GetTemperatureUnit(Entity.Function device)
{
string unit = string.Empty;
- if (device.GetAttribute("temperature_type") != null && device.GetAttribute("temperature_type").value.Count > 0)
+ if (device.GetAttribute("temperature_type") != null)
{
- unit = device.GetAttribute("temperature_type").value[0];
+ unit = device.GetAttribute("temperature_type").unit;
}
if (string.IsNullOrEmpty(unit))
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
index 7aed7ce..1ca1b0f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
@@ -299,7 +299,7 @@
/// <param name="api_Url">璇锋眰鍦板潃(涓嶆槸缁濆鍦板潃)</param>
/// <param name="tag">鏍囪->鎻忚堪鎺ュ彛(鑷畾涔�)</param>
/// <returns></returns>
- public ResponsePackNew RequestServerhomeId(object o, string api_Url, string tag, int mTimeout = 5)
+ public ResponsePackNew RequestServerhomeId(object o, string api_Url, string tag, int mTimeout = 15)
{
JObject jobject = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(o));
return UI2.Intelligence.Automation.Send.Current.RequestServerhomeId(jobject, api_Url, tag, mTimeout);
--
Gitblit v1.8.0