Browse Source

zhao:增加下载信息

tags/录制修改前
耀 4 years ago
parent
commit
1011fa6b8e

+ 15
- 11
XHWK.WKTool/App.cs View File

137
             Killffmpeg();
137
             Killffmpeg();
138
             LatticeFileHelper.RunPrintConfig();
138
             LatticeFileHelper.RunPrintConfig();
139
         }
139
         }
140
+
141
+        #region 杀死已存在的进程
140
         /// <summary>
142
         /// <summary>
141
         /// 结束已运行的程序
143
         /// 结束已运行的程序
142
         /// </summary>
144
         /// </summary>
161
                 }
163
                 }
162
             }
164
             }
163
         }
165
         }
166
+        /// <summary>
167
+        /// 杀死正在运行的ffmpeg
168
+        /// </summary>
169
+        public static void Killffmpeg()
170
+        {
171
+            Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
172
+            foreach (var KillProcess in KillProcessArray)
173
+            {
174
+                KillProcess.Kill();
175
+            }
176
+        }
177
+        #endregion
164
 
178
 
165
         /// <summary>
179
         /// <summary>
166
         /// 错误处理
180
         /// 错误处理
289
             }
303
             }
290
         }
304
         }
291
         #endregion
305
         #endregion
292
-        /// <summary>
293
-        /// 杀死正在运行的ffmpeg
294
-        /// </summary>
295
-        public static void Killffmpeg()
296
-        {
297
-            Process[] KillProcessArray = Process.GetProcessesByName("ffmpeg");
298
-            foreach (var KillProcess in KillProcessArray)
299
-            {
300
-                KillProcess.Kill();
301
-            }
302
-        }
306
+
303
         #region 内存处理 -创建人:赵耀 -创建时间:2020年8月12日
307
         #region 内存处理 -创建人:赵耀 -创建时间:2020年8月12日
304
 
308
 
305
         /// <summary>
309
         /// <summary>

+ 4
- 0
XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs View File

294
                         VideoInfo.VidePath = VideoSavePathName;
294
                         VideoInfo.VidePath = VideoSavePathName;
295
                         VideoInfo.ThumbnailPath = ThumbnailPathName;
295
                         VideoInfo.ThumbnailPath = ThumbnailPathName;
296
                         APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName);
296
                         APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName);
297
+                        VideoInfo.FileGuid = Guid.NewGuid().ToString();
298
+                        VideoInfo.IsUpload = false;
299
+                        VideoInfo.Uploaded = 0;
300
+                        VideoInfo.Savefolder = APP.UserInfo.Schoolid + "/resource";
297
                         APP.VideoList.Add(VideoInfo);
301
                         APP.VideoList.Add(VideoInfo);
298
                         //保存数据
302
                         //保存数据
299
                         APP.SaveWkData();
303
                         APP.SaveWkData();

+ 4
- 0
XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs View File

1312
                         VideoInfo.VidePath = VideoSavePathName;
1312
                         VideoInfo.VidePath = VideoSavePathName;
1313
                         VideoInfo.ThumbnailPath = ThumbnailPathName;
1313
                         VideoInfo.ThumbnailPath = ThumbnailPathName;
1314
                         APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName);
1314
                         APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName);
1315
+                        VideoInfo.FileGuid = Guid.NewGuid().ToString();
1316
+                        VideoInfo.IsUpload = false;
1317
+                        VideoInfo.Uploaded = 0;
1318
+                        VideoInfo.Savefolder = APP.UserInfo.Schoolid + "/resource";
1315
                         APP.VideoList.Add(VideoInfo);
1319
                         APP.VideoList.Add(VideoInfo);
1316
                         //保存数据
1320
                         //保存数据
1317
                         APP.SaveWkData();
1321
                         APP.SaveWkData();

Loading…
Cancel
Save