剔除拓思德点阵笔验证

XHWK.WKTool/App.config

   </startup>
   <appSettings>
     <!--0正式 1测试-->
-    <add key="IsDebug" value="1" />
+    <add key="IsDebug" value="0" />
     <!--参数是否加密 0不加密 1加密-->
     <add key="IsParameterEncryption" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="115" />
-    <add key="VersionName" value="3.2.6" />
+    <add key="VersionCode" value="116" />
+    <add key="VersionName" value="3.2.7" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

XHWK.WKTool/App.xaml.cs

 using System.Threading.Tasks;
 using System.Windows;
 
-using TStudyDigitalPen.HID;
-
 using XHWK.Model;
 using XHWK.WKTool.Helpers;
 using XHWK.WKTool.Skin;
 
         #region 点阵笔
 
-        /// <summary>
-        /// 点阵笔
-        /// </summary>
-        public static DigitalPenHID digitalPen;
-
         /// <summary>
         /// 笔序号
         /// </summary>

XHWK.WKTool/MainWindow.xaml.cs

         /// </param>
         /// <param name="e">
         /// </param>
-        private async void BtnScreenRecording_Click(object sender, RoutedEventArgs e)
+        private void BtnScreenRecording_Click(object sender, RoutedEventArgs e)
         {
             luoBoPenUtil.lb_device_mouse();
 

XHWK.WKTool/PracticeWindow.xaml.cs

 using System.Windows.Input;
 using System.Windows.Media;
 
-using TStudyDigitalPen.HID;
-
 using XHWK.Model;
 
 namespace XHWK.WKTool
     /// </summary>
     public partial class PracticeWindow : Window
     {
-        //声明一个 DrawingAttributes 类型的变量  
+        //声明一个 DrawingAttributes 类型的变量
         private DrawingAttributes drawingAttributes;
+
         private DrawingAttributes drawing;
         private ViewModel viewModel;
+
         /// <summary>
-        /// 0 画笔 1 矩形 2 圆形 
+        /// 0 画笔 1 矩形 2 圆形
         /// </summary>
         private int flg = 0;
 
         /// 当前画笔颜色
         /// </summary>
         private Color Colour = Colors.Red;
+
         /// <summary>
         /// 当前画笔宽
         /// </summary>
         private int Wit = 2;
+
         /// <summary>
         /// 当前画笔高
         /// </summary>
         private int Hei = 2;
+
         public PracticeWindow()
         {
             InitializeComponent();
-            InitPen();
+
             InitTQLPPen();
         }
+
         public void Initialize(string _imgPath = null)
         {
             flg = 0;
             //    imgCanvas.Source = new BitmapImage(new Uri(_imgPath));
             //}
 
-
-
-
-            //创建 DrawingAttributes 类的一个实例  
+            //创建 DrawingAttributes 类的一个实例
             drawingAttributes = new DrawingAttributes();
 
             //drawingAttributes.StylusTip = StylusTip.Rectangle;
             //drawingAttributes.IsHighlighter = false;
             //drawingAttributes.IgnorePressure = true;
 
-
-
-            ////将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用  
-            ////InkCanvas 通过 DefaultDrawingAttributes 属性来获取墨迹的各种设置，该属性的类型为 DrawingAttributes 型  
+            ////将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用
+            ////InkCanvas 通过 DefaultDrawingAttributes 属性来获取墨迹的各种设置，该属性的类型为 DrawingAttributes 型
             blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
             Pen();
             //blackboard_canvas.Cursor = Cursors.Pen;
 
-
             //Cursor cus = new Cursor(@"G:\06.cur");
 
             //blackboard_canvas.Cursor = cus;
             //APP.W_ScreenRecordingToolbarWindow.Owner = this;
             //APP.W_ScreenRecordingToolbarWindow.Topmost = true;
         }
+
         /// <summary>
         /// 画笔颜色事件 白色
         /// </summary>
             drawingAttributes.Color = Colors.White;
             Colour = Colors.White;
         }
+
         /// <summary>
         /// 画笔颜色事件 红色
         /// </summary>
             drawingAttributes.Color = Colors.Red;
             Colour = Colors.Red;
         }
+
         /// <summary>
         /// 画笔颜色事件 黑色
         /// </summary>
             drawingAttributes.Color = Colors.Black;
             Colour = Colors.Black;
         }
