From d87400af518ebc9274f4447f06476959c3aa5102 Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期二, 14 七月 2020 16:29:42 +0800 Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs index cb8e6e2..2b6a909 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs @@ -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; } -- Gitblit v1.8.0