zhao：1修改智能笔，增加写字板

Common/system/BlackboardNew.cs

@@ -359,7 +359,7 @@ namespace Common.system
         private StylusPoint stylusPoint = new StylusPoint();
         private Stroke stroke;
         private bool isFirst = true;
-        public void changepages(double _x, double _y, bool _new, Color _color, int _size, int i)
+        public void changepages(double _x, double _y, bool _new, Color _color, int _size, int i, float Pressure)
         {
             if (_new)
             {
@@ -400,6 +400,8 @@ namespace Common.system
                 {
                     stylusPoint.X = _x;
                     stylusPoint.Y = _y;
+                    //_color.A = (byte)(Pressure * 255f);
+                    //stylusPoint.PressureFactor = Pressure;
                     stylusPoints.Add(stylusPoint);
                     if (stylusPoints.Count > 1)
                     {
@@ -410,7 +412,8 @@ namespace Common.system
                             Width = _size * 4.5,
                             Height = _size * 4.5,
                             FitToCurve = true,
-                            IgnorePressure = false
+                            //IsHighlighter =true,
+                            IgnorePressure = true
                         };
                         stroke.DrawingAttributes = drawingAttributes;
                         m_canvas.Strokes.Add(stroke);

Common/system/FFMpeg.cs

@@ -22,6 +22,7 @@ namespace Common.system
     /// </summary>
     public class FFMpeg
     {
+        #region 变量
         public Process myProcess = null;
 
         /// <summary>
@@ -42,6 +43,8 @@ namespace Common.system
         /// 是否可以录制麦克风
         /// </summary>
         private bool IsRecordMicrophone = true;
+        #endregion
+
         /// <summary>
         /// 录制屏幕
         /// </summary>
@@ -848,6 +851,8 @@ namespace Common.system
                 FileToolsCommon.AppendText(LogPath, output.Data + "\r\n");
             }
         }
+
+
         #region 麦克风声卡检测
         #region 获取麦克风
         private bool IsMicrophone = false;

XHWK.WKTool/App.config

@@ -6,7 +6,10 @@
   <appSettings>
     <!--0正式 1测试-->
     <add key="IsDebug" value="1" />
+    <!--是否输出视频记录日志：0否-->
     <add key="OutputVideoLog" value="0"/>
+    <!--是否输出其他测试日志-->
+    <add key="IsOutputInfoLog" value="0"/>
     <!--文件存放路径  路径\账户名\讲解名称_x.MP4-->
     <add key="VideoSavePath" value="D:\星火微课" />
     <!--视频格式 1、MP4 2、FlV 3、AVI-->
@@ -31,6 +34,8 @@
     <add key="CameraPosition" value="1" />
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1" />
+    <!--是否隐藏录屏工具栏 1 隐藏 0不隐藏-->
+    <add key="IsHideSRTool" value="1" />
     <!--版本号-->
     <add key="VersionCode" value="54" />
     <add key="VersionName" value="2.5.4" />

XHWK.WKTool/App.cs

@@ -27,6 +27,14 @@ namespace XHWK.WKTool
         /// </summary>
         public static bool isDebug = FileToolsCommon.GetConfigValue("IsDebug") != "0";
         /// <summary>
+        /// 是否输出测试记录日志
+        /// </summary>
+        public static bool IsOutputInfoLog = FileToolsCommon.GetConfigValue("IsOutputInfoLog") != "0";
+        /// <summary>
+        /// 是否隐藏录屏工具栏
+        /// </summary>
+        public static bool IsHideSRTool= FileToolsCommon.GetConfigValue("IsHideSRTool") != "0";
+        /// <summary>
         /// 接口地址
         /// </summary>
         public static string apiUrl = isDebug ? "http://schoolapitest.xhkjedu.com" : FileToolsCommon.GetConfigValue("APIRequestAddress");
@@ -139,6 +147,10 @@ namespace XHWK.WKTool
         /// 笔状态，是否已连接
         /// </summary>
         public static bool PenStatus;
+        /// <summary>
+        /// 手写板状态，是否已连接
+        /// </summary>
+        public static bool BoardStatus;
         #endregion
         #region 页面
         /// <summary>

XHWK.WKTool/LoginWindow.xaml.cs

@@ -224,7 +224,7 @@ namespace XHWK.WKTool
                 }
 
             }
