对接罗博智写板T8C

XHWK.WKTool/App.config

@@ -9,8 +9,8 @@
     <!--参数是否加密 0不加密 1加密-->
     <add key="IsParameterEncryption" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="97" />
-    <add key="VersionName" value="3.1.3" />
+    <add key="VersionCode" value="98" />
+    <add key="VersionName" value="3.1.4" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -566,6 +566,7 @@ namespace XHWK.WKTool
         /// </param>
         private void BtnAdd_Click(object sender, RoutedEventArgs e)
         {
+            lb_device_hand();
             Record();
             if (APP.PageContextData.currpage > 0)
             {
@@ -2656,6 +2657,7 @@ namespace XHWK.WKTool
         /// </param>
         private void BtnScreenRecording_Click(object sender, RoutedEventArgs e)
         {
+            lb_device_mouse();
             ThreadPool.QueueUserWorkItem(o =>
             {
                 bool microphoneGood = ZAudioRecordHelper.IsDeviceGood(ZAudioRecordHelper.RecordType.microphone);
@@ -2961,7 +2963,7 @@ namespace XHWK.WKTool
                     EndRecord();
                 }))).Start();
                 //鼠标模式
-                deviceMouse();
+                lb_device_mouse();
             }
         }
 
@@ -2980,7 +2982,7 @@ namespace XHWK.WKTool
         private void StartRecord()
         {
             //电子版切换笔模式
-            deviceHand();
+            lb_device_hand();
 
             VideoInfo = new Model_Video
             {
@@ -3670,62 +3672,9 @@ namespace XHWK.WKTool
             }
             else
             {
-                //labPenSerial.Text = penSerial;
-                //labPenStatus.Text = "PenDown";
+
                 isPenDown = true;
 
-                //Dispatcher.Invoke(new Action(() =>
-                //{
-                //    for (int i = 0; i < APP.PageDrawList.Count; i++)
-                //    {
-                //        if (APP.PageDrawList[i].PageCode == penSerial)
-                //        {
-                //            if (i < APP.pageData.pagenum)
-                //            {
-                //                if (i < APP.pageData.currpage)
-                //                {
-                //                    int num = APP.pageData.currpage - i;
-                //                    APP.pageData.currpage -= num;
-                //                    myblackboard.changepage(APP.pageData.currpage - 1);
-                //                    if (APP.PageDrawList.Count > 0)
-                //                    {
-                //                        if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage <= APP.PageDrawList.Count && APP.pageData.currpage > 0 && !string.IsNullOrWhiteSpace(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath))
-                //                        {
-                //                            //imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));//cs
-
-                //                            imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
-                //                        }
-                //                        else
-                //                        {
-                //                            imgCanvas.Source = null;
-                //                        }
-                //                    }
-                //                }
-                //                else
-                //                {
-                //                    int num = i - APP.pageData.currpage;
-                //                    APP.pageData.currpage += num;
-                //                    myblackboard.changepage(APP.pageData.currpage - 1);
-                //                    if (APP.PageDrawList.Count > 0)
-                //                    {
-                //                        if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage <= APP.PageDrawList.Count && !string.IsNullOrWhiteSpace(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath))
-                //                        {
-                //                            //imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage-1]));
-                //                            imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
-                //                        }
-                //                        else
-                //                        {
-                //                            imgCanvas.Source = null;
-                //                        }
-                //                    }
-                //                }
-                //            }
-                //            return;
-                //        }
-                //    }
-                //    //myblackboard.changepages(0, 0, true);
-                //    //myblackboard.changepaget(0, 0, true, blackboard_canvas);
-                //}));
             }
             //myblackboard.changepages(0, 0, true);
         }
@@ -3882,7 +3831,6 @@ namespace XHWK.WKTool
             }
             else
             {
-                //System.Windows.MessageWindow.Show("存储:" + fillLevel.ToString());
             }
         }
 
@@ -4145,58 +4093,34 @@ namespace XHWK.WKTool
         /// <summary>
         /// 笔模式
         /// </summary>
