From 3aa397ab145382935492b11c1f18c9634e69910b Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 10 十二月 2020 16:45:00 +0800
Subject: [PATCH] 请合并，门锁和晾衣架第一版代码
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 105 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs
similarity index 85%
rename from ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs
index 50c2d74..3484cb6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 浣忓畢绠＄悊鐨勭敾闈⑩槄
/// </summary>
- public class ResidenceListForm : EditorCommonForm
+ public class ResidenceListMainForm : EditorCommonForm
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -250,14 +250,32 @@
//鍒嗕韩鐨�,涓嶈兘鏇存敼
return;
}
- //杩囨埛
- var btnTransfer = rowLayout.AddDeleteControl();
- btnTransfer.TextID = R.MyInternationalizationString.uTransfer;
- btnTransfer.ButtonClickEvent += (sender, e) =>
+ //鍙湁鍒囨崲鍒板綋鍓嶄綇瀹�,骞朵笖鏈湴鎷ユ湁缃戝叧鐨勬椂鍊�,鎵嶈兘杩囨埛
+ if (info.Id == Config.Instance.Home.Id && HdlGatewayLogic.Current.GetAllLocalGateway().Count > 0)
{
- var form = new TransferResidenceMainForm();
- form.AddForm();
- };
+ //杩囨埛
+ var btnTransfer = rowLayout.AddDeleteControl();
+ btnTransfer.TextID = R.MyInternationalizationString.uTransfer;
+ btnTransfer.ButtonClickEvent += (sender, e) =>
+ {
+ rowLayout.HideMenu();
+ HdlCheckLogic.Current.CheckSecondarySecurity(() =>
+ {
+ //鎵ц杩囨埛鎿嶄綔
+ this.DoTransferResidence();
+ },
+ () =>
+ {
+ //璇峰墠寰�涓汉涓績{0}璁剧疆浜屾瀹夊叏楠岃瘉鏂瑰紡
+ string msg = Language.StringByID(R.MyInternationalizationString.uGotoCenterAndSetSecondAuthentication).Replace("{0}", "\r\n");
+ this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+ {
+ var form = new UserMain.SecondAuthenticationForm();
+ form.AddForm();
+ });
+ });
+ };
+ }
//鏇存敼
var btnChanged = rowLayout.AddEditorControl();
btnChanged.TextID = R.MyInternationalizationString.uChanged1;
@@ -558,6 +576,85 @@
#endregion
+ #region 鈻� 杩囨埛_______________________________
+
+ /// <summary>
+ /// 鎵ц杩囨埛鎿嶄綔
+ /// </summary>
+ private void DoTransferResidence()
+ {
+ this.ShowProgressBar();
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //妫�娴嬪畠鏈夋病鏈夊浠�
+ 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