新增 10秒一次心跳。 新增 页面切换关闭其他页面。

XHZB.Desktop/AttendanceWindow.xaml.cs

@@ -86,7 +86,7 @@ namespace XHZB.Desktop
                 pageData.menuList.Clear();
             }
 
-            //ToolbarWindow.IsOpenAttendanceWindow = false;
+            ToolbarWindow.IsOpenAttendanceWindow = false;
             Hide();
             FreeMemoryHelper.ReallocateMemory();
             System.Threading.Thread.Sleep(0);

XHZB.Desktop/RollCallWindow.xaml.cs

@@ -616,10 +616,6 @@ namespace XHZB.Desktop
         private void btnDown_Click(object sender, RoutedEventArgs e)
         {
             WSocketClient.getInstance().SendMessage(SocketMsgManger.RushToAnswerEndMsg());
-
-
-
-
             //ToolbarWindow.IsNotOperation = false;
             APP.myloading.Show();
             new Thread(o =>
@@ -630,26 +626,14 @@ namespace XHZB.Desktop
                 useridsss = string.Empty;
                 isRollCall = false;
                 isRushToAnswer = false;
-                APP.RollCallList = new System.Collections.Generic.List<Model.RollCallModel>();
-                //string msg = ZSocketMsgManger.qiangdaEnd();
-                //ZSocketServer.getInstance().SendMessage(msg);
-                //ZSqliteManger.insertClassAction(new ClassAction()
-                //{
-                //    unix = DataProvider.TimestampTotalSeconds(),
-                //    roomid = ZCommonData.roomid,
-                //    type = 403,
-                //    json = msg,
-                //    askid = ZCommonData.askid
-                //});
-
+                APP.RollCallList = new List<Model.RollCallModel>();
                 Dispatcher.Invoke(new Action(() =>
                 {
-                    //ToolbarWindow.IsOpenRollCallWindow = false;
+                    ToolbarWindow.IsOpenRollCallWindow = false;
                     APP.myloading.Hide();
                     Hide();
                 }));
             }).Start();
-
         }
 
         /// <summary>