-        private void deviceHand()
+        private void lb_device_hand()
         {
             IsPen = true;
-            if (APP.IsOutputInfoLog)
-            {
-                LogHelper.WriteInfoLog(string.Format("切换笔模式：设备类型：{0}", deviceType.ToString()));
-            }
             if (deviceType == eDeviceType.T8B_D2 || deviceType == eDeviceType.T8Y || deviceType == eDeviceType.T8S_LQ || deviceType == eDeviceType.T8C)
             {
-                IsT8 = true;
                 robotpenController.GetInstance().setDeviceMode(eDeviceMode.DEVICE_HAND);
-                if (APP.IsOutputInfoLog)
-                {
-                    LogHelper.WriteInfoLog("使用robotpenController.GetInstance().setDeviceMode(eDeviceMode.DEVICE_HAND)切换");
-                }
             }
             else
             {
-                IsT8 = false;
                 //获取当前设备模式，根据模式切换鼠标和笔
                 robotpenController.GetInstance()._Send(cmdId.SearchMode);
-                if (APP.IsOutputInfoLog)
-                {
-                    LogHelper.WriteInfoLog("发送(cmdId.SearchMode)");
-                }
             }
         }
 
         /// <summary>
         /// 鼠标模式
         /// </summary>
-        private void deviceMouse()
+        private void lb_device_mouse()
         {
             IsPen = false;
-            if (deviceType == eDeviceType.T8B_D2 || deviceType == eDeviceType.T8Y || deviceType == eDeviceType.T8S_LQ)
+            if (deviceType == eDeviceType.T8B_D2 || deviceType == eDeviceType.T8Y || deviceType == eDeviceType.T8S_LQ || deviceType == eDeviceType.T8C)
             {
-                IsT8 = true;
                 robotpenController.GetInstance().setDeviceMode(eDeviceMode.DEVICE_MOUSE);
-                if (APP.IsOutputInfoLog)
-                {
-                    LogHelper.WriteInfoLog("使用robotpenController.GetInstance().setDeviceMode(eDeviceMode.DEVICE_MOUSE)切换");
-                }
             }
             else
             {
-                IsT8 = false;
                 //获取当前设备模式，根据模式切换鼠标和笔
                 robotpenController.GetInstance()._Send(cmdId.SearchMode);
-                if (APP.IsOutputInfoLog)
-                {
-                    LogHelper.WriteInfoLog("发送(cmdId.SearchMode)");
-                }
             }
         }
 
@@ -4237,6 +4161,83 @@ namespace XHWK.WKTool
             }
         }
 
+        // 子节点设备状态改变事件
+        private void Form1_nodeStatusEvt(NODE_STATUS ns)
+        {
+            string strStatus = string.Empty;
+            switch (ns)
+            {
+                case NODE_STATUS.DEVICE_POWER_OFF:
+                    {
+                        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 Form1_switchModeEvt(int modeType)
         {
             if (modeType == 1)
@@ -4247,7 +4248,7 @@ namespace XHWK.WKTool
                 }
                 if (!IsPen)
                 {
-                    deviceMouse();
+                    lb_device_mouse();
                 }
             }
             else
@@ -4258,7 +4259,7 @@ namespace XHWK.WKTool
                 }
                 if (IsPen)
                 {
-                    deviceHand();
+                    lb_device_hand();
                 }
             }
         }
@@ -4271,6 +4272,7 @@ namespace XHWK.WKTool
                 robotpenController.GetInstance()._ConnectInitialize(eDeviceType.Gateway, IntPtr.Zero);
                 robotpenController.GetInstance().deviceChangeEvt += new robotpenController.DeviceChange(Form1_deviceChangeEvt);
                 robotpenController.GetInstance().searchModeEvt += Form1_searchModeEvt;
+                robotpenController.GetInstance().nodeStatusEvt += Form1_nodeStatusEvt;
                 robotpenController.GetInstance().switchModeEvt += Form1_switchModeEvt;
 
                 //// 所有设备均注册该页码显示消息 目前只有T9设备才会有页码识别功能, 客户代码可以根据设备来判断是否消费该事件
