~wxr/OnPro.git - Gitblit

			@@ -26,7 +26,7 @@
			/// <summary>
			/// 版本号
			/// </summary>
			public static string VersionString = "1.6.2";
			public static string VersionString = "1.6.4";
			///// <summary>
			///// 客户端类型
			///// </summary>
			@@ -58,6 +58,10 @@
			/// 0:无网络
			/// </summary>
			public static int InternetStatus = 2;
			/// <summary>
			/// 连接mqtt次数
			/// </summary>
			public static int LinkHdlMqttCount = 0;
			/// <summary>
			/// 是否进入后台
			/// </summary>
			@@ -116,7 +120,7 @@
			SPK.AirFreshStandard,SPK.HvacAirFresh,
			SPK.AirSwitch,
			SPK.PanelSocket,SPK.ElectricSocket,
			SPK.MechanicalArm,
			SPK.MechanicalArm,SPK.IpCam_Imou,
			};


			@@ -137,6 +141,7 @@
			_RoomNotSupportFunctionList.Add(SPK.AirSwitch);
			_RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
			_RoomNotSupportFunctionList.Add(SPK.OtherCommon);
			_RoomNotSupportFunctionList.Add(SPK.SensorLight);
			_RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
			//_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
			}
			@@ -152,7 +157,6 @@
			Application.DesignHeight = 667;
			//设置语言环境防止string转 double出现逗号，todouble异常等问题
			System.Globalization.CultureInfo.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("zh-CN");


			BaseView = Application.MainPage;
			Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
			@@ -394,7 +398,7 @@
			{
			try
			{
			Entity.FunctionList.List.Clear();
			Entity.FunctionList.List.ClearDatas();
			Entity.SpatialInfo.CurrentSpatial.Clear();
			///等待获取住宅信息
			Application.RunOnMainThread(() =>