From 528c105b3aea0e6e00477365f16f57c1e3d7eb1c Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 24 十月 2019 15:31:28 +0800
Subject: [PATCH] 2019-10-24-3
---
ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackUpForm.cs | 153 +++++++++++++++++++++++++++-----------------------
1 files changed, 83 insertions(+), 70 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackUpForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackUpForm.cs
index 69a7b55..02888e6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackUpForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackUpForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 鑷姩澶囦唤鐨勭晫闈�
/// </summary>
- public class HdlAutoBackUpForm : UserCenterCommonForm
+ public class HdlAutoBackUpForm : EditorCommonForm
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -20,29 +20,30 @@
#region 鈻� 鍒濆鍖朹____________________________
- /// <summary>
- /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- public void ShowForm()
- {
- //璁剧疆鏍囬淇℃伅
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm()
+ {
+ //璁剧疆鏍囬淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAppAutoBackup));
-
- //鍒濆鍖栦腑閮ㄦ帶浠�
- this.InitMiddleFrame();
-
- //娣诲姞涓婁紶鑿滃崟
- this.AddUploadMenu();
+
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame();
+
+ //娣诲姞涓婁紶鑿滃崟
+ this.AddUploadMenu();
}
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄦ帶浠�
- /// </summary>
- private void InitMiddleFrame()
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄦ帶浠�
+ /// </summary>
+ private void InitMiddleFrame()
{
- bodyFrameLayout.RemoveAll();
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
- new System.Threading.Thread(async () =>
+ HdlThreadLogic.Current.RunThread(async () =>
{
//杩涘害鏉�
this.ShowProgressBar();
@@ -57,12 +58,14 @@
//鑷姩澶囦唤鍙湁涓�涓�
Application.RunOnMainThread(() =>
{
- //娣诲姞鑷姩澶囦唤鐨勮
- this.AddRowlayout(data[0]);
- this.m_BackupDeleteClassId = data[0].Id;
+ if (this.Parent != null)
+ {
+ //娣诲姞鑷姩澶囦唤鐨勮
+ this.AddRowlayout(data[0]);
+ this.m_BackupDeleteClassId = data[0].Id;
+ }
});
- })
- { IsBackground = true }.Start();
+ });
}
#endregion
@@ -76,34 +79,36 @@
private void AddRowlayout(BackupListNameInfo info)
{
//琛�
- var rowLayout = new StatuRowLayout();
+ var rowLayout = new FrameRowControl();
bodyFrameLayout.AddChidren(rowLayout);
//鍥炬爣
- var btnPoint = new RowLeftIconView();
- btnPoint.SelectedImagePath = "Center/BackupSelected.png";
+ var btnPoint = rowLayout.AddLeftIcon();
btnPoint.UnSelectedImagePath = "Center/Backup.png";
- rowLayout.AddChidren(btnPoint, ChidrenBindMode.BindEventOnly);
//澶囦唤鍚嶅瓧
- var txtText = new RowCenterView();
+ var txtText = rowLayout.AddLeftCaption("", 700);
txtText.TextID = R.MyInternationalizationString.uAutoBackupData;
- rowLayout.AddChidren(txtText, ChidrenBindMode.BindEventOnly);
+
+ //搴曠嚎
+ rowLayout.AddBottomLine();
//涓嬭浇鍥炬爣
- var btnLoad = new MostRightEmptyView();
+ var btnLoad = rowLayout.AddMostRightEmptyIcon(81, 81);
+ rowLayout.ChangedChidrenBindMode(btnLoad, ChidrenBindMode.NotBind);
//鍚敤鐐逛寒鍔熻兘
btnLoad.UseClickStatu = true;
btnLoad.UnSelectedImagePath = "Item/DownLoad.png";
btnLoad.SelectedImagePath = "Item/DownLoadSelected.png";
- rowLayout.AddChidren(btnLoad, ChidrenBindMode.NotBind);
- //涓嬭浇鍥炬爣澶彸杈逛笉濂界湅
- btnLoad.X -= Application.GetRealWidth(50);
- btnLoad.MouseUpEventHandler += (sender, e) =>
+ btnLoad.ButtonClickEvent += (sender, e) =>
{
//鏄惁瑕佷笅杞藉苟鎭㈠鏁版嵁锛�
string msg = Language.StringByID(R.MyInternationalizationString.uDownLoadAndRecoverMsg);
- this.ShowConfirmMsg(msg, "LoadBackupInfo", info.Id);
+ this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+ {
+ // 璇诲彇澶囦唤鏂囨。
+ this.LoadBackupInfo(info.Id);
+ });
};
}
@@ -115,9 +120,9 @@
/// 璇诲彇澶囦唤鏂囨。
/// </summary>
/// <param name="BackupClassId"></param>
- public void LoadBackupInfo(string BackupClassId)
+ private void LoadBackupInfo(string BackupClassId)
{
- new System.Threading.Thread(async () =>
+ HdlThreadLogic.Current.RunThread(async () =>
{
//浠庝簯绔幏鍙栧浠界殑鏂囦欢
bool result = await HdlBackupLogic.Current.LoadAppBackupInfo(BackupClassId);
@@ -125,13 +130,13 @@
{
//鏂囦欢鎭㈠澶辫触
string msg2 = Language.StringByID(R.MyInternationalizationString.uFileRecoverFail);
- this.ShowNormalMsg(msg2);
+ this.ShowMassage(ShowMsgType.Normal, msg2);
return;
}
Application.RunOnMainThread(() =>
- {
- //鍏抽棴鎵�鏈夌晫闈�
+ {
+ //鍏抽棴鎵�鏈夌晫闈�
UserCenterLogic.CloseAllOpenForm();
//鍒囨崲鍒颁富椤�
UserView.UserPage.Instance.Fresh();
@@ -139,9 +144,8 @@
//鏂囦欢鎭㈠鎴愬姛
string msg = Language.StringByID(R.MyInternationalizationString.uFileRecoverSuccess);
- this.ShowNormalMsg(msg);
- })
- { IsBackground = true }.Start();
+ this.ShowMassage(ShowMsgType.Normal, msg);
+ });
}
#endregion
@@ -153,28 +157,30 @@
/// </summary>
public void UpLoadBackupInfo()
{
- new System.Threading.Thread(async () =>
+ HdlThreadLogic.Current.RunThread(async () =>
{
int result = await HdlAutoBackupLogic.DoUpLoadAutoBackupData();
if (result == -1)
{
//鏂囦欢涓婁紶澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.uFileUpLoadFail);
- this.ShowErrorMsg(msg);
+ this.ShowMassage(ShowMsgType.Error, msg);
return;
}
//鏁版嵁鎴愬姛鍚屾鍒版湇鍔″櫒
string msg2 = Language.StringByID(R.MyInternationalizationString.uSynchronizeDataToServiceSuccessMsg);
- this.ShowTip(msg2);
+ this.ShowMassage(ShowMsgType.Normal, msg2);
Application.RunOnMainThread(() =>
{
- //鍒濆鍖栦腑閮ㄦ帶浠�
- this.InitMiddleFrame();
+ if (this.Parent != null)
+ {
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame();
+ }
});
- })
- { IsBackground = true }.Start();
+ });
}
#endregion
@@ -185,24 +191,31 @@
/// </summary>
private void AddUploadMenu()
{
- var btnIcon = new TopLayoutMostRightView();
- btnIcon.UnSelectedImagePath = "Item/More.png";
- btnIcon.SelectedImagePath = "Item/MoreSelected.png";
- topFrameLayout.AddChidren(btnIcon);
- btnIcon.MouseUpEventHandler += (sender, e) =>
+ var btnIcon = new MostRightIconControl(69, 69);
+ btnIcon.UnSelectedImagePath = "Item/More.png";
+ topFrameLayout.AddChidren(btnIcon);
+ btnIcon.InitControl();
+ btnIcon.ButtonClickEvent += (sender, e) =>
{
- var menuForm = new TopRightMenuControl(this, 1);
- menuForm.AddRowMenu(Language.StringByID(R.MyInternationalizationString.uUpLoadAutoBackUpButton), (obj) =>
- {
- //纭鏄惁涓婁紶鏁版嵁鍒版湇鍔″櫒锛�
- string msg = Language.StringByID(R.MyInternationalizationString.uSynchronizeDataToServiceMsg);
- this.ShowConfirmMsg(msg, "UpLoadBackupInfo");
- });
- //menuForm.AddRowMenu("鍒犻櫎澶囦唤", (obj) =>
- //{
- // string msg = "纭畾瑕佸垹闄よ嚜鍔ㄥ浠藉悧锛焅r\n(PS:姝ゅ姛鑳藉悗缁細鍒犻櫎)";
- // this.ShowConfirmMsg(msg, "DeleteBackId");
- //});
+ var menuForm = new TopRightMenuControl(this, 2);
+ menuForm.AddRowMenu(Language.StringByID(R.MyInternationalizationString.uUpLoadAutoBackUpButton),
+ "", "", () =>
+ {
+ //纭鏄惁涓婁紶鏁版嵁鍒版湇鍔″櫒锛�
+ string msg = Language.StringByID(R.MyInternationalizationString.uSynchronizeDataToServiceMsg);
+ this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+ {
+ UpLoadBackupInfo();
+ });
+ });
+ menuForm.AddRowMenu("鍒犻櫎澶囦唤", "", "", () =>
+ {
+ string msg = "纭畾瑕佸垹闄よ嚜鍔ㄥ浠藉悧锛焅r\n(PS:姝ゅ姛鑳藉悗缁細鍒犻櫎)";
+ this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+ {
+ DeleteBackId();
+ });
+ });
};
}
@@ -213,7 +226,7 @@
/// <summary>
/// 鍒犻櫎澶囦唤(鏆傛椂,鍚庣画浼氬垹闄�)
/// </summary>
- public async void DeleteBackId()
+ private async void DeleteBackId()
{
if (this.m_BackupDeleteClassId == null)
{
@@ -229,7 +242,7 @@
{
//鍒犻櫎澶囦唤澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.uDeleteBackupFail);
- this.ShowErrorMsg(msg);
+ this.ShowMassage(ShowMsgType.Error, msg);
return;
}
--
Gitblit v1.8.0