请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs

@@ -148,13 +148,8 @@
                };

            }

            //定位

            var btnPosition = new NormalViewControl(Application.GetRealWidth(184), frameRow.Height, false);

            btnPosition.BackgroundColor = 0xff4a4a4a;

            btnPosition.TextAlignment = TextAlignment.Center;

            btnPosition.TextColor = UserCenterColor.Current.White;

            btnPosition.TextSize = 12;

            var btnPosition = frameRow.AddEditorControl(false);

            btnPosition.TextID = R.MyInternationalizationString.uFixedPosition;

            frameRow.AddRightView(btnPosition);

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

            {

                //发送定位命令

@@ -177,5 +172,22 @@
        }



        #endregion



        #region ■ 界面关闭___________________________



        /// <summary>

        /// 界面关闭

        /// </summary>

        public override void CloseFormBefore()

        {

            if (UserCenterResourse.listActionFormId.Contains("UserMainForm") == false)

            {

                //刷新主页

                UserView.UserPage.Instance.Fresh();

            }

            base.CloseFormBefore();

        }



        #endregion

    }

}