Browse Source

无法获取打印机异常退出问题

主页面UI优化
大幅提升进入主页面的速度
设备检测不再在每次开始时检测
录制未完成不能退出
全局按钮样式调整
master
张剑 2 years ago
parent
commit
28235b9aec

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

5
   </startup>
5
   </startup>
6
   <appSettings>
6
   <appSettings>
7
     <!--0正式 1测试-->
7
     <!--0正式 1测试-->
8
-    <add key="IsDebug" value="1" />
8
+    <add key="IsDebug" value="0" />
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="110" />
13
-    <add key="VersionName" value="3.2.1" />
12
+    <add key="VersionCode" value="111" />
13
+    <add key="VersionName" value="3.2.2" />
14
     <!--皮肤样式 0白 1蓝 2黑色 -->
14
     <!--皮肤样式 0白 1蓝 2黑色 -->
15
     <add key="SkinStyle" value="0" />
15
     <add key="SkinStyle" value="0" />
16
     <!--是否输出视频记录日志:0否-->
16
     <!--是否输出视频记录日志:0否-->

+ 3
- 3
XHWK.WKTool/CreateAMicroLessonWindow.xaml View File

210
                                     FontWeight="Bold"
210
                                     FontWeight="Bold"
211
                                     Foreground="#FFFFFF"
211
                                     Foreground="#FFFFFF"
212
                                     IsDefault="True"
212
                                     IsDefault="True"
213
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
213
+                                    >
214
                                     <Button.Template>
214
                                     <Button.Template>
215
                                         <ControlTemplate TargetType="{x:Type Button}">
215
                                         <ControlTemplate TargetType="{x:Type Button}">
216
                                             <Border
216
                                             <Border
272
                     FontSize="16"
272
                     FontSize="16"
273
                     Foreground="#FFFFFF"
273
                     Foreground="#FFFFFF"
274
                     Text="创建微课" />
274
                     Text="创建微课" />
275
-                <!--<Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" VerticalAlignment="Top" Foreground="#FFFFFF" FontSize="30" Padding="10,2,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>-->
275
+                <!--<Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" VerticalAlignment="Top" Foreground="#FFFFFF" FontSize="30" Padding="10,2,10,0" HorizontalAlignment="Right"  Click="BtnDown_Click"/>-->
276
             </Grid>
276
             </Grid>
277
             <Grid
277
             <Grid
278
                 x:Name="GridTitle_Black"
278
                 x:Name="GridTitle_Black"
297
                     Cursor="Hand"
297
                     Cursor="Hand"
298
                     FontSize="30"
298
                     FontSize="30"
299
                     Foreground="#FF333333"
299
                     Foreground="#FF333333"
300
-                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
300
+                     />
301
             </Grid>
301
             </Grid>
302
             <!--  第二行 讲解名称  -->
302
             <!--  第二行 讲解名称  -->
303
             <!--  第三行 存放路径  -->
303
             <!--  第三行 存放路径  -->

+ 5
- 10
XHWK.WKTool/DeviceWindow.xaml View File

181
                             Margin="0,0,0,0"
181
                             Margin="0,0,0,0"
182
                             HorizontalAlignment="Stretch"
182
                             HorizontalAlignment="Stretch"
183
                             VerticalAlignment="Stretch"
183
                             VerticalAlignment="Stretch"
184
-                            IsEnabled="False"
185
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
184
+                            IsEnabled="False">
186
                             <StackPanel Orientation="Horizontal">
185
                             <StackPanel Orientation="Horizontal">
187
                                 <Image
186
                                 <Image
188
                                     Height="18"
187
                                     Height="18"
203
                             Margin="0,0,0,0"
202
                             Margin="0,0,0,0"
204
                             HorizontalAlignment="Stretch"
203
                             HorizontalAlignment="Stretch"
205
                             VerticalAlignment="Stretch"
204
                             VerticalAlignment="Stretch"
206
-                            IsEnabled="False"
207
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
205
+                            IsEnabled="False">
208
                             <StackPanel Orientation="Horizontal">
