Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 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;

                }