img位置调整

XHWK.WKTool/FileDirectoryWindow.xaml

@@ -33,28 +33,29 @@
             <UniformGrid
                 Height="36"
                 Margin="0,0,0,0"
-                
+                Background="{Binding Colour}"
                 Columns="6"
                 Rows="1">
                 <!--题号-->
-                <TextBlock
+                <TextBlock 
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="15"
                     Text="{Binding SerialNumber}" />
                 <Grid>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock
+                    <StackPanel Orientation="Horizontal"   HorizontalAlignment="Center"
+                    VerticalAlignment="Center">
+                        <TextBox IsEnabled="{Binding IsEnabled}"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="15"
                     Text="{Binding VideoName}" />
-                        <Button Background="Transparent"
+                        <Button x:Name="btnModify" Background="Transparent"
                                 Cursor="Hand"
-                        BorderThickness="0">
+                        BorderThickness="0" Click="BtnModify_Click">
                             <Grid>
-                                <Image Source="./Images/fileDirectory1.png"/>
-                                <Image Source="./Images/fileDirectory2.png" Visibility="Collapsed"/>
+                                <Image Source="./Images/fileDirectory3.png" Margin="6,6,6,6" Visibility="{Binding vis}"/>
+                                <Image Source="./Images/fileDirectory4.png" Margin="6,6,6,6" Visibility="{Binding cos}"/>
                             </Grid>
                         </Button>
                     </StackPanel>
@@ -82,30 +83,31 @@
                     Text="{Binding VideoTime}" />
 
                 <Grid>
-                    <StackPanel Orientation="Horizontal">
-                        <Button Cursor="Hand" Content="播放" FontSize="15"
-                        Background="Transparent"
-                            Foreground="#2D8CF0"
-                        BorderThickness="0"
-                     >
+                    <StackPanel Orientation="Horizontal"   HorizontalAlignment="Center"
+                    VerticalAlignment="Center">
+                        <Button x:Name="btnPlay" Background="Transparent" 
+                                Cursor="Hand"
+                        BorderThickness="0" Click="BtnPlay_Click">
+                            <Grid>
+                                <Image Source="./Images/fileDirectory1.png" Margin="6,6,6,6" Visibility="{Binding vis}"/>
+                                <Image Source="./Images/fileDirectory2.png" Margin="6,6,6,6" Visibility="{Binding cos}"/>
+                            </Grid>
                         </Button>
-
-
-
-                        <Button Cursor="Hand" Content="上传" FontSize="15"
-                        Background="Transparent"
-                            Foreground="#2D8CF0"
-                        BorderThickness="0"
-                     >
+                        <Button x:Name="btnUpload" Background="Transparent"
+                                Cursor="Hand"
+                        BorderThickness="0" Click="BtnUpload_Click">
+                            <Grid>
+                                <Image Source="./Images/fileDirectory7.png" Margin="6,6,6,6" Visibility="{Binding vis}"/>
+                                <Image Source="./Images/fileDirectory8.png" Margin="6,6,6,6" Visibility="{Binding cos}"/>
+                            </Grid>
                         </Button>
-
-
-
-                        <Button Cursor="Hand" Content="删除" FontSize="15"
-                        Background="Transparent"
-                            Foreground="#2D8CF0"
-                        BorderThickness="0"
-                     >
+                        <Button x:Name="btnDelete" Background="Transparent"
+                                Cursor="Hand"
+                        BorderThickness="0" Click="BtnDelete_Click">
+                            <Grid>
+                                <Image Source="./Images/fileDirectory5.png" Margin="6,6,6,6" Visibility="{Binding vis}"/>
+                                <Image Source="./Images/fileDirectory6.png" Margin="6,6,6,6" Visibility="{Binding cos}"/>
+                            </Grid>
                         </Button>
                     </StackPanel>
                 </Grid>
@@ -181,38 +183,28 @@
                     ItemsSource="{Binding menuList}" />
             </Grid>
             <!--第三行 删除 上传 按钮-->
