3335 修改界面跳转规则。

client_Wu Xijin

2019-04-18 e5e4ca058e22a1423c72c4d4cae5b5dffe98f53d

3335  修改界面跳转规则。

 System/WindowBase/WindowCenter.cs

@@ -77,6 +77,11 @@
            }

        }



        public WindowType GetWindowType(string name)

        {

            return windows.GetWindowType(name);

        }



        public void OpenFromLocal<T>() where T : Window

        {

            var command = new OpenCommand()

@@ -768,6 +773,18 @@
                windowKeys.Remove(key);

            }



            public WindowType GetWindowType(string key)

            {

                if (windows.ContainsKey(key))

                {

                    return windows[key].windowInfo.windowType;

                }

                else

                {

                    return WindowType.Flag;

                }

            }



        }



    }


 System/WindowJump/WindowJumpMgr.cs

@@ -80,6 +80,12 @@
        for (int i = 0; i < windowKeys.Count; i++)

        {

            var key = windowKeys[i];

            var type = WindowCenter.Instance.GetWindowType(key);

            if (type >= WindowType.Tip && type <= WindowType.Loading)

            {

                continue;

            }



            if (WindowCenter.Instance.IsOpen(key) && key != "NewBieWin")

            {

                if (!openWindows.ContainsKey(jumpPhase))


 Utility/EnumHelper.cs

@@ -139,6 +139,8 @@
    Tip = 3,

    System = 4,

    Loading = 5,



    Flag=99,

}



public enum GestureType