From 64dbbfe1d6488635e160189a704afccffc7d34d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 07 十二月 2020 11:33:06 +0800
Subject: [PATCH] Merge branch 'WJC'
---
HDL_ON/Entity/DB_ResidenceData.cs | 52 ++++++++++++++++------------------------------------
1 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 5410f8b..0d6b029 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -30,6 +30,22 @@
else
{
var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID);
+ if (curRegion == null)
+ {
+ if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
+ {
+ CurReginID = UserInfo.Current.regionList[0].RegionID;
+ //鎭㈠澶囦唤
+ HDLCommon.Current.RestoreHomeBackup(CurReginID);
+
+ return UserInfo.Current.regionList[0];
+ }
+ else
+ {
+ return new RegionInfoRes();
+ }
+ }
+
//if (curRegion == null)
//{
// CurReginID = UserInfo.Current.regionList[0].RegionID;
@@ -272,42 +288,6 @@
#region 鍔熻兘鏁版嵁
public static FunctionList functionList = FunctionList.List;
-
- /// <summary>
- /// 鍒锋柊浣忓畢閲岄潰鐨勬悳绱㈣澶囩姸鎬�
- /// </summary>
- public void RefreshResidenceFunctionStatus()
- {
- new Thread(() =>
- {
- try
- {
- foreach (var function in functionList.GetAllDeviceFunctionList())
- {
- Thread.Sleep(100);
- switch (function.functionCategory)
- {
- case FunctionCategory.Light:
- case FunctionCategory.Electrical:
- case FunctionCategory.SwitchDevice:
- case FunctionCategory.Curtain:
- case FunctionCategory.Thermostat:
- if (DB_ResidenceData.residenceData.GatewayType == 0)
- {
- DriverLayer.Control.Ins.SendReadCommand(function);
- }
- break;
- }
- }
- }
- catch (Exception ex)
- {
- MainPage.Log($"Refresh Residence Function Status Error : {ex.Message}");
- }
- })
- { IsBackground = true }.Start();
- }
-
#endregion
--
Gitblit v1.8.0