fix uimanager

Author: coding2233

Assets/GameFramework/UI/UIManager.cs

@@ -25,14 +25,14 @@ public sealed class UIManager :GameFrameworkModule
 		//资源管理器
 		private ResourceManager _resource;
 		//ui堆栈
-		private Stack<UIViewAttribute> _stackUiAsset = new Stack<UIViewAttribute>();
+		private Stack<AssetConfig> _stackUiAsset = new Stack<AssetConfig>();
 		//所有的uiview
-		private readonly Dictionary<UIViewAttribute, UIView> _allUiViews = new Dictionary<UIViewAttribute, UIView>();
+		private readonly Dictionary<AssetConfig, UIView> _allUiViews = new Dictionary<AssetConfig, UIView>();
 		//默认的uipath路径
-        private readonly Dictionary<int, UIViewAttribute> _uiAssetPath =
-            new Dictionary<int, UIViewAttribute>();
+        private readonly Dictionary<int, AssetConfig> _uiAssetPath =
+            new Dictionary<int, AssetConfig>();
 		//所有的uiAsset
-		private readonly Dictionary<int, UIViewAttribute> _allUiAssets = new Dictionary<int, UIViewAttribute>();
+		private readonly Dictionary<int, AssetConfig> _allUiAssets = new Dictionary<int, AssetConfig>();
 		#region 构造函数
 		public UIManager()
 		{
@@ -51,18 +51,18 @@ public UIManager()
 		#region 外部接口
 		public void Push<T>(bool allowMulti = false, params object[] parameters) where T : UIView
 		{
-		    UIViewAttribute uiViewAttribute = CheckAssetPath(typeof(T));
-			if (uiViewAttribute==null)
+		    AssetConfig assetConfig = CheckAssetPath(typeof(T));
+			if (assetConfig==null)
 				return;
 
 			if (_stackUiAsset.Count > 0)
 			{
-			    UIViewAttribute lastUiViewAttribute = _stackUiAsset.Peek();
+			    AssetConfig lastAssetConfig = _stackUiAsset.Peek();
 				//如果界面已经打开 则不在执行
-				if (Equals(lastUiViewAttribute, uiViewAttribute) && !allowMulti)
+				if (Equals(lastAssetConfig, assetConfig) && !allowMulti)
 					return;
 
-				IUIView uiView = GetUiView(lastUiViewAttribute);
+				IUIView uiView = GetUiView(lastAssetConfig);
 
 				//触发暂停事件
 				_uiPauseArgs.UIView = uiView;
@@ -71,12 +71,14 @@ public void Push<T>(bool allowMulti = false, params object[] parameters) where T
 				uiView.OnPause();
 			}
 
-		    UIViewAttribute newUIViewAttribute = uiViewAttribute;
+		    AssetConfig newAssetConfig = null;
 		    if (allowMulti)
-		        newUIViewAttribute = new UIViewAttribute(uiViewAttribute.AssetBundleName, uiViewAttribute.ViewPath);
+		        newAssetConfig = new AssetConfig(assetConfig.AssetBundleName, assetConfig.AssetPath);
+		    else
+		        newAssetConfig = assetConfig;
 
-			_stackUiAsset.Push(newUIViewAttribute);
-			UIView newUiView = GetUiView(newUIViewAttribute);
+            _stackUiAsset.Push(newAssetConfig);
+			UIView newUiView = GetUiView(newAssetConfig);
 			newUiView.OnEnter(parameters);
 
 			//触发打开事件
@@ -90,9 +92,9 @@ public void Pop(bool isDestory = false)
 			//移除当前UI
 			if (_stackUiAsset.Count > 0)
 			{
-			    UIViewAttribute lastUIViewAttribute = _stackUiAsset.Pop();
-				UIView lastUiView;
-				if (_allUiViews.TryGetValue(lastUIViewAttribute, out lastUiView))
+			    AssetConfig lastAssetConfig = _stackUiAsset.Pop();
+                UIView lastUiView;
+				if (_allUiViews.TryGetValue(lastAssetConfig, out lastUiView))
 				{
 					//触发关闭事件
 					_uiExitArgs.UIView = lastUiView;
@@ -101,7 +103,7 @@ public void Pop(bool isDestory = false)
 					lastUiView.OnExit();
 					if (isDestory)
 					{
-						_allUiViews.Remove(lastUIViewAttribute);
+						_allUiViews.Remove(lastAssetConfig);
 						MonoBehaviour.Destroy(lastUiView);
 					}
 					else
@@ -111,9 +113,9 @@ public void Pop(bool isDestory = false)
 
 			if (_stackUiAsset.Count > 0)
 			{
-			    UIViewAttribute uiViewAttribute = _stackUiAsset.Peek();
-			    UIView lastUiView;
-			    if (_allUiViews.TryGetValue(uiViewAttribute, out lastUiView))
+			    AssetConfig lastAssetConfig = _stackUiAsset.Peek();
+                UIView lastUiView;
+			    if (_allUiViews.TryGetValue(lastAssetConfig, out lastUiView))
 			    {
 			        lastUiView.OnResume();
 			        //触发恢复事件
@@ -129,40 +131,41 @@ public void Pop(bool isDestory = false)
 
 		#region 内部函数
 		//检查路径
-		private UIViewAttribute CheckAssetPath(Type t)
+		private AssetConfig CheckAssetPath(Type t)
 		{
-			int hashCode = t.GetHashCode();
+		    int hashCode = t.GetHashCode();
 
-		    UIViewAttribute uiViewAttribute=null;
-            if (!_uiAssetPath.TryGetValue(hashCode, out uiViewAttribute))
-			{
-				object[] attrs = t.GetCustomAttributes(typeof(UIViewAttribute), false);
-				if (attrs.Length == 0)
-					return null;
-			    uiViewAttribute = (UIViewAttribute)attrs[0];
-				if (string.IsNullOrEmpty(uiViewAttribute.ViewPath)
-				|| string.IsNullOrEmpty(uiViewAttribute.AssetBundleName))
-					return null;
-			}
-			return uiViewAttribute;
-		}
+		    AssetConfig assetCofig = null;
+            if (!_uiAssetPath.TryGetValue(hashCode, out assetCofig))
+		    {
+		        object[] attrs = t.GetCustomAttributes(typeof(UIViewAttribute), false);
+		        if (attrs.Length == 0)
+		            return null;
+		        UIViewAttribute uIViewAttribute = attrs[0] as UIViewAttribute;
+
+                if (string.IsNullOrEmpty(uIViewAttribute?.ViewPath) || string.IsNullOrEmpty(uIViewAttribute.AssetBundleName))
+		            return null;
+		        assetCofig = new AssetConfig(uIViewAttribute.AssetBundleName, uIViewAttribute.ViewPath);
+		    }
+		    return assetCofig;
+        }
 
 
 		//获取ui界面
-		private UIView GetUiView(UIViewAttribute uiViewAttribute)
+		private UIView GetUiView(AssetConfig assetConfig)
 		{
 			UIView uiView;
-			if (!_allUiViews.TryGetValue(uiViewAttribute, out uiView))
+			if (!_allUiViews.TryGetValue(assetConfig, out uiView))
 			{
-				GameObject uiViewSource = _resource.LoadAsset<GameObject>(uiViewAttribute.AssetBundleName, uiViewAttribute.ViewPath);
+				GameObject uiViewSource = _resource.LoadAsset<GameObject>(assetConfig.AssetBundleName, assetConfig.AssetPath);
 				if (uiViewSource == null)
-					throw new Exception("uiview path not found:"+ uiViewAttribute.AssetBundleName+":"+uiViewAttribute.ViewPath);
+					throw new Exception("uiview path not found:"+ assetConfig.AssetBundleName+":"+ assetConfig.AssetPath);
 
 				GameObject uiViewClone = GameObject.Instantiate(uiViewSource);
 				uiView = uiViewClone.GetComponent<UIView>();
 				if (uiView == null)
 					return null;
-				_allUiViews[uiViewAttribute] = uiView;
+				_allUiViews[assetConfig] = uiView;
 				return uiView;
 			}
 			uiView.gameObject.SetActive(true);
@@ -185,9 +188,27 @@ public override void OnClose()
 			}
 			_allUiViews.Clear();
 		}
-		#endregion
-        
+        #endregion
+
+
+        #region 数据结构
+        //资源配置
+        private class AssetConfig
+        {
+            public string AssetBundleName;
+            public string AssetPath;
+
+            public AssetConfig()
+            {
+            }
 
+            public AssetConfig(string assetBundleName, string assetPath)
+            {
+                AssetBundleName = assetBundleName;
+                AssetPath = assetPath;
+            }
+        }
+        #endregion
 
-	}
+    }
 }