Merge branch 'master' of http://git.xhkjedu.com/zhaoyaoyao/XHPZPC

# Conflicts:
#	XHPZ.Desktop/APP.cs
#	XHPZ.Desktop/XHPZ.Desktop.csproj

XHPZ.Desktop/APP.cs

@@ -21,6 +21,10 @@ namespace XHPZ.Desktop
     {
         #region 全局变量
         /// <summary>
+        /// 是否输出测试记录日志
+        /// </summary>
+        public static bool IsOutputInfoLog = FileToolsCommon.GetConfigValue("IsOutputInfoLog") != "0";
+        /// <summary>
         /// 后台线程帮助类
         /// </summary>
         public static BackgroundWorkerHelper BackgroundWorkerHelper => BackgroundWorkerHelper.GetInstance();
@@ -44,20 +48,24 @@ namespace XHPZ.Desktop
         public static bool BoardStatus = false;
         #endregion
         #region 腾千里手写笔
-        ///// <summary>
-        ///// 腾千里手写笔事件
-        ///// </summary>
-        //public static PenEvents TQLPenevents;
-        ///// <summary>
-        ///// 腾千里手写笔是否已连接
-        ///// </summary>
-        //public static bool TQLPenStatus = false;
-        #endregion
-        #region 页面
         /// <summary>
-        /// 批注
+        /// 腾千里手写笔事件
+        /// </summary>
+        public static PenEvents TQLPenevents;
+        /// <summary>
+        /// 腾千里手写笔是否已连接
         /// </summary>
+<<<<<<< HEAD
         public static PracticeWindow W_PracticeWindow = null;
+=======
+        public static bool TQLPenStatus = false;
+        #endregion
+        #region 页面
+        ///// <summary>
+        ///// 批注
+        ///// </summary>
+        //public static PracticeWindow W_PracticeWindow = null;
+>>>>>>> a23bdc84b33a613a7ae65513fd285d36f24a5dd6
         #endregion
         #endregion
 

XHPZ.Desktop/App.config

@@ -3,4 +3,8 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
+  <appSettings>
+      <!--是否输出其他测试日志-->
+      <add key="IsOutputInfoLog" value="1"/>
+  </appSettings>
 </configuration>

XHPZ.Desktop/MessageWindow.xaml

@@ -0,0 +1,37 @@
+<Window x:Class="XHPZ.Desktop.MessageWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:XHPZ.Desktop"
+        mc:Ignorable="d" 
+        Title="星火微课" WindowStartupLocation="CenterScreen"
+    WindowStyle="None" AllowsTransparency="True"    WindowState="Normal"
+    ShowInTaskbar="False"  Topmost="True" ResizeMode="NoResize" 
+        d:DesignHeight="250" Width="600" Height="220"  MouseMove="Window_MouseMove"  BorderThickness="7">
+    <Window.Effect>
+        <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
+    </Window.Effect>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50"/>
+            <RowDefinition Height="100*"/>
+            <RowDefinition Height="70"/>
+        </Grid.RowDefinitions>
+        <Grid Grid.Row="0">
+            <Label x:Name="lblTitle" Content="提示" HorizontalAlignment="Left" Margin="14,10,0,0" VerticalAlignment="Top" Foreground="#FF333333" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" FontSize="20" FontWeight="Bold"/>
+        </Grid>
+        <Grid Grid.Row="1">
+            <TextBlock x:Name="tbkContent" Margin="20,0,20,0" TextWrapping="Wrap" VerticalAlignment="Center" FontSize="20" Foreground="#FF919191" Grid.Row="1" HorizontalAlignment="Center" Text=""/>
+        </Grid>
+        <Grid Grid.Row="2" Margin="0,0,0,0">
+            <Border x:Name="borOk" Background="#2D8CF0" CornerRadius="6" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,30,20">
+                <Button x:Name="BtnOK" Width="104" Height="42" Content="确定" FontSize="20"  Background="#00000000"  BorderBrush="{x:Null}" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Foreground="White"  Cursor="Hand" Click="BtnOK_Click" IsDefault="True"/>
+            </Border>
+            <Border x:Name="borCancel" Background="#E5E5E5" CornerRadius="6"  HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,150,20">
+                <Button x:Name="BtnCancel" Width="104" Height="42" Content="取消" FontSize="20" Background="#00000000" BorderBrush="{x:Null}"  Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"  Cursor="Hand" Click="BtnCancel_Click"/>
+            </Border>
+        </Grid>
+
+    </Grid>
+</Window>

XHPZ.Desktop/MessageWindow.xaml.cs

@@ -0,0 +1,147 @@
+using System.Windows;
+using System.Windows.Input;
+
+namespace XHPZ.Desktop
+{
+    /// <summary>
+    /// MessageWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class MessageWindow : Window
+    {
+        /// <summary>
+        /// 提示框
+        /// </summary>
+        /// <param name="MessageType">取消按钮  1不显示2显示</param>
+        /// <param name="Title">标题</param>
+        /// <param name="content">消息内容</param>
+        public MessageWindow(int MessageType, string Title, string Content)
+        {
+            InitializeComponent();
+            switch (MessageType)
+            {
+                case 1:
+                    borCancel.Visibility = Visibility.Hidden;
+                    break;
+                case 2:
+                    borCancel.Visibility = Visibility.Visible;
+                    break;
+                default:
+                    break;
+            }
+            lblTitle.Content = Title;
+            if (!string.IsNullOrWhiteSpace(Content))
+            {
+                if (Content.Length > 143)
+                {
+                    Content = Content.Substring(0, 140) + "...";
+                }
+                tbkContent.Text = Content;
+            }
+            else
+            {
+                tbkContent.Text = "错误！";
+            }
+        }
+        /// <summary>
+        /// 取消
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnCancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+        }
+        /// <summary>
+        /// 确定
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnOK_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = true;
+        }
+        /// <summary>
+        /// 消息提示框
+        /// </summary>
+        /// <param name="Message">消息</param>
+        /// <returns></returns>
+        public static MessageBoxResult Show(string Message)
+        {
+            string Title = "消息提示";
+            return Show(Message, Title);
+        }
+        /// <summary>
+        /// 消息提示框
+        /// </summary>
+        /// <param name="Message">消息</param>
+        /// <returns></returns>
+        public static MessageBoxResult Show(string Message, string Title)
+        {
+            MessageWindow message = new MessageWindow(1, Title, Message);
+            message.ShowDialog();
+            return MessageBoxResult.Cancel;
+        }
+        /// <summary>
+        /// 消息提示框
+        /// </summary>
+        /// <param name="Title">标题</param>
+        /// <param name="Message">消息</param>
+        /// <returns></returns>
+        public static MessageBoxResult Show(string Message, string Title, MessageBoxButton messageBox)
+        {
+            if (string.IsNullOrWhiteSpace(Title))
+            {
+                Title = "消息提示";
+            }
+            MessageWindow message = new MessageWindow(2, Title, Message);
+            bool? res = message.ShowDialog();
+            if ((bool)res)
+            {
+                if (messageBox == MessageBoxButton.OKCancel)
+                {
+                    return MessageBoxResult.OK;
+                }
+                else
+                {
+                    return MessageBoxResult.Yes;
+                }
+            }
+            else
+            {
+                if (messageBox == MessageBoxButton.OKCancel)
+                {
+                    return MessageBoxResult.Cancel;
+                }
+                else
+                {
+                    return MessageBoxResult.No;
+                }
+            }
+        }
+        private static MessageBoxResult Win32ToMessageBoxResult(int value)
+        {
+            switch (value)
+            {
+                case 1:
+                    return MessageBoxResult.OK;
+                case 2:
+                    return MessageBoxResult.Cancel;
+                case 6:
+                    return MessageBoxResult.Yes;
+                case 7:
+                    return MessageBoxResult.No;
+                default:
+                    return MessageBoxResult.No;
+            }
+        }
+
+        private void Window_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (e.LeftButton == MouseButtonState.Pressed)
+            {
+                //this.DragMove();              
+                DragMove();
+            }
+        }
+    }
+}

