zhao：1，优化麦克风和音频检测。2优化上传3去除未登录清空用户信息。

Common/system/FFMpeg.cs

@@ -67,8 +67,10 @@ namespace Common.system
             LogPath = CreateffmpegLog();
             string MicrophoneName = null;
             #region 检测麦克风扬声器
-            string audioSpeakerPath = FileToolsCommon.GetFileAbsolutePath("adoS.m");
-            string audioMicrophonePath = FileToolsCommon.GetFileAbsolutePath("adoM.m");
+            string AudioPath = FileToolsCommon.GetFileAbsolutePath("/temp/audio/");
+            FileToolsCommon.CreateDirectory(AudioPath);
+            string audioSpeakerPath = AudioPath + "adoS" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".m";//FileToolsCommon.GetFileAbsolutePath("adoS.m");
+            string audioMicrophonePath = AudioPath + "adoM" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".m";//FileToolsCommon.GetFileAbsolutePath("adoM.m");
             try
             {
                 FileToolsCommon.DeleteFile(audioSpeakerPath);
@@ -202,8 +204,10 @@ namespace Common.system
             }
             string MicrophoneName = null;
             #region 检测麦克风扬声器
-            string audioSpeakerPath = FileToolsCommon.GetFileAbsolutePath("adoS.m");
-            string audioMicrophonePath = FileToolsCommon.GetFileAbsolutePath("adoM.m");
+            string AudioPath = FileToolsCommon.GetFileAbsolutePath("/temp/audio/");
+            FileToolsCommon.CreateDirectory(AudioPath);
+            string audioSpeakerPath = AudioPath + "adoS" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".m";
+            string audioMicrophonePath = AudioPath + "adoM" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".m";
             try
             {
                 FileToolsCommon.DeleteFile(audioSpeakerPath);
@@ -1032,7 +1036,7 @@ namespace Common.system
             }
             catch (ApplicationException)
             {
-                Console.WriteLine("No local capture devices");
+                //Console.WriteLine("No local capture devices");
             }
             return devicesList;
         }

XHWK.WKTool/AppUpdateWin.xaml.cs

@@ -57,7 +57,7 @@ namespace XHWK.WKTool
                 info.Create();
             }
 
