Merge remote-tracking branch 'origin/zyy' into zhangxueyang

# Conflicts:
#	XHWK.WKTool/App.cs

XHWK.WKTool/App.cs

@@ -9,6 +9,8 @@ using System.Threading;
 using System.Windows;
 using System.Windows.Threading;
 
+using TStudyDigitalPen.HID;
+
 using XHWK.Model;
 
 namespace XHWK.WKTool
@@ -86,6 +88,19 @@ namespace XHWK.WKTool
         /// 页码IP
         /// </summary>
         public static string[] OutPut = new string[] { }; 
+
+        /// <summary>
+        /// 点阵笔
+        /// </summary>
+        public static DigitalPenHID digitalPen;
+        /// <summary>
+        /// 笔序号
+        /// </summary>
+        public static string PenSerial;
+        /// <summary>
+        /// 笔状态，是否已连接
+        /// </summary>
+        public static bool PenStatus;
         #endregion
 
         [STAThread]

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -17,6 +17,8 @@ using System.Windows.Controls;
 using ComeCapture;
 using Aspose.Slides;
 using static Common.system.PdfTrunImage;
+using TStudyDigitalPen.HID;
+using System.Drawing;
 
 namespace XHWK.WKTool
 {
@@ -73,6 +75,7 @@ namespace XHWK.WKTool
             }
             txbStoragePath.Text = FileToolsCommon.GetConfigValue("VideoSavePath");
             Initialize();
+            InitPen();
         }
         /// <summary>
         /// 初始化
@@ -1339,5 +1342,317 @@ namespace XHWK.WKTool
             //Console.WriteLine("transform.ScaleX = " + transform.ScaleX + "; transform.ScaleY = " + transform.ScaleY);
         }
         #endregion
