Procházet zdrojové kódy

PID识别到是528时,产品型号选择GT7

robbin před 3 roky
rodič
revize
838cc9cec1

+ 2 - 2
app/build.gradle

@@ -7,14 +7,14 @@ android {
         minSdkVersion 18
         targetSdkVersion 28
         versionCode 1
-        versionName "2.2.0"
+        versionName "2.2.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     android.applicationVariants.all {
         variant ->
             variant.outputs.all{
                 //´Ë´¦Ö¸¶¨Éú³ÉµÄapkÎļþÃû
-                outputFileName = "WingCoolAPK_V2.2.0_20211228.apk"
+                outputFileName = "WingCoolAPK_V2.2.1_20220216.apk"
             }
     }
     lintOptions {

+ 1 - 1
app/src/main/java/com/example/administrator/wingcool_gt9_apk/Config.java

@@ -1977,7 +1977,7 @@ public class Config extends AppCompatActivity
                             mUsbDeviceConnection.claimInterface(mUsbInterface, true);
                             if(null != mUsbEndpointIn){
                                 iProductId = usbDevice.getProductId();
-                                if ((iProductId == 0x0819) || (iProductId == 0x8191))
+                                if ((iProductId == 0x0819) || (iProductId == 0x8191) || (iProductId == 0x0528) )
                                 {
                                     byProductType = GT7;
                                 }

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

@@ -740,7 +740,7 @@ public class DataAnalysis extends AppCompatActivity
                             mUsbDeviceConnection.claimInterface(mUsbInterface, true);
                             if(null != mUsbEndpointIn){
                                 iProductId = usbDevice.getProductId();
-                                if ((iProductId == 0x0819) || (iProductId == 0x8191))
+                                if ((iProductId == 0x0819) || (iProductId == 0x8191) || (iProductId == 0x0528))
                                 {
                                     byProductType = GT7;
                                 }

+ 4 - 1
app/src/main/java/com/example/administrator/wingcool_gt9_apk/FirmwareUpdate.java

@@ -444,7 +444,7 @@ public class FirmwareUpdate extends AppCompatActivity
                             mUsbDeviceConnection.claimInterface(mUsbInterface, true);
                             if(null != mUsbEndpointIn){
                                 iProductId = usbDevice.getProductId();
-                                if ((iProductId == 0x0819) || (iProductId == 0x8191))
+                                if ((iProductId == 0x0819) || (iProductId == 0x8191)||(iProductId == 0x0528))
                                 {
                                     byProductType = GT7;
                                 }else{
@@ -491,6 +491,9 @@ public class FirmwareUpdate extends AppCompatActivity
                     else if (mBytes[0] == 0x37 && mBytes[1] == 0x33 && mBytes[2] == 0x38 && mBytes[3] == 0x38){
                         mShow.setText( "GT7387P_" + mVersionShow[4] + "." + mVersionShow[5] + "." + mVersionShow[6] + "." + mVersionShow[7]);//输出显示
                     }
+                    else if (mBytes[0] == 0x37 && mBytes[1] == 0x33 && mBytes[2] == 0x38 && mBytes[3] == 0x32){
+                        mShow.setText( "GT7382H_" + mVersionShow[4] + "." + mVersionShow[5] + "." + mVersionShow[6] + "." + mVersionShow[7]);//输出显示
+                    }
                     else{
                         mShow.setText( "Null" );//输出显示
                     }

+ 1 - 1
app/src/main/java/com/example/administrator/wingcool_gt9_apk/NoiseAnalysis.java

@@ -163,7 +163,7 @@ public class NoiseAnalysis extends AppCompatActivity implements OpenDevicesRecei
                     //获取噪声数据
                     //if((mUsbEndpointIn != null) || (mUsbEndpointOut != null)) {
                     if (bIsconnected == true){
-                        if ((iProductId == 0x0819) || (iProductId == 0x8191))
+                        if ((iProductId == 0x0819) || (iProductId == 0x8191) || (iProductId == 0x0528))
                         {
                             addressH = (byte) 0xF3;
                             addressL = (byte) 0xB4;

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

@@ -105,7 +105,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:v2.2.1_20220118-Debug Version</string>
+    <string name="version">APK Version:v2.2.1_20220216-Debug Version</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>

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

@@ -105,7 +105,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版本:v2.2.1_20220118-debug版本</string>
+    <string name="version">APK版本:v2.2.1_20220216-debug版本</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>