Prechádzať zdrojové kódy

把触控配置合到代码里一键下发

robbin 1 rok pred
rodič
commit
f8a4350300

+ 1 - 3
.idea/misc.xml

@@ -29,9 +29,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>

+ 2 - 2
app/build.gradle

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

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

@@ -356,6 +356,10 @@ public class Config extends AppCompatActivity
             0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
     };
 
+    private int Gt9ConfigData[]= {
+            0x53, 0x00, 0x40, 0x80, 0x25, 0x05, 0x3D, 0x00, 0x11, 0xC8, 0x28, 0x0A, 0x6E, 0x50, 0x05, 0x05,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x19, 0x1B, 0x1F, 0x14, 0x12, 0x31, 0xBB, 0xC8, 0xCA, 0x08, 0x07, 0x00, 0x00, 0x00, 0x40, 0x02, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB4, 0xF0, 0x94, 0xC0, 0x82, 0x00, 0x00, 0x00, 0x04, 0x80, 0xF0, 0x00, 0x82, 0xF0, 0x00, 0x82, 0xF0, 0x00, 0x82, 0xF0, 0x00, 0x82, 0xF0, 0x00, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x0A, 0x00, 0x06, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x1B, 0x1A, 0x19, 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x2A, 0x29, 0x28, 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x21, 0x20, 0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x19, 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4A, 0x01
+    };
     Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -3488,7 +3492,8 @@ public class Config extends AppCompatActivity
                     addressL = (byte) 0x4E;
                     iicWrite(addressH, addressL, mBufferData, 3, 1);
                 }
-
+/*
+                //todo
                 if (iChooseVPager == 8) {
 
                     if (byProductType == GT9) {
@@ -3992,6 +3997,19 @@ public class Config extends AppCompatActivity
                         configBuilder.append("01");  //mBytes[185],最后置上1
                     }
                 }
+*/
+
+                //todo
+                for (int i = 0; i < 185; i++) {
+                    String hv = Integer.toHexString(Gt9ConfigData[i] & 0xFF);
+                    if (hv.length() < 2) {
+                        hv = "0" + hv;
+                    }
+                    configBuilder.append(hv + ",");
+                }
+
+                configBuilder.append("01");  //mBytes[185],最后置上1
+
                 //mShow.setText(configBuilder.toString());
 
                 value = configBuilder.toString();

+ 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.3.0_20220324-Release Version</string>
+    <string name="version">APK Version:v2.3.1_20240110-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.3.0_20220324-发布版本</string>
+    <string name="version">APK版本:v2.3.1_20240110-Debug版本</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>