From 76f93f093282d72e97894132277d3412b6bf8bea Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 20 九月 2022 13:31:27 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL_ON/UI/MainPage.cs | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 0b32010..eb5fa78 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -37,6 +37,11 @@
/// </summary>
public static Entity.CityInfo cityInfo = new Entity.CityInfo();
/// <summary>
+ /// 鍩庡競澶╂皵淇℃伅antion
+ /// </summary>
+ public static Action CityWeatherAction = null;
+
+ /// <summary>
/// 澶╂皵鍒锋柊action
/// </summary>
public static Action RefreshAir;
@@ -130,6 +135,7 @@
_RoomNotSupportFunctionList.Add(SPK.AvMusic);
_RoomNotSupportFunctionList.Add(SPK.AirSwitch);
_RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
+ _RoomNotSupportFunctionList.Add(SPK.OtherCommon);
_RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
//_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
}
--
Gitblit v1.8.0