合并wjc

wxr

2021-11-30 358044c907e0e492b26377b21ca5091d19b503c8

 HDL_ON/UI/MainPage.cs

@@ -120,7 +120,8 @@
        /// </summary>
        public static List<string> RoomNotSupportFunctionList
        {
            get {
      get
      {
                if(_RoomNotSupportFunctionList == null)
                {
                    _RoomNotSupportFunctionList = new List<string>();
@@ -145,9 +146,6 @@

                BaseView = Application.MainPage;
                Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
                ///监听经纬度
                HDL_ON.UI.UI2.Intelligence.Automation.LogicMethod.CurrLogicMethod.AppLatAndLonEvent();

                //#region 测试
                //var ddd = new UI.test.TestDialog();
                //ddd.InitView();
@@ -281,7 +279,8 @@
                StartX = (int)e.X;
                BtnBackIcon.Y = (int)e.Y + Application.GetRealHeight(50);
            };
            backView.MouseUpEventHandler = (sender, e) => {
      backView.MouseUpEventHandler = (sender, e) =>
      {
                MainPage.Log($"up{e.X}");
                StartX = 0;
                BtnBackIcon.X = -Application.GetRealWidth(100);
@@ -294,7 +293,8 @@
                    }
                }
            };
            backView.MouseUpOutsideEventHandler = (sender, e) => {
      backView.MouseUpOutsideEventHandler = (sender, e) =>
      {
                MainPage.Log($"up{e.X}");
                StartX = 0;
                BtnBackIcon.X = -Application.GetRealWidth(100);
@@ -370,7 +370,8 @@
                catch (Exception ex)
                {
                    MainPage.Log($"GoUserPage : {ex.Message}");
                }finally
        }
        finally
                {
                    Application.RunOnMainThread(() =>
                    {
@@ -427,11 +428,13 @@
                                if (view.Tag.ToString() != "unlockpage")
                                {
                                    view.RemoveFromParent();
                                }else
                }
                else
                                {
                                    result = 2;
                                }
                            }else
              }
              else
                            {
                                view.RemoveFromParent();
                            }