From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。
---
ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs
index 2d30198..31bf22d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs
@@ -37,7 +37,7 @@
bodyFrameLayout.Height = ControlCommonResourse.TopMenuFrameHeight + ControlCommonResourse.TopFrameHeight
+ ControlCommonResourse.BodyFrameHeight;
- var btnPic = new NormalViewControl(991, 438, true);
+ var btnPic = new PicViewControl(991, 438, true);
btnPic.UnSelectedImagePath = "Item/AutoBackup.png";
btnPic.Y = Application.GetRealHeight(374);
bodyFrameLayout.AddChidren(btnPic);
@@ -76,7 +76,7 @@
btnBackup.Gravity = Gravity.CenterHorizontal;
btnBackup.TextAlignment = TextAlignment.Center;
btnBackup.Text = Language.StringByID(R.MyInternationalizationString.uImmediatelyBackup) + "(" + Language.StringByID(R.MyInternationalizationString.uRecommendation) + ")";
- frameback.AddChidren(btnBackup, ChidrenBindMode.BindEventOnly);
+ frameback.AddChidren(btnBackup, ChidrenBindMode.BindEvent);
frameback.ButtonClickEvent += (sender, e) =>
{
HdlThreadLogic.Current.RunThread(() =>
@@ -100,7 +100,8 @@
bodyFrameLayout.AddChidren(btnRemind);
btnRemind.ButtonClickEvent += (sender, e) =>
{
- HdlAutoBackupLogic.SaveBackupNotPrompted(false, 3);
+ //涓�澶╀箣鍐呬笉鍐嶆彁閱�
+ HdlAutoBackupLogic.SaveBackupNotPrompted(false, 1);
this.CloseForm();
};
}
@@ -112,9 +113,9 @@
/// <summary>
/// 涓婁紶鏁版嵁
/// </summary>
- private async void UpLoadBackupInfo()
+ private void UpLoadBackupInfo()
{
- int result = await HdlAutoBackupLogic.DoUpLoadAutoBackupData();
+ int result = HdlAutoBackupLogic.DoUpLoadAutoBackupDataByHand();
if (result == -1)
{
//鏂囦欢涓婁紶澶辫触
@@ -127,7 +128,7 @@
string msg2 = Language.StringByID(R.MyInternationalizationString.uSynchronizeDataToServiceSuccessMsg);
this.ShowMassage(ShowMsgType.Tip, msg2);
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
this.CloseForm();
});
--
Gitblit v1.8.0