206
                             <StackPanel Orientation="Horizontal">
209
                                 <Image
207
                                 <Image
210
                                     Height="18"
208
                                     Height="18"
226
                             HorizontalAlignment="Stretch"
224
                             HorizontalAlignment="Stretch"
227
                             VerticalAlignment="Stretch"
225
                             VerticalAlignment="Stretch"
228
                             Cursor="Hand"
226
                             Cursor="Hand"
229
-                            IsEnabled="False"
230
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
227
+                            IsEnabled="False">
231
                             <StackPanel Orientation="Horizontal">
228
                             <StackPanel Orientation="Horizontal">
232
                                 <Image
229
                                 <Image
233
                                     Height="18"
230
                                     Height="18"
248
                             Margin="0,0,0,0"
245
                             Margin="0,0,0,0"
249
                             HorizontalAlignment="Stretch"
246
                             HorizontalAlignment="Stretch"
250
                             VerticalAlignment="Stretch"
247
                             VerticalAlignment="Stretch"
251
-                            IsEnabled="False"
252
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
248
+                            IsEnabled="False">
253
                             <StackPanel Orientation="Horizontal">
249
                             <StackPanel Orientation="Horizontal">
254
                                 <Image
250
                                 <Image
255
                                     Height="18"
251
                                     Height="18"
386
                             Cursor="Hand"
382
                             Cursor="Hand"
387
                             FontSize="15"
383
                             FontSize="15"
388
                             Foreground="White"
384
                             Foreground="White"
389
-                            IsDefault="True"
390
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
385
+                            IsDefault="True">
391
                             <Button.Template>
386
                             <Button.Template>
392
                                 <ControlTemplate TargetType="{x:Type Button}">
387
                                 <ControlTemplate TargetType="{x:Type Button}">
393
                                     <Border
388
                                     <Border

+ 5
- 5
XHWK.WKTool/LoginWindow.xaml View File

236
                             FontSize="18"
236
                             FontSize="18"
237
                             Foreground="#FFFFFF"
237
                             Foreground="#FFFFFF"
238
                             IsDefault="True"
238
                             IsDefault="True"
239
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
239
+                            >
240
                             <Button.Template>
240
                             <Button.Template>
241
                                 <ControlTemplate TargetType="{x:Type Button}">
241
                                 <ControlTemplate TargetType="{x:Type Button}">
242
                                     <Border
242
                                     <Border
269
                             FontSize="18"
269
                             FontSize="18"
270
                             Foreground="#FFFFFF"
270
                             Foreground="#FFFFFF"
271
                             IsDefault="True"
271
                             IsDefault="True"
272
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
272
+                            >
273
                             <Button.Template>
273
                             <Button.Template>
274
                                 <ControlTemplate TargetType="{x:Type Button}">
274
                                 <ControlTemplate TargetType="{x:Type Button}">
275
                                     <Border
275
                                     <Border
296
                             Click="BtnServiceAddress_Click"
296
                             Click="BtnServiceAddress_Click"
297
                             Cursor="Hand"
297
                             Cursor="Hand"
298
                             FontSize="{Binding WordSize12}"
298
                             FontSize="{Binding WordSize12}"
299
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
299
+                            >
300
                             <Button.Template>
300
                             <Button.Template>
301
                                 <ControlTemplate TargetType="{x:Type Button}">
301
                                 <ControlTemplate TargetType="{x:Type Button}">
302
                                     <Grid>
302
                                     <Grid>
427
                             FontWeight="Bold"
427
                             FontWeight="Bold"
428
                             Foreground="#FFFFFF"
428
                             Foreground="#FFFFFF"
429
                             IsDefault="True"
429
                             IsDefault="True"
430
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
430
+                            >
431
                             <Button.Template>
431
                             <Button.Template>
432
                                 <ControlTemplate TargetType="{x:Type Button}">
432
                                 <ControlTemplate TargetType="{x:Type Button}">
