Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 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,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

@@ -300,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>