Переглянути джерело

下发两个USB命令之间的时间间隔延时要加长,避免第一个命令还没响应就被第二命令下发覆盖了

robbin 2 місяців тому
батько
коміт
1f32ceb2dc

+ 2 - 2
app/build.gradle

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

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

@@ -85,7 +85,7 @@ public class DataAnalysis extends AppCompatActivity
     private static final int TEST_DATA_MESSAGE = 7;
     private static final int STYLUS_DATA_MESSAGE = 8;
 
-
+    private static final int NEXT_COMMAND_DELAY_TIME = 150;            //下一个USB命令发送前延时时间
     private static final String USB_ACTION = "com.host2device";
     private static final String ACTION_USB_PERMISSION = "com.host2device.USB_PERMISSION";
     private ExecutorService mThreadPool;
@@ -4315,8 +4315,8 @@ public class DataAnalysis extends AppCompatActivity
     {
         byte addrfirstbyte = (byte)0x01;
         byte addrsecondbyte = (byte)0x01;
-        byte addrthirdbyte = (byte)0x74;;
-        byte msubcommand = (byte)0x04 ;  //最高位置1。写命令4 rst IC
+        byte addrthirdbyte = (byte)0x74;
+        byte msubcommand = (byte)0x04;  //最高位置1。写命令4 rst IC
         byte mdata = (byte)0x00;
 
         Update_log = "";
@@ -4339,12 +4339,12 @@ public class DataAnalysis extends AppCompatActivity
                 //return;
             }
 
-            SystemClock.sleep(30);
+            SystemClock.sleep(NEXT_COMMAND_DELAY_TIME);
 
             msubcommand = (byte)0x11 ;  //最高位置1,写命令17 ENABLE_DIGITER_INTERFACE
             IicWriteOneByte(addrfirstbyte, addrsecondbyte, addrthirdbyte, msubcommand, mdata);
 
-            SystemClock.sleep(10);
+            SystemClock.sleep(NEXT_COMMAND_DELAY_TIME);
 
             msubcommand = (byte)0x2A ;  //最高位置1,写命令42 ENABLE_ESD_CHECK
             IicWriteOneByte(addrfirstbyte, addrsecondbyte, addrthirdbyte, msubcommand, mdata);
@@ -4364,12 +4364,12 @@ public class DataAnalysis extends AppCompatActivity
                 //return;
             }
 
-            SystemClock.sleep(30);
+            SystemClock.sleep(NEXT_COMMAND_DELAY_TIME);
 
             msubcommand = (byte)0x11 ;  //最高位置1,写命令17 ENABLE_DIGITER_INTERFACE
             IicWriteOneByte(addrfirstbyte, addrsecondbyte, addrthirdbyte, msubcommand, mdata);
 
-            SystemClock.sleep(10);
+            SystemClock.sleep(NEXT_COMMAND_DELAY_TIME);
 
             msubcommand = (byte)0x2A ;  //最高位置1,写命令42 ENABLE_ESD_CHECK
             IicWriteOneByte(addrfirstbyte, addrsecondbyte, addrthirdbyte, msubcommand, mdata);
@@ -4388,12 +4388,12 @@ public class DataAnalysis extends AppCompatActivity
                 //return;
             }
 
-            SystemClock.sleep(30);
+            SystemClock.sleep(NEXT_COMMAND_DELAY_TIME);
 
             msubcommand = (byte)0x11 ;  //最高位置1,写命令17 ENABLE_DIGITER_INTERFACE
             IicWriteOneByte(addrfirstbyte, addrsecondbyte, addrthirdbyte, msubcommand, mdata);
 
-            SystemClock.sleep(10);
+            SystemClock.sleep(NEXT_COMMAND_DELAY_TIME);
 
             msubcommand = (byte)0x2A ;  //最高位置1,写命令42 ENABLE_ESD_CHECK
             IicWriteOneByte(addrfirstbyte, addrsecondbyte, addrthirdbyte, msubcommand, mdata);
@@ -4413,12 +4413,12 @@ public class DataAnalysis extends AppCompatActivity
                 //return;
             }
 
-            SystemClock.sleep(30);
+            SystemClock.sleep(NEXT_COMMAND_DELAY_TIME);
 
             msubcommand = (byte)0x11 ;  //最高位置1,写命令17 ENABLE_DIGITER_INTERFACE
             IicWriteOneByte(addrfirstbyte, addrsecondbyte, addrthirdbyte, msubcommand, mdata);
 
-            SystemClock.sleep(10);
+            SystemClock.sleep(NEXT_COMMAND_DELAY_TIME);
 
             msubcommand = (byte)0x2A ;  //最高位置1,写命令42 ENABLE_ESD_CHECK
             IicWriteOneByte(addrfirstbyte, addrsecondbyte, addrthirdbyte, msubcommand, mdata);
@@ -4434,14 +4434,16 @@ public class DataAnalysis extends AppCompatActivity
             mHandler.sendEmptyMessage(TEST_DATA_MESSAGE);
         }
 
-        SystemClock.sleep(30);
+        SystemClock.sleep(NEXT_COMMAND_DELAY_TIME);
 
-        msubcommand = (byte)0x11 ;  //最高位置1,写命令17 ENABLE_DIGITER_INTERFACE
+        msubcommand = (byte)0x11;  //最高位置1,写命令17 ENABLE_DIGITER_INTERFACE
+        mdata = (byte)0x00;
         IicWriteOneByte(addrfirstbyte, addrsecondbyte, addrthirdbyte, msubcommand, mdata);
 
-        SystemClock.sleep(10);
+        SystemClock.sleep(NEXT_COMMAND_DELAY_TIME);
 
-        msubcommand = (byte)0x2A ;  //最高位置1,写命令42 ENABLE_ESD_CHECK
+        msubcommand = (byte)0x2A;  //最高位置1,写命令42 ENABLE_ESD_CHECK
+        mdata = (byte)0x00;
         IicWriteOneByte(addrfirstbyte, addrsecondbyte, addrthirdbyte, msubcommand, mdata);
 
         bSaveShortTestResult = true;
@@ -4821,7 +4823,7 @@ public class DataAnalysis extends AppCompatActivity
                         addrfirstbyte = (byte) 0x01;
                         addrsecondbyte = (byte) 0x01;
                         addrthirdbyte = (byte) 0x74;
-                        ;
+
                         byte msubcommand = (byte) 0x12;  //最高位置1,写命令18 DISABLE_DIGITER_INTERFACE
                         byte mdata = (byte) 0x00;
 
@@ -4829,7 +4831,7 @@ public class DataAnalysis extends AppCompatActivity
                             return;
                         }
 
-                        SystemClock.sleep(10);
+                        SystemClock.sleep(NEXT_COMMAND_DELAY_TIME);
 
                         msubcommand = (byte) 0x2B;  //最高位置1,写命令43 DISABLE_ESD_CHECK
                         mdata = (byte) 0x00;

+ 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.8_20250113-Debug Version</string>
+    <string name="version">APK Version:v3.0.9_20250206-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.8_20250113-debug版本</string>
+    <string name="version">APK版本:v3.0.9_20250206-debug版本</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>