Jelajahi Sumber

根据规则修改,可编译成.aar的版本

robbin 1 tahun lalu
induk
melakukan
ad8fe11ed6

+ 7 - 0
.idea/kotlinc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Kotlin2JsCompilerArguments">
+    <option name="sourceMapEmbedSources" />
+    <option name="sourceMapPrefix" />
+  </component>
+</project>

+ 8 - 2
app/build.gradle

@@ -1,15 +1,20 @@
-apply plugin: 'com.android.application'
+plugins {
+    //id 'com.android.application'
+    id 'com.android.library'
+}
+
 
 android {
     compileSdkVersion 28
     defaultConfig {
-        applicationId "com.example.administrator.wingcool_gt9_apk"
+        //applicationId "com.example.administrator.wingcool_gt9_apk"
         minSdkVersion 18
         targetSdkVersion 28
         versionCode 1
         versionName "3.0.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+    /*
     android.applicationVariants.all {
         variant ->
             variant.outputs.all{
@@ -17,6 +22,7 @@ android {
                 outputFileName = "WingCoolAPK_V3.0.4_20230523_debug.apk"
             }
     }
+    */
     lintOptions {
         checkReleaseBuilds false
         abortOnError false

+ 2 - 8
app/src/main/AndroidManifest.xml

@@ -4,21 +4,15 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        >
         <!-- android:requestLegacyExternalStorage="true"> -->
 
         <activity
             android:name=".GT9MainActivity"
             android:configChanges="locale|layoutDirection|keyboard|orientation|keyboardHidden|screenSize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
         <activity
             android:name=".Config"

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

@@ -3228,7 +3228,7 @@ public class Config extends AppCompatActivity
 
         mShow.setText("");
 
-        switch (v.getId()) {
+        //switch (v.getId()) {
             /*
             case R.id.tvsample:
                 vpagerCfg.setCurrentItem(0);
@@ -3268,6 +3268,7 @@ public class Config extends AppCompatActivity
                 break;
 
              */
+            /*
             case R.id.btnsensorrev:
                 configBuilder.append(edtSensorCH0.getText().toString()+",");
                 configBuilder.append(edtSensorCH1.getText().toString()+",");
@@ -3491,14 +3492,15 @@ public class Config extends AppCompatActivity
                 edtDriverCH35.setText("35");edtDriverCH36.setText("36");edtDriverCH37.setText("37");edtDriverCH38.setText("38");edtDriverCH39.setText("39");
                 edtDriverCH40.setText("40");edtDriverCH41.setText("41");
                 break;
-            case R.id.sendcfg:   //send cfg
+                */
+            if (v.getId() == R.id.sendcfg) {   //send cfg
                 bottonMode = 1;
 
                 stMessageLogShow = "";
 
                 //send 0x00 to [0x10174],清除标志
                 mBytes[0] = 0x00;
-                iicWrite32Bits((byte)0x01, (byte)0x01, (byte)0x74, mBytes,0,1);
+                iicWrite32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 0, 1);
                 SystemClock.sleep(15);
 
                 //send 0x00 0x00 0x04 0x04 0x08 0x00 to [0x10174],通知GT29XX,send cfg
@@ -3508,13 +3510,13 @@ public class Config extends AppCompatActivity
                 mBytes[3] = 0x04;
                 mBytes[4] = 0x08;
                 mBytes[5] = 0x00;
-                iicWrite32Bits((byte)0x01, (byte)0x01, (byte)0x74, mBytes,0,6);
+                iicWrite32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 0, 6);
 
                 //30ms一次轮询[0x10174],如果是0x80,说明GT29XX已准备好,可以send cfg
                 do {
                     SystemClock.sleep(30);
-                    iicRead32Bits((byte)0x01, (byte)0x01, (byte)0x74, mBytes, 1);
-                }while(mBytes[0] != (byte)0x80);
+                    iicRead32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 1);
+                } while (mBytes[0] != (byte) 0x80);
 
                 //value = configBuilder.toString();
                 value = edtConfigDataShow.getText().toString();
@@ -3544,11 +3546,11 @@ public class Config extends AppCompatActivity
                     ichecksumhead = ichecksumhead + vb;
                 }
 
-                mBufferData[62] = (byte)(ichecksumhead & 0x00ff);
-                mBufferData[63] = (byte)((ichecksumhead & 0xff00) >> 8);
+                mBufferData[62] = (byte) (ichecksumhead & 0x00ff);
+                mBufferData[63] = (byte) ((ichecksumhead & 0xff00) >> 8);
 
                 //配置长度(不含head buffer长度)
-                int iconfiglen = (int)(mBufferData[60] & 0xFF) * 256 + (mBufferData[59] & 0xFF);
+                int iconfiglen = (int) (mBufferData[60] & 0xFF) * 256 + (mBufferData[59] & 0xFF);
 
                 //计算配置的checksum,不含64字节的head buffer
                 lchecksum = 0;
@@ -3557,24 +3559,22 @@ public class Config extends AppCompatActivity
                     lchecksum = lchecksum + vb;
                 }
 
-                mBufferData[iconfiglen + 64 - 4] = (byte)(lchecksum & 0x000000ff);
-                mBufferData[iconfiglen + 64 - 3] = (byte)((lchecksum & 0x0000ff00) >> 8);
-                mBufferData[iconfiglen + 64 - 2] = (byte)((lchecksum & 0x00ff0000) >> 16);
-                mBufferData[iconfiglen + 64 - 1] = (byte)((lchecksum & 0xff000000) >> 24);
+                mBufferData[iconfiglen + 64 - 4] = (byte) (lchecksum & 0x000000ff);
+                mBufferData[iconfiglen + 64 - 3] = (byte) ((lchecksum & 0x0000ff00) >> 8);
+                mBufferData[iconfiglen + 64 - 2] = (byte) ((lchecksum & 0x00ff0000) >> 16);
+                mBufferData[iconfiglen + 64 - 1] = (byte) ((lchecksum & 0xff000000) >> 24);
 
                 if (byProductType == GT29336) {
-                    addrfirstbyte = (byte)0x01;
-                    addrsecondbyte = (byte)0x3B;
-                    addrthirdbyte = (byte)0x74;
-                }
-                else
-                {
-                    addrfirstbyte = (byte)0x01;
-                    addrsecondbyte = (byte)0x21;
-                    addrthirdbyte = (byte)0x8C;
+                    addrfirstbyte = (byte) 0x01;
+                    addrsecondbyte = (byte) 0x3B;
+                    addrthirdbyte = (byte) 0x74;
+                } else {
+                    addrfirstbyte = (byte) 0x01;
+                    addrsecondbyte = (byte) 0x21;
+                    addrthirdbyte = (byte) 0x8C;
                 }
 
