可以读取显示GT7系列主动笔数据

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

@@ -57,6 +57,7 @@ public class DataAnalysis extends AppCompatActivity
     private static final int DIFF_MESSAGE = 5;
     private static final int MANUALDIFF_MESSAGE = 6;
     private static final int TEST_DATA_MESSAGE = 7;
+    private static final int STYLUS_DATA_MESSAGE = 8;
 
     private static final String USB_ACTION = "com.host2device";
     private static final String ACTION_USB_PERMISSION = "com.host2device.USB_PERMISSION";
@@ -77,6 +78,7 @@ public class DataAnalysis extends AppCompatActivity
     private Button btn_ReffdataShow;
     private Button btn_ManualdiffdataShow;
     private Button btn_Manualreff;
+    private Button btn_StylusDataShow;
     private Button btn_Test;
     private Button btn_Stop;
 
@@ -591,6 +593,7 @@ public class DataAnalysis extends AppCompatActivity
         btn_ReffdataShow = (Button) findViewById(R.id.reffdata);
         btn_ManualdiffdataShow = (Button) findViewById(R.id.manualdiff);
         btn_Manualreff = (Button) findViewById(R.id.manualreff);
+        btn_StylusDataShow = (Button) findViewById(R.id.stylusdata);
         btn_Test = (Button) findViewById(R.id.testting);
         btn_Stop = (Button) findViewById(R.id.stop);
 
@@ -599,6 +602,7 @@ public class DataAnalysis extends AppCompatActivity
         //btn_ReffdataShow.setEnabled(false);
         //btn_ManualdiffdataShow.setEnabled(false);
         btn_Manualreff.setEnabled(false);
+        //btn_StylusDataShow.setEnabled(false);
         //btn_Stop.setEnabled(false);
     }
 
@@ -620,6 +624,7 @@ public class DataAnalysis extends AppCompatActivity
         btn_ReffdataShow.setOnClickListener(this);
         btn_ManualdiffdataShow.setOnClickListener(this);
         btn_Manualreff.setOnClickListener(this);
+        btn_StylusDataShow.setOnClickListener(this);
         btn_Test.setOnClickListener(this);
         btn_Stop.setOnClickListener(this);
     }
@@ -630,6 +635,7 @@ public class DataAnalysis extends AppCompatActivity
         btn_ReffdataShow.setEnabled(false);
         btn_ManualdiffdataShow.setEnabled(false);
         btn_Manualreff.setEnabled(false);
+        btn_StylusDataShow.setEnabled(false);
         btn_Test.setEnabled(false);
 
         textGridLayout = (GridLayout)findViewById(R.id.AllGridLayout);
@@ -1025,8 +1031,14 @@ public class DataAnalysis extends AppCompatActivity
         byte maddressLow;  //rawdata address
         byte msubcommand = (byte)0x0d;  //  READ_SYNC
         byte mdata;
+        int ilength = colnum * rownum * 2;
 
-        if(!iicRead(showAddressHigh,showAddressLow,mRawdataBytes,colnum * rownum * 2)) {  //读取rawData
+        if (showFlag == 8)
+        {
+            ilength = (colnum + rownum + 2) * 2;
+        }
+
+        if(!iicRead(showAddressHigh,showAddressLow,mRawdataBytes,ilength)) {  //读取rawData
             return false;
         }
 
@@ -1132,9 +1144,9 @@ public class DataAnalysis extends AppCompatActivity
                             break;
                         }
                     }
