From 680385e9f4ddc6f9153d3b1a7b50d54878bc0884 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 18 四月 2022 15:16:39 +0800
Subject: [PATCH] 紧急面板备份
---
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_blue.png | 0
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 46 ++++++++++++++--------
HDL-ON_Android/Assets/Language.ini | 5 ++
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_white.png | 0
HDL-ON_iOS/HDL-ON_iOS.csproj | 3 +
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 2 +
HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_white.png | 0
HDL_ON/HDL_ON.projitems | 1
HDL_ON/Entity/FunctionList.cs | 9 ++++
HDL-ON_Android/HDL-ON_Android.csproj | 3 +
HDL_ON/Entity/Function/Function.cs | 16 ++++++++
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 3 +
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 4 ++
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorhelp.png | 0
HDL_ON/Common/R.cs | 5 ++
HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/sensorhelp.png | 0
HDL_ON/UI/MainPage.cs | 1
HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_blue.png | 0
19 files changed, 78 insertions(+), 20 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 5de77ae..fb3dca6 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -524,7 +524,7 @@
536=Temperature statistics
537=Humidity statistics
538=Uint
-
+539=Smart panel
1000=Room Humidity
1001=V-chip
@@ -1671,6 +1671,7 @@
536=娓╁害缁熻鍥�
537=婀垮害缁熻鍥�
538=鍗曚綅
+539=鏅鸿兘闈㈡澘
1000=瀹ゅ唴婀垮害
1001=绔ラ攣
@@ -2799,6 +2800,7 @@
536=Temperature statistics
537=Humidity statistics
538=Uint
+539=Smart panel
@@ -3951,6 +3953,7 @@
536=Temperature statistics
537=Humidity statistics
538=Uint
+539=Smart panel
1000=Humedad de ambiente
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_blue.png
new file mode 100644
index 0000000..7e5e4ac
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_white.png
new file mode 100644
index 0000000..448b3c8
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorhelp.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorhelp.png
new file mode 100644
index 0000000..cbb1b1c
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorhelp.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index e235da9..cb54ebd 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -236,6 +236,9 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_blue.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_white.png" />
<AndroidAsset Include="Assets\Phone\Public\dialogBg2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorhelp.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_white.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index c7399fb..e63fc9c 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1396,6 +1396,9 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_blue.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_white.png" />
<BundleResource Include="Resources\Phone\Public\dialogBg2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorhelp.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_white.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_blue.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_blue.png
new file mode 100644
index 0000000..7e5e4ac
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_blue.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_white.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_white.png
new file mode 100644
index 0000000..448b3c8
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_white.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/sensorhelp.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/sensorhelp.png
new file mode 100644
index 0000000..cbb1b1c
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/sensorhelp.png
Binary files differ
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 7cd6035..acf9214 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,7 +4,10 @@
{
public static class StringId
{
-
+ /// <summary>
+ /// 鏅鸿兘闈㈡澘
+ /// </summary>
+ public const int SmartPanel = 539;
/// <summary>
/// 鍗曚綅
/// </summary>
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 5f8beba..6fdb8d9 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1442,6 +1442,10 @@
public const string SenesorMegahealth = "sensor.megahealth";
public const string SenesorMegahealth2 = "sensor.megahealth.zg";
/// <summary>
+ /// 绱ф�ュ懠鍙�
+ /// </summary>
+ public const string SensorHelp = "sensor.help";
+ /// <summary>
/// 瀹夐槻浼犳劅鍣╯pk鍒楄〃
/// </summary>
/// <returns></returns>
@@ -1461,6 +1465,18 @@
spkList.Add(SensorDryContact2);
spkList.Add(SenesorMegahealth);
spkList.Add(SenesorMegahealth2);
+ spkList.Add(SensorHelp);
+ return spkList;
+ }
+
+ /// <summary>
+ /// 闈㈡澘spk鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public static List<string> PanelSpkList()
+ {
+ var spkList = new List<string>();
+ spkList.Add(SensorHelp);
return spkList;
}
#endregion
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 55d26a3..208eb41 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -87,6 +87,15 @@
var spkList = SPK.AirFreshSpkList();
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
+ /// <summary>
+ /// 闈㈡澘鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetPanelList()
+ {
+ var spkList = SPK.PanelSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
/// <summary>
/// 鑳芥簮鍒楄〃
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index cbbabbe..84c78f2 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -492,6 +492,7 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\CacWeekHistoryPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\CacDayHistoryPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\CacHistoryChoosePage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Automation\LogicMethod.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)Entity\Device\" />
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 78a70a9..b9b9bb8 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -133,6 +133,7 @@
_RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
_RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
+ _RoomNotSupportFunctionList.AddRange(SPK.PanelSpkList());
}
return _RoomNotSupportFunctionList;
}
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 90bf91a..0bb4e7c 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -626,6 +626,18 @@
// new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
// },
//});
+ 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 = "battery_value",curValue= "2000",state = "2000" },
+ new FunctionAttributes(){ key = "battery_percentage",curValue= "80",state = "80" },
+ new FunctionAttributes(){ key = "battery_state",curValue= "high",state = "high" },
+ },
+ });
//FunctionList.List.Functions.Add(new Function()
//{
@@ -649,23 +661,23 @@
//});
- FunctionList.List.Functions.Add(new Function()
- {
- spk = SPK.HvacCac,
- name = "娴嬭瘯閲戣寕娓╂帶鏋告潪",
- attributes = new List<FunctionAttributes>()
- {
- new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
- new FunctionAttributes(){ key = "mode",curValue= "cool",state = "cool" ,value = new List<string>(){ "cool", "heat" } },
- new FunctionAttributes(){ key = "set_temp",curValue= "22",state = "22" ,value = new List<string>(){},min = 0,max = 30 },
- //new FunctionAttributes(){ key = "set_temp_step",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low", "auto", "stop" } },
- new FunctionAttributes(){ key = "humidity",curValue= "0",state = "0" ,value = new List<string>(){ },min = 0,max = 100 },
- new FunctionAttributes(){ key = "room_temp",curValue= "26",state = "26" ,value = new List<string>(){ },min = 0,max = 100 },
- new FunctionAttributes(){ key = "dew_point_temp",curValue= "20",state = "20" ,value = new List<string>(){ },min = 0,max = 100 },
- new FunctionAttributes(){ key = "room_humidity",curValue= "20",state = "20" ,value = new List<string>(){ },min = 0,max = 1000 },
- //new FunctionAttributes(){ key = "tvoc",curValue= "20",state = "20" ,value = new List<string>(){ },min = 0,max = 100 },
- },
- });
+ //FunctionList.List.Functions.Add(new Function()
+ //{
+ // spk = SPK.HvacCac,
+ // name = "娴嬭瘯閲戣寕娓╂帶",
+ // attributes = new List<FunctionAttributes>()
+ // {
+ // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
+ // new FunctionAttributes(){ key = "mode",curValue= "cool",state = "cool" ,value = new List<string>(){ "cool", "heat" } },
+ // new FunctionAttributes(){ key = "set_temp",curValue= "22",state = "22" ,value = new List<string>(){},min = 0,max = 30 },
+ // //new FunctionAttributes(){ key = "set_temp_step",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low", "auto", "stop" } },
+ // new FunctionAttributes(){ key = "humidity",curValue= "0",state = "0" ,value = new List<string>(){ },min = 0,max = 100 },
+ // new FunctionAttributes(){ key = "room_temp",curValue= "26",state = "26" ,value = new List<string>(){ },min = 0,max = 100 },
+ // new FunctionAttributes(){ key = "dew_point_temp",curValue= "20",state = "20" ,value = new List<string>(){ },min = 0,max = 100 },
+ // new FunctionAttributes(){ key = "room_humidity",curValue= "20",state = "20" ,value = new List<string>(){ },min = 0,max = 1000 },
+ // //new FunctionAttributes(){ key = "tvoc",curValue= "20",state = "20" ,value = new List<string>(){ },min = 0,max = 100 },
+ // },
+ //});
//FunctionList.List.Functions.Add(new Function()
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 77796b7..c049ebd 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -709,6 +709,8 @@
#endif
break;
case ShowFunction.Panel:
+
+
break;
case ShowFunction.SecurityMonitoring:
if (!MainPage.NoLoginMode)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index cff1381..aa40d9a 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -76,7 +76,8 @@
{//闊充箰娌℃湁寮�鍏虫寜閽�
MusicFragment();
}
- else if (SPK.EvironmentSensorList().Contains(function.spk) || SPK.ArmSensorSpkList().Contains(function.spk)) //浼犳劅鍣ㄦ病鏈夊紑鍏虫寜閽�)
+ else if (SPK.EvironmentSensorList().Contains(function.spk) || SPK.ArmSensorSpkList().Contains(function.spk)
+ || SPK.PanelSpkList().Contains(function.spk)) //浼犳劅鍣ㄦ病鏈夊紑鍏虫寜閽�)
{
var powerLowTipAttr = function.attributes.Find((obj) => obj.key == FunctionAttributeKey.BatteryState);
if (powerLowTipAttr != null)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 82dbf52..9418e78 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -157,6 +157,10 @@
{
functionList.AddRange(FunctionList.List.GetAirFreshList());
}
+ else if (titleId == StringId.SmartPanel)
+ {
+ functionList.AddRange(FunctionList.List.GetPanelList());
+ }
functionList.OrderByDescending(o => o.controlCounter).ToList();
ShowFunctionRow(functionList);
diff --git a/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
similarity index 100%
rename from LogicMethod.cs
rename to HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
--
Gitblit v1.8.0