zhao：解决冲突

Common/system/HttpHelper.cs

@@ -143,6 +143,39 @@ namespace Common.system
             }
             return null;
         }
+
+        /// <summary>
+        ///调用Post接口
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public static string HttpPost(string body, string Url)
+        {
+            try
+            {
+                Encoding encoding = Encoding.UTF8;
+
+                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(Url);
+                request.Method = "POST";
+                request.Accept = "text/html,application/xhtml+xml,*/*";
+                request.ContentType = "application/json";
+
+                byte[] buffer = encoding.GetBytes(body);
+                request.ContentLength = buffer.Length;
+                request.GetRequestStream().Write(buffer, 0, buffer.Length);
+
+                HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+                using (StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.UTF8))
+                {
+                    return reader.ReadToEnd();
+                }
+            }
+            catch (Exception ex)
+            {
+                // LogHelper.Instance.Debug($"POST接口连接失败，请求参数：{ex.Message}");
+                return "POST报错:" + ex.Message;
+            }
+        }
         /// <summary>
         /// Post Http请求
         /// </summary>

XHWK.Model/ComboBoxBean.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XHWK.Model
+{
+    public class ComboBoxBean
+    {
+        public int Key { get; set; }
+        public string Value { get; set; }
+    }
+}

XHWK.Model/Model_DirectorList.cs

@@ -0,0 +1,111 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XHWK.Model
+{
+    public class Model_DirectorList
+    {
+        /// <summary>
+        /// id
+        /// </summary>
+        public int? id { get; set; }
+
+        /// <summary>
+        /// 创建人姓名
+        /// </summary>
+        public string createname { get; set; }
+
+        /// <summary>
+        /// id
+        /// </summary>
+        public int? page { get; set; }
+
+        /// <summary>
+        /// id
+        /// </summary>
+        public int? pageSize { get; set; }
+
+        /// <summary>
+        /// 章节id
+        /// </summary>
+        public int directorid { get; set; }
+
+        /// <summary>
+        /// 章节名称
+        /// </summary>
+        public string directorname { get; set; }
+
+        /// <summary>
+        /// 所属章节
+        /// </summary>
+        public int? directorpid { get; set; }
+
+        /// <summary>
+        /// 章节排序
+        /// </summary>
+        public int directororder { get; set; }
+
+        /// <summary>
+        /// 是否是叶子节点
+        /// </summary>
+        public int? leaf { get; set; }
+
+        /// <summary>
+        /// 教材id
+        /// </summary>
+        public int? lsbid { get; set; }
+
+        /// <summary>
+        /// 章节列表
+        /// </summary>
+        public int? directortype { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int? createid { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public int? createtime { get; set; }
+
+        /// <summary>
+        /// 学校id
+        /// </summary>
+        public int? schoolid { get; set; }
+
+        /// <summary>
+        /// 子章节
+        /// </summary>
+        public List<Model_DirectorList> children { get; set; }
+
+        /// <summary>
+        /// 章节归属级别
+        /// </summary>
+        public int? asknum { get; set; }
+
+        /// <summary>
+        /// 章节归属级别
+        /// </summary>
+        public int? correctRate { get; set; }
+
+        /// <summary>
+        /// 章节归属级别
+        /// </summary>
+        public int? selected { get; set; }
+
+        /// <summary>
+        /// 章节归属级别
+        /// </summary>
+        public int directorlevel { get; set; }
+
+        public override string ToString()
+        {
+            return $"{nameof(id)}: {id}, {nameof(createname)}: {createname}, {nameof(page)}: {page}, {nameof(pageSize)}: {pageSize},{nameof(directorid)}: {directorid}, {nameof(directorname)}: {directorname}, {nameof(directorpid)}: {directorpid}, {nameof(directororder)}: {directororder}, {nameof(leaf)}: {leaf}, {nameof(lsbid)}: {lsbid}, {nameof(directortype)}: {directortype}, {nameof(directorlevel)}: {directorlevel}, {nameof(createid)}: {createid}, {nameof(createtime)}: {createtime}, {nameof(schoolid)}: {schoolid}, {nameof(children)}: {children}, {nameof(asknum)}: {asknum}, {nameof(correctRate)}: {correctRate}, {nameof(selected)}: {selected}";
+        }
+    }
+}

XHWK.Model/Model_ResourceAdd.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XHWK.Model
+{
+    public class Model_ResourceAdd
+    {
+        //        converted: 0
+        //createid: 80
+        //directorid: 1009
+        //duration: 39
+        //imgUrl: ""
+        //level: 2
+        //lsbid: 40
+        //mp4code: "h264"
+        //resourcebelong: 3
+        //resourceclass: 2
+        //resourcecover: "12/resource/20200917/4f297df0-f8c0-11ea-adf5-81f24b97d4ff/weather_pic.jpg"
+        //resourcename: "weather_pic"
+        //resourcesize: 6105268
+        //resourcetype: 0
+        //resourceurl: "12/resource/20200917/4f297df0-f8c0-11ea-adf5-81f24b97d4ff/weather_pic.mp4"
+        //schoolid: 12
+        //suffix: "mp4"
+        //uid: 80
+        /// <summary>
+        /// 是否转换0未转换1已转换
+        /// </summary>
+        public int converted { get; set; }
+        /// <summary>
+        /// 创建人id	
+        /// </summary>
+        public int createid { get; set; }
+        /// <summary>
+        /// 章节id
+        /// </summary>
+        public int directorid { get; set; }
+        /// <summary>
+        /// 视频时长（秒）
+        /// </summary>
+        public int duration { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string imgUrl { get; set; }
+        /// <summary>
+        /// 资源级别1校本2个人(备课)3导学案4视频库
+        /// </summary>
+        public int level { get; set; }
+        /// <summary>
+        /// 教材关系表id
+        /// </summary>
+        public int lsbid { get; set; }
+        /// <summary>
+        /// mp4文件编码：mpeg4网页端不能播放，h264网页端能播放
+        /// </summary>
+        public string mp4code { get; set; }
+        /// <summary>
+        /// 资源归属1平台2校本3个人
+        /// </summary>
+        public int resourcebelong { get; set; }
+        /// <summary>
+        /// 资源分类1音频2视频3图片4文档
+        /// </summary>
+        public int resourceclass { get; set; }
+        /// <summary>
+        /// 封面图地址
+        /// </summary>
+        public string resourcecover { get; set; }
+        /// <summary>
+        /// 资源名称
+        /// </summary>
+        public string resourcename { get; set; }
+        /// <summary>
+        /// 文件大小   zxy lx
+        /// </summary>
+        public long resourcesize { get; set; }
+        /// <summary>
+        /// 资源归类0未知1课件 2学案（导学案）3习题 4微课视频（视频库）5教学设计
+        /// </summary>
+        public int resourcetype { get; set; }
+        /// <summary>
+        /// 资源地址
+        /// </summary>
+        public string resourceurl { get; set; }
+        /// <summary>
+        /// 学校id
+        /// </summary>
+        public int schoolid { get; set; }
+        /// <summary>
+        /// 文件后缀
+        /// </summary>
+        public string suffix { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int uid { get; set; }
+    }
+}

XHWK.Model/Model_ResourceAddTwo.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XHWK.Model
+{
+    public class Model_ResourceAddTwo 
+    {
+  public string videopath { get; set; }
+        public string coverpath { get; set; }
+        public int duration { get; set; }
+        public string mp4code { get; set; } 
+    }
+}

XHWK.Model/Model_TsubjectbookList.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XHWK.Model
+{
+    public class Model_TsubjectbookList
+    {
+        private string tbid;
+        private int lsbid;
+        private string selected;
+        private int subjectid;
+        private string subjectname;
+        private string bookname;
+        private string coverpath;
+        /// <summary>
+        /// 教师教材关系id
+        /// </summary>
+        public string Tbid { get => tbid; set => tbid = value; }
+        /// <summary>
+        /// 教材关联关系表id
+        /// </summary>
+        public int Lsbid { get => lsbid; set => lsbid = value; }
+        /// <summary>
+        /// 是否选中：0未选中1已选中
+        /// </summary>
+        public string Selected { get => selected; set => selected = value; }
+        /// <summary>
+        /// 科目id
+        /// </summary>
+        public int Subjectid { get => subjectid; set => subjectid = value; }
+        /// <summary>
+        /// 科目名称
+        /// </summary>
+        public string Subjectname { get => subjectname; set => subjectname = value; }
+        /// <summary>
+        /// 册别名称
+        /// </summary>
+        public string Bookname { get => bookname; set => bookname = value; }
+        /// <summary>
+        /// 封面图地址
+        /// </summary>
+        public string Coverpath { get => coverpath; set => coverpath = value; }
+    }
+}

XHWK.Model/XHWK.Model.csproj

@@ -50,11 +50,16 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ComboBoxBean.cs" />
     <Compile Include="Model_App.cs" />
     <Compile Include="Model_Canvas.cs" />
+    <Compile Include="Model_DirectorList.cs" />
     <Compile Include="Model_DrawData.cs" />
     <Compile Include="Model_Page.cs" />
+    <Compile Include="Model_ResourceAddTwo.cs" />
+    <Compile Include="Model_ResourceAdd.cs" />
     <Compile Include="Model_Screenshot.cs" />
+    <Compile Include="Model_TsubjectbookList.cs" />
     <Compile Include="Model_UserInfo.cs" />
     <Compile Include="Model_Video.cs" />
     <Compile Include="Model_WKData.cs" />

XHWK.WKTool/App.config

@@ -29,7 +29,7 @@
     文件上传： https://schoolfiletest.xhkjedu.com/
     展示文件:   https://schoolfiletest.xhkjedu.com/-->
     <!--摄像头位置 1.右上 2.左上 3.右下 4.左下-->
-    <add key="CameraPosition" value=""/>
+    <add key="CameraPosition" value="1"/>
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1"/>
   </appSettings>

XHWK.WKTool/App.cs

@@ -77,6 +77,18 @@ namespace XHWK.WKTool
         /// 数据存放目录
         /// </summary>
         public static string DataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\XHMicroLesson\\";
+        /// <summary>
+        /// 教材列表
+        /// </summary>
+        public static List<Model_TsubjectbookList> TsubjectbookList=null;
+        /// <summary>
+        /// 章节列表
+        /// </summary>
+        public static List<Model_DirectorList> DirectorList = null;
+        /// <summary>
+        /// 上传个人空间 入参
+        /// </summary>
+        public static Model_ResourceAddTwo ResourceAddTwo = null;
         #region 点阵笔
         /// <summary>
         /// 点阵笔
@@ -132,7 +144,14 @@ namespace XHWK.WKTool
         /// 提示窗口
         /// </summary>
         public static PromptWindow W_PromptWindow = null;
+        /// <summary>
+        /// loding页面
+        /// </summary>
         public static LoadDialog myloading;
+        /// <summary>
+        /// 上传页面
+        /// </summary>
+        public static UploadWindow W_UploadWindow = null;
         #endregion
         #endregion
 

XHWK.WKTool/AppUpdateWin.xaml

@@ -15,6 +15,9 @@
     WindowStartupLocation="CenterScreen"
     WindowStyle="None"
     >
+    <Window.Effect>
+        <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
+    </Window.Effect>
     <Grid>
         <Views:ZJClippingBorder
             Margin="10"

XHWK.WKTool/CreateAMicroLessonWindow.xaml

@@ -7,70 +7,51 @@
         mc:Ignorable="d"
         Title="星火微课" Height="346" Width="457"   AllowsTransparency="True"
     WindowStartupLocation="CenterScreen"
-    WindowStyle="None" Loaded="Window_Loaded" Margin="0"  BorderThickness="5,5,5,5">
+    WindowStyle="None" Loaded="Window_Loaded" Margin="0"  BorderThickness="7">
     <Window.Effect>
-        <DropShadowEffect BlurRadius="5" Color="#FF060606" Direction="80" ShadowDepth="0"/>
+        <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
     </Window.Effect>
-    <Viewbox>
-        <Grid Height="341" Width="454" >
-            <!--分4行-->
-            <Grid.RowDefinitions>
-                <RowDefinition Height="45"/>
-                <RowDefinition Height="110"/>
-                <RowDefinition Height="80"/>
-                <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
-            <!--第一行 标题-->
-            <Border Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown">
-                <Grid>
-                    <TextBlock Text="创建微课" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
-                    <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
-                </Grid>
+    <Grid>
+        <!--分4行-->
+        <Grid.RowDefinitions>
+            <RowDefinition Height="45"/>
+            <RowDefinition Height="110"/>
+            <RowDefinition Height="80"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <!--第一行 标题-->
+        <Border Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Grid.ColumnSpan="2">
+            <Grid>
+                <TextBlock Text="创建微课" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
+                <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
+            </Grid>
+        </Border>
+        <!--第二行 讲解名称-->
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,60,0,0" Grid.ColumnSpan="2">
+            <Label Content="*" FontSize="18" Padding="0,20,0,0" Foreground="#FF0000"/>
+            <TextBlock Text="讲解名称" FontSize="18" Padding="2,15,10,0"/>
+            <!--输入框-->
+            <Border Background="#CDD6E0" Width="321" Height="43" CornerRadius="3">
+                <TextBox x:Name="txbExplainName" Text="微课1" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="319" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
             </Border>
-            <!--第二行 讲解名称-->
-            <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,60,0,0">
-                <Label Content="*" FontSize="18" Padding="0,20,0,0" Foreground="#FF0000"/>
-                <TextBlock Text="讲解名称" FontSize="18" Padding="2,15,10,0"/>
-                <!--输入框-->
-                <Border Background="#CDD6E0" Width="321" Height="43" CornerRadius="3">
-                    <TextBox x:Name="txbExplainName" Text="微课1" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="319" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
-                </Border>
-            </StackPanel>
-            <!--第三行 存放路径-->
-            <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="10,30,0,0">
-                <Label Content="*" FontSize="18" Padding="0,20,0,0" Foreground="#FF0000"/>
-                <TextBlock Text="存放路径" FontSize="18" Padding="2,15,10,0"/>
-                <!--输入框-->
-                <Border Background="#CDD6E0" Width="225" Height="43" CornerRadius="3">
-                    <TextBox x:Name="txbStoragePath" Text="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="223" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
-                </Border>
-                <!--浏览按钮-->
-                <Button  Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="BtnBrowse_Click">
-                    <Button.Template>
-                        <ControlTemplate TargetType="{x:Type Button}">
-                            <Border
-                                BorderBrush="{TemplateBinding Control.BorderBrush}"
-                                BorderThickness="1"
-                                CornerRadius="2">
-                                <Border.Background>#CDD6E0</Border.Background>
-                                <ContentPresenter
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding ContentControl.Content}" />
-                            </Border>
-                        </ControlTemplate>
-                    </Button.Template>
-                </Button>
-            </StackPanel>
-            <!--第四行 开始按钮-->
-            <Button  Cursor="Hand" Grid.Row="3" x:Name="btnStart" Content="开始" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="43" Margin="10,0,10,0" Click="BtnStart_Click">
+        </StackPanel>
+        <!--第三行 存放路径-->
+        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="10,30,0,0" Grid.ColumnSpan="2">
+            <Label Content="*" FontSize="18" Padding="0,20,0,0" Foreground="#FF0000"/>
+            <TextBlock Text="存放路径" FontSize="18" Padding="2,15,10,0"/>
+            <!--输入框-->
+            <Border Background="#CDD6E0" Width="225" Height="43" CornerRadius="3">
+                <TextBox x:Name="txbStoragePath" Text="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="223" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
+            </Border>
+            <!--浏览按钮-->
+            <Button  Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="BtnBrowse_Click">
                 <Button.Template>
                     <ControlTemplate TargetType="{x:Type Button}">
                         <Border
                                 BorderBrush="{TemplateBinding Control.BorderBrush}"
                                 BorderThickness="1"
                                 CornerRadius="2">
-                            <Border.Background>#2D8CF0</Border.Background>
+                            <Border.Background>#CDD6E0</Border.Background>
                             <ContentPresenter
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
@@ -79,6 +60,23 @@
                     </ControlTemplate>
                 </Button.Template>
             </Button>
-        </Grid>
-    </Viewbox>
+        </StackPanel>
+        <!--第四行 开始按钮-->
+        <Button  Cursor="Hand" Grid.Row="3" x:Name="btnStart" Content="开始" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="43" Margin="10,0,10,0" Click="BtnStart_Click" Grid.ColumnSpan="2">
+            <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>
+    </Grid>
 </Window>

XHWK.WKTool/DAL/DAL_Upload.cs

@@ -40,7 +40,7 @@ namespace XHWK.WKTool.DAL
             {
                 try
                 {
-                    JObject jo = HttpHelper.PostFunction(FileRequestAddress + @"/chunkdb/isexist", @"application/x-www-form-urlencoded", @"md5=" + MD5, "");
+                    JObject jo = HttpHelper.PostFunction(FileRequestAddress /*"http://192.168.2.18:8908"*/ + @"/chunkdb/isexist", @"application/x-www-form-urlencoded", @"md5=" + MD5, "");
                     //0成功，1失败
                     if (jo["code"].ToString() == "0")
                     {
@@ -87,14 +87,18 @@ namespace XHWK.WKTool.DAL
             {
                 try
                 {
-                    JObject jo = HttpHelper.PostFunction(FileRequestAddress + @"/chunkdb/mergechunk", @"application/x-www-form-urlencoded", @"savefolder=" + Savefolder + "&identifier=" + FileCode, "");
+                    JObject jo = HttpHelper.PostFunction(FileRequestAddress /*"http://192.168.2.18:8908"*/ + @"/chunkdb/mergechunk", @"application/x-www-form-urlencoded", @"savefolder=" + Savefolder + "&identifier=" + FileCode, "");
+                    Model.ResultVo<Model_ResourceAddTwo> resultObj = JsonHelper.JsonToObj<Model.ResultVo<Model_ResourceAddTwo>>(jo.ToString()); ;
+                    APP.ResourceAddTwo = new Model_ResourceAddTwo();
                     //0成功，1失败
-                    if (jo["code"].ToString() == "0")
+                    if (resultObj.code == 0 && resultObj.obj != null)
                     {
+                        APP.ResourceAddTwo = resultObj.obj;
                         return true;
                     }
                     else
                     {
+                        //Message = "上传失败！";
                         Message = jo["msg"].ToString();
                         return false;
                     }
@@ -141,7 +145,7 @@ namespace XHWK.WKTool.DAL
                     ErrMessage = "未找到课程！";
                     return false;
                 }
-                string UploadUrl = FileRequestAddress + "/chunkdb/upchunk";
+                string UploadUrl = FileRequestAddress /*"http://192.168.2.18:8908" */+ "/chunkdb/upchunk";//zxyceshi
                 if (VideoInfo.IsUpload)
                 {
                     ErrMessage = "视频已上传";
@@ -167,12 +171,41 @@ namespace XHWK.WKTool.DAL
                         //已上传长度
                         long len = VideoInfo.Uploaded * VideoInfo.SliceLen;
                         string fileName = FileToolsCommon.GetFileName(VideoInfo.VideoPath);
+
+
+                        ////分块
+                        //for (; len + VideoInfo.SliceLen < filelen; VideoInfo.Uploaded++)
+                        //{
+                        //    len = VideoInfo.Uploaded * VideoInfo.SliceLen;
+                        //    //取指定长度的流
+                        //    byte[] byteArray = FileToolsCommon.ReadBigFileSpecifyLength(VideoInfo.VideoPath, len, (int)VideoInfo.SliceLen);
+                        //    //参数
+                        //    NameValueCollection formFields = new NameValueCollection();
+                        //    formFields.Add("identifier", VideoInfo.FileGuid);
+                        //    formFields.Add("chunkNumber", (VideoInfo.Uploaded + 1).ToString());
+                        //    formFields.Add("filename", fileName);
+                        //    formFields.Add("totalchunk", VideoInfo.Block.ToString());
+                        //    formFields.Add("md5", VideoInfo.FileMD5);
+                        //    JObject jo = HttpHelper.UploadRequestflow(UploadUrl, byteArray, fileName, formFields);
+                        //    //0成功，1失败
+                        //    if (jo["code"].ToString() != "0")
+                        //    {
+                        //        ErrMessage = jo["msg"].ToString();
+                        //        return false;
+                        //    }
+                        //}
+
+
+
+
+
+
                         //分块
-                        for (; len + VideoInfo.SliceLen < filelen; VideoInfo.Uploaded++)
+                        do
                         {
                             len = VideoInfo.Uploaded * VideoInfo.SliceLen;
                             //取指定长度的流
-                            byte[] byteArray = FileToolsCommon.ReadBigFileSpecifyLength(VideoInfo.VideoPath, len, 102400);
+                            byte[] byteArray = FileToolsCommon.ReadBigFileSpecifyLength(VideoInfo.VideoPath, len, (int)VideoInfo.SliceLen);
                             //参数
                             NameValueCollection formFields = new NameValueCollection();
                             formFields.Add("identifier", VideoInfo.FileGuid);
@@ -180,6 +213,14 @@ namespace XHWK.WKTool.DAL
                             formFields.Add("filename", fileName);
                             formFields.Add("totalchunk", VideoInfo.Block.ToString());
                             formFields.Add("md5", VideoInfo.FileMD5);
+                            VideoInfo.Uploaded++;
+                            //formFields.Add();///教材
+                            //if()//章节若没选不传
+                            //{
+                            //    formFields.Add();
+                            //}
+
+
                             JObject jo = HttpHelper.UploadRequestflow(UploadUrl, byteArray, fileName, formFields);
                             //0成功，1失败
                             if (jo["code"].ToString() != "0")
@@ -187,7 +228,7 @@ namespace XHWK.WKTool.DAL
                                 ErrMessage = jo["msg"].ToString();
                                 return false;
                             }
-                        }
+                        } while (len + VideoInfo.SliceLen < filelen);
                         //合并文件
                         bool isres = ReportFileMerge(APP.UserInfo.Schoolid.ToString() + "/resource", VideoInfo.FileGuid, out ErrMessage);
                         if (isres)

XHWK.WKTool/DAL/Interface.cs

@@ -1,4 +1,5 @@
 using Common.system;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -43,5 +44,150 @@ namespace XHWK.WKTool.DAL
                 return 1;
             }
         }
+        /// <summary>
+        /// 教师教材列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public int TsubjectbookList()
+        {
+            APP.TsubjectbookList = new List<Model_TsubjectbookList>();
+            try
+            {
+                string url = ZConfig.apiUrl + "/tsubjectbook/list";//地址
+                Dictionary<string, int> dic = new Dictionary<string, int>
+                {
+                    { "teacherid",APP.UserInfo.Userid}
+                };
+                string body = JsonHelper.ToJson(dic);
+                ResultVo<List<Model_TsubjectbookList>> result = HttpHelper.PostAndRespSignle<ResultVo<List<Model_TsubjectbookList>>>(url, postData: body);
+                if (result != null)
+                {
+                    APP.ServerMsg = result.msg;
+                    APP.TsubjectbookList = result.obj;
+                    return result.code;
+                }
+                else
+                {
+                    APP.ServerMsg = "网络异常！";
+                    return 1;
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【调用接口（RegisterController）】错误日志：" + ex.Message, ex);
+                return 1;
+            }
+        }
+        /// <summary>
+        /// 章节--列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public int DirectorList(int lsbid,int directortype,int createid)
+        {
+            APP.DirectorList = new List<Model_DirectorList>();
+            try
+            {
+                string url = ZConfig.apiUrl + "/director/list";//地址
+                Dictionary<string, int> dic = new Dictionary<string, int>
+                {
+                    { "lsbid", lsbid },
+                    { "directortype", directortype },
+                    { "createid", createid }
+                };
+                string body = JsonHelper.ToJson(dic);
+                ResultVo<List<Model_DirectorList>> result = HttpHelper.PostAndRespSignle<ResultVo<List<Model_DirectorList>>>(url, postData: body);
+                if (result != null)
+                {
+                    APP.ServerMsg = result.msg;
+                    APP.DirectorList = result.obj;
+                    return result.code;
+                }
+                else
+                {
+                    APP.ServerMsg = "网络异常！";
+                    return 1;
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【调用接口（RegisterController）】错误日志：" + ex.Message, ex);
+                return 1;
+            }
+        }
+        /// <summary>
+        /// 资源--添加
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public int ResourceAdd(Model_ResourceAdd model)
+        {
+            APP.DirectorList = new List<Model_DirectorList>();
+            try
+            {
+                string url = ZConfig.apiUrl + "/resource/add";//地址
+                Dictionary<string, object> dic = new Dictionary<string, object>();
+                //            converted: 0
+                //createid: 80
+                //directorid: 1009
+                //duration: 39
+                //imgUrl: ""
+                //level: 2
+                //lsbid: 40
+                //mp4code: "h264"
+                //resourcebelong: 3
+                //resourceclass: 2
+                //resourcecover: "12/resource/20200917/4f297df0-f8c0-11ea-adf5-81f24b97d4ff/weather_pic.jpg"
+                //resourcename: "weather_pic"
+                //resourcesize: 6105268
+                //resourcetype: 0
+                //resourceurl: "12/resource/20200917/4f297df0-f8c0-11ea-adf5-81f24b97d4ff/weather_pic.mp4"
+                //schoolid: 12
+                //suffix: "mp4"
+                //uid: 80
+                dic.Add("converted", model.converted);
+                dic.Add("createid", model.createid);
+                if(model.directorid!=999999)//章节上传可以不选
+                {
+                    dic.Add("directorid", model.directorid);
+                }
+                dic.Add("duration", model.duration);
+                dic.Add("imgUrl", model.imgUrl);
+                dic.Add("level", model.level);
+                dic.Add("lsbid", model.lsbid);
+                dic.Add("mp4code", model.mp4code);
+                dic.Add("resourcebelong", model.resourcebelong);
+                dic.Add("resourceclass", model.resourceclass);
+                dic.Add("resourcecover", model.resourcecover);
+                dic.Add("resourcename", model.resourcename);
+                dic.Add("resourcesize", model.resourcesize);
+                dic.Add("resourcetype", model.resourcetype);
+                dic.Add("resourceurl", model.resourceurl);
+                dic.Add("schoolid", model.schoolid);
+                dic.Add("suffix", model.suffix);
+                //dic.Add("uid", model.uid);
+
+
+                string body = JsonHelper.ToJson(dic);
+                string xmlDoc = HttpHelper.HttpPost(body, url);
+                JObject obj = JObject.Parse(xmlDoc);
+                if (obj != null)
+                {
+                    APP.ServerMsg = obj["msg"].ToString();
+                    return Convert.ToInt32(obj["code"].ToString());
+                }
+                else
+                {
+                    APP.ServerMsg = "网络异常！";
+                    return 1;
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【调用接口（RegisterController）】错误日志：" + ex.Message, ex);
+                return 1;
+            }
+        }
     }
 }

XHWK.WKTool/LoginWindow.xaml

@@ -8,26 +8,12 @@
         Title="LoginWindow" Height="358" Width="471"   AllowsTransparency="True"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
-    WindowStyle="None">
+    WindowStyle="None"  BorderThickness="7">
+    <Window.Effect>
+        <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
+    </Window.Effect>
     <Viewbox>
-        <Border Background="#fefefe" Height="358" Width="471">
-            <Border Background="#fdfdfd" Height="357" Width="470">
-                <Border Background="#fcfcfc" Height="356" Width="469">
-                    <Border Background="#fafafa" Height="355" Width="468">
-                        <Border Background="#f9f9f9" Height="354" Width="467">
-                            <Border Background="#f6f6f6" Height="353" Width="466">
-                                <Border Background="#f3f3f3" Height="352" Width="465">
-                                    <Border Background="#eeeeee" Height="351" Width="464">
-                                        <Border Background="#e9e9e9" Height="350" Width="463">
-                                            <Border Background="#e2e2e2" Height="349" Width="462">
-                                                <Border Background="#dcdcdc" Height="348" Width="461">
-                                                    <Border Background="#d3d3d3" Height="347" Width="460">
-                                                        <Border Background="#cccccc" Height="346" Width="459">
-                                                            <Border Background="#bfbfbf" Height="345" Width="458">
-                                                                <Border Background="#aeaeae" Height="344" Width="457">
-                                                                    <Border Background="#bababa" Height="343" Width="456">
-                                                                        <!--<Border Background="#e4e4e4" Height="342" Width="455">-->
-                                                                        <Grid Height="343" Width="456" Background="#FFFFFF">
+        <Grid Height="358" Width="471" Background="#FFFFFF">
             <!--分5行-->
             <Grid.RowDefinitions>
                 <RowDefinition Height="45"/>
@@ -47,7 +33,7 @@
             <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="20,20,0,0">
                 <TextBlock Text="登陆" FontSize="18" Padding="2,15,10,0"/>
                 <!--输入框-->
-                                                                                <Border Background="#cccbce" Width="371" Height="43" CornerRadius="3">
+                <Border Background="#cccbce" Width="371" Height="43" CornerRadius="3">
                     <TextBox x:Name="txbAccountNumber" Text="" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="369" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
                 </Border>
             </StackPanel>
@@ -55,7 +41,7 @@
             <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="20,20,0,0">
                 <TextBlock Text="密码" FontSize="18" Padding="2,15,10,0"/>
                 <!--输入框-->
-                                                                                <Border Background="#cccbce" Width="371" Height="43" CornerRadius="3">
+                <Border Background="#cccbce" Width="371" Height="43" CornerRadius="3">
                     <PasswordBox x:Name="pobPassword" FontSize="16" Foreground="#333333" PasswordChar="*" Padding="5,12,2,2" Width="369" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
                 </Border>
             </StackPanel>
@@ -65,7 +51,7 @@
                 </Viewbox>
                 <TextBlock Text="记住账号" FontSize="18" Height="30" Padding="5,3,0,0"/>
             </StackPanel>
-            
+
             <!--第五行 开始按钮-->
             <Button  Cursor="Hand" Grid.Row="4" x:Name="btnStart" Content="登录" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="50" Margin="10,0,10,0" Click="BtnStart_Click">
                 <Button.Template>
@@ -84,22 +70,5 @@
                 </Button.Template>
             </Button>
         </Grid>
-                                                                        </Border>
-                                                                    </Border>
-                                                                </Border>
-                                                            </Border>
-                                                        </Border>
-                                                    </Border>
-                                                </Border>
-                                            </Border>
-                                        </Border>
-                                    </Border>
-                                </Border>
-                            </Border>
-                        </Border>
-                    </Border>
-                </Border>
-            </Border>
-        <!--</Border>-->
     </Viewbox>
 </Window>

XHWK.WKTool/MessageWindow.xaml

@@ -7,9 +7,10 @@
         mc:Ignorable="d" 
         Title="星火微课" WindowStartupLocation="CenterScreen"
     WindowStyle="None" AllowsTransparency="True"    WindowState="Normal"
-    ShowInTaskbar="False" Topmost="True" ResizeMode="NoResize" d:DesignHeight="250" Width="600" Height="220" BorderThickness="5,5,5,5" MouseMove="Window_MouseMove">
+    ShowInTaskbar="False" Topmost="True" ResizeMode="NoResize" 
+        d:DesignHeight="250" Width="600" Height="220"  MouseMove="Window_MouseMove"  BorderThickness="7">
     <Window.Effect>
-        <DropShadowEffect BlurRadius="8" Color="#FF060606" Direction="80" ShadowDepth="0"/>
+        <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
     </Window.Effect>
     <Grid>
         <Grid.RowDefinitions>

XHWK.WKTool/PrintWindow.xaml

@@ -8,7 +8,10 @@
         Title="PrintWindow" Height="600" Width="900" AllowsTransparency="True"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
-    WindowStyle="None">
+    WindowStyle="None"  BorderThickness="7">
+    <Window.Effect>
+        <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
+    </Window.Effect>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="120"/>
@@ -19,26 +22,17 @@
             <Grid.RowDefinitions>
                 <RowDefinition Height="auto"/>
                 <RowDefinition Height="*"/>
-                <RowDefinition Height="50"/>
+                <RowDefinition Height="70"/>
             </Grid.RowDefinitions>
-            <TextBlock Grid.Row="0" Text="打印预览" Background="#2E8CF0" Foreground="#FFFFFF" Width="50" HorizontalAlignment="Left" Margin="10,5,0,0"/>
+            <!--<TextBlock Grid.Row="0" Text="打印预览" Background="#2E8CF0" Foreground="#FFFFFF" Width="50" HorizontalAlignment="Left" Margin="10,5,0,0"/>-->
             <StackPanel Grid.Row="1" HorizontalAlignment="Left" Orientation="Horizontal" Margin="10,10,0,0">
                 <TextBlock  Text="打印机：" Width="210" FontSize="20"/>
-                <TextBlock Text="份数：" FontSize="20" Margin="120,0,0,0"/>
-                <TextBlock x:Name="txbNumberOfCopies" Width="100" Text="1" FontSize="16" Padding="50,10,0,0" Background="White" />
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                    </Grid.RowDefinitions>
-                    <Button Grid.Row="0" x:Name="btnLess"  Content="-" Click="BtnLess_Click"/>
-                    <Button Grid.Row="1" x:Name="btnAdd"  Content="+" Click="BtnAdd_Click"/>
-                </Grid>
             </StackPanel>
-            <Button Grid.Row="1" x:Name="btnClose" Background="#CC4848" Foreground="#FFFFFF" Content="×" FontSize="20" Width="30" Height="30" HorizontalAlignment="Right" Margin="0,0,20,0" Click="BtnClose_Click">
+
+            <Button Grid.Row="2" x:Name="btnClose" Background="#CC4848" Foreground="#FFFFFF" Content="×" FontSize="20" Width="30" Height="30" HorizontalAlignment="Right" Margin="0,0,20,0" Click="BtnClose_Click">
 
             </Button>
-            <StackPanel Grid.Row="2" HorizontalAlignment="Left" Orientation="Horizontal" Margin="10,2,0,0">
+            <StackPanel Grid.Row="2" HorizontalAlignment="Left" Orientation="Horizontal" Margin="10,2,0,0" Height="40">
                 <ComboBox Cursor="Hand" Width="210"
                                 x:Name="cmbClass"
                                 Padding="10,0,10,0"
@@ -48,11 +42,20 @@
                                 FontSize="14"
                                 SelectedValuePath="Key"
                                 />
-                <TextBlock Text="点型：" FontSize="20"  Margin="120,10,0,0"/>
+                <TextBlock Text="份数：" FontSize="20" Margin="120,0,0,0" Padding="0,10,0,0"/>
+                <TextBlock x:Name="txbNumberOfCopies" Width="100" Text="1" FontSize="16" Padding="50,10,0,0" Background="White"/>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                    </Grid.RowDefinitions>
+                    <Button Grid.Row="0" x:Name="btnLess"  Content="-" Click="BtnLess_Click"/>
+                    <Button Grid.Row="1" x:Name="btnAdd"  Content="+" Click="BtnAdd_Click"/>
+                </Grid>
+                <!--<TextBlock Text="点型：" FontSize="20"  Margin="120,10,0,0"/>
                 <RadioButton x:Name="rbnSquarePoint" Content="方点" FontSize="16"  Margin="0,15,0,0" IsChecked="True"/>
-                <RadioButton x:Name="rbnDots" Content="圆点" FontSize="16"  Margin="0,15,0,0"/>
+                <RadioButton x:Name="rbnDots" Content="圆点" FontSize="16"  Margin="0,15,0,0"/>-->
             </StackPanel>
-            <TextBlock Grid.Row="2" Text="关闭" HorizontalAlignment="Right" Margin="0,2,20,0"  Width="30" Height="30"/>
         </Grid>
         <Grid Grid.Row="1">
             <Image x:Name="imgPri"/>

XHWK.WKTool/PrintWindow.xaml.cs

@@ -78,11 +78,11 @@ namespace XHWK.WKTool
             string msg = string.Empty;
             string outPut = string.Empty;
             int pyte = 0; //0为方点 1为圆点
-            if(rbnSquarePoint.IsChecked==false)
-            {
-                pyte = 1;
-            }
-            LatticeFileHelper.GeneratingPDF(pdf, tpf, out pr, out msg, out outPut, pyte);
+            //if(rbnSquarePoint.IsChecked==false)
+            //{
+            //    pyte = 1;
+            //}
+            LatticeFileHelper.GeneratingPDF(pdf, tpf, out pr, out msg, out outPut/*, pyte*/);
             if (pr == 0)
             {
                 outPut = outPut.Replace("[", "").Replace("]", "").Replace("\"", "").Trim();
@@ -100,10 +100,10 @@ namespace XHWK.WKTool
                 string standardError = string.Empty;
                 string standardOutput = string.Empty;
                 int frequency = Convert.ToInt32(txbNumberOfCopies.Text);
-                for (int i=0;i< frequency;i++)
-                {
-                    LatticeFileHelper.PrinterTPFFile(tpf, 1, cmbClass.Text, out printResult, out standardError, out standardOutput);
-                }
+                //for (int i=0;i< frequency;i++)
+                //{
+                    LatticeFileHelper.PrinterTPFFile(tpf, frequency, cmbClass.Text, out printResult, out standardError, out standardOutput);
+                //}
                 if(printResult==0)// 0为成功
                 {
                     MessageWindow.Show("打印成功", "", MessageBoxButton.OKCancel);

XHWK.WKTool/PromptWindow.xaml

@@ -8,7 +8,10 @@
         Title="PromptWindow" Height="210" Width="553" WindowStartupLocation="CenterOwner"
     WindowStyle="None" AllowsTransparency="True"    WindowState="Normal"
     ShowInTaskbar="True"   ResizeMode="NoResize"
-  >
+    BorderThickness="7">
+    <Window.Effect>
+        <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
+    </Window.Effect>
     <Grid Background="#FFFFFF">
         <Grid.RowDefinitions>
             <RowDefinition Height="auto"/>

XHWK.WKTool/UploadWindow.xaml

@@ -0,0 +1,84 @@
+<Window x:Class="XHWK.WKTool.UploadWindow"
+        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"
+        xmlns:local="clr-namespace:XHWK.WKTool"
+        mc:Ignorable="d"
+        Title="UploadWindow" Height="346" Width="457"   AllowsTransparency="True"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None" Loaded="Window_Loaded" Margin="0"    BorderThickness="7">
+    <Window.Effect>
+        <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
+    </Window.Effect>
+    <Viewbox>
+        <Grid Height="341" Width="454" >
+            <!--分4行-->
+            <Grid.RowDefinitions>
+                <RowDefinition Height="45"/>
+                <RowDefinition Height="80"/>
+                <RowDefinition Height="60"/>
+                <RowDefinition Height="60"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            <!--第一行 标题-->
+            <Border Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown">
+                <Grid>
+                    <TextBlock Text="上传" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
+                    <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
+                </Grid>
+            </Border>
+            <!--第三行 教材-->
+            <ComboBox Cursor="Hand"
+                            x:Name="book_list"
+                            Grid.Row="2"
+                            Height="30"
+                      Width="300"
+                            Margin="0,0,0,0"
+                            Padding="10,0,0,0"
+                            VerticalContentAlignment="Center"
+                            DisplayMemberPath="Value"
+                            FontSize="14"
+                            ItemsSource="{Binding bookList}"
+                            SelectedValuePath="Key"
+                      SelectionChanged="toolbar_list_SelectionChanged"
+                          >
+                <ComboBox.Resources>
+                    <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="WhiteSmoke" />
+                    <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Gray" />
+                </ComboBox.Resources>
+            </ComboBox>
+            <!--章节-->
+            <ComboBox Cursor="Hand"
+                            x:Name="cmbTeachingMaterial"
+                            Grid.Row="3"
+                               Height="30"
+                             Width="300"
+                            Padding="10,0,0,0"
+                            VerticalContentAlignment="Center"
+                            Background="White"
+                            DisplayMemberPath="Value"
+                            FontSize="14"
+                            Foreground="Black"
+                            ItemsSource="{Binding zhangjieList}"
+                            SelectedValuePath="Key" />
+            <!--第四行 开始按钮-->
+            <Button  Cursor="Hand" Grid.Row="4" x:Name="btnStart" Content="确定" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="43" Margin="10,0,10,0" Click="BtnStart_Click">
+                <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>
+        </Grid>
+    </Viewbox>
+</Window>

XHWK.WKTool/UploadWindow.xaml.cs

@@ -0,0 +1,261 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+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;
+using XHWK.Model;
+using XHWK.WKTool.DAL;
+
+namespace XHWK.WKTool
+{
+    /// <summary>
+    /// UploadWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class UploadWindow : Window
+    {
+        /// <summary>
+        /// 调用接口
+        /// </summary>
+        private readonly Interface @interface = new Interface();
+        /// <summary>
+        /// 前台数据
+        /// </summary>
+        internal LoginPageData pageData = new LoginPageData();
+        /// <summary>
+        /// 文件名
+        /// </summary>
+        private string Resourcename = string.Empty;
+        /// <summary>
+        /// 文件大小
+        /// </summary>
+        private long Resourcesize = 0;
+        /// <summary>
+        /// 文件类型
+        /// </summary>
+        private string Suffix = string.Empty;
+        public UploadWindow()
+        {
+            InitializeComponent();
+        }
+        /// <summary>
+        /// 初始化
+        /// </summary>
+        public void Initialize(string _resourcename,long _resourcesize,string _suffix) 
+        {
+            Resourcename = _resourcename;
+            Resourcesize = _resourcesize;
+            Suffix = _suffix;
+            Tsubjectbook();
+        }
+        /// <summary>
+        /// 教材接口调用
+        /// </summary>
+        /// <returns></returns>
+        private void Tsubjectbook()
+        {
+            int code = @interface.TsubjectbookList();
+            if (code == 0)
+            {
+                for (int i = 0; i < APP.TsubjectbookList.Count; i++)
+                {
+                    pageData.bookList.Add(new ComboBoxBean()
+                    {
+                        Key = APP.TsubjectbookList[i].Lsbid,
+                        Value = $"{APP.TsubjectbookList[i].Subjectname}  {APP.TsubjectbookList[i].Bookname}"
+                    });
+                }
+                book_list.SelectedIndex = 0;
+                DataContext = pageData;
+                Director();
+            }
+            else
+            {
+                MessageWindow.Show(APP.ServerMsg);
+            }
+        }
+        /// <summary>
+        /// 章节接口调用
+        /// </summary>
+        private void Director()
+        {
+            int selectIndex = book_list.SelectedIndex;
+            if(selectIndex<0)
+            {
+                selectIndex = 0;
+            }
+            int code = @interface.DirectorList(APP.TsubjectbookList[selectIndex].Lsbid,2,APP.UserInfo.Userid);
+            if (code == 0)
+            {
+                pageData.zhangjieList.Clear();
+                //pageData.zhangjieList.Add(new ComboBoxBean()
+                //{
+                //    Key = 999999,
+                //    Value = "全部"
+                //});
+                for (int i = 0; i < APP.DirectorList.Count; i++)
+                {
+                    Model_DirectorList item = APP.DirectorList[i];
+                    pageData.zhangjieList.Add(new ComboBoxBean()
+                    {
+                        Key = item.directorid,
+                        Value = item.directorname
+                    });
+                    addChild(item);
+                }
+                cmbTeachingMaterial.SelectedIndex = 0;
+            }
+            else
+            {
+                MessageWindow.Show(APP.ServerMsg);
+            }
+        }
+        /// <summary>
+        /// 子章节递归
+        /// </summary>
+        /// <param name="directorList"></param>
+        private void addChild(Model_DirectorList directorList)
+        {
+            if (directorList.children != null && directorList.children.Count > 0)
+            {
+                foreach (Model_DirectorList child in directorList.children)
+                {
+                    pageData.zhangjieList.Add(new ComboBoxBean()
+                    {
+                        Key = child.directorid,
+                        Value = getSpace(child.directorlevel) + child.directorname
+                    });
+                    if (child.children != null && child.children.Count > 0)
+                    {
+                        addChild(child);
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// 章节是否加空格符
+        /// </summary>
+        /// <param name="num"></param>
+        /// <returns></returns>
+        private string getSpace(int num)
+        {
+            string str = "";
+            for (int i = 0; i < num; i++)
+            {
+                str += "  ";
+            }
+            return str;
+        }
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+
+        }
+        /// <summary>
+        /// 教材下拉框改变事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void toolbar_list_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            Director();
+        }
+
+        private void BtnDown_Click(object sender, RoutedEventArgs e)
+        {
+            this.Hide();
+        }
+        /// <summary>
+        /// 上传到个人空间
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnStart_Click(object sender, RoutedEventArgs e)
+        {
+            //        converted: 0
+            //createid: 80
+            //directorid: 1009
+            //duration: 39
+            //imgUrl: ""
+            //level: 2
+            //lsbid: 40
+            //mp4code: "h264"
+            //resourcebelong: 3
+            //resourceclass: 2
+            //resourcecover: "12/resource/20200917/4f297df0-f8c0-11ea-adf5-81f24b97d4ff/weather_pic.jpg"
+            //resourcename: "weather_pic"
+            //resourcesize: 6105268
+            //resourcetype: 0
+            //resourceurl: "12/resource/20200917/4f297df0-f8c0-11ea-adf5-81f24b97d4ff/weather_pic.mp4"
+            //schoolid: 12
+            //suffix: "mp4"
+            //uid: 80
+            Model_ResourceAdd model_ResourceAdd = new Model_ResourceAdd();
+            model_ResourceAdd.converted = 0;
+            model_ResourceAdd.createid = APP.UserInfo.Userid;
+            model_ResourceAdd.directorid= Convert.ToInt32(cmbTeachingMaterial.SelectedValue.ToString());
+            model_ResourceAdd.duration = APP.ResourceAddTwo.duration;
+            model_ResourceAdd.imgUrl = "";
+            model_ResourceAdd.level = 2;
+            model_ResourceAdd.lsbid= Convert.ToInt32(book_list.SelectedValue.ToString());
+            model_ResourceAdd.mp4code = APP.ResourceAddTwo.mp4code;
+            model_ResourceAdd.resourcebelong = 3;
+            model_ResourceAdd.resourceclass = 2;
+            model_ResourceAdd.resourcecover = APP.ResourceAddTwo.coverpath;
+            model_ResourceAdd.resourcename = Resourcename;
+            model_ResourceAdd.resourcesize = Resourcesize;//zxy 文件大小
+            model_ResourceAdd.resourcetype = 0;
+            model_ResourceAdd.resourceurl = APP.ResourceAddTwo.videopath;
+            model_ResourceAdd.schoolid = APP.UserInfo.Schoolid;
+            if(Suffix.Equals("FLV"))
+            {
+                Suffix = "flv";
+            }
+            else if(Suffix.Equals("AVI"))
+            {
+                Suffix = "avi";
+            }
+            else
+            {
+                Suffix = "mp4";
+            }
+
+            model_ResourceAdd.suffix = Suffix;
+            //model_ResourceAdd.uid = 0;//zxy
+            int code = @interface.ResourceAdd(model_ResourceAdd);
+            if(code==0)
+            {
+                MessageWindow.Show("视频上传成功！");
+                Hide();
+            }
+            else
+            {
+                MessageWindow.Show(APP.ServerMsg);
+            }
+        }
+    }
+    public class LoginPageData : NotifyModel
+    {
+        public ObservableCollection<ComboBoxBean> bookList { get; set; }
+
+        public ObservableCollection<ComboBoxBean> zhangjieList { get; set; }
+
+        public LoginPageData()
+        {
+            bookList = new ObservableCollection<ComboBoxBean>();
+            zhangjieList = new ObservableCollection<ComboBoxBean>();
+        }
+    }
+}

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -9,8 +9,10 @@
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
         Title="星火微课系统" Height="1040" Width="1276" WindowStartupLocation="CenterScreen"
-    WindowStyle="None"    AllowsTransparency="True"  Background="#EFF1F8" ShowInTaskbar="True" ResizeMode="CanMinimize" BorderThickness="10"
-   >
+    WindowStyle="None"    AllowsTransparency="True"  Background="#EFF1F8" ShowInTaskbar="True" ResizeMode="CanMinimize" BorderThickness="7">
+    <Window.Effect>
+        <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
+    </Window.Effect>
     <!--<Grid>
         <Border CornerRadius="0,0,0,0"
                 Background="White"
@@ -251,10 +253,6 @@
                             </StackPanel>
                         </Button>
                     </StackPanel>
-                    <Label x:Name="lbl1" Content="Label" HorizontalAlignment="Left" Margin="469,10,0,0" Grid.Row="1" VerticalAlignment="Top" RenderTransformOrigin="0.802,0.126"/>
-                    <Label x:Name="lbl2" Content="Label" HorizontalAlignment="Left" Margin="780,10,0,0" Grid.Row="1" VerticalAlignment="Top" RenderTransformOrigin="0.34,0.173"/>
-                    <Label x:Name="lbl3" Content="Label" HorizontalAlignment="Left" Margin="469,49,0,0" Grid.Row="1" VerticalAlignment="Top" RenderTransformOrigin="0.11,0.159"/>
-                    <Label x:Name="lbl4" Content="Label" HorizontalAlignment="Left" Margin="780,44,0,0" Grid.Row="1" VerticalAlignment="Top"/>
                 </Grid>
                 <!--主内容-->
                 <Grid Grid.Row="1" x:Name="GridMain" Width="1276" Visibility="Visible">
@@ -325,9 +323,9 @@
                     Width="60" Height="20"
                     Click="last_button_Click">
                             <Button.Content>
-                                <StackPanel>
-                                    <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
-                                </StackPanel>
+                            <StackPanel>
+                                <Image Width="16" Height="12" Source=".\Images\class_p1.png" />
+                            </StackPanel>
                             </Button.Content>
                         </Button>
                         <Grid Width="60"  Background="Transparent">

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -471,9 +471,15 @@ namespace XHWK.WKTool
             {
                 gridUpload.Visibility = Visibility.Collapsed;
                 GridMain.Visibility = Visibility.Visible;
+                if(APP.pageData.pagenum>0)
+                {
+                    gridPage.Visibility = Visibility.Visible;
+                }
+                DataContext = APP.pageData;
             }
             else
             {
+                gridPage.Visibility = Visibility.Collapsed;
                 gridUpload.Visibility = Visibility.Visible;
                 GridMain.Visibility = Visibility.Collapsed;
                 InitializeUpload();
@@ -592,6 +598,19 @@ namespace XHWK.WKTool
             {
                 FileToolsCommon.SetConfigValue("CameraPosition", "4");
             }
+
+            if (rbnMP4.IsChecked == true)
+            {
+                FileToolsCommon.SetConfigValue("VideoType", "1");
+            }
+            else if (rbnFLV.IsChecked == true)
+            {
+                FileToolsCommon.SetConfigValue("VideoType", "2");
+            }
+            else if (rbnAVI.IsChecked == true)
+            {
+                FileToolsCommon.SetConfigValue("VideoType", "3");
+            }
             APP.CameraPosition = FileToolsCommon.GetConfigValue("CameraPosition");
             GridMain.Visibility = Visibility.Visible;
             gridSetUp.Visibility = Visibility.Collapsed;
@@ -638,6 +657,28 @@ namespace XHWK.WKTool
                 {
                     rbnLeftUnder.IsChecked = true;
                 }
+             string type=   FileToolsCommon.GetConfigValue("VideoType");//<!--视频格式 1、MP4 2、FlV 3、AVI-->
+                if ("1".Equals(type))
+                {
+                    rbnMP4.IsChecked = true;
+                }
+                else if ("2".Equals(type))
+                {
+                    rbnFLV.IsChecked = true;
+                }
+                else if ("3".Equals(type))
+                {
+                    rbnAVI.IsChecked = true;
+                }
+                string isSound = FileToolsCommon.GetConfigValue("IsSound");//<!--声音 true 有 false 无-->
+                if(isSound=="true")
+                {
+                    rbnY.IsChecked = true;
+                }
+                else
+                {
+                    rbnN.IsChecked = true;
+                }
             }
         }
         /// <summary>
@@ -2821,6 +2862,8 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnUploads_Click(object sender, RoutedEventArgs e) 
         {
+     
+
             pageData.menuList[Subscript].IsEnabled = false;
             List<System.Windows.Controls.Button> buttons = FindChilds<System.Windows.Controls.Button>(listView1, "btnUpload");
             for (int i = 0; i < buttons.Count; i++)
@@ -2831,19 +2874,35 @@ namespace XHWK.WKTool
 
                     if (dAL_Upload.UploadVideo(pageData.menuList[i].FileGuid, out string ErrMessage))
                     {
-                        pageData.menuList[i].Visi = "Visible";
-                        pageData.menuList[i].Coll = "Collapsed";
+                        //foreach (Model_WKData wKData in APP.WKDataList)
+                        //{
+                        //    if (wKData.VideoList == null)
+                        //        continue;
+                        //    //if()
+                        //    //{
+
+                        //    //}
+                        //}
+                            pageData.menuList[i].Visi = "Collapsed";
+                        pageData.menuList[i].Coll = "Visible";
 
                         DataContext = pageData;
 
-                        System.Windows.MessageBox.Show("视频上传成功！");
+                        //MessageWindow.Show("视频上传服务器成功！");
+                        if (APP.W_UploadWindow == null)
+                        {
+                            APP.W_UploadWindow = new UploadWindow();
+                            APP.W_UploadWindow.Owner = this;
+                        }
+                        //long size = Convert.ToInt64(FileToolsCommon.GetFileSizeByMB(pageData.menuList[i].FilePath));
+                            APP.W_UploadWindow.Initialize(pageData.menuList[i].VideoName,11110 /*Convert.ToInt64(pageData.menuList[i].VideoSize)*/, pageData.menuList[i].VideoType);
+                        APP.W_UploadWindow.ShowDialog();
+                     
                     }
                     else
                     {
-                        System.Windows.MessageBox.Show(ErrMessage);
+                        MessageWindow.Show(ErrMessage);
                     }
-
-
                 }
             }
         }
@@ -3272,17 +3331,9 @@ namespace XHWK.WKTool
             Thumb thu = (Thumb)sender;
             Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
             Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
-            //lbl1.Content = e.HorizontalChange + "," + e.VerticalChange;
-            lbl2.Content = Mouse.GetPosition(gridM);
                 switch (thu.Name)
                 {
                     case "RectLeftUp":
-                        //imgCanvas.Width -= e.HorizontalChange;
-                        //imgCanvas.Height -= e.VerticalChange;
-                        //imgCanvas.Margin = new Thickness(Mouse.GetPosition(gridM).X , Mouse.GetPosition(gridM).Y , 0, 0);
-                        ////imgCanvas.Width = imgRightDown.X- Mouse.GetPosition(gridM).X-10.0;
-                        ////imgCanvas.Height = imgRightDown.Y - Mouse.GetPosition(gridM).Y - 10.0
-                        //lbl1.Content = imgRightDown.X + "," + imgRightDown.Y; ;
                         imgCanvas.Width = imgRightDown.X - (Mouse.GetPosition(gridM).X);
                         imgCanvas.Height = imgRightDown.Y - (Mouse.GetPosition(gridM).Y);
                         imgCanvas.Margin = new Thickness(Mouse.GetPosition(gridM).X, Mouse.GetPosition(gridM).Y, 0, 0);
@@ -3304,12 +3355,10 @@ namespace XHWK.WKTool
                     default:
                         break;
                 }
-                lbl1.Content = imgCanvas.Margin.Left + "," + imgCanvas.Margin.Top;
-                lbl2.Content = (imgCanvas.Margin.Left+ imgCanvas.Width) +"," + imgCanvas.Margin.Top;
-                lbl3.Content = imgCanvas.Margin.Left + "," + (imgCanvas.Margin.Top+ imgCanvas.Height);
-                lbl4.Content= (imgCanvas.Margin.Left + imgCanvas.Width )+ "," + (imgCanvas.Margin.Top + imgCanvas.Height);
-                //lbl3.Content = imgCanvas.Width + "," + imgCanvas.Height;
-                //lbl4.Content = (imgCanvas.Margin.Left + imgCanvas.ActualWidth)+","+ (imgCanvas.Margin.Top + imgCanvas.ActualHeight);
+                //lbl1.Content = imgCanvas.Margin.Left + "," + imgCanvas.Margin.Top;
+                //lbl2.Content = (imgCanvas.Margin.Left+ imgCanvas.Width) +"," + imgCanvas.Margin.Top;
+                //lbl3.Content = imgCanvas.Margin.Left + "," + (imgCanvas.Margin.Top+ imgCanvas.Height);
+                //lbl4.Content= (imgCanvas.Margin.Left + imgCanvas.Width )+ "," + (imgCanvas.Margin.Top + imgCanvas.Height);
             }
             catch (Exception ex)
             {

XHWK.WKTool/XHWK.WKTool.csproj

@@ -162,6 +162,9 @@
     <Compile Include="ScreenRecordingToolbarWindow.xaml.cs">
       <DependentUpon>ScreenRecordingToolbarWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UploadWindow.xaml.cs">
+      <DependentUpon>UploadWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="XHMicroLessonSystemWindow.xaml.cs">
       <DependentUpon>XHMicroLessonSystemWindow.xaml</DependentUpon>
     </Compile>
@@ -211,6 +214,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="UploadWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="XHMicroLessonSystemWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

XHWK.WKTool/ZConfig.cs

@@ -13,9 +13,9 @@ namespace XHWK.WKTool.Config
         /// <summary>
         /// 当前版本号
         /// </summary>
-        public static int versionCode = 3;
+        public static int versionCode = 4;
 
-        public static string versionName = "1.0.2";
+        public static string versionName = "1.0.3";
 
         //接口地址
         public static string apiUrl = isDebug ? "http://schoolapitest.xhkjedu.com" : "http://schoolapi.xhkjedu.com";