Jelajahi Sumber

修改了测试fail之后不显示rawdata在界面上,避免界面拉长看不到测试结果

robbin 1 bulan lalu
induk
melakukan
bff3aed7f3

+ 2 - 2
app/build.gradle

@@ -7,14 +7,14 @@ android {
         minSdkVersion 18
         targetSdkVersion 28
         versionCode 1
-        versionName "3.0.A"
+        versionName "3.0.B"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     android.applicationVariants.all {
         variant ->
             variant.outputs.all{
                 //此处指定生成的apk文件名
-                outputFileName = "WingCoolAPK_V3.0.A_20250225_debug.apk"
+                outputFileName = "WingCoolAPK_V3.0.B_20250226_debug.apk"
             }
     }
     lintOptions {

+ 13 - 13
app/src/main/java/com/example/administrator/wingcool_gt9_apk/SensorTest.java

@@ -2349,25 +2349,25 @@ public class SensorTest extends AppCompatActivity
                                     //控制列数
                                     for (int col = 0; col < colnum + 1; col++) {
 
-                                        TextView textView = new TextView(mContext);
-                                        GridLayout.LayoutParams params = new GridLayout.LayoutParams();
+                                        //TextView textView = new TextView(mContext);
+                                        //GridLayout.LayoutParams params = new GridLayout.LayoutParams();
 
                                         if (col == 0) {
-                                            dv = Integer.toString(row);
+                                            //dv = Integer.toString(row);
                                         } else {
 
-                                            dv = Integer.toString(datatemp[i]);
+                                            //dv = Integer.toString(datatemp[i]);
 
                                             //if ((bypDrvShortFlag[col - 1] == 0x55) || (bypSenShortFlag[row] == 0x55)) {
                                             //    textView.setTextColor(Color.parseColor("#FF0000"));  //红色
                                             //}
 
                                             if (byOverMaxCount[i] > 2) {  //最大值
-                                                textView.setTextColor(Color.parseColor("#FF0000"));  //红色
+                                                //textView.setTextColor(Color.parseColor("#FF0000"));  //红色
                                                 strSaveRawDataTestFlagArray += Integer.toString(0xFF) + ",";
                                             }
                                             else if (byLessMinCount[i] > 2) {  //最小值
-                                                textView.setTextColor(Color.parseColor("#FFFF00"));  //黄色
+                                                //textView.setTextColor(Color.parseColor("#FFFF00"));  //黄色
                                                 strSaveRawDataTestFlagArray += Integer.toString(0xFF) + ",";
                                             }
                                             else
@@ -2375,16 +2375,16 @@ public class SensorTest extends AppCompatActivity
                                                 strSaveRawDataTestFlagArray += Integer.toString(0 & 0xFF) + ",";
                                             }
 
-                                            params.width = 50;
+                                            //params.width = 50;
 
                                             i++;
                                         }
-                                        if (bTestMaxResult == false || bTestMinResult == false) {
-                                            textView.setText(dv);
-                                            textView.setGravity(Gravity.CENTER);
-                                            params.setMargins(2, 1, 2, 1);
-                                            textGridLayout.addView(textView, params);
-                                        }
+                                        //if (bTestMaxResult == false || bTestMinResult == false) {
+                                        //    textView.setText(dv);
+                                        //    textView.setGravity(Gravity.CENTER);
+                                        //    params.setMargins(2, 1, 2, 1);
+                                        //    textGridLayout.addView(textView, params);
+                                        //}
                                     }
                                     strSaveRawDataTestFlagArray += "\n";
                                 }

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

@@ -110,7 +110,7 @@
     <string name="companyaddr">Address:Room 2006, Chuangxingda Business Building, No.36 Liuxian 3rd Road, Baoan District, Shenzhen</string>
     <string name="telephonenum">Telephone:186 8896 1937</string>
     <string name="emailaddr">Email:robbin@wingcool.cn</string>
-    <string name="version">APK Version:v3.0.A_20250225-Debug Version</string>
+    <string name="version">APK Version:v3.0.B_20250226-Debug Version</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -110,7 +110,7 @@
     <string name="companyaddr">地址:深圳市宝安区留仙三路 36 号创兴达商务大厦 2006 室</string>
     <string name="telephonenum">电话:186 8896 1937</string>
     <string name="emailaddr">邮箱:robbin@wingcool.cn</string>
-    <string name="version">APK版本:v3.0.A_20250225-debug版本</string>
+    <string name="version">APK版本:v3.0.B_20250226-debug版本</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>