Browse Source

安卓测试结果获取

callm 4 years ago
parent
commit
fc4abc9d11

+ 1 - 1
UAS_MES_PW/FunctionCode/Make/Make_GetTestFileData.cs

@@ -83,7 +83,7 @@ namespace UAS_MES_NEW.Make
                         LoadCollectedNum();
                         LoadCollectedNum();
                         string ms_prodcode = dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_id='" + oMsid + "'").ToString();
                         string ms_prodcode = dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_id='" + oMsid + "'").ToString();
                         DataTable dt = new DataTable();
                         DataTable dt = new DataTable();
-                        BaseUtil.GetDataFromDevice("GETFILE", WatchPath.Text + " ./" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text);
+                        //BaseUtil.GetDataFromDevice("GETFILE", WatchPath.Text + " ./" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text);
                         string[] files = Directory.GetFiles(Application.StartupPath + "/" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text, "*.csv");
                         string[] files = Directory.GetFiles(Application.StartupPath + "/" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text, "*.csv");
                         BaseUtil.OpenCSVFile(ref dt, files[0]);
                         BaseUtil.OpenCSVFile(ref dt, files[0]);
                         //移除标题行
                         //移除标题行

+ 3 - 3
UAS_MES_PW/PublicMethod/BaseUtil.cs

@@ -1573,7 +1573,7 @@ namespace UAS_MES_NEW.PublicMethod
 
 
                 string strline;
                 string strline;
                 string[] aryline;
                 string[] aryline;
-                StreamReader mysr = new StreamReader(strpath, System.Text.Encoding.Default);
+                StreamReader mysr = new StreamReader(strpath, System.Text.Encoding.UTF8);
 
 
                 while ((strline = mysr.ReadLine()) != null)
                 while ((strline = mysr.ReadLine()) != null)
                 {
                 {
@@ -1595,7 +1595,7 @@ namespace UAS_MES_NEW.PublicMethod
 
 
                     //填充数据并加入到datatable中
                     //填充数据并加入到datatable中
                     mydr = mycsvdt.NewRow();
                     mydr = mycsvdt.NewRow();
-                    for (int i = 0; i < intColCount; i++)
+                    for (int i = 0; i < aryline.Length; i++)
                     {
                     {
                         mydr[i] = aryline[i];
                         mydr[i] = aryline[i];
                     }
                     }
@@ -1607,7 +1607,7 @@ namespace UAS_MES_NEW.PublicMethod
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {
-                Console.WriteLine(ex.Message);
+                Console.WriteLine(ex.Message+ex.StackTrace);
                 return false;
                 return false;
             }
             }
         }
         }