From bd428f23e1eb103c19ebbf1f0165f9e2e7b0a9d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 五月 2023 09:11:18 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr' into Dev-Branch
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
index 5cb1eb4..0f80995 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
@@ -391,6 +391,9 @@
};
transferRow.AddChidren(btnTrasferSkinIcon);
#endregion
+
+ LoadEvent_SkipAdminMigrationConfirmPage();
+ LoadEvent_SkipTransferConfirmPage();
}
#region 璋冭瘯鏉冮檺
@@ -448,15 +451,24 @@
btnCommissioningAuthoritySwitchIcon.IsSelected = DB_ResidenceData.Instance.CurrentRegion.debugPerm;
new System.Threading.Thread(() =>
{
- new DAL.Server.HttpServerRequest().ChangeResidenceDebugPerm(DB_ResidenceData.Instance.CurrentRegion.debugPerm);
+ var pack = new DAL.Server.HttpServerRequest().ChangeResidenceDebugPerm(DB_ResidenceData.Instance.CurrentRegion.debugPerm);
+ if(pack != null)
+ {
+ if(pack.Code == DAL.Server.StateCode.SUCCESS)
+ {
+ DB_ResidenceData.Instance.CurrentRegion.debugStatus = DB_ResidenceData.Instance.CurrentRegion.debugPerm ? "SECONDARY_DEBUGGIN" : "Delivered";
+ Application.RunOnMainThread(() => {
+ bodyView.RemoveAll();
+ LoadPage();
+ });
+ }
+ }
})
{ IsBackground = true }.Start();
};
#endregion
- LoadEvent_SkipAdminMigrationConfirmPage();
- LoadEvent_SkipTransferConfirmPage();
}
//璋冭瘯瀹屾垚 鎵嶈兘鍔犺浇浜岀淮鐮�
else if (DB_ResidenceData.Instance.CurrentRegion.deliverStatus == "WAIT_DELIVERED")
--
Gitblit v1.8.0