From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1
---
HDL_ON/Entity/DB_ResidenceData.cs | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 9f4dfd5..926fe3a 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -24,7 +24,14 @@
{
get
{
- return MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
+ if (MainPage.LocalMode)
+ {
+ return new RegionInfoRes() { Name = "鏈湴妯″紡" };
+ }
+ else
+ {
+ return MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
+ }
}
}
@@ -174,8 +181,8 @@
lastState = "20%",
bus_Data = new BusData
{
- SubnetID = 111,
- DeviceID = 2,
+ SubnetID = 42,
+ DeviceID = 9,
LoopID = 1,
},
@@ -474,8 +481,7 @@
{
MainPage.Log($"浣忓畢鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
}
- if (instance!=null) {
- instance.residenceImage = "Classification/Room/Roombg.png";}
+ instance.residenceImage = "Classification/Room/Roombg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
InitRoomFunction();
@@ -500,6 +506,10 @@
/// </summary>
bool hasChange = false;
/// <summary>
+ /// 褰撳墠浣忓畢鐨勭綉鍏矼AC
+ /// </summary>
+ public string residenceGatewayMAC = "4E47323347591243";
+ /// <summary>
/// 淇濆瓨浣忓畢鏁版嵁
/// </summary>
public void SaveResidenceData()
--
Gitblit v1.8.0