改用GridLayout显示数据，但是GT7数据量比较多，显示和操作特别慢

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

@@ -26,11 +26,14 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.GridLayout;
 import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import org.w3c.dom.Text;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -106,6 +109,7 @@ public class DataAnalysis extends AppCompatActivity
     private TextView tvDataContent;  //显示当前处于何种数值模式：原始值、差值、基准……
     private TextView tvMAD;          //显示最大相邻偏差
     private TextView mtextView;
+    private byte byDisplayFrame;   //间隔显示帧数
 
     public String stTestLog;   //最大最小值测试信息存放字符串
     String stTestLogShow= "";  //最大最小值测试信息合并起来存放字符串
@@ -118,6 +122,8 @@ public class DataAnalysis extends AppCompatActivity
 
     private EditText edtShortCircuitInfo;  //the info of short circuit test
 
+    private GridLayout textGridLayout;
+
     private static final byte gt9110h_short_dsp_code[] = {
         0x02,0x0c,(byte)0xb7,(byte)0x8f,0x08,0x7e,0x00,0x7f,0x71,0x7d,0x00,0x7b,0x01,0x7a,(byte)0xa5,0x79,
         (byte)0xc1,0x12,0x09,0x1f,(byte)0xe5,0x08,0x70,0x03,0x02,0x01,(byte)0xbb,(byte)0xd3,(byte)0x94,0x04,0x40,0x03,
@@ -591,6 +597,8 @@ public class DataAnalysis extends AppCompatActivity
         btn_ManualdiffdataShow.setEnabled(false);
         btn_Manualreff.setEnabled(false);
         btn_Test.setEnabled(false);
+
+        textGridLayout = (GridLayout)findViewById(R.id.AllGridLayout);
     }
 
     /**
@@ -923,14 +931,14 @@ public class DataAnalysis extends AppCompatActivity
             return 0x77;  //用0x77来表示传输失败
 
         //SystemClock.sleep(12);  //加长时间，避免数据显示错乱乱闪
-        SystemClock.sleep(24);  //加长时间，避免数据显示错乱乱闪
+        SystemClock.sleep(110);  //加长时间，避免数据显示错乱乱闪
 
         isReceiverMessage = false;  //先关闭循环接收信息
 
         i = mUsbDeviceConnection.bulkTransfer(mUsbEndpointIn, mBytes, 0, 0x40, 3000);
 
         //SystemClock.sleep(12);  //加长时间，避免数据显示错乱乱闪
-        SystemClock.sleep(24);  //加长时间，避免数据显示错乱乱闪
+        SystemClock.sleep(110);  //加长时间，避免数据显示错乱乱闪
 
         if (i == 0x40)
             return mBytes[1];
@@ -1005,7 +1013,7 @@ public class DataAnalysis extends AppCompatActivity
     }
 
     public void initTextView() {
-        mtextView = (TextView) findViewById(R.id.textView);
+        //mtextView = (TextView) findViewById(R.id.textView);
         tvMaximum = (TextView) findViewById(R.id.maximumshow);
         tvMinimum = (TextView) findViewById(R.id.minimumshow);
         tvDataContent = (TextView) findViewById(R.id.datacontentshow);
@@ -1088,7 +1096,16 @@ public class DataAnalysis extends AppCompatActivity
 
                         switch (showFlag) {
                             case 1:// rawdata
+                                //if (byDisplayFrame == 5){
+                                //    byDisplayFrame = 0;
+                                //
+                                //    mHandler.sendEmptyMessage(RAWDATA_MESSAGE);
+                                //}else
+                                //{
+                                //    byDisplayFrame++;
+                                //}
                                 mHandler.sendEmptyMessage(RAWDATA_MESSAGE);
+
                                 break;
                             case 2://manual diff
                                 if(count == 999)   //第一帧备份rawdata作为基准
@@ -1145,8 +1162,9 @@ public class DataAnalysis extends AppCompatActivity
     Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-
+            textGridLayout.removeAllViews();
             StringBuilder stringBuilder = new StringBuilder("");
+
             int idtemp;
             int i = 0;
             int tempcol = 0;
@@ -1162,20 +1180,24 @@ public class DataAnalysis extends AppCompatActivity
                     maxdata = 0;
                     mindata = 65535;
                     i = 0;
+
                     //控制行数
                     for (int row = 0; row < rownum; row++) {  //Sen
                         //控制列数
                         for (int col = 0; col < colnum + 1; col++) {  //Drv
 
+                            TextView textView = new TextView(mContext);
+                            GridLayout.LayoutParams params = new GridLayout.LayoutParams();
+
                             if (col == 0)
                             {
                                 dv = Integer.toString(row);
-                                if (row < 10){
-                                    dv = "0" + dv;
-                                }
+                                //if (row < 10){
+                                //    dv = "0" + dv;
+                                //}
 
-                                stringBuilder.append(dv);
-                                stringBuilder.append("│");
+                                //stringBuilder.append(dv);
+                                //stringBuilder.append("│");
 
                             }else{
                                 idtemp = (row + tempcol * rownum) * 2;
@@ -1188,7 +1210,7 @@ public class DataAnalysis extends AppCompatActivity
 
                                 dv = Integer.toString(datatemp[i]);
 
-                                stringBuilder.append(dv + "│");
+                                //stringBuilder.append(dv + "│");
 
                                 tempcol++;
 
@@ -1202,13 +1224,25 @@ public class DataAnalysis extends AppCompatActivity
                                 }
 
                                 i++;
+
+                                params.width = 45;
                             }
+
+
+                            textView.setText(dv);
+                            textView.setGravity(Gravity.CENTER);
+                            params.setMargins(2,1,2,1);
+
+                            textGridLayout.addView(textView,params);
+
+
                         }
                         tempcol = 0;
-                        stringBuilder.append("\n");
+                        //stringBuilder.append("\n");
+
                     }
 
-                    mtextView.setText(stringBuilder.toString());
+                    //mtextView.setText(stringBuilder.toString());
                     tvMaximum.setText(Integer.toString(maxdata));
                     tvMinimum.setText(Integer.toString(mindata));
                     break;
@@ -1233,20 +1267,23 @@ public class DataAnalysis extends AppCompatActivity
                         //控制列数
                         for (int col = 0; col < colnum + 1; col++) {  //Drv
 
+                            TextView textView = new TextView(mContext);
+                            GridLayout.LayoutParams params = new GridLayout.LayoutParams();
+
                             if (col == 0){
                                 dv = Integer.toString(row);
-                                if (row < 10){
-                                    dv = "0" + dv;
-                                }
+                                //if (row < 10){
+                                //    dv = "0" + dv;
+                                //}
 
-                                stringBuilder.append(dv);
-                                stringBuilder.append("│");
+                                //stringBuilder.append(dv);
+                                //stringBuilder.append("│");
                             }else{
                                 idtemp = row + tempcol * rownum;
                                 datatemp[i] = (mRawdataBytes[idtemp] & 0xFF);
                                 dv = Integer.toString(datatemp[i]);
 
-                                stringBuilder.append(dv + "│");
+                                //stringBuilder.append(dv + "│");
 
                                 tempcol++;
 
@@ -1258,12 +1295,22 @@ public class DataAnalysis extends AppCompatActivity
                                 if (datatemp[i] < mindata){
                                     mindata = datatemp[i];
                                 }
+
+                                params.width = 45;
                             }
+
+                            //textView.setMinimumWidth(8);
+                            textView.setText(dv);
+                            textView.setGravity(Gravity.CENTER);
+                            params.setMargins(2,1,2,1);
+                            //params.width = 45;
+
+                            textGridLayout.addView(textView,params);
                         }
                         tempcol = 0;
-                        stringBuilder.append("\n");
+                        //stringBuilder.append("\n");
                     }
-                    mtextView.setText(stringBuilder.toString());
+                    //mtextView.setText(stringBuilder.toString());
                     tvMaximum.setText(Integer.toString(maxdata));
                     tvMinimum.setText(Integer.toString(mindata));
                     break;
@@ -1274,15 +1321,20 @@ public class DataAnalysis extends AppCompatActivity
                     for (int row = 0; row < rownum; row++) {  //Sen
                         //控制列数
                         for (int col = 0; col < colnum + 1; col++) {  //Drv
+
+                            TextView textView = new TextView(mContext);
+                            GridLayout.LayoutParams params = new GridLayout.LayoutParams();
+
                             if (col == 0){
 
                                 dv = Integer.toString(row);
-                                if (row < 10){
-                                    dv = "0" + dv;
-                                }
+                                //if (row < 10){
+                                //    dv = "0" + dv;
+                                //}
+
+                                //stringBuilder.append(dv);
+                                //stringBuilder.append("│");
 
-                                stringBuilder.append(dv);
-                                stringBuilder.append("│");
                             }else{
 
                                 idtemp = row + tempcol * rownum;
@@ -1296,7 +1348,7 @@ public class DataAnalysis extends AppCompatActivity
                                 datatemp[i] = mManualRefInt[idtemp] - datatemp[i];
                                 dv = Integer.toString(datatemp[i]);
 
-                                stringBuilder.append(dv + "│");
+                                //stringBuilder.append(dv + "│");
 
                                 tempcol++;
 
@@ -1308,12 +1360,21 @@ public class DataAnalysis extends AppCompatActivity
                                 if (datatemp[i] < mindata){
                                     mindata = datatemp[i];
                                 }
+
+                                params.width = 45;
                             }
+
+
+                            textView.setText(dv);
+                            textView.setGravity(Gravity.CENTER);
+                            params.setMargins(2,1,2,1);
+                            //params.width = 45;
+                            textGridLayout.addView(textView,params);
                         }
                         tempcol = 0;
-                        stringBuilder.append("\n");
+                        //stringBuilder.append("\n");
                     }
-                    mtextView.setText(stringBuilder.toString());
+                    //mtextView.setText(stringBuilder.toString());
                     tvMaximum.setText(Integer.toString(maxdata));
                     tvMinimum.setText(Integer.toString(mindata));
                     break;
@@ -2293,6 +2354,11 @@ public class DataAnalysis extends AppCompatActivity
             edt_RowNum.setText(Integer.toString(rownum));
         }
 
+        textGridLayout.setColumnCount(colnum + 1);
+        textGridLayout.setRowCount(rownum);
+
+        byDisplayFrame = 0;
+
         btn_RawdataShow.setEnabled(false);
         btn_DiffdataShow.setEnabled(false);
         btn_ReffdataShow.setEnabled(false);

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

@@ -27,26 +27,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <LinearLayout
-                    android:id="@+id/TextLinearLayout"
+                <GridLayout
+                    xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:id="@+id/AllGridLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginBottom="0dp"
-                    android:orientation="vertical"
-                    tools:context=".DataAnalysis">
-
-                    <TextView
-                        android:id="@+id/textView"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:text=""
-                        android:textSize="16dp"/>
-                </LinearLayout>
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                </GridLayout>
+
             </HorizontalScrollView>
 
             <GridLayout

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

@@ -27,26 +27,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <LinearLayout
-                    android:id="@+id/TextLinearLayout"
+                <GridLayout
+                    xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:id="@+id/AllGridLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginBottom="0dp"
-                    android:orientation="vertical"
-                    tools:context=".DataAnalysis">
-
-                    <TextView
-                        android:id="@+id/textView"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:text=""
-                        android:textSize="16dp"/>
-                </LinearLayout>
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                </GridLayout>
+
             </HorizontalScrollView>
 
             <GridLayout

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

@@ -27,26 +27,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <LinearLayout
-                    android:id="@+id/TextLinearLayout"
+                <GridLayout
+                    xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:id="@+id/AllGridLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginBottom="0dp"
-                    android:orientation="vertical"
-                    tools:context=".DataAnalysis">
-
-                    <TextView
-                        android:id="@+id/textView"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:text=""
-                        android:textSize="16dp"/>
-                </LinearLayout>
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                </GridLayout>
+
             </HorizontalScrollView>
 
             <GridLayout

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

@@ -27,26 +27,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <LinearLayout
-                    android:id="@+id/TextLinearLayout"
+                <GridLayout
+                    xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:id="@+id/AllGridLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginBottom="0dp"
-                    android:orientation="vertical"
-                    tools:context=".DataAnalysis">
-
-                    <TextView
-                        android:id="@+id/textView"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:text=""
-                        android:textSize="16dp"/>
-                </LinearLayout>
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                </GridLayout>
+
             </HorizontalScrollView>
 
             <GridLayout

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

@@ -27,26 +27,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <LinearLayout
-                    android:id="@+id/TextLinearLayout"
+                <GridLayout
+                    xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:id="@+id/AllGridLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginBottom="0dp"
-                    android:orientation="vertical"
-                    tools:context=".DataAnalysis">
-
-                    <TextView
-                        android:id="@+id/textView"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:text=""
-                        android:textSize="16dp"/>
-                </LinearLayout>
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                </GridLayout>
+
             </HorizontalScrollView>
 
             <GridLayout

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

@@ -27,26 +27,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <LinearLayout
-                    android:id="@+id/TextLinearLayout"
+                <GridLayout
+                    xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:id="@+id/AllGridLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginBottom="0dp"
-                    android:orientation="vertical"
-                    tools:context=".DataAnalysis">
-
-                    <TextView
-                        android:id="@+id/textView"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:text=""
-                        android:textSize="16dp"/>
-                </LinearLayout>
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                </GridLayout>
+
             </HorizontalScrollView>
 
             <GridLayout

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

@@ -27,26 +27,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <LinearLayout
-                    android:id="@+id/TextLinearLayout"
+                <GridLayout
+                    xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:id="@+id/AllGridLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginBottom="0dp"
-                    android:orientation="vertical"
-                    tools:context=".DataAnalysis">
-
-                    <TextView
-                        android:id="@+id/textView"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:text=""
-                        android:textSize="16dp"/>
-                </LinearLayout>
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                </GridLayout>
+
             </HorizontalScrollView>
 
             <GridLayout

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

@@ -27,26 +27,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <LinearLayout
-                    android:id="@+id/TextLinearLayout"
+                <GridLayout
+                    xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:id="@+id/AllGridLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginBottom="0dp"
-                    android:orientation="vertical"
-                    tools:context=".DataAnalysis">
-
-                    <TextView
-                        android:id="@+id/textView"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:text=""
-                        android:textSize="16dp"/>
-                </LinearLayout>
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                </GridLayout>
+
             </HorizontalScrollView>
 
             <GridLayout

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

@@ -27,26 +27,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <LinearLayout
-                    android:id="@+id/TextLinearLayout"
+                <GridLayout
+                    xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:id="@+id/AllGridLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginBottom="0dp"
-                    android:orientation="vertical"
-                    tools:context=".DataAnalysis">
-
-                    <TextView
-                        android:id="@+id/textView"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:text=""
-                        android:textSize="16dp"/>
-                </LinearLayout>
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                </GridLayout>
+
             </HorizontalScrollView>
 
             <GridLayout

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

@@ -27,26 +27,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <LinearLayout
-                    android:id="@+id/TextLinearLayout"
+                <GridLayout
+                    xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:id="@+id/AllGridLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginBottom="0dp"
-                    android:orientation="vertical"
-                    tools:context=".DataAnalysis">
-
-                    <TextView
-                        android:id="@+id/textView"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:text=""
-                        android:textSize="16dp"/>
-                </LinearLayout>
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                </GridLayout>
+
             </HorizontalScrollView>
 
             <GridLayout

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

@@ -27,26 +27,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <LinearLayout
-                    android:id="@+id/TextLinearLayout"
+                <GridLayout
+                    xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:id="@+id/AllGridLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginBottom="0dp"
-                    android:orientation="vertical"
-                    tools:context=".DataAnalysis">
-
-                    <TextView
-                        android:id="@+id/textView"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:text=""
-                        android:textSize="16dp"/>
-                </LinearLayout>
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                </GridLayout>
+
             </HorizontalScrollView>
 
             <GridLayout

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

@@ -27,26 +27,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <LinearLayout
-                    android:id="@+id/TextLinearLayout"
+                <GridLayout
+                    xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:id="@+id/AllGridLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginBottom="0dp"
-                    android:orientation="vertical"
-                    tools:context=".DataAnalysis">
-
-                    <TextView
-                        android:id="@+id/textView"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:text=""
-                        android:textSize="16dp"/>
-                </LinearLayout>
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                </GridLayout>
+
             </HorizontalScrollView>
 
             <GridLayout

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

@@ -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.3_20210914-Release Version</string>
+    <string name="version">APK Version:v1.1.3_20210922-Release Version</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>

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

@@ -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.3_20210914-发布版本</string>
+    <string name="version">APK版本：v1.1.3_20210922-发布版本</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>