From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
index e1f7466..7b0dbfb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
@@ -45,7 +45,7 @@
/// </summary>
public AbountForm()
{
-
+
}
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
@@ -150,23 +150,25 @@
var versionFL = new FrameLayout
{
Y = Application.GetRealHeight(510),
- Height = Application.GetRealHeight(300),
+ //Height = Application.GetRealHeight(300),
+ Height = Application.GetRealHeight(300-127-12),
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();
- };
+ //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 = new DeviceInfoRow(12 + 127 + 12);
+ updateRow = new DeviceInfoRow(12);
updateRow.Init();
updateRow.SetTipTitle(R.MyInternationalizationString.UpdateVersion);
updateRow.NameText.TextAlignment = TextAlignment.CenterRight;
@@ -180,7 +182,7 @@
UpdateVersion();
};
-
+
updatingBtn = new Button()
{
Y = Application.GetRealHeight(994),
@@ -194,7 +196,7 @@
Gravity=Gravity.CenterHorizontal
};
bodyFrameLayout.AddChidren(updatingBtn);
-
+
SetDownLoadBtnNoVisible();
CheckVersion();
}
@@ -247,7 +249,6 @@
#if iOS
try
{
- CommonPage.Loading.Start();
var versionResult = await RequestHttpsiOSAppVersionAsync();
if (versionResult == null || versionResult.Results == null)
{
@@ -264,14 +265,13 @@
{
return true;
}
- retuun false;
+ return false;
}
catch
{
- return false;
-
+ return false;
}
-
+
#elif Android
try
{
@@ -300,7 +300,7 @@
private async void UpdateVersion()
{
#if iOS
- CommonPage.Instance.OpenUrl();
+ OpenUrl();
#elif Android
try
{
@@ -351,7 +351,7 @@
/// 鑾峰彇iOS-APP鐗堟湰淇℃伅
/// </summary>
/// <returns>The https app version async.</returns>
- public async System.Threading.Tasks.Task<ResponseEntity.ResultPack> RequestHttpsiOSAppVersionAsync()
+ public async System.Threading.Tasks.Task<Common.ResponseEntity.ResultPack> RequestHttpsiOSAppVersionAsync()
{
try
{
@@ -361,7 +361,7 @@
{
return null;
}
- return Newtonsoft.Json.JsonConvert.DeserializeObject<ResponseEntity.ResultPack>(Encoding.UTF8.GetString(result));
+ return Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.ResultPack>(Encoding.UTF8.GetString(result));
}
catch
{
--
Gitblit v1.8.0