From 9a343a7240c0254450174ea674948a6df54fbc61 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 八月 2023 16:25:24 +0800
Subject: [PATCH] 优化全开全关控制算法
---
HDL_ON/DAL/DriverLayer/UdpSocket.cs | 5 -----
HDL_ON/Entity/Function/Function.cs | 4 ++++
HDL_ON/DAL/Server/HttpUtil.cs | 4 ++--
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs | 10 +++++-----
HDL_ON/DAL/DriverLayer/Control.cs | 4 ++++
HDL_ON/UI/MainPage.cs | 8 ++++----
HDL_ON/UI/UI1-Login/LoginPage.cs | 8 ++++----
SiriIntents/Server/HttpUtil.cs | 4 ++--
8 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index c9f3c21..a1af398 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -626,6 +626,10 @@
{
foreach (var temp in functions)
{
+ if((temp.trait_on_off.state.ToString() == "on" && open)|| temp.trait_on_off.state.ToString() == "off"&& !open)
+ {
+ continue;
+ }
var apiControlData = temp.GetApiControlData(d);
actionObjs.Add(apiControlData);
count++;
diff --git a/HDL_ON/DAL/DriverLayer/UdpSocket.cs b/HDL_ON/DAL/DriverLayer/UdpSocket.cs
index 17acf0f..df9662a 100644
--- a/HDL_ON/DAL/DriverLayer/UdpSocket.cs
+++ b/HDL_ON/DAL/DriverLayer/UdpSocket.cs
@@ -27,22 +27,17 @@
/// </summary>
public void Start (int port = 0)
{
- MainPage.Log("鍚姩Socket鎺ユ敹鍜屽彂閫佸姛鑳�0");
if (IsRunning)
{
- MainPage.Log("鍚姩Socket鎺ユ敹鍜屽彂閫佸姛鑳絰");
if (port == Port)
{
- MainPage.Log("鍚姩Socket鎺ユ敹鍜屽彂閫佸姛鑳絪");
return;
}
else
{
- MainPage.Log("鍚姩Socket鎺ユ敹鍜屽彂閫佸姛鑳絘");
busSocket.Close();
}
}
- MainPage.Log("鍚姩Socket鎺ユ敹鍜屽彂閫佸姛鑳�1");
if (port != 0)
Port = port;
if (Port == 0)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 2ef648a..f356d18 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/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
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 7f37cae..53702aa 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -867,6 +867,10 @@
foreach (var attr in list)
{
+ if(attr.key == FunctionAttributeKey.ColorfulBegin || attr.key == FunctionAttributeKey.ColorfulEnd || attr.key == FunctionAttributeKey.ColorfulTime)
+ {
+ continue;
+ }
//绐楀笜鍚屾椂鍙戦�佸紑鍏宠窡鐧惧垎姣斾細鏈夐棶棰橈紝
if(spk == SPK.CurtainRoller || spk == SPK.CurtainTrietex || spk == SPK.CurtainDream)
{
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 7130000..faf0875 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "2.1.0";
+ public static string VersionString = "2.0.0";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -629,9 +629,9 @@
{
#if DEBUG
if (msg.Contains("鏀跺埌鏁版嵁")
- || msg.Contains("鍙戦��")
- || msg.Contains("鎺ユ敹鍒版帹閫�")
- || true
+ || msg.Contains("api鍔熻兘鎺у埗")
+ //|| msg.Contains("鎺ユ敹鍒版帹閫�")
+ //|| true
)
Console.WriteLine(msg);
#endif
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 24bc191..c7a2ca5 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -323,9 +323,9 @@
etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
etAccount.Text = "15855403939";
etAccount.Text = "15006564444";
- etAccount.Text = "13580507523";
+ etAccount.Text = "jeremy@ruma.my";
//etAccount.Text = "12345678904";//2.0 娴嬭瘯 钀ょ煶
- etAccount.Text = "18316672920";
+ //etAccount.Text = "18316672920";
}
else
{
@@ -357,9 +357,9 @@
}
b = !b;
etPassword.Text = "123456";
- if(etAccount.Text == "18188019284")
+ if(etAccount.Text == "jeremy@ruma.my")
{
- etPassword.Text = "CEZUJHSZ";
+ etPassword.Text = "CEBCWINP";
}
else if(etAccount.Text == "13143792049")
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
index 863d94e..2bf2a19 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
@@ -234,14 +234,14 @@
/// </summary>
void OpenUrl()
{
- if (!string.IsNullOrEmpty(newAppVersion)&& newAppVersion.Contains("http"))
+ if (!string.IsNullOrEmpty(newAppVersion)&& newAppVersionUrl.Contains("http"))
{
HDLUtils.OpenUrl(newAppVersionUrl);
}
- else
- {
- Utlis.ShowTip(Language.StringByID(StringId.IsLatestVersion));
- }
+ //else
+ //{
+ // Utlis.ShowTip(Language.StringByID(StringId.IsLatestVersion));
+ //}
}
/// <summary>
diff --git a/SiriIntents/Server/HttpUtil.cs b/SiriIntents/Server/HttpUtil.cs
index dc7aca0..8d4483c 100644
--- a/SiriIntents/Server/HttpUtil.cs
+++ b/SiriIntents/Server/HttpUtil.cs
@@ -16,8 +16,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
--
Gitblit v1.8.0