UIManager增加异步打开的接口

wanderer · wanderer · commit 588f5b1b314d · 2020-12-10T13:32:28.000+08:00
diff --git a/GameFramework/Runtime/Debugger/ConsoleWindow.cs b/GameFramework/Runtime/Debugger/ConsoleWindow.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 using System.Reflection;
+using System.Text;
 
 namespace Wanderer.GameFramework
 {
@@ -15,6 +16,10 @@ public class ConsoleWindow : IDebuggerWindow
         private Dictionary<string, MethodInfo> _commandMethod = new Dictionary<string, MethodInfo>();
         //action执行函数
         private Dictionary<string, Action> _commandAction = new Dictionary<string, Action>();
+        //命令帮助
+        private Dictionary<string, string> _commandHelp = new Dictionary<string, string>();
+        //命令反馈
+        private Dictionary<string, string> _commandFeedback=new Dictionary<string, string>();
         //支持反射
         private bool _reflectionSupported = true;
         //支持消息发送
@@ -28,22 +33,10 @@ public class ConsoleWindow : IDebuggerWindow
 
         public void OnInit(params object[] args)
         {
-            _commandAction.Add("d1", () =>
-            {
-                Debug.unityLogger.logEnabled = true;
-            });
-            _commandAction.Add("d0", () =>
-            {
-                Debug.unityLogger.logEnabled = false;
-            });
-            _commandAction.Add("f1", () =>
-            {
-                GameFrameworkMode.GetModule<DebuggerManager>().SetLogFileEnable(true);
-            });
-            _commandAction.Add("f0", () =>
-            {
-                GameFrameworkMode.GetModule<DebuggerManager>().SetLogFileEnable(false);
-            });
+            AddCommand("d0", () => { Debug.unityLogger.logEnabled = false; }, "关闭Debug.Log","Log disabled.");
+            AddCommand("d1", () => { Debug.unityLogger.logEnabled = true; }, "开启Debug.Log", "Log enabled.");
+            AddCommand("f0", () => { GameFrameworkMode.GetModule<DebuggerManager>().SetLogFileEnable(false); }, "关闭日志文件", "Log file disabled.");
+            AddCommand("f1", () => { GameFrameworkMode.GetModule<DebuggerManager>().SetLogFileEnable(true); }, "开启日志文件", "Log file enabled.");
         }
 
         public void OnEnter()
@@ -106,24 +99,52 @@ public void OnDraw()
         /// </summary>
         /// <param name="command"></param>
         /// <param name="callAction"></param>
-        public void AddCommand(string command, Action callAction)
+        public void AddCommand(string command, Action callAction,string help=null,string feedback = null)
         {
             if (!_commandAction.ContainsKey(command))
             {
                 _commandAction.Add(command, callAction);
             }
+            if (!string.IsNullOrEmpty(help))
+            {
+                if (!_commandHelp.ContainsKey(command))
+                {
+                    _commandHelp.Add(command, help);
+                }
+            }
+            if (!string.IsNullOrEmpty(feedback))
+            {
+                if (!_commandFeedback.ContainsKey(command))
+                {
+                    _commandFeedback.Add(command, feedback);
+                }
+            }
         }
         /// <summary>
         /// 添加命令
         /// </summary>
         /// <param name="command"></param>
         /// <param name="callMethod"></param>
-        public void AddCommand(string command, MethodInfo callMethod)
+        public void AddCommand(string command, MethodInfo callMethod,string help = null, string feedback = null)
         {
             if (!_commandMethod.ContainsKey(command))
             {
                 _commandMethod.Add(command, callMethod);
             }
+            if (!string.IsNullOrEmpty(help))
+            {
+                if (!_commandHelp.ContainsKey(command))
+                {
+                    _commandHelp.Add(command, help);
+                }
+            }
+            if (!string.IsNullOrEmpty(feedback))
+            {
+                if (!_commandFeedback.ContainsKey(command))
+                {
+                    _commandFeedback.Add(command, feedback);
+                }
+            }
         }
         /// <summary>
         /// 移除命令
@@ -139,6 +160,14 @@ public void RemoveCommand(string command)
             {
                 _commandMethod.Remove(command);
             }
+            if (_commandHelp.ContainsKey(command))
+            {
+                _commandHelp.Remove(command);
+            }
+            if (_commandFeedback.ContainsKey(command))
+            {
+                _commandFeedback.Remove(command);
+            }
         }
         #endregion
 