-            <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Center">
-                <Button  Cursor="Hand" x:Name="btnDelete" Content="删除" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="0,0,30,0">
-                    <Button.Template>
-                        <ControlTemplate TargetType="{x:Type Button}">
-                            <Border
-                                BorderBrush="{TemplateBinding Control.BorderBrush}"
-                                BorderThickness="1"
-                                CornerRadius="2">
-                                <Border.Background>#F0582B</Border.Background>
-                                <ContentPresenter
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding ContentControl.Content}" />
-                            </Border>
-                        </ControlTemplate>
-                    </Button.Template>
+            <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Center" Height="32">
+                <TextBlock Text="共" FontSize="20" Padding="0,5,0,0"/>
+                <TextBlock x:Name="txbSum" Text="0" FontSize="20" Padding="0,5,0,0"/>
+                <TextBlock Text="条" FontSize="20" Padding="0,5,0,0"/>
+                <Button Background="Transparent"
+                                Cursor="Hand"
+                        BorderThickness="0">
+                    <Image Source="./Images/class_p1.png"/>
                 </Button>
-                <Button  Cursor="Hand" x:Name="btnUpload" Content="上传" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="30,0,0,0">
-                    <Button.Template>
-                        <ControlTemplate TargetType="{x:Type Button}">
-                            <Border
-                                BorderBrush="{TemplateBinding Control.BorderBrush}"
-                                BorderThickness="1"
-                                CornerRadius="2">
-                                <Border.Background>#2D8CF0</Border.Background>
-                                <ContentPresenter
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding ContentControl.Content}" />
-                            </Border>
-                        </ControlTemplate>
-                    </Button.Template>
+                <Button Background="Transparent"
+                                Cursor="Hand"
+                        BorderThickness="0" Content="1" FontSize="20" Width="30"/>
+                <Button Background="Transparent"
+                                Cursor="Hand"
+                        BorderThickness="0" Content="2" FontSize="20" Width="30"/>
+                <Button Background="Transparent"
+                                Cursor="Hand"
+                        BorderThickness="0" Content="3" FontSize="20" Width="30"/>
+                <Button Background="Transparent"
+                                Cursor="Hand"
+                        BorderThickness="0">
+                    <Image Source="./Images/class_p2.png"/>
                 </Button>
             </StackPanel>
             

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -1,8 +1,13 @@
-using Org.BouncyCastle.Asn1.Crmf;
+using Common.system;
+using Org.BouncyCastle.Asn1.Crmf;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
 using XHWK.Model;
 
 namespace XHWK.WKTool
@@ -33,6 +38,7 @@ namespace XHWK.WKTool
             //加载视频列表
             LoadingVideoList();
             int i = 1;
+            bool isColour = true;
             //显示视频
             foreach (Model_Video videoinfo in model_VideoList)
             {
@@ -49,17 +55,41 @@ namespace XHWK.WKTool
                 //文件存储路径
                 //videoinfo.VidePath;
 
+                string colour = "#FFFFFF";
+                if (isColour==true)
+                {
+                    colour = "#FFFFFF";
+                    isColour = false;
+                }
+                else
+                {
+                    colour = "#E6F1FF";
+                    isColour = true;
+                }
+                string vis = "Visible";
+                string cos = "Collapsed";
+                if(!videoinfo.IsUpload)
+                {
+                    vis= "Collapsed";
+                    cos= "Visible";
+                }
+
                 pageData.menuList.Add(new FileDirectoryModel()
                 {
                     SerialNumber = i,
-                    VideoName = Common.system.FileToolsCommon.GetIOFileName( videoinfo.VidePath),
+                    VideoName = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VidePath),
                     VideoDuration = 0,
                     VideoSize = videoinfo.VideoSize,
                     VideoTime = videoinfo.RSTime,
-
-                });
+                    IsEnabled = false,
+                    Path = videoinfo.VidePath,
+                    Colour = colour,
+                    Visi = vis,
+                    Coll=cos,
+                }) ; ; 
                 i++;
             }
+            txbSum.Text = pageData.menuList.Count.ToString();
             DataContext = pageData;
         }
         /// <summary>