433
                                     <Border
433
                                     <Border
461
                             FontWeight="Bold"
461
                             FontWeight="Bold"
462
                             Foreground="#FFFFFF"
462
                             Foreground="#FFFFFF"
463
                             IsDefault="True"
463
                             IsDefault="True"
464
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
464
+                            >
465
                             <Button.Template>
465
                             <Button.Template>
466
                                 <ControlTemplate TargetType="{x:Type Button}">
466
                                 <ControlTemplate TargetType="{x:Type Button}">
467
                                     <Border
467
                                     <Border

+ 17
- 17
XHWK.WKTool/MainWindow.xaml View File

352
                                 Click="BtnRecord_Click"
352
                                 Click="BtnRecord_Click"
353
                                 Cursor="Hand"
353
                                 Cursor="Hand"
354
                                 FontSize="14"
354
                                 FontSize="14"
355
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
355
+                                 />
356
                             <Button
356
                             <Button
357
                                 x:Name="BtnRecordSuspend"
357
                                 x:Name="BtnRecordSuspend"
358
                                 Margin="5,0"
358
                                 Margin="5,0"
362
                                 Click="BtnRecord_Click"
362
                                 Click="BtnRecord_Click"
363
                                 Cursor="Hand"
363
                                 Cursor="Hand"
364
                                 FontSize="14"
364
                                 FontSize="14"
365
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
365
+                                
366
                                 Visibility="Collapsed" />
366
                                 Visibility="Collapsed" />
367
                         </Grid>
367
                         </Grid>
368
                         <Grid Name="stop_grid" Grid.Column="3">
368
                         <Grid Name="stop_grid" Grid.Column="3">
375
                                 Click="BtnStop_Click"
375
                                 Click="BtnStop_Click"
376
                                 Cursor="Hand"
376
                                 Cursor="Hand"
377
                                 FontSize="14"
377
                                 FontSize="14"
378
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
378
+                                 />
379
                         </Grid>
379
                         </Grid>
380
                     </Grid>
380
                     </Grid>
381
 
381
 
395
                             Click="BtnClose_Click"
395
                             Click="BtnClose_Click"
396
                             Cursor="Hand"
396
                             Cursor="Hand"
397
                             FontSize="14"
397
                             FontSize="14"
398
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
398
+                             />
399
                     </Grid>
399
                     </Grid>
400
                     <!--  测试  -->
400
                     <!--  测试  -->
401
                     <Grid Grid.Column="2" Visibility="Collapsed">
401
                     <Grid Grid.Column="2" Visibility="Collapsed">
411
                             Click="BtnClose_Click"
411
                             Click="BtnClose_Click"
412
                             Cursor="Hand"
412
                             Cursor="Hand"
413
                             FontSize="16"
413
                             FontSize="16"
414
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
414
+                            >
415
                             <Button.Template>
415
                             <Button.Template>
416
                                 <ControlTemplate TargetType="{x:Type Button}">
416
                                 <ControlTemplate TargetType="{x:Type Button}">
417
                                     <Grid>
417
                                     <Grid>
535
                                 Click="BtnScreenshot_Click"
535
                                 Click="BtnScreenshot_Click"
536
                                 Cursor="Hand"
536
                                 Cursor="Hand"
537
                                 FontSize="16"
537
                                 FontSize="16"
538
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
538
+                                 />
539
                         </Grid>
539
                         </Grid>
540
                         <!--  导入  -->
540
                         <!--  导入  -->
541
                         <Grid Grid.Row="3">
541
                         <Grid Grid.Row="3">
547
                                 Click="BtnImport_Click"
547
                                 Click="BtnImport_Click"
548
                                 Cursor="Hand"
548
                                 Cursor="Hand"
549
                                 FontSize="16"
549
                                 FontSize="16"
550
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
550
+                                 />
551
                         </Grid>
551
                         </Grid>
552
                         <!--  加页  -->
552
                         <!--  加页  -->
