From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs
index b00607f..0b1c22c 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;
                 }
@@ -140,7 +140,7 @@
                     return obj1.First.CompareTo(obj2.First);
                 });
             }
-            Application.RunOnMainThread(() =>
+            HdlThreadLogic.Current.RunMain(() =>
             {
                 //娣诲姞鍏ㄩ儴鏄庣粏琛�
                 this.AddAllDetailRow(listAreaCode);
@@ -253,7 +253,7 @@
                         listData.Add(listAreaCode[i]);
                     }
                 }
-                Application.RunOnMainThread(() =>
+                HdlThreadLogic.Current.RunMain(() =>
                 {
                     //娣诲姞鍏ㄩ儴鏄庣粏琛�
                     this.AddAllDetailRow(listData);
@@ -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