Browse Source

添加版本号显示

增大可用内存
3.1.7发版
tags/对接微服务前
张剑 3 years ago
parent
commit
101d13ef2c

+ 2
- 2
XHWK.WKTool/App.config View File

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

+ 9
- 18
XHWK.WKTool/CreateAMicroLessonWindow.xaml View File

111
                         <!--  创建内页 375  -->
111
                         <!--  创建内页 375  -->
112
                         <Grid Margin="20,0">
112
                         <Grid Margin="20,0">
113
                             <Grid.RowDefinitions>
113
                             <Grid.RowDefinitions>
114
-                                <RowDefinition Height="100*" />
114
+                                <RowDefinition Height="80" />
115
                                 <RowDefinition Height="80*" />
115
                                 <RowDefinition Height="80*" />
116
                                 <RowDefinition Height="80*" />
116
                                 <RowDefinition Height="80*" />
117
-                                <RowDefinition Height="115*" />
117
+                                <RowDefinition Height="80" />
118
+                                <RowDefinition Height="30" />
118
                             </Grid.RowDefinitions>
119
                             </Grid.RowDefinitions>
119
                             <Grid Grid.Row="0">
120
                             <Grid Grid.Row="0">
120
                                 <Label
121
                                 <Label
181
                                     </Grid>
182
                                     </Grid>
182
                                     <Label Height="1.5" Background="#3F6FFF" />
183
                                     <Label Height="1.5" Background="#3F6FFF" />
183
                                 </StackPanel>
184
                                 </StackPanel>
184
-                                <!--<StackPanel Grid.Row="2" Orientation="Horizontal" Margin="30,0,30,1" Grid.ColumnSpan="2">
185
-                                <Label Content="*" FontSize="18" Padding="0,27,0,0" Foreground="#FF0000"/>
186
-                                <TextBlock Text="存放路径" FontSize="18" Padding="2,23,10,0"/>
187
-                                -->
188
-                                <!--  输入框  -->
189
-                                <!--
190
-                                <Border Background="#CDD6E0" Width="200" Height="43" CornerRadius="3">
191
-                                    <TextBox x:Name="txbStoragePath" Text="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="198" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
192
-                                </Border>
193
-                                -->
194
-                                <!--  浏览按钮  -->
195
-                                <!--
196
-                                <Button Cursor="Hand" x:Name="btnBrowse" FontSize="18" Width="80" Height="43" BorderBrush="#cccccc" BorderThickness="1" Click="BtnBrowse_Click" Content="浏览" Style="{StaticResource Button_Menu}"
197
-                                Background="#F7F7F7" Margin="11,0,0,0"/>
198
-                            </StackPanel>-->
185
+                            
199
                             </Grid>
186
                             </Grid>
200
                             <!--  按钮  -->
187
                             <!--  按钮  -->
201
                             <Grid Grid.Row="3">
188
                             <Grid Grid.Row="3">
212
                                     Grid.ColumnSpan="2"
199
                                     Grid.ColumnSpan="2"
213
                                     Width="195"
200
                                     Width="195"
214
                                     Height="40"
201
                                     Height="40"
215
-                                    Margin="0,0,0,30"
202
+                                    Margin="0,0,0,0"
216
                                     HorizontalAlignment="Center"
203
                                     HorizontalAlignment="Center"
217
                                     VerticalAlignment="Center"
204
                                     VerticalAlignment="Center"
218
                                     HorizontalContentAlignment="Center"
205
                                     HorizontalContentAlignment="Center"
240
                                     </Button.Template>
227
                                     </Button.Template>
241
                                 </Button>
228
                                 </Button>
242
                             </Grid>
229
                             </Grid>
230
+
231
+                            <Grid Grid.Row="4">
232
+                                <Label Name="versionLabel" Content="版本号:" Foreground="#666666" HorizontalAlignment="Center"></Label>
233
+                            </Grid>
243
                         </Grid>
234
                         </Grid>
244
                     </Grid>
235
                     </Grid>
245
                 </Border>
236
                 </Border>

+ 15
- 6
XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs View File

32
             InitializeComponent();
32
             InitializeComponent();
33
             ResizeMode = ResizeMode.NoResize;
33
             ResizeMode = ResizeMode.NoResize;
34
 
34
 
35
-            //if (!APP.CheckScreenCapturerRecorder())
36
-            //{
37
-            //    MessageWindow.Show("首次运行需安装环境,请在确定后依次点击“English-OK-Next>-Next>Install”完成安装!");
38
-            //    //APP.InstallScreenCapturerRecorder();
39
-            //}
40
             txbStoragePath.Text = FileToolsCommon.GetConfigValue("VideoSavePath");
35
             txbStoragePath.Text = FileToolsCommon.GetConfigValue("VideoSavePath");
41
-            //APP.FFmpeg.GetMToFFmpeg();
36
+
37
+            var versionCode = FileToolsCommon.GetConfigValue("VersionCode");
38
+            var versionName = FileToolsCommon.GetConfigValue("VersionName");
39
+            var isDebug = FileToolsCommon.GetConfigValue("IsDebug");
40
+            var debugStr = "测试版";
41
+            if (isDebug == "1")
42
+            {
43
+                debugStr = "测试版";
44
+            }
45
+            else if (isDebug == "0")
46
+            {
47
+                debugStr = "正式版";
48
+            }
49
+
50
+            versionLabel.Content = debugStr+" v" + versionName + "(" + versionCode + ")";
42
 
51
 
43
             LoadingCarouseImg();
52
             LoadingCarouseImg();
44
         }
53
         }

+ 3
- 0
XHWK.WKTool/XHWK.WKTool.csproj View File

874
     <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'))" />
874
     <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'))" />
875
   </Target>
875
   </Target>
876
   <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')" />
876
   <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')" />
877
+  <PropertyGroup>
878
+    <PostBuildEvent>editbin.exe /largeaddressaware 星火微课.exe</PostBuildEvent>
879
+  </PropertyGroup>
877
 </Project>
880
 </Project>

+ 1
- 1
星火微课/星火微课-正式.iss View File

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

+ 1
- 1
星火微课/星火微课-测试.iss View File

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

Loading…
Cancel
Save