From 321d2f007c7f85e933b3f90266af07e10c6b4658 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 十二月 2020 21:06:20 +0800
Subject: [PATCH] 2020-12-03 1.修改推送ID保存方法
---
HDL_ON/Entity/DB_ResidenceData.cs | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 148d6bd..e20e883 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -35,6 +35,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;
@@ -131,18 +147,20 @@
{
sid = "030101123456780202010005ABCD",
name = "鐏厜1",
- function = new List<FunctionAttributes>() {
+ attributes = new List<FunctionAttributes>() {
new FunctionAttributes { key="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
},
- roomIdList = new List<string>() { "0001" },
+ roomIds = new List<string>() { "0001" },
bus_Data = new BusData
{
- SubnetID = 42,
- DeviceID = 6,
- LoopID = 1,
+ addresses = "2A06",
+ loopId = 1,
},
}.SaveFunctionData();
+
+
+
@@ -535,6 +553,7 @@
foreach (var r in rooms)
{
r.GetRoomFunctions(true);
+ r.GetRoomScenes(true);
}
}
catch (Exception ex)
--
Gitblit v1.8.0