From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs | 101 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 79 insertions(+), 22 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
index 86e3760..02092c1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
@@ -42,7 +42,7 @@
base.SetTitleText(Common.Config.Instance.Home.Name);
//涓讳汉鎴栬�呯鐞嗗憳鎵嶄細鍑虹幇杩欎釜鑿滃崟
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1 || HdlUserCenterResourse.ResidenceOption.AuthorityNo == 2)
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
{
//鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
if (Common.Config.Instance.Home.IsShowTemplate == false)
@@ -91,7 +91,7 @@
btnNowView.TextColor = UserCenterColor.Current.TextGrayColor1;
rowHome.frameTable.AddChidren(btnNowView, ChidrenBindMode.BindEvent);
//涓讳汉鎴栬�呯鐞嗗憳鎵嶄細鍑虹幇杩欎釜鑿滃崟
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1 || HdlUserCenterResourse.ResidenceOption.AuthorityNo == 2)
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
{
//鍙崇澶�
rowHome.frameTable.AddRightArrow();
@@ -103,7 +103,7 @@
btnLocation.Text = Common.Config.Instance.Home.ResidenceAddressName;
//涓讳汉鎴栬�呯鐞嗗憳鎵嶄細鍑虹幇杩欎釜鑿滃崟
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1 || HdlUserCenterResourse.ResidenceOption.AuthorityNo == 2)
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
{
rowHome.frameTable.UseClickStatu = true;
//鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
@@ -320,7 +320,7 @@
form.AddForm(keys);
};
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1 || HdlUserCenterResourse.ResidenceOption.AuthorityNo == 2)
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
{
//鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
if (Common.Config.Instance.Home.IsShowTemplate == true)
@@ -659,10 +659,14 @@
//寮�鍚繘搴︽潯
this.ShowProgressBar();
- if (Common.Config.Instance.Home.IsOtherShare == false)
+ if (Common.Config.Instance.Home.IsOthreShare == false)
{
//鍒犻櫎涓讳汉鑷繁鐨勪綇瀹�
- var result = HdlResidenceLogic.Current.DeleteCloundHouse(Common.Config.Instance.Home.Id);
+ var Pra = new DeleteResidencePra();
+ Pra.HomeId = Common.Config.Instance.Home.Id;
+ Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+
+ bool result = UserCenterLogic.GetResultStatuByRequestHttps("App/DelHome", true, Pra);
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -672,8 +676,13 @@
}
else
{
- //鍒犻櫎鍒嗕韩鐨勪綇瀹�,浣跨敤涓讳汉鐨凾oken,鎶婅嚜宸卞垹浜�
- var result = HdlMemberLogic.Current.DeleteMember(Common.Config.Instance.Guid);
+ //鍒犻櫎鍒嗕韩鐨勪綇瀹�
+ var Pra2 = new
+ {
+ HomeId = Common.Config.Instance.Home.Id,
+ PrimaryUserId = Common.Config.Instance.Home.MainUserDistributedMark
+ };
+ bool result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/SubAccountDelShareHome", false, Pra2);
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -683,29 +692,45 @@
}
//鍥犱负鍒犻櫎鐨勬槸褰撳墠鐨勪綇瀹�,鎵�浠ラ渶瑕佸厛鍒囨崲鍒板埆鐨勪綇瀹�
- var listLocalHouse = HdlResidenceLogic.Current.GetAllLocalResidenceListByDirectory();
- //鍙栦竴涓綇瀹卛d
- string houseId = string.Empty;
- foreach (var myHouse in listLocalHouse)
+ string deleteId = Common.Config.Instance.Home.Id;
+ string deleteFile = Common.Config.Instance.Home.FileName;
+ int index = 0;
+ for (; index < Common.Config.Instance.HomeFilePathList.Count; index++)
{
- houseId = myHouse.Id;
- if (houseId != Common.Config.Instance.Home.Id)
+ if (Common.Config.Instance.HomeFilePathList[index] == deleteFile)
{
- //闅忎究鍙栦竴涓拰褰撳墠浣忓畢涓嶇浉绛夌殑ID
+ //褰撳墠浣忓畢鎵�澶勭殑浣嶇疆(浣忓畢鏁拌偗瀹氬ぇ浜�1,涓嶇劧涓嶄細鍑虹幇鍒犻櫎鎸夐挳)
+ if (index == 0)
+ {
+ //鍙栦笅涓�浣�
+ index++;
+ }
+ else
+ {
+ //鍙栧墠涓�浣�
+ index--;
+ }
break;
}
}
- //褰撳墠浣忓畢ID
- string nowHouseId = Common.Config.Instance.Home.Id;
+
+ var myHouse = HdlResidenceLogic.Current.GetHouseByFilePath(Common.Config.Instance.HomeFilePathList[index]);
//鍒囨崲浣忓畢
- bool result2 = HdlResidenceLogic.Current.SwitchResidence(houseId);
- //鍒犳帀杩欎釜鏂囦欢澶�
- HdlResidenceLogic.Current.DeleteHouseMemmory(nowHouseId);
+ Common.Config.Instance.HomeId = myHouse.Id;
+ Common.Config.Instance.Home = myHouse;
+ Common.Global.CreateHomeDirectory(myHouse.Id);
+ Common.Config.Instance.Save();
+
+ //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
+ bool result2 = UserCenterLogic.InitUserCenterMenmoryAndThread(false);
if (result2 == false)
{
//寮�鍚簡璋冭瘯鍔熻兘
return;
}
+
+ //鍒犻櫎浣忓畢
+ HdlResidenceLogic.Current.DeleteHouseMemmory(deleteId);
HdlThreadLogic.Current.RunMain(() =>
{
@@ -793,16 +818,48 @@
//寮�鍚繘搴︽潯
this.ShowProgressBar();
- var result = HdlResidenceLogic.Current.EditorResidenceLongitudeAndLatitude(latitude, longitude, addresName);
- if (result == false)
+ 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 = 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();
}
+
+ //淇濆瓨缂撳瓨
+ Common.Config.Instance.Home.Longitude = longitude;
+ Common.Config.Instance.Home.Latitude = latitude;
+ Common.Config.Instance.Home.ResidenceAddressName = addresName;
+ Common.Config.Instance.Home.Save();
HdlThreadLogic.Current.RunMain(() =>
{
btnLocation.Text = addresName;
--
Gitblit v1.8.0