From f759dc1e6f49c53733eafda82207c85af18f9931 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 28 五月 2020 15:46:54 +0800
Subject: [PATCH] 2020-05-28-1
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs | 83 ++++++++++++++++++++---------------------
1 files changed, 41 insertions(+), 42 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
index b36ff40..91d1c5e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
@@ -384,11 +384,6 @@
listDeleteId.Add(listAllRoom[i].Id);
}
}
- //濡傛灉褰撳墠閫夋嫨鐨勬埧闂存槸鍒犻櫎瀵硅薄鐨勮瘽
- if (HdlRoomLogic.Current.CurrentRoom.FloorId == keys)
- {
- HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();
- }
//鍒犻櫎鎴块棿
foreach (string roomId in listDeleteId)
{
@@ -425,6 +420,8 @@
//璋冩暣妗屽竷楂樺害
this.AdjustContrlTableHeight();
}
+ //鍒犻櫎妤煎眰鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
+ UserView.UserPage.Instance.RefreshForm = true;
});
};
}
@@ -495,6 +492,8 @@
//鏍规嵁鎸囧畾妯″紡,鍒濆鍖栨甯冩帶浠�
this.InitFrameTableByMode();
}
+ //鍒涘缓鎴栬�呬慨鏀规ゼ灞傜殑璇�,涓婚〉闇�瑕侀噸鏂板埛鏂�
+ UserView.UserPage.Instance.RefreshForm = true;
}
});
}
@@ -612,11 +611,6 @@
//纭鍒犻櫎鎴块棿?
this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uDeleteRoomMsg), () =>
{
- if (HdlRoomLogic.Current.CurrentRoom.Id == room.Id)
- {
- //濡傛灉鍒犻櫎鐨勬槸褰撳墠鎴块棿鐨勮瘽
- HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();
- }
HdlRoomLogic.Current.RemoveRoom(room.Id);
//淇濆瓨椤哄簭
this.listRoomSort.Remove(room.Id);
@@ -649,6 +643,8 @@
//璋冩暣妗屽竷楂樺害
this.AdjustContrlTableHeight();
}
+ //鍒犻櫎鎴块棿鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
+ UserView.UserPage.Instance.RefreshForm = true;
});
};
}
@@ -728,7 +724,6 @@
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
await UserCenterLogic.InitUserCenterMenmoryAndThread(false);
- HdlRoomLogic.Current.InitAllRoom();
//鍒犻櫎浣忓畢
Common.House.DeleteHouseByHouseId(deleteId);
@@ -753,45 +748,49 @@
/// <param name="addresName">浣嶇疆鍚嶇О</param>
private async void SaveResidenceAdrress(NormalViewControl btnLocation, double latitude, double longitude, string addresName)
{
- //寮�鍚繘搴︽潯
- this.ShowProgressBar();
-
- var Pra = new EditorResidencePra();
- Pra.HomeId = Common.Config.Instance.Home.Id;
- Pra.Name = Common.Config.Instance.Home.Name;
- Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- Pra.Latitude = latitude;
- Pra.Longitude = longitude;
-
- //缂栬緫浣忓畢
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", true, Pra);
- if (flage == false)
+ //濡傛灉涓嶆槸铏氭嫙浣忓畢,鎵嶆洿鏂颁簯绔�
+ if (Common.Config.Instance.Home.IsVirtually == false)
{
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
- return;
- }
- //璁剧疆鍏ㄩ儴缃戝叧鐨勪綇瀹呭湴鍧�
- var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();
- foreach (var gateway in listGateway)
- {
- ZigBee.Device.ZbGateway realWay = null;
- if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, gateway) == false)
- {
- //閿欒:缃戝叧瀵硅薄涓㈠け
- continue;
- }
- var result = HdlGatewayLogic.Current.SetGatewaySite(gateway, longitude, latitude, ShowErrorMode.YES);
- if (result == false)
+ //寮�鍚繘搴︽潯
+ this.ShowProgressBar();
+
+ var Pra = new EditorResidencePra();
+ Pra.HomeId = Common.Config.Instance.Home.Id;
+ Pra.Name = Common.Config.Instance.Home.Name;
+ Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ Pra.Latitude = latitude;
+ Pra.Longitude = longitude;
+
+ //缂栬緫浣忓畢
+ bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", true, Pra);
+ if (flage == false)
{
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
return;
}
+ //璁剧疆鍏ㄩ儴缃戝叧鐨勪綇瀹呭湴鍧�
+ var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();
+ foreach (var gateway in listGateway)
+ {
+ ZigBee.Device.ZbGateway realWay = null;
+ if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, gateway) == false)
+ {
+ //閿欒:缃戝叧瀵硅薄涓㈠け
+ continue;
+ }
+ var result = HdlGatewayLogic.Current.SetGatewaySite(gateway, longitude, latitude, ShowErrorMode.YES);
+ if (result == false)
+ {
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ return;
+ }
+ }
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
}
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
//淇濆瓨缂撳瓨
Common.Config.Instance.Home.Longitude = longitude;
Common.Config.Instance.Home.Latitude = latitude;
--
Gitblit v1.8.0