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

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

 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 = (uint)Application.GetMinRealAverage(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,13 +77,6 @@
            btnSearch.Y = Application.GetRealHeight(46);

            frameBack.AddChidren(btnSearch);

            btnSearch.BindEvent(this.SearchEvent);



            new System.Threading.Thread(() =>

            {

                //初始化地区列表

                this.InitAreaList();

            })

            { IsBackground = true }.Start();



            //让这个按钮这个区域不能点击菜单

            var frameTemp = new FrameLayout();
@@ -103,6 +96,12 @@
                }

                this.CloseForm();

            };



            HdlThreadLogic.Current.RunThread(() =>

            {

                //初始化地区列表

                this.InitAreaList();

            });

        }



        #endregion

@@ -112,7 +111,7 @@
        /// <summary>

        /// 初始化地区列表

        /// </summary>

        private async void InitAreaList()

        private void InitAreaList()

        {

            if (listAreaCode == null)

            {

@@ -122,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;

                }

@@ -301,9 +300,9 @@
                //桌布控件

                this.Width = Application.GetRealWidth(458);

                this.Height = Application.GetRealHeight(104);

                this.Radius = (uint)Application.GetMinRealAverage(6);

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

                this.BorderColor = 0xffbfc1c2;

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

                this.BorderWidth = 1;

            }



            /// <summary>
@@ -370,7 +369,7 @@
            /// </summary>
            private void StartSearchKeysThead()

            {

                new System.Threading.Thread(() =>

                HdlThreadLogic.Current.RunThread(() =>

                {

                    while (this.Parent != null)

                    {

@@ -396,8 +395,7 @@
                        //如果当前的检索键值与下一个检索键值不一样的话

                        //那就说明，用户再次输入了键值，这个时候，让线程继续跑下去

                    }

                })

                { IsBackground = true }.Start();

                });

            }

            #endregion