Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/WindowBase/WindowCenter.cs

@@ -72,7 +72,7 @@
                }

                else

                {

                    DebugEx.Log(string.Format("{0} 窗口已经打开！", typeof(T)));

                    DebugEx.LogFormat("{0} 窗口已经打开！", typeof(T));

                }

            }

            else

@@ -146,7 +146,7 @@
                }

                else

                {

                    DebugEx.Log(string.Format("{0} 窗口已经打开！", typeof(T)));

                    DebugEx.LogFormat("{0} 窗口已经打开！", typeof(T));

                }



                return (T)win;

@@ -201,13 +201,13 @@
                }

                else

                {

                    DebugEx.Log(string.Format("{0} 窗口已经关闭！", typeof(T)));

                    DebugEx.LogFormat("{0} 窗口已经关闭！", typeof(T));

                }

            }

            else

            {

                asyncLoad.StopTask(typeof(T).Name);

                DebugEx.Log(string.Format("{0} 窗口无法获得！", typeof(T)));

                DebugEx.LogFormat("{0} 窗口无法获得！", typeof(T));

            }



            return win;

@@ -224,13 +224,13 @@
                }

                else

                {

                    DebugEx.Log(string.Format("{0} 窗口已经关闭！", typeof(T)));

                    DebugEx.LogFormat("{0} 窗口已经关闭！", typeof(T));

                }

            }

            else

            {

                asyncLoad.StopTask(typeof(T).Name);

                DebugEx.Log(string.Format("{0} 窗口无法获得！", typeof(T)));

                DebugEx.LogFormat("{0} 窗口无法获得！", typeof(T));

            }



            return win;

@@ -385,7 +385,7 @@
            }

            else

            {

                DebugEx.Log(string.Format("{0} 窗口无法获得！", typeof(T)));

                DebugEx.LogFormat("{0} 窗口无法获得！", typeof(T));

            }

        }



@@ -544,7 +544,7 @@
                }

                else

                {

                    DebugEx.Log(string.Format("{0} 窗口已经打开！", typeof(T)));

                    DebugEx.LogFormat("{0} 窗口已经打开！", typeof(T));

                }



                return (T)win;

@@ -577,7 +577,7 @@
                            }

                            else

                            {

                                DebugEx.Log(string.Format("{0} 窗口已经打开！", typeof(T)));

                                DebugEx.LogFormat("{0} 窗口已经打开！", typeof(T));

                            }

                        }

                    }