-            System.Console.WriteLine("fileUrl:" + fileUrl);
+            //System.Console.WriteLine("fileUrl:" + fileUrl);
             string filename = fileUrl.Substring(fileUrl.LastIndexOf("/") + 1);
             if (filename != null)
             {
@@ -80,7 +80,7 @@ namespace XHWK.WKTool
 
         public void downloadEnd(int position, string filepath)
         {
-            System.Console.WriteLine("filepath:" + filepath);
+            //System.Console.WriteLine("filepath:" + filepath);
             progress_sp.Visibility = Visibility.Collapsed;
             content_sv.Visibility = Visibility.Visible;
             button_bottom.Visibility = Visibility.Visible;

XHWK.WKTool/DAL/DAL_Upload.cs

@@ -104,6 +104,7 @@ namespace XHWK.WKTool.DAL
                     if (resultObj.code == 0 && resultObj.obj != null)
                     {
                         APP.ResourceAddTwo = resultObj.obj;
+                        //上报合并成功后 修改为已成功上传。
                         foreach (Model_WKData Vdata in APP.WKDataList)
                         {
                             if (Vdata.VideoList == null)
@@ -241,23 +242,77 @@ namespace XHWK.WKTool.DAL
                     {
                         VideoInfo.FileMD5 = AESHelper.AESEncrypt(FileToolsCommon.ReadBigFileStr(VideoInfo.VideoPath, 1024));
                     }
-                    if (IsAllowUploaded(VideoInfo.FileMD5, out ErrMessage))
+
+                    //视频长度
+                    long filelen = FileToolsCommon.GetFileSize(VideoInfo.VideoPath);
+                    //每片的长度
+                    double UploadSliceLenMB = double.Parse(FileToolsCommon.GetConfigValue("UploadSliceLen"));
+                    string fileName = FileToolsCommon.GetFileName(VideoInfo.VideoPath);
+                    //是否续传
+                    bool IsSequel = true;
+                    //分块数为0时 从未上传过 
+                    if(VideoInfo.Block>0)
                     {
-                        //视频长度
-                        long filelen = FileToolsCommon.GetFileSize(VideoInfo.VideoPath);
-                        //每片的长度
-                        double UploadSliceLenMB = double.Parse(FileToolsCommon.GetConfigValue("UploadSliceLen"));
-                        if (VideoInfo.SliceLen == 0)
+                        //是否已上传所有分块
+                        if(VideoInfo.Block> VideoInfo.Uploaded)
                         {
-                            VideoInfo.SliceLen = (long)(UploadSliceLenMB * 1024 * 1024);
-                            VideoInfo.Block = (int)(filelen / VideoInfo.SliceLen + (filelen % VideoInfo.SliceLen > 0 ? 1 : 0));
+                            //已上传，未上传完
+                            IsSequel = true;
                         }
-                        //临时修改 没有断点续传，每次上传都重新上传。
-                        VideoInfo.Uploaded = 0;
+                        else
+                        {
+                            //上传完,未合并
+                            IsSequel = false;
+
+                            #region 合并文件
+                            //合并文件
+                            bool isres = ReportFileMerge(APP.UserInfo.Schoolid.ToString() + "/resource", VideoInfo.FileGuid, out ErrMessage);
+                            if (isres)
+                            {
+                                VideoInfo.IsUpload = true;
+                                return true;
+                            }
+                            else
+                            {
+                                return false;
+                            }
+                            #endregion
+
+                        }
+                    }
+                    else
+                    {
+                        //是否允许上传
+                        if (IsAllowUploaded(VideoInfo.FileMD5, out ErrMessage))
+                        {
+                            IsSequel = true;
+                            if (VideoInfo.SliceLen == 0)
+                            {
+                                VideoInfo.SliceLen = (long)(UploadSliceLenMB * 1024 * 1024);
+                                VideoInfo.Block = (int)(filelen / VideoInfo.SliceLen + (filelen % VideoInfo.SliceLen > 0 ? 1 : 0));
+                            }
+                        }
+                        else
+                        {
+                            //文件在服务器上已存在  空间是否存在未知 若增加空间是否存在判断在此处添加
+                            IsSequel = false;
+                            VideoInfo.Block = 1;
+                            VideoInfo.Uploaded = 1;
+
+                            VideoInfo.IsUpload = true;
+                            return true;
+                        }
+
+                    }
+
+                    ////临时修改 没有断点续传，每次上传都重新上传。
+                    //VideoInfo.Uploaded = 0;
+                    if (IsSequel)
+                    {
                         //已上传长度
                         long len = VideoInfo.Uploaded * VideoInfo.SliceLen;
-                        string fileName = FileToolsCommon.GetFileName(VideoInfo.VideoPath);
 
+                        #region 废弃
                         ////分块
                         //for (; len + VideoInfo.SliceLen < filelen; VideoInfo.Uploaded++)
                         //{
@@ -279,6 +334,7 @@ namespace XHWK.WKTool.DAL
                         //        return false;
                         //    }
                         //}
+                        #endregion
 
                         //分块
                         do
@@ -311,6 +367,8 @@ namespace XHWK.WKTool.DAL
                                 return false;
                             }
                         } while (len + VideoInfo.SliceLen < filelen);
+
+                        #region 合并文件
                         //合并文件
                         bool isres = ReportFileMerge(APP.UserInfo.Schoolid.ToString() + "/resource", VideoInfo.FileGuid, out ErrMessage);
                         if (isres)
@@ -322,6 +380,7 @@ namespace XHWK.WKTool.DAL
                         {
                             return false;
                         }
+                        #endregion
                     }
                     else
                     {

XHWK.WKTool/DAL/Interface.cs

@@ -138,7 +138,10 @@ namespace XHWK.WKTool.DAL
             {
                 APP.UserInfo = new Model_UserInfo();
                 APP.ServerMsg = result.msg;
-                APP.UserInfo = result.obj;
+                if (result.obj != null)
+                {
+                    APP.UserInfo = result.obj;
+                }
                 return result.code;
             }
             else

XHWK.WKTool/ProductVerification.xaml.cs

@@ -148,12 +148,12 @@ namespace XHWK.WKTool
 
         ~ProductVerification()
         {
-            Console.WriteLine("{0}被销毁", this);
+            //Console.WriteLine("{0}被销毁", this);
             Dispose(false);
         }
         public void Dispose()
         {
-            Console.WriteLine("{0}被手动销毁", this);
+            //Console.WriteLine("{0}被手动销毁", this);
             Dispose(true);
             GC.SuppressFinalize(this);
         }
@@ -161,7 +161,7 @@ namespace XHWK.WKTool
         private bool disposed;
         protected void Dispose(bool disposing)
         {
-            Console.WriteLine("{0}被自动销毁", this);
+            //Console.WriteLine("{0}被自动销毁", this);
             if (!disposed)
             {
                 if (disposing)

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -331,8 +331,10 @@ namespace XHWK.WKTool
                 if (IsFirstRS)
                 {
                     #region 检测麦克风扬声器是否可用
-                    string audioSpeakerPath = FileToolsCommon.GetFileAbsolutePath("adoS.m");
-                    string audioMicrophonePath = FileToolsCommon.GetFileAbsolutePath("adoM.m");
+                    string AudioPath = FileToolsCommon.GetFileAbsolutePath("/temp/audio/");
+                    FileToolsCommon.CreateDirectory(AudioPath);
+                    string audioSpeakerPath = AudioPath + "adoS" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".m";
+                    string audioMicrophonePath = AudioPath + "adoM" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".m";
                     try
                     {
                         FileToolsCommon.DeleteFile(audioSpeakerPath);
@@ -626,7 +628,7 @@ namespace XHWK.WKTool
                             VideoInfo.FileGuid = Guid.NewGuid().ToString();
                             VideoInfo.IsUpload = false;
                             VideoInfo.Uploaded = 0;
-                            VideoInfo.Savefolder = APP.UserInfo.Schoolid + "/resource";
+                            //VideoInfo.Savefolder = APP.UserInfo.Schoolid + "/resource";
                             APP.VideoList.Add(VideoInfo);
                             //保存数据
                             APP.SaveWkData();
@@ -1279,9 +1281,16 @@ namespace XHWK.WKTool
                 //{
                 //    APP.W_CountdownWindow.Initialize(true, 1800);
                 //}
-                gridToobar.Visibility = Visibility.Hidden;
-                APP.W_MinToolbar.Show();
-                Console.WriteLine(this.Top+"max");
+                new Thread(new ThreadStart(new Action(() =>
+                {
+                    Thread.Sleep(500);
+                    Dispatcher.Invoke(() =>
+                    {
+                        gridToobar.Visibility = Visibility.Hidden;
+                        APP.W_MinToolbar.Show();
+                    });
+                }))).Start();
+                //Console.WriteLine(this.Top+"max");
             }
         }
     }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -3357,8 +3357,10 @@ namespace XHWK.WKTool
                 if (IsFirstR)//是否第一次录制  初始化录制
                 {
                     #region 检测麦克风扬声器是否可用
-                    string audioSpeakerPath = FileToolsCommon.GetFileAbsolutePath("adoS.m");
-                    string audioMicrophonePath = FileToolsCommon.GetFileAbsolutePath("adoM.m");
+                    string AudioPath = FileToolsCommon.GetFileAbsolutePath("/temp/audio/");
+                    FileToolsCommon.CreateDirectory(AudioPath);
+                    string audioSpeakerPath = AudioPath + "adoS" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".m";
+                    string audioMicrophonePath = AudioPath + "adoM" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".m";
                     try
                     {
                         FileToolsCommon.DeleteFile(audioSpeakerPath);
@@ -3893,7 +3895,7 @@ namespace XHWK.WKTool
                             VideoInfo.FileGuid = Guid.NewGuid().ToString();
                             VideoInfo.IsUpload = false;
                             VideoInfo.Uploaded = 0;
-                            VideoInfo.Savefolder = APP.UserInfo.Schoolid + "/resource";
+                            //VideoInfo.Savefolder = APP.UserInfo.Schoolid + "/resource";
                             APP.VideoList.Add(VideoInfo);
                             //保存数据
                             APP.SaveWkData();
@@ -4183,7 +4185,7 @@ namespace XHWK.WKTool
             img.CaptureMouse();
             mouseDown = true;
             mouseXY = e.GetPosition(img);
-            Console.WriteLine("mouseXY.X = " + mouseXY.X + "; mouseXY.Y = " + mouseXY.Y);
+            //Console.WriteLine("mouseXY.X = " + mouseXY.X + "; mouseXY.Y = " + mouseXY.Y);
 
         }
         private void IMG1_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
@@ -4244,9 +4246,9 @@ namespace XHWK.WKTool
                 return;
             }
             System.Windows.Point point = e.GetPosition(img);
-            Console.WriteLine("point.X = " + point.X + "; point.Y=" + point.Y);
+            //Console.WriteLine("point.X = " + point.X + "; point.Y=" + point.Y);
             System.Windows.Point PicLocate = e.GetPosition(imgCanvas);
-            Console.WriteLine("PicEmap.X = " + PicLocate.X + "; PicEmap.Y=" + PicLocate.Y);
+            //Console.WriteLine("PicEmap.X = " + PicLocate.X + "; PicEmap.Y=" + PicLocate.Y);
 
 
             TransformGroup group = IMG.FindResource("Imageview") as TransformGroup;