From 98ceb6bd2021f9ff136cda27eef28676dd7b5d92 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 21 五月 2020 13:24:02 +0800
Subject: [PATCH] 最后的版本
---
ZigbeeApp/Shared/Common/House.cs | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index 0627613..96aeddc 100755
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -163,14 +163,19 @@
/// <param name="houseName">House name.</param>
public static void EditorHouseByHouseId(string houseId, string houseName)
{
+ if (Config.Instance.Home.Id == houseId)
+ {
+ Config.Instance.Home.Name = houseName;
+ }
var home = GetHouseByHouseId(houseId);
if (home == null)
{
return;
}
home.Name = houseName;
- home.Save();
- Config.Instance.Save();
+ home.Save();
+ //浣忓畢淇敼鍚嶇О鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
+ Phone.UserView.UserPage.Instance.RefreshForm = true;
}
#endregion
@@ -247,13 +252,6 @@
//褰撲綇瀹呬负绌烘椂鍏堟彁绀虹敤鎴锋柊寤轰綇瀹�
var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst), Language.StringByID(R.MyInternationalizationString.Close), Language.StringByID(R.MyInternationalizationString.Confrim));
alert.Show();
- alert.ResultEventHandler += (sender, e) =>
- {
- if (e)
- {
- //
- }
- };
}
else
{
@@ -292,7 +290,7 @@
listHouse.Add(house);
}
//濡傛灉鍒囨崲浜嗚处鍙�,鎴栬�呭師鏉ョ殑id涓嶅瓨鍦�,鍒欓噸缃綇瀹匢D
- if (UserCenterResourse.ResidenceOption.TheSameLoginAccount == false ||
+ if (Config.Instance.TheSameLoginAccount == false ||
Config.Instance.HomeFilePathList.Find((obj) => obj == $"House_{Config.Instance.HomeId}.json") == null)
{
Config.Instance.HomeId = listHouse[0].Id;
@@ -403,6 +401,7 @@
/// GetCurrentFloorName
/// </summary>
/// <returns></returns>
+ [Newtonsoft.Json.JsonIgnore]
public string GetCurrentFloorName
{
get
--
Gitblit v1.8.0