@@ -96,7 +126,129 @@ namespace XHWK.WKTool
         {
             DragMove();
         }
-     
+        /// <summary>
+        /// 上传
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnUpload_Click(object sender, RoutedEventArgs e) 
+        {
+            List<Button> buttons = FindChilds<Button>(listView1, "btnUpload");
+            for (int i = 0; i < buttons.Count; i++)
+            {
+                if (buttons[i] == sender)
+                {
+                 
+                }
+            }
+        }
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnDelete_Click(object sender, RoutedEventArgs e)
+        {
+            List<Button> buttons = FindChilds<Button>(listView1, "btnDelete");
+            for (int i = 0; i < buttons.Count; i++)
+            {
+                if (buttons[i] == sender)
+                {
+
+                }
+            }
+        }
+        /// <summary>
+        /// 播放
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnPlay_Click(object sender, RoutedEventArgs e)
+        {
+            List<Button> buttons = FindChilds<Button>(listView1, "btnPlay");
+            for (int i = 0; i < buttons.Count; i++)
+            {
+                if (buttons[i] == sender)
+                {
+                    try
+                    {
+                        ProcessStartInfo psi = new ProcessStartInfo(pageData.menuList[i].Path);
+                        Process pro = new Process
+                        {
+                            StartInfo = psi
+                        };
+                        pro.Start();
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteErrLog("FileDirectoryWindow【BtnPlay_Click】" + ex.Message, ex);
+                        MessageBox.Show(ex.Message);
+                        return;
+                    }
+                }
+            }
+        }
+
+
+
+        public static List<T> FindChilds<T>(DependencyObject parent, string childName)
+  where T : DependencyObject
+        {
+            List<T> list = new List<T>();
+            if (parent == null)
+            {
+                return list;
+            }
+
+            int childrenCount = VisualTreeHelper.GetChildrenCount(parent);
+            for (int i = 0; i < childrenCount; i++)
+            {
+                DependencyObject child = VisualTreeHelper.GetChild(parent, i);
+                // 如果子控件不是需查找的控件类型
+                T childType = child as T;
+                if (childType == null)
+                {
+                    // 在下一级控件中递归查找
+                    List<T> findChildList = FindChilds<T>(child, childName);
+                    for (int j = 0; j < findChildList.Count; j++)
+                    {
+                    }
+                    list.AddRange(FindChilds<T>(child, childName));
+                }
+                else if (!string.IsNullOrEmpty(childName))
+                {
+                    FrameworkElement frameworkElement = child as FrameworkElement;
+                    // 如果控件名称符合参数条件
+                    if (frameworkElement != null && frameworkElement.Name == childName)
+                    {
+                        list.Add((T)child);
+                    }
+                }
+                else
+                {
+                    // 查找到了控件
+                    list.Add((T)child);
+                }
+            }
+
+            return list;
+        }
+        /// <summary>
+        /// 修改
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnModify_Click(object sender, RoutedEventArgs e)
+        {
+            List<Button> buttons = FindChilds<Button>(listView1, "btnModify");
+            for (int i = 0; i < buttons.Count; i++)
+            {
+                if (buttons[i] == sender)
+                {
+                    pageData.menuList[i].IsEnabled = true;
+                }
+            }
+        }
     }
     public class FileDirectoryData : NotifyModel
     {
@@ -188,5 +340,45 @@ namespace XHWK.WKTool
                 OnPropertyChanged("Colour");
             }
         }
+        private bool _isEnabled;
+        /// <summary>
+        /// 是否可编辑
+        /// </summary>
+        public bool IsEnabled
+        {
+            get => _isEnabled;
+            set
+            {
+                _isEnabled = value;
+                OnPropertyChanged("IsEnabled");
+            }
+        }
+        public string Path { get; set; }
+        private string _visi;
+        /// <summary>
+        /// 显示
+        /// </summary>
+        public string Visi
+        {
+            get => _visi;
+            set
+            {
+                _visi = value;
+                OnPropertyChanged("Visi");
+            }
+        }
+        private string _coll;
+        /// <summary>
+        /// 显示
+        /// </summary>
+        public string Coll
+        {
+            get => _coll;
+            set
+            {
+                _coll = value;
+                OnPropertyChanged("Coll");
+            }
+        }
     }
 }