@@ -179,6 +208,10 @@ private void ExecuteCommand(string command)
             if (_commandAction.TryGetValue(command, out Action callAction))
             {
                 callAction.Invoke();
+                if (_commandFeedback.TryGetValue(command, out string feedback))
+                {
+                    AddLine(feedback);
+                }
                 return;
             }
 
@@ -195,7 +228,6 @@ private void ExecuteCommand(string command)
             MethodInfo callMethod;
             if (!_commandMethod.TryGetValue(command, out callMethod))
             {
-               
                 int index = command.LastIndexOf('.');
                 if (index > 0 && index < command.Length - 1)
                 {
@@ -255,6 +287,15 @@ private void ExecuteCommand(string command)
                     }
                 }
             }
+            else
+            {
+                callMethod.Invoke(null,null);
+                if (_commandFeedback.TryGetValue(command, out string feedback))
+                {
+                    AddLine(feedback);
+                }
+                return;
+            }
 
             
             //添加反馈
@@ -264,11 +305,22 @@ private void ExecuteCommand(string command)
         //执行默认的命令
         private int ExecuteDefaultCommand(string command)
         {
+            command = command.ToLower();
             switch (command)
             {
                 case "clear":
                     ClearLines();
                     return 0;
+                case "help":
+                    StringBuilder helpBuilder = new StringBuilder();
+                    helpBuilder.AppendLine("help\tSee all the commands and the corresponding help.");
+                    helpBuilder.AppendLine("clear\tClean up all lines.");
+					foreach (var item in _commandHelp)
+					{
+                        helpBuilder.AppendLine($"{item.Key}\t{item.Value}.");
+                    }
+                    AddLine(helpBuilder.ToString());
+                    return 0;
             }
             return -1;
         }
diff --git a/GameFramework/Runtime/UI/UIManager.cs b/GameFramework/Runtime/UI/UIManager.cs
@@ -64,7 +64,7 @@ public UIManager()
         /// <param name="callBack"></param>
         /// <param name="parameters"></param>
         /// <returns></returns>
-        public IUITween Push(IUIContext uiContext, Action<string> callBack=null, params object[] parameters)
+        public IUITween Push(IUIContext uiContext, Action<string> callBack=null, bool async = false, params object[] parameters)
         {
             //动态获取uiTween
             UITween uiTweener = UITweePool.Get();
@@ -103,23 +103,30 @@ public IUITween Push(IUIContext uiContext, Action<string> callBack=null, params
             }
             //处理新的ui
             _activeUIContextList.Add(uiContext);
-			////异步加载
-			//GetUIView(uiContext, (newUiView) => {
-			//    newUiView.OnEnter(uiContext, callBack, parameters);
-			//    _uiEnterArgs.UIView = newUiView;
-			//    _event.Trigger(this, _uiEnterArgs);
-			//    //设置打开的uiview
-			//    uiTweener.SetNextUIView(newUiView);
-			//    uiTweener.SetUITweenReady();
-			//});
 
-			UIView newUiView = GetUIView(uiContext);
-			newUiView.OnEnter(uiContext, callBack, parameters);
-			//触发打开事件
-			_uiEnterArgs.UIView = newUiView;
-			_event.Trigger(this, _uiEnterArgs);
-			//设置打开的uiview
-			uiTweener.SetNextUIView(newUiView);
+            if (async)
+            {
+                //异步加载
+                GetUIView(uiContext, (newUiView) =>
+                {
+                    newUiView.OnEnter(uiContext, callBack, parameters);
+                    _uiEnterArgs.UIView = newUiView;
+                    _event.Trigger(this, _uiEnterArgs);
+                    //设置打开的uiview
+                    uiTweener.SetNextUIView(newUiView);
+                    uiTweener.SetUITweenReadyAsync();
+                });
+            }
+            else
+            {
+                UIView newUiView = GetUIView(uiContext);
+                newUiView.OnEnter(uiContext, callBack, parameters);
+                //触发打开事件
+                _uiEnterArgs.UIView = newUiView;
+                _event.Trigger(this, _uiEnterArgs);
+                //设置打开的uiview
+                uiTweener.SetNextUIView(newUiView);
+            }
 			return uiTweener;
         }
 
