From 5d7f352aec764ceff5e0ed71e34c23492211a329 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 16 三月 2023 17:53:50 +0800
Subject: [PATCH] 组合调光开始
---
HDL-ON_Android/HDL-ON_Android.csproj | 2 +-
/dev/null | 0
HDL-ON_Android/Assets/Phone/PersonalCenter/CombinedDimmingIcon.png | 0
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs | 10 ++++++++++
HDL_ON/DAL/Mqtt/MqttClient.cs | 3 +--
HDL_ON/HDL_ON.projitems | 2 ++
6 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/CombinedDimmingIcon.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/CombinedDimmingIcon.png
new file mode 100644
index 0000000..2ccd215
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/PersonalCenter/CombinedDimmingIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/FaceManagementIcon.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/FaceManagementIcon.png
deleted file mode 100644
index 90ba0a4..0000000
--- a/HDL-ON_Android/Assets/Phone/PersonalCenter/FaceManagementIcon.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index cccb443..ef8047f 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -420,7 +420,7 @@
<AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" />
<AndroidAsset Include="Assets\h5\static\font\SourceHanSansCN-Normal.otf" />
<AndroidAsset Include="Assets\Phone\MusicIcon\currentPlayList.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\FaceManagementIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\CombinedDimmingIcon.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 383bda8..94ae641 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -446,8 +446,7 @@
}
#region 鏁版嵁鏇存柊鎺ㄩ�佷富棰�
//appHomeRefresh锛氫綇瀹呮暟鎹埛鏂伴�氱煡
- else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appHomeRefresh/up"
- || topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up")
+ else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appHomeRefresh/up")
{
MainPage.Log("浣忓畢鏁版嵁鍒锋柊閫氱煡");
new HttpServerRequest().GetHomePager();
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index dbf7c92..7639f6c 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -532,6 +532,7 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\Face\FaceManagementPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\DeliveryQrCodePage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\MemberManagement\MemberFaceManagementPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\CombinedDimmingListPage.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)Entity\Device\" />
@@ -560,5 +561,6 @@
<Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\FaceManagement\" />
<Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Acst\" />
<Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\Face\" />
+ <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
new file mode 100644
index 0000000..f15dd19
--- /dev/null
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
@@ -0,0 +1,10 @@
+锘縰sing System;
+namespace HDL_ON.UI.UI2.PersonalCenter.CombinedDimming
+{
+ public class CombinedDimmingListPage
+ {
+ public CombinedDimmingListPage()
+ {
+ }
+ }
+}
--
Gitblit v1.8.0