553
                         <Grid Grid.Row="4">
553
                         <Grid Grid.Row="4">
559
                                 Click="BtnAdd_Click"
559
                                 Click="BtnAdd_Click"
560
                                 Cursor="Hand"
560
                                 Cursor="Hand"
561
                                 FontSize="16"
561
                                 FontSize="16"
562
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
562
+                                 />
563
                         </Grid>
563
                         </Grid>
564
                         <!--  打印  -->
564
                         <!--  打印  -->
565
                         <Grid Grid.Row="5">
565
                         <Grid Grid.Row="5">
571
                                 Click="BtnPrint_Click"
571
                                 Click="BtnPrint_Click"
572
                                 Cursor="Hand"
572
                                 Cursor="Hand"
573
                                 FontSize="16"
573
                                 FontSize="16"
574
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
574
+                                 />
575
                         </Grid>
575
                         </Grid>
576
                         <!--  我的  -->
576
                         <!--  我的  -->
577
                         <Grid Grid.Row="6">
577
                         <Grid Grid.Row="6">
583
                                 Click="BtnUpload_Click"
583
                                 Click="BtnUpload_Click"
584
                                 Cursor="Hand"
584
                                 Cursor="Hand"
585
                                 FontSize="16"
585
                                 FontSize="16"
586
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
586
+                                 />
587
                         </Grid>
587
                         </Grid>
588
                         <!--  检测  -->
588
                         <!--  检测  -->
589
                         <Grid Grid.Row="7">
589
                         <Grid Grid.Row="7">
595
                                 Click="BtnDevice_Click"
595
                                 Click="BtnDevice_Click"
596
                                 Cursor="Hand"
596
                                 Cursor="Hand"
597
                                 FontSize="16"
597
                                 FontSize="16"
598
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
598
+                                 />
599
                         </Grid>
599
                         </Grid>
600
                         <!--  设置  -->
600
                         <!--  设置  -->
601
                         <Grid Grid.Row="8">
601
                         <Grid Grid.Row="8">
607
                                 Click="BtnSetUp_Click"
607
                                 Click="BtnSetUp_Click"
608
                                 Cursor="Hand"
608
                                 Cursor="Hand"
609
                                 FontSize="16"
609
                                 FontSize="16"
610
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
610
+                                 />
611
                         </Grid>
611
                         </Grid>
612
                         <!--  测试  -->
612
                         <!--  测试  -->
613
                         <Grid
613
                         <Grid
621
                                 Click="BtnSetUp_Click"
621
                                 Click="BtnSetUp_Click"
622
                                 Cursor="Hand"
622
                                 Cursor="Hand"
623
                                 FontSize="18"
623
                                 FontSize="18"
624
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
624
+                                >
625
                                 <Button.Template>
625
                                 <Button.Template>
626
                                     <ControlTemplate TargetType="{x:Type Button}">
626
                                     <ControlTemplate TargetType="{x:Type Button}">
627
                                         <Grid>
627
                                         <Grid>
919
                                         Height="20"
919
                                         Height="20"
920
                                         Click="last_button_Click"
920
                                         Click="last_button_Click"
921
                                         Cursor="Hand"
921
                                         Cursor="Hand"
922
-                                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
922
+                                        >
923
                                         <StackPanel>
923
                                         <StackPanel>
924
                                             <Image
924
                                             <Image
925
                                                 Width="16"
925
                                                 Width="16"
965
                                         Background="Transparent"
965
                                         Background="Transparent"
966
                                         Click="next_btn_Click"
966
                                         Click="next_btn_Click"
967
                                         Cursor="Hand"
967
                                         Cursor="Hand"
968
-                                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
968
+                                        >
969
                                         <StackPanel>
969
                                         <StackPanel>
970
                                             <Image
970
                                             <Image
971
                                                 Width="16"
971
                                                 Width="16"
1231
                                                 VerticalAlignment="Center"
1231
                                                 VerticalAlignment="Center"
1232
                                                 Click="BtnSkinWhite_Click"
