From 060faec7b10ad7a3ff33a3dd2453ee7ebc1bb24d Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 21 九月 2018 11:12:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/WindowJump/WindowJumpMgr.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 25ce56f..5759e78 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -49,7 +49,7 @@
public bool IsJumpState { get; private set; }
private int jumpPhase = 0;
-
+ public int jumpType { get; private set; }
public void GetPreAllOpenWin()
{
jumpPhase += 1;
@@ -79,6 +79,7 @@
{
IsJumpState = false;
jumpPhase = 0;
+ jumpType = 0;
openWindows.Clear();
jumpWinNameDict.Clear();
WindowCenter.Instance.jumpWindowCloseEvent -= CloseWindow;
@@ -833,6 +834,7 @@
IsJumpState = false;
openWindows.Clear();
jumpWinNameDict.Clear();
+ jumpType = 0;
jumpPhase = 0;
break;
}
@@ -876,9 +878,9 @@
private void SetJumpLogic<T>(int _functionalOrder = 0, bool _forceSync = true) where T : Window
{
-
string curOpenWin = typeof(T).Name;
jumpWinNameDict.Add(jumpPhase, curOpenWin);
+ jumpType = _tagWinSearchModel.Type;
switch (_tagWinSearchModel.Type)
{
case 1:
@@ -921,7 +923,7 @@
}
DebugEx.Log("鍏抽棴鐣岄潰绫诲瀷锛�" + _tagWinSearchModel.Type);
WindowCenter.Instance.jumpWindowCloseEvent -= CloseWindow;
-
+ jumpType = _tagWinSearchModel.Type;
int i = 0;
List<string> openWinlist = null;
switch (_tagWinSearchModel.Type)
--
Gitblit v1.8.0