删除TCP传输的相关代码，否则中英文切换的时候APK会异常关闭

app/src/main/java/com/example/administrator/wingcool_gt9_apk/GT9MainActivity.java

@@ -100,6 +100,7 @@ public class GT9MainActivity extends AppCompatActivity
 
     public static List<Activity> activityList = new LinkedList();
 
+/*
     private Button bt_tcpstart;
     private final static String TAG = "Main2Activity-------->";
     private Socket socket = null;
@@ -110,6 +111,7 @@ public class GT9MainActivity extends AppCompatActivity
     private InputStream inputStream = null;
 
     private byte[] SyncCmd = new byte[] {0x03, 0x00, 0x0d, (byte)0x81, 0x4E, 0x00, 0x01};
+*/
 
     Handler mHandler = new Handler() {
         @Override
@@ -121,7 +123,7 @@ public class GT9MainActivity extends AppCompatActivity
                     //String avalue = "S818 is connected";
 
                     mShow.setText(R.string.connected);//????????
-                    bt_tcpstart.setEnabled(true);
+                    //bt_tcpstart.setEnabled(true);
                     break;
                 case CONNECTED_FAILED://??????????????????
                     //String bvalue = "S818 is disconnected";
@@ -142,9 +144,11 @@ public class GT9MainActivity extends AppCompatActivity
         }
     };
 
-    public GT9MainActivity() throws IOException {
+/*
+    public GT9MainActivity() throws IOException
+    {
     }
-
+*/
     //==========================================================================================//
 
     @Override
@@ -364,9 +368,9 @@ public class GT9MainActivity extends AppCompatActivity
 
         mUsbManager = (UsbManager) getSystemService(Context.USB_SERVICE);
 
-        bt_tcpstart = findViewById(R.id.bt_tcpstart);
-        bt_tcpstart.setOnClickListener(this);
-        bt_tcpstart.setEnabled(false);
+        //bt_tcpstart = findViewById(R.id.bt_tcpstart);
+        //bt_tcpstart.setOnClickListener(this);
+        //bt_tcpstart.setEnabled(false);
 
         btnConfigSetting = findViewById(R.id.ConfigSetting);
         btnFWUpdate = findViewById(R.id.FWUpdate);
@@ -388,7 +392,7 @@ public class GT9MainActivity extends AppCompatActivity
             case R.id.Exit:   //Exit
                 exit();
                 break;
-
+        /*
             case R.id.bt_tcpstart:
 
                 String btContent = bt_tcpstart.getText().toString();
@@ -519,7 +523,7 @@ public class GT9MainActivity extends AppCompatActivity
                 }
 
                 break;
-
+        */
             default:
                 break;
         }