+
         /// <summary>
         /// 画笔颜色事件 青色
         /// </summary>
             drawingAttributes.Color = Colors.LimeGreen;
             Colour = Colors.LimeGreen;
         }
+
         /// <summary>
         /// 画笔颜色事件 黄色
         /// </summary>
             drawingAttributes.Color = Colors.Gold;
             Colour = Colors.Gold;
         }
+
         /// <summary>
         /// 画笔颜色事件 蓝色
         /// </summary>
             drawingAttributes.Color = Colors.DeepSkyBlue;
             Colour = Colors.DeepSkyBlue;
         }
+
         /// <summary>
         /// 画笔粗细事件 细
         /// </summary>
             Wit = 1;
             Hei = 1;
         }
+
         /// <summary>
         /// 画笔粗细事件 中
         /// </summary>
             drawingAttributes.Height = 3;
             Wit = 3;
             Hei = 3;
-
         }
+
         /// <summary>
         /// 画笔粗细事件 粗
         /// </summary>
             Wit = 5;
             Hei = 5;
         }
+
         /// <summary>
         /// 橡皮
         /// </summary>
             blackboard_canvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
             blackboard_canvas.EraserShape = new EllipseStylusShape(64, 64, 0);
         }
+
         /// <summary>
         /// 画笔
         /// </summary>
 
             blackboard_canvas.Cursor = Cursors.Pen;
         }
+
         /// <summary>
         /// 圆
         /// </summary>
                 //FitToCurve = true,
                 IsHighlighter = false,
                 IgnorePressure = true,
-
             };
             blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
             blackboard_canvas.EditingMode = InkCanvasEditingMode.None;
             blackboard_canvas.Cursor = Cursors.Cross;
         }
+
         /// <summary>
         /// 矩形
         /// </summary>
                 //FitToCurve = true,
                 IsHighlighter = false,
                 IgnorePressure = true,
-
             };
             blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
             blackboard_canvas.EditingMode = InkCanvasEditingMode.None;
             blackboard_canvas.Cursor = Cursors.Cross;
         }
+
         private System.Windows.Point iniP;
+
         private void blackboard_canvas_MouseDown(object sender, MouseButtonEventArgs e)
         {
             if (flg != 0)
 
         private Stroke StrokeRound;
         private Stroke StrokeRectangle;
+
         private void blackboard_canvas_MouseMove(object sender, MouseEventArgs e)
         {
             if (flg != 0)
                 }
             }
         }
+
         private List<System.Windows.Point> GenerateEclipseGeometry(System.Windows.Point st, System.Windows.Point ed)
         {
             double a = 0.5 * (ed.X - st.X);
             }
             return pointList;
         }
+
         /// <summary>
         /// 鼠标松开时
         /// </summary>
             StrokeRound = null;
             StrokeRectangle = null;
         }
+
         /// <summary>
         /// 鼠标右键
         /// </summary>
             }
             Hide();
         }
+
         /// <summary>
         /// 鼠标中键点击
         /// </summary>
-        void SwitchPages()
+        private void SwitchPages()
         {
             try
             {
             }
         }
 
-
         private void blackboard_canvas_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
             if (APP.W_ScreenRecordingToolbarWindow.flg == 10)
             SwitchPages();
             //Hide();
         }
+
         /// <summary>
         /// 退出批注并清空画板
         /// </summary>
             }))).Start();
         }
 
-
         #region 点阵笔相关
+
         #region 值初始化
+
         // 不同尺寸点阵纸点阵宽高尺寸计算方法为：纸张物理尺寸（毫米）/0.3 *8,详见 开发必读.pdf 文档
 
         /// <summary>
         /// </summary>
         private bool isPenDown;
 