@@ -4291,17 +4293,7 @@ namespace XHWK.WKTool
             }
         }
 
-        /// <summary>
-        /// 委托实例函数，用于异步修改listview显示的USB连接设备信息
-        /// </summary>
-        private void SetListView()
-        {
-            if (usbIsConnected)
-            {
-                robotpenController.GetInstance()._CloseConnect();
-            }
-            CheckUsbConnect();
-        }
+   
 
         /// <summary>
         /// 设备插拔消息，更新listview
@@ -4313,7 +4305,7 @@ namespace XHWK.WKTool
         private void Form1_deviceChangeEvt(bool bStatus, ushort uPid)
         {
             //throw new NotImplementedException();
-            //Console.WriteLine();
+            Console.WriteLine("Form1_deviceChangeEvt");
             try
             {
                 if (APP.IsOutputInfoLog)
@@ -4324,7 +4316,6 @@ namespace XHWK.WKTool
             catch (Exception)
             {
             }
-            //SetListView();
             CheckUsbConnect();
         }
 
@@ -4506,10 +4497,12 @@ namespace XHWK.WKTool
                             new Thread(new ThreadStart(new Action(() =>
                             {
                                 Thread.Sleep(500);
-
+                               
                                 robotpenController.GetInstance()._Send(cmdId.SearchMode);
                             }))).Start();
                         }
+
+                      
                     }
                 }
             }
@@ -5823,58 +5816,6 @@ namespace XHWK.WKTool
                     return;
                 });
             }
-
-            #region 拓思德生成点阵文件
-
-            ////TPF文件位置
-            //string TPFPath = FileToolsCommon.GetFileAbsolutePath("temp/");
-            //FileToolsCommon.CreateDirectory(TPFPath);
-            //TPFPath += "101.TPF";
-            ////生成点阵文件
-            //LatticeFileHelper.GeneratingPDF(SourcePath, TPFPath, out int pr, out string msg, out string outPut/*, pyte*/);
-            //while (!FileToolsCommon.IsExistFile(TPFPath))
-            //{
-            //    Thread.Sleep(100);
-            //}
-            //while (string.IsNullOrWhiteSpace(pr.ToString()))
-            //{
-            //    Thread.Sleep(100);
-            //}
-            //Thread.Sleep(1000);
-
-            #endregion 拓思德生成点阵文件
-
-            #region 拓思德打印
-
-            ////打印
-            //LatticeFileHelper.PrinterTPFFile(TPFPath, PrinterNum, PrinterName, out int printResult, out string standardError, out string standardOutput);
-            //if (printResult == 0)
-            //{
-            //    Dispatcher.Invoke(() =>
-            //    {
-            //        btnClose.IsEnabled = true;
-            //        btnPrint.IsEnabled = true;
-            //        num = 99;
-            //        timesPrint.Stop();
-            //        pgbProcess.Value = 100;
-            //        lbProcess.Content = "100%";
-            //        MessageWindow.Show("打印成功！");
-            //        GridPrintMask.Visibility = Visibility.Collapsed;
-            //    });
-            //}
-            //else
-            //{
-            //    Dispatcher.Invoke(() =>
-            //    {
-            //        btnClose.IsEnabled = true;
-            //        btnPrint.IsEnabled = true;
-            //        timesPrint.Stop();
-            //        GridPrintMask.Visibility = Visibility.Collapsed;
-            //        MessageWindow.Show(standardError);
-            //    });
-            //}
-
-            #endregion 拓思德打印
         }
 
         /// <summary>

XHWK.WKTool/XHWK.WKTool.csproj

@@ -152,7 +152,7 @@
     <Reference Include="O2S.Components.PDFRender4NET">
       <HintPath>..\DLL\O2S.Components.PDFRender4NET.dll</HintPath>
     </Reference>
-    <Reference Include="RobotpenGateway, Version=1.1.6.1, Culture=neutral, processorArchitecture=x86">
+    <Reference Include="RobotpenGateway, Version=1.1.6.2, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\DLL\Robot\RobotpenGateway.dll</HintPath>
     </Reference>

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

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