1232
                                                 Click="BtnSkinWhite_Click"
1233
                                                 Cursor="Hand"
1233
                                                 Cursor="Hand"
1234
-                                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
1234
+                                                >
1235
                                                 <Button.Template>
1235
                                                 <Button.Template>
1236
                                                     <ControlTemplate TargetType="{x:Type Button}">
1236
                                                     <ControlTemplate TargetType="{x:Type Button}">
1237
                                                         <StackPanel>
1237
                                                         <StackPanel>
1262
                                                 VerticalAlignment="Center"
1262
                                                 VerticalAlignment="Center"
1263
                                                 Click="BtnSkinTechnologyBlue_Click"
1263
                                                 Click="BtnSkinTechnologyBlue_Click"
1264
                                                 Cursor="Hand"
1264
                                                 Cursor="Hand"
1265
-                                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
1265
+                                                >
1266
                                                 <Button.Template>
1266
                                                 <Button.Template>
1267
                                                     <ControlTemplate TargetType="{x:Type Button}">
1267
                                                     <ControlTemplate TargetType="{x:Type Button}">
1268
                                                         <StackPanel>
1268
                                                         <StackPanel>

+ 1
- 1
XHWK.WKTool/MinToolbar.xaml View File

16
         <Grid>
16
         <Grid>
17
             <Border Background="White" CornerRadius="3">
17
             <Border Background="White" CornerRadius="3">
18
                 <!--<Grid x:Name="buttonMin" Height="25" Width="3"
18
                 <!--<Grid x:Name="buttonMin" Height="25" Width="3"
19
-                        Margin="0.5"  Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
19
+                        Margin="0.5"  
20
                         MouseEnter="buttonMin_MouseEnter">
20
                         MouseEnter="buttonMin_MouseEnter">
21
                     <Button.Template>
21
                     <Button.Template>
22
                         <ControlTemplate TargetType="{x:Type Button}">
22
                         <ControlTemplate TargetType="{x:Type Button}">

+ 1
- 1
XHWK.WKTool/ProductVerification.xaml View File

87
                     Background="White"
87
                     Background="White"
88
                     Click="close_click"
88
                     Click="close_click"
89
                     Cursor="Hand"
89
                     Cursor="Hand"
90
-                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
90
+                    >
91
                     <Button.Template>
91
                     <Button.Template>
92
                         <ControlTemplate TargetType="{x:Type Button}">
92
                         <ControlTemplate TargetType="{x:Type Button}">
93
                             <Border
93
                             <Border

+ 2
- 2
XHWK.WKTool/PromptWindow.xaml View File

26
        
26
        
27
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,30,0,0">
27
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,30,0,0">
28
             <Border x:Name="borCancel" Background="#E5E5E5" CornerRadius="6" >
28
             <Border x:Name="borCancel" Background="#E5E5E5" CornerRadius="6" >
29
-                <Button x:Name="btnCancel" Width="104" Height="42" Content="取消" FontSize="18" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="Transparent"/>
29
+                <Button x:Name="btnCancel" Width="104" Height="42" Content="取消" FontSize="18"  Background="Transparent"/>
30
             </Border>
30
             </Border>
31
             <Border Background="#E5E5E5" CornerRadius="6" Margin="30,0,20,0">
31
             <Border Background="#E5E5E5" CornerRadius="6" Margin="30,0,20,0">
32
-                <Button Width="104" Height="42" Content="确定" FontSize="18" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="Transparent"/>
32
+                <Button Width="104" Height="42" Content="确定" FontSize="18"  Background="Transparent"/>
33
             </Border>
33
             </Border>
34
         </StackPanel>
34
         </StackPanel>
35
     </Grid>
35
     </Grid>

+ 8
- 8
XHWK.WKTool/ScreenRecordingToolbarWindow.xaml View File

39
                     x:Name="BtnRecordingScreen"
39
                     x:Name="BtnRecordingScreen"
40
                     Click="BtnRecordingScreen_Click"