-        //当前点阵地址
-        private string currentPageSerial = string.Empty;
-
-        //不同点阵地址对应的笔迹绘制图片，用于实现在不同点阵地址书写切换时，显示书写内容自动切换
-        //本例图片放在内存中存储，对于大量或者需要在多个点阵地址对应图片进行切换演示，建议将图片存储到文件，以免内存溢出
-        private Dictionary<string, System.Drawing.Image> pagesDic = new Dictionary<string, System.Drawing.Image>();
-        #endregion
-        public void InitPen()
-        {
-            stroke = new List<System.Drawing.Point>();
-            //获取点阵笔实例，并绑定点阵笔事件
-            //将授权文件内容传入，获取点阵笔对象实例
-            APP.digitalPen = DigitalPenHID.GetInstance(certificates.MyLicense.Bytes);
-            //绑定笔连接事件
-            APP.digitalPen.PenConnected += OnPenConnect;
-            //绑定笔断开事件
-            APP.digitalPen.PenDisconnect += OnPenDisconnect;
-            //绑定笔书写输出坐标事件
-            APP.digitalPen.PenCoordinate += OnPenCoordinate;
-            //绑定抬笔事件
-            APP.digitalPen.PenUp += OnPenUp;
-            //绑定落笔事件
-            APP.digitalPen.PenDown += OnPenDown;
-            APP.digitalPen.PenBatteryCapacity += OnBatteryCapacity;
-            APP.digitalPen.PenMemoryFillLevel += OnMemoryFillLevel;
-            //完成初始化点阵笔，开始与点阵笔通信
-            ERROR_CODE ER = APP.digitalPen.Start();
-
-            ////绑定笔在新的点阵地址页面书写事件
-            //APP.digitalPen.PenNewPage += APP.digitalPen_OnPenNewPage;
-            ////绑定笔信息事件
-            //APP.digitalPen.PenInfo += APP.digitalPen_OnPenInfo;
-            //启动接收笔数据，完成初始化工作
-            //ERROR_CODE rc = APP.digitalPen.Start();
-            //判断是否成功
-            if (ER != ERROR_CODE.ERROR_OK)
-            {
-                MessageWindow.Show("初始化失败，授权过期，返回值：" + ER.ToString());
-            }
-        }
+        #endregion 值初始化
 
         /// <summary>
         /// 落笔
 
                 stroke.Clear();
             }
-            //if (APP.pageData.currpage > 0)
-            //{
-            //    Dispatcher.Invoke(new Action(() =>
-            //    {
-            //        myblackboard.changepages(0, 0, true, Color, PenSize, APP.pageData.currpage - 1, 0);
-            //    }));
-            //}
-
 
             if (strokes != null && strokes.StylusPoints.Count > 1)
             {
                 APP.PenSerial = penSerial;
                 APP.PenStatus = true;
                 this.penSerial = penSerial;
-                //连接后，在获取笔数据前，可以清除笔内的历史数据
-                //APP.digitalPen.ClearMemory(penSerial);
-
-                //开始接收笔数据
-                APP.digitalPen.GetPenData(penSerial);
-                //UpdateDevStatus();
-                ////Dispatcher.Invoke(new Action(() =>
-                ////{
-                ////    txbNotConnected.Text = "已连接";
-                ////    txbNotConnecteds.Text = "已连接";
-                ////}));
-
             }
         }
+
         /// <summary>
         /// 电池电量
         /// </summary>
                                     //blackboard_canvas.Strokes = new StrokeCollection();
                                     strokes = new Stroke(stylusPoints);
 
-
                                     strokes.DrawingAttributes = drawing;
                                     //blackboard_canvas.Strokes.Add(strokes);
 
                             }
                         }));
                     }
-
                 }
             }
         }
-        bool isFirst = true;
+
+        private bool isFirst = true;
         private StylusPointCollection stylusPoints = new StylusPointCollection();
         private StylusPoint stylusPoint = new StylusPoint();
         private Stroke strokes;
