录屏中使用画笔录制无法结束的BUG修复

用户无章节闪退BUG修复

XHWK.WKTool/App.config

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

XHWK.WKTool/UControl/Uc_VideoItem.xaml.cs

@@ -18,22 +18,27 @@ namespace XHWK.WKTool.UControl
     public partial class Uc_VideoItem : UserControl
     {
         #region 初始值
+
         /// <summary>
         /// 视频模型
         /// </summary>
         private Model_Video VideoModel = new Model_Video();
+
         /// <summary>
         /// 刷新视频列表
         /// </summary>
         public delegate void RefreshVideoList();
+
         /// <summary>
         /// 刷新视频列表事件
         /// </summary>
         public event RefreshVideoList Click_refreshVideoList;
+
         /// <summary>
         /// 登录
         /// </summary>
         public delegate void UploadLogin();
+
         /// <summary>
         /// 登录事件
         /// </summary>
@@ -44,9 +49,10 @@ namespace XHWK.WKTool.UControl
         /// </summary>
         private UploadWindow W_UploadWindow = null;
 
-        #endregion
+        #endregion 初始值
 
         #region 初始化
+
         /// <summary>
         /// 视频信息
         /// </summary>
@@ -68,12 +74,13 @@ namespace XHWK.WKTool.UControl
             if (VideoModel.IsUpload)
             {
                 BtnUpload.Visibility = Visibility.Hidden;
-              
             }
         }
-        #endregion
+
+        #endregion 初始化
 
         #region 修改视频名
+
         /// <summary>
         /// 双击修改视频名
         /// </summary>
@@ -89,6 +96,7 @@ namespace XHWK.WKTool.UControl
                 //BtnNameModifyOK.Visibility = Visibility.Visible;
             }
         }
+
         /// <summary>
         /// 失去焦点保存视频名
         /// </summary>
@@ -111,6 +119,7 @@ namespace XHWK.WKTool.UControl
                 ModifyVideoName();
             }
         }
+
         /// <summary>
         /// 修改文件名保存
         /// </summary>
@@ -149,6 +158,7 @@ namespace XHWK.WKTool.UControl
                 //BtnNameModifyOK.Visibility = Visibility.Hidden;
             }
         }
+
         /// <summary>
         /// 修改视频文件名
         /// </summary>
@@ -163,7 +173,6 @@ namespace XHWK.WKTool.UControl
             {
                 if (WKData.VideoList.Exists(x => x.FileGuid == FileGuid))
                 {
-
                     Model_Video model_Video = WKData.VideoList.Find(x => x.FileGuid == FileGuid);
 
                     string filePathName = model_Video.VideoPath;
@@ -201,9 +210,10 @@ namespace XHWK.WKTool.UControl
             return false;
         }
 
-        #endregion
+        #endregion 修改视频名
 
         #region 删除视频
+
         /// <summary>
         /// 删除视频
         /// </summary>
@@ -244,7 +254,8 @@ namespace XHWK.WKTool.UControl
                 }
             }
         }
-        #endregion
+
+        #endregion 删除视频
 
         #region 播放视频
 
@@ -266,6 +277,7 @@ namespace XHWK.WKTool.UControl
                 return;
             }
         }
+
         /// <summary>
         /// 视频播放
         /// </summary>
@@ -288,9 +300,9 @@ namespace XHWK.WKTool.UControl
                 System.Windows.MessageBox.Show(ex.Message);
                 return;
             }
-
         }
-        #endregion
+
+        #endregion 播放视频
 
         /// <summary>
         /// 视频上传
@@ -331,7 +343,6 @@ namespace XHWK.WKTool.UControl
 
                     //long size = Convert.ToInt64(FileToolsCommon.GetFileSizeByMB(pageData.menuList[i].FilePath));
                     W_UploadWindow.Initialize(TbName.Text, VideoModel.VideoSizebyte, VideoModel.VideoType.ToString(), VideoModel.FileGuid, 0);
-                    W_UploadWindow.ShowDialog();
                 }
                 else
                 {
@@ -355,6 +366,7 @@ namespace XHWK.WKTool.UControl
                 BtnUpload.Background.Opacity = 0.6;
             }
         }
+
         /// <summary>
         /// 编辑
         /// </summary>
@@ -372,4 +384,4 @@ namespace XHWK.WKTool.UControl
             }
         }
     }
-}
+}

XHWK.WKTool/UploadWindow.xaml.cs

@@ -99,7 +99,18 @@ namespace XHWK.WKTool
                 }
                 book_list.SelectedIndex = 0;
                 DataContext = pageData;
-                Director();
+
+                if (APP.TsubjectbookList.Count > 0)
+                {
+                    Director();
+                    ShowDialog();
+                }
+                else
+                {
+                    APP.IsUpLoad = false;
+                    Hide();
+                    MessageWindow.Show("暂无章节！");
+                }
             }
             else
             {
@@ -117,32 +128,35 @@ namespace XHWK.WKTool
             {
                 selectIndex = 0;
             }
-            int code = xhapi.DirectorList(APP.TsubjectbookList[selectIndex].Lsbid, 4, APP.UserInfo.Userid);
-            if (code == 0)
+            if (APP.TsubjectbookList.Count > selectIndex)
             {
-                pageData.zhangjieList.Clear();
-                pageData.zhangjieList.Add(new ComboBoxBean()
-                {
-                    Key = "0",
-                    Value = "全部",
-                    leaf = 1
-                });
-                for (int i = 0; i < APP.DirectorList.Count; i++)
+                int code = xhapi.DirectorList(APP.TsubjectbookList[selectIndex].Lsbid, 4, APP.UserInfo.Userid);
+                if (code == 0)
                 {
-                    Model_DirectorList item = APP.DirectorList[i];
+                    pageData.zhangjieList.Clear();
                     pageData.zhangjieList.Add(new ComboBoxBean()
                     {
-                        Key = item.directorid,
-                        Value = item.directorname,
-                        leaf = item.leaf
+                        Key = "0",
+                        Value = "全部",
+                        leaf = 1
                     });
-                    addChild(item);
+                    for (int i = 0; i < APP.DirectorList.Count; i++)
+                    {
+                        Model_DirectorList item = APP.DirectorList[i];
+                        pageData.zhangjieList.Add(new ComboBoxBean()
+                        {
+                            Key = item.directorid,
+                            Value = item.directorname,
+                            leaf = item.leaf
+                        });
+                        addChild(item);
+                    }
+                    cmbTeachingMaterial.SelectedIndex = 0;
+                }
+                else
+                {
+                    MessageWindow.Show(APP.ServerMsg);
                 }
-                cmbTeachingMaterial.SelectedIndex = 0;
-            }
-            else
-            {
-                MessageWindow.Show(APP.ServerMsg);
             }
         }
 
@@ -190,6 +204,7 @@ namespace XHWK.WKTool
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
+            //Tsubjectbook();
         }
 
         private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
@@ -205,7 +220,16 @@ namespace XHWK.WKTool
         /// </param>
         private void toolbar_list_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            Director();
+            if (APP.TsubjectbookList.Count > 0)
+            {
+                Director();
+            }
+            else
+            {
+                MessageWindow.Show("暂无章节！");
+                APP.IsUpLoad = false;
+                Hide();
+            }
         }
 
         private void BtnDown_Click(object sender, RoutedEventArgs e)

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

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