From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs | 256 ++++++++++++++++++++-------------------------------
1 files changed, 101 insertions(+), 155 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
index 124ab42..aa44917 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
@@ -1,10 +1,9 @@
锘縰sing System;
using System.Collections.Generic;
using System.Net;
-using System.Runtime.Remoting.Contexts;
using System.Text;
using Shared.Common;
-using Shared.Phone.Device.CommonForm;
+
namespace Shared.Phone.UserCenter.Abount
{
/// <summary>
@@ -20,11 +19,11 @@
/// <summary>
/// The web client.
/// </summary>
- public WebClient webClient=new WebClient { };
+ public WebClient webClient = new WebClient { };
/// <summary>
/// 鏇存柊涓�
/// </summary>
- public Button updatingBtn;
+ public NormalViewControl btnUpdating;
/// <summary>
/// distributedMark
/// </summary>
@@ -32,7 +31,7 @@
/// <summary>
/// updateRow
/// </summary>
- public DeviceInfoRow updateRow;
+ public FrameRowControl rowUpdate;
/// <summary>
/// 涓嬭浇瀹夊崜apk鐨刡yte闀垮害
/// </summary>
@@ -40,13 +39,6 @@
#endregion
- /// <summary>
- /// Initializes a new instance of the <see cref="T:Shared.Phone.UserCenter.Abount.AbountForm"/> class.
- /// </summary>
- public AbountForm()
- {
-
- }
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
@@ -63,28 +55,9 @@
public override void CloseFormBefore()
{
#if Android
- //if (isUpdating == true)
- //{
- //var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.CancelUpdating), Language.StringByID(R.MyInternationalizationString.Cancel), Language.StringByID(R.MyInternationalizationString.Confrim));
- //alert.Show();
- //alert.ResultEventHandler += (send, e) =>
- //{
- // if (e)
- // {
- SetDownLoadBtnNoVisible();
- CancelDownLoadApkAsync();
- base.CloseFormBefore();
- //}
- // else
- // {
- // return;
- // }
- // };
- //}
- //else
- //{
- // base.CloseFormBefore();
- //}
+ SetDownLoadBtnNoVisible();
+ CancelDownLoadApkAsync();
+ base.CloseFormBefore();
#elif iOS
base.CloseFormBefore();
#endif
@@ -94,139 +67,112 @@
/// </summary>
private void InitMiddleFrame()
{
- bodyFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
- var logoFrameLayout = new FrameLayout
- {
- Height = Application.GetRealHeight(484),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
- };
- bodyFrameLayout.AddChidren(logoFrameLayout);
-
- var logoBackground = new FrameLayout
- {
- Y = Application.GetRealHeight(104),
- Width = Application.GetMinRealAverage(167),
- Height = Application.GetMinRealAverage(167),
- Gravity = Gravity.CenterHorizontal,
- BackgroundColor = ZigbeeColor.Current.GXCButtonBlackSelectedColor,
- Radius = (uint)Application.GetRealHeight(37),
- };
- logoFrameLayout.AddChidren(logoBackground);
-
- var logoBtn = new Button()
- {
- Width = Application.GetMinRealAverage(144),
- Height = Application.GetMinRealAverage(144),
- UnSelectedImagePath = "Account/Logo_White.png",
- Gravity = Gravity.Center
- };
- logoBackground.AddChidren(logoBtn);
-
- var nameBtn = new Button()
- {
- Y = Application.GetRealHeight(294),
- Width = Application.GetRealWidth(700),
- Height = Application.GetRealHeight(60),
- Gravity = Gravity.CenterHorizontal,
- Text = "HDL Home",
- TextSize = 15,
- TextColor = ZigbeeColor.Current.GXCTextDeepBlackColor
- };
- logoFrameLayout.AddChidren(nameBtn);
-
- var versionBtn = new Button()
- {
- Y = Application.GetRealHeight(366),
- Width = Application.GetRealWidth(700),
- Height = Application.GetRealHeight(50),
- Gravity = Gravity.CenterHorizontal,
- Text = $"{Language.StringByID(R.MyInternationalizationString.VersionCode)} {CommonPage.CodeIDString}",
- TextSize = 12,
- TextColor = ZigbeeColor.Current.GXCTextGrayColor
- };
- logoFrameLayout.AddChidren(versionBtn);
-
-
- var versionFL = new FrameLayout
- {
- Y = Application.GetRealHeight(510),
- Height = Application.GetRealHeight(300),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
- };
- bodyFrameLayout.AddChidren(versionFL);
-
- var SLARow = new DeviceInfoRow(12);
- SLARow.Init();
- SLARow.SetTipTitle(R.MyInternationalizationString.SLA);
- SLARow.NameText.TextAlignment = TextAlignment.CenterRight;
- versionFL.AddChidren(SLARow);
- SLARow.ClickBtn.MouseUpEventHandler += (sender, e) =>
- {
- var slaForm = new SLAForm();
- slaForm.AddForm();
- };
-
- updateRow = new DeviceInfoRow(12 + 127 + 12);
- updateRow.Init();
- updateRow.SetTipTitle(R.MyInternationalizationString.UpdateVersion);
- updateRow.NameText.TextAlignment = TextAlignment.CenterRight;
- updateRow.HideLine(true);
- updateRow.SetTitle(R.MyInternationalizationString.TheAppVersionIsNewest);
- updateRow.CanClick(false);
- updateRow.SetTitleColor(ZigbeeColor.Current.GXCTextGrayColor);
- versionFL.AddChidren(updateRow);
- updateRow.ClickBtn.MouseUpEventHandler += (sender, e) =>
+ //澶撮儴鐧借壊鑳屾櫙
+ var frameLogo = new FrameLayoutBase();
+ frameLogo.Height = Application.GetRealHeight(484);
+ frameLogo.BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
+ bodyFrameLayout.AddChidren(frameLogo);
+ //鍥炬爣鐨勫鍣�
+ var frameLogoBackground = new FrameLayoutBase();
+ frameLogoBackground.Y = Application.GetRealHeight(104);
+ frameLogoBackground.Width = this.GetPictrueRealSize(167);
+ frameLogoBackground.Height = this.GetPictrueRealSize(167);
+ frameLogoBackground.Gravity = Gravity.CenterHorizontal;
+ frameLogoBackground.BackgroundColor = ZigbeeColor.Current.GXCButtonBlackSelectedColor;
+ frameLogoBackground.Radius = (uint)Application.GetRealHeight(37);
+ frameLogo.AddChidren(frameLogoBackground);
+ //鍥炬爣
+ var btnLogo = new IconViewControl(144);
+ btnLogo.UnSelectedImagePath = "Account/Logo_White.png";
+ btnLogo.Gravity = Gravity.Center;
+ frameLogoBackground.AddChidren(btnLogo);
+ //HDL Home
+ var btnName = new NormalViewControl(700, 60, true);
+ btnName.Y = Application.GetRealHeight(294);
+ btnName.Gravity = Gravity.CenterHorizontal;
+ btnName.Text = "HDL Home";
+ btnName.TextSize = 15;
+ btnName.TextColor = ZigbeeColor.Current.GXCTextDeepBlackColor;
+ btnName.TextAlignment = TextAlignment.Center;
+ frameLogo.AddChidren(btnName);
+ //鐗堟湰鍙�
+ var btnVersion = new NormalViewControl(700, 50, true);
+ btnVersion.Y = Application.GetRealHeight(366);
+ btnVersion.Gravity = Gravity.CenterHorizontal;
+ btnVersion.Text = $"{Language.StringByID(R.MyInternationalizationString.VersionCode)} {CommonPage.CodeIDString}";
+ btnVersion.TextSize = 12;
+ btnVersion.TextColor = ZigbeeColor.Current.GXCTextGrayColor;
+ btnVersion.TextAlignment = TextAlignment.Center;
+ frameLogo.AddChidren(btnVersion);
+ //鍒楄〃鎺т欢
+ var listView = new FrameListControl(12);
+ listView.Y = frameLogo.Bottom + Application.GetRealHeight(23);
+ listView.BackgroundColor = UserCenterColor.Current.White;
+ listView.Height = Application.GetRealHeight(500);
+ bodyFrameLayout.AddChidren(listView);
+ //鏈嶅姟鍗忚
+ //var rowService = new FrameRowControl(listView.rowSpace / 2);
+ //listView.AddChidren(rowService);
+ //rowService.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.SLA), 400);
+ //rowService.AddRightArrow();
+ //rowService.AddBottomLine();
+ //鐗堟湰鏇存柊
+ this.rowUpdate = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(rowUpdate);
+ rowUpdate.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.UpdateVersion), 400);
+ rowUpdate.AddRightArrow();
+ var btnRightView = rowUpdate.AddMostRightView("", 400);
+ rowUpdate.CanClick = false;
+ rowUpdate.ButtonClickEvent += (sender, e) =>
{
UpdateVersion();
};
+ //璋冩暣妗屽竷楂樺害
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
+ //鏇存柊涓�
+ this.btnUpdating = new NormalViewControl(556, 106, true);
+ btnUpdating.Y = Application.GetRealHeight(994);
+ btnUpdating.Radius = (uint)Application.GetRealHeight(53);
+ btnUpdating.BackgroundColor = ZigbeeColor.Current.GXCDailogBackGroundColor;
+ btnUpdating.TextID = R.MyInternationalizationString.Updating;
+ btnUpdating.TextSize = 15;
+ btnUpdating.TextColor = ZigbeeColor.Current.GXCTextWhiteColor;
+ btnUpdating.Gravity = Gravity.CenterHorizontal;
+ btnUpdating.TextAlignment = TextAlignment.Center;
+ bodyFrameLayout.AddChidren(btnUpdating);
- updatingBtn = new Button()
+ //璁剧疆杩涘害鎺т欢涓嶅彲瑙�
+ this.SetDownLoadBtnNoVisible();
+
+ //妫�娴嬫柊鐗堟湰
+ HdlThreadLogic.Current.RunThread(async () =>
{
- Y = Application.GetRealHeight(994),
- Width = Application.GetRealWidth(556),
- Height = Application.GetRealHeight(106),
- Radius=(uint)Application.GetRealHeight(53),
- BackgroundColor=ZigbeeColor.Current.GXCDailogBackGroundColor,
- TextID = R.MyInternationalizationString.Updating,
- TextSize=15,
- TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
- Gravity=Gravity.CenterHorizontal
- };
- bodyFrameLayout.AddChidren(updatingBtn);
-
- SetDownLoadBtnNoVisible();
- CheckVersion();
- }
-
- /// <summary>
- /// CheckVersion
- /// </summary>
- private void CheckVersion()
- {
- new System.Threading.Thread(async () =>
- {
- var re = await CanUpdateAsync();
- if (re)
+ var result = await CanUpdateAsync();
+ HdlThreadLogic.Current.RunMain(() =>
{
- Application.RunOnMainThread(() =>
+ if (result)
{
- updateRow.CanClick(true);
- updateRow.SetTitleColor(ZigbeeColor.Current.GXCButtonSelectedColor);
- updateRow.SetTitle(R.MyInternationalizationString.Update);
- });
- }
- })
- { IsBackground = true }.Start();
+ //鏇存柊鏈�鏂扮増
+ btnRightView.TextID = R.MyInternationalizationString.Update;
+ rowUpdate.CanClick = true;
+ }
+ else
+ {
+ btnRightView.TextID = R.MyInternationalizationString.TheAppVersionIsNewest;
+ }
+ });
+ });
}
+
/// <summary>
/// 璁剧疆杩涘害鎺т欢涓嶅彲瑙�
/// </summary>
private void SetDownLoadBtnNoVisible()
{
isUpdating = false;
- updatingBtn.Visible = false;
+ btnUpdating.Visible = false;
}
/// <summary>
/// 璁剧疆杩涘害鎺т欢鍙
@@ -234,8 +180,8 @@
private void SetDownLoadBtnVisible()
{
isUpdating = true;
- updatingBtn.Visible = true;
- updateRow.CanClick(false);
+ btnUpdating.Visible = true;
+ rowUpdate.CanClick = false;
}
/// <summary>
@@ -259,7 +205,7 @@
}
var newVersion = results[0]["version"]?.ToString();
var updateContent = results[0]["releaseNotes"]?.ToString();
- if (newVersion != CommonPage.CodeIDString)
+ if (newVersion.CompareTo(CommonPage.CodeIDString) > 0)
{
return true;
}
@@ -499,7 +445,7 @@
Application.RunOnMainThread(() =>
{
SetDownLoadBtnVisible();
- updatingBtn.Text = $"{ Language.StringByID(R.MyInternationalizationString.Updating)} {(int)(e.BytesReceived / (float)ApkBytesTotalLength * 100)}%";
+ btnUpdating.Text = $"{ Language.StringByID(R.MyInternationalizationString.Updating)} {(int)(e.BytesReceived / (float)ApkBytesTotalLength * 100)}%";
});
}
}
--
Gitblit v1.8.0