-                    if ((byDisplayFrame == byDisplayFrameCount) || (showFlag == 6)) {
+                    if (byDisplayFrame == byDisplayFrameCount) {
 
-                        if (showFlag != 6) {
+                        if ((showFlag != 6) && (showFlag != 8)) {  //测试模式和读取主动笔数据时
                             byDisplayFrameCount = 0;
                         }
 
@@ -1181,6 +1193,11 @@ public class DataAnalysis extends AppCompatActivity
                                 case 6:  //test
                                     mHandler.sendEmptyMessage(TEST_DATA_MESSAGE);
                                     break;
+                                case 8:  //stylusdata
+                                    mHandler.sendEmptyMessage(STYLUS_DATA_MESSAGE);
+                                    break;
+                                default:
+                                    break;
                             }
                         } else {
                             iicByteWrite(maddressHigh, maddressLow, msubcommand, mdata);
@@ -1302,6 +1319,7 @@ public class DataAnalysis extends AppCompatActivity
                     btn_ReffdataShow.setEnabled(true);
                     btn_ManualdiffdataShow.setEnabled(true);
                     //btn_Manualreff.setEnabled(false);
+                    btn_StylusDataShow.setEnabled(true);
                     btn_Test.setEnabled(true);
                     break;
 
@@ -1616,12 +1634,60 @@ public class DataAnalysis extends AppCompatActivity
                         btn_ReffdataShow.setEnabled(true);
                         btn_ManualdiffdataShow.setEnabled(true);
                         btn_Manualreff.setEnabled(false);
+                        btn_StylusDataShow.setEnabled(true);
                         btn_Test.setEnabled(true);
                     }
                     edt_TestiInformation.setText(stTestLogShow + stTestLog);
                     edt_TestiInformation.setSelection(edt_TestiInformation.getText().length());
 
                     break;
+
+                case STYLUS_DATA_MESSAGE:
+                    int layindex = 0;
+
+                    for (int index = 0; index < (rownum + colnum + 2); index++) {  //驱动和感应数据之间留有2个空位为0
+
+                        if ((index == colnum) || (index == (colnum + 1)))  //跳过两个空位
+                        {
+                            layindex = 0; //开始感应数据的排列
+
+                            continue;
+                        }
+
+                        TextView textView = new TextView(mContext);
+                        GridLayout.LayoutParams params = new GridLayout.LayoutParams();
+
+                        datatemp[index] = ((mRawdataBytes[index * 2 + 1] & 0xFF) << 8) + (mRawdataBytes[index * 2] & 0xFF);
+
+                        dv = Integer.toString(datatemp[index]);
+
+                        if (datatemp[index] > 80) {
+                            textView.setTextColor(Color.parseColor("#FF0000"));
+                        }
+
+                        layindex++;
+
+                        params.width = 40;
+
+                        textView.setText(dv);
+                        textView.setGravity(Gravity.CENTER);
+                        params.setMargins(2,1,2,1);
+
+                        if (index < colnum) {  //驱动数据排列
+                            params.columnSpec = GridLayout.spec(0, 1);  //列的位置
+                            params.rowSpec = GridLayout.spec(layindex, 1);   //行的位置
+                        }else{  //感应数据排列
+                            params.columnSpec = GridLayout.spec(layindex,1);  //列的位置
+                            params.rowSpec = GridLayout.spec(0,1);   //行的位置
+                        }
+                        //params.width = 45;
+                        textGridLayout.addView(textView, params);
+                    }
+
+                    break;
+
+                default:
+                    break;
             }
         }
     };
@@ -2839,9 +2905,13 @@ public class DataAnalysis extends AppCompatActivity
             edt_RowNum.setText(Integer.toString(rownum));
         }
 
-        textGridLayout.setColumnCount(colnum + 1);
-        textGridLayout.setRowCount(rownum);
+        if (showFlag != 8) {
+            textGridLayout.removeAllViews();
 
+            textGridLayout.setColumnCount(colnum + 1);
+            textGridLayout.setRowCount(rownum);
+        }
+        
         byDisplayFrame = 7;
         byDisplayFrameCount = 7;
         if (byProductType == GT7)  //GT7 数据多，要多加时间间隔
@@ -2855,6 +2925,7 @@ public class DataAnalysis extends AppCompatActivity
         btn_ReffdataShow.setEnabled(false);
         btn_ManualdiffdataShow.setEnabled(false);
         btn_Manualreff.setEnabled(false);
+        btn_StylusDataShow.setEnabled(false);
         btn_Test.setEnabled(false);
 
         switch (view.getId()) {
@@ -2916,6 +2987,7 @@ public class DataAnalysis extends AppCompatActivity
                 btn_ReffdataShow.setEnabled(true);
                 btn_ManualdiffdataShow.setEnabled(true);
                 //btn_Manualreff.setEnabled(false);
+                btn_StylusDataShow.setEnabled(true);
                 btn_Test.setEnabled(true);
                 break;
 
@@ -2956,6 +3028,28 @@ public class DataAnalysis extends AppCompatActivity
                 }
                 break;
 
