|
@@ -9,6 +9,7 @@ using System.Security.Principal;
|
9
|
9
|
using System.Security.RightsManagement;
|
10
|
10
|
using System.Threading;
|
11
|
11
|
using System.Windows;
|
|
12
|
+using System.Windows.Documents;
|
12
|
13
|
using System.Windows.Threading;
|
13
|
14
|
|
14
|
15
|
using TStudyDigitalPen.HID;
|
|
@@ -142,6 +143,7 @@ namespace XHWK.WKTool
|
142
|
143
|
// 定义Application对象作为整个应用程序入口
|
143
|
144
|
Application app = new Application();
|
144
|
145
|
app.Run(W_CreateAMicroLessonWindow);
|
|
146
|
+ //Application.Run(W_CreateAMicroLessonWindow);
|
145
|
147
|
}
|
146
|
148
|
else
|
147
|
149
|
{
|
|
@@ -161,7 +163,8 @@ namespace XHWK.WKTool
|
161
|
163
|
return;
|
162
|
164
|
}
|
163
|
165
|
//退出
|
164
|
|
- Application.Current.Shutdown();
|
|
166
|
+ //Current.Shutdown();
|
|
167
|
+ Environment.Exit(0);
|
165
|
168
|
|
166
|
169
|
}
|
167
|
170
|
#endregion
|
|
@@ -172,12 +175,6 @@ namespace XHWK.WKTool
|
172
|
175
|
string ErrMessage = "【进程】(Main):进程意外关闭。 " + ex.Message;
|
173
|
176
|
LogHelper.WriteErrLog(ErrMessage, ex);
|
174
|
177
|
}
|
175
|
|
-
|
176
|
|
- //app.DispatcherUnhandledException += MyApp_DispatcherUnhandledException;
|
177
|
|
- //Application app = new Application();
|
178
|
|
- //W_CreateAMicroLessonWindow = new CreateAMicroLessonWindow();
|
179
|
|
- //app.Run(W_CreateAMicroLessonWindow);
|
180
|
|
- //LogHelper.WriteInfoLog("启动项目");
|
181
|
178
|
StopSameProcess();
|
182
|
179
|
Killffmpeg();
|
183
|
180
|
LatticeFileHelper.RunPrintConfig();
|