@@ -679,7 +683,7 @@ public class GT9MainActivity extends AppCompatActivity
     @Override
     protected void onDestroy() {
         super.onDestroy();
-
+/*
         try {
 
             server.close();
@@ -689,7 +693,7 @@ public class GT9MainActivity extends AppCompatActivity
             e.printStackTrace();
 
         }
-
+*/
         if (mUsbDeviceConnection != null) {
             mUsbDeviceConnection.releaseInterface(mUsbInterface);
             mUsbDeviceConnection.close();
@@ -704,7 +708,7 @@ public class GT9MainActivity extends AppCompatActivity
 
     public void exit()
     {
-
+/*
         try {
 
             server.close();
@@ -714,7 +718,7 @@ public class GT9MainActivity extends AppCompatActivity
             e.printStackTrace();
 
         }
-
+*/
         for(Activity act:activityList)
         {
             act.finish();
@@ -753,7 +757,7 @@ public class GT9MainActivity extends AppCompatActivity
 
         return "0.0.0.0";
     }
-
+/*
     private byte iicByteData[]={
             //0    1   2     3    4    5    6
             0x03,0x00,0x0f,0x00,0x00,0x00,0x01,0x00,
@@ -891,6 +895,8 @@ public class GT9MainActivity extends AppCompatActivity
 
         return true;
     }
+
+*/
 }
 
 class OpenDevicesReceiver extends BroadcastReceiver {

app/src/main/java/com/example/administrator/wingcool_gt9_apk/NoiseAnalysis.java

@@ -480,8 +480,13 @@ public class NoiseAnalysis extends AppCompatActivity
         Collection<UsbDevice> values = deviceList.values();
         if (!values.isEmpty()) {
             for (UsbDevice usbDevice : values) {
-                int productId = usbDevice.getProductId();
-                if (productId == 0x0818 || productId == 0x0001) {  //0x0001是奕力的PID
+                //int productId = usbDevice.getProductId();
+                int vendorId = usbDevice.getVendorId();
+                //if (productId == 0x0818 || productId == 0x0001 )
+                if (( vendorId == 0x27C0)
+                        ||(vendorId == 0x222A)    //奕力的VID
+                        ||(vendorId == 0x056A))   //8191主动笔和Wacom主动笔
+                {  //0x0001是奕力的PID
 
                     if (mUsbManager.hasPermission(usbDevice)) {
 

app/src/main/res/layout-hdpi/activity_gt9_main.xml

@@ -172,7 +172,7 @@
 
                 </RadioGroup>
             </LinearLayout>
-
+<!--
             <Button
                 android:id="@+id/bt_tcpstart"
                 android:layout_width="wrap_content"
@@ -190,7 +190,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="0.196" />
-
+-->
             <Button
                 android:id="@+id/ConfigSetting"
                 android:layout_width="wrap_content"

app/src/main/res/layout-land-hdpi/activity_gt9_main.xml

@@ -172,7 +172,7 @@
 
                 </RadioGroup>
             </LinearLayout>
-
+<!--
             <Button
                 android:id="@+id/bt_tcpstart"
                 android:layout_width="wrap_content"
@@ -190,7 +190,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="0.196" />
-
+-->
             <Button
                 android:id="@+id/ConfigSetting"
                 android:layout_width="wrap_content"

app/src/main/res/layout-land-mdpi/activity_gt9_main.xml

@@ -172,7 +172,7 @@
 
                 </RadioGroup>
             </LinearLayout>
-
+<!--
             <Button
                 android:id="@+id/bt_tcpstart"
                 android:layout_width="wrap_content"
@@ -190,7 +190,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="0.196" />
-
+-->
             <Button
                 android:id="@+id/ConfigSetting"
                 android:layout_width="wrap_content"

app/src/main/res/layout-land-xhdpi/activity_gt9_main.xml

@@ -172,7 +172,7 @@
 
                 </RadioGroup>
             </LinearLayout>
-
+<!--
             <Button
                 android:id="@+id/bt_tcpstart"
                 android:layout_width="wrap_content"
@@ -190,7 +190,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="0.196" />
-
+-->
             <Button
                 android:id="@+id/ConfigSetting"
                 android:layout_width="wrap_content"

app/src/main/res/layout-land-xxhdpi/activity_gt9_main.xml

@@ -172,7 +172,7 @@
 
                 </RadioGroup>
             </LinearLayout>
-
+<!--
             <Button
                 android:id="@+id/bt_tcpstart"
                 android:layout_width="wrap_content"
@@ -190,7 +190,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="0.196" />
-
+-->
             <Button
                 android:id="@+id/ConfigSetting"
                 android:layout_width="wrap_content"

app/src/main/res/layout-land-xxxhdpi/activity_gt9_main.xml

@@ -172,7 +172,7 @@
 
                 </RadioGroup>
             </LinearLayout>
-
+<!--
             <Button
                 android:id="@+id/bt_tcpstart"
                 android:layout_width="wrap_content"
@@ -190,7 +190,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="0.196" />
-
+-->
             <Button
                 android:id="@+id/ConfigSetting"
                 android:layout_width="wrap_content"

app/src/main/res/layout-land/activity_gt9_main.xml

@@ -172,7 +172,7 @@
 
                 </RadioGroup>
             </LinearLayout>
-
+<!--
             <Button
                 android:id="@+id/bt_tcpstart"
                 android:layout_width="wrap_content"
@@ -190,7 +190,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="0.196" />
-
+-->
             <Button
                 android:id="@+id/ConfigSetting"
                 android:layout_width="wrap_content"

app/src/main/res/layout-mdpi/activity_gt9_main.xml

@@ -172,7 +172,7 @@
 
                 </RadioGroup>
             </LinearLayout>
-
+<!--
             <Button
                 android:id="@+id/bt_tcpstart"
                 android:layout_width="wrap_content"
@@ -190,7 +190,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="0.196" />
-
+-->
             <Button
                 android:id="@+id/ConfigSetting"
                 android:layout_width="wrap_content"

app/src/main/res/layout-xhdpi/activity_gt9_main.xml

@@ -172,7 +172,7 @@
 
                 </RadioGroup>
             </LinearLayout>
-
+<!--
             <Button
                 android:id="@+id/bt_tcpstart"
                 android:layout_width="wrap_content"
@@ -190,7 +190,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="0.196" />
-
+-->
             <Button
                 android:id="@+id/ConfigSetting"
                 android:layout_width="wrap_content"

app/src/main/res/layout-xxhdpi/activity_gt9_main.xml

@@ -172,7 +172,7 @@
 
                 </RadioGroup>
             </LinearLayout>
-
+<!--
             <Button
                 android:id="@+id/bt_tcpstart"
                 android:layout_width="wrap_content"
@@ -190,7 +190,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="0.196" />
-
+-->
             <Button
                 android:id="@+id/ConfigSetting"
                 android:layout_width="wrap_content"

app/src/main/res/layout-xxxhdpi/activity_gt9_main.xml

@@ -172,7 +172,7 @@
 
                 </RadioGroup>
             </LinearLayout>
-
+<!--
             <Button
                 android:id="@+id/bt_tcpstart"
                 android:layout_width="wrap_content"
@@ -190,7 +190,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="0.196" />
-
+-->
             <Button
                 android:id="@+id/ConfigSetting"
                 android:layout_width="wrap_content"

app/src/main/res/layout/activity_gt9_main.xml

@@ -172,7 +172,7 @@
 
                 </RadioGroup>
             </LinearLayout>
-
+<!--
             <Button
                 android:id="@+id/bt_tcpstart"
                 android:layout_width="wrap_content"
@@ -190,7 +190,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="0.196" />
-
+-->
             <Button
                 android:id="@+id/ConfigSetting"
                 android:layout_width="wrap_content"