-            catch (Exception ex)
+            catch (Exception)
             {
             }
         }

XHWK.WKTool/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Windows;
 // 有关程序集的一般信息由以下
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
-[assembly: AssemblyTitle("XHWK.WKTool")]
+[assembly: AssemblyTitle("星火微课")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("XHWK.WKTool")]
+[assembly: AssemblyCompany("河南星火燎原软件科技有限公司")]
+[assembly: AssemblyProduct("星火微课")]
 [assembly: AssemblyCopyright("Copyright ©  2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -425,15 +425,19 @@ namespace XHWK.WKTool
                                                         //borOne.Background = new SolidColorBrush(Colors.LightBlue);
                 BtnRecordingScreen.ToolTip = "暂停";
 
-                if (APP.W_MinToolbar == null)
+                #region 隐藏工具栏
+                if (APP.IsHideSRTool)
                 {
-                    APP.W_MinToolbar = new MinToolbar();
-
+                    if (APP.W_MinToolbar == null)
+                    {
+                        APP.W_MinToolbar = new MinToolbar();
+                    }
+                    APP.W_MinToolbar.Topmost = true;
+                    APP.W_MinToolbar.Initialize(this.Top);
+                    gridToobar.Visibility = Visibility.Hidden;
+                    APP.W_MinToolbar.Show();
                 }
-                APP.W_MinToolbar.Topmost = true;
-                APP.W_MinToolbar.Initialize(this.Top);
-                gridToobar.Visibility = Visibility.Hidden;
-                APP.W_MinToolbar.Show();
+                #endregion
                 try
                 {
                     #region 4秒内不可点击
@@ -566,7 +570,10 @@ namespace XHWK.WKTool
                 }))).Start();
             }
             #endregion
-            APP.W_MinToolbar.Hide();
+            if (APP.W_MinToolbar != null)
+            {
+                APP.W_MinToolbar.Hide();
+            }
             BtnRecordingScreen.ToolTip = "开始";
             k_hook.Stop();
             IsSuspend = true;
@@ -1156,7 +1163,10 @@ namespace XHWK.WKTool
                 }
                 k_hook.Stop();
                 BtnRecordingScreen.ToolTip = "开始";
-                APP.W_MinToolbar.Hide();
+                if (APP.W_MinToolbar != null)
+                {
+                    APP.W_MinToolbar.Hide();
+                }
                 IsSuspend = true;
                 txbTime.Text = "00:00";
 
@@ -1270,27 +1280,30 @@ namespace XHWK.WKTool
         {
             if(BtnRecordingScreen.ToolTip.ToString().Equals ("暂停")&& gridToobar.Visibility == Visibility.Visible)
             {
-                if (APP.W_MinToolbar == null)
+                if (APP.IsHideSRTool)
                 {
-                    APP.W_MinToolbar = new MinToolbar();
+                    if (APP.W_MinToolbar == null)
+                    {
+                        APP.W_MinToolbar = new MinToolbar();
 
-                }
-                APP.W_MinToolbar.Topmost = true;
-                APP.W_MinToolbar.Initialize(this.Top);
-                //else
-                //{
-                //    APP.W_CountdownWindow.Initialize(true, 1800);
-                //}
-                new Thread(new ThreadStart(new Action(() =>
-                {
-                    Thread.Sleep(500);
-                    Dispatcher.Invoke(() =>
+                    }
+                    APP.W_MinToolbar.Topmost = true;
+                    APP.W_MinToolbar.Initialize(this.Top);
+                    //else
+                    //{
+                    //    APP.W_CountdownWindow.Initialize(true, 1800);
+                    //}
+                    new Thread(new ThreadStart(new Action(() =>
                     {
-                        gridToobar.Visibility = Visibility.Hidden;
-                        APP.W_MinToolbar.Show();
-                    });
-                }))).Start();
-                //Console.WriteLine(this.Top+"max");
+                        Thread.Sleep(500);
+                        Dispatcher.Invoke(() =>
+                        {
+                            gridToobar.Visibility = Visibility.Hidden;
+                            APP.W_MinToolbar.Show();
+                        });
+                    }))).Start();
+                    //Console.WriteLine(this.Top+"max");
+                }
             }
         }
     }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -384,7 +384,7 @@
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
-                    <TextBlock Grid.Row="0" Grid.Column="0" Text="智能笔" FontSize="16" Foreground="#333333" HorizontalAlignment="Right" Margin="0,30,0,0"/>
+                    <TextBlock Grid.Row="0" Grid.Column="0" Text="设备" FontSize="16" Foreground="#333333" HorizontalAlignment="Right" Margin="0,30,0,0"/>
                     <TextBlock Grid.Row="0" Grid.Column="1" x:Name="txbNotConnecteds"  Text="未连接" FontSize="14" Foreground="#333333" Margin="30,30,0,0"/>
 
                     <TextBlock Grid.Row="1" Grid.Column="0" Text="视频格式" FontSize="16" Foreground="#333333" HorizontalAlignment="Right"/>
