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/ResidenceListMainForm.cs | 94 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 91 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs
old mode 100755
new mode 100644
index 93d88bc..d37511f
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs
@@ -258,11 +258,11 @@
btnTransfer.TextID = R.MyInternationalizationString.uTransfer;
btnTransfer.ButtonClickEvent += (sender, e) =>
{
+ rowLayout.HideMenu();
HdlCheckLogic.Current.CheckSecondarySecurity(() =>
{
- //楠岃瘉鎴愬姛
- var form = new Transfer.TransferResidenceMainForm();
- form.AddForm(1);
+ //鎵ц杩囨埛鎿嶄綔
+ this.DoTransferResidence();
},
() =>
{
@@ -576,6 +576,94 @@
#endregion
+ #region 鈻� 杩囨埛_______________________________
+
+ /// <summary>
+ /// 鎵ц杩囨埛鎿嶄綔
+ /// </summary>
+ private void DoTransferResidence()
+ {
+ this.ShowProgressBar();
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //缁戝畾杩樻病鏈夋垚鍔熺殑缃戝叧
+ var result2 = HdlGatewayLogic.Current.ResetComandToBindBackupGateway();
+ if (result2 == false)
+ {
+ //涓存椂杩欎箞鍐�,鏂颁簯绔氨浼氬啓鍒癛鏂囦欢浜�
+ this.ShowMassage(ShowMsgType.Tip, "缁戝畾缃戝叧澶辫触,璇烽噸鏂版搷浣�");
+ this.CloseProgressBar();
+ return;
+ }
+ //妫�娴嬪畠鏈夋病鏈夊浠�
+ var listBack = HdlBackupLogic.Current.GetBackupListNameFromDB();
+ this.CloseProgressBar();
+
+ if (listBack == null)
+ {
+ return;
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ if (listBack.Count > 0)
+ {
+ var form = new Transfer.TransferResidenceMainForm();
+ form.AddForm(1);
+ }
+ else
+ {
+ //妫�娴嬪埌杩樻病鏈夊浠�,璇峰厛澶囦唤
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uIsNotHadBackupByCheckPleaseBackup));
+
+ //鐢熸垚涓�涓脊绐楃敾闈�
+ this.ShowDialogInputForm(Language.StringByID(R.MyInternationalizationString.uAddBackup),
+ Config.Instance.Home.Name,
+ Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName), (dialogForm, textValue) =>
+ {
+ //鐢婚潰鍏抽棴
+ dialogForm.CloseDialog();
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鍒涘缓涓�涓浠藉悕瀛�
+ string backupClassId = HdlBackupLogic.Current.CreatNewBackupNameToDB(textValue);
+ if (backupClassId == null)
+ {
+ //鍒涘缓澶囦唤鍚嶅瓧澶辫触
+ string msg = Language.StringByID(R.MyInternationalizationString.uCreatBackupNameFail);
+ this.ShowMassage(ShowMsgType.Error, msg);
+
+ return;
+ }
+
+ //涓婁紶鏁版嵁鍒颁簯绔�
+ bool result = HdlBackupLogic.Current.UpLoadBackupFileToDB(backupClassId);
+ if (result == false)
+ {
+ //鏂囦欢涓婁紶澶辫触
+ string msg = Language.StringByID(R.MyInternationalizationString.uFileUpLoadFail);
+ this.ShowMassage(ShowMsgType.Error, msg);
+
+ //濡傛灉涓婁紶澶辫触鐨勮瘽锛屽氨鎶婂畠鍒犻櫎
+ HdlBackupLogic.Current.DeleteDbBackupData(backupClassId);
+
+ return;
+ }
+
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var form = new Transfer.TransferResidenceMainForm();
+ form.AddForm(1);
+ });
+ });
+ });
+ }
+ });
+ });
+ }
+
+ #endregion
+
#region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
--
Gitblit v1.8.0