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

注释掉无用代码
# Conflicts:
#	XHWK.WKTool/DAL/DAL_Upload.cs

Common/system/BlackboardNew.cs

@@ -368,6 +368,12 @@ namespace Common.system
                     isFirst = true;
                     try
                     {
+                        if(strokes_page_all.Count<=i)
+                        {
+                            ZBBPage pagetemp = new ZBBPage();
+                            pagetemp.lines.Add(new ZBBPageStep());
+                            strokes_page_all.Add(pagetemp);
+                        }
                         strokes_page_all[i].lines.Last().lines_curr.Add(stroke);
                     }
                     catch (Exception ex)

XHWK.WKTool/DAL/DAL_Upload.cs

@@ -46,6 +46,10 @@ namespace XHWK.WKTool.DAL
                     if (jo["code"].ToString() == "0")
                     {
                         Message = "";
+
+                        Model.ResultVo<Model_ResourceAddTwo> resultObj = JsonHelper.JsonToObj<Model.ResultVo<Model_ResourceAddTwo>>(jo.ToString());
+
+                        APP.ResourceAddTwo = resultObj.obj;
                         //已存在 不允许上传
                         return false;
                         //    if (string.IsNullOrWhiteSpace(jo["obj"].ToString()))
@@ -104,23 +108,21 @@ namespace XHWK.WKTool.DAL
                     if (resultObj.code == 0 && resultObj.obj != null)
                     {
                         APP.ResourceAddTwo = resultObj.obj;
-                        //上报合并成功后 修改为已成功上传。
-                        foreach (Model_WKData Vdata in APP.WKDataList)
-                        {
-                            if (Vdata.VideoList == null)
-                            {
-                                continue;
-                            }
-
-                            foreach (Model_Video videoinfo in Vdata.VideoList)
-                            {
-                                if (videoinfo.FileGuid == FileCode)
-                                {
-                                    videoinfo.IsUpload = true;
-                                    break;
-                                }
-                            }
-                        }
+                        //foreach (Model_WKData Vdata in APP.WKDataList)
+                        //{
+                        //    if (Vdata.VideoList == null)
+                        //    {
+                        //        continue;
+                        //    }
+                        //    foreach (Model_Video videoinfo in Vdata.VideoList)
+                        //    {
+                        //        if (videoinfo.FileGuid == FileCode)
+                        //        {
+                        //            //videoinfo.IsUpload = true;
+                        //            break;
+                        //        }
+                        //    }
+                        //}
                         return true;
                     }
                     else
@@ -373,7 +375,7 @@ namespace XHWK.WKTool.DAL
                         bool isres = ReportFileMerge(APP.UserInfo.Schoolid.ToString() + "/resource", VideoInfo.FileGuid, out ErrMessage);
                         if (isres)
                         {
-                            VideoInfo.IsUpload = true;
+                            //VideoInfo.IsUpload = true;
                             return true;
                         }
                         else
@@ -386,7 +388,7 @@ namespace XHWK.WKTool.DAL
                     {
                         if (string.IsNullOrWhiteSpace(ErrMessage))
                         {
-                            VideoInfo.IsUpload = true;
+                            //VideoInfo.IsUpload = true;
                             return true;
                         }
                         else

XHWK.WKTool/DAL/Interface.cs

@@ -294,6 +294,7 @@ namespace XHWK.WKTool.DAL
             }
             catch (Exception ex)
             {
+                APP.ServerMsg = "网络异常！";
                 LogHelper.WriteErrLog("【调用接口（RegisterController）】错误日志：" + ex.Message, ex);
                 return 1;
             }

XHWK.WKTool/UploadWindow.xaml.cs

@@ -283,6 +283,24 @@ namespace XHWK.WKTool
                     {
                         Dispatcher.Invoke(() =>
                         {
+                            foreach (Model_WKData Vdata in APP.WKDataList)
+                            {
+                                if (Vdata.VideoList == null)
+                                {
+                                    continue;
+                                }
+
+                                foreach (Model_Video videoinfo in Vdata.VideoList)
+                                {
+                                    if (videoinfo.FileGuid == Guid)
+                                    {
+                                        videoinfo.IsUpload = true;
+                                        break;
+                                    }
+                                }
+                            }
+
+
                             btnStart.IsEnabled = true;
                             book_list.IsEnabled = true;
                             cmbTeachingMaterial.IsEnabled = true;