XHWK.WKTool/PrintWindow.xaml.cs

@@ -70,6 +70,10 @@ namespace XHWK.WKTool
                 System.Windows.Forms.MessageBox.Show("打印机不能为空！", "", MessageBoxButtons.OK, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1, System.Windows.Forms.MessageBoxOptions.DefaultDesktopOnly);
                 return;
             }
+            string imgPath = FileToolsCommon.GetFileAbsolutePath("temp");
+            FileToolsCommon.CreateFile(imgPath);
+            string pdf = imgPath + "\\101.pdf";
+            string tpf = imgPath + "\\102.TPF";
             int pr = 1;
             string msg = string.Empty;
             string outPut = string.Empty;
@@ -78,7 +82,7 @@ namespace XHWK.WKTool
             {
                 pyte = 1;
             }
-            LatticeFileHelper.GeneratingPDF(@"G:\101.pdf", @"G:\102.TPF", out pr, out msg, out outPut, pyte);
+            LatticeFileHelper.GeneratingPDF(pdf, tpf, out pr, out msg, out outPut, pyte);
             if (pr == 0)
             {
                 outPut = outPut.Replace("[", "").Replace("]", "").Replace("\"", "").Trim();

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -178,8 +178,10 @@ namespace XHWK.WKTool
                         if (I > 10010)
                         {
                             long time = Timestamp();
+                        string imgPath= FileToolsCommon.GetFileAbsolutePath("temp/imgplayer");
+                            FileToolsCommon.CreateFile(imgPath);
                             //string FilePathName = ImgPath + RsImgName.Count + ".png";
-                            string path = CameraHelper.CaptureImage(@"G:\103", time.ToString());
+                            string path = CameraHelper.CaptureImage(imgPath, time.ToString());
                             if (!string.IsNullOrWhiteSpace(path))
                             {
                                 RbnOpen.Add(path);
@@ -292,12 +294,21 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnUpload_Click(object sender, RoutedEventArgs e)
         {
-            //if (APP.IsLoginType == false)
-            //{
-            //    Login();
-            //    return;
-            //}
-            APP.fileDirectoryWindow = new FileDirectoryWindow();
+            if (APP.IsLoginType == false)
+            {
+                Login();
+                return;
+            }
+            if(APP.fileDirectoryWindow==null)
+            {
+                APP.fileDirectoryWindow = new FileDirectoryWindow();
+                APP.fileDirectoryWindow.Topmost = true;
+                APP.fileDirectoryWindow.Owner = this;
+            }
+            else
+            {
+                Initialize();
+            }
             APP.fileDirectoryWindow.Show();
 
             #region 测试上传
@@ -1345,7 +1356,8 @@ namespace XHWK.WKTool
             }
             if (APP.pageData.pagenum < 200)
             {
-                if (APP.PageDrawList != null && APP.PageDrawList.Count > 0 && APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null)
+                if (APP.PageDrawList != null && APP.PageDrawList.Count > 0 && APP.PageDrawList.Count > APP.pageData.currpage - 1
+                    && APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null)
                 {
                     APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
                 }
@@ -1392,8 +1404,10 @@ namespace XHWK.WKTool
                 ////设置纸张横向
                 //document.SetPageSize(iTextSharp.text.PageSize.A4.Rotate());
 
-
-                iTextSharp.text.pdf.PdfWriter.GetInstance(document, new FileStream(@"G:\101.pdf", FileMode.Create, FileAccess.ReadWrite));
+                string imgPath = FileToolsCommon.GetFileAbsolutePath("temp");
+                FileToolsCommon.CreateFile(imgPath);
+                imgPath += "\\101.pdf";
+                iTextSharp.text.pdf.PdfWriter.GetInstance(document, new FileStream(imgPath, FileMode.Create, FileAccess.ReadWrite));
                 document.Open();
                 iTextSharp.text.Image image;
                 for (int i = 0; i < APP.PageDrawList.Count; i++)