40
                     Click="BtnRecordingScreen_Click"
41
                     Cursor="Hand"
41
                     Cursor="Hand"
42
-                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
42
+                    
43
                     ToolTip="开始"
43
                     ToolTip="开始"
44
                     Visibility="Visible">
44
                     Visibility="Visible">
45
                     <Button.Template>
45
                     <Button.Template>
63
                     x:Name="BtnRecordingScreenPause"
63
                     x:Name="BtnRecordingScreenPause"
64
                     Click="BtnRecordingScreen_Click"
64
                     Click="BtnRecordingScreen_Click"
65
                     Cursor="Hand"
65
                     Cursor="Hand"
66
-                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
66
+                    
67
                     ToolTip="暂停"
67
                     ToolTip="暂停"
68
                     Visibility="Collapsed">
68
                     Visibility="Collapsed">
69
                     <Button.Template>
69
                     <Button.Template>
110
                         x:Name="BtnStopRecordingScreen"
110
                         x:Name="BtnStopRecordingScreen"
111
                         Click="BtnStopRecordingScreen_Click"
111
                         Click="BtnStopRecordingScreen_Click"
112
                         Cursor="Hand"
112
                         Cursor="Hand"
113
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
113
+                        
114
                         ToolTip="停止">
114
                         ToolTip="停止">
115
                         <Button.Template>
115
                         <Button.Template>
116
                             <ControlTemplate TargetType="{x:Type Button}">
116
                             <ControlTemplate TargetType="{x:Type Button}">
178
                         x:Name="BtnPenBlue"
178
                         x:Name="BtnPenBlue"
179
                         Click="BtnBrush_Click"
179
                         Click="BtnBrush_Click"
180
                         Cursor="Hand"
180
                         Cursor="Hand"
181
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
181
+                        
182
                         ToolTip="蓝笔">
182
                         ToolTip="蓝笔">
183
                         <Button.Template>
183
                         <Button.Template>
184
                             <ControlTemplate TargetType="{x:Type Button}">
184
                             <ControlTemplate TargetType="{x:Type Button}">
199
                         x:Name="BtnPenBlue_CL"
199
                         x:Name="BtnPenBlue_CL"
200
                         Click="BtnBrush_Click"
200
                         Click="BtnBrush_Click"
201
                         Cursor="Hand"
201
                         Cursor="Hand"
202
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
202
+                        
203
                         ToolTip="批注"
203
                         ToolTip="批注"
204
                         Visibility="Collapsed">
204
                         Visibility="Collapsed">
205
                         <Button.Template>
205
                         <Button.Template>
215
                         x:Name="BtnPenRed"
215
                         x:Name="BtnPenRed"
216
                         Click="BtnBlackPenTwo_Click"
216
                         Click="BtnBlackPenTwo_Click"
217
                         Cursor="Hand"
217
                         Cursor="Hand"
218
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
218
+                        
219
                         ToolTip="批注">
219
                         ToolTip="批注">
220
                         <Button.Template>
220
                         <Button.Template>
221
                             <ControlTemplate TargetType="{x:Type Button}">
221
                             <ControlTemplate TargetType="{x:Type Button}">
236
                         x:Name="BtnPenRed_CL"
236
                         x:Name="BtnPenRed_CL"
237
                         Click="BtnBlackPenTwo_Click"
237
                         Click="BtnBlackPenTwo_Click"
238
                         Cursor="Hand"
238
                         Cursor="Hand"
239
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
239
+                        
240
                         ToolTip="批注"
240
                         ToolTip="批注"
241
                         Visibility="Collapsed">
241
                         Visibility="Collapsed">
242
                         <Button.Template>
242
                         <Button.Template>
265
                         x:Name="BtnReturn"
265
                         x:Name="BtnReturn"
266
                         Click="BtnReturn_Click"
266
                         Click="BtnReturn_Click"
267
                         Cursor="Hand"
267
                         Cursor="Hand"
268
-                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
268
+                        
269
                         ToolTip="返回">
269
                         ToolTip="返回">
270
                         <Button.Template>
270
                         <Button.Template>
271
                             <ControlTemplate TargetType="{x:Type Button}">
271
                             <ControlTemplate TargetType="{x:Type Button}">

+ 2
- 2
XHWK.WKTool/UControl/Uc_VideoItem.xaml View File

31
                             VerticalAlignment="Stretch"
31
                             VerticalAlignment="Stretch"
32
                             Click="BtnVideoPlay_Click"
32
                             Click="BtnVideoPlay_Click"
33
                             Cursor="Hand"
33
                             Cursor="Hand"
34
-                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
34
+                            >
35
                             <Image
35
                             <Image
36
                                 x:Name="ImgVideo"
36
                                 x:Name="ImgVideo"
37
                                 Cursor="Hand"
37
                                 Cursor="Hand"
60
                                 VerticalAlignment="Center"
60
                                 VerticalAlignment="Center"
61
                                 Click="Button_Click"
61
                                 Click="Button_Click"
62
                                 Cursor="Hand"
62
                                 Cursor="Hand"
63
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
63
+                                >
64
                                 <Image
64
                                 <Image
65
                                     x:Name="ImgSetUp"
65
                                     x:Name="ImgSetUp"
66
                                     Source="/Images/Clip_Clip.png"
66
                                     Source="/Images/Clip_Clip.png"

+ 3
- 3
XHWK.WKTool/UploadWindow.xaml View File

50
                 Cursor="Hand"
50
                 Cursor="Hand"
51
                 FontSize="25"
51
                 FontSize="25"
52
                 Foreground="#FFFFFF"
52
                 Foreground="#FFFFFF"
53
-                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
53
+                 />
54
         </Grid>
54
         </Grid>
55
         <Grid
55
         <Grid
56
             x:Name="GridTitle_Black"
56
             x:Name="GridTitle_Black"
74
                 Cursor="Hand"
74
                 Cursor="Hand"
75
                 FontSize="25"
75
                 FontSize="25"
76
                 Foreground="#FF333333"
76
                 Foreground="#FF333333"
77
-                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
77
+                 />
78
         </Grid>
78
         </Grid>
79
         <!--  第三行 教材  -->
79
         <!--  第三行 教材  -->
80
         <ComboBox
80
         <ComboBox
132
             FontSize="18"
132
             FontSize="18"
133
             Foreground="#FFFFFF"
133
             Foreground="#FFFFFF"
134
             IsDefault="True"
134
             IsDefault="True"
135
-            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
135
+            >
136
             <Button.Template>
136
             <Button.Template>
137
                 <ControlTemplate TargetType="{x:Type Button}">
137
                 <ControlTemplate TargetType="{x:Type Button}">
138
                     <Border
138
                     <Border

+ 13
- 3
XHWK.WKTool/Utils/ZPrintUtils.cs View File

1
-using System.Collections.Generic;
1
+using Common.system;
2
+
3
+using System.Collections.Generic;
2
 using System.Drawing.Printing;
4
 using System.Drawing.Printing;
3
 using System.Runtime.InteropServices;
5
 using System.Runtime.InteropServices;
4
 
6
 
27
             try
29
             try
28
             {
30
             {
29
                 fPrinters.Add(DefaultPrinter()); //默认打印机始终出现在列表的第一项
31
                 fPrinters.Add(DefaultPrinter()); //默认打印机始终出现在列表的第一项
32
+            }
33
+            catch (System.Exception ex)
34
+            {
35
+                LogHelper.WriteErrLog("添加默认打印机" + ex.Message, ex);
36
+            }
37
+
38
+            try
39
+            {
30
                 foreach (string fPrinterName in PrinterSettings.InstalledPrinters)
40
                 foreach (string fPrinterName in PrinterSettings.InstalledPrinters)
31
                 {
41
                 {
32
                     if (!fPrinters.Contains(fPrinterName))
42
                     if (!fPrinters.Contains(fPrinterName))
35
                     }
45
                     }
36
                 }
46
                 }