@@ -130,12 +137,12 @@ public IUITween Push(IUIContext uiContext, Action<string> callBack=null, params
         /// <param name="callBack"></param>
         /// <param name="parameters"></param>
         /// <returns></returns>
-        public IUITween Push(string assetPath, Action<string> callBack=null, params object[] parameters)
+        public IUITween Push(string assetPath, Action<string> callBack=null, bool async = false,params object[] parameters)
         {
             IUIContext uiContext = UIContextMgr[assetPath];
             if (uiContext != null)
             {
-                IUITween uiTween = Push(uiContext, callBack, parameters);
+                IUITween uiTween = Push(uiContext, callBack, async, parameters);
                 return uiTween;
             }
             return null;
diff --git a/GameFramework/Runtime/UI/UITween.cs b/GameFramework/Runtime/UI/UITween.cs
@@ -13,6 +13,8 @@ public interface IUITween
         UIView NextUIView { get; }
         //UITween准备好
         IUITween OnUITweenReady(Action<IUITween,UIView, UIView> onUITweenReady);
+        //UITween准备好 异步
+        IUITween OnUITweenReadyAsync(Action<IUITween, UIView, UIView> onUITweenReady);
         //动画开始回调 
         IUITween OnAnimationStart(Action<UIView, UIView> onAnimStart);
         //动画结束
@@ -30,6 +32,7 @@ public interface IUITween
     internal class UITween : IUITween
     {
         private Action<IUITween,UIView, UIView> _onUITweenReady;
+        private Action<IUITween, UIView, UIView> _onUITweenReadyAsync;
         private Action<UIView, UIView> _onAnimStart;
         private Action<UIView, UIView> _onAnimComplete;
         private Action<IUIAnimation, IUIAnimation> _onAnimChanged;
@@ -55,6 +58,7 @@ public bool HasAnims
         public UITween Flush()
         {
             _onUITweenReady = null;
+            _onUITweenReadyAsync = null;
             _onAnimStart = null;
             _onAnimComplete = null;
             _onAnimChanged = null;
@@ -110,6 +114,13 @@ public IUITween OnUITweenReady(Action<IUITween,UIView, UIView> onUITweenReady)
             return this;
         }
 
+        //UITween准备好 异步
+        public IUITween OnUITweenReadyAsync(Action<IUITween, UIView, UIView> onUITweenReady)
+        {
+            _onUITweenReadyAsync = onUITweenReady;
+            return this;
+        }
+
         public IUITween OnAnimationChanged(Action<IUIAnimation, IUIAnimation> onAnimChanged)
         {
             _onAnimChanged += onAnimChanged;
@@ -133,6 +144,14 @@ public IUITween OnAnimationStart(Action<UIView, UIView> onAnimStart)
             return this;
         }
 
+        /// <summary>
+        /// 设置异步准备
+        /// </summary>
+        public void SetUITweenReadyAsync()
+        {
+            _onUITweenReadyAsync?.Invoke(this, LastUIView, NextUIView);
+        }
+
         public IUITween SetAnimation(IUIAnimation anim)
         {
             _anims.Add(anim);
