zhao：解决冲突

XHWK.WKTool/App.cs

@@ -72,6 +72,10 @@ namespace XHWK.WKTool
         /// </summary>
         public static string[] OutPut = new string[] { };
         public static string CameraPosition = string.Empty;
+        /// <summary>
+        /// 数据存放目录
+        /// </summary>
+        public static string DataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\XHMicroLesson\\"; 
         #region 点阵笔
         /// <summary>
         /// 点阵笔

XHWK.WKTool/FileDirectoryWindow.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
         Title="FileDirectoryWindow" Height="729" Width="1030" AllowsTransparency="True" 
-    ShowInTaskbar="False"
+    ShowInTaskbar="False" MouseLeftButtonDown="Window_MouseLeftButtonDown_1" MouseLeftButtonUp="Window_MouseLeftButtonUp"
     WindowStartupLocation="CenterOwner"
     WindowStyle="None">
     <Window.Resources>
@@ -49,7 +49,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="15"
-                    Text="{Binding VideoName}" />
+                    Text="{Binding VideoName,Mode=TwoWay}" />
                         <Button x:Name="btnModify" Background="Transparent"
                                 Cursor="Hand"
                         BorderThickness="0" Click="BtnModify_Click">

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -22,8 +22,19 @@ namespace XHWK.WKTool
         /// 视频模型
         /// </summary>
         List<Model_Video> model_VideoList =null;
+        /// <summary>
+        /// 数据列表
+        /// </summary>
         internal FileDirectoryData pageData = new FileDirectoryData();
         /// <summary>
+        /// 下标
+        /// </summary>
+        private int Subscript = 0;
+        /// <summary>
+        /// 是否是修改状态
+        /// </summary>
+        private bool IsModify = false;
+        /// <summary>
         /// 文件目录
         /// </summary>
         public FileDirectoryWindow()
@@ -36,6 +47,8 @@ namespace XHWK.WKTool
         /// </summary>
         public void Initialize()
         {
+            MouseNumber = 0;
+            IsModify = false;
             //加载视频列表
             LoadingVideoList();
             int i = 1;
@@ -78,7 +91,9 @@ namespace XHWK.WKTool
                 pageData.menuList.Add(new FileDirectoryModel()
                 {
                     SerialNumber = i,
-                    VideoName = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath),
+                    VideoName = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace("AVI", "").Trim(),
+                    Name = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath).Replace(".MP4", "").Replace(".FLV", "").Replace("AVI", "").Trim(),
+                    FilePath = videoinfo.VideoPath.Replace(FileToolsCommon.GetIOFileName(videoinfo.VideoPath), "").Trim(),
                     VideoDuration = 0,
                     VideoSize = videoinfo.VideoSize,
                     VideoTime = videoinfo.RSTime,
@@ -86,9 +101,10 @@ namespace XHWK.WKTool
                     Path = videoinfo.VideoPath,
                     Colour = colour,
                     Visi = vis,
-                    Coll=cos,
-                    FileGuid= videoinfo.FileGuid,
-                }) ; ; 
+                    Coll = cos,
+                    FileGuid = videoinfo.FileGuid,
+                    VideoType = videoinfo.VideoType.ToString()
+                }); ; 
                 i++;
             }
             txbSum.Text = pageData.menuList.Count.ToString();