-                iicWrite32Bits(addrfirstbyte, addrsecondbyte, addrthirdbyte, mBufferData,0,iconfiglen + 64);
+                iicWrite32Bits(addrfirstbyte, addrsecondbyte, addrthirdbyte, mBufferData, 0, iconfiglen + 64);
 
                 SystemClock.sleep(30);
 
@@ -3595,26 +3595,23 @@ public class Config extends AppCompatActivity
                 mBytes[3] = 0x05;
                 mBytes[4] = 0x09;
                 mBytes[5] = 0x00;
-                iicWrite32Bits((byte)0x01, (byte)0x01, (byte)0x74, mBytes,0,6);
+                iicWrite32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 0, 6);
 
                 //30ms一次轮询[0x10174],如果是0x80,说明GT29XX已接收配置
                 do {
                     SystemClock.sleep(30);
-                    iicRead32Bits((byte)0x01, (byte)0x01, (byte)0x74, mBytes, 1);
-                    if (mBytes[0] == (byte)0x03)
-                    {
+                    iicRead32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 1);
+                    if (mBytes[0] == (byte) 0x03) {
                         stMessageLog = "Config checksum is error!!";
                         stMessageLogShow = stMessageLogShow.concat(stMessageLog);
                         break;
-                    }
-                    else if (mBytes[0] == (byte)0x01)
-                    {
+                    } else if (mBytes[0] == (byte) 0x01) {
                         stMessageLog = "receive finish!!";
                         stMessageLogShow = stMessageLogShow.concat(stMessageLog);
                         break;
                     }
 
-                }while(mBytes[0] != (byte)0x80);
+                } while (mBytes[0] != (byte) 0x80);
 
                 SystemClock.sleep(15);
 
@@ -3625,19 +3622,18 @@ public class Config extends AppCompatActivity
                 mBytes[3] = 0x06;
                 mBytes[4] = 0x0A;
                 mBytes[5] = 0x00;
-                iicWrite32Bits((byte)0x01, (byte)0x01, (byte)0x74, mBytes,0,6);
+                iicWrite32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 0, 6);
 
                 //30ms一次轮询[0x10174],如果是0x80,说明GT29XX已完成
                 do {
                     SystemClock.sleep(30);
-                    iicRead32Bits((byte)0x01, (byte)0x01, (byte)0x74, mBytes, 1);
-                    if (mBytes[0] == (byte)0x01)
-                    {
+                    iicRead32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 1);
+                    if (mBytes[0] == (byte) 0x01) {
                         stMessageLog = "receive finish!!";
                         stMessageLogShow = stMessageLogShow.concat(stMessageLog);
                         break;
                     }
-                }while(mBytes[0] != (byte)0x80);
+                } while (mBytes[0] != (byte) 0x80);
 
                 //mShow.setText("Send cfg finish!!");
                 stMessageLog = "Send config finish!! Config Version:0x" + Integer.toHexString(mBufferData[34]);
@@ -3663,7 +3659,7 @@ public class Config extends AppCompatActivity
                 //iicWrite(addressH, addressL, mBufferData, 0, 186);
                 //if (!recallCheck(addressH, addressL, mBufferData, 0, 185)) {
                 //    mShow.setText("Recall check error,Send cfg failed");
-                    // return false;
+                // return false;
                 //} else {
                 //    mShow.setText("Recall check success,Send cfg success");
                 //}
@@ -3671,9 +3667,9 @@ public class Config extends AppCompatActivity
                 //if (iChooseVPager == 8) {
                 //    mCfg80FF.setText(Integer.toHexString(mBufferData[184] & 0xff));
                 //}
-
-                break;
-            case R.id.readcfg:  //read cfg
+            }
+                //break;
+            else if (v.getId() == R.id.readcfg) {  //read cfg
                 bottonMode = 2;
                 mSendData = mSendGetGt9ConfigData;
                 StringBuilder stringBuilder = new StringBuilder("");
@@ -3696,7 +3692,7 @@ public class Config extends AppCompatActivity
                 mBytes[3] = 0x07;
                 mBytes[4] = 0x0B;
                 mBytes[5] = 0x00;
-                iicWrite32Bits((byte)0x01, (byte)0x01, (byte)0x74, mBytes,0,6);
+                iicWrite32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 0, 6);
 
 
                 //read [0x10175] = 0x80,config is ready
@@ -3708,34 +3704,34 @@ public class Config extends AppCompatActivity
                 //read [0x10174] = 0x80,config is ready
                 do {
                     SystemClock.sleep(30);
-                    iicRead32Bits((byte)0x01, (byte)0x01, (byte)0x74, mBytes, 1);
-                }while(mBytes[0] != (byte)0x80);
+                    iicRead32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 1);
+                } while (mBytes[0] != (byte) 0x80);
 
                 //SystemClock.sleep(2);
 
                 if (byProductType == GT29336) {
-                    addrfirstbyte = (byte)0x01;
-                    addrsecondbyte = (byte)0x3B;
-                    addrthirdbyte = (byte)0x74;
-                }else {
-                    addrfirstbyte = (byte)0x01;
-                    addrsecondbyte = (byte)0x21;
-                    addrthirdbyte = (byte)0x8C;
+                    addrfirstbyte = (byte) 0x01;
+                    addrsecondbyte = (byte) 0x3B;
+                    addrthirdbyte = (byte) 0x74;
+                } else {
+                    addrfirstbyte = (byte) 0x01;
+                    addrsecondbyte = (byte) 0x21;
+                    addrthirdbyte = (byte) 0x8C;
                 }
 
                 //read buffer [0x13B74]/[0X1218C]
                 iicRead32Bits(addrfirstbyte, addrsecondbyte, addrthirdbyte, mBytes, 63);  //read config head
 
-                int iConfigSize = 64 + (int)(mBytes[60] & 0xFF) * 256 + (mBytes[59] & 0xFF);   //the head lend is 64
+                int iConfigSize = 64 + (int) (mBytes[60] & 0xFF) * 256 + (mBytes[59] & 0xFF);   //the head lend is 64
 
                 iicRead32Bits(addrfirstbyte, addrsecondbyte, addrthirdbyte, mBytes, iConfigSize);  //read config
 
                 for (int i = 0; i < iConfigSize; i++) {
 
                     int k = mBytes[i] & 0xFF;
-                    checksum =checksum+ k;
+                    checksum = checksum + k;
                     String hv = Integer.toHexString(k);
-                    if (hv.length() < 2){
+                    if (hv.length() < 2) {
                         hv = "0" + hv;
                     }
                     mConfigShow[i] = hv;
@@ -3756,7 +3752,7 @@ public class Config extends AppCompatActivity
                 mBytes[3] = 0x08;
                 mBytes[4] = 0x0C;
                 mBytes[5] = 0x00;
-                iicWrite32Bits((byte)0x01, (byte)0x01, (byte)0x74, mBytes, 0, 6);
+                iicWrite32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 0, 6);
 
                 //read [0x10175] = 0x80,config is ready
                 //do {
@@ -3767,8 +3763,8 @@ public class Config extends AppCompatActivity
                 //read [0x10175] = 0x80,read config is over
                 do {
                     SystemClock.sleep(30);
-                    iicRead32Bits((byte)0x01, (byte)0x01, (byte)0x74, mBytes, 1);
-                }while(mBytes[0] != (byte)0x80);
+                    iicRead32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 1);
+                } while (mBytes[0] != (byte) 0x80);
 
                 //SystemClock.sleep(2);
 