@@ -715,7 +715,7 @@
                     <TextBlock Text="摄像头: " FontSize="14" Padding="5,4,0,0"/>
                     <RadioButton Cursor="Hand" x:Name="rbnOpen" Content=" 开" Style="{StaticResource radBase}" FontSize="14" Margin="0,4,0,0" Click="RbnOpen_Click"/>
                     <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content=" 关"  Style="{StaticResource radBase}" FontSize="14" Margin="5,4,10,0" IsChecked="True" Click="RbnTurnOff_Click"/>
-                    <TextBlock Text="智能笔: " FontSize="14" Padding="0,4,0,0"/>
+                    <TextBlock Text="设备: " FontSize="14" Padding="0,4,0,0"/>
                     <TextBlock x:Name="txbNotConnected" Text="未连接" FontSize="14" Padding="0,4,5,0"/>
                 </StackPanel>
             </Grid>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -6,6 +6,8 @@ using ComeCapture;
 
 using Common.system;
 
+using RobotpenGateway;
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -194,6 +196,7 @@ namespace XHWK.WKTool
             txbStoragePath.Content = FileToolsCommon.GetConfigValue("VideoSavePath");
             Initialize();
             InitPen();
+            InitlbPen();
 
         }
         /// <summary>
@@ -3338,6 +3341,8 @@ namespace XHWK.WKTool
             #endregion
             blackboard_canvas.Visibility = Visibility.Collapsed;
             EndRecord();
+            //鼠标模式
+            deviceMouse();
         }
 
         /// <summary>
@@ -3400,7 +3405,8 @@ namespace XHWK.WKTool
                         }
                     }
                     #endregion
-
+                    //电子版切换笔模式
+                    deviceHand();
                     txbTime.Visibility = Visibility.Visible;
 
                     VideoInfo = new Model_Video
@@ -4479,7 +4485,7 @@ namespace XHWK.WKTool
             {
                 Dispatcher.Invoke(new Action(() =>
                 {
-                    myblackboard.changepages(0, 0, true, Color, PenSize, APP.pageData.currpage - 1);
+                    myblackboard.changepages(0, 0, true, Color, PenSize, APP.pageData.currpage - 1,0);
                 }));
             }
 
@@ -4503,12 +4509,12 @@ namespace XHWK.WKTool
             {
                 APP.PenSerial = penSerial;
                 APP.PenStatus = false;
-
-                Dispatcher.Invoke(new Action(() =>
-                {
-                    txbNotConnected.Text = "未连接";
-                    txbNotConnecteds.Text = "未连接";
-                }));
+                UpdateDevStatus();
+                //Dispatcher.Invoke(new Action(() =>
+                //{
+                //    txbNotConnected.Text = "未连接";
+                //    txbNotConnecteds.Text = "未连接";
+                //}));
             }
         }
 
@@ -4535,11 +4541,12 @@ namespace XHWK.WKTool
 
                 //开始接收笔数据
                 APP.digitalPen.GetPenData(penSerial);
