v1.1.1_20210816，修改一些显示问题，出demo版本。

app/build.gradle

@@ -14,7 +14,7 @@ android {
         variant ->
             variant.outputs.all{
                 //´Ë´¦Ö¸¶¨Éú³ÉµÄapkÎļþÃû
-                outputFileName = "WingCoolAPK_V1.0_20210601.apk"
+                outputFileName = "WingCoolAPK(GT9)_V1.1.1_20210816.apk"
             }
     }
     lintOptions {

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

@@ -1,5 +1,6 @@
 package com.example.administrator.wingcool_gt9_apk;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
@@ -20,6 +21,7 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -99,6 +101,11 @@ public class GT9MainActivity extends AppCompatActivity
 
     public static List<Activity> activityList = new LinkedList();
 
+    private int iProductId;
+    private int iVendorId;
+    private String strVersion;
+    private int iDeviceId;
+
 /*
     private Button bt_tcpstart;
     private final static String TAG = "Main2Activity-------->";
@@ -120,8 +127,8 @@ public class GT9MainActivity extends AppCompatActivity
                     //mError.setText("");
                     //mSendMessage.setEnabled(true);
                     //String avalue = "S818 is connected";
-
-                    mShow.setText(R.string.connected);//????????
+                    //mShow.setText(getResources().getString(R.string.connected));
+                    mShow.setText("S"+Integer.toHexString(iProductId)+" "+getResources().getString(R.string.connected));//????????
                     //bt_tcpstart.setEnabled(true);
                     break;
                 case CONNECTED_FAILED://??????????????????
@@ -129,7 +136,7 @@ public class GT9MainActivity extends AppCompatActivity
                     //mError.setText("");
                     //mSendMessage.setEnabled(true);
 
-                    mShow.setText(R.string.disconnected);//????????
+                    mShow.setText(getResources().getString(R.string.disconnected));//????????
                     break;
 
                 case RECEIVER_MESSAGE_SUCCESS://??????????????
@@ -555,10 +562,10 @@ public class GT9MainActivity extends AppCompatActivity
 
                             for (UsbDevice usbDevice : deviceList.values()) {
                                 //int productId = usbDevice.getProductId();
-                                int vendorId = usbDevice.getVendorId();
-                                if (( vendorId == 0x27C0)
-                                        ||(vendorId == 0x222A)    //奕力的VID
-                                        ||(vendorId == 0x056A))   //8191主动笔和Wacom主动笔
+                                iVendorId = usbDevice.getVendorId();
+                                if ((iVendorId == 0x27C0)
+                                        ||(iVendorId == 0x222A)    //奕力的VID
+                                        ||(iVendorId == 0x056A))   //8191主动笔和Wacom主动笔
                                 {
                                     isS818Device = true;
                                     if (mUsbManager.hasPermission(usbDevice)) {
@@ -601,17 +608,18 @@ public class GT9MainActivity extends AppCompatActivity
     /**
      * ??????????(????) , ??????????Accessory?????? , ??????PID??????Google??????2?????????????????? ,
      */
+    @SuppressLint("NewApi")
     private void initDevice() {
         HashMap<String, UsbDevice> deviceList = mUsbManager.getDeviceList();
         Collection<UsbDevice> values = deviceList.values();
         if (!values.isEmpty()) {
             for (UsbDevice usbDevice : values) {
                 //int productId = usbDevice.getProductId();
-                int vendorId = usbDevice.getVendorId();
+                iVendorId = usbDevice.getVendorId();
                 //if (productId == 0x0818 || productId == 0x0001 )
-                if (( vendorId == 0x27C0)
-                        ||(vendorId == 0x222A)    //奕力的VID
-                        ||(vendorId == 0x056A))   //8191主动笔和Wacom主动笔
+                if (( iVendorId == 0x27C0)
+                        ||(iVendorId == 0x222A)    //奕力的VID
+                        ||(iVendorId == 0x056A))   //8191主动笔和Wacom主动笔
                 {  //0x0001是奕力的PID
 
                     if (mUsbManager.hasPermission(usbDevice)) {
@@ -663,6 +671,7 @@ public class GT9MainActivity extends AppCompatActivity
                                     mUsbInterface = usbInterface;
                                     mUsbDeviceConnection = mUsbManager.openDevice(usbDevice);
                                     if(null != mUsbEndpointIn){
+                                        iProductId = usbDevice.getProductId();
                                         mHandler.sendEmptyMessage(CONNECTED_SUCCESS);
                                     }
 

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

@@ -349,6 +349,7 @@
                 android:layout_height="match_parent"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 android:layout_marginEnd="8dp"
                 android:orientation="horizontal"
                 tools:context=".DataAnalysis">

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

@@ -349,6 +349,7 @@
                 android:layout_height="match_parent"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 android:layout_marginEnd="8dp"
                 android:orientation="horizontal"
                 tools:context=".DataAnalysis">

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

@@ -349,6 +349,7 @@
                 android:layout_height="match_parent"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 android:layout_marginEnd="8dp"
                 android:orientation="horizontal"
                 tools:context=".DataAnalysis">

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

@@ -349,6 +349,7 @@
                 android:layout_height="match_parent"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 android:layout_marginEnd="8dp"
                 android:orientation="horizontal"
                 tools:context=".DataAnalysis">

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

@@ -349,6 +349,7 @@
                 android:layout_height="match_parent"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 android:layout_marginEnd="8dp"
                 android:orientation="horizontal"
                 tools:context=".DataAnalysis">

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

@@ -349,6 +349,7 @@
                 android:layout_height="match_parent"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 android:layout_marginEnd="8dp"
                 android:orientation="horizontal"
                 tools:context=".DataAnalysis">

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

@@ -349,6 +349,7 @@
                 android:layout_height="match_parent"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 android:layout_marginEnd="8dp"
                 android:orientation="horizontal"
                 tools:context=".DataAnalysis">

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

@@ -349,6 +349,7 @@
                 android:layout_height="match_parent"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 android:layout_marginEnd="8dp"
                 android:orientation="horizontal"
                 tools:context=".DataAnalysis">

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

@@ -349,6 +349,7 @@
                 android:layout_height="match_parent"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 android:layout_marginEnd="8dp"
                 android:orientation="horizontal"
                 tools:context=".DataAnalysis">

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

@@ -349,6 +349,7 @@
                 android:layout_height="match_parent"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 android:layout_marginEnd="8dp"
                 android:orientation="horizontal"
                 tools:context=".DataAnalysis">

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

@@ -349,6 +349,7 @@
                 android:layout_height="match_parent"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 android:layout_marginEnd="8dp"
                 android:orientation="horizontal"
                 tools:context=".DataAnalysis">

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

@@ -349,6 +349,7 @@
                 android:layout_height="match_parent"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 android:layout_marginEnd="8dp"
                 android:orientation="horizontal"
                 tools:context=".DataAnalysis">

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

@@ -2,7 +2,7 @@
     <!-- Activity_gt9_main -->
     <string name="companyname">Shenzhen Qianhai Yungu Technology Co., LTD</string>
     <string name="connectdevice">Please Connect Device</string>
-    <string name="connected">S81x is connected</string>
+    <string name="connected">is connected</string>
     <string name="disconnected">S81x is disconnected</string>
     <string name="tcpstart">TCP Start</string>
     <string name="tcpstop">TCP Stop</string>
@@ -99,7 +99,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:v1.1.1_20210813-Release Version</string>
+    <string name="version">APK Version:v1.1.1_20210816-Release Version</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>

app/src/main/res/values/strings.xml

@@ -2,7 +2,7 @@
     <!-- Activity_gt9_main -->
     <string name="companyname">深圳前海云鼓科技有限公司</string>
     <string name="connectdevice">请 连 接 设 备</string>
-    <string name="connected">S81x 已 连 接</string>
+    <string name="connected">已 连 接</string>
     <string name="tcpstart">TCP 启 动</string>
     <string name="tcpstop">TCP 停 止</string>
     <string name="disconnected">S81x 已 断 开</string>
@@ -99,7 +99,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版本：v1.1.1_20210813-发布版本</string>
+    <string name="version">APK版本：v1.1.1_20210816-发布版本</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>