From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs
index b00607f..2b6a909 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs
@@ -50,7 +50,7 @@
var frameBack = new FrameLayout();
frameBack.Width = Application.GetRealWidth(850);
frameBack.Height = Application.GetRealHeight(1342);
- frameBack.Radius = 6;
+ frameBack.Radius = (uint)Application.GetRealHeight(17);
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Gravity = Gravity.CenterHorizontal;
frameBack.Y = Application.GetRealHeight(328);
@@ -59,11 +59,11 @@
this.listView = new VerticalListControl(3);
listView.Y = Application.GetRealHeight(164 - 11);
listView.Height = frameBack.Height - Application.GetRealHeight(164 - 11);
- listView.Radius = frameBack.Radius;
+ listView.Radius = (uint)Application.GetRealHeight(17);
frameBack.AddChidren(listView);
//璇烽�夋嫨鍖哄彿
- var btnTitle = new NormalViewControl(230, 60, true);
+ var btnTitle = new NormalViewControl(270, 60, true);
btnTitle.X = ControlCommonResourse.XXLeft;
btnTitle.Y = Application.GetRealHeight(69);
btnTitle.TextID = R.MyInternationalizationString.uPleaseSelectAreaCode;
@@ -77,12 +77,6 @@
btnSearch.Y = Application.GetRealHeight(46);
frameBack.AddChidren(btnSearch);
btnSearch.BindEvent(this.SearchEvent);
-
- HdlThreadLogic.Current.RunThread(() =>
- {
- //鍒濆鍖栧湴鍖哄垪琛�
- this.InitAreaList();
- });
//璁╄繖涓寜閽繖涓尯鍩熶笉鑳界偣鍑昏彍鍗�
var frameTemp = new FrameLayout();
@@ -102,6 +96,12 @@
}
this.CloseForm();
};
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鍒濆鍖栧湴鍖哄垪琛�
+ this.InitAreaList();
+ });
}
#endregion
@@ -111,7 +111,7 @@
/// <summary>
/// 鍒濆鍖栧湴鍖哄垪琛�
/// </summary>
- private async void InitAreaList()
+ private void InitAreaList()
{
if (listAreaCode == null)
{
@@ -121,10 +121,10 @@
//鑾峰彇鍏ㄩ儴鐨勫湴鍖轰唬鐮佸垪琛�
var Pra = new { Common.CommonPage.RequestVersion };
- string result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetAreaCode", false, Pra);
+ string result = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetAreaCode", false, Pra);
//鍏抽棴杩涘害鏉�
ProgressBar.Close();
- if (result == null)
+ if (string.IsNullOrEmpty(result) == true)
{
return;
}
@@ -300,9 +300,9 @@
//妗屽竷鎺т欢
this.Width = Application.GetRealWidth(458);
this.Height = Application.GetRealHeight(104);
- this.Radius = 6;
+ this.Radius = (uint)Application.GetRealHeight(17);
this.BorderColor = 0xffbfc1c2;
- this.BorderWidth = (uint)Application.GetMinRealAverage(3);
+ this.BorderWidth = 1;
}
/// <summary>
--
Gitblit v1.8.0