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

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -4850,10 +4850,10 @@ namespace XHWK.WKTool
         //int pageData = 0;
 
         bool AreSynchronized = false;
-        //Dictionary<string, drawFormForA4> fa4dic = new Dictionary<string, drawFormForA4>();
-        //drawFormForA4 dfa4_sync;
-        //string[] szSubjectArray = new string[21] { "未选", "语文", "数学", "英语", "物理", "化学", "生物", "历史", "地理", "政治", "自然", "科一", "科二", "科三", "科四", "科五", "科六", "科七", "科八", "科九", "科十" };
-
+        /// <summary>
+        /// 笔模式
+        /// </summary>
+        bool IsPen = false;
         #endregion
 
         #region 罗博智慧笔
@@ -4863,14 +4863,72 @@ namespace XHWK.WKTool
         /// </summary>
         private void deviceHand()
         {
-            robotpenController.GetInstance().setDeviceMode(eDeviceMode.DEVICE_HAND);
+            if (deviceType == eDeviceType.T8B_D2 || deviceType == eDeviceType.T8Y || deviceType == eDeviceType.T8S_LQ)
+            {
+                robotpenController.GetInstance().setDeviceMode(eDeviceMode.DEVICE_HAND);
+            }
+            else
+            {
+                IsPen = true;
+                //获取当前设备模式，根据模式切换鼠标和笔
+                robotpenController.GetInstance()._Send(cmdId.SearchMode);
+            }
         }
         /// <summary>
         /// 鼠标模式
         /// </summary>
         private void deviceMouse()
         {
-            robotpenController.GetInstance().setDeviceMode(eDeviceMode.DEVICE_MOUSE);
+            if (deviceType == eDeviceType.T8B_D2 || deviceType == eDeviceType.T8Y || deviceType == eDeviceType.T8S_LQ)
+            {
+                robotpenController.GetInstance().setDeviceMode(eDeviceMode.DEVICE_MOUSE);
+            }
+            else
+            {
+                IsPen = false;
+                //获取当前设备模式，根据模式切换鼠标和笔
+                robotpenController.GetInstance()._Send(cmdId.SearchMode);
+            }
+        }
+
+        private void Form1_searchModeEvt(int modeType)
+        {
+            if (modeType == 1)
+            {
+                //当前为笔模式时  切换回鼠标模式
+                if(!IsPen)
+                {
+                    robotpenController.GetInstance()._Send(cmdId.SwitchMode);
+                }
+            }
+            else
+            {
+                //当前为鼠标模式 切换为笔模式
+                if(isOpen)
+                {
+                    robotpenController.GetInstance()._Send(cmdId.SwitchMode);
+                }
+            }
+        }
+
+        private void Form1_switchModeEvt(int modeType)
+        {
+            if (modeType == 1)
+            {
+                //当前为笔模式时  切换回鼠标模式
+                if (!IsPen)
+                {
+                    robotpenController.GetInstance()._Send(cmdId.SwitchMode);
+                }
+            }
+            else
+            {
+                //当前为鼠标模式 切换为笔模式
+                if (isOpen)
+                {
+                    robotpenController.GetInstance()._Send(cmdId.SwitchMode);
+                }
+            }
         }
         //初始化笔服务
         private void InitlbPen()
@@ -4880,10 +4938,11 @@ 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().switchModeEvt += Form1_switchModeEvt;
                 //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);
@@ -4930,8 +4989,10 @@ namespace XHWK.WKTool
         {
             //throw new NotImplementedException();
             //Console.WriteLine();
-
-            LogHelper.WriteInfoLog(string.Format("设备状态{0} PID = {1}", bStatus, uPid));
+            if (APP.IsOutputInfoLog)
+            {
+                LogHelper.WriteInfoLog(string.Format("设备状态{0} PID = {1}", bStatus, uPid));
+            }
             SetListView();
         }