添加版本号显示

增大可用内存
3.1.7发版

XHWK.WKTool/App.config

@@ -9,8 +9,8 @@
     <!--参数是否加密 0不加密 1加密-->
     <add key="IsParameterEncryption" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="100" />
-    <add key="VersionName" value="3.1.6" />
+    <add key="VersionCode" value="101" />
+    <add key="VersionName" value="3.1.7" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

XHWK.WKTool/CreateAMicroLessonWindow.xaml

@@ -111,10 +111,11 @@
                         <!--  创建内页 375  -->
                         <Grid Margin="20,0">
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="100*" />
+                                <RowDefinition Height="80" />
                                 <RowDefinition Height="80*" />
                                 <RowDefinition Height="80*" />
-                                <RowDefinition Height="115*" />
+                                <RowDefinition Height="80" />
+                                <RowDefinition Height="30" />
                             </Grid.RowDefinitions>
                             <Grid Grid.Row="0">
                                 <Label
@@ -181,21 +182,7 @@
                                     </Grid>
                                     <Label Height="1.5" Background="#3F6FFF" />
                                 </StackPanel>
-                                <!--<StackPanel Grid.Row="2" Orientation="Horizontal" Margin="30,0,30,1" Grid.ColumnSpan="2">
-                                <Label Content="*" FontSize="18" Padding="0,27,0,0" Foreground="#FF0000"/>
-                                <TextBlock Text="存放路径" FontSize="18" Padding="2,23,10,0"/>
-                                -->
-                                <!--  输入框  -->
-                                <!--
-                                <Border Background="#CDD6E0" Width="200" Height="43" CornerRadius="3">
-                                    <TextBox x:Name="txbStoragePath" Text="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="198" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
-                                </Border>
-                                -->
-                                <!--  浏览按钮  -->
-                                <!--
-                                <Button Cursor="Hand" x:Name="btnBrowse" FontSize="18" Width="80" Height="43" BorderBrush="#cccccc" BorderThickness="1" Click="BtnBrowse_Click" Content="浏览" Style="{StaticResource Button_Menu}"
-                                Background="#F7F7F7" Margin="11,0,0,0"/>
-                            </StackPanel>-->
+                            
                             </Grid>
                             <!--  按钮  -->
                             <Grid Grid.Row="3">
@@ -212,7 +199,7 @@
                                     Grid.ColumnSpan="2"
                                     Width="195"
                                     Height="40"
-                                    Margin="0,0,0,30"
+                                    Margin="0,0,0,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     HorizontalContentAlignment="Center"
@@ -240,6 +227,10 @@
                                     </Button.Template>
                                 </Button>
                             </Grid>
+
+                            <Grid Grid.Row="4">
+                                <Label Name="versionLabel" Content="版本号：" Foreground="#666666" HorizontalAlignment="Center"></Label>
+                            </Grid>
                         </Grid>
                     </Grid>
                 </Border>

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -32,13 +32,22 @@ namespace XHWK.WKTool
             InitializeComponent();
             ResizeMode = ResizeMode.NoResize;
 
-            //if (!APP.CheckScreenCapturerRecorder())
-            //{
-            //    MessageWindow.Show("首次运行需安装环境,请在确定后依次点击“English-OK-Next>-Next>Install”完成安装！");
-            //    //APP.InstallScreenCapturerRecorder();
-            //}
             txbStoragePath.Text = FileToolsCommon.GetConfigValue("VideoSavePath");
-            //APP.FFmpeg.GetMToFFmpeg();
+
+            var versionCode = FileToolsCommon.GetConfigValue("VersionCode");
+            var versionName = FileToolsCommon.GetConfigValue("VersionName");
+            var isDebug = FileToolsCommon.GetConfigValue("IsDebug");
+            var debugStr = "测试版";
+            if (isDebug == "1")
+            {
+                debugStr = "测试版";
+            }
+            else if (isDebug == "0")
+            {
+                debugStr = "正式版";
+            }
+
+            versionLabel.Content = debugStr+" v" + versionName + "(" + versionCode + ")";
 
             LoadingCarouseImg();
         }

XHWK.WKTool/XHWK.WKTool.csproj

@@ -874,4 +874,7 @@ xcopy /Y /i $(ProjectDir)\256.ico $(TargetDir)\
     <Error Condition="!Exists('..\packages\Accord.Video.FFMPEG.3.8.0\build\Accord.Video.FFMPEG.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Accord.Video.FFMPEG.3.8.0\build\Accord.Video.FFMPEG.targets'))" />
   </Target>
   <Import Project="..\packages\Accord.Video.FFMPEG.3.8.0\build\Accord.Video.FFMPEG.targets" Condition="Exists('..\packages\Accord.Video.FFMPEG.3.8.0\build\Accord.Video.FFMPEG.targets')" />
+  <PropertyGroup>
+    <PostBuildEvent>editbin.exe /largeaddressaware 星火微课.exe</PostBuildEvent>
+  </PropertyGroup>
 </Project>

星火微课/星火微课-正式.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课"  
 #define MyAppDir "xhwk"
-#define MyAppVersion "3.1.6"
+#define MyAppVersion "3.1.7"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xhwkclient\XHWK.WKTool\bin\x86\Debug\"

星火微课/星火微课-测试.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课"  
 #define MyAppDir "xhwk"
-#define MyAppVersion "3.0.0"
+#define MyAppVersion "3.1.7"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xhwkclient\XHWK.WKTool\bin\x86\Debug\"