@@ -99,21 +115,31 @@ namespace XHWK.WKTool
         /// </summary>
         public void LoadingVideoList()
         {
+            try
+            {
+                model_VideoList = new List<Model_Video>();
+                foreach (Model_WKData Vdata in APP.WKDataList)
+                {
+                    if (Vdata.VideoList == null)
+                        continue;
+                    foreach (Model_Video videoinfo in Vdata.VideoList)
+                    {
+                        if (string.IsNullOrWhiteSpace(videoinfo.VideoPath))
+                        {
+                            continue;
+                        }
+                        if (string.IsNullOrWhiteSpace(videoinfo.VideoSize) || videoinfo.VideoSize == "0 MB")
+                        {
+                            videoinfo.VideoSize = FileToolsCommon.GetFileSizeByMB(videoinfo.VideoPath).ToString() + " MB";
+                        }
+                        model_VideoList.Add(videoinfo);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
 
-            //model_VideoList = new List<Model_Video>();
-            //foreach(Model_WKData Vdata in APP.WKDataList)
-            //{
-            //    if (Vdata.VideoList == null)
-            //        continue;
-            //    foreach(Model_Video videoinfo in Vdata.VideoList)
-            //    {
-            //        if (string.IsNullOrWhiteSpace(videoinfo.VideoSize)|| videoinfo.VideoSize=="0 MB")
-            //        {
-            //            videoinfo.VideoSize = FileToolsCommon.GetFileSizeByMB(videoinfo.VideoPath).ToString() + " MB";
-            //        }
-            //        model_VideoList.Add(videoinfo);
-            //    }
-            //}
+            }
         }
         /// <summary>
         /// 关闭
@@ -140,6 +166,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnUpload_Click(object sender, RoutedEventArgs e) 
         {
+            pageData.menuList[Subscript].IsEnabled = false;
             List<Button> buttons = FindChilds<Button>(listView1, "btnUpload");
             for (int i = 0; i < buttons.Count; i++)
             {
@@ -172,6 +199,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnDelete_Click(object sender, RoutedEventArgs e)
         {
+            pageData.menuList[Subscript].IsEnabled = false;
             List<Button> buttons = FindChilds<Button>(listView1, "btnDelete");
             for (int i = 0; i < buttons.Count; i++)
             {
@@ -208,6 +236,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnPlay_Click(object sender, RoutedEventArgs e)
         {
+            pageData.menuList[Subscript].IsEnabled = false;
             List<Button> buttons = FindChilds<Button>(listView1, "btnPlay");
             for (int i = 0; i < buttons.Count; i++)
             {
@@ -283,15 +312,109 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnModify_Click(object sender, RoutedEventArgs e)
         {
+            if(IsModify)
+            {
+                pageData.menuList[Subscript].IsEnabled = false;
+            }
+
             List<Button> buttons = FindChilds<Button>(listView1, "btnModify");
             for (int i = 0; i < buttons.Count; i++)
             {
                 if (buttons[i] == sender)
                 {
                     pageData.menuList[i].IsEnabled = true;
+                    Subscript = i;
+                    IsModify = true;
                 }
             }
         }
+        int MouseNumber = 0;
+        /// <summary>
+        /// 鼠标按下
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Window_MouseLeftButtonDown_1(object sender, MouseButtonEventArgs e)
+        {
+            //if(IsModify)
+            //{
+            //    if(MouseNumber>0&& pageData.menuList.Count> Subscript)
+            //    {
+            //        pageData.menuList[Subscript].IsEnabled = false;
+            //        try
+            //        {
+            //            if(!pageData.menuList[Subscript].Name.Equals(pageData.menuList[Subscript].VideoName))
+            //            {
+
+            //                string tempPath = pageData.menuList[Subscript].VideoName + pageData.menuList[Subscript].VideoType;
+            //                tempPath = pageData.menuList[Subscript].Path.Replace(tempPath, "").Trim();
+            //                tempPath = tempPath + pageData.menuList[Subscript].Name;
+            //                FileToolsCommon.MoveDirectory(pageData.menuList[Subscript].Path, tempPath,out string Message);
+            //            }
+            //        }
+            //        catch (Exception ex)
+            //        {
+            //            MessageBox.Show("无法修改视频名称！" + ex.Message);
+            //            return;
+            //        }
+            //    }
+            //    MouseNumber++;
+            //}
+        }
+
+        private void Window_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            //if (IsModify)
+            //{
+            //    if (MouseNumber > 2 && pageData.menuList.Count > Subscript)
+            //    {
+            //        pageData.menuList[Subscript].IsEnabled = false;
+            //        try
+            //        {
+            //            if (!pageData.menuList[Subscript].Name.Equals(pageData.menuList[Subscript].VideoName))
+            //            {
+            //                MouseNumber = 0;
+            //                string tempPath = pageData.menuList[Subscript].FilePath + pageData.menuList[Subscript].VideoName+"."+ pageData.menuList[Subscript].VideoType;
+            //                if(FileToolsCommon.IsExistFile(tempPath))
+            //                {
+            //                    MessageBox.Show("文件名已存在！");
+            //                    return;
+            //                }
+            //                foreach (Model_WKData wKData in APP.WKDataList)
+            //                {
+            //                    if (wKData.VideoList == null)
+            //                        continue;
+            //                    if (wKData.VideoList.Exists(x => x.FileGuid == pageData.menuList[Subscript].FileGuid))
+            //                    {
+            //                        try
+            //                        {
+            //                            //FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[Subscript].FileGuid).VideoPath);
+            //                            //FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[Subscript].FileGuid).ThumbnailPath);
+            //                            //wKData.VideoList.Remove(wKData.VideoList.Find(x => x.FileGuid == pageData.menuList[Subscript].FileGuid));
+            //                            //Initialize();
+            //                            //return;
+            //                        }
+            //                        catch (Exception ex)
+            //                        {
+            //                            MessageBox.Show("无法删除视频！" + ex.Message);
+            //                            return;
+            //                        }
+            //                    }
+            //                }
+
+
+            //                FileToolsCommon.Copy(pageData.menuList[Subscript].Path, tempPath); 
+            //            }
+            //        }
+            //        catch (Exception ex)
+            //        {
+            //            MessageBox.Show("无法修改视频名称！" + ex.Message);
+            //            return;
+            //        }
+            //    }
+            //    MouseNumber++;
+            //}
+        }
     }
     public class FileDirectoryData : NotifyModel
     {
@@ -427,5 +550,17 @@ namespace XHWK.WKTool
         /// 唯一编号
         /// </summary>
         public string FileGuid { get; set; } 
+        /// <summary>
+        /// 视频类型
+        /// </summary>
+        public string VideoType { get; set; }
+        /// <summary>
+        /// 初始名称
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 文件路径
+        /// </summary>
+        public string FilePath { get; set; }
     }
 }

XHWK.WKTool/LoginWindow.xaml.cs

@@ -1,6 +1,7 @@
 using Common.system;
 using System;
 using System.Configuration;
+using System.Text;
 using System.Windows;
 using XHWK.WKTool.DAL;
 
@@ -73,6 +74,12 @@ namespace XHWK.WKTool
             int code = @interface.Login(accountNumber, password);
             if(code==0)
             {
+                FileToolsCommon.CreateDirectory(APP.DataPath);
+                string applicationData = APP.DataPath + "accountNumber.txt";
+                string accountNumbers = DateTime.Now.ToLongDateString().ToString();//当前时间 
+                System.IO.File.WriteAllText(applicationData, accountNumbers, Encoding.Default);//存放签名验证日期
+
+
                 UpdateSettingString("userName", txbAccountNumber.Text);
                 APP.IsLoginType = true;
                 txbAccountNumber.Text = string.Empty;

XHWK.WKTool/UCCamera.xaml

@@ -1,22 +0,0 @@
-<Window x:Class="XHWK.WKTool.UCCamera"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:XHWK.WKTool"
-        xmlns:wfi ="clr-namespace:System.Windows.Forms.Integration;assembly=WindowsFormsIntegration"
-xmlns:aforge ="clr-namespace:AForge.Controls;assembly=AForge.Controls"
-      mc:Ignorable="d" 
-      d:DesignHeight="450" d:DesignWidth="800"
-      Title="UCCamera">
-
-    <Grid>
-        <wfi:WindowsFormsHost Grid.Row="0" Grid.Column="0" Height="200" Width="300">
-            <aforge:VideoSourcePlayer x:Name="player" Height="200" Width="300"/>
-        </wfi:WindowsFormsHost>
-        <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2">
-            <Button  Name="btnOpenCamera" Click="btnOpenCamera_Click">打开摄像头</Button>
-            <Button x:Name="btnDown" Click="btnDown_Click" Content="关闭摄像头"/>
-        </StackPanel>
-    </Grid>
-</Window>

XHWK.WKTool/UCCamera.xaml.cs

@@ -1,33 +0,0 @@
-using Common.system;
-
-using System.Windows;
-
-namespace XHWK.WKTool
-{
-    /// <summary>
-    /// UCCamera.xaml 的交互逻辑
-    /// </summary>
-    public partial class UCCamera : Window
-    {
-        public UCCamera()
-        {
-            InitializeComponent();
-        }
-
-        private void btnOpenCamera_Click(object sender, RoutedEventArgs e)
-        {
-            CameraHelper.IsDisplay = true;
-            CameraHelper.SourcePlayer = player;
-            CameraHelper.UpdateCameraDevices();
-            if (CameraHelper.CameraDevices.Count > 0)
-            {
-                CameraHelper.SetCameraDevice(0);
-            }
-        }
-
-        private void btnDown_Click(object sender, RoutedEventArgs e)
-        {
-            CameraHelper.CloseDevice();
-        }
-    }
-}

XHWK.WKTool/VideoPlaybackWindow.xaml

@@ -1,35 +0,0 @@
-<Window x:Class="XHWK.WKTool.VideoPlaybackWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        
-        mc:Ignorable="d"
-        Title="VideoPlaybackWindow" Height="693" Width="1039" AllowsTransparency="True" 
-    ShowInTaskbar="False"
-    WindowStartupLocation="CenterOwner"
-    WindowStyle="None">
-    <Grid Background="#121212">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="37"/>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="60"/>
-        </Grid.RowDefinitions>
-        <Grid Grid.Row="0" Margin="5,5,5,0">
-
-            <TextBlock Text="预览" HorizontalAlignment="Left" Foreground="#FFFFFF" FontSize="16"/>
-            <TextBlock x:Name="txbVideoName" Text="微课1.mp4" HorizontalAlignment="Center" Foreground="#FFFFFF" FontSize="16"/>
-        </Grid>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Cursor="Hand" x:Name="btnShrink" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"  Margin="8,0,8,0">
-                <Image Source="./Images/microLessonSystem_19.png"/>
-            </Button>
-            <Button Cursor="Hand" x:Name="btnEnlarge" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="8,0,8,0">
-                        <Image Source="./Images/microLessonSystem_8.png"/>
-                    </Button>
-            <Button Cursor="Hand" x:Name="btnDown" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"  >
-                <Image Source="./Images/microLessonSystem_10.png"/>
-            </Button>
-        </StackPanel>
-    </Grid>
-</Window>

XHWK.WKTool/VideoPlaybackWindow.xaml.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-
-namespace XHWK.WKTool
-{
-    /// <summary>
-    /// VideoPlaybackWindow.xaml 的交互逻辑
-    /// </summary>
-    public partial class VideoPlaybackWindow : Window
-    {
-        public VideoPlaybackWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -7,7 +7,7 @@
         xmlns:aforge ="clr-namespace:AForge.Controls;assembly=AForge.Controls"
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
-        Title="XHMicroLessonSystemWindow" Height="1040.8" Width="875" WindowStartupLocation="CenterScreen"
+        Title="星火微课系统" Height="1040.8" Width="875" WindowStartupLocation="CenterScreen"
     WindowStyle="None"    AllowsTransparency="True"  Background="#EFF1F8" ShowInTaskbar="True"
    >
     

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -1310,6 +1310,7 @@ namespace XHWK.WKTool
                         }
                         FileToolsCommon.DeleteFile(ThumbnailPathName);
                         VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                        Thread.Sleep(500);
                         //VideoInfo.VideoSize = FileToolsCommon.GetFileSizeByMB(VideoSavePathName).ToString() + " MB";
                         VideoInfo.VideoPath = VideoSavePathName;
                         VideoInfo.ThumbnailPath = ThumbnailPathName;
@@ -1448,7 +1449,7 @@ namespace XHWK.WKTool
             {
                 APP.W_PrintWindow.Initialize("");
             }
-            APP.W_PrintWindow.Show();
+            APP.W_PrintWindow.ShowDialog();
             //int pr = 1;
             //string msg = string.Empty;
             //string outPut = string.Empty;

XHWK.WKTool/XHWK.WKTool.csproj

@@ -34,6 +34,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>256.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="AForge, Version=2.2.5.0, Culture=neutral, PublicKeyToken=c1db6ff4eaa06aeb, processorArchitecture=MSIL">
       <HintPath>..\packages\AForge.2.2.5\lib\AForge.dll</HintPath>
@@ -146,12 +149,6 @@
     <Compile Include="ScreenRecordingToolbarWindow.xaml.cs">
       <DependentUpon>ScreenRecordingToolbarWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UCCamera.xaml.cs">
-      <DependentUpon>UCCamera.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="VideoPlaybackWindow.xaml.cs">
-      <DependentUpon>VideoPlaybackWindow.xaml</DependentUpon>
-    </Compile>
     <Compile Include="XHMicroLessonSystemWindow.xaml.cs">
       <DependentUpon>XHMicroLessonSystemWindow.xaml</DependentUpon>
     </Compile>
@@ -184,10 +181,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="VideoPlaybackWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="XHMicroLessonSystemWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -204,10 +197,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="UCCamera.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -1505,5 +1494,8 @@
     <Resource Include="Images\fileDirectory7.png" />
     <Resource Include="Images\fileDirectory8.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="256.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>