Bladeren bron

时间 版本

tags/录制修改前
zhangxueyang 4 jaren geleden
bovenliggende
commit
722903481f

+ 3
- 3
XHWK.WKTool/App.config Bestand weergeven

@@ -5,7 +5,7 @@
5 5
   </startup>
6 6
   <appSettings>
7 7
     <!--0正式 1测试-->
8
-    <add key="IsDebug" value="0" />
8
+    <add key="IsDebug" value="1" />
9 9
     <add key="OutputVideoLog" value="0"/>
10 10
     <!--图片压缩等级-->
11 11
     <add key="ImageCompressionLevel" value="30" />
@@ -34,8 +34,8 @@
34 34
     <!--上传每片大小 Mb-->
35 35
     <add key="UploadSliceLen" value="1" />
36 36
     <!--版本号-->
37
-    <add key="VersionCode" value="37" />
38
-    <add key="VersionName" value="1.3.6" />
37
+    <add key="VersionCode" value="38" />
38
+    <add key="VersionName" value="1.3.7" />
39 39
     <add key="ClientSettingsProvider.ServiceUri" value="" />
40 40
   </appSettings>
41 41
   <system.web>

+ 2
- 2
XHWK.WKTool/Properties/AssemblyInfo.cs Bestand weergeven

@@ -49,5 +49,5 @@ using System.Windows;
49 49
 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
50 50
 //通过使用 "*",如下所示:
51 51
 // [assembly: AssemblyVersion("1.0.*")]
52
-[assembly: AssemblyVersion("1.3.6.0")]
53
-[assembly: AssemblyFileVersion("1.3.6.0")]
52
+[assembly: AssemblyVersion("1.3.7.0")]
53
+[assembly: AssemblyFileVersion("1.3.7.0")]

+ 1
- 1
XHWK.WKTool/XHMicroLessonSystemWindow.xaml Bestand weergeven

@@ -455,7 +455,7 @@
455 455
                     <StackPanel Grid.Row="7" Grid.Column="1">
456 456
                         <TextBlock  FontSize="14" Foreground="#333333" Text="开始/暂停:Ctrl+F5     停止:Ctrl+S     退出讲评:鼠标右键" Margin="30,0,0,0"/>
457 457
                     </StackPanel>
458
-                    <TextBlock Grid.Row="9" Grid.Column="0" Text="版本号" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" Margin="0,0,0,0"/>
458
+                    <TextBlock Grid.Row="9" Grid.Column="0" x:Name="txbVersion" Text="正式版:" FontSize="16" HorizontalAlignment="Right" Foreground="#333333" Margin="0,0,0,0"/>
459 459
                     <StackPanel Grid.Row="9" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
460 460
                         <TextBlock x:Name="txbv" Text="V0.0.0" FontSize="16" Foreground="#333333"/>
461 461
                     </StackPanel>

+ 18
- 3
XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs Bestand weergeven

@@ -184,6 +184,15 @@ namespace XHWK.WKTool
184 184
         /// </summary>
185 185
         public void Initialize()
186 186
         {
187
+            if(APP.isDebug)
188
+            {
189
+                txbVersion.Text = "测试版:";
190
+            }
191
+            else
192
+            {
193
+                txbVersion.Text = "正式版:";
194
+            }
195
+           
187 196
             #region 数据初始化
188 197
             string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
189 198
             FileToolsCommon.CreateDirectory(pathTemp);
@@ -3445,14 +3454,20 @@ namespace XHWK.WKTool
3445 3454
                         timer.Change(-1, 0);
3446 3455
                         timer.Dispose();
3447 3456
                         IsFirstR = true;
3448
-                        txbTime.Text = "";
3449
-                        txbTime.Visibility = Visibility.Hidden;
3457
+
3458
+                      
3459
+
3460
+                      
3450 3461
                         BtnRecord.IsEnabled = true;
3451 3462
                         btnStop.IsEnabled = true;
3452 3463
                         TxbRecordingWord.Text = "录制";
3453 3464
                         txbType.Text = "";
3454 3465
                         MessageWindow.Show("保存失败,录制时间过短");
3455
-
3466
+                        Dispatcher.Invoke(() =>
3467
+                        {
3468
+                            txbTime.Text = "";
3469
+                            txbTime.Visibility = Visibility.Hidden;
3470
+                        });
3456 3471
                     }
3457 3472
                     //List<Model_Video> VideoList
3458 3473
                 }

Laden…
Annuleren
Opslaan