+
+        #region 点阵笔相关
+
+        #region 值初始化
+        // 不同尺寸点阵纸点阵宽高尺寸计算方法为：纸张物理尺寸（毫米）/0.3 *8,详见 开发必读.pdf 文档
+
+        /// <summary>
+        /// A4点阵纸点阵宽度
+        /// </summary>
+        private const int A4_WIDTH = 5600;
+
+        /// <summary>
+        /// A4点阵纸点阵高度
+        /// </summary>
+        private const int A4_HEIGHT = 7920;
+
+        /// <summary>
+        /// 画板
+        /// </summary>
+        private Graphics graphics;
+
+        /// <summary>
+        /// 笔画坐标数组
+        /// </summary>
+        private List<System.Drawing.Point> stroke;
+
+        /// <summary>
+        /// 笔序列号
+        /// </summary>
+        private string penSerial;
+
+        /// <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)
+            {
+                System.Windows.MessageBox.Show("初始化失败，授权过期，返回值：" + ER.ToString());
+            }
+        }
+
+
+        /// <summary>
+        /// 落笔
+        /// </summary>
+        /// <param name="time">时间戳，1970年1月1日到现在的总毫秒数</param>
+        /// <param name="penSerial">点阵笔序列号</param>
+        /// <param name="penType">点阵笔型号编号</param>
+        private void OnPenDown(ulong time, string penSerial, int penType)
+        {
+            if (this.CheckAccess())
+            {
+                Action<ulong, string, int> action = new Action<ulong, string, int>(OnPenDown);
+                this.Dispatcher.Invoke(action, new object[] { time, penSerial, penType });
+            }
+            else
+            {
+                //labPenSerial.Text = penSerial;
+                //labPenStatus.Text = "PenDown";
+                isPenDown = true;
+            }
+        }
+
+        /// <summary>
+        /// 抬笔
+        /// </summary>
+        /// <param name="time">时间戳，1970年1月1日到现在的总毫秒数</param>
+        /// <param name="penSerial">点阵笔序列号</param>
+        /// <param name="penType">点阵笔型号编号</param>
+        private void OnPenUp(ulong time, string penSerial, int penType)
+        {
+            if (this.CheckAccess())
+            {
+                Action<ulong, string, int> action = new Action<ulong, string, int>(OnPenUp);
+                this.Dispatcher.Invoke(action, new object[] { time, penSerial, penType });
+            }
+            else
+            {
+                isPenDown = false;
+                APP.PenSerial = penSerial;
+                //int leftPoints = stroke.Count % 3;
+                //if (0 != leftPoints)
+                //{
+                //    int from = stroke.Count - leftPoints - 1;
+                //    if (from < 0)
+                //        from = 0;
+                //    int to = stroke.Count - 1;
+                //    DrawCoordinates(from, to);
+                //}
+                stroke.Clear();
+            }
+        }
+
+        /// <summary>
+        /// 笔断开
+        /// </summary>
+        /// <param name="time">时间戳，1970年1月1日到现在的总毫秒数</param>
+        /// <param name="penSerial">点阵笔序列号</param>
+        /// <param name="penType">点阵笔型号编号</param>
+        private void OnPenDisconnect(ulong time, string penSerial, int penType)
+        {
+            if (this.CheckAccess())
+            {
+                Action<ulong, string, int> action = new Action<ulong, string, int>(OnPenDisconnect);
+                this.Dispatcher.Invoke(action, new object[] { time, penSerial, penType });
+            }
+            else
+            {
+                APP.PenSerial = penSerial;
+                APP.PenStatus = false;
+            }
+        }
+
+        /// <summary>
+        /// 笔连接
+        /// </summary>
+        /// <param name="time">时间戳，1970年1月1日到现在的总毫秒数</param>
+        /// <param name="penSerial">点阵笔序列号</param>
+        /// <param name="penType">点阵笔型号编号</param>
+        private void OnPenConnect(ulong time, string penSerial, int penType)
+        {
+            if (this.CheckAccess())
+            {
+                Action<ulong, string, int> action = new Action<ulong, string, int>(OnPenConnect);
+                this.Dispatcher.Invoke(action, new object[] { time, penSerial, penType });
+            }
+            else
+            {
+                APP.PenSerial = penSerial;
+                APP.PenStatus = true;
+                this.penSerial = penSerial;
+                //连接后，在获取笔数据前，可以清除笔内的历史数据
+                //APP.digitalPen.ClearMemory(penSerial);
+
+                //开始接收笔数据
+                APP.digitalPen.GetPenData(penSerial);
+            }
+        }
+        /// <summary>
+        /// 电池电量
+        /// </summary>
+        /// <param name="time"></param>
+        /// <param name="penSerial"></param>
+        /// <param name="penType"></param>
+        /// <param name="capacity"></param>
+        private void OnBatteryCapacity(ulong time, string penSerial, int penType, byte capacity)
+        {
+            if (this.CheckAccess())
+            {
+                Action<ulong, string, int, byte> action = new Action<ulong, string, int, byte>(OnBatteryCapacity);
+                this.Dispatcher.Invoke(action, new object[] { time, penSerial, penType, capacity });
+            }
+            else
+            {
+                //System.Windows.MessageBox.Show("电池电量:" + capacity.ToString());
+            }
+        }
+
+        /// <summary>
+        /// 已用存储
+        /// </summary>
+        /// <param name="time"></param>
+        /// <param name="penSerial"></param>
+        /// <param name="penType"></param>
+        /// <param name="fillLevel"></param>
+        private void OnMemoryFillLevel(ulong time, string penSerial, int penType, byte fillLevel)
+        {
+            if (this.CheckAccess())
+            {
+                Action<ulong, string, int, byte> action = new Action<ulong, string, int, byte>(OnMemoryFillLevel);
+                this.Dispatcher.Invoke(action, new object[] { time, penSerial, penType, fillLevel });
+            }
+            else
+            {
+                //System.Windows.MessageBox.Show("存储:" + fillLevel.ToString());
+            }
+        }
+
+        /// <summary>
+        /// 笔书写，收到坐标
+        /// </summary>
+        /// <param name="time">时间戳，1970年1月1日到现在的总毫秒数</param>
+        /// <param name="penSerial">点阵笔序列号</param>
+        /// <param name="penType">点阵笔型号编号</param>
+        /// <param name="pageSerial">点阵地址</param>
+        /// <param name="cx">x坐标</param>
+        /// <param name="cy">y坐标</param>
+        /// <param name="force">压力值</param>
+        private void OnPenCoordinate(ulong time, string penSerial, int penType, string pageSerial, int cx, int cy, byte force)
+        {
+            if (this.CheckAccess())
+            {
+                Action<ulong, string, int, string, int, int, byte> ac = new Action<ulong, string, int, string, int, int, byte>(OnPenCoordinate);
+                this.Dispatcher.Invoke(ac, new object[] { time, pageSerial, penType, pageSerial, cx, cy, force });
+            }
+            else
+            {
+                //判断是否是落笔后输出的坐标，在设置悬浮模式下，落笔前的悬浮坐标不绘制
+                if (!isPenDown)
+                {
+                    return;
+                }
+                stroke.Add(new System.Drawing.Point(cx, cy));
+
+                double PropW = blackboard_canvas.ActualWidth / A4_WIDTH;
+                double PropH = blackboard_canvas.ActualHeight / A4_HEIGHT;
+                //点
+                double testX=(double)cx * PropW;
+                double testY=(double)cy * PropH;
+                //pageSerial //点阵IP地址  与打印的页面关联
+
+
+                ////每3个点画一条曲线
+                //if (stroke.Count % 3 == 0)
+                //{
+                //    int from = stroke.Count - 3 - 1;
+                //    if (from < 0)
+                //        from = 0;
+                //    int to = stroke.Count - 1;
+                //    DrawCoordinates(from, to);
+                //}
+            }
+        }
+
+        /// <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);
+        }
+        #endregion
     }
 }

XHWK.WKTool/XHWK.WKTool.csproj

@@ -82,6 +82,10 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
+    <Reference Include="TStudy.DigitalPen, Version=3.0.0.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Common\dlls\TStudy.DigitalPen.dll</HintPath>
+    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -127,6 +131,7 @@
     <Compile Include="Models\EntityBase.cs" />
     <Compile Include="Models\Limit.cs" />
     <Compile Include="Models\Tool.cs" />
+    <Compile Include="MyLicense.cs" />
     <Compile Include="PracticeWindow.xaml.cs">
       <DependentUpon>PracticeWindow.xaml</DependentUpon>
     </Compile>