-                Dispatcher.Invoke(new Action(() =>
-                {
-                    txbNotConnected.Text = "已连接";
-                    txbNotConnecteds.Text = "已连接";
-                }));
+                UpdateDevStatus();
+                //Dispatcher.Invoke(new Action(() =>
+                //{
+                //    txbNotConnected.Text = "已连接";
+                //    txbNotConnecteds.Text = "已连接";
+                //}));
 
             }
         }
@@ -4619,9 +4626,9 @@ namespace XHWK.WKTool
                 {
                     Dispatcher.Invoke(new Action(() =>
                     {
+                        float Pressure = force / 100f;
                         //myblackboard.changepages(testX, testY,false);
-                        myblackboard.changepages(testX, testY, false, Color, PenSize, APP.pageData.currpage - 1);
-
+                        myblackboard.changepages(testX, testY, false, Color, PenSize, APP.pageData.currpage - 1, Pressure);
                         #region 设置滚动条位置
 
                         //点在显示页面上方
@@ -4762,6 +4769,331 @@ namespace XHWK.WKTool
 
         #endregion
 
+        #region 写字板模式
+        #region 值初始化
+
+        [System.Runtime.InteropServices.DllImport("kernel32.dll", CharSet = System.Runtime.InteropServices.CharSet.Auto)]
+        public static extern void OutputDebugString(string message);
+
+        public bool usbIsConnected = false;
+
+        //Angle angle = Angle._270;
+        eDeviceType deviceType = eDeviceType.Unknow;
+        /// <summary>
+        /// 点缩放比例
+        /// </summary>
+        private double m_nCompress = 0;
+        private double m_nCompress_x = 0;
+        private double m_nCompress_y = 0;
+
+        /// <summary>
+        /// 0:画布根据板子适配
+        /// 1:板子根据画布适配
+        /// </summary>
+        private int type = 1;//默认画笔根据板子适配
+        bool bScreenO = false;//判断是否是横屏，默认横屏,true:横屏幕；false:竖屏
+        Drawing drawing;
+
+        //List<RobotPoint> plist = new List<RobotPoint>();
+
+        //画布宽高
+        //private int m_nDeviceW = 21000;
+        //private int m_nDeviceH = 29700;
+        private int m_nDeviceW = 22600;
+        private int m_nDeviceH = 16650;
+        private RobotpenGateway.robotpenController.returnPointData date = null;
+
+        private int nResource = 0;
+        private ReportRate RR = ReportRate.R_200;
+        string Mac = string.Empty;
+
+        int Recog_create = 0;
+        int Recog_adddate = 0;
+        int Recog_start = 0;
+
+        public bool isOpen = true;
+
+        //PrintType ptype = PrintType.NoMarkCode_FB2;
+        //int pageData = 0;
+
+        bool AreSynchronized = false;
+        //Dictionary<string, drawFormForA4> fa4dic = new Dictionary<string, drawFormForA4>();
+        //drawFormForA4 dfa4_sync;
+        //string[] szSubjectArray = new string[21] { "未选", "语文", "数学", "英语", "物理", "化学", "生物", "历史", "地理", "政治", "自然", "科一", "科二", "科三", "科四", "科五", "科六", "科七", "科八", "科九", "科十" };
+
+        #endregion
+
+        #region 罗博智慧笔
+
+        /// <summary>
+        /// 笔模式
+        /// </summary>
+        private void deviceHand()
+        {
+            robotpenController.GetInstance().setDeviceMode(eDeviceMode.DEVICE_HAND);
+        }
+        /// <summary>
+        /// 鼠标模式
+        /// </summary>
+        private void deviceMouse()
+        {
+            robotpenController.GetInstance().setDeviceMode(eDeviceMode.DEVICE_MOUSE);
+        }
+        //初始化笔服务
+        private void InitlbPen()
+        {
+            try
+            {
+
+                robotpenController.GetInstance()._ConnectInitialize(eDeviceType.Gateway, IntPtr.Zero);
+                robotpenController.GetInstance().deviceChangeEvt += new robotpenController.DeviceChange(Form1_deviceChangeEvt);
+                //robotpenController.GetInstance().deviceChangeEvt += new robotpenController.DeviceChange(Form1_deviceChangeEvt);
+                //robotpenController.GetInstance().gatewatVersionEvt += Form1_gatewatVersionEvt;
+                //robotpenController.GetInstance().nodeStatusEvt += Form1_nodeStatusEvt;
+                //    robotpenController.GetInstance().searchModeEvt += Form1_searchModeEvt;
+
+                //// 所有设备均注册该页码显示消息 目前只有T9设备才会有页码识别功能, 客户代码可以根据设备来判断是否消费该事件
+                //robotpenController.GetInstance().showPageEvt += new robotpenController.ShowPage(Form1_showPageEvt);
+                //// T8A 按键消息 为了适应其他demo也能响应， 所以任何demo都消费此事件， 客户代码可根据设备类型判断是否消费此事件
+                //robotpenController.GetInstance().keyPressEvt += new robotpenController.KeyPress(Form1_keyPressEvt);
+
+                //robotpenController.GetInstance().PageSensorCallback_Evt += Rbtnet__PageSensorEvt_;
+
+                date = new RobotpenGateway.robotpenController.returnPointData(Form1_bigDataReportEvt1);
+                robotpenController.GetInstance().initDeletgate(ref date);
+
+                CheckUsbConnect();
+                ////robotpenController.GetInstance().returnOptimizePointDataEvt += new robotpenController.returnOptimizePointData(Form1_returnOptimizePointDataEvt);
+
+                //robotpenController.GetInstance().startSyncNoteDataEvt += new robotpenController.startSyncNoteData(Form1_startSyncNoteDataEvt);
+                //robotpenController.GetInstance().startSyncNoteData_kzEvt += Form1_startSyncNoteData_kzEvt;
+                //robotpenController.GetInstance().syncNoteDataEvt += new robotpenController.syncNoteData(Form1_syncNoteDataEvt);
+                //robotpenController.GetInstance().endSyncNoteDataEvt += new robotpenController.endSyncNoteData(Form1_endSyncNoteDataEvt);
+                //robotpenController.GetInstance().getOfflineNoteDataEvt += new robotpenController.getOfflineNoteData(Form1_getOfflineNoteDataEvt);
+            }
+            catch (Exception ex)
+            {
+
+            }
+        }
+        /// <summary>
+        /// 委托实例函数，用于异步修改listview显示的USB连接设备信息
+        /// </summary>
+        private void SetListView()
+        {
+            if (usbIsConnected)
+            {
+                robotpenController.GetInstance()._CloseConnect();
+            }
+            CheckUsbConnect();
+        }
+
+        /// <summary>
+        /// 设备插拔消息，更新listview
+        /// </summary>
+        /// <param name="bStatus"></param>
+        /// <param name="uPid"></param>
+        void Form1_deviceChangeEvt(bool bStatus, ushort uPid)
+        {
+            //throw new NotImplementedException();
+            //Console.WriteLine();
+
+            LogHelper.WriteInfoLog(string.Format("设备状态{0} PID = {1}", bStatus, uPid));
+            SetListView();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>        
+        /// /// <param name="bIndex"></param>
+        /// <param name="bPenStatus"></param>
+        /// <param name="bx"></param>
+        /// <param name="by"></param>
+        /// <param name="bPress"></param>
+        private void Form1_bigDataReportEvt1(byte bIndex, byte bPenStatus, short bx, short by, short bPress)
+        {
+
+            //17是按下，16是抬起
+            if (bPenStatus == 16|| bPenStatus==0)
+            {
+                stroke.Clear();
+                if (APP.pageData.currpage > 0)
+                {
+                    Dispatcher.Invoke(new Action(() =>
+                    {
+                        myblackboard.changepages(0, 0, true, Color, PenSize, APP.pageData.currpage - 1, 0);
+                    }));
+                }
+            }
+            ////按下
+            //if (bPenStatus == 17)
+            //{
+            //}
+            if(APP.IsOutputInfoLog)
+            {
+                LogHelper.WriteInfoLog(string.Format(@"x={0},y={1},s={2},p={3}", bx, by, bPenStatus, bPress));
+            }
+
+            stroke.Add(new System.Drawing.Point(by, bx));
+
+            double PropW = blackboard_canvas.ActualWidth / m_nDeviceH;
+            double PropH = blackboard_canvas.ActualHeight / m_nDeviceW;
+            //点
+            double testY = (m_nDeviceW - bx) * PropH;
+            double testX = by * PropW;
+            //pageSerial //点阵IP地址  与打印的页面关联
+            if (APP.pageData.currpage > 0)
+            {
+                Dispatcher.Invoke(new Action(() =>
+                {
+                    float Pressure = bPress / 100f;
+                    //myblackboard.changepages(testX, testY,false);
+
+                    if (bPress > 0)
+                    {
+                        myblackboard.changepages(testX, testY, false, Color, PenSize, APP.pageData.currpage - 1, Pressure);
+                    }
+                    #region 设置滚动条位置
+
+                    //点在显示页面上方
+                    if (testY < scroMain.VerticalOffset)
+                    {
+                        //滚动条当前位置
+                        double RollCurrentLocation = scroMain.VerticalOffset;
+                        //向上滚动至以点为中心需要滚动的距离  
+                        double UpRoll = (RollCurrentLocation - testY) + (scroMain.ActualHeight / 2);
+                        //如果小于0则等于0
+                        double RollLocation = RollCurrentLocation - UpRoll;
+                        if (RollLocation < 0)
+                        {
+                            RollLocation = 0;
+                        }
+                        ////滚动条实际偏移量
+                        //double RollOffset = RollCurrentLocation - RollLocation;
+                        scroMain.ScrollToVerticalOffset(RollLocation);
+                    }
+                    //点在显示页面下方
+                    if (testY > scroMain.VerticalOffset + scroMain.ActualHeight)
+                    {
+                        //滚动条当前位置
+                        double RollCurrentLocation = scroMain.VerticalOffset;
+                        //向下滚动至以点为中心需要滚动的距离  
+                        double DownRoll = (testY - RollCurrentLocation) - (scroMain.ActualHeight / 2);
+                        //如果小于0则等于0
+                        double RollLocation = RollCurrentLocation + DownRoll;
+                        //滚动条最大滚动值
+                        double ScrollbarMaxNum = gridM.ActualHeight - scroMain.ActualHeight;
+                        if (RollLocation > ScrollbarMaxNum)
+                        {
+                            RollLocation = ScrollbarMaxNum;
+                        }
+                        ////滚动条实际偏移量
+                        //double RollOffset = RollLocation-RollCurrentLocation;
+                        scroMain.ScrollToVerticalOffset(RollLocation);
+                    }
+                    #endregion
+                    if (testX > 0 && testY > 0)
+                    {
+                        //System.Windows.Point getP = blackboard_canvas.PointToScreen(new System.Windows.Point(testX, testY));
+                        System.Windows.Point getP = scroMain.PointToScreen(new System.Windows.Point(testX, testY - scroMain.VerticalOffset));
+                        SetCursorPos((int)getP.X, (int)getP.Y);
+                    }
+                }));
+            }
+        }
+
+        /// <summary>
+        /// 判断是否有设备连接
+        /// </summary>
+        public void CheckUsbConnect()
+        {
+            usbIsConnected = false;
+            Thread.Sleep(200);
+            int nDeviceCount = robotpenController.GetInstance()._GetDeviceCount();
+            if (nDeviceCount > 0)
+            {
+                //this.listView1.BeginUpdate();
+                for (int i = 0; i < nDeviceCount; ++i)
+                {
+                    ushort npid = 0;
+                    ushort nvid = 0;
+                    string strDeviceName = string.Empty;
+                    eDeviceType dtype = eDeviceType.Unknow;
+                    if (robotpenController.GetInstance()._GetAvailableDevice(i, ref npid, ref nvid, ref strDeviceName, ref dtype))
+                    {
+                        if (!usbIsConnected)
+                        {
+                            usbIsConnected = true;
+                            deviceType = dtype;
+                            robotpenController.GetInstance()._ConnectInitialize(deviceType, IntPtr.Zero);
+                            int nRes = robotpenController.GetInstance()._ConnectOpen();
+                            if (nRes != 0)
+                            {
+                                //LogHelper.WriteInfoLog(string.Format(@"x={0},y={1},s={2},p={3}", bx, by, bPenStatus, bPress));
+                                LogHelper.WriteErrLog("设备自动连接失败，请重新插拔设备或尝试手动连接!",null);
+                                usbIsConnected = false;
+                                break;
+                            }
+                            //robotpenController.GetInstance()._Send(cmdId.SwitchMode);
+                            robotpenController.GetInstance()._Send(cmdId.GetConfig);
+
+                            APP.BoardStatus = true;
+                            UpdateDevStatus();
+                            //Dispatcher.Invoke(new Action(() =>
+                            //{
+                            //    txbNotConnected.Text = "手写板";
+                            //    txbNotConnecteds.Text = "手写板";
+                            //}));
+                        }
+                    }
+                }
+            }
+            else
+            {
+                APP.BoardStatus = false;
+                UpdateDevStatus();
+            }
+        }
+
+        #endregion
+
+        void UpdateDevStatus()
+        {
+            if (APP.BoardStatus && APP.PenStatus)
+            {
+                Dispatcher.Invoke(new Action(() =>
+                {
+                    txbNotConnected.Text = "笔/板";
+                    txbNotConnecteds.Text = "笔/板";
+                }));
+            }
+            else if(APP.BoardStatus)
+            {
+                Dispatcher.Invoke(new Action(() =>
+                {
+                    txbNotConnected.Text = "手写板";
+                    txbNotConnecteds.Text = "手写板";
+                }));
+            }
+            else if (APP.PenStatus)
+            {
+                Dispatcher.Invoke(new Action(() =>
+                {
+                    txbNotConnected.Text = "智能笔";
+                    txbNotConnecteds.Text = "智能笔";
+                }));
+            }
+            else
+            {
+                Dispatcher.Invoke(new Action(() =>
+                {
+                    txbNotConnected.Text = "未连接";
+                    txbNotConnecteds.Text = "未连接";
+                }));
+            }
+        }
+        #endregion
+
         #region 图片拉伸移动
         private System.Windows.Point initialPoint;
 
@@ -5269,10 +5601,41 @@ namespace XHWK.WKTool
         }
         #endregion
 
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            robotpenController.GetInstance().setDeviceMode(eDeviceMode.DEVICE_HAND);
+        }
+
+        private void Button_Click_1(object sender, RoutedEventArgs e)
+        {
+            robotpenController.GetInstance().setDeviceMode(eDeviceMode.DEVICE_MOUSE);
+        }
     }
     public class PageData
     {
         public int PageCode { get; set; }
         public string PageName { get; set; }
     }
+
+
+    public enum ReportRate
+    {
+        R_200,
+        R_160,
+        R_120,
+        R_80,
+        R_40
+    }
+
+    public class RobotPoint
+    {
+        public int bIndex { get; set; }
+        public int bPenStatus { get; set; }
+        public float bx { get; set; }
+        public float by { get; set; }
+        public float bPress { get; set; }
+        public float bWidth { get; set; }
+        public float bSpeed { get; set; }
+        public bool isOptimize { get; set; }
+    }
 }

XHWK.WKTool/XHWK.WKTool.csproj

@@ -68,7 +68,7 @@
     <Reference Include="Aspose.PDF, Version=19.1.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
       <HintPath>..\packages\Aspose.PDF.19.1.0\lib\net4.0\Aspose.PDF.dll</HintPath>
     </Reference>
-    <Reference Include="Aspose.Slides, Version=15.1.0.0, Culture=neutral, PublicKeyToken=00725b1ceb58d0a9, processorArchitecture=MSIL">
+    <Reference Include="Aspose.Slides, Version=17.9.1.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\dl\Aspose.Slides.dll</HintPath>
     </Reference>
@@ -85,6 +85,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Common\dlls\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="RobotpenGateway, Version=1.1.6.1, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Common\dlls\RobotpenGateway.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />