From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Common/House.cs | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index 7da0b22..d8a2c06 100755
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -55,6 +55,10 @@
/// 绾害
/// </summary>
public double Latitude = 0;
+ /// <summary>
+ /// 浣忓畢鎵�鍦ㄧ殑鍦扮悊浣嶇疆鐨勫悕绉�
+ /// </summary>
+ public string ResidenceAddressName = string.Empty;
/// <summary>
/// 鎴块棿鍒楄〃(鎴块棿鐨処D)
@@ -70,7 +74,7 @@
/// <summary>
/// 褰撳墠妤煎眰Id
/// </summary>
- public string CurrentFloorId;
+ public string CurrentFloorId = string.Empty;
/// <summary>
/// 鍏ㄥ眬鍦烘櫙璺緞鍒楄〃---澶囩敤
@@ -278,11 +282,7 @@
{
//娓呯┖褰撳墠浣忓畢鍒楄〃
Config.Instance.HomeFilePathList.Clear();
- if (Config.Instance.HomeId == string.Empty && responseDataObj.PageData.Count > 0)
- {
- //璧嬩竴涓垵濮嬪��
- Config.Instance.HomeId = responseDataObj.PageData[0].Id;
- }
+ var listHouse = new List<House>();
foreach (var residence in responseDataObj.PageData)
{
Config.Instance.HomeFilePathList.Add($"House_{residence.Id}.json");
@@ -312,11 +312,23 @@
}
Global.CreateHomeDirectory(residence.Id);
house.Save(false);
+ listHouse.Add(house);
}
- //鍖归厤褰撳墠浣忓畢
- if (Config.Instance.HomeFilePathList.Find((obj) => obj == $"House_{Config.Instance.HomeId}.json") == null)
+ //濡傛灉鍒囨崲浜嗚处鍙�,鎴栬�呭師鏉ョ殑id涓嶅瓨鍦�,鍒欓噸缃綇瀹匢D
+ if (UserCenterResourse.ResidenceOption.TheSameLoginAccount == false ||
+ Config.Instance.HomeFilePathList.Find((obj) => obj == $"House_{Config.Instance.HomeId}.json") == null)
{
- Config.Instance.HomeId = GetHouseIdByFilePath(Config.Instance.HomeFilePathList[0]);
+ Config.Instance.HomeId = listHouse[0].Id;
+ foreach (var house in listHouse)
+ {
+ //鍒濆閫夋嫨瀹冭嚜宸辩殑浣忓畢
+ if (house.IsOthreShare == false)
+ {
+ Config.Instance.HomeId = house.Id;
+ Config.Instance.Home = House.GetHouseByHouseId(house.Id);
+ break;
+ }
+ }
}
Config.Instance.Save();
}
@@ -431,7 +443,7 @@
{
if (Config.Instance.Home.FloorDics.Count == 0)
{
- return null;
+ return string.Empty;
}
foreach (var floor in Config.Instance.Home.FloorDics)
@@ -440,8 +452,8 @@
{
return floor.Value;
}
- }
- return null;
+ }
+ return string.Empty;
}
/// <summary>
--
Gitblit v1.8.0