浏览代码

修复OTSSysMgrApp获取图片失败bug

cxs 1 年之前
父节点
当前提交
921c5179ce
共有 2 个文件被更改,包括 11 次插入7 次删除
  1. 5 4
      OTSSysMgrApp/OTSSystemManagerForms.cs
  2. 6 3
      OTSSysMgrApp/XMLOperationClass.cs

+ 5 - 4
OTSSysMgrApp/OTSSystemManagerForms.cs

@@ -273,7 +273,7 @@ namespace OTSSysMgrApp
             }
             }
             try
             try
             {
             {
-                if (!WriteXMLFile(EDSName))
+                if (!WriteXMLFile(EDSName, EDSName))
                 {
                 {
                     log.Error("SaveSelectVersionInfo()--错误日志:请检查HardwareConfig.xml确保Value为值标签!");
                     log.Error("SaveSelectVersionInfo()--错误日志:请检查HardwareConfig.xml确保Value为值标签!");
                 }
                 }
@@ -286,8 +286,9 @@ namespace OTSSysMgrApp
 
 
         private void ReadXMLFile()
         private void ReadXMLFile()
         {
         {
+            string xmlSEMName = string.Empty;
             string xmlEDSName = string.Empty;
             string xmlEDSName = string.Empty;
-            bool result = XMLOperationClass.ReadXMLFile(XMLFileName, ref xmlEDSName);
+            bool result = XMLOperationClass.ReadXMLFile(XMLFileName, ref xmlSEMName, ref xmlEDSName);
             if (result)
             if (result)
             {
             {
                 if (xmlEDSName != "")
                 if (xmlEDSName != "")
@@ -312,11 +313,11 @@ namespace OTSSysMgrApp
                 CmbEDSController.SelectedItem = CmbEDSController.Items[0].ToString();
                 CmbEDSController.SelectedItem = CmbEDSController.Items[0].ToString();
             }
             }
         }
         }
-        private bool WriteXMLFile(string xmlEDSName)
+        private bool WriteXMLFile(string xmlSEMName, string xmlEDSName)
         {
         {
             try
             try
             {
             {
-                return XMLOperationClass.WriteXMLFile(XMLFileName, xmlEDSName);
+                return XMLOperationClass.WriteXMLFile(XMLFileName, xmlSEMName, xmlEDSName);
             }
             }
             catch (Exception)
             catch (Exception)
             {
             {

+ 6 - 3
OTSSysMgrApp/XMLOperationClass.cs

@@ -282,13 +282,15 @@ namespace OTSSysMgrApp
         #endregion
         #endregion
 
 
         #region 写入COTSXMLFileDllExportForCShape
         #region 写入COTSXMLFileDllExportForCShape
-        public static bool WriteXMLFile(string FileName, string EDSName)
+        public static bool WriteXMLFile(string FileName,string SEMName, string EDSName)
         {
         {
             try
             try
             {
             {
+                bool isSuccessSem = false;
                 bool isSuccessEds = false;
                 bool isSuccessEds = false;
+                isSuccessSem = EditXmlInfoWidthPath(FileName, "SemControllerName", "Value", SEMName);
                 isSuccessEds = EditXmlInfoWidthPath(FileName, "EDSName", "Value", EDSName);
                 isSuccessEds = EditXmlInfoWidthPath(FileName, "EDSName", "Value", EDSName);
-                return isSuccessEds;
+                return isSuccessSem && isSuccessEds;
             }
             }
             catch (Exception)
             catch (Exception)
             {
             {
@@ -299,10 +301,11 @@ namespace OTSSysMgrApp
         #endregion
         #endregion
 
 
         #region 读取COTSXMLFileDllExportForCShape
         #region 读取COTSXMLFileDllExportForCShape
-        public static bool ReadXMLFile(string FileName, ref string EDSName)
+        public static bool ReadXMLFile(string FileName,ref string SEMName, ref string EDSName)
         {
         {
             try
             try
             {
             {
+                SEMName = GetXMLReg(FileName, "SemControllerName", "Value");
                 EDSName = GetXMLReg(FileName, "EDSName", "Value");
                 EDSName = GetXMLReg(FileName, "EDSName", "Value");
                 return true;
                 return true;
             }
             }