-        /// <summary>
-        /// 停止笔
-        /// </summary>
-        public void StopDigitalPen()
-        {
-            //停止，释放资源
-            APP.digitalPen.Stop();
-        }
-        /// <summary>
-        /// 清空笔内存储
-        /// </summary>
-        public void ClearPenStorage()
-        {
-            if (!string.IsNullOrEmpty(penSerial))
-            {
-                APP.digitalPen.ClearMemory(penSerial);
-            }
-        }
-        /// <summary>
-        /// 获取剩余电量
-        /// </summary>
-        public void GetPenElectricityQuantity()
-        {
-            if (!string.IsNullOrEmpty(penSerial))
-            {
-                APP.digitalPen.GetBatteryCapacity(penSerial);
-            }
-        }
-
-        /// <summary>
-        /// 获取存储空间
-        /// </summary>
-        public void GetUsedStorage()
-        {
-            if (!string.IsNullOrEmpty(penSerial))
-            {
-                APP.digitalPen.GetMemoryFillLevel(penSerial);
-            }
-        }
-
-        /// <summary>
-        /// 开启悬浮
-        /// </summary>
-        public void 开启悬浮()
-        {
-            if (!string.IsNullOrEmpty(penSerial))
-            {
-                APP.digitalPen.SetPenHoverMode(true, penSerial);
-            }
-        }
-
-        /// <summary>
-        /// 关闭悬浮
-        /// </summary>
-        public void 关闭悬浮()
-        {
-            if (!string.IsNullOrEmpty(penSerial))
-            {
-                APP.digitalPen.SetPenHoverMode(false, penSerial);
-            }
-        }
 
         /// <summary>
         /// 引用user32.dll动态链接库（windows api），
         [System.Runtime.InteropServices.DllImport("user32.dll")]
         private static extern int SetCursorPos(int x, int y);
 
-        #endregion
+        #endregion 点阵笔相关
 
         #region 腾千里手写笔
+
         /// <summary>
         /// 是否在书写
         /// </summary>
-        bool isTQLPenDown = false;
+        private bool isTQLPenDown = false;
+
         /// <summary>
         /// TQL点阵笔宽高
         /// </summary>
         //static float TQLA4_WIDTH = (float)1075 / (float)150 * (float)25.4 / (float)1.524; //OID4
         //static float TQLA4_HEIGHT = (float)1512 / (float)150 * (float)25.4 / (float)1.524;
-        static float TQLA4_WIDTH = (float)2480 / (float)300 * (float)25.4 / (float)1.524;
-        static float TQLA4_HEIGHT = (float)3509 / (float)300 * (float)25.4 / (float)1.524;
+        private static float TQLA4_WIDTH = (float)2480 / (float)300 * (float)25.4 / (float)1.524;
+
+        private static float TQLA4_HEIGHT = (float)3509 / (float)300 * (float)25.4 / (float)1.524;
+
         /// <summary>
         /// 初始化
         /// </summary>
                 APP.TQLPenevents.InToType = 2;
             }
         }
+
         /// <summary>
         /// 笔落下
         /// </summary>
             stylusPoint = new StylusPoint();
             strokes = null;
         }
+
         /// <summary>
         /// 笔抬起
         /// </summary>
             stylusPoint = new StylusPoint();
             strokes = null;
         }
+
         /// <summary>
         /// 笔书写
         /// </summary>
                 }));
             }
         }
-        #endregion
-    }
-}
 
+        #endregion 腾千里手写笔
+    }
+}

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

                 };
                 //practiceWin.Owner = this;
             }
-            APP.W_PracticeWindow.InitPen();
+
             APP.W_PracticeWindow.InitTQLPPen();
             APP.W_PracticeWindow.Show();
             new Thread(new ThreadStart(new Action(() =>
                         };
                         //practiceWin.Owner = this;
                     }
-                    APP.W_PracticeWindow.InitPen();
+
                     APP.W_PracticeWindow.InitTQLPPen();
                     APP.W_PracticeWindow.Initialize();// imagePath);
                     flg = 11;
                             Top = 0
                         };
                     }
-                    APP.W_PracticeWindow.InitPen();
+
                     APP.W_PracticeWindow.InitTQLPPen();
                     APP.W_PracticeWindow.Initialize();//imagePath);
                     flg = 10;

