Pārlūkot izejas kodu

修改获取的最大值测试阈值数组最后一个数值没获取的问题
修改hoppingEN、NormalizeEn & NormalizeCheckEn的位置,配合GT2933_00.FF.01.1C(7C943E1E).bin固件版本的变动做修改

robbin 3 mēneši atpakaļ
vecāks
revīzija
cf564a21c0

+ 2 - 2
app/build.gradle

@@ -7,14 +7,14 @@ android {
         minSdkVersion 18
         targetSdkVersion 28
         versionCode 1
-        versionName "3.0.7"
+        versionName "3.0.8"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     android.applicationVariants.all {
         variant ->
             variant.outputs.all{
                 //此处指定生成的apk文件名
-                outputFileName = "WingCoolAPK_V3.0.7_20250103_debug.apk"
+                outputFileName = "WingCoolAPK_V3.0.8_20250113_debug.apk"
             }
     }
     lintOptions {

+ 3 - 3
app/src/main/java/com/example/administrator/wingcool_gt9_apk/DataAnalysis.java

@@ -769,7 +769,7 @@ public class DataAnalysis extends AppCompatActivity
                     String[] stringMaxValArr = stringMaxVal.split(",");
                     String[] stringMinValArr = stringMinVal.split(",");
 
-                    for (i = 0; i < stringMaxValArr.length - 1; i++){
+                    for (i = 0; i < stringMaxValArr.length; i++){
                         iRawDataMaxVal[i] = Integer.parseInt(stringMaxValArr[i], 10);
                         iRawDataMinVal[i] = Integer.parseInt(stringMinValArr[i], 10);
                     }
@@ -4864,8 +4864,8 @@ public class DataAnalysis extends AppCompatActivity
                         }
 
                         if (byProductType == GT29336) {
-                            mBytes[287] = (byte) ((mBytes[287] & 0xFF) - 4);  // disable hopping [385],0x04
-                            mBytes[1120] = (byte) ((mBytes[1120] & 0xFF) - 3);  // disable NormalizeEn & NormalizeCheckEn [1120],0x03
+                            mBytes[289] = (byte) ((mBytes[289] & 0xFF) - 4);  // disable hopping [289],0x04
+                            mBytes[1128] = (byte) ((mBytes[1128] & 0xFF) - 3);  // disable NormalizeEn & NormalizeCheckEn [1128],0x03
                         } else {
                             //todo
                         }

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

@@ -109,7 +109,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.7_20250103-Debug Version</string>
+    <string name="version">APK Version:v3.0.8_20250113-Debug Version</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>

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

@@ -109,7 +109,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.7_20250103-debug版本</string>
+    <string name="version">APK版本:v3.0.8_20250113-debug版本</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>