@@ -660,9 +644,6 @@ namespace XHZB.Desktop
         private void btnAnswer_Click(object sender, RoutedEventArgs e)
         {
             WSocketClient.getInstance().SendMessage(SocketMsgManger.RushToAnswerMsg());
-
-
-
             if (!IsRandomRollCallButton)
             {
                 returnNum = 0;
@@ -912,7 +893,7 @@ namespace XHZB.Desktop
         {
             //ToolbarWindow.IsNotOperation = false;
             click_closeClick();
-            //ZSocketServer.getInstance().removedWin(this);
+            WSocketClient.getInstance().removedWin(this);
         }
 
         #region 关闭委托

XHZB.Desktop/ToolbarWindow.xaml.cs

@@ -45,6 +45,20 @@ namespace XHZB.Desktop
         /// </summary>
         private bool heibanshow = false;
         private bool isTool = true;
+        #region 当前已打开页面
+        /// <summary>
+        /// 是否已打开个人空间
+        /// </summary>
+        public static bool IsOpenUserCenterWindow = false;
+        /// <summary>
+        /// 是否已打开课堂点名
+        /// </summary>
+        public static bool IsOpenRollCallWindow = false;
+        /// <summary>
+        /// 是否已打开考勤页面
+        /// </summary>
+        public static bool IsOpenAttendanceWindow = false;
+        #endregion 当前已打开页面
         #endregion
 
         #region 初始化
@@ -121,9 +135,23 @@ namespace XHZB.Desktop
             ToolbarMenu item = pageData.menuList[clickindex];
             if (clickindex == 0)//个人空间
             {
+                #region 关闭冲突页面
+                if (IsOpenUserCenterWindow)
+                {
+                    if (APP.W_UserCenterWindow != null && !APP.W_UserCenterWindow.IsFocused)
+                    {
+                        APP.W_UserCenterWindow.Focus();
+                    }
+                    return;
+                }
+                else
+                {
+                    CloseOrHideWindowPage();
+                }
+                #endregion 关闭冲突页面
                 try
                 {
-                    //HideLevel2();
+                    HideLevel2();
                     if (APP.W_UserCenterWindow != null && !APP.W_UserCenterWindow.IsFocused)
                     {
                         APP.W_UserCenterWindow.Focus();
@@ -134,23 +162,22 @@ namespace XHZB.Desktop
                         APP.W_UserCenterWindow.Show();
                         APP.W_UserCenterWindow.Closed += UserCenterWindow_Closed;
                     }
-                    //IsOpenUserCenterWindow = true;
+                    IsOpenUserCenterWindow = true;
                 }
                 catch (Exception ex)
                 {
-                    //IsOpenUserCenterWindow = false;
-                    //userCenterWindow = null;
+                    IsOpenUserCenterWindow = false;
+                    APP.W_UserCenterWindow = null;
                     LogHelper.WriteErrLog("【个人空间（toolbar_item_Click）" + ex.Message, ex);
                 }
             }
             else if (clickindex == 1)//直播
             {
-                //HideLevel2();
+                HideLevel2();
                 pageData.tongping = !pageData.tongping;
                 if (pageData.tongping&& isTool)
                 {
                     isTool = false;
-                    //tongpingBegin();
                     if (StartLive(out string ErrMessage))
                     {
                         pageData.menuList[1].Pic = "../Images/ToolBar/img_shared_1.gif";
@@ -171,36 +198,29 @@ namespace XHZB.Desktop
                         MessageWindow.Show(ErrMessage);
                     }
                 }
-                //else
-                //{
-                //    EndLive();
-                //    pageData.menuList[1].Pic = "../Images/ToolBar/直播@2x.png";
-                //    pageData.menuList[1].Name = "直播";
-                //    APP.W_CameraWindow.Hide();
-                //}
             }
             else if (clickindex == 2)//抢答点名
             {
-                //HideLevel2();
+                HideLevel2();
                 try
                 {
-                    //#region 关闭冲突页面
+                    #region 关闭冲突页面
 
-                    //if (IsOpenRollCallWindow)
-                    //{
-                    //    return;
-                    //}
-                    //else
-                    //{
-                    //    CloseOrHideWindowPage();
-                    //}
+                    if (IsOpenRollCallWindow)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        CloseOrHideWindowPage();
+                    }
 
-                    //#endregion 关闭冲突页面
+                    #endregion 关闭冲突页面
 
                     if (APP.W_RollCallWindow == null)
                     {
                         APP.W_RollCallWindow = new RollCallWindow();
-                        //APP.W_RollCallWindow.click_closeClick += RollCallWindow_click_closeClick;
+                        APP.W_RollCallWindow.click_closeClick += RollCallWindow_click_closeClick;
                     }
                     else
                     {
@@ -208,13 +228,13 @@ namespace XHZB.Desktop
                     }
                     APP.W_RollCallWindow.Owner = this;
                     //ZSocketServer.getInstance().addWin(rollCallWindow);
-                    //IsOpenRollCallWindow = true;
+                    IsOpenRollCallWindow = true;
                     APP.W_RollCallWindow.Show();
                 }
                 catch (Exception ex)
                 {
-                    //IsOpenRollCallWindow = false;
-                    //rollCallWindow = null;
+                    IsOpenRollCallWindow = false;
+                    APP.W_RollCallWindow = null;
                     LogHelper.WriteErrLog("【抢答点名（toolbar_item_Click）" + ex.Message, ex);
                 }
             }
@@ -228,16 +248,6 @@ namespace XHZB.Desktop
                         heiban_btn,
                         pizhu_btn
                     };