+            case R.id.stylusdata:  //主动笔数据
+                if (byProductType == GT7)  //GT7系列才显示
+                {
+                    showFlag = 8;
+
+                    changeToDebugMode();
+
+                    textGridLayout.removeAllViews();
+
+                    textGridLayout.setColumnCount(rownum + 1);  //列数=感应数
+                    textGridLayout.setRowCount(colnum + 1); //行数=驱动数
+
+                    showAddressHigh = (byte)0xDD;
+                    showAddressLow = (byte)0x58;
+
+                    if(count == 1000) {
+                        tvDataContent.setText("[" + getResources().getString(R.string.stylusdata) + "]");
+                        showRawdata();
+                    }
+                }
+                break;
+
             case R.id.testting:  //start test
 
                 if (edt_Maximum.getText().length() == 0)
@@ -2986,6 +3080,7 @@ public class DataAnalysis extends AppCompatActivity
                     btn_ReffdataShow.setEnabled(true);
                     btn_ManualdiffdataShow.setEnabled(true);
                     //btn_Manualreff.setEnabled(false);
+                    btn_StylusDataShow.setEnabled(true);
                     btn_Test.setEnabled(true);
                     break;
                 }
@@ -3018,6 +3113,7 @@ public class DataAnalysis extends AppCompatActivity
                 btn_ReffdataShow.setEnabled(true);
                 btn_ManualdiffdataShow.setEnabled(true);
                 btn_Manualreff.setEnabled(false);
+                btn_StylusDataShow.setEnabled(true);
                 btn_Test.setEnabled(true);
                 //count = 1000;
                 //changeToNormalMode();
@@ -3076,6 +3172,7 @@ public class DataAnalysis extends AppCompatActivity
                 btn_ReffdataShow.setEnabled(true);
                 btn_ManualdiffdataShow.setEnabled(true);
                 btn_Manualreff.setEnabled(false);
+                btn_StylusDataShow.setEnabled(true);
                 btn_Test.setEnabled(true);
 
             }

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

@@ -309,6 +309,17 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/stylusdata"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/stylusdata"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/testting"
                     android:layout_width="match_parent"

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

@@ -309,6 +309,17 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/stylusdata"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/stylusdata"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/testting"
                     android:layout_width="match_parent"

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

@@ -309,6 +309,17 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/stylusdata"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/stylusdata"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/testting"
                     android:layout_width="match_parent"

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

@@ -309,6 +309,17 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/stylusdata"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/stylusdata"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/testting"
                     android:layout_width="match_parent"

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

@@ -309,6 +309,17 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/stylusdata"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/stylusdata"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/testting"
                     android:layout_width="match_parent"

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

@@ -309,6 +309,17 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/stylusdata"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/stylusdata"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/testting"
                     android:layout_width="match_parent"

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

@@ -309,6 +309,17 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/stylusdata"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/stylusdata"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/testting"
                     android:layout_width="match_parent"

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

@@ -309,6 +309,17 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/stylusdata"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/stylusdata"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/testting"
                     android:layout_width="match_parent"

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

@@ -309,6 +309,17 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/stylusdata"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/stylusdata"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/testting"
                     android:layout_width="match_parent"

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

@@ -309,6 +309,17 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/stylusdata"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/stylusdata"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/testting"
                     android:layout_width="match_parent"

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

@@ -309,6 +309,17 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/stylusdata"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/stylusdata"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/testting"
                     android:layout_width="match_parent"

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

@@ -309,6 +309,17 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/stylusdata"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/stylusdata"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/testting"
                     android:layout_width="match_parent"

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

@@ -61,6 +61,7 @@
     <string name="reffdata">Reffdata</string>
     <string name="manualdiff">Manualdiff</string>
     <string name="manualreff">Manualreff</string>
+    <string name="stylusdata">Stylus Data</string>
     <string name="test">Test</string>
     <string name="stop">Stop</string>
     <string name="cfgerror">Read cfg fail，please manually enter the Sen and Drv numbers</string>
@@ -102,7 +103,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.0.1_20211021-Debug Version</string>
+    <string name="version">APK Version:v2.0.1_20211028-Debug Version</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>

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

@@ -61,6 +61,7 @@
     <string name="reffdata">基准值</string>
     <string name="manualdiff">手动差值</string>
     <string name="manualreff">手动基准</string>
+    <string name="stylusdata">主动笔数据</string>
     <string name="test">测 试</string>
     <string name="stop">停 止</string>
     <string name="cfgerror">Cfg读取错误，请手动输入要显示的行列数</string>
@@ -102,7 +103,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.0.1_20211021-内部版本</string>
+    <string name="version">APK版本：v2.0.1_20211028-内部版本</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>