XHWK.WKTool/Utils/pen/luobo/LuoBoPenUtil.cs

 
 namespace XHWK.WKTool.Utils.luobo
 {
-    class LuoBoPenUtil
+    internal class LuoBoPenUtil
     {
         #region 罗博智慧笔
 
         #region 值初始化
 
-        PenEventI penEvent = null;
+        private PenEventI penEvent = null;
 
         [System.Runtime.InteropServices.DllImport("kernel32.dll", CharSet = System.Runtime.InteropServices.CharSet.Auto)]
         public static extern void OutputDebugString(string message);
         private int m_nDeviceH = 16650;
         private robotpenController.returnPointData date = null;
 
-
         public bool isOpen = true;
 
         /// <summary>
         /// </summary>
         private bool IsPen = false;
 
-        private bool IsT8 = true;
-
         #endregion 值初始化
 
-
-        public LuoBoPenUtil(PenEventI penEvent) {
+        public LuoBoPenUtil(PenEventI penEvent)
+        {
             this.penEvent = penEvent;
         }
 
                         strStatus = "DEVICE_POWER_OFF";
                     }
                     break;
+
                 case NODE_STATUS.DEVICE_STANDBY:
                     {
                         strStatus = "DEVICE_STANDBY";
-
                     }
                     break;
+
                 case NODE_STATUS.DEVICE_INIT_BTN:
                     {
                         strStatus = "DEVICE_INIT_BTN";
-
                     }
                     break;
+
                 case NODE_STATUS.DEVICE_OFFLINE:
                     {
                         strStatus = "DEVICE_OFFLINE";
                     }
                     break;
+
                 case NODE_STATUS.DEVICE_ACTIVE:
                     {
                         strStatus = "DEVICE_ACTIVE";
                         //deviceHand();
                     }
                     break;
+
                 case NODE_STATUS.DEVICE_LOW_POWER_ACTIVE:
                     {
                         strStatus = "DEVICE_LOW_POWER_ACTIVE";
                     }
                     break;
+
                 case NODE_STATUS.DEVICE_OTA_MODE:
                     {
                         strStatus = "DEVICE_OTA_MODE";
                     }
                     break;
+
                 case NODE_STATUS.DEVICE_OTA_WAIT_SWITCH:
                     {
                         strStatus = "DEVICE_OTA_WAIT_SWITCH";
                     }
                     break;
+
                 case NODE_STATUS.DEVICE_DFU_MODE:
                     {
                         strStatus = "DEVICE_DFU_MODE";
-
                     }
                     break;
+
                 case NODE_STATUS.DEVICE_TRYING_POWER_OFF:
                     {
                         strStatus = "DEVICE_TRYING_POWER_OFF";
                     }
                     break;
+
                 case NODE_STATUS.DEVICE_FINISHED_PRODUCT_TEST:
                     {
                         strStatus = "DEVICE_FINISHED_PRODUCT_TEST";
                     }
                     break;
+
                 case NODE_STATUS.DEVICE_SYNC_MODE:
                     {
                         strStatus = "DEVICE_SYNC_MODE";
                     }
                     break;
+
                 default:
                     {
                         strStatus = "UNKNOW";
                     break;
             }
         }
+
         private void luobo_switchModeEvt(int modeType)
         {
             if (modeType == 1)
             }
         }
 
-
-
         /// <summary>
         /// 设备插拔消息，更新listview
         /// </summary>
         /// </param>
         private void luobo_bigDataReportEvt1(byte bIndex, byte bPenStatus, short bx, short by, short bPress)
         {
-
             if (bx == 0 && by == 0 && bPenStatus == 0 && bPress == 0)
             {
                 return;
                                 robotpenController.GetInstance()._Send(cmdId.SearchMode);
                             }))).Start();
                         }
-
-
                     }
                 }
             }
         /// </summary>
         public void UpdateDevStatus()
         {
-     
             if (penEvent != null)
             {
                 penEvent.penStatusEvent();
 
         #endregion 罗博智慧笔
     }
-}
+}

XHWK.WKTool/XHWK.WKTool.csproj

       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\DLL\TQL\TQLComm.dll</HintPath>
     </Reference>
-    <Reference Include="TStudy.DigitalPen, Version=3.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\DLL\TStudy\TStudy.DigitalPen.dll</HintPath>
-    </Reference>
     <Reference Include="VisioForge.Controls, Version=12.0.56.0, Culture=neutral, PublicKeyToken=5873e863f1bcda5d, processorArchitecture=MSIL">
       <HintPath>..\packages\VisioForge.DotNet.Core.TRIAL.12.0.56\lib\net45\VisioForge.Controls.dll</HintPath>
     </Reference>

星火微课/星火微课-正式.iss

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

星火微课/星火微课-测试.iss

 
 #define MyAppName "星火微课测试版"  
 #define MyAppDir "xhwk_test"
-#define MyAppVersion "3.2.6"
+#define MyAppVersion "3.2.7"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xhwkclient\XHWK.WKTool\bin\x86\Debug\"