37
             }
47
             }
38
-            catch (System.Exception)
48
+            catch (System.Exception ex)
39
             {
49
             {
40
-                throw;
50
+                LogHelper.WriteErrLog("添加其它打印机" + ex.Message, ex);
41
             }
51
             }
42
             return fPrinters;
52
             return fPrinters;
43
         }
53
         }

+ 3
- 3
XHWK.WKTool/VideoClipWindow.xaml View File

268
         </Grid.RowDefinitions>
268
         </Grid.RowDefinitions>
269
         <Grid Background="#3f6fff" Grid.Row="0" MouseLeftButtonDown="Title_MouseLeftButtonDown">
269
         <Grid Background="#3f6fff" Grid.Row="0" MouseLeftButtonDown="Title_MouseLeftButtonDown">
270
             <TextBlock Text="视频剪辑" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
270
             <TextBlock Text="视频剪辑" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
271
-            <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="Button_Click"/>
271
+            <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right"  Click="Button_Click"/>
272
         </Grid>
272
         </Grid>
273
         <Grid x:Name="GridMovie" Grid.Row="1" Background="Black">
273
         <Grid x:Name="GridMovie" Grid.Row="1" Background="Black">
274
             <MediaElement Stretch="Fill" LoadedBehavior="Manual" Name="QS_Movie" MediaOpened="Element_MediaOpened" Loaded="QS_Movie_Loaded" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Grid.ColumnSpan="2" Volume="1"/>
274
             <MediaElement Stretch="Fill" LoadedBehavior="Manual" Name="QS_Movie" MediaOpened="Element_MediaOpened" Loaded="QS_Movie_Loaded" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Grid.ColumnSpan="2" Volume="1"/>
283
                 <ColumnDefinition Width="60*"/>
283
                 <ColumnDefinition Width="60*"/>
284
             </Grid.ColumnDefinitions>
284
             </Grid.ColumnDefinitions>
285
             <Grid Grid.Column="0">
285
             <Grid Grid.Column="0">
286
-                <Button Cursor="Hand" x:Name="Play" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0" Click="Play_Click" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
286
+                <Button Cursor="Hand" x:Name="Play"  Margin="0" Click="Play_Click" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
287
                     <StackPanel Orientation="Vertical">
287
                     <StackPanel Orientation="Vertical">
288
                         <Image x:Name="ImgPlay" Source="/Images/Clip_Play.png" Visibility="Visible"/>
288
                         <Image x:Name="ImgPlay" Source="/Images/Clip_Play.png" Visibility="Visible"/>
289
                         <Image x:Name="ImgPause" Source="/Images/Clip_Pause.png" Visibility="Collapsed"/>
289
                         <Image x:Name="ImgPause" Source="/Images/Clip_Pause.png" Visibility="Collapsed"/>
346
             </Grid>
346
             </Grid>
347
             <Grid Grid.Row="1" Grid.Column="2">
347
             <Grid Grid.Row="1" Grid.Column="2">
348
 
348
 
349
-                <Button x:Name="BtnClip" Cursor="Hand" Content="  剪  辑  " Foreground="White" FontSize="{Binding WordSize20}" Click="BtnClip_Click" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" HorizontalAlignment="Center" VerticalAlignment="Center">
349
+                <Button x:Name="BtnClip" Cursor="Hand" Content="  剪  辑  " Foreground="White" FontSize="{Binding WordSize20}" Click="BtnClip_Click"  HorizontalAlignment="Center" VerticalAlignment="Center">
350
                     <Button.Template>
350
                     <Button.Template>
351
                         <ControlTemplate TargetType="{x:Type Button}">
351
                         <ControlTemplate TargetType="{x:Type Button}">
352
                             <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="8" Padding="10,5">
352
                             <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="8" Padding="10,5">

+ 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.2.1"
6
+#define MyAppVersion "3.2.2"
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