From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL_ON/UI/MainPage.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 0b32010..64b1e92 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.6.0";
+ public static string VersionString = "1.6.1";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -36,6 +36,11 @@
///
/// </summary>
public static Entity.CityInfo cityInfo = new Entity.CityInfo();
+ /// <summary>
+ /// 鍩庡競澶╂皵淇℃伅antion
+ /// </summary>
+ public static Action CityWeatherAction = null;
+
/// <summary>
/// 澶╂皵鍒锋柊action
/// </summary>
@@ -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