XHPZ.Desktop/TQLPen/PenEvents.cs

@@ -0,0 +1,481 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using TQLComm;
+
+namespace XHPZ.Desktop
+{
+    public class PenEvents : PenEvent
+    {
+        int SA = 0;
+        int SB = 0;
+        int SC = 0;
+        int SD = 0;
+        int Sindex = 0;
+
+        int S = 0;
+        int O = 0;
+        int B = 0;
+        int P = 0;
+        public static bool ConnectPen = false;
+        public bool ShowPointLog = false;
+
+        public static bool DrawIngend = true;
+
+        public PenCommManager Manager;
+
+        /// <summary>
+        /// TQL事件初始化，进入类型1录制2录屏
+        /// </summary>
+        /// <param name="type">进入类型1录制2录屏</param>
+        public PenEvents()//(Form1 form)
+        {
+            //this.form = form;
+            Manager = new PenCommManager(this);
+            Manager.Init();
+        }
+
+
+        public void StartRecvDataTimer1()
+        {
+            DrawIngend = false;
+            System.Timers.Timer t = new System.Timers.Timer(1000);
+            t.Elapsed += new System.Timers.ElapsedEventHandler(timerCall);
+            t.AutoReset = false;//设置是执行一次（false）还是一直执行(true)；
+            t.Enabled = true;//是否执行System.Timers.Timer.Elapsed事件；
+        }
+
+        //委托执行的方法
+        private void timerCall(object source, System.Timers.ElapsedEventArgs e)
+        {
+            DrawIngend = true;
+            //MessageBox.Show("ni");
+        }
+
+        public void OnGetOIDType(uint oType)
+        {
+
+        }
+
+        public void OnSetOIDType(bool bSuccess)
+        {
+
+        }
+
+        public void onConfirmReceiveOfflineData(bool bSuccess)
+        {
+        }
+        
+        /// <summary>
+        /// 智能笔连接状态
+        /// </summary>
+        /// <param name="bConnected"></param>
+        public void onConnectionStatus(bool bConnected)
+        {
+            ConnectPen = bConnected;
+            try
+            {
+                if (bConnected)
+                {
+                    APP.TQLPenStatus = true;
+                    //form.AddLog("智能笔已连接！");
+                    //APP.W_XHMicroLessonSystemWindow.UpdateDevStatus();
+                }
+                else
+                {
+                    APP.TQLPenStatus = false;
+                    //form.DisConnect();
+                    //form.AddLog("智能笔已断开连接！");
+                    //APP.W_XHMicroLessonSystemWindow.UpdateDevStatus();
+                }
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        public void onContinueOfflineData(bool bSuccess)
+        {
+
+        }
+        /// <summary>
+        /// 下载离线数据
+        /// </summary>
+        /// <param name="bEnd"></param>
+        public void onEndOfDownloadOfflineData(bool bEnd)
+        {
+            if (bEnd)
+            {
+                //if (form.StartDownload) form.StartDownload = false;
+                //form.StartOrStop(form.StartDownload);
+                //form.DrawOffType = -1;
+
+                //form.AddLog("下载离线数据成功！");
+
+                //form.SetProGress(100);
+            }
+            else
+            {
+                //if (!form.StartDownload) form.StartDownload = true;
+                //form.AddLog("下载离线数据失败！");
+            }
+        }
+
+        public void onGetAutoPowerOffTime(short Data)
+        {
+            //if (form.PenAttribute != null) form.PenAttribute.SetoffTextString(Data.ToString());
+            //form.AddLog("当前自动休眠时间:" + Data.ToString() + "!");
+        }
+
+        public void onGetAutoPowerOnMode(bool bSetOn)
+        {
+            //if (form.PenAttribute != null) form.PenAttribute.SetSevseepComBox(bSetOn);
+            //form.AddLog("当前唤醒模式笔尖压力是否唤醒:" + bSetOn.ToString() + "!");
+        }
+
+        public void onGetBatteryPower(short Data)
+        {
+            //if (form.PenAttribute != null) form.PenAttribute.SetBatteryTextString(Data.ToString() + "%");
+            //form.AddLog("当前剩余电量:" + Data.ToString() + "%!");
+        }
+
+        public void onGetBeepStatus(bool bSetOn)
+        {
+            //if (form.PenAttribute != null) form.PenAttribute.SetBeetComBox(bSetOn);
+            //form.AddLog("当前蜂鸣器模式是否响动:" + bSetOn.ToString() + "!");
+        }
+
+        public void onGetCustomerID(uint ID1, uint ID2)
+        {
+
+        }
+
+        public void onGetElementCode(uint OID, uint SID, int Size)
+        {
+
+        }
+
+        public void onGetFWVersion(string strData)
+        {
+            //if (form.PenAttribute != null) form.PenAttribute.SetBTTextString(strData);
+            //form.AddLog("当前蓝牙版本号:" + strData + "!");
+        }
+
+        public void onGetMCUFWVersion(string strData)
+        {
+            //if (form.PenAttribute != null) form.PenAttribute.SetMCUTextString(strData);
+            //form.AddLog("当前MCU版本号:" + strData + "!");
+        }
+
+        public void onGetMacAddress(string macAddress)
+        {
+            //if (form.PenAttribute != null) form.PenAttribute.SetMAcTextString(macAddress);
+            //form.AddLog("当前MAC:" + macAddress + "!");
+        }
+
+        public void onGetOID4ElementCode(int SA, int SB, int SC, int SD, int index)
+        {
+            //if (this.SA != SA || this.SB != SB || this.SC != SC || this.SD != SD || this.Sindex != index)
+            //{
+            //    this.SA = SA; this.SB = SB; this.SC = SC; this.SD = SD; this.Sindex = index;
+            //    form.AddLog("SA:" + SA.ToString() + "," + "SB:" + SB.ToString() + "," + "SC:" + SC.ToString() + "," + "SD:" + SD.ToString() + "," + "index:" + index.ToString());
+            //}
+        }
+
+        public void onGetOfflineDataNo(int Data)
+        {
+            //ConnectPen = true;
+            //form.AddLog("当前离线数据量:" + Data.ToString() + "!");
+            //if (Data == 0 && form.StartDownload == true)
+            //{
+            //    form.StartDownload = false;
+            //    form.StartOrStop(form.StartDownload);
+            //    form.AddLog("下载离线数据成功！");
+            //}
+
+        }
+
+        public void onGetPenColor(short Data)
+        {
+            //if (form.PenAttribute != null) form.PenAttribute.SetLEDComBox(Data);
+            //switch (Data)
+            //{
+            //    case 1:
+            //        form.timing.SetPenColor(Color.Blue);
+            //        break;
+            //    case 2:
+            //        form.timing.SetPenColor(Color.Green);
+            //        break;
+            //    case 3:
+            //        form.timing.SetPenColor(Color.Cyan);
+            //        break;
+            //    case 4:
+            //        form.timing.SetPenColor(Color.Red);
+            //        break;
+            //    case 5:
+            //        form.timing.SetPenColor(Color.Magenta);
+            //        break;
+            //    case 6:
+            //        form.timing.SetPenColor(Color.Yellow);
+            //        break;
+            //    case 7:
+            //        form.timing.SetPenColor(Color.Black);
+            //        break;
+            //    default:
+            //        break;
+            //}
+
+        }
+        /// <summary>
+        /// 获取笔名
+        /// </summary>
+        /// <param name="localName"></param>
+        public void onGetPenLocalName(string localName)
+        {
+            //if (form.PenAttribute != null) form.PenAttribute.SetNameTextString(localName);
+            //form.AddLog("当前笔名:" + localName + "!");
+        }
+
+        public void onGetPressureCalibrationData(uint LData, uint HData)
+        {
+
+        }
+
+        private DateTime ConvertLongToDateTime(long d)
+        {
+            DateTime dtStart = Convert.ToDateTime("1970-1-1");
+            long lTime = long.Parse(d.ToString());
+            TimeSpan toNow = new TimeSpan(lTime);
+            DateTime dtResult = dtStart.AddSeconds(lTime);
+            return dtResult;
+            // return dtResult;
+        }
+
+        public void onGetRTC(long Data)
+        {
+            //DateTime time = ConvertLongToDateTime(Data);
+            //if (form.PenAttribute != null) form.PenAttribute.SetRTCTextString(time.ToString("yyyy-MM-dd HH:mm:ss"));
+            //form.AddLog("当前RTC:" + time.ToString("yyyy-MM-dd HH:mm:ss") + "!");
+        }
+
+        public void onGetSensitivityLevel(short Data)
+        {
+            //ConnectPen = true;
+            //if (form.PenAttribute != null) form.PenAttribute.SetSevComBox(Data);
+            //form.AddLog("当前压力敏感度:" + Data.ToString() + "!");
+        }
+        /// <summary>
+        /// 内存使用量
+        /// </summary>
+        /// <param name="Data"></param>
+        public void onGetUsedMemory(short Data)
+        {
+            //if (form.PenAttribute != null) form.PenAttribute.SetmemTextString(Data.ToString());
+            //form.AddLog("当前使用内存为:" + Data.ToString() + "!");
+        }
+        /// <summary>
+        /// 获取蓝牙适配器连接状态
+        /// </summary>
+        /// <param name="bReady"></param>
+        public void onHIDGetReady(bool bReady)
+        {
+            //if (bReady)
+            //{
+            //    form.AddLog("蓝牙适配器已连接！");
+            //}
+            //else
+            //{
+            //    form.AddLog("蓝牙适配器已断开连接！");
+            //}
+        }
+
+        public void onPauseOfflineData(bool bSuccess)
+        {
+
+        }
+
+        /// <summary>
+        /// 书写点
+        /// </summary>
+        /// <param name="dot"></param>
+        /// <param name="count"></param>
+        public void onReceiveDot(Dot dot, int count)
+        {
+            
+                //录屏模式
+                if (dot.type == DotType.PEN_HOVER)
+                {
+                    return;
+                }
+                else if (dot.type == DotType.PEN_DOWN)
+                {
+                    APP.W_PracticeWindow.TQLDown();
+                }
+                else if (dot.type == DotType.PEN_UP)
+                {
+                    APP.W_PracticeWindow.TQLUp();
+                }
+                else if (dot.type == DotType.PEN_MOVE)
+                {
+                    double CX = (double)dot.x + (double)dot.fx / 100.00;
+                    double CY = (double)dot.y + (double)dot.fy / 100.00;
+                    APP.W_PracticeWindow.TQLPenWrite(CX, CY, dot.force);
+                    //form.AddLog("x:" + (dot.x + dot.fx / 100f).ToString() + ", " + "y:" + (dot.y + dot.fy / 100f).ToString());
+                }
+        }
+        /// <summary>
+        /// 接收脱机数据
+        /// </summary>
+        /// <param name="dot"></param>
+        /// <param name="count"></param>
+        public void onReceiveOfflineData(Dot dot, int count)
+        {
+            //if (form.StartDownload == false)
+            //{
+            //    Manager.StopDownloadOfflineData();
+            //    return;
+            //}
+            //if (this.S != dot.sectionId || this.O != dot.ownerId || this.B != dot.noteId || this.P != dot.pageId)
+            //{
+            //    this.S = dot.sectionId; this.O = dot.ownerId; this.B = dot.noteId; this.P = dot.pageId;
+            //    form.AddLog("Dot_S:" + this.S.ToString() + ", " + "Dot_O:" + this.O.ToString() + ", " + "Dot_B:" + this.B.ToString() + ", " + "Dot_P:" + this.P.ToString());
+            //}
+
+            ///*long unixTimeStamp = (long)(dot.timeLong - 28800000);//1478162177;
+            //System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(2010, 1, 1)); // 当地时区
+            //DateTime dt = startTime.AddMilliseconds(unixTimeStamp);
+            //form.AddLog("OFF:" + dt.ToString("MM/dd HH:mm:ss.fff"));
+            //*/
+
+            ///* DateTime tmp = new System.DateTime(2010, 1, 1);
+            // tmp.AddMilliseconds(dot.timeLong);
+            // form.AddLog("TIME:" + tmp.ToString("MM/dd HH:mm:ss"));*/
+
+            //// form.AddLog("TIME:" + dot.timeLong.ToString());
+
+            //if (DrawingBox.DrawType != 2) DrawingBox.DrawType = 3;
+            //form.Drawing(dot);
+        }
+
+        public void onReceiveOriginalDot(Dot dot, int count)
+        {
+            //form.Drawing(dot);
+        }
+
+        public void onRemoveOfflineData(bool bRemoved)
+        {
+            //if (bRemoved)
+            //{
+
+            //    form.AddLog("删除离线数据成功！");
+            //    form.StartDownload = false;
+            //    form.ContinueDownload = true;
+            //    form.DrawOffType = -1;
+            //}
+            //else form.AddLog("删除离线数据失败！");
+        }
+
+        public void onSetAutoPowerOffTime(bool bsuccess)
+        {
+
+            //if (bsuccess) form.AddLog("设置自动休眠时间成功！");
+            //else form.AddLog("设置自动休眠时间失败！");
+        }
+
+        public void onSetAutoPowerOnMode(bool bsuccess)
+        {
+            //if (bsuccess) form.AddLog("设置笔的唤醒模式成功！");
+            //else form.AddLog("设置笔的唤醒模式失败！");
+        }
+
+        public void onSetBeepStatus(bool bsuccess)
+        {
+            //if (bsuccess) form.AddLog("设置蜂鸣器成功！");
+            //else form.AddLog("设置蜂鸣器失败！");
+        }
+
+        public void onSetCustomerID(bool bsuccess)
+        {
+
+        }
+
+        public void onSetElementCode(bool bSuccess)
+        {
+
+        }
+
+        public void onSetPenColor(bool bsuccess)
+        {
+            //if (Form1.SetColor == false) return;
+            //Form1.SetColor = false;
+            //if (bsuccess) form.AddLog("设置笔LED灯颜色成功！");
+            //else form.AddLog("设置笔LED灯颜色失败！");
+        }
+
+        public void onSetPenLocalName(bool bsuccess)
+        {
+            //if (bsuccess) form.AddLog("设置笔名成功！");
+            //else form.AddLog("设置笔名失败！");
+        }
+
+        public void onSetSensitivityLevel(bool bsuccess)
+        {
+            //if (bsuccess) form.AddLog("设置压力敏感度成功！");
+            //else form.AddLog("设置压力敏感度失败！");
+        }
+
+        public void onStartDownloadOfflineData(bool bStart)
+        {
+
+        }
+
+        public void onStopDownloadOfflineData(bool bStart)
+        {
+
+        }
+
+        public void onWriteRTC(bool bsuccess)
+        {
+            //if (bsuccess)
+            //{
+            //    form.AddLog("设置RTC成功！");
+            //    Manager.GetRTC();
+            //}
+            //else form.AddLog("设置RTC失败！");
+        }
+
+
+        public void DownloadOfflineDataRate(float Rate)
+        {
+            //form.SetProGress(Rate);
+        }
+
+        public void onGetMCUFCode(string strData)
+        {
+            //if (form.PenAttribute != null) form.PenAttribute.SetMcuCodeTextString(strData);
+            //form.AddLog("MCU序列号:" + strData + "!");
+        }
+
+        public void OnGetPenCodeType(uint oType)
+        {
+
+        }
+
+        public void onSetPenHover(byte type)
+        {
+            //if (type == 1)
+            //{
+            //    form.AddLog("设置悬浮打开！");
+            //    form.PenAttribute.SetHoverComBox(0);
+            //}
+            //else if (type == 0)
+            //{
+            //    form.AddLog("设置悬浮关闭！");
+            //    form.PenAttribute.SetHoverComBox(1);
+            //}
+        }
+    }
+}

XHPZ.Desktop/TQLPen/Pentiming.cs

@@ -0,0 +1,125 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using TQLComm;
+
+namespace XHPZ.Desktop
+{
+    public struct PenData
+    {
+        public int PenWidth;
+        public Color PenColor;
+        public Dot dot;
+        public PenData(int PenWidth, Color PenColor, Dot dot)
+        {
+            this.PenWidth = PenWidth;
+            this.PenColor = PenColor;
+            this.dot = new Dot(dot);
+        }
+
+        public PenData(PenData Data)
+        {
+            this.PenWidth = Data.PenWidth;
+            this.PenColor = Data.PenColor;
+            this.dot = new Dot(Data.dot);
+        }
+
+    }
+
+    public class DrawBezierInfo
+    {
+        public float g_x0 = 0, g_x1 = 0, g_x2 = 0, g_x3 = 0;
+        public float g_y0 = 0, g_y1 = 0, g_y2 = 0, g_y3 = 0;
+        public float g_p0 = 0, g_p1 = 0, g_p2 = 0, g_p3 = 0;
+        public float g_vx01 = 0, g_vy01 = 0, g_n_x0 = 0, g_n_y0 = 0;
+        public float g_vx21 = 0, g_vy21 = 0;
+        public float g_norm = 0;
+        public float g_n_x2 = 0, g_n_y2 = 0;
+        public int DrawIndex = 0;
+        public void clear()
+        {
+            g_x0 = 0; g_x1 = 0; g_x2 = 0; g_x3 = 0;
+            g_y0 = 0; g_y1 = 0; g_y2 = 0; g_y3 = 0;
+            g_p0 = 0; g_p1 = 0; g_p2 = 0; g_p3 = 0;
+            g_vx01 = 0; g_vy01 = 0; g_n_x0 = 0; g_n_y0 = 0;
+            g_vx21 = 0; g_vy21 = 0;
+            g_norm = 0;
+            g_n_x2 = 0; g_n_y2 = 0;
+            DrawIndex = 0;
+
+        }
+    }
+
+    public class Pentiming
+    {
+        int Width = 5;
+        int PenWidth = 5;
+        Color PenColor = Color.Black;
+        public ArrayList DotData = new ArrayList();
+
+        //public DrawingBox Drawing = null;
+        public long DrawIndex = 0;
+
+        public DrawBezierInfo BoxBezierInfo = new DrawBezierInfo();
+        public DrawBezierInfo ImageBezierInfo = new DrawBezierInfo();
+
+        //Form1 from = null;
+
+        public Pentiming()//(PictureBox Box, Form1 from)
+        {
+            //this.from = from;
+            //Drawing = new DrawingBox(Box, from);
+        }
+        public void SetPenWidth(int Raio)
+        {
+            this.PenWidth = Width * Raio;
+        }
+
+        public void SetPenColor(Color PenColor)
+        {
+            this.PenColor = PenColor;
+        }
+
+        public void DrawImaging(Dot dot)
+        {
+
+            PenData data = new PenData(this.PenWidth, this.PenColor, dot);
+
+            //from.timed.DotData.Add(data);
+            //if (DrawingBox.DrawType == 2) return;
+            //Drawing.Drawdot(data, ref BoxBezierInfo, ref ImageBezierInfo);
+        }
+
+        public void SetgScale(float gScale)
+        {
+            //Drawing.SetgScale(gScale);
+        }
+
+        //public Image GetImage()
+        //{
+        //    return Drawing.GetImage();
+        //}
+
+        public void Seep(int sp)
+        {
+            //Drawing.Seep(sp);
+        }
+
+        public void clear()
+        {
+
+            DrawIndex = 0;
+            BoxBezierInfo.clear();
+            ImageBezierInfo.clear();
+            DotData.Clear();
+            //Drawing.clear();
+        }
+
+
+    }
+}

XHPZ.Desktop/XHPZ.Desktop.csproj

@@ -43,12 +43,16 @@
   <PropertyGroup>
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>xhpz.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="log4net">
       <HintPath>..\Common\dlls\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />
@@ -69,6 +73,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="TQLPen\PenEvents.cs" />
+    <Compile Include="TQLPen\Pentiming.cs" />
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -78,6 +84,7 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+<<<<<<< HEAD
     <Page Include="PracticeWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -86,6 +93,16 @@
   <ItemGroup>
     <Compile Include="PracticeWindow.xaml.cs">
       <DependentUpon>PracticeWindow.xaml</DependentUpon>
+=======
+    <Page Include="MessageWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MessageWindow.xaml.cs">
+      <DependentUpon>MessageWindow.xaml</DependentUpon>
+>>>>>>> a23bdc84b33a613a7ae65513fd285d36f24a5dd6
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
@@ -127,5 +144,14 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\144.png" />
+    <Resource Include="Images\192.png" />
+    <Resource Include="Images\72.png" />
+    <Resource Include="Images\96.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="xhpz.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>