-                    //if (tangceshow)
-                    //{
-                    //    tangceshow = !tangceshow;
-                    //    List<DependencyObject> lists = new List<DependencyObject>
-                    //    {
-                    //        import_word_btn,
-                    //        jietu_btn
-                    //    };
-                    //    hideOrShow(tangceshow, tangceTool, lists);
-                    //}
                     hideOrShow(heibanshow, ketangTool, list);
                 }
                 catch (Exception ex)
@@ -247,7 +257,7 @@ namespace XHZB.Desktop
             }
             else if (clickindex == 4)//本节考勤
             {
-                //HideLevel2();
+                HideLevel2();
                 try
                 {
                     showKaoqin();
@@ -273,34 +283,43 @@ namespace XHZB.Desktop
         private void UserCenterWindow_Closed(object sender, EventArgs e)
         {
             APP.W_UserCenterWindow = null;
-            //IsOpenUserCenterWindow = false;
+            IsOpenUserCenterWindow = false;
+        }
+        /// <summary>
+        /// 课堂点名关闭
+        /// </summary>
+        private void RollCallWindow_click_closeClick()
+        {
+            IsOpenRollCallWindow = false;
+            APP.W_RollCallWindow = null;
+        }
+        /// <summary>
+        /// 考勤关闭
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void AttendanceWindow_Closed(object sender, EventArgs e)
+        {
+            IsOpenAttendanceWindow = false;
+            APP.W_AttendanceWindow = null;
         }
         /// <summary>
         /// 考勤
         /// </summary>
         private void showKaoqin()
         {
-            //if (
-            //        attendanceWindow != null &&
-            //        !attendanceWindow.IsFocused
-            //        )
-            //{
-            //    attendanceWindow.Focus();
-            //}
-            //else
-            //{
             try
             {
                 #region 关闭冲突页面
 
-                //if (IsOpenAttendanceWindow)
-                //{
-                //    return;
-                //}
-                //else
-                //{
-                //    CloseOrHideWindowPage();
-                //}
+                if (IsOpenAttendanceWindow)
+                {
+                    return;
+                }
+                else
+                {
+                    CloseOrHideWindowPage();
+                }
 
                 #endregion 关闭冲突页面
 
@@ -310,19 +329,19 @@ namespace XHZB.Desktop
                     {
                         Owner = this
                     };
-                    //APP.W_AttendanceWindow.Closed += AttendanceWindow_Closed;
+                    APP.W_AttendanceWindow.Closed += AttendanceWindow_Closed;
                 }
                 else
                 {
-                    //APP.W_AttendanceWindow.Initialize();
+                    APP.W_AttendanceWindow.Initialize();
                 }
-                //IsOpenAttendanceWindow = true;
+                IsOpenAttendanceWindow = true;
                 APP.W_AttendanceWindow.Show();
             }
             catch (Exception ex)
             {
-                //IsOpenAttendanceWindow = false;
-                //attendanceWindow = null;
+                IsOpenAttendanceWindow = false;
+                APP.W_AttendanceWindow = null;
                 LogHelper.WriteErrLog("【考勤（toolbar_item_Click）" + ex.Message, ex);
             }
             //}
@@ -339,9 +358,7 @@ namespace XHZB.Desktop
                 heibanshow = !heibanshow;
 
                 #region 关闭冲突页面
-
-                //CloseOrHideWindowPage();
-
+                CloseOrHideWindowPage();
                 #endregion 关闭冲突页面
 
                 List<DependencyObject> list = new List<DependencyObject>
@@ -693,18 +710,10 @@ namespace XHZB.Desktop
             if (txbName.Visibility == Visibility.Visible)
             {
                 txbName.Visibility = Visibility.Collapsed;
-                //if ("正在共享".Equals(pageData.menuList[1].Name))
-                //{
-                //    gridAnimated.Visibility = Visibility.Collapsed;
-                //}
             }
             else
             {
                 txbName.Visibility = Visibility.Visible;
-                //if("正在共享".Equals(pageData.menuList[1].Name))
-                //{
-                //    gridAnimated.Visibility = Visibility.Visible;
-                //}
             }
 
             Storyboard story = new Storyboard();
@@ -712,11 +721,11 @@ namespace XHZB.Desktop
             if (toolShow)
             {
                 da.From = 0;
-                da.To = 670;
+                da.To = 450;
             }
             else
             {
-                da.From = 670;
+                da.From = 450;
                 da.To = 0.0;
             }
 
@@ -767,7 +776,7 @@ namespace XHZB.Desktop
 
         private void Window_MouseLeftButtonDown_1(object sender, MouseButtonEventArgs e)
         {
-
+            time = NumUtil.unixTime();
         }
         private int time = NumUtil.unixTime();
         private void Rectangle_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
@@ -819,7 +828,52 @@ namespace XHZB.Desktop
         {
             WSocketClient.getInstance().StartWsClient();
         }
+        /// <summary>
+        /// 关闭或隐藏页面
+        /// </summary>
+        private void CloseOrHideWindowPage()
+        {
+            if (IsOpenUserCenterWindow)
+            {
+                IsOpenUserCenterWindow = false;
+                APP.W_UserCenterWindow.Close();
+            }
+            if (IsOpenRollCallWindow)
+            {
+                IsOpenRollCallWindow = false;
+                APP.W_RollCallWindow.Hide();
+            }
+            if (IsOpenAttendanceWindow)
+            {
+                IsOpenAttendanceWindow = false;
+                APP.W_AttendanceWindow.Hide();
+            }
+        }
+        /// <summary>
+        /// 隐藏二级菜单
+        /// </summary>
+        private void HideLevel2()
+        {
+            try
+            {
+                if (heibanshow)
+                {
+                    heibanshow = !heibanshow;
+                    List<DependencyObject> lists = new List<DependencyObject>
+                    {
+                        heiban_btn,
+                        pizhu_btn
+                    };
+                    hideOrShow(heibanshow, ketangTool, lists);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【工具栏（ToolbarWindow）" + ex.Message, ex);
+            }
+        }
         #endregion
+
         #region 直播
         /// <summary>
         /// 直播间节点和房号
@@ -870,23 +924,18 @@ namespace XHZB.Desktop
     public class ToolbarModel : NotifyModel
     {
         public ObservableCollection<ToolbarMenu> menuList { get; set; }
-
         internal bool _tongping = false;
-
         public bool tongping
         {
             get => _tongping;
             set { _tongping = value; OnPropertyChanged("tongping"); }
         }
-
         internal bool _IsOpen = true;
-
         public bool IsOpen
         {
             get => _IsOpen;
             set { _IsOpen = value; OnPropertyChanged("IsOpen"); }
         }
-
         public ToolbarModel()
         {
             menuList = new ObservableCollection<ToolbarMenu>();

XHZB.Desktop/UserCenterWindow.xaml.cs

@@ -1,6 +1,4 @@
 using Common.system;
-
-
 using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -12,21 +10,28 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-
-
 using XHZB.Desktop.Utils;
 using XHZB.Model;
 
-
 namespace XHZB.Desktop
 {
     /// <summary>
-    /// 个人空间 LessonPreparationWindow.xaml 的交互逻辑
+    /// 个人空间
     /// </summary>
     public partial class UserCenterWindow : Window, DownloadUtil.DownloadCallback
     {
+        #region 字段
+        /// <summary>
+        /// 接口返回 0 成功 1 失败
+        /// </summary>
         private int serverReturnCode = 0;
+        /// <summary>
+        /// 接口调用
+        /// </summary>
         private readonly RegisterController registerController = new RegisterController();
+        /// <summary>
+        /// 数据源
+        /// </summary>
         internal UserCenterPageData pageData = new UserCenterPageData();
         private bool isInitial = false;
         private Thread thread;
@@ -51,6 +56,9 @@ namespace XHZB.Desktop
         /// 资源分类1音频2视频3图片4文档
         /// </summary>
         private int Resourceclass = 0;
+        #endregion
+
+        #region 初始化
         /// <summary>
         /// 个人空间
         /// </summary>
@@ -84,6 +92,16 @@ namespace XHZB.Desktop
 
             }).Start();
         }
+        #endregion
+
+        #region 方法
+        /// <summary>
+        /// 刷新
+        /// </summary>
+        private void Refresh()
+        {
+            pageData.menuList.Clear();
+        }
         /// <summary>
         /// 教师教材列表服务-调用
         /// </summary>
@@ -134,7 +152,7 @@ namespace XHZB.Desktop
         private object InvokeDirectorListServering()
         {
             APP.DirectorList = null;
-            serverReturnCode = registerController.DirectorList(Lsbid,2,APP.LoginUser.userid);
+            serverReturnCode = registerController.DirectorList(Lsbid, 2, APP.LoginUser.userid);
             return APP.ErrorMessage;
         }
 
@@ -212,7 +230,6 @@ namespace XHZB.Desktop
                 }
             }
         }
-
         private string getSpace(int num)
         {
             string str = "";
@@ -222,7 +239,6 @@ namespace XHZB.Desktop
             }
             return str;
         }
-
         private void zhangjieClick(object sender, RoutedEventArgs e)
         {
             ChapterModel item = ((Button)sender).Tag as ChapterModel;
@@ -437,7 +453,9 @@ namespace XHZB.Desktop
                 this
                 );
         }
+        #endregion
 
+        #region 事件
         /// <summary>
         /// 下载
         /// </summary>
@@ -491,7 +509,6 @@ namespace XHZB.Desktop
                 }
             }
         }
-
         /// <summary>
         /// 打开
         /// </summary>
@@ -555,7 +572,6 @@ namespace XHZB.Desktop
                 }
             }
         }
-
         /// <summary>
         /// 全部
         /// </summary>
@@ -578,7 +594,11 @@ namespace XHZB.Desktop
             btnDoc.Foreground = new SolidColorBrush(Colors.Black);
             APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeResourceMyListServering, InvokeServerResourceMyListCompate);
         }
-
+        /// <summary>
+        /// 窗口关闭
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void Window_Closing(object sender, CancelEventArgs e)
         {
             if (pageData.menuList.Count > 0)
@@ -587,7 +607,6 @@ namespace XHZB.Desktop
                 DataContext = null;
             }
         }
-
         /// <summary>
         /// 音频
         /// </summary>
@@ -610,7 +629,6 @@ namespace XHZB.Desktop
             btnDoc.Foreground = new SolidColorBrush(Colors.Black);
             APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeResourceMyListServering, InvokeServerResourceMyListCompate);
         }
-
         /// <summary>
         /// 视频
         /// </summary>
@@ -633,7 +651,6 @@ namespace XHZB.Desktop
             btnDoc.Foreground = new SolidColorBrush(Colors.Black);
             APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeResourceMyListServering, InvokeServerResourceMyListCompate);
         }
-
         /// <summary>
         /// 图片
         /// </summary>
@@ -656,7 +673,6 @@ namespace XHZB.Desktop
             btnDoc.Foreground = new SolidColorBrush(Colors.Black);
             APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeResourceMyListServering, InvokeServerResourceMyListCompate);
         }
-
         /// <summary>
         /// 文档
         /// </summary>
@@ -679,11 +695,6 @@ namespace XHZB.Desktop
             btnDoc.Foreground = new SolidColorBrush(Colors.White);
             APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeResourceMyListServering, InvokeServerResourceMyListCompate);
         }
-
-        private void Refresh()
-        {
-            pageData.menuList.Clear();
-        }
         /// <summary>
         /// 科目教材选择改变事件
         /// </summary>
@@ -721,7 +732,11 @@ namespace XHZB.Desktop
                 Refresh();
             }
         }
-
+        /// <summary>
+        /// 窗口移动事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void Window_MouseMove(object sender, MouseEventArgs e)
         {
             if (e.LeftButton == MouseButtonState.Pressed)
@@ -730,7 +745,11 @@ namespace XHZB.Desktop
                 DragMove();
             }
         }
-
+        /// <summary>
+        /// 关闭窗口事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void btnDown_Click(object sender, RoutedEventArgs e)
         {
             if (thread != null)
@@ -739,9 +758,12 @@ namespace XHZB.Desktop
             }
             APP.myloading.Hide();
             Close();
-            //ToolbarWindow.IsOpenUserCenterWindow = false;
+            ToolbarWindow.IsOpenUserCenterWindow = false;
         }
-
+        /// <summary>
+        /// 下载
+        /// </summary>
+        /// <param name="position"></param>
         public void downloadBegin(int position)
         {
             isDownloadStatus = true;
@@ -750,7 +772,11 @@ namespace XHZB.Desktop
                 tip_outer.Visibility = Visibility.Visible;
             }
         }
-
+        /// <summary>
+        /// 下载中
+        /// </summary>
+        /// <param name="position"></param>
+        /// <param name="progress"></param>
         public void downloadProgress(int position, int progress)
         {
             if (position >= 9999)
@@ -759,7 +785,11 @@ namespace XHZB.Desktop
                 lbProcess.Content = string.Format("{0}% / {1}%", progress, 100);
             }
         }
-
+        /// <summary>
+        /// 下载完成
+        /// </summary>
+        /// <param name="position"></param>
+        /// <param name="filepath"></param>
         public void downloadEnd(int position, string filepath)
         {
             isDownloadStatus = false;
@@ -839,7 +869,11 @@ namespace XHZB.Desktop
                 }
             }
         }
-
+        /// <summary>
+        /// 下载结束
+        /// </summary>
+        /// <param name="position"></param>
+        /// <param name="msg"></param>
         public void downloadError(int position, string msg)
         {
             Dispatcher.Invoke(new Action(() =>
@@ -851,7 +885,8 @@ namespace XHZB.Desktop
             {
                 MessageWindow.Show(msg);
             }
-        }
+        } 
+        #endregion
 
         public class ButtonBrush
         {

XHZB.Desktop/WebSocket/WSocketClient.cs

@@ -40,6 +40,10 @@ namespace XHZB.Desktop.WebSocket
         /// 检查重连线程
         /// </summary>
         Thread _thread;
+        /// <summary>
+        /// 心跳
+        /// </summary>
+        Thread thread;
         bool _isRunning = true;
         /// <summary>
         /// WebSocket连接地址
@@ -99,6 +103,10 @@ namespace XHZB.Desktop.WebSocket
                 this._isRunning = true;
                 this._thread = new Thread(new ThreadStart(CheckConnection));
                 this._thread.Start();
+
+
+                thread = new Thread(new ThreadStart(Heartbeat));
+                thread.Start();
             }
             catch (Exception ex)
             {
@@ -340,13 +348,36 @@ namespace XHZB.Desktop.WebSocket
             System.Threading.Thread.Sleep(5000);
         } while (this._isRunning);
     }
-    #endregion
+        /// <summary>
+        /// 心跳
+        /// </summary>
+        private void Heartbeat() 
+        {
+            do
+            {
+                try
+                {
+                    if(_webSocket != null && _webSocket.State == WebSocket4Net.WebSocketState.Open)
+                    {
+                        byte[] bt = new byte[] { 01 };
+                        _webSocket.Send(bt, 0, 1);
+                        Console.WriteLine("心跳:" + DateTime.Now.ToString());
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _Logger.Error(ex.ToString());
+                }
+                Thread.Sleep(10000);
+            } while (true);
+        }
+        #endregion
 
-    /// <summary>
-    /// 发送消息
-    /// </summary>
-    /// <param name="Message"></param>
-    public void SendMessage(string Message)
+        /// <summary>
+        /// 发送消息
+        /// </summary>
+        /// <param name="Message"></param>
+        public void SendMessage(string Message)
     {
         Task.Factory.StartNew(() =>
         {