上传一个合并的版本

黄学彪

2020-06-01 0bf9e65bc3ba98391e7835c922b15baab3c77876

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs

@@ -42,7 +42,7 @@
            this.ClearBodyFrame();

            var listView = new VerticalListControl(29);
            listView.Height = Application.GetRealHeight(340);
            listView.Height = bodyFrameLayout.Height;
            listView.BackgroundColor = UserCenterColor.Current.White;
            bodyFrameLayout.AddChidren(listView);

@@ -74,6 +74,7 @@
            var btntext2 = row2.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uWirelessGateway), 500);
            btntext2.TextSize = 15;
            row2.AddRightArrow();

            row2.AddBottomLine();

            row2.ButtonClickEvent += (sender, e) =>

            {

                //检测住宅经纬度

@@ -97,6 +98,26 @@
                });

            };

            //Mini网关
            var row3 = new FrameRowControl(listView.rowSpace / 2);
            listView.AddChidren(row3);
            var btnIcon3 = row3.AddLeftIcon(81);
            btnIcon3.UnSelectedImagePath = "Gateway/MiniGateway.png";
            var btntext3 = row3.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uMiniGateway), 500);
            btntext3.TextSize = 15;
            row3.AddRightArrow();

            row3.ButtonClickEvent += (sender, e) =>

            {

                //检测住宅经纬度

                if (this.CheckResidencePoint() == false)

                {

                    return;

                }

                var form = new MiniGatewayDirection1Form();

                form.AddForm();

            };
            listView.AdjustRealHeight(Application.GetRealHeight(23));

            //如果还没有设置地理位置
            if (Common.Config.Instance.Home.Latitude == 0 && Common.Config.Instance.Home.Longitude == 0)

            {