Przeglądaj źródła

封装罗博笔板 添加普通打印

tags/对接微服务前
张剑 3 lat temu
rodzic
commit
fd592a8a1c

+ 9
- 0
XHWK.WKTool/Utils/pen/PenEventI.cs Wyświetl plik

@@ -0,0 +1,9 @@
1
+
2
+namespace XHWK.WKTool.Utils.pen
3
+{
4
+    interface PenEventI
5
+    {
6
+        void penPointEvent(byte bIndex, byte bPenStatus, short bx, short by, short bPress,int m_nDeviceW,int m_nDeviceH);
7
+        void penStatusEvent();
8
+    }
9
+}

XHWK.WKTool/TQLPen/PenEvents.cs → XHWK.WKTool/Utils/pen/TQLPen/PenEvents.cs Wyświetl plik


XHWK.WKTool/TQLPen/Pentiming.cs → XHWK.WKTool/Utils/pen/TQLPen/Pentiming.cs Wyświetl plik


XHWK.WKTool/Utils/luobo/LuoBoPenUtil.cs → XHWK.WKTool/Utils/pen/luobo/LuoBoPenUtil.cs Wyświetl plik

@@ -5,6 +5,8 @@ using RobotpenGateway;
5 5
 using System;
6 6
 using System.Threading;
7 7
 
8
+using XHWK.WKTool.Utils.pen;
9
+
8 10
 namespace XHWK.WKTool.Utils.luobo
9 11
 {
10 12
     class LuoBoPenUtil
@@ -13,6 +15,8 @@ namespace XHWK.WKTool.Utils.luobo
13 15
 
14 16
         #region 值初始化
15 17
 
18
+        PenEventI penEvent = null;
19
+
16 20
         [System.Runtime.InteropServices.DllImport("kernel32.dll", CharSet = System.Runtime.InteropServices.CharSet.Auto)]
17 21
         public static extern void OutputDebugString(string message);
18 22
 
@@ -39,10 +43,14 @@ namespace XHWK.WKTool.Utils.luobo
39 43
         #endregion 值初始化
40 44
 
41 45
 
46
+        public LuoBoPenUtil(PenEventI penEvent) {
47
+            this.penEvent = penEvent;
48
+        }
49
+
42 50
         /// <summary>
43 51
         /// 笔模式
44 52
         /// </summary>
45
-        private void lb_device_hand()
53
+        public void lb_device_hand()
46 54
         {
47 55
             IsPen = true;
48 56
             if (deviceType == eDeviceType.T8B_D2 || deviceType == eDeviceType.T8Y || deviceType == eDeviceType.T8S_LQ || deviceType == eDeviceType.T8C)
@@ -59,7 +67,7 @@ namespace XHWK.WKTool.Utils.luobo
59 67
         /// <summary>
60 68
         /// 鼠标模式
61 69
         /// </summary>
62
-        private void lb_device_mouse()
70
+        public void lb_device_mouse()
63 71
         {
64 72
             IsPen = false;
65 73
             if (deviceType == eDeviceType.T8B_D2 || deviceType == eDeviceType.T8Y || deviceType == eDeviceType.T8S_LQ || deviceType == eDeviceType.T8C)
@@ -192,7 +200,7 @@ namespace XHWK.WKTool.Utils.luobo
192 200
         }
193 201
 
194 202
         //初始化笔服务
195
-        private void InitlbPen()
203
+        public void InitlbPen()
196 204
         {
197 205
             try
198 206
             {
@@ -203,8 +211,8 @@ namespace XHWK.WKTool.Utils.luobo
203 211
                 robotpenController.GetInstance().switchModeEvt += luobo_switchModeEvt;
204 212
                 robotpenController.GetInstance().keyPressEvt += new robotpenController.KeyPress(luobo_keyPressEvt);
205 213
 
206
-                Date = new robotpenController.returnPointData(luobo_bigDataReportEvt1);
207
-                robotpenController.GetInstance().initDeletgate(ref Date);
214
+                robotpenController.returnPointData datad = new robotpenController.returnPointData(luobo_bigDataReportEvt1);
215
+                robotpenController.GetInstance().initDeletgate(ref datad);
208 216
 
209 217
                 CheckUsbConnect();
210 218
             }
@@ -256,88 +264,14 @@ namespace XHWK.WKTool.Utils.luobo
256 264
         /// </param>
257 265
         private void luobo_bigDataReportEvt1(byte bIndex, byte bPenStatus, short bx, short by, short bPress)
258 266
         {
267
+
259 268
             if (bx == 0 && by == 0 && bPenStatus == 0 && bPress == 0)
260 269
             {
261 270
                 return;
262 271
             }
263
-            //17是按下,16是抬起
264
-            if (bPenStatus == 16 || bPenStatus == 0)
272
+            if (penEvent != null)
265 273
             {
266
-                //stroke.Clear();
267
-                if (APP.PageContextData.currpage > 0)
268
-                {
269
-                    Dispatcher.Invoke(new Action(() =>
270
-                    {
271
-                        myblackboard.changepages(0, 0, true, Color, PenSize, APP.PageContextData.currpage - 1, 0);
272
-                    }));
273
-                }
274
-            }
275
-
276
-            double PropW = blackboard_canvas.ActualWidth / m_nDeviceH;
277
-            double PropH = blackboard_canvas.ActualHeight / m_nDeviceW;
278
-            //点
279
-            double tempY = (m_nDeviceW - bx) * PropH;
280
-            double tempX = by * PropW;
281
-            //pageSerial //点阵IP地址  与打印的页面关联
282
-            if (APP.PageContextData.currpage > 0)
283
-            {
284
-                Dispatcher.Invoke(new Action(() =>
285
-                {
286
-                    float Pressure = bPress / 100f;
287
-
288
-                    if (bPress > 0)
289
-                    {
290
-                        myblackboard.changepages(tempX, tempY, false, Color, PenSize, APP.PageContextData.currpage - 1, Pressure);
291
-                    }
292
-
293
-                    #region 设置滚动条位置
294
-
295
-                    //点在显示页面上方
296
-                    if (tempY < ScroMain.VerticalOffset)
297
-                    {
298
-                        //滚动条当前位置
299
-                        double RollCurrentLocation = ScroMain.VerticalOffset;
300
-                        //向上滚动至以点为中心需要滚动的距离
301
-                        double UpRoll = (RollCurrentLocation - tempY) + (ScroMain.ActualHeight / 2);
302
-                        //如果小于0则等于0
303
-                        double RollLocation = RollCurrentLocation - UpRoll;
304
-                        if (RollLocation < 0)
305
-                        {
306
-                            RollLocation = 0;
307
-                        }
308
-                        ////滚动条实际偏移量
309
-                        //double RollOffset = RollCurrentLocation - RollLocation;
310
-                        ScroMain.ScrollToVerticalOffset(RollLocation);
311
-                    }
312
-                    //点在显示页面下方
313
-                    if (tempY > ScroMain.VerticalOffset + ScroMain.ActualHeight)
314
-                    {
315
-                        //滚动条当前位置
316
-                        double RollCurrentLocation = ScroMain.VerticalOffset;
317
-                        //向下滚动至以点为中心需要滚动的距离
318
-                        double DownRoll = (tempY - RollCurrentLocation) - (ScroMain.ActualHeight / 2);
319
-                        //如果小于0则等于0
320
-                        double RollLocation = RollCurrentLocation + DownRoll;
321
-                        //滚动条最大滚动值
322
-                        double ScrollbarMaxNum = GridM.ActualHeight - ScroMain.ActualHeight;
323
-                        if (RollLocation > ScrollbarMaxNum)
324
-                        {
325
-                            RollLocation = ScrollbarMaxNum;
326
-                        }
327
-                        ////滚动条实际偏移量
328
-                        //double RollOffset = RollLocation-RollCurrentLocation;
329
-                        ScroMain.ScrollToVerticalOffset(RollLocation);
330
-                    }
331
-
332
-                    #endregion 设置滚动条位置
333
-
334
-                    if (tempX > 0 && tempY > 0)
335
-                    {
336
-                        //System.Windows.Point getP = blackboard_canvas.PointToScreen(new System.Windows.Point(testX, testY));
337
-                        System.Windows.Point getP = ScroMain.PointToScreen(new System.Windows.Point(tempX, tempY - ScroMain.VerticalOffset));
338
-                        SetCursorPos((int)getP.X, (int)getP.Y);
339
-                    }
340
-                }));
274
+                penEvent.penPointEvent(bIndex, bPenStatus, bx, by, bPress, m_nDeviceW, m_nDeviceH);
341 275
             }
342 276
         }
343 277
 
@@ -448,11 +382,11 @@ namespace XHWK.WKTool.Utils.luobo
448 382
                     break;
449 383
 
450 384
                 case eKeyPress.PAGEUP:
451
-                    last_button_Click(null, null);
385
+                    //last_button_Click(null, null);
452 386
                     break;
453 387
 
454 388
                 case eKeyPress.PAGEDOWN:
455
-                    next_btn_Click(null, null);
389
+                    //next_btn_Click(null, null);
456 390
                     break;
457 391
 
458 392
                 case eKeyPress.CREATEPAGE://关机键
@@ -477,11 +411,11 @@ namespace XHWK.WKTool.Utils.luobo
477 411
                     break;
478 412
 
479 413
                 case eKeyPress.KEY_UP:
480
-                    last_button_Click(null, null);
414
+                    //last_button_Click(null, null);
481 415
                     break;
482 416
 
483 417
                 case eKeyPress.KEY_DOWN:
484
-                    next_btn_Click(null, null);
418
+                    //next_btn_Click(null, null);
485 419
                     break;
486 420
 
487 421
                 case eKeyPress.KEY_YES:
@@ -523,45 +457,10 @@ namespace XHWK.WKTool.Utils.luobo
523 457
         /// </summary>
524 458
         public void UpdateDevStatus()
525 459
         {
526
-            if (APP.BoardStatus && (APP.PenStatus || APP.TQLPenStatus))
527
-            {
528
-                Dispatcher.Invoke(new Action(() =>
529
-                {
530
-                    txbNotConnected.Text = "笔/板已连接";
531
-                    txbNotConnecteds.Text = "笔/板已连接";
532
-                }));
533
-            }
534
-            else if (APP.BoardStatus)
460
+     
461
+            if (penEvent != null)
535 462
             {
536
-                Dispatcher.Invoke(new Action(() =>
537
-                {
538
-                    txbNotConnected.Text = "手写板已连接";
539
-                    txbNotConnecteds.Text = "手写板已连接";
540
-                }));
541
-            }
542
-            else if (APP.PenStatus)
543
-            {
544
-                Dispatcher.Invoke(new Action(() =>
545
-                {
546
-                    txbNotConnected.Text = "智能笔已连接";
547
-                    txbNotConnecteds.Text = "智能笔已连接";
548
-                }));
549
-            }
550
-            else if (APP.TQLPenStatus)
551
-            {
552
-                Dispatcher.Invoke(new Action(() =>
553
-                {
554
-                    txbNotConnected.Text = "智能笔已连接";
555
-                    txbNotConnecteds.Text = "智能笔已连接";
556
-                }));
557
-            }
558
-            else
559
-            {
560
-                Dispatcher.Invoke(new Action(() =>
561
-                {
562
-                    txbNotConnected.Text = "未连接";
563
-                    txbNotConnecteds.Text = "未连接";
564
-                }));
463
+                penEvent.penStatusEvent();
565 464
             }
566 465
         }
567 466
 

+ 72
- 55
XHWK.WKTool/XHMicroLessonSystemWindow.xaml Wyświetl plik

@@ -262,7 +262,7 @@
262 262
                                 Margin="10,0,0,0"
263 263
                                 HorizontalAlignment="Left"
264 264
                                 VerticalAlignment="Center"
265
-                                FontSize="{Binding WordSize18}"
265
+                                FontSize="18"
266 266
                                 FontWeight="Bold"
267 267
                                 Style="{DynamicResource LogoColor}"
268 268
                                 Text="星火微课" />
@@ -297,7 +297,7 @@
297 297
                                     Padding="0"
298 298
                                     VerticalAlignment="Center"
299 299
                                     Background="{x:Null}"
300
-                                    FontSize="{Binding WordSize14}"
300
+                                    FontSize="14"
301 301
                                     FontWeight="Bold"
302 302
                                     Style="{DynamicResource PenStateColor}"
303 303
                                     Text="未连接" />
@@ -324,7 +324,7 @@
324 324
                                     Margin="10,0"
325 325
                                     HorizontalAlignment="Center"
326 326
                                     VerticalAlignment="Center"
327
-                                    FontSize="{Binding WordSize18}"
327
+                                    FontSize="18"
328 328
                                     Foreground="#FFFF0000"
329 329
                                     Text="00:00" />
330 330
                                 <TextBlock
@@ -332,7 +332,7 @@
332 332
                                     Margin="10,0"
333 333
                                     HorizontalAlignment="Center"
334 334
                                     VerticalAlignment="Center"
335
-                                    FontSize="{Binding WordSize18}"
335
+                                    FontSize="18"
336 336
                                     Style="{DynamicResource TxbMesColor}"
337 337
                                     Text="准备就绪" />
338 338
                             </StackPanel>
@@ -353,7 +353,7 @@
353 353
                                 Button.Template="{DynamicResource SkinBtnRecord}"
354 354
                                 Click="BtnRecord_Click"
355 355
                                 Cursor="Hand"
356
-                                FontSize="{Binding WordSize14}"
356
+                                FontSize="14"
357 357
                                 Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
358 358
                             <Button
359 359
                                 x:Name="BtnRecordSuspend"
@@ -363,7 +363,7 @@
363 363
                                 Button.Template="{DynamicResource SkinBtnRecordSuspend}"
364 364
                                 Click="BtnRecord_Click"
365 365
                                 Cursor="Hand"
366
-                                FontSize="{Binding WordSize14}"
366
+                                FontSize="14"
367 367
                                 Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
368 368
                                 Visibility="Collapsed" />
369 369
                         </Grid>
@@ -376,7 +376,7 @@
376 376
                                 Button.Template="{DynamicResource SkinBtnRecordStop}"
377 377
                                 Click="BtnStop_Click"
378 378
                                 Cursor="Hand"
379
-                                FontSize="{Binding WordSize14}"
379
+                                FontSize="14"
380 380
                                 Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
381 381
                         </Grid>
382 382
                     </Grid>
@@ -396,7 +396,7 @@
396 396
                             Button.Template="{DynamicResource SkinBtnClose}"
397 397
                             Click="BtnClose_Click"
398 398
                             Cursor="Hand"
399
-                            FontSize="{Binding WordSize14}"
399
+                            FontSize="14"
400 400
                             Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
401 401
 
402 402
                     </Grid>
@@ -508,7 +508,7 @@
508 508
                                         x:Name="TxbLoginType"
509 509
                                         Margin="0,10,0,0"
510 510
                                         HorizontalAlignment="Center"
511
-                                        FontSize="{Binding WordSize12}"
511
+                                        FontSize="12"
512 512
                                         Style="{DynamicResource LoginTypeColor}"
513 513
                                         Text="未登录" />
514 514
                                 </StackPanel>
@@ -526,7 +526,7 @@
526 526
                                 Button.Template="{DynamicResource SkinBtnScreenRecording}"
527 527
                                 Click="BtnScreenRecording_Click"
528 528
                                 Cursor="Hand"
529
-                                FontSize="{Binding WordSize16}" />
529
+                                FontSize="16" />
530 530
                         </Grid>
531 531
                         <!--  截图  -->
532 532
                         <Grid Grid.Row="2">
@@ -538,7 +538,7 @@
538 538
                                 Button.Template="{DynamicResource SkinBtnScreenshot}"
539 539
                                 Click="BtnScreenshot_Click"
540 540
                                 Cursor="Hand"
541
-                                FontSize="{Binding WordSize16}"
541
+                                FontSize="16"
542 542
                                 Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
543 543
                         </Grid>
544 544
                         <!--  导入  -->
@@ -550,7 +550,7 @@
550 550
                                 Button.Template="{DynamicResource SkinBtnImport}"
551 551
                                 Click="BtnImport_Click"
552 552
                                 Cursor="Hand"
553
-                                FontSize="{Binding WordSize16}"
553
+                                FontSize="16"
554 554
                                 Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
555 555
                         </Grid>
556 556
                         <!--  加页  -->
@@ -562,7 +562,7 @@
562 562
                                 Button.Template="{DynamicResource SkinBtnAdd}"
563 563
                                 Click="BtnAdd_Click"
564 564
                                 Cursor="Hand"
565
-                                FontSize="{Binding WordSize16}"
565
+                                FontSize="16"
566 566
                                 Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
567 567
                         </Grid>
568 568
                         <!--  打印  -->
@@ -574,7 +574,7 @@
574 574
                                 Button.Template="{DynamicResource SkinBtnPrint}"
575 575
                                 Click="BtnPrint_Click"
576 576
                                 Cursor="Hand"
577
-                                FontSize="{Binding WordSize16}"
577
+                                FontSize="16"
578 578
                                 Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
579 579
                         </Grid>
580 580
                         <!--  我的  -->
@@ -586,7 +586,7 @@
586 586
                                 Button.Template="{DynamicResource SkinBtnMy}"
587 587
                                 Click="BtnUpload_Click"
588 588
                                 Cursor="Hand"
589
-                                FontSize="{Binding WordSize16}"
589
+                                FontSize="16"
590 590
                                 Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
591 591
                         </Grid>
592 592
                         <!--  检测  -->
@@ -598,7 +598,7 @@
598 598
                                 Button.Template="{DynamicResource SkinBtnDevice}"
599 599
                                 Click="BtnDevice_Click"
600 600
                                 Cursor="Hand"
601
-                                FontSize="{Binding WordSize16}"
601
+                                FontSize="16"
602 602
                                 Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
603 603
                         </Grid>
604 604
                         <!--  设置  -->
@@ -610,7 +610,7 @@
610 610
                                 Button.Template="{DynamicResource SkinBtnSetUp}"
611 611
                                 Click="BtnSetUp_Click"
612 612
                                 Cursor="Hand"
613
-                                FontSize="{Binding WordSize16}"
613
+                                FontSize="16"
614 614
                                 Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
615 615
                         </Grid>
616 616
                         <!--  测试  -->
@@ -944,20 +944,20 @@
944 944
                                                     Margin="0"
945 945
                                                     HorizontalAlignment="Center"
946 946
                                                     VerticalAlignment="Center"
947
-                                                    FontSize="{Binding WordSize14}"
947
+                                                    FontSize="14"
948 948
                                                     Text="{Binding currpage}"
949 949
                                                     TextAlignment="Center" />
950 950
                                             <TextBlock
951 951
                                                     HorizontalAlignment="Center"
952 952
                                                     VerticalAlignment="Center"
953
-                                                    FontSize="{Binding WordSize14}"
953
+                                                    FontSize="14"
954 954
                                                     Text="/"
955 955
                                                     TextAlignment="Center" />
956 956
                                             <TextBlock
957 957
                                                     x:Name="txbTotalpage"
958 958
                                                     HorizontalAlignment="Center"
959 959
                                                     VerticalAlignment="Center"
960
-                                                    FontSize="{Binding WordSize14}"
960
+                                                    FontSize="14"
961 961
                                                     Text="{Binding pagenum}"
962 962
                                                     TextAlignment="Center" />
963 963
                                         </StackPanel>
@@ -990,7 +990,7 @@
990 990
                                         Margin="5,0,0,0"
991 991
                                         Padding="0,0,0,0"
992 992
                                         VerticalAlignment="Center"
993
-                                        FontSize="{Binding WordSize12}"
993
+                                        FontSize="12"
994 994
                                         Text="颜色: " />
995 995
                                 <Button
996 996
                                         x:Name="btnWhite"
@@ -1114,7 +1114,7 @@
1114 1114
                                         Margin="5,0,0,0"
1115 1115
                                         Padding="0,0,0,0"
1116 1116
                                         VerticalAlignment="Center"
1117
-                                        FontSize="{Binding WordSize12}"
1117
+                                        FontSize="12"
1118 1118
                                         Text="粗细: " />
1119 1119
                                 <RadioButton
1120 1120
                                         x:Name="rbnFine"
@@ -1123,7 +1123,7 @@
1123 1123
                                         Click="RbnFine_Click"
1124 1124
                                         Content=" 细"
1125 1125
                                         Cursor="Hand"
1126
-                                        FontSize="{Binding WordSize12}"
1126
+                                        FontSize="12"
1127 1127
                                         IsChecked="True"
1128 1128
                                         Style="{StaticResource radBase}" />
1129 1129
                                 <RadioButton
@@ -1133,7 +1133,7 @@
1133 1133
                                         Click="RbnIn_Click"
1134 1134
                                         Content=" 中"
1135 1135
                                         Cursor="Hand"
1136
-                                        FontSize="{Binding WordSize12}"
1136
+                                        FontSize="12"
1137 1137
                                         Style="{StaticResource radBase}" />
1138 1138
                                 <RadioButton
1139 1139
                                         x:Name="rbnCrude"
@@ -1142,7 +1142,7 @@
1142 1142
                                         Click="RbnCrude_Click"
1143 1143
                                         Content=" 粗"
1144 1144
                                         Cursor="Hand"
1145
-                                        FontSize="{Binding WordSize12}"
1145
+                                        FontSize="12"
1146 1146
                                         Style="{StaticResource radBase}" />
1147 1147
                             </StackPanel>
1148 1148
                             <StackPanel
@@ -1154,7 +1154,7 @@
1154 1154
                                 <TextBlock
1155 1155
                                         Padding="5,0,0,0"
1156 1156
                                         VerticalAlignment="Center"
1157
-                                        FontSize="{Binding WordSize12}"
1157
+                                        FontSize="12"
1158 1158
                                         Text="摄像头: " />
1159 1159
                                 <RadioButton
1160 1160
                                         x:Name="rbnOpen"
@@ -1163,7 +1163,7 @@
1163 1163
                                         Click="RbnOpen_Click"
1164 1164
                                         Content=" 开"
1165 1165
                                         Cursor="Hand"
1166
-                                        FontSize="{Binding WordSize12}"
1166
+                                        FontSize="12"
1167 1167
                                         Style="{StaticResource radBase}" />
1168 1168
                                 <RadioButton
1169 1169
                                         x:Name="rbnTurnOff"
@@ -1172,7 +1172,7 @@
1172 1172
                                         Click="RbnTurnOff_Click"
1173 1173
                                         Content=" 关"
1174 1174
                                         Cursor="Hand"
1175
-                                        FontSize="{Binding WordSize12}"
1175
+                                        FontSize="12"
1176 1176
                                         IsChecked="True"
1177 1177
                                         Style="{StaticResource radBase}" />
1178 1178
                             </StackPanel>
@@ -1210,7 +1210,7 @@
1210 1210
                                             Grid.Column="0"
1211 1211
                                             HorizontalAlignment="Right"
1212 1212
                                             VerticalAlignment="Center"
1213
-                                            FontSize="{Binding WordSize16}"
1213
+                                            FontSize="16"
1214 1214
                                             Foreground="#333333"
1215 1215
                                             Text="更换皮肤" />
1216 1216
                                     </Grid>
@@ -1294,7 +1294,7 @@
1294 1294
                                             <TextBlock
1295 1295
                                                 HorizontalAlignment="Center"
1296 1296
                                                 VerticalAlignment="Center"
1297
-                                                FontSize="{Binding WordSize16}"
1297
+                                                FontSize="16"
1298 1298
                                                 Foreground="#333333"
1299 1299
                                                 Text="经典白" />
1300 1300
                                         </Grid>
@@ -1302,7 +1302,7 @@
1302 1302
                                             <TextBlock
1303 1303
                                                 HorizontalAlignment="Center"
1304 1304
                                                 VerticalAlignment="Center"
1305
-                                                FontSize="{Binding WordSize16}"
1305
+                                                FontSize="16"
1306 1306
                                                 Foreground="#333333"
1307 1307
                                                 Text="科技蓝" />
1308 1308
                                         </Grid>
@@ -1336,7 +1336,7 @@
1336 1336
                                                 Grid.Column="0"
1337 1337
                                                 HorizontalAlignment="Right"
1338 1338
                                                 VerticalAlignment="Center"
1339
-                                                FontSize="{Binding WordSize16}"
1339
+                                                FontSize="16"
1340 1340
                                                 Foreground="#333333"
1341 1341
                                                 Text="视频格式" />
1342 1342
                                         </Grid>
@@ -1351,7 +1351,7 @@
1351 1351
                                                     VerticalAlignment="Top"
1352 1352
                                                     Content=" MP4"
1353 1353
                                                     Cursor="Hand"
1354
-                                                    FontSize="{Binding WordSize16}"
1354
+                                                    FontSize="16"
1355 1355
                                                     Foreground="#333333"
1356 1356
                                                     IsChecked="True"
1357 1357
                                                     Style="{StaticResource radBase}" />
@@ -1361,7 +1361,7 @@
1361 1361
                                                     VerticalAlignment="Top"
1362 1362
                                                     Content=" FLV"
1363 1363
                                                     Cursor="Hand"
1364
-                                                    FontSize="{Binding WordSize16}"
1364
+                                                    FontSize="16"
1365 1365
                                                     Foreground="#333333"
1366 1366
                                                     Style="{StaticResource radBase}"
1367 1367
                                                     Visibility="Collapsed" />
@@ -1370,7 +1370,7 @@
1370 1370
                                                     Margin="15,0,0,0"
1371 1371
                                                     Content=" AVI"
1372 1372
                                                     Cursor="Hand"
1373
-                                                    FontSize="{Binding WordSize16}"
1373
+                                                    FontSize="16"
1374 1374
                                                     Foreground="#333333"
1375 1375
                                                     Style="{StaticResource radBase}"
1376 1376
                                                     Visibility="Collapsed" />
@@ -1380,7 +1380,7 @@
1380 1380
                                             <TextBlock
1381 1381
                                                 HorizontalAlignment="Right"
1382 1382
                                                 VerticalAlignment="Center"
1383
-                                                FontSize="{Binding WordSize16}"
1383
+                                                FontSize="16"
1384 1384
                                                 Foreground="#333333"
1385 1385
                                                 Text="摄像头位置" />
1386 1386
                                         </Grid>
@@ -1408,7 +1408,7 @@
1408 1408
                                                     VerticalAlignment="Center"
1409 1409
                                                     Content=" 右上"
1410 1410
                                                     Cursor="Hand"
1411
-                                                    FontSize="{Binding WordSize16}"
1411
+                                                    FontSize="16"
1412 1412
                                                     Foreground="#333333"
1413 1413
                                                     GroupName="RbtnCamera"
1414 1414
                                                     IsChecked="True"
@@ -1420,7 +1420,7 @@
1420 1420
                                                     VerticalAlignment="Center"
1421 1421
                                                     Content=" 右下"
1422 1422
                                                     Cursor="Hand"
1423
-                                                    FontSize="{Binding WordSize16}"
1423
+                                                    FontSize="16"
1424 1424
                                                     Foreground="#333333"
1425 1425
                                                     GroupName="RbtnCamera"
1426 1426
                                                     Style="{StaticResource radBase}" />
@@ -1439,7 +1439,7 @@
1439 1439
                                                     VerticalAlignment="Center"
1440 1440
                                                     Content=" 左上"
1441 1441
                                                     Cursor="Hand"
1442
-                                                    FontSize="{Binding WordSize16}"
1442
+                                                    FontSize="16"
1443 1443
                                                     Foreground="#333333"
1444 1444
                                                     GroupName="RbtnCamera"
1445 1445
                                                     Style="{StaticResource radBase}" />
@@ -1450,7 +1450,7 @@
1450 1450
                                                     VerticalAlignment="Center"
1451 1451
                                                     Content=" 左下"
1452 1452
                                                     Cursor="Hand"
1453
-                                                    FontSize="{Binding WordSize16}"
1453
+                                                    FontSize="16"
1454 1454
                                                     Foreground="#333333"
1455 1455
                                                     GroupName="RbtnCamera"
1456 1456
                                                     Style="{StaticResource radBase}" />
@@ -1460,7 +1460,7 @@
1460 1460
                                             <TextBlock
1461 1461
                                                 HorizontalAlignment="Right"
1462 1462
                                                 VerticalAlignment="Center"
1463
-                                                FontSize="{Binding WordSize16}"
1463
+                                                FontSize="16"
1464 1464
                                                 Foreground="#333333"
1465 1465
                                                 Text="录屏工具栏" />
1466 1466
                                         </Grid>
@@ -1475,7 +1475,7 @@
1475 1475
                                                     VerticalAlignment="Top"
1476 1476
                                                     Content=" 隐藏"
1477 1477
                                                     Cursor="Hand"
1478
-                                                    FontSize="{Binding WordSize16}"
1478
+                                                    FontSize="16"
1479 1479
                                                     Foreground="#333333"
1480 1480
                                                     IsChecked="True"
1481 1481
                                                     Style="{StaticResource radBase}" />
@@ -1485,7 +1485,7 @@
1485 1485
                                                     VerticalAlignment="Top"
1486 1486
                                                     Content=" 显示"
1487 1487
                                                     Cursor="Hand"
1488
-                                                    FontSize="{Binding WordSize16}"
1488
+                                                    FontSize="16"
1489 1489
                                                     Foreground="#333333"
1490 1490
                                                     Style="{StaticResource radBase}" />
1491 1491
                                             </StackPanel>
@@ -1517,7 +1517,7 @@
1517 1517
                                                 Padding="0,0,0,0"
1518 1518
                                                 HorizontalAlignment="Right"
1519 1519
                                                 VerticalAlignment="Center"
1520
-                                                FontSize="{Binding WordSize16}"
1520
+                                                FontSize="16"
1521 1521
                                                 Foreground="#333333"
1522 1522
                                                 Text="文件路径" />
1523 1523
                                         </Grid>
@@ -1536,7 +1536,7 @@
1536 1536
                                                         BorderBrush="{x:Null}"
1537 1537
                                                         BorderThickness="0"
1538 1538
                                                         Content="D:\"
1539
-                                                        FontSize="{Binding WordSize14}"
1539
+                                                        FontSize="14"
1540 1540
                                                         Foreground="#333333" />
1541 1541
                                                 </Border>
1542 1542
                                             </Grid>
@@ -1601,7 +1601,7 @@
1601 1601
                                             Padding="0,0,0,0"
1602 1602
                                             HorizontalAlignment="Right"
1603 1603
                                             VerticalAlignment="Center"
1604
-                                            FontSize="{Binding WordSize16}"
1604
+                                            FontSize="16"
1605 1605
                                             Foreground="#FF666666"
1606 1606
                                             Text="录屏快捷键" />
1607 1607
                                     </Grid>
@@ -1612,7 +1612,7 @@
1612 1612
                                         <TextBlock
1613 1613
                                             Margin="20,0,0,0"
1614 1614
                                             VerticalAlignment="Center"
1615
-                                            FontSize="{Binding WordSize16}"
1615
+                                            FontSize="16"
1616 1616
                                             Foreground="#FF666666"
1617 1617
                                             Text="开始/暂停:Ctrl+F5     停止:Ctrl+S     退出讲评:鼠标右键" />
1618 1618
                                     </Grid>
@@ -1620,7 +1620,7 @@
1620 1620
                                         <TextBlock
1621 1621
                                             HorizontalAlignment="Right"
1622 1622
                                             VerticalAlignment="Center"
1623
-                                            FontSize="{Binding WordSize16}"
1623
+                                            FontSize="16"
1624 1624
                                             Foreground="#FF666666"
1625 1625
                                             Text="版权所有" />
1626 1626
                                     </Grid>
@@ -1631,7 +1631,7 @@
1631 1631
                                         <TextBlock
1632 1632
                                             Margin="20,0,0,0"
1633 1633
                                             VerticalAlignment="Center"
1634
-                                            FontSize="{Binding WordSize16}"
1634
+                                            FontSize="16"
1635 1635
                                             Foreground="#FF666666"
1636 1636
                                             Text="河南星火燎原软件科技有限公司" />
1637 1637
                                     </Grid>
@@ -1642,7 +1642,7 @@
1642 1642
                                             Margin="0,0,0,0"
1643 1643
                                             HorizontalAlignment="Right"
1644 1644
                                             VerticalAlignment="Center"
1645
-                                            FontSize="{Binding WordSize16}"
1645
+                                            FontSize="16"
1646 1646
                                             Foreground="#FF666666"
1647 1647
                                             Text="正式版" />
1648 1648
                                     </Grid>
@@ -1651,7 +1651,7 @@
1651 1651
                                             x:Name="txbv"
1652 1652
                                             Margin="20,0,0,0"
1653 1653
                                             VerticalAlignment="Center"
1654
-                                            FontSize="{Binding WordSize16}"
1654
+                                            FontSize="16"
1655 1655
                                             Foreground="#FF666666"
1656 1656
                                             Text="V0.0.0" />
1657 1657
                                     </Grid>
@@ -1859,6 +1859,7 @@
1859 1859
                         <ColumnDefinition Width="Auto" />
1860 1860
                         <ColumnDefinition Width="*" />
1861 1861
                         <ColumnDefinition Width="86" />
1862
+                        <ColumnDefinition Width="86" />
1862 1863
                     </Grid.ColumnDefinitions>
1863 1864
 
1864 1865
                     <Image
@@ -1879,11 +1880,11 @@
1879 1880
                         Click="btnPrintExplain_Click"
1880 1881
                         Content="打印说明"
1881 1882
                         Cursor="Hand"
1882
-                        FontSize="{Binding WordSize14}"
1883
+                        FontSize="14"
1883 1884
                         Foreground="#3F6FFF"
1884 1885
                         IsDefault="True" />
1886
+
1885 1887
                     <Button
1886
-                        x:Name="btnPrint_Print"
1887 1888
                         Grid.Column="3"
1888 1889
                         Width="76"
1889 1890
                         Height="30"
@@ -1891,10 +1892,26 @@
1891 1892
                         HorizontalAlignment="Stretch"
1892 1893
                         VerticalAlignment="Stretch"
1893 1894
                         Background="#3F6FFF"
1895
+                        Click="Print_No_Code_Click"
1896
+                        Content="普通打印"
1897
+                        Cursor="Hand"
1898
+                        FontSize="12"
1899
+                        Foreground="White"
1900
+                        IsDefault="True" />
1901
+                    
1902
+                    <Button
1903
+                        x:Name="btnPrint_Print"
1904
+                        Grid.Column="4"
1905
+                        Width="76"
1906
+                        Height="30"
1907
+                        Margin="0,0,10,0"
1908
+                        HorizontalAlignment="Stretch"
1909
+                        VerticalAlignment="Stretch"
1910
+                        Background="#3F6FFF"
1894 1911
                         Click="BtnPrint_Print_Click"
1895
-                        Content="打印"
1912
+                        Content="铺码打印"
1896 1913
                         Cursor="Hand"
1897
-                        FontSize="{Binding WordSize14}"
1914
+                        FontSize="12"
1898 1915
                         Foreground="White"
1899 1916
                         IsDefault="True" />
1900 1917
                 </Grid>

+ 1002
- 1398
XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs
Plik diff jest za duży
Wyświetl plik


+ 5
- 5
XHWK.WKTool/XHWK.WKTool.csproj Wyświetl plik

@@ -316,8 +316,8 @@
316 316
     <Compile Include="system\SplashScreen.cs" />
317 317
     <Compile Include="system\XmlUtilHelper.cs" />
318 318
     <Compile Include="system\ZJClippingBorder.cs" />
319
-    <Compile Include="TQLPen\PenEvents.cs" />
320
-    <Compile Include="TQLPen\Pentiming.cs" />
319
+    <Compile Include="Utils\pen\TQLPen\PenEvents.cs" />
320
+    <Compile Include="Utils\pen\TQLPen\Pentiming.cs" />
321 321
     <Compile Include="UControl\UC_MultiRangeSlider.xaml.cs">
322 322
       <DependentUpon>UC_MultiRangeSlider.xaml</DependentUpon>
323 323
     </Compile>
@@ -327,6 +327,8 @@
327 327
     <Compile Include="UploadWindow.xaml.cs">
328 328
       <DependentUpon>UploadWindow.xaml</DependentUpon>
329 329
     </Compile>
330
+    <Compile Include="Utils\pen\luobo\LuoBoPenUtil.cs" />
331
+    <Compile Include="Utils\pen\PenEventI.cs" />
330 332
     <Compile Include="Utils\ZAsposeUtil.cs" />
331 333
     <Compile Include="Utils\ZVideoRecordHelper.cs" />
332 334
     <Compile Include="Utils\ZAudioRecordHelper.cs" />
@@ -855,9 +857,7 @@
855 857
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
856 858
     </Content>
857 859
   </ItemGroup>
858
-  <ItemGroup>
859
-    <Folder Include="Utils\luobo\" />
860
-  </ItemGroup>
860
+  <ItemGroup />
861 861
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
862 862
   <PropertyGroup>
863 863
     <PreBuildEvent>xcopy /Y /i /e $(ProjectDir)\Extension $(TargetDir)\

Ładowanie…
Anuluj
Zapisz