上传成功永久置灰 125% 屏幕适应

XHWK.Model/Properties/AssemblyInfo.cs

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

XHWK.WKTool/App.config

@@ -31,7 +31,7 @@
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1"/>
     <!--版本号-->
-    <add key="VersionCode" value="11"/>
-    <add key="VersionName" value="1.1.0"/>
+    <add key="VersionCode" value="12"/>
+    <add key="VersionName" value="1.1.1"/>
   </appSettings>
 </configuration>

XHWK.WKTool/DAL/DAL_Upload.cs

@@ -89,6 +89,22 @@ namespace XHWK.WKTool.DAL
                     if (resultObj.code == 0 && resultObj.obj != null)
                     {
                         APP.ResourceAddTwo = resultObj.obj;
+                        foreach (Model_WKData Vdata in APP.WKDataList)
+                        {
+                            if (Vdata.VideoList == null)
+                            {
+                                continue;
+                            }
+
+                            foreach (Model_Video videoinfo in Vdata.VideoList)
+                            {
+                                if (videoinfo.FileGuid == FileCode)
+                                {
+                                    videoinfo.IsUpload = true;
+                                    break;
+                                }
+                            }
+                        }
                         return true;
                     }
                     else

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -69,8 +69,8 @@
                                 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>
@@ -105,24 +105,24 @@
                                 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>
@@ -139,14 +139,13 @@
         </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="100"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="50"/>
         </Grid.RowDefinitions>
         <Grid Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Margin="0,0,0,0" MinHeight="100px">
             <Grid.RowDefinitions>
@@ -401,7 +400,7 @@
             </StackPanel>
 
 
-        <!--接口地址-->
+            <!--接口地址-->
             <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"/>
@@ -610,5 +609,5 @@
         </Grid>
 
     </Grid>
-
+    </Viewbox>
 </Window>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -1291,6 +1291,11 @@ namespace XHWK.WKTool
                     vis = "Collapsed";
                     cos = "Visible";
                 }
+                //if(i==1)//ceshi
+                //{
+                //    vis = "Visible";
+                //    cos = "Collapsed";
+                //}
                 if (i <= 16)
                 {
                     pageData.menuList.Add(new FileDirectoryModel()
@@ -1415,6 +1420,10 @@ namespace XHWK.WKTool
 
                     if (dAL_Upload.UploadVideo(pageData.menuList[i].FileGuid, out string ErrMessage))
                     {
+                        pageData.menuList[i].Visi = "Visible";
+                        pageData.menuList[i].Coll = "Collapsed";
+
+                        DataContext = pageData;
                         //MessageWindow.Show("视频上传服务器成功！");
                         if (APP.W_UploadWindow == null)
                         {
@@ -1423,13 +1432,11 @@ namespace XHWK.WKTool
                                 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();
-                        pageData.menuList[i].Visi = "Collapsed";
-                        pageData.menuList[i].Coll = "Visible";
-
-                        DataContext = pageData;
+                    
 
                     }
                     else