开短路测试结果，用不同颜色标出最大最小值和短路通道

app/src/main/java/com/example/administrator/wingcool_gt9_apk/Config.java

@@ -1741,7 +1741,7 @@ public class Config extends AppCompatActivity
                     ReadCfgHoppingSetting(mBytes);
                     ReadCfgRam(stringCfgArr);
                 } catch (IOException e) {
-                    //editdetail.setText("文件不存在!");
+                    edit_search.setText(getResources().getString(R.string.invalidfile));
                 }
 
                 /*

app/src/main/java/com/example/administrator/wingcool_gt9_apk/DataAnalysis.java

@@ -7,6 +7,7 @@ import android.content.IntentFilter;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.graphics.Color;
 import android.hardware.usb.UsbConstants;
 import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbDeviceConnection;
@@ -509,6 +510,9 @@ public class DataAnalysis extends AppCompatActivity
     private byte[] bypCfgDrv = new byte[42];
     private byte[] bypCfgSen = new byte[30];
 
+    private byte[] bypDrvShortFlag = new byte[44];
+    private byte[] bypSenShortFlag = new byte[72];
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -1225,7 +1229,7 @@ public class DataAnalysis extends AppCompatActivity
 
                                 i++;
 
-                                params.width = 45;
+                                params.width = 42;
                             }
 
 
@@ -1296,7 +1300,13 @@ public class DataAnalysis extends AppCompatActivity
                                     mindata = datatemp[i];
                                 }
 
-                                params.width = 45;
+                                if (datatemp[i] > 10){
+                                    textView.setTextColor(Color.parseColor("#FF0000"));
+                                }
+
+                                i++;
+
+                                params.width = 40;
                             }
 
                             //textView.setMinimumWidth(8);
@@ -1361,7 +1371,15 @@ public class DataAnalysis extends AppCompatActivity
                                     mindata = datatemp[i];
                                 }
 
-                                params.width = 45;
+                                if (datatemp[i] > 30){
+                                    textView.setTextColor(Color.parseColor("#FF0000"));
+                                }else if (datatemp[i] < -30){
+                                    textView.setTextColor(Color.parseColor("#0000FF"));
+                                }
+
+                                i++;
+
+                                params.width = 40;
                             }
 
 
@@ -1389,6 +1407,9 @@ public class DataAnalysis extends AppCompatActivity
                         break;
                     }
 
+                    int imaxdataid = 255;
+                    int imindataid = 255;
+
                     maxdata = 0;
                     mindata = 65535;
                     i = 0;
@@ -1408,12 +1429,17 @@ public class DataAnalysis extends AppCompatActivity
                             //获取最大值
                             if (datatemp[i] > maxdata){
                                 maxdata = datatemp[i];
+                                imaxdataid = i;
+
                             }
                             //获取最小值
                             if (datatemp[i] < mindata){
                                 mindata = datatemp[i];
+                                imindataid = i;
                             }
 
+                            i++;
+
                         }
                     }
                     /*
@@ -1500,6 +1526,49 @@ public class DataAnalysis extends AppCompatActivity
                             stTestLog = getResources().getString(R.string.testng);
                         }
 
+                        i = 0;
+                        //控制行数
+                        for (int row = 0; row < rownum; row++) {
+                            //控制列数
+                            for (int col = 0; col < colnum + 1; col++) {
+
+                                TextView textView = new TextView(mContext);
+                                GridLayout.LayoutParams params = new GridLayout.LayoutParams();
+
+                                if (col == 0)
+                                {
+                                    dv = Integer.toString(row);
+                                }else {
+
+                                    dv = Integer.toString(datatemp[i]);
+
+                                    if ((bypDrvShortFlag[col] == 0x55) || (bypSenShortFlag[row] == 0x55))
+                                    {
+                                        textView.setTextColor(Color.parseColor("#FF0000"));  //红色
+                                    }
+
+                                    if (bTestMaxResult == false)
+                                    {
+                                        if (imaxdataid == i) {  //最大值
+                                            textView.setTextColor(Color.parseColor("#FFFF00"));  //黄色
+                                        }else if (imindataid == i) {  //最小值
+                                            textView.setTextColor(Color.parseColor("#FFFF00"));  //黄色
+                                        }
+
+                                    }
+
+                                    params.width = 42;
+
+                                    i++;
+                                }
+
+                                textView.setText(dv);
+                                textView.setGravity(Gravity.CENTER);
+                                params.setMargins(2,1,2,1);
+                                textGridLayout.addView(textView,params);
+                            }
+                        }
+
                         showFlag = 5;  //stop
                         btn_RawdataShow.setEnabled(true);
                         btn_DiffdataShow.setEnabled(true);
@@ -1939,6 +2008,13 @@ public class DataAnalysis extends AppCompatActivity
 
         boolean bFailed = false;
 
+        for (int i = 0; i < 44; i++) {
+            bypDrvShortFlag[i] = (byte)255;
+        }
+        for (int i = 0; i < 72; i++) {
+            bypSenShortFlag[i] = (byte)255;
+        }
+
         /* step3-1 判断是否有短路 */
         if (0x00 == testResult)
         {
@@ -2024,6 +2100,9 @@ public class DataAnalysis extends AppCompatActivity
                         //AppendMessage(str, MESSAGE_ERR);
                         mHandler.sendEmptyMessage(TEST_DATA_MESSAGE);
                         bFailed = true;
+
+                        bypDrvShortFlag[shortPinNum & 0x7F] = 0x55;
+                        bypDrvShortFlag[j] = 0x55;
                     }
                 }
                 offSet = offSet + 84;
@@ -2060,6 +2139,9 @@ public class DataAnalysis extends AppCompatActivity
 
                         mHandler.sendEmptyMessage(TEST_DATA_MESSAGE);
                         bFailed = true;
+
+                        bypDrvShortFlag[shortPinNum & 0x7F] = 0x55;
+                        bypSenShortFlag[j] = 0x55;
                     }
                 }
             }
@@ -2110,6 +2192,9 @@ public class DataAnalysis extends AppCompatActivity
                         mHandler.sendEmptyMessage(TEST_DATA_MESSAGE);
 
                         bFailed = true;
+
+                        bypSenShortFlag[shortPinNum & 0x7F] = 0x55;
+                        bypSenShortFlag[j] = 0x55;
                     }
                 }
             }
@@ -2182,6 +2267,12 @@ public class DataAnalysis extends AppCompatActivity
                 }
                 mHandler.sendEmptyMessage(TEST_DATA_MESSAGE);
                 bFailed = true;
+
+                if (i < 42) {
+                    bypDrvShortFlag[i] = 0x55;
+                }else{
+                    bypSenShortFlag[i - 42] = 0x55;
+                }
             }
         }
 

app/src/main/res/values-en/strings.xml

@@ -21,6 +21,7 @@
 
     <!-- Activity_config -->
     <string name="chooseconfig">choose config</string>
+    <string name="invalidfile">Invalid filename or file not found</string>
     <string name="cfgaddr">addr</string>
     <string name="nameandformat">please type the name and format of file</string>
     <string name="savefile">Save</string>
@@ -99,7 +100,7 @@
     <string name="companyaddr">Address:Room 2008, Chuangxingda Business Building, No.36 Liuxian 3rd Road, Baoan District, Shenzhen</string>
     <string name="telephonenum">Telephone:186 8896 1937</string>
     <string name="emailaddr">Email:max@wingcool.cn</string>
-    <string name="version">APK Version:v1.1.3_20210922-Release Version</string>
+    <string name="version">APK Version:v1.1.3_20210928-Release Version</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>

app/src/main/res/values/strings.xml

@@ -21,6 +21,7 @@
 
     <!-- Activity_config -->
     <string name="chooseconfig">选择配置文件</string>
+    <string name="invalidfile">无效的文件名或找不到文件</string>
     <string name="cfgaddr">地址</string>
     <string name="nameandformat">请输入文件名及文件格式</string>
     <string name="savefile">保 存</string>
@@ -99,7 +100,7 @@
     <string name="companyaddr">地址：深圳市宝安区留仙三路 36 号创兴达商务大厦 2008 室</string>
     <string name="telephonenum">电话：186 8896 1937</string>
     <string name="emailaddr">邮箱：max@wingcool.cn</string>
-    <string name="version">APK版本：v1.1.3_20210922-发布版本</string>
+    <string name="version">APK版本：v1.1.3_20210928-发布版本</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>