Merge remote-tracking branch 'origin/zhangxueyang' into zyy

# Conflicts:
#	XHWK.WKTool/App.cs

XHWK.Model/Properties/AssemblyInfo.cs

 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.9.0")]
-[assembly: AssemblyFileVersion("1.0.9.0")]
+[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyFileVersion("1.1.1.0")]

XHWK.WKTool/App.config

     <!--记住密码-->
     <add key="isRemind" value="" />
     <!--API请求地址-->
-    <add key="APIRequestAddress" value="https://schoolapi.xhkjedu.com"/>
+    <add key="APIRequestAddress" value="http://schoolapi.xhkjedu.com"/>
     <!--文件平台请求地址-->
-    <add key="FileRequestAddress" value="https://schoolfile.xhkjedu.com"/>
+    <add key="FileRequestAddress" value="http://schoolfile.xhkjedu.com"/>
     <!--展示文件服务器请求地址-->
-    <add key="SchoolfileRequestAddress" value="https://schoolfile.xhkjedu.com"/>
+    <add key="SchoolfileRequestAddress" value="http://schoolfile.xhkjedu.com"/>
     <!--认证请求地址-->
     <add key="CertapiRequestAddress" value="http://certapi.xhkjedu.com"/>
     <!--摄像头位置 1.右上 2.左上 3.右下 4.左下-->
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1"/>
     <!--版本号-->
-    <add key="VersionCode" value="10"/>
-    <add key="VersionName" value="1.0.9"/>
+    <add key="VersionCode" value="12"/>
+    <add key="VersionName" value="1.1.1"/>
   </appSettings>
 </configuration>

XHWK.WKTool/App.cs

         /// 认证接口地址
         /// </summary>
         public static string certapiUrl = isDebug ? "http://certapitest.xhkjedu.com" : FileToolsCommon.GetConfigValue("CertapiRequestAddress");
+        /// <summary>
+        /// 数据存放目录
+        /// </summary>
+        public static string dataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\XHMicroLesson\\";
 
         /// <summary>
         /// 用户信息

XHWK.WKTool/DAL/DAL_Upload.cs

                     if (resultObj.code == 0 && resultObj.obj != null)
                     {
                         APP.ResourceAddTwo = resultObj.obj;
+                        foreach (Model_WKData Vdata in APP.WKDataList)
+                        {
+                            if (Vdata.VideoList == null)
+                            {
+                                continue;
+                            }
+
+                            foreach (Model_Video videoinfo in Vdata.VideoList)
+                            {
+                                if (videoinfo.FileGuid == FileCode)
+                                {
+                                    videoinfo.IsUpload = true;
+                                    break;
+                                }
+                            }
+                        }
                         return true;
                     }
                     else

XHWK.WKTool/LoginWindow.xaml.cs

             }
             else
             {
+                APP.IsLoginType = false;
                 APP.myloading.Hide();
                 MessageWindow.Show(APP.ServerMsg);
             }

XHWK.WKTool/UploadWindow.xaml.cs

             if (code == 0)
             {
                 pageData.zhangjieList.Clear();
-                //pageData.zhangjieList.Add(new ComboBoxBean()
-                //{
-                //    Key = 999999,
-                //    Value = "全部"
-                //});
+                pageData.zhangjieList.Add(new ComboBoxBean()
+                {
+                    Key = 0,
+                    Value = "全部",
+                });
                 for (int i = 0; i < APP.DirectorList.Count; i++)
                 {
                     Model_DirectorList item = APP.DirectorList[i];

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

                                 Cursor="Hand"
                         BorderThickness="0" Click="BtnModify_Click">
                             <Grid>
-                                <Image Source="./Images/fileDirectory3.png" Margin="6,6,6,6" Height="20" Visibility="{Binding vis}"/>
-                                <Image Source="./Images/fileDirectory4.png" Margin="6,6,6,6" Height="20" Visibility="{Binding cos}"/>
+                                <Image Source="./Images/fileDirectory3.png" Margin="6,6,6,6" Height="20" Visibility="{Binding Visi}"/>
+                                <Image Source="./Images/fileDirectory4.png" Margin="6,6,6,6" Height="20" Visibility="{Binding Coll}"/>
                             </Grid>
                         </Button>
                     </StackPanel>
                                 Cursor="Hand"
                         BorderThickness="0" Click="BtnPlay_Click">
                             <Grid>
-                                <Image Source="./Images/fileDirectory1.png" Margin="10" Height="20" Visibility="{Binding vis}"/>
-                                <Image Source="./Images/fileDirectory2.png" Margin="10"  Height="20" Visibility="{Binding cos}"/>
+                                <Image Source="./Images/fileDirectory1.png" Margin="10" Height="20" Visibility="{Binding Visi}"/>
+                                <Image Source="./Images/fileDirectory2.png" Margin="10"  Height="20" Visibility="{Binding Coll}"/>
                             </Grid>
                         </Button>
                         <Button x:Name="btnUpload" Background="Transparent"
                                 Cursor="Hand"
                         BorderThickness="0" Click="BtnUploads_Click">
                             <Grid>
-                                <Image Source="./Images/fileDirectory7.png" Margin="6,6,6,6" Height="20" Visibility="{Binding vis}"/>
-                                <Image Source="./Images/fileDirectory8.png" Margin="6,6,6,6" Height="20" Visibility="{Binding cos}"/>
+                                <Image Source="./Images/fileDirectory7.png" Margin="6,6,6,6" Height="20" Visibility="{Binding Visi}"/>
+                                <Image Source="./Images/fileDirectory8.png" Margin="6,6,6,6" Height="20" Visibility="{Binding Coll}"/>
                             </Grid>
                         </Button>
                         <Button x:Name="btnDelete" Background="Transparent"
                                 Cursor="Hand"
                         BorderThickness="0" Click="BtnDelete_Click">
                             <Grid>
-                                <Image Source="./Images/fileDirectory5.png" Margin="6,6,6,6" Height="20" Visibility="{Binding vis}"/>
-                                <Image Source="./Images/fileDirectory6.png" Margin="6,6,6,6" Height="20" Visibility="{Binding cos}"/>
+                                <Image Source="./Images/fileDirectory5.png" Margin="6,6,6,6" Height="20" Visibility="{Binding Visi}"/>
+                                <Image Source="./Images/fileDirectory6.png" Margin="6,6,6,6" Height="20" Visibility="{Binding Coll}"/>
                             </Grid>
                         </Button>
                     </StackPanel>
         </RadialGradientBrush>
     </Window.BorderBrush>
 
-
-    <Grid x:Name="GridContent" Height="1030" Width="1276" >
-
+    <Viewbox>
+    <Grid x:Name="GridContent" Height="1030" Width="1276">
         <!--分3行-->
         <Grid.RowDefinitions>
-            <RowDefinition Height="10*"/>
-            <RowDefinition Height="85*"/>
-            <RowDefinition Height="5*"/>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="auto"/>
         </Grid.RowDefinitions>
         <Grid Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Margin="0,0,0,0" MinHeight="100px" MouseDown="Grid_MouseDown">
             <Grid.RowDefinitions>
                 <RowDefinition Height="70"/>
                 <RowDefinition Height="70"/>
                 <RowDefinition Height="70"/>
+                <RowDefinition Height="70"/>
+                <RowDefinition Height="70"/>
+                <RowDefinition Height="70"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
             <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
                 <RadioButton x:Name="rbnY" Cursor="Hand" Content="有" FontSize="14" Foreground="#333333" Margin="10,2,0,0" IsChecked="True"/>
                 <RadioButton x:Name="rbnN" Cursor="Hand" Content="无" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
             </StackPanel>
-            <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
-                <TextBlock x:Name="txbFilePath" Text="文件路径" FontSize="16" Width="80"  Foreground="#2D8CF0" Padding="2,26,10,0"/>
-                <!--输入框-->
-                <Border Background="#CDD6E0" Width="525" Height="43" CornerRadius="3">
-                    <Label x:Name="txbStoragePath" Background="#FFFFFF" Content="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="523" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
+
+
+            <!--接口地址-->
+            <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="30,0,0,0">
+                <TextBlock Text="接口地址" FontSize="16" Foreground="#2D8CF0" Width="80" Padding="0,25,0,0" Margin="10,0,0,0"/>
+                <TextBlock Text="http://" FontSize="16" Padding="0,25,5,0"/>
+                <TextBox x:Name="txbInterfaceAddress" FontSize="16" Width="467" Height="41"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
+            </StackPanel>
+            <!--上传地址-->
+            <StackPanel Grid.Row="4" Orientation="Horizontal" Margin="30,20,0,0">
+                <TextBlock Text="上传地址" FontSize="16" Foreground="#2D8CF0" Width="80" Padding="0,10,0,0" Margin="10,5,0,0"/>
+                <TextBlock Text="http://" FontSize="16" Padding="0,15,5,0"/>
+                <TextBox x:Name="txbImageUploadAddress" FontSize="16" Width="467" Height="41"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
+            </StackPanel>
+            <!--下载地址-->
+            <StackPanel Grid.Row="5" Orientation="Horizontal" Margin="30,20,0,0">
+                <TextBlock Text="下载地址" FontSize="16" Foreground="#2D8CF0" Width="80" Padding="0,15,0,0" Margin="10,0,0,0"/>
+                <TextBlock Text="http://" FontSize="16" Padding="0,15,5,0"/>
+                <TextBox x:Name="txbPictureShowsAddress" FontSize="16" Width="467" Height="41"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
+            </StackPanel>
+
+
+            <StackPanel Grid.Row="6" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,20,0,0">
+                <TextBlock x:Name="txbFilePath" Text="文件路径" FontSize="16" Width="80"  Foreground="#2D8CF0" Padding="10,18,10,0" />
+                <Border Background="#CDD6E0" Width="522" Height="43" CornerRadius="3" Margin="10,0,0,0">
+                    <Label x:Name="txbStoragePath" Background="#FFFFFF" Content="D:\" FontSize="16" Foreground="#333333" Padding="10,12,2,2" Width="520" Height="41" 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>
                 </Button>
             </StackPanel>
-            <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
+            <StackPanel Grid.Row="7" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
                 <TextBlock Text="    版本号" FontSize="16" Width="80" Foreground="#2D8CF0"/>
                 <TextBlock x:Name="txbv" Text="V0.0.0" FontSize="16" Foreground="#333333" Padding="10,0,0,0"/>
             </StackPanel>
-            <StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
+            <StackPanel Grid.Row="8" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
                 <TextBlock Text="版权所有" FontSize="16" Width="80" Foreground="#2D8CF0"/>
                 <TextBlock Text="河南星火燎原软件科技有限公司" FontSize="14" Foreground="#333333" Padding="10,0,0,0"/>
             </StackPanel>
             <!--第四行 开始按钮-->
-            <Button Cursor="Hand" Grid.Row="6" x:Name="btnSave" Content="保存" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="10,0,10,0" Click="BtnSave_Click">
+            <Button Cursor="Hand" Grid.Row="9" x:Name="btnSave" Content="保存" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="10,0,10,0" Click="BtnSave_Click">
                 <Button.Template>
                     <ControlTemplate TargetType="{x:Type Button}">
                         <Border
                 <Button Cursor="Hand" x:Name="btnWhite" Background="#FFFFFF" Width="20" Height="20" Click="BtnWhite_Click" Margin="0,2,0,0" Visibility="Collapsed"/>
 
 
-                <Button Cursor="Hand" x:Name="btnRed" Background="#FF0000" Width="20" Height="20" Margin="5,-15,0,0" Click="BtnRed_Click">
+                <Button Cursor="Hand" x:Name="btnRed" Background="#FF0000" Width="20" Height="20" Margin="5,2,0,0" Click="BtnRed_Click">
                     <Image x:Name="imgRed" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Visible"/>
                 </Button>
-                <Button Cursor="Hand" x:Name="btnGray" Background="#333333" Width="20" Height="20" Margin="5,-15,0,0" Click="BtnGray_Click">
+                <Button Cursor="Hand" x:Name="btnGray" Background="#333333" Width="20" Height="20" Margin="5,2,0,0" Click="BtnGray_Click">
                     <Image x:Name="imgGray" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
                 </Button>
-                <Button Cursor="Hand" x:Name="btnCyanBlue" Background="#63D600" Width="20" Height="20" Margin="5,-15,0,0" Click="BtnCyanBlue_Click">
+                <Button Cursor="Hand" x:Name="btnCyanBlue" Background="#63D600" Width="20" Height="20" Margin="5,2,0,0" Click="BtnCyanBlue_Click">
                     <Image x:Name="imgCyanBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
                 </Button>
-                <Button Cursor="Hand" x:Name="btnYellow" Background="#FFBC00" Width="20" Height="20" Margin="5,-15,0,0" Click="BtnYellow_Click">
+                <Button Cursor="Hand" x:Name="btnYellow" Background="#FFBC00" Width="20" Height="20" Margin="5,2,0,0" Click="BtnYellow_Click">
                     <Image x:Name="imgYellow" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
                 </Button>
-                <Button Cursor="Hand" x:Name="btnBlue" Background="#00B4FC" Width="20" Height="20" Margin="5,-15,0,0" Click="BtnBlue_Click">
+                <Button Cursor="Hand" x:Name="btnBlue" Background="#00B4FC" Width="20" Height="20" Margin="5,2,0,0" Click="BtnBlue_Click">
                     <Image x:Name="imgBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
                 </Button>
                 <TextBlock Text="粗细：" FontSize="14" Padding="15,5,0,0" Margin="5,5,0,0"/>
         </Grid>
 
     </Grid>
-
+    </Viewbox>
 </Window>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

 using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
             GridContent.Height = Height;
 
 
-
+            #region 读取本地配置
+            if (File.Exists(APP.dataPath + "interfaceAddress.txt")) //若不为空
+            {
+                APP.apiUrl = System.IO.File.ReadAllText(APP.dataPath + "interfaceAddress.txt", Encoding.Default);
+            }
+            if (File.Exists(APP.dataPath + "imageUploadAddress.txt")) //若不为空
+            {
+                APP.uploadUrl = System.IO.File.ReadAllText(APP.dataPath + "imageUploadAddress.txt", Encoding.Default);
+            }
+            if (File.Exists(APP.dataPath + "pictureShowsAddress.txt")) //若不为空
+            {
+                APP.showImageUrl = System.IO.File.ReadAllText(APP.dataPath + "pictureShowsAddress.txt", Encoding.Default);
+            } 
+            #endregion
 
             //GridMain.Height= PrimaryScreen.ScaleScreenSize().Height - 40;
 
                 //ImgRecord.Visibility = Visibility.Collapsed;//设置时不可录制
                 //ImgRecordTwo.Visibility = Visibility.Visible;//设置时不可录制
                 //BtnRecord.IsEnabled = false;//设置时不可录制
+
+
+
+                #region 读取用户配置
+                //接口地址
+                if (!File.Exists(APP.dataPath + "interfaceAddress.txt")) //若为空
+                {
+                    txbInterfaceAddress.Text = APP.apiUrl.Replace("http://", "").Trim();
+                }
+                else
+                {
+                    txbInterfaceAddress.Text = System.IO.File.ReadAllText(APP.dataPath + "interfaceAddress.txt", Encoding.Default).Replace("http://", "").Trim();
+                }
+                //上传地址
+                if (!File.Exists(APP.dataPath + "imageUploadAddress.txt")) //若为空
+                {
+                    txbImageUploadAddress.Text = APP.uploadUrl.Replace("http://", "").Replace("/", "").Trim();
+                }
+                else
+                {
+                    txbImageUploadAddress.Text = System.IO.File.ReadAllText(APP.dataPath + "imageUploadAddress.txt", Encoding.Default).Replace("http://", "").Replace("/", "").Trim();
+                }
+                //下载地址
+                if (!File.Exists(APP.dataPath + "pictureShowsAddress.txt")) //若为空
+                {
+                    txbPictureShowsAddress.Text = APP.showImageUrl.Replace("http://", "").Replace("/", "").Replace("static", "").Trim();
+                }
+                else
+                {
+                    txbPictureShowsAddress.Text = System.IO.File.ReadAllText(APP.dataPath + "pictureShowsAddress.txt", Encoding.Default).Replace("http://", "").Replace("/", "").Replace("static", "").Trim();
+                }
+           
+
                 ///  < !--摄像头位置 1.右上 2.左上 3.右下 4.左下-- >
                 if ("1".Equals(APP.CameraPosition))
                 {
                 {
                     rbnN.IsChecked = true;
                 }
+                #endregion
             }
         }
         /// <summary>
             ImgRecord.Visibility = Visibility.Visible;//设置结束时可录制
             ImgRecordTwo.Visibility = Visibility.Collapsed;//设置结束时可录制
             BtnRecord.IsEnabled = true;//设置结束时可录制
+
+            if (!string.IsNullOrWhiteSpace(txbInterfaceAddress.Text))
+            {
+                string ApplicationData = APP.dataPath + "interfaceAddress.txt";
+                string temp = "http://" + txbInterfaceAddress.Text;
+                System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
+            }
+            else
+            {
+                MessageWindow.Show("接口地址未输入");
+                return;
+            }
+            if (!string.IsNullOrWhiteSpace(txbImageUploadAddress.Text))//图片上传地址
+            {
+                string ApplicationData = APP.dataPath + "imageUploadAddress.txt";
+                string temp = "http://" + txbImageUploadAddress.Text + "/";
+                System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
+            }
+            else
+            {
+                MessageWindow.Show("上传地址未输入");
+                return;
+            }
+            if (!string.IsNullOrWhiteSpace(txbPictureShowsAddress.Text))
+            {
+                string ApplicationData = APP.dataPath + "pictureShowsAddress.txt";
+                string temp = "http://" + txbPictureShowsAddress.Text + "/static/";
+                System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
+            }
+            else
+            {
+                MessageWindow.Show("下载地址未输入");
+                return;
+            }
+            if (!APP.apiUrl.Equals(txbInterfaceAddress.Text))
+            {
+                APP.apiUrl = "http://" + txbInterfaceAddress.Text;
+                LoginType();
+            }
+            if (!APP.uploadUrl.Equals(txbImageUploadAddress.Text))
+            {
+                APP.uploadUrl = "http://" + txbImageUploadAddress.Text + "/";
+            }
+            if (!APP.showImageUrl.Equals(txbPictureShowsAddress.Text))
+            {
+                APP.showImageUrl = "http://" + txbPictureShowsAddress.Text + "/static/";
+            }
             if (rbnMP4.IsChecked == true)
             {
                 //存储文件
             {
                 //存储文件
                 FileToolsCommon.SetConfigValue("VideoSavePath", txbStoragePath.Content.ToString());
-                System.Windows.MessageBox.Show("路径已变更，下次创建微课时自动生效！！！");
+                MessageWindow.Show("路径已变更，下次创建微课时自动生效！！！");
             }
         }
         /// <summary>
         public void InitializeUpload()
         {
             APP.myloading.Show();
+
             MouseNumber = 0;
             IsModify = false;
             //加载视频列表
                     vis = "Collapsed";
                     cos = "Visible";
                 }
+                //if(i==1)//ceshi
+                //{
+                //    vis = "Visible";
+                //    cos = "Collapsed";
+                //}
                 if (i <= 16)
                 {
                     pageData.menuList.Add(new FileDirectoryModel()
 
                     if (dAL_Upload.UploadVideo(pageData.menuList[i].FileGuid, out string ErrMessage))
                     {
-                        pageData.menuList[i].Visi = "Collapsed";
-                        pageData.menuList[i].Coll = "Visible";
+                        pageData.menuList[i].Visi = "Visible";
+                        pageData.menuList[i].Coll = "Collapsed";
 
                         DataContext = pageData;
-
                         //MessageWindow.Show("视频上传服务器成功！");
                         if (APP.W_UploadWindow == null)
                         {
                                 Owner = this
                             };
                         }
+                      
                         //long size = Convert.ToInt64(FileToolsCommon.GetFileSizeByMB(pageData.menuList[i].FilePath));
                         APP.W_UploadWindow.Initialize(pageData.menuList[i].VideoName, pageData.menuList[i].VideoSizes, pageData.menuList[i].VideoType, pageData.menuList[i].FileGuid);
                         APP.W_UploadWindow.ShowDialog();
+                    
 
                     }
                     else
             }
         }
         /// <summary>
+        /// 状态更改为未登陆
+        /// </summary>
+        private void LoginType()
+        {
+            APP.IsLoginType = false;
+            txbLoginType.Text = "未登录";
+            APP.UserInfo = new Model_UserInfo();
+            ImgUpload.Visibility = Visibility.Collapsed;
+            ImgUploadTwo.Visibility = Visibility.Visible;
+        }
+        /// <summary>
         /// 获取时间戳
         /// </summary>
         /// <returns></returns>