请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs

@@ -63,7 +63,7 @@
            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;

                }

@@ -302,7 +302,7 @@
                this.Height = Application.GetRealHeight(104);

                this.Radius = (uint)Application.GetRealHeight(17);

                this.BorderColor = 0xffbfc1c2;

                this.BorderWidth = (uint)Application.GetMinRealAverage(3);

                this.BorderWidth = 1;

            }



            /// <summary>