From 1fa13087ee7be5502e2e42cbd07cf185cbc69a9c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十月 2023 13:57:23 +0800
Subject: [PATCH] Merge branch 'wxr-2.1' into wxr-2.2
---
HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensorpir_hold_white.png | 0
HDL-ON_Android/Properties/AndroidManifest.xml | 4
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 56 +++++
HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/sensorpir_hold.png | 0
HDL-ON_Android/Assets/Language.ini | 13
HDL-ON_iOS/HDL-ON_iOS.csproj | 6
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 38 ----
HDL_ON/DAL/Mqtt/MqttClient.cs | 2
HDL-ON_Android/HDL-ON_Android.csproj | 6
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 20 ++
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs | 109 ++++--------
HDL-ON_iOS/Info.plist | 4
HDL-ON_iOS/Resources/Language.ini | 6
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensordryContact.png | 0
HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs | 38 ----
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensordryContact_white.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensordryContact_white.png | 0
HDL_ON/DAL/DriverLayer/Control.cs | 3
HDL_ON/UI/MainPage.cs | 6
HDL_ON/UI/UI1-Login/LoginPage.cs | 127 +++++++++----
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs | 2
SiriIntents/Server/HttpUtil.cs | 4
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorpir_hold_white.png | 0
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 37 ----
HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/sensordryContact.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorpir_hold_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorpir_hold.png | 0
HDL_ON/Entity/Function/Function.cs | 7
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensordryContact_blue.png | 0
HDL_ON/Common/R.cs | 4
HDL_ON/DAL/Server/HttpServerRequest.cs | 2
HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensordryContact_blue.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensorpir_hold_blue.png | 0
34 files changed, 238 insertions(+), 260 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index ff8cadd..e4f7f4b 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -682,7 +682,7 @@
695=Daily data of the past month
696=Monthly data of the past year
697=prompt: The closer the starting color selection is to the edge of the color ring, the more obvious the dazzling effect. The closer to the white center, the less noticeable the dazzling effect.
-
+698=Break
@@ -2078,6 +2078,7 @@
695=杩囧幓涓�涓湀鐨勬瘡鏃ユ暟鎹�
696=杩囧幓涓�骞寸殑姣忔湀鏁版嵁
697=鎻愮ず锛氳捣濮嬮鑹查�夋嫨瓒婇潬杩戣壊鐜竟缂橈紝鐐僵鏁堟灉瓒婃槑鏄俱�傝秺闈犺繎鐧借壊涓績锛岀偒褰╂晥鏋滆秺涓嶆槑鏄俱��
+698=鏂紑
@@ -2628,9 +2629,6 @@
7174=鐓ф槑搴﹂珮浜�
7175=鐓ф槑搴︿綆浜�
7176=鍏夌収
-
-
-
@@ -3473,6 +3471,7 @@
695=Daily data of the past month
696=Monthly data of the past year
697=prompt: The closer the starting color selection is to the edge of the color ring, the more obvious the dazzling effect. The closer to the white center, the less noticeable the dazzling effect.
+698=Break
@@ -4861,6 +4860,7 @@
695=Daily data of the past month
696=Monthly data of the past year
697=prompt: The closer the starting color selection is to the edge of the color ring, the more obvious the dazzling effect. The closer to the white center, the less noticeable the dazzling effect.
+698=Break
@@ -6234,6 +6234,7 @@
695=Daily data of the past month
696=Monthly data of the past year
697=prompt: The closer the starting color selection is to the edge of the color ring, the more obvious the dazzling effect. The closer to the white center, the less noticeable the dazzling effect.
+698=Break
@@ -6943,8 +6944,6 @@
10032=袩芯褌褉械斜懈褌械谢褟褌 薪褟屑邪 褉邪蟹褉械褕械薪懈械.
10033=校褋褌褉芯泄褋褌胁芯褌芯 薪械 褋褗褖械褋褌胁褍胁邪.
-
-
[Ukraine]
1=袙褏褨写 胁 褋懈褋褌械屑褍
2=袧芯屑械褉 褌械谢械褎芯薪褍
@@ -7535,7 +7534,7 @@
601=袙懈斜械褉褨褌褜 写胁邪 邪斜芯 斜褨谢褜褕械 锌褉懈褋褌褉芯褩胁
602=袦褨泄 写褨屑
603=袘褍写褜 谢邪褋泻邪, 锌褉芯褔懈褌邪泄褌械 褍胁邪卸薪芯
-604=袩褉芯褌芯泻芯谢 蟹斜芯褉褍 褨薪褎芯褉屑邪褑褨褩 锌褉芯 芯斜谢懈褔褔褟 Pro Face
+604="袩褉芯褌芯泻芯谢 蟹斜芯褉褍 褨薪褎芯褉屑邪褑褨褩 锌褉芯 芯斜谢懈褔褔褟 Pro Face
605= 携泻褖芯 胁懈 蟹谐芯写薪褨 蟹 褑褨褦褞 褍谐芯写芯褞, 斜褍写褜 谢邪褋泻邪, 薪邪褌懈褋薪褨褌褜 泻薪芯锌泻褍 [袟谐芯写械薪].
606=袩褉懈胁'褟蟹泻邪 芯斜谢褨泻芯胁芯谐芯 蟹邪锌懈褋褍 褍褋锌褨褕薪邪, 胁懈 屑芯卸械褌械 锌褉芯写芯胁卸懈褌懈 芯锌械褉邪褑褨褞 蟹胁'褟蟹褍胁邪薪薪褟 锌褉懈褋褌褉芯褩胁
607=袩芯锌械褉械写薪褟 褋褌芯褉褨薪泻邪
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensordryContact_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensordryContact_blue.png
new file mode 100644
index 0000000..a428a90
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensordryContact_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensordryContact_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensordryContact_white.png
new file mode 100644
index 0000000..8981bc3
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensordryContact_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorpir_hold_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorpir_hold_blue.png
new file mode 100644
index 0000000..bcae4f4
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorpir_hold_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorpir_hold_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorpir_hold_white.png
new file mode 100644
index 0000000..98c78b4
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorpir_hold_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensordryContact.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensordryContact.png
new file mode 100644
index 0000000..1f2a6bc
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensordryContact.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorpir_hold.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorpir_hold.png
new file mode 100644
index 0000000..4f7a978
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorpir_hold.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index a4b6c45..db820e2 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -606,6 +606,12 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_on_home_click.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_on_home.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_on.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensordryContact.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorpir_hold.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensordryContact_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensordryContact_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensorpir_hold_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensorpir_hold_white.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index deda7a1..c3f858c 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.1.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202309111">
- <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.2.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202310121">
+ <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="33" />
<uses-permission android:name="android.permission.RECEIVE_SMS" />
<!--鍙嬬洘-->
<!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 5ceca1e..b218343 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1762,6 +1762,12 @@
<BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_on_home_click.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_on_home.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_on.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensordryContact_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensordryContact_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensorpir_hold_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensorpir_hold_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorpir_hold.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensordryContact.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index c3eadee..f3bf464 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -11,7 +11,7 @@
<key>CFBundleName</key>
<string>On Pro</string>
<key>CFBundleShortVersionString</key>
- <string>2.1.3</string>
+ <string>2.2.0</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
@@ -36,7 +36,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>2.1.3</string>
+ <string>2.2.0</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>weixinULAPI</string>
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 9d76f34..e4f7f4b 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -682,7 +682,7 @@
695=Daily data of the past month
696=Monthly data of the past year
697=prompt: The closer the starting color selection is to the edge of the color ring, the more obvious the dazzling effect. The closer to the white center, the less noticeable the dazzling effect.
-
+698=Break
@@ -2078,6 +2078,7 @@
695=杩囧幓涓�涓湀鐨勬瘡鏃ユ暟鎹�
696=杩囧幓涓�骞寸殑姣忔湀鏁版嵁
697=鎻愮ず锛氳捣濮嬮鑹查�夋嫨瓒婇潬杩戣壊鐜竟缂橈紝鐐僵鏁堟灉瓒婃槑鏄俱�傝秺闈犺繎鐧借壊涓績锛岀偒褰╂晥鏋滆秺涓嶆槑鏄俱��
+698=鏂紑
@@ -3470,6 +3471,7 @@
695=Daily data of the past month
696=Monthly data of the past year
697=prompt: The closer the starting color selection is to the edge of the color ring, the more obvious the dazzling effect. The closer to the white center, the less noticeable the dazzling effect.
+698=Break
@@ -4858,6 +4860,7 @@
695=Daily data of the past month
696=Monthly data of the past year
697=prompt: The closer the starting color selection is to the edge of the color ring, the more obvious the dazzling effect. The closer to the white center, the less noticeable the dazzling effect.
+698=Break
@@ -6231,6 +6234,7 @@
695=Daily data of the past month
696=Monthly data of the past year
697=prompt: The closer the starting color selection is to the edge of the color ring, the more obvious the dazzling effect. The closer to the white center, the less noticeable the dazzling effect.
+698=Break
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensordryContact_blue.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensordryContact_blue.png
new file mode 100644
index 0000000..a428a90
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensordryContact_blue.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensordryContact_white.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensordryContact_white.png
new file mode 100644
index 0000000..8981bc3
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensordryContact_white.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensorpir_hold_blue.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensorpir_hold_blue.png
new file mode 100644
index 0000000..bcae4f4
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensorpir_hold_blue.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensorpir_hold_white.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensorpir_hold_white.png
new file mode 100644
index 0000000..98c78b4
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensorpir_hold_white.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/sensordryContact.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/sensordryContact.png
new file mode 100644
index 0000000..1f2a6bc
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/sensordryContact.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/sensorpir_hold.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/sensorpir_hold.png
new file mode 100644
index 0000000..4f7a978
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/sensorpir_hold.png
Binary files differ
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index ca5fa2d..19b54db 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -5,6 +5,10 @@
public static class StringId
{
/// <summary>
+ /// 鏂紑锛堝共鎺ョ偣锛�
+ /// </summary>
+ public const int DryBreak = 698;
+ /// <summary>
/// 鎻愮ず锛氳捣濮嬮鑹查�夋嫨瓒婇潬杩戣壊鐜竟缂橈紝鐐僵鏁堟灉瓒婃槑鏄俱�傝秺闈犺繎鐧借壊涓績锛岀偒褰╂晥鏋滆秺涓嶆槑鏄俱��
/// </summary>
public const int ColorfulSetTip = 697;
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 6955fab..1773eb4 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -1137,6 +1137,7 @@
receiveObj.Topic.Contains(CommunicationTopic.ct.GatewayUpSortTopic))
{
//TODO 鏆傛椂涓嶄紶姝ｇ‘鐨勬暟鎹笂鍘伙紝濡傛灉鍚庨潰瑕佷紭鍖栧墠闈㈣繖浜涗唬鐮�
+ //Console.WriteLine($"{receiveObj.Topic}\r\n{receiveObj.BodyDataString}");
UpdataFunctionStatus(receiveObj.BodyDataString, null);
}
else if (receiveObj.Topic == CommunicationTopic.ct.ControlSeurity + "_reply"
@@ -1246,7 +1247,7 @@
{
continue;
}
- MainPage.Log($"鏀跺埌鏁版嵁:{revString}");
+ MainPage.Log($"鏀跺埌缇ゆ帶鏁版嵁:{revString}");
foreach (var attr in updateTemp.status)
{
localFunction.time_stamp = temp.time_stamp;
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 9c11563..51866d6 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -111,7 +111,7 @@
{
MqttInfoConfig.Current.IfGetMqttInfoSuccess = false;
}
- Control.Ins.GatewayOnline_Cloud = Control.Ins.GatewayOnline_Local = false;
+ //Control.Ins.GatewayOnline_Cloud = Control.Ins.GatewayOnline_Local = false;
await DisConnectRemoteMqttClient(s);
}
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index a3038f6..fca8e58 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -698,7 +698,7 @@
{
if (mHomeGatewayRes.Count > 0)
{
- DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes[0];
+ DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes[0];//缃戝叧鐘舵��
DriverLayer.Control.Ins.GatewayOnline_Cloud = mHomeGatewayRes[0].gatewayStatus;
DB_ResidenceData.Instance.SaveResidenceData();
return revertObj.Code;
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index b659327..5235064 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";
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index e07df39..45b0b35 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -173,6 +173,13 @@
string iconPath = spk.Replace(".", "");
switch (spk)
{
+ case SPK.SensorDryContact2:
+ case SPK.OtherCommon:
+ iconPath = "sensordryContact";
+ break;
+ case SPK.SensorLight:
+ iconPath = "lightswitch";
+ break;
case SPK.AirSwitchP3:
iconPath = "electricalbreaker";
break;
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index d5e3084..332cd3f 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.4";
+ public static string VersionString = "2.2.0";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -124,7 +124,9 @@
SPK.GroupControl,
SPK.AvMusic,
SPK.MusicStandard,
- SPK.ElectricalTvHisense
+ SPK.ElectricalTvHisense,
+ SPK.OtherCommon,
+
};
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index a62f728..1198236 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -327,8 +327,9 @@
etAccount.Text = "18316672920";
etAccount.Text = "18244942707";
etAccount.Text = "1272061968@qq.com";//涓囩鍩庡競涔嬪厜E鍖�8鏍�206
- etAccount.Text = "18933160333";
- etAccount.Text = "18402017839";//wjc
+ etAccount.Text = "13533335801";
+ etAccount.Text = "13682244600";
+ etAccount.Text = "marketing@australindo.co.id";
}
else
@@ -364,9 +365,9 @@
{
etPassword.Text = "hdl123";
}
- else if(etAccount.Text == "13143792049")
+ else if(etAccount.Text == "18600200915")
{
- etPassword.Text = "BVVBQATD";
+ etPassword.Text = "ZJtiaoshi";
}else if(etAccount.Text == "13288623489")
{
etPassword.Text = "luoxiaodong";
@@ -380,9 +381,9 @@
else if (etAccount.Text == "18100573477")
{
etPassword.Text = "huang12345";
- }else if(etAccount.Text == "1272061968@qq.com")
+ }else if(etAccount.Text == "marketing@australindo.co.id")
{
- etPassword.Text = "a123456";
+ etPassword.Text = "HDLAGN2023";
}
//etPassword.Text = "Hdl85521566";
btnLogin.IsSelected = true;
@@ -947,7 +948,7 @@
{
sid = "airSwitchP3000000000001",
deviceId = "airSwitchP3000000000001",
- name = "娴嬭瘯-涓夌浉鏅鸿兘绌哄紑",
+ name = "娴嬭瘯-涓夌浉鏅鸿兘绌哄紑",
spk = SPK.AirSwitchP3,
roomIds = new List<string>() { "1405771024583090178" },
attributes = new List<FunctionAttributes>()
@@ -973,7 +974,7 @@
new FunctionAttributes() { key = FunctionAttributeKey.ElectricityC,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
new FunctionAttributes() { key = FunctionAttributeKey.TotalElectricity,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
},
- collect=true,
+ //collect = true,
};
airSwitchP3.SaveFunctionFile();
@@ -1077,7 +1078,7 @@
{
name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺鎬绘帶",
spk = SPK.AcstParent,
- collect = true,
+ //collect = true,
attributes = new List<FunctionAttributes>()
{
new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
@@ -1202,7 +1203,7 @@
new FunctionAttributes(){ key = "enable",curValue = "true",state = "true" },
new FunctionAttributes(){ key = "people_num",curValue = "0",state = "0" },
new FunctionAttributes(){ key = "people_id",curValue = "1",state = "1" },
- new FunctionAttributes(){ key = "target_status",curValue = "0",state = "0" },//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔�
+ new FunctionAttributes(){ key = "target_status",curValue = "1",state = "1" },//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔�
new FunctionAttributes(){ key = "people_status",curValue = "false",state = "false" },//鐘舵�� 鏈変汉鏃犱汉
//new FunctionAttributes(){ key = "",curValue = "",state = "" },
//new FunctionAttributes(){ key = "",curValue = "",state = "" },
@@ -1279,15 +1280,57 @@
// }
//});
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.SensorDryContact,
- // name = "骞叉帴鐐�",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
- // },
- //});
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorDryContact,
+ name = "骞叉帴鐐�",
+ //collect = true,
+ sid = "sss000001",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "contact_status",curValue= "open",state = "open" },
+ },
+ });
+
+
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.OtherCommon,
+ name = "閫氱敤寮�鍏�",
+ //collect = true,
+ sid = "sssCommon000001",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "on_off",curValue= "on",state = "off" },
+ },
+ });
+
+
+
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorPir,
+ name = "浜轰綋瀛樺湪浼犳劅鍣�1",
+ collect = true,
+ sid = "sss000001111",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "people_status",curValue= "false",state = "false" },
+ },
+ });
+
+
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorPirHold,
+ name = "浜轰綋瀛樺湪浼犳劅鍣�2",
+ collect = true,
+ sid = "sss0000011112",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "people_status",curValue= "true",state = "true" },
+ },
+ });
//FunctionList.List.Functions.Add(new Function()
//{
@@ -1312,19 +1355,19 @@
// },
//});
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.SensorHelp,
- // name = "娴嬭瘯绱ф�ユ眰鍔╂寜閽�",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
- // new FunctionAttributes(){ key = "alarm_status",curValue= "alarm",state = "alarm" },
- // new FunctionAttributes(){ key = "battery_value",curValue= "200",state = "200" },
- // new FunctionAttributes(){ key = "battery_percentage",curValue= "10",state = "10" },
- // new FunctionAttributes(){ key = "battery_state",curValue= "low",state = "low" },
- // },
- //});
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorHelp,
+ name = "娴嬭瘯绱ф�ユ眰鍔╂寜閽�",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
+ new FunctionAttributes(){ key = "alarm_status",curValue= "alarm",state = "alarm" },
+ new FunctionAttributes(){ key = "battery_value",curValue= "200",state = "200" },
+ new FunctionAttributes(){ key = "battery_percentage",curValue= "10",state = "10" },
+ new FunctionAttributes(){ key = "battery_state",curValue= "low",state = "low" },
+ },
+ });
//FunctionList.List.Functions.Add(new Function()
//{
@@ -1366,16 +1409,16 @@
// },
//});
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.SensorGas,
- // name = "鐕冩皵浼犳劅鍣�",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "enable",curValue= "true",state = "true" ,value = new List<string>(){ "true", "false" } },
- // new FunctionAttributes(){ key = "status",curValue= "normal",state = "normal" ,value = new List<string>(){ "alarm", "normal" } },
- // },
- //});
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorGas,
+ name = "鐕冩皵浼犳劅鍣�",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "enable",curValue= "true",state = "true" ,value = new List<string>(){ "true", "false" } },
+ new FunctionAttributes(){ key = "status",curValue= "normal",state = "normal" ,value = new List<string>(){ "alarm", "normal" } },
+ },
+ });
//FunctionList.List.Functions.Add(new Function() { spk = SPK.PjtIr, name = "娴嬭瘯鎶曞奖浠�",
// attributes = new List<FunctionAttributes>() {
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 2eb8498..84471ba 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -1279,7 +1279,8 @@
};
- if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
+ if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose ||
+ function.spk == SPK.SensorPir || function.spk == SPK.SensorPirHold)
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
btnIcon.SelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
@@ -1334,8 +1335,49 @@
}
btnState.Text = function.lastState;
}
+ else
+ {
+ tempStatus = function.attributes.Find((sta) => sta.key == "people_status");
+ if (tempStatus != null)
+ {
+ switch (tempStatus.state)
+ {
+ case "true":
+ function.lastState = Language.StringByID(StringId.Someone);
+ break;
+ case "false":
+ function.lastState = Language.StringByID(StringId.wuren);
+ break;
+ }
+ btnState.Text = function.lastState;
+ }
+ }
+
}
-
+
+ else if(function.spk == SPK.SensorDryContact || function.spk == SPK.SensorDryContact2)
+ {
+ btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
+ btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
+ btnName.TextColor = CSS_Color.MainBackgroundColor;
+ btnZone.TextColor = CSS_Color.MainBackgroundColor;
+ btnState.TextColor = CSS_Color.MainBackgroundColor;
+ var tempStatus = function.attributes.Find((sta) => sta.key == FunctionAttributeKey.ContactStatus);
+ if (tempStatus != null)
+ {
+ switch (tempStatus.state)
+ {
+ case "open":
+ function.lastState = Language.StringByID(StringId.DryBreak);
+ break;
+ case "close":
+ function.lastState = Language.StringByID(StringId.Shut);
+ break;
+ }
+ btnState.Text = function.lastState;
+ }
+ }
+
else
{
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
@@ -1494,13 +1536,13 @@
}
- else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
+ //else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
+ else if (SPK.ArmSensorSpkList().Contains(function.spk))
{
- //btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}.png";
- //btnIcon.SelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
- //btnIcon.IsSelected = true;
+ btnName.TextColor = CSS_Color.MainBackgroundColor;
+ btnZone.TextColor = CSS_Color.MainBackgroundColor;
btnState.SelectedTextColor = CSS_Color.MainBackgroundColor;
- btnState.TextColor = CSS_Color.MainColor;//PromptingColor1
+ btnState.TextColor = CSS_Color.MainBackgroundColor;
}
//绱ф�ユ眰鍔�
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 34599ea..7e6f261 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -430,14 +430,30 @@
}
}
}
- else if(function.spk == SPK.SensorHelp)
+ else if (function.spk == SPK.SensorHelp)
{
var tempStatus = function.attributes.Find((sta) => sta.key == FunctionAttributeKey.AlarmStatus);
- if(tempStatus != null)
+ if (tempStatus != null)
{
state = tempStatus.curValue.ToString() == "alarm";
}
}
+ else if (function.spk == SPK.SensorPir || function.spk == SPK.SensorPirHold)
+ {
+ var tempStatus = function.attributes.Find((sta) => sta.key == "people_status");
+ if (tempStatus != null)
+ {
+ state = tempStatus.curValue.ToString() == "true";
+ }
+ }
+ else if (function.spk == SPK.SensorDryContact || function.spk == SPK.SensorDryContact2)
+ {
+ var tempStatus = function.attributes.Find((sta) => sta.key == "contact_status");
+ if (tempStatus != null)
+ {
+ state = tempStatus.curValue.ToString() == "open";
+ }
+ }
else
{
state = function.trait_on_off.curValue.ToString() == "on";
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
index dc72414..8b430ad 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
@@ -652,8 +652,6 @@
#endregion
-
-
}
LoadEventList();
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
index c9d675a..ecb9937 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
@@ -7,98 +7,61 @@
{
public partial class ColorTureLampPage
{
- /// <summary>
- /// 閫氱煡鏇存柊鐣岄潰鐨勬椂闂�
- /// </summary>
- DateTime notiyUpdateTime = DateTime.MinValue;
- System.Threading.Thread updateUiThread;
- object lockObj = new object();
+
/// <summary>
/// 鏇存柊鍔熻兘鐘舵��
/// </summary>
public static void UpdataStatus(Function updataTemp)
- {
- if(bodyView == null)
+ {
+ if (bodyView == null)
{
return;
}
- lock (bodyView.lockObj)
+
+ Application.RunOnMainThread(() =>
{
- MainPage.Log($"鏀跺埌鏇存柊" + DateTime.Now.Ticks);
- bodyView.notiyUpdateTime = DateTime.Now;
- if (bodyView.updateUiThread == null)
+ try
{
- bodyView.updateUiThread = new System.Threading.Thread(() =>
+ if (bodyView == null)
+ return;
+ if (updataTemp.spk == bodyView.function.spk && updataTemp.sid == bodyView.function.sid)
{
- while (true)
+ if (updataTemp.trait_on_off.curValue.ToString() == "on")
{
- System.Threading.Thread.Sleep(1500);
- if (bodyView == null)
+ bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
+ if (!bodyView.onDimmerBar)
{
- return;
+ bodyView.dimmerBar.Progress = Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness));
}
- if (DateTime.Now.AddMilliseconds(-1500) > bodyView.notiyUpdateTime)
+ if (updataTemp.GetAttrState(FunctionAttributeKey.Brightness) != "0")
{
- MainPage.Log("娌℃湁鏂版暟鎹紝鏇存柊UI");
- break;
- }
- else
- {
- MainPage.Log("鏈夋柊鏁版嵁锛岀户缁瓑寰�");
+ bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%";
+ bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);
}
}
-
- Application.RunOnMainThread(() =>
+ else
{
- try
- {
- if (bodyView == null)
- return;
- if (updataTemp.spk == bodyView.function.spk && updataTemp.sid == bodyView.function.sid)
- {
- if (updataTemp.trait_on_off.curValue.ToString() == "on")
- {
- bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
- if (!bodyView.onDimmerBar)
- {
- bodyView.dimmerBar.Progress = Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness));
- }
- if (updataTemp.GetAttrState(FunctionAttributeKey.Brightness) != "0")
- {
- bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%";
- bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);
- }
- }
- else
- {
- bodyView.dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
- }
- bodyView.btnSwitch.IsSelected = updataTemp.trait_on_off.curValue.ToString() == "on";
- bodyView.barColorTemplatrue.Enable = updataTemp.trait_on_off.curValue.ToString() == "on";
- var cct = 27;
- int.TryParse(updataTemp.GetAttrState(FunctionAttributeKey.CCT), out cct);
- bodyView.barColorTemplatrue.Progress = cct / 100;
- //璁剧疆鍒濆鍊�
- bodyView.barColorTemplatrue.SetCustomText(bodyView.barColorTemplatrue.Progress * 100 + "K");
+ bodyView.dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
+ }
+ bodyView.btnSwitch.IsSelected = updataTemp.trait_on_off.curValue.ToString() == "on";
+ bodyView.barColorTemplatrue.Enable = updataTemp.trait_on_off.curValue.ToString() == "on";
+ var cct = 27;
+ int.TryParse(updataTemp.GetAttrState(FunctionAttributeKey.CCT), out cct);
+ bodyView.barColorTemplatrue.Progress = cct / 100;
+ //璁剧疆鍒濆鍊�
+ bodyView.barColorTemplatrue.SetCustomText(bodyView.barColorTemplatrue.Progress * 100 + "K");
- }
- }
- catch (Exception ex)
- {
- MainPage.Log($"{bodyView.GetType().Name} UpdataStates error : {ex.Message}");
- }
- finally
- {
- bodyView.updateUiThread = null;
- }
-
- });
-
- bodyView.updateUiThread.IsBackground = true;
- bodyView.updateUiThread.Start();
- });
+ }
}
- }
+ catch (Exception ex)
+ {
+ MainPage.Log($"{bodyView.GetType().Name} UpdataStates error : {ex.Message}");
+ }
+ finally
+ {
+ }
+
+ });
}
void LoadEventList()
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index 765396b..11c2daa 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -7,12 +7,6 @@
{
public partial class DimmerPage
{
- /// <summary>
- /// 閫氱煡鏇存柊鐣岄潰鐨勬椂闂�
- /// </summary>
- DateTime notiyUpdateTime = DateTime.MinValue;
- System.Threading.Thread updateUiThread;
- object lockObj = new object();
/// <summary>
/// 鏇存柊鍔熻兘鐘舵��
@@ -23,31 +17,6 @@
{
return;
}
- lock (bodyView.lockObj)
- {
- MainPage.Log($"鏀跺埌鏇存柊" + DateTime.Now.Ticks);
- bodyView.notiyUpdateTime = DateTime.Now;
- if (bodyView.updateUiThread == null)
- {
- bodyView.updateUiThread = new System.Threading.Thread(() =>
- {
- while (true)
- {
- System.Threading.Thread.Sleep(1500);
- if (bodyView == null)
- {
- return;
- }
- if (DateTime.Now.AddMilliseconds(-1500) > bodyView.notiyUpdateTime)
- {
- MainPage.Log("娌℃湁鏂版暟鎹紝鏇存柊UI");
- break;
- }
- else
- {
- MainPage.Log("鏈夋柊鏁版嵁锛岀户缁瓑寰�");
- }
- }
Application.RunOnMainThread(() =>{
try
@@ -79,16 +48,9 @@
}
finally
{
- bodyView.updateUiThread = null;
}
});
-
- bodyView.updateUiThread.IsBackground = true;
- bodyView.updateUiThread.Start();
- });
- }
- }
}
void LoadEventList()
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index e60c686..776e6d0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -6,12 +6,6 @@
{
public partial class RGBPage
{
- /// <summary>
- /// 閫氱煡鏇存柊鐣岄潰鐨勬椂闂�
- /// </summary>
- DateTime notiyUpdateTime = DateTime.MinValue;
- System.Threading.Thread updateUiThread;
- object lockObj = new object();
public override void RemoveFromParent()
{
@@ -27,31 +21,6 @@
{
return;
}
- lock (bodyView.lockObj)
- {
- MainPage.Log($"鏀跺埌鏇存柊"+ DateTime.Now.Ticks);
- bodyView.notiyUpdateTime = DateTime.Now;
- if (bodyView.updateUiThread == null)
- {
- bodyView.updateUiThread = new System.Threading.Thread(() =>
- {
- while (true)
- {
- System.Threading.Thread.Sleep(1500);
- if(bodyView == null)
- {
- return;
- }
- if (DateTime.Now.AddMilliseconds(-1500) > bodyView.notiyUpdateTime)
- {
- MainPage.Log("娌℃湁鏂版暟鎹紝鏇存柊UI");
- break;
- }
- else
- {
- MainPage.Log("鏈夋柊鏁版嵁锛岀户缁瓑寰�");
- }
- }
Application.RunOnMainThread((() =>
{
@@ -123,15 +92,9 @@
}
finally
{
- bodyView.updateUiThread = null;
}
}));
- });
- bodyView.updateUiThread.IsBackground = true;
- bodyView.updateUiThread.Start();
- }
- }
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs
index 369d3b9..a895328 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs
@@ -7,12 +7,6 @@
public partial class RGBWPage
{
/// <summary>
- /// 閫氱煡鏇存柊鐣岄潰鐨勬椂闂�
- /// </summary>
- DateTime notiyUpdateTime = DateTime.MinValue;
- System.Threading.Thread updateUiThread;
- object lockObj = new object();
- /// <summary>
/// 鏇存柊鍔熻兘鐘舵��
/// </summary>
public static void UpdataStates(Function updateTemp)
@@ -21,31 +15,6 @@
{
return;
}
- lock (bodyView.lockObj)
- {
- MainPage.Log($"鏀跺埌鏇存柊" + DateTime.Now.Ticks);
- bodyView.notiyUpdateTime = DateTime.Now;
- if (bodyView.updateUiThread == null)
- {
- bodyView.updateUiThread = new System.Threading.Thread(() =>
- {
- while (true)
- {
- System.Threading.Thread.Sleep(1500);
- if (bodyView == null)
- {
- return;
- }
- if (DateTime.Now.AddMilliseconds(-1500) > bodyView.notiyUpdateTime)
- {
- MainPage.Log("娌℃湁鏂版暟鎹紝鏇存柊UI");
- break;
- }
- else
- {
- MainPage.Log("鏈夋柊鏁版嵁锛岀户缁瓑寰�");
- }
- }
Application.RunOnMainThread(() =>
{
try
@@ -101,16 +70,9 @@
}
finally
{
- bodyView.updateUiThread = null;
}
});
-
- bodyView.updateUiThread.IsBackground = true;
- bodyView.updateUiThread.Start();
- });
- }
- }
}
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