@@ -3776,8 +3772,8 @@ public class Config extends AppCompatActivity
                 stMessageLogShow = stMessageLogShow.concat(stMessageLog);
                 mShow.setText(stMessageLogShow);
 
-                iicRead32Bits((byte)0x01, (byte)0x00, (byte)0x2B, mBytes, 4);  //read Sensor ID
-                tvVenderID.setText("VenderID:"+Integer.toString(mBytes[0] & 0xFF));
+                iicRead32Bits((byte) 0x01, (byte) 0x00, (byte) 0x2B, mBytes, 4);  //read Sensor ID
+                tvVenderID.setText("VenderID:" + Integer.toString(mBytes[0] & 0xFF));
 
                 /*
                 addressH = (byte)0x80;
@@ -3815,25 +3811,25 @@ public class Config extends AppCompatActivity
 
                  */
 
+            }
+            //    break;
+            else if (v.getId() == R.id.savecfg) {
 
-                break;
-            case R.id.savecfg:
-
-                if (editname.getText().length() == 0){
+                if (editname.getText().length() == 0) {
                     Toast.makeText(this, getResources().getString(R.string.nameandformat), Toast.LENGTH_SHORT).show();
-                }else{
-                    ActivityCompat.requestPermissions(  Config.this, new String[]{android
+                } else {
+                    ActivityCompat.requestPermissions(Config.this, new String[]{android
                             .Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
 
                     //String filePath = Environment.getExternalStorageDirectory() + "/saveconfig/";
                     //String fileName = editname.getText().toString();
                     //writeTxtToFile(editdetail.getText().toString().trim(), filePath, fileName);
                 }
-
-                break;
-            default:
-                break;
-        }
+            }
+            //    break;
+            //default:
+            //    break;
+        //}
     }
 
     @Override

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

@@ -4330,22 +4330,23 @@ public class DataAnalysis extends AppCompatActivity
 
         byte addrfirstbyte, addrsecondbyte, addrthirdbyte;
 
-        switch (view.getId()) {
-            case R.id.stop:    //back
-                showFlag = 5;
-
-                btn_RawdataShow.setEnabled(true);
-                btn_DiffdataShow.setEnabled(true);
-                //btn_ReffdataShow.setEnabled(true);
-                //btn_ManualdiffdataShow.setEnabled(true);
-                btn_Manualreff.setEnabled(false);
-                //btn_StylusDataShow.setEnabled(true);
-                btn_Test.setEnabled(true);
-                //count = 1000;
-                //changeToNormalMode();
-                break;
-
-            default: {
+        //switch (view.getId()) {
+        if (view.getId() == R.id.stop) {    //back
+            showFlag = 5;
+
+            btn_RawdataShow.setEnabled(true);
+            btn_DiffdataShow.setEnabled(true);
+            //btn_ReffdataShow.setEnabled(true);
+            //btn_ManualdiffdataShow.setEnabled(true);
+            btn_Manualreff.setEnabled(false);
+            //btn_StylusDataShow.setEnabled(true);
+            btn_Test.setEnabled(true);
+            //count = 1000;
+            //changeToNormalMode();
+            // break;
+        }
+        else{
+            //default: {
 
                 if (byProductType == GT7) {
                     addressH = (byte) 0x80;
@@ -4548,13 +4549,13 @@ public class DataAnalysis extends AppCompatActivity
                 btn_StylusDataShow.setEnabled(false);
                 btn_Test.setEnabled(false);
 
-                switch (view.getId()) {
-                    case R.id.rawdata:   //Read RawData
+                //switch (view.getId()) {
+                if (view.getId() == R.id.rawdata) {   //Read RawData
 
-                        showFlag = 1;
+                    showFlag = 1;
 
-                        changeToDebugMode();
-                        //count = 1000;
+                    changeToDebugMode();
+                    //count = 1000;
                 /*
                 showAddressHigh = (byte)0x8b;
                 showAddressLow = (byte)0x98;
@@ -4568,252 +4569,258 @@ public class DataAnalysis extends AppCompatActivity
                     showRawdata();
                 }
                 */
-                        showRawdata();
-                        break;
-
-                    case R.id.diffdata:
+                    showRawdata();
+                }
+                //        break;
+                else if (view.getId() == R.id.diffdata) {
+                    //case R.id.diffdata:
 
-                        //showFlag = 3;
-                        //if (byProductType == GT7)
-                        {
-                            showFlag = 7; //GT7系列的差值是2bytes,按照RawData的方式去显示
-                        }
+                    //showFlag = 3;
+                    //if (byProductType == GT7)
+                    {
+                        showFlag = 7; //GT7系列的差值是2bytes,按照RawData的方式去显示
+                    }
 
-                        changeToDebugMode();
-                        //showAddressHigh = (byte)0xbb;
-                        //showAddressLow = (byte)0x10;
-                        //if (byProductType == GT7)
-                        //{
-                        //    showAddressHigh = (byte)0x8a;
-                        //    showAddressLow = (byte)0xc0;
-                        //}
-                        //if(count == 1000) {
-                        //    tvDataContent.setText("[" + getResources().getString(R.string.diffdata) + "]");
-                        //}
-                        showRawdata();
+                    changeToDebugMode();
+                    //showAddressHigh = (byte)0xbb;
+                    //showAddressLow = (byte)0x10;
+                    //if (byProductType == GT7)
+                    //{
+                    //    showAddressHigh = (byte)0x8a;
+                    //    showAddressLow = (byte)0xc0;
+                    //}
+                    //if(count == 1000) {
+                    //    tvDataContent.setText("[" + getResources().getString(R.string.diffdata) + "]");
+                    //}
+                    showRawdata();
+                }
+                //        break;
 
-                        break;
+                else if (view.getId() == R.id.reffdata) {
+                    showFlag = 4;
+                    count = 1000;
+                    showAddressHigh = (byte) 0x81;
+                    showAddressLow = (byte) 0xc0;
+                    if (byProductType == GT7) {
+                        showAddressHigh = (byte) 0xa5;
+                        showAddressLow = (byte) 0x58;
+                    }
+                    tvDataContent.setText("[" + getResources().getString(R.string.reffdata) + "]");
+                    getRawdata();
+                    mHandler.sendEmptyMessage(RAWDATA_MESSAGE);
+                    btn_RawdataShow.setEnabled(true);
+                    btn_DiffdataShow.setEnabled(true);
+                    //btn_ReffdataShow.setEnabled(true);
+                    //btn_ManualdiffdataShow.setEnabled(true);
+                    //btn_Manualreff.setEnabled(false);
+                    //btn_StylusDataShow.setEnabled(true);
+                    btn_Test.setEnabled(true);
+                }
+                //        break;
 
-                    case R.id.reffdata:
-                        showFlag = 4;
+                else if (view.getId() == R.id.manualdiff) {
+                    showFlag = 2;
+                    btn_Manualreff.setEnabled(true);
+                    changeToDebugMode();
+                    showAddressHigh = (byte) 0x8b;
+                    showAddressLow = (byte) 0x98;
+                    if (byProductType == GT7) {
+                        showAddressHigh = (byte) 0xbf;
+                        showAddressLow = (byte) 0xf0;
+                    }
+                    if (count == 1000) {
+                        tvDataContent.setText("[" + getResources().getString(R.string.manualdiff) + "]");
+                        showRawdata();
+                    } else {
                         count = 1000;
-                        showAddressHigh = (byte) 0x81;
-                        showAddressLow = (byte) 0xc0;
-                        if (byProductType == GT7) {
-                            showAddressHigh = (byte) 0xa5;
-                            showAddressLow = (byte) 0x58;
-                        }
-                        tvDataContent.setText("[" + getResources().getString(R.string.reffdata) + "]");
-                        getRawdata();
-                        mHandler.sendEmptyMessage(RAWDATA_MESSAGE);
-                        btn_RawdataShow.setEnabled(true);
-                        btn_DiffdataShow.setEnabled(true);
-                        //btn_ReffdataShow.setEnabled(true);
-                        //btn_ManualdiffdataShow.setEnabled(true);
-                        //btn_Manualreff.setEnabled(false);
-                        //btn_StylusDataShow.setEnabled(true);
-                        btn_Test.setEnabled(true);
-                        break;
+                    }
+                }
+                //        break;
 
-                    case R.id.manualdiff:
-                        showFlag = 2;
-                        btn_Manualreff.setEnabled(true);
-                        changeToDebugMode();
+                else if (view.getId() == R.id.manualreff) {  //set up manual ref
+                    showFlag = 2;
+                    btn_Manualreff.setEnabled(true);
+                    count = 1000;
+
+                    if (byProductType == GT7) {
+                        showAddressHigh = (byte) 0xbf;
+                        showAddressLow = (byte) 0xf0;
+                    } else {
                         showAddressHigh = (byte) 0x8b;
                         showAddressLow = (byte) 0x98;
-                        if (byProductType == GT7) {
-                            showAddressHigh = (byte) 0xbf;
-                            showAddressLow = (byte) 0xf0;
-                        }
-                        if (count == 1000) {
-                            tvDataContent.setText("[" + getResources().getString(R.string.manualdiff) + "]");
-                            showRawdata();
-                        } else {
-                            count = 1000;
-                        }
-                        break;
+                    }
+                }
+                //        break;
 
-                    case R.id.manualreff:  //set up manual ref
-                        showFlag = 2;
-                        btn_Manualreff.setEnabled(true);
-                        count = 1000;
+                else if (view.getId() == R.id.stylusdata) {  //主动笔数据
+                    if (byProductType == GT7)  //GT7系列才显示
+                    {
+                        showFlag = 8;
 
-                        if (byProductType == GT7) {
-                            showAddressHigh = (byte) 0xbf;
-                            showAddressLow = (byte) 0xf0;
-                        } else {
-                            showAddressHigh = (byte) 0x8b;
-                            showAddressLow = (byte) 0x98;
-                        }
-                        break;
+                        changeToDebugMode();
 
-                    case R.id.stylusdata:  //主动笔数据
-                        if (byProductType == GT7)  //GT7系列才显示
-                        {
-                            showFlag = 8;
+                        textGridLayout.removeAllViews();
 
-                            changeToDebugMode();
+                        textGridLayout.setColumnCount(rownum + 1);  //列数=感应数
+                        textGridLayout.setRowCount(colnum + 1); //行数=驱动数
 
-                            textGridLayout.removeAllViews();
+                        showAddressHigh = (byte) 0xDD;
+                        showAddressLow = (byte) 0x58;
 
-                            textGridLayout.setColumnCount(rownum + 1);  //列数=感应数
-                            textGridLayout.setRowCount(colnum + 1); //行数=驱动数
+                        if (count == 1000) {
+                            tvDataContent.setText("[" + getResources().getString(R.string.stylusdata) + "]");
+                            showRawdata();
+                        }
+                    }
+                }
+                //        break;
 
-                            showAddressHigh = (byte) 0xDD;
-                            showAddressLow = (byte) 0x58;
+                else if (view.getId() == R.id.testting) {  //start test
 
-                            if (count == 1000) {
-                                tvDataContent.setText("[" + getResources().getString(R.string.stylusdata) + "]");
-                                showRawdata();
-                            }
-                        }
-                        break;
+                    if (edit_search.getText().length() == 0) {
+                        Toast.makeText(this, getResources().getString(R.string.nameandformat), Toast.LENGTH_SHORT).show();
 
-                    case R.id.testting:  //start test
+                        edt_ColNum.setText("");
+                        edt_RowNum.setText("");
 
-                        if (edit_search.getText().length() == 0) {
-                            Toast.makeText(this, getResources().getString(R.string.nameandformat), Toast.LENGTH_SHORT).show();
+                        btn_RawdataShow.setEnabled(true);
+                        btn_DiffdataShow.setEnabled(true);
+                        //btn_ReffdataShow.setEnabled(true);
+                        //btn_ManualdiffdataShow.setEnabled(true);
+                        //btn_Manualreff.setEnabled(false);
+                        //btn_StylusDataShow.setEnabled(true);
+                        btn_Test.setEnabled(true);
 
-                            edt_ColNum.setText("");
-                            edt_RowNum.setText("");
+                        //break;
+                        return;
+                    }
 
-                            btn_RawdataShow.setEnabled(true);
-                            btn_DiffdataShow.setEnabled(true);
-                            //btn_ReffdataShow.setEnabled(true);
-                            //btn_ManualdiffdataShow.setEnabled(true);
-                            //btn_Manualreff.setEnabled(false);
-                            //btn_StylusDataShow.setEnabled(true);
-                            btn_Test.setEnabled(true);
+                    addrfirstbyte = (byte) 0x01;
+                    addrsecondbyte = (byte) 0x01;
+                    addrthirdbyte = (byte) 0x74;
+                    ;
+                    byte msubcommand = (byte) 0x12;  //最高位置1,写命令18 DISABLE_DIGITER_INTERFACE
+                    byte mdata = (byte) 0x00;
 
-                            break;
-                        }
+                    if (!IicWriteOneByte(addrfirstbyte, addrsecondbyte, addrthirdbyte, msubcommand, mdata)) {
+                        return;
+                    }
 
-                        addrfirstbyte = (byte) 0x01;
-                        addrsecondbyte = (byte) 0x01;
-                        addrthirdbyte = (byte) 0x74;
-                        ;
-                        byte msubcommand = (byte) 0x12;  //最高位置1,写命令18 DISABLE_DIGITER_INTERFACE
-                        byte mdata = (byte) 0x00;
+                    SystemClock.sleep(10);
 
-                        if (!IicWriteOneByte(addrfirstbyte, addrsecondbyte, addrthirdbyte, msubcommand, mdata)) {
-                            return;
-                        }
+                    msubcommand = (byte) 0x2B;  //最高位置1,写命令43 DISABLE_ESD_CHECK
+                    mdata = (byte) 0x00;
 
-                        SystemClock.sleep(10);
+                    if (!IicWriteOneByte(addrfirstbyte, addrsecondbyte, addrthirdbyte, msubcommand, mdata)) {
+                        return;
+                    }
 
-                        msubcommand = (byte) 0x2B;  //最高位置1,写命令43 DISABLE_ESD_CHECK
-                        mdata = (byte) 0x00;
+                    //send 0x00 to [0x10174],清除标志
+                    mBytes[0] = 0x00;
+                    iicWrite32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 0, 1);
+                    SystemClock.sleep(15);
 
-                        if (!IicWriteOneByte(addrfirstbyte, addrsecondbyte, addrthirdbyte, msubcommand, mdata)) {
-                            return;
-                        }
+                    //send 0x00 0x00 0x04 0x04 0x08 0x00 to [0x10174],通知GT29XX,send cfg
+                    mBytes[0] = 0x00;
+                    mBytes[1] = 0x00;
+                    mBytes[2] = 0x04;
+                    mBytes[3] = 0x04;
+                    mBytes[4] = 0x08;
+                    mBytes[5] = 0x00;
+                    iicWrite32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 0, 6);
 
-                        //send 0x00 to [0x10174],清除标志
-                        mBytes[0] = 0x00;
-                        iicWrite32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 0, 1);
-                        SystemClock.sleep(15);
-
-                        //send 0x00 0x00 0x04 0x04 0x08 0x00 to [0x10174],通知GT29XX,send cfg
-                        mBytes[0] = 0x00;
-                        mBytes[1] = 0x00;
-                        mBytes[2] = 0x04;
-                        mBytes[3] = 0x04;
-                        mBytes[4] = 0x08;
-                        mBytes[5] = 0x00;
-                        iicWrite32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 0, 6);
-
-                        //30ms一次轮询[0x10174],如果是0x80,说明GT29XX已准备好,可以send cfg
-                        do {
-                            SystemClock.sleep(30);
-                            iicRead32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 1);
-                        } while (mBytes[0] != (byte) 0x80);
+                    //30ms一次轮询[0x10174],如果是0x80,说明GT29XX已准备好,可以send cfg
+                    do {
+                        SystemClock.sleep(30);
+                        iicRead32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 1);
+                    } while (mBytes[0] != (byte) 0x80);
 
-                        //配置
-                        for (int i = 0; i < iConfigSize; i++) {
-                            mBytes[i] = byConfigBak[i];
-                        }
+                    //配置
+                    for (int i = 0; i < iConfigSize; i++) {
+                        mBytes[i] = byConfigBak[i];
+                    }
 
-                        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
-                        } else {
-                            //todo
-                        }
-                        //配置长度(不含head buffer长度)
-                        int iconfiglen = (int) (mBytes[60] & 0xFF) * 256 + (mBytes[59] & 0xFF);
-
-                        //计算配置的checksum,不含64字节的head buffer
-                        long lchecksum = 0;
-                        for (int i = 64; i < (iconfiglen + 64 - 4); i += 2) {
-                            int vb = ((mBytes[i + 1] & 0xFF) << 8) + (mBytes[i] & 0xFF);
-                            lchecksum = lchecksum + vb;
-                        }
+                    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
+                    } else {
+                        //todo
+                    }
+                    //配置长度(不含head buffer长度)
+                    int iconfiglen = (int) (mBytes[60] & 0xFF) * 256 + (mBytes[59] & 0xFF);
+
+                    //计算配置的checksum,不含64字节的head buffer
+                    long lchecksum = 0;
+                    for (int i = 64; i < (iconfiglen + 64 - 4); i += 2) {
+                        int vb = ((mBytes[i + 1] & 0xFF) << 8) + (mBytes[i] & 0xFF);
+                        lchecksum = lchecksum + vb;
+                    }
 
-                        mBytes[iconfiglen + 64 - 4] = (byte) (lchecksum & 0x000000ff);
-                        mBytes[iconfiglen + 64 - 3] = (byte) ((lchecksum & 0x0000ff00) >> 8);
-                        mBytes[iconfiglen + 64 - 2] = (byte) ((lchecksum & 0x00ff0000) >> 16);
-                        mBytes[iconfiglen + 64 - 1] = (byte) ((lchecksum & 0xff000000) >> 24);
+                    mBytes[iconfiglen + 64 - 4] = (byte) (lchecksum & 0x000000ff);
+                    mBytes[iconfiglen + 64 - 3] = (byte) ((lchecksum & 0x0000ff00) >> 8);
+                    mBytes[iconfiglen + 64 - 2] = (byte) ((lchecksum & 0x00ff0000) >> 16);
+                    mBytes[iconfiglen + 64 - 1] = (byte) ((lchecksum & 0xff000000) >> 24);
 
-                        if (byProductType == GT29336) {
-                            addrfirstbyte = (byte) 0x01;
-                            addrsecondbyte = (byte) 0x3B;
-                            addrthirdbyte = (byte) 0x74;
-                        } else {
-                            addrfirstbyte = (byte) 0x01;
-                            addrsecondbyte = (byte) 0x21;
-                            addrthirdbyte = (byte) 0x8C;
-                        }
+                    if (byProductType == GT29336) {
+                        addrfirstbyte = (byte) 0x01;
+                        addrsecondbyte = (byte) 0x3B;
+                        addrthirdbyte = (byte) 0x74;
+                    } else {
+                        addrfirstbyte = (byte) 0x01;
+                        addrsecondbyte = (byte) 0x21;
+                        addrthirdbyte = (byte) 0x8C;
+                    }
 
-                        //iicWrite32Bits((byte)0x01, (byte)0x3B, (byte)0x74, mBytes,0,iconfiglen + 64);
-                        iicWrite32Bits(addrfirstbyte, addrsecondbyte, addrthirdbyte, mBytes, 0, iconfiglen + 64);  //read config
+                    //iicWrite32Bits((byte)0x01, (byte)0x3B, (byte)0x74, mBytes,0,iconfiglen + 64);
+                    iicWrite32Bits(addrfirstbyte, addrsecondbyte, addrthirdbyte, mBytes, 0, iconfiglen + 64);  //read config
 
-                        //if (!recallCheck((byte)0x01, (byte)0x3B, (byte)0x74, mBytes, 0, iconfiglen + 64)) {
-                        //    stMessageLog = "Recall check config error!!";
-                        //    stMessageLogShow = stMessageLogShow.concat(stMessageLog);
-                        //} else {
-                        //    stMessageLog = "Recall check config success!!";
-                        //    stMessageLogShow = stMessageLogShow.concat(stMessageLog);
-                        //}
+                    //if (!recallCheck((byte)0x01, (byte)0x3B, (byte)0x74, mBytes, 0, iconfiglen + 64)) {
+                    //    stMessageLog = "Recall check config error!!";
+                    //    stMessageLogShow = stMessageLogShow.concat(stMessageLog);
+                    //} else {
+                    //    stMessageLog = "Recall check config success!!";
+                    //    stMessageLogShow = stMessageLogShow.concat(stMessageLog);
+                    //}
 
-                        SystemClock.sleep(8);
+                    SystemClock.sleep(8);
 
-                        //send 0x00 0x00 0x04 0x05 0x09 0x00 to [0x10174],通知GT29XX,cfg发送完毕
-                        mBytes[0] = 0x00;
-                        mBytes[1] = 0x00;
-                        mBytes[2] = 0x04;
-                        mBytes[3] = 0x05;
-                        mBytes[4] = 0x09;
-                        mBytes[5] = 0x00;
-                        iicWrite32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 0, 6);
+                    //send 0x00 0x00 0x04 0x05 0x09 0x00 to [0x10174],通知GT29XX,cfg发送完毕
+                    mBytes[0] = 0x00;
+                    mBytes[1] = 0x00;
+                    mBytes[2] = 0x04;
+                    mBytes[3] = 0x05;
+                    mBytes[4] = 0x09;
+                    mBytes[5] = 0x00;
+                    iicWrite32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 0, 6);
 
-                        //30ms一次轮询[0x10174],如果是0x80,说明GT29XX已接收配置
-                        do {
-                            SystemClock.sleep(30);
-                            iicRead32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 1);
-                            if (mBytes[0] == (byte) 0x03) {
-                                //stMessageLog = "Config checksum is error!!";
-                                //stMessageLogShow = stMessageLogShow.concat(stMessageLog);
-                                break;
-                            }
+                    //30ms一次轮询[0x10174],如果是0x80,说明GT29XX已接收配置
+                    do {
+                        SystemClock.sleep(30);
+                        iicRead32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 1);
+                        if (mBytes[0] == (byte) 0x03) {
+                            //stMessageLog = "Config checksum is error!!";
+                            //stMessageLogShow = stMessageLogShow.concat(stMessageLog);
+                            break;
+                        }
 
-                        } while (mBytes[0] != (byte) 0x80);
+                    } while (mBytes[0] != (byte) 0x80);
 
-                        SystemClock.sleep(15);
+                    SystemClock.sleep(15);
 
-                        //send 0x00 0x00 0x04 0x06 0x0A 0x00 to [0x10174],通知GT29XX,流程完成
-                        mBytes[0] = 0x00;
-                        mBytes[1] = 0x00;
-                        mBytes[2] = 0x04;
-                        mBytes[3] = 0x06;
-                        mBytes[4] = 0x0A;
-                        mBytes[5] = 0x00;
-                        iicWrite32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 0, 6);
+                    //send 0x00 0x00 0x04 0x06 0x0A 0x00 to [0x10174],通知GT29XX,流程完成
+                    mBytes[0] = 0x00;
+                    mBytes[1] = 0x00;
+                    mBytes[2] = 0x04;
+                    mBytes[3] = 0x06;
+                    mBytes[4] = 0x0A;
+                    mBytes[5] = 0x00;
+                    iicWrite32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 0, 6);
 
-                        //30ms一次轮询[0x10174],如果是0x80,说明GT29XX已完成
-                        do {
-                            SystemClock.sleep(30);
-                            iicRead32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 1);
-                        } while (mBytes[0] != (byte) 0x80);
+                    //30ms一次轮询[0x10174],如果是0x80,说明GT29XX已完成
+                    do {
+                        SystemClock.sleep(30);
+                        iicRead32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 1);
+                    } while (mBytes[0] != (byte) 0x80);
 
                 /*
                 if (edt_Maximum.getText().length() == 0)
@@ -4867,25 +4874,26 @@ public class DataAnalysis extends AppCompatActivity
                     showRawdata();
                 }
                 */
-                        for (int i = 0; i < 52 * 75; i++) {
-                            byOverMaxCount[i] = 0;
-                            byLessMinCount[i] = 0;
-                            byOverAdjCount[i] = 0;
-                        }
+                    for (int i = 0; i < 52 * 75; i++) {
+                        byOverMaxCount[i] = 0;
+                        byLessMinCount[i] = 0;
+                        byOverAdjCount[i] = 0;
+                    }
 
-                        bTestMaxResult = true;
-                        bTestMinResult = true;
+                    bTestMaxResult = true;
+                    bTestMinResult = true;
 
-                        showFlag = 6;
-                        byTestCount = 0;
-                        byMaximumOverCount = 0;
-                        byMinimumOverCount = 0;
-                        byReTestCount = 0;
-                        if (count == 1000) {
-                            //tvDataContent.setText("["+getResources().getString(R.string.rawdata)+"]");
-                            showRawdata();
-                        }
-                        break;
+                    showFlag = 6;
+                    byTestCount = 0;
+                    byMaximumOverCount = 0;
+                    byMinimumOverCount = 0;
+                    byReTestCount = 0;
+                    if (count == 1000) {
+                        //tvDataContent.setText("["+getResources().getString(R.string.rawdata)+"]");
+                        showRawdata();
+                    }
+                }
+                //        break;
                     /*
                     case R.id.stop:    //back
                         showFlag = 5;
@@ -4901,11 +4909,11 @@ public class DataAnalysis extends AppCompatActivity
                         //changeToNormalMode();
                         break;
                     */
-                    default:
-                        break;
-                }
-            }
-            break;
+                //    default:
+                //        break;
+                //}
+            //}
+            //break;
         }
     }
 

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

@@ -522,8 +522,8 @@ public class FirmwareUpdate extends AppCompatActivity
         byte addrfirstbyte, addrsecondbyte, addrthirdbyte;
         String hv = "";
         String strpidversion = "GT";
-        switch(view.getId()) {
-            case R.id.version:     //read version
+        //switch(view.getId()) {
+            if (view.getId() == R.id.version) {     //read version
                 bottonMode = 0;
                 mSendData = mSendGetGt9VersionData;
                 isSendMessage = false;
@@ -563,15 +563,15 @@ public class FirmwareUpdate extends AppCompatActivity
                         mBytes[i] = 0;
                     }
 
-                    iicRead32Bits((byte)0x01, (byte)0x00, (byte)0x14, (byte)0x03,mBytes, 24);
+                    iicRead32Bits((byte) 0x01, (byte) 0x00, (byte) 0x14, (byte) 0x03, mBytes, 24);
 
-                    strpidversion = new String(mBytes,0,24);
+                    strpidversion = new String(mBytes, 0, 24);
 
                     tvS8xxxxShow.setText(strpidversion);
 
                     strpidversion = "GT";
 
-                    iicRead32Bits((byte)0x01, (byte)0x00, (byte)0x14, (byte)0x0f,mBytes, 23);
+                    iicRead32Bits((byte) 0x01, (byte) 0x00, (byte) 0x14, (byte) 0x0f, mBytes, 23);
 
                     for (int i = 10; i < 15; i++)  //Get PID
                     {
@@ -583,10 +583,9 @@ public class FirmwareUpdate extends AppCompatActivity
                         strpidversion += hv;
                     }
 
-                    if (strpidversion.length() < 6)
-                    {
-                        tvGtxxxxShow.setText( "Null" );//输出显示
-                    } else{
+                    if (strpidversion.length() < 6) {
+                        tvGtxxxxShow.setText("Null");//输出显示
+                    } else {
 
                         strpidversion += "_";
 
@@ -594,14 +593,13 @@ public class FirmwareUpdate extends AppCompatActivity
                         {
                             int v = mBytes[i] & 0xFF;
                             hv = Integer.toHexString(v);
-                            if (hv.length() < 2){
+                            if (hv.length() < 2) {
                                 hv = "0" + hv;
                             }
 
                             strpidversion += hv;
 
-                            if (i < 21)
-                            {
+                            if (i < 21) {
                                 strpidversion += ".";
                             }
                         }
@@ -616,7 +614,7 @@ public class FirmwareUpdate extends AppCompatActivity
                     mBytes[3] = 0x07;
                     mBytes[4] = 0x0B;
                     mBytes[5] = 0x00;
-                    iicWrite32Bits((byte)0x01, (byte)0x01, (byte)0x74, mBytes,0,6);
+                    iicWrite32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 0, 6);
 
 
                     //read [0x10175] = 0x80,config is ready
@@ -628,28 +626,28 @@ public class FirmwareUpdate extends AppCompatActivity
                     //read [0x10174] = 0x80,config is ready
                     do {
                         SystemClock.sleep(30);
-                        iicRead32Bits((byte)0x01, (byte)0x01, (byte)0x74, (byte)0x0f, mBytes, 1);
-                    }while(mBytes[0] != (byte)0x80);
+                        iicRead32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, (byte) 0x0f, mBytes, 1);
+                    } while (mBytes[0] != (byte) 0x80);
 
                     //SystemClock.sleep(2);
 
                     if (byProductType == GT29336) {
-                        addrfirstbyte = (byte)0x01;
-                        addrsecondbyte = (byte)0x3B;
-                        addrthirdbyte = (byte)0x74;
-                    }else {
-                        addrfirstbyte = (byte)0x01;
-                        addrsecondbyte = (byte)0x21;
-                        addrthirdbyte = (byte)0x8C;
+                        addrfirstbyte = (byte) 0x01;
+                        addrsecondbyte = (byte) 0x3B;
+                        addrthirdbyte = (byte) 0x74;
+                    } else {
+                        addrfirstbyte = (byte) 0x01;
+                        addrsecondbyte = (byte) 0x21;
+                        addrthirdbyte = (byte) 0x8C;
                     }
 
                     //read buffer [0x13B74]/[0X1218C]
-                    iicRead32Bits(addrfirstbyte, addrsecondbyte, addrthirdbyte, (byte)0x0f, mBytes, 63);  //read config head
+                    iicRead32Bits(addrfirstbyte, addrsecondbyte, addrthirdbyte, (byte) 0x0f, mBytes, 63);  //read config head
 
                     int k = mBytes[34] & 0xFF;
 
                     hv = Integer.toHexString(k);
-                    if (hv.length() < 2){
+                    if (hv.length() < 2) {
                         hv = "0" + hv;
                     }
 
@@ -664,7 +662,7 @@ public class FirmwareUpdate extends AppCompatActivity
                     mBytes[3] = 0x08;
                     mBytes[4] = 0x0C;
                     mBytes[5] = 0x00;
-                    iicWrite32Bits((byte)0x01, (byte)0x01, (byte)0x74, mBytes, 0, 6);
+                    iicWrite32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, mBytes, 0, 6);
 
                     //read [0x10175] = 0x80,config is ready
                     //do {
@@ -675,8 +673,8 @@ public class FirmwareUpdate extends AppCompatActivity
                     //read [0x10175] = 0x80,read config is over
                     do {
                         SystemClock.sleep(30);
-                        iicRead32Bits((byte)0x01, (byte)0x01, (byte)0x74, (byte)0x0f, mBytes, 1);
-                    }while(mBytes[0] != (byte)0x80);
+                        iicRead32Bits((byte) 0x01, (byte) 0x01, (byte) 0x74, (byte) 0x0f, mBytes, 1);
+                    } while (mBytes[0] != (byte) 0x80);
 
                     //SystemClock.sleep(2);
 
@@ -714,18 +712,19 @@ public class FirmwareUpdate extends AppCompatActivity
                     }
                      */
                 }
+            }
+            //    break;
 
-                break;
-
-            case R.id.btnAutoUpdate:  //自动下载固件和配置
+            else if (view.getId() == R.id.btnAutoUpdate) {  //自动下载固件和配置
                 bottonMode = 3;
                 isReceiverMessage = false;  //升级关闭循环接收信息
                 //mSendData = mSendGetGt9VersionData;
                 isSendMessage = false;
                 //updateProcHandle();   //暂时不开放
                 //mHandler.sendEmptyMessage(UPDATE_FW);
-                break;
-            case R.id.btnUpdate:
+            }
+            //    break;
+            else if (view.getId() == R.id.btnUpdate) {
                 bottonMode = 4;
                 isReceiverMessage = false;  //升级关闭循环接收信息
                 //mSendData = mSendGetGt9VersionData;
@@ -735,11 +734,12 @@ public class FirmwareUpdate extends AppCompatActivity
                 {
                     updateProcHandle();
                 }
-                break;
+            }
+            //    break;
 
-            default:
-                break;
-        }
+            //default:
+            //    break;
+        //}
 
 
         while (isSendMessage) {

+ 7 - 6
app/src/main/java/com/example/administrator/wingcool_gt9_apk/GT9MainActivity.java

@@ -394,10 +394,11 @@ public class GT9MainActivity extends AppCompatActivity
 
     @Override
     public void onClick(final View v) {
-        switch (v.getId()) {
-            case R.id.Exit:   //Exit
+        //switch (v.getId()) {
+            if (v.getId() == R.id.Exit) {   //Exit
                 exit();
-                break;
+            }
+            //    break;
         /*
             case R.id.bt_tcpstart:
 
@@ -530,9 +531,9 @@ public class GT9MainActivity extends AppCompatActivity
 
                 break;
         */
-            default:
-                break;
-        }
+        //    default:
+        //        break;
+        //}
     }
 
     /**

+ 20 - 17
app/src/main/java/com/example/administrator/wingcool_gt9_apk/IICOperation.java

@@ -282,25 +282,26 @@ public class IICOperation extends AppCompatActivity
             lengthtemp = Integer.parseInt(edtLengthInput.getText().toString(),10);
         }
 
-        switch (view.getId()) {
-            case R.id.readdata:     //read
-                if (cbSequentialRead.isChecked()){    //连续读取
+        //switch (view.getId()) {
+            if (view.getId() == R.id.readdata) {     //read
+                if (cbSequentialRead.isChecked()) {    //连续读取
 
-                    if (bottonMode == false){
+                    if (bottonMode == false) {
                         bottonMode = true;
                         btnReadData.setText(getResources().getString(R.string.stop));
                         sequentialRead();
-                    }else{
+                    } else {
                         bottonMode = false;
                         btnReadData.setText(getResources().getString(R.string.readdata));
                     }
 
-                    break;
+                    //break;
+                    return;
                 }
 
                 bottonMode = false;
 
-                iicRead(addressH,addressL,mBytes,lengthtemp);
+                iicRead(addressH, addressL, mBytes, lengthtemp);
 
                 for (int i = 0; i < lengthtemp; i++) {
 
@@ -311,7 +312,7 @@ public class IICOperation extends AppCompatActivity
                         value = "0" + value;
                     }
 
-                    if (cbDualBytes.isChecked()){    //双字节显示
+                    if (cbDualBytes.isChecked()) {    //双字节显示
                         int l = mBytes[i + 1] & 0xFF;
                         hv = Integer.toHexString(l);
                         if (hv.length() < 2) {
@@ -327,10 +328,11 @@ public class IICOperation extends AppCompatActivity
                     stringBuilder.append("  ");
                 }
 
-                edtDataShow.setText( stringBuilder.toString() );//输出显示
-                break;
+                edtDataShow.setText(stringBuilder.toString());//输出显示
+            }
+            //    break;
 
-            case R.id.writedata:    //write
+            else if (view.getId() == R.id.writedata) {    //write
                 value = edtDataWrite.getText().toString();
                 String[] stringArr = value.split(" ");
 
@@ -340,14 +342,15 @@ public class IICOperation extends AppCompatActivity
                     mBufferData[i] = aByte;
                 }
 
-                iicWrite(addressH,addressL,mBufferData,0,lengthtemp);
+                iicWrite(addressH, addressL, mBufferData, 0, lengthtemp);
 
-                Toast.makeText(this,"Send successfully",Toast.LENGTH_SHORT).show();
-                break;
+                Toast.makeText(this, "Send successfully", Toast.LENGTH_SHORT).show();
+            }
+            //    break;
 
-            default:
-                break;
-        }
+            //default:
+            //    break;
+        //}
     }
 
     private void sequentialRead() {

+ 1 - 1
app/src/main/res/layout-hdpi/view_module_switch.xml

@@ -87,7 +87,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/INT_trigger_mode"
             android:background="@color/frame_search"/>
 
         <TextView

+ 1 - 1
app/src/main/res/layout-land-hdpi/view_module_switch.xml

@@ -87,7 +87,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/INT_trigger_mode"
             android:background="@color/frame_search"/>
 
         <TextView

+ 1 - 1
app/src/main/res/layout-land-mdpi/view_module_switch.xml

@@ -87,7 +87,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/INT_trigger_mode"
             android:background="@color/frame_search"/>
 
         <TextView

+ 1 - 1
app/src/main/res/layout-land-xhdpi/view_module_switch.xml

@@ -87,7 +87,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/INT_trigger_mode"
             android:background="@color/frame_search"/>
 
         <TextView

+ 1 - 1
app/src/main/res/layout-land-xxhdpi/view_module_switch.xml

@@ -87,7 +87,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/INT_trigger_mode"
             android:background="@color/frame_search"/>
 
         <TextView

+ 1 - 1
app/src/main/res/layout-land-xxxhdpi/view_module_switch.xml

@@ -87,7 +87,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/INT_trigger_mode"
             android:background="@color/frame_search"/>
 
         <TextView

+ 1 - 1
app/src/main/res/layout-land/view_module_switch.xml

@@ -87,7 +87,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/INT_trigger_mode"
             android:background="@color/frame_search"/>
 
         <TextView

+ 1 - 1
app/src/main/res/layout-mdpi/view_module_switch.xml

@@ -87,7 +87,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/INT_trigger_mode"
             android:background="@color/frame_search"/>
 
         <TextView

+ 1 - 1
app/src/main/res/layout-xhdpi/view_module_switch.xml

@@ -87,7 +87,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/INT_trigger_mode"
             android:background="@color/frame_search"/>
 
         <TextView

+ 1 - 1
app/src/main/res/layout-xxhdpi/view_module_switch.xml

@@ -87,7 +87,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/INT_trigger_mode"
             android:background="@color/frame_search"/>
 
         <TextView

+ 1 - 1
app/src/main/res/layout-xxxhdpi/view_module_switch.xml

@@ -87,7 +87,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/INT_trigger_mode"
             android:background="@color/frame_search"/>
 
         <TextView

+ 1 - 1
app/src/main/res/layout/view_module_switch.xml

@@ -87,7 +87,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/INT_trigger_mode"
             android:background="@color/frame_search"/>
 
         <TextView

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

@@ -7,7 +7,7 @@
         <item>user defined</item>
     </string-array>
 
-    <string-array name="INT触发方式">
+    <string-array name="INT_trigger_mode">
         <item>rising edge trigger</item>
         <item>falling edge trigger</item>
         <item>low level</item>

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

@@ -7,7 +7,7 @@
         <item>自定义系数</item>
     </string-array>
 
-    <string-array name="INT触发方式">
+    <string-array name="INT_trigger_mode">
         <item>上升沿触发</item>
         <item>下降沿触发</item>
         <item>低电平查询</item>