1、进入主界面改为横屏

2、修改数据分析界面的显示，计算平均值
3、内部版本为v0.0.0.1_20200818

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

@@ -11,6 +11,6 @@ public class ConstantsActivity extends AppCompatActivity {
     public static List<Activity> activityList = new ArrayList<>();
     public static Boolean bHaveChange = false;
 
-    public static String screenview = "portrait";
+    public static String screenview = "landscape";
     public static Boolean bScreenHaveChange = false;
 }

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

@@ -91,15 +91,14 @@ public class DataAnalysis extends AppCompatActivity
     private final int W = ViewGroup.LayoutParams.MATCH_PARENT;
     private int colnum;
     private int rownum;
-    private TextView tvMaximum;
-    private TextView tvMinimum;
-    private TextView tvMaxSubMin;
-    private TextView tvMaxDivMin;
-    private TextView tvDataContent;
-    private TextView tvAverage;
-    private TextView tvSTD;
-    private TextView tvATR;
-    private TextView tvMAD;
+    private TextView tvMaximum;      //显示最大值
+    private TextView tvMinimum;      //显示最小值
+    private TextView tvMaxSubMin;    //显示最大值减最小值
+    private TextView tvUniformity;   //显示一致性：最小值/最大值
+    private TextView tvDataContent;  //显示当前处于何种数值模式：原始值、差值、基准……
+    private TextView tvAverage;      //显示平均值
+    private TextView tvRMD;          //显示相对平均值偏差
+    private TextView tvMAD;          //显示最大相邻偏差
     private ArrayList<String> tabCol = new ArrayList<>();
     private ArrayList<String> tabH = new ArrayList<>();
 
@@ -638,11 +637,10 @@ public class DataAnalysis extends AppCompatActivity
         tvMaximum = (TextView) findViewById(R.id.maximumshow);
         tvMinimum = (TextView) findViewById(R.id.minimumshow);
         tvMaxSubMin = (TextView) findViewById(R.id.maxsubminshow);
-        tvMaxDivMin = (TextView) findViewById(R.id.maxdivminshow);
+        tvUniformity = (TextView) findViewById(R.id.uniformityshow);
         tvDataContent = (TextView) findViewById(R.id.datacontentshow);
         tvAverage = (TextView) findViewById(R.id.averageshow);
-        tvSTD = (TextView) findViewById(R.id.stdshow);
-        tvATR = (TextView) findViewById(R.id.atrshow);
+        tvRMD = (TextView) findViewById(R.id.rmdshow);
         tvMAD = (TextView) findViewById(R.id.madshow);
     }
 
@@ -755,11 +753,14 @@ public class DataAnalysis extends AppCompatActivity
             String dvhex;
             int maxdata;
             int mindata;
+            long laverage;  //平均值，临时存储和值
+            int iaverage;   //平均值
             switch (msg.what) {
                 case RAWDATA_MESSAGE://
                     //ShowData();
                     maxdata = 0;
                     mindata = 65535;
+                    laverage = 0;
                     //控制行数
                     for (int row = 0; row < rownum + 1; row++) {
                         //控制列数
@@ -824,6 +825,8 @@ public class DataAnalysis extends AppCompatActivity
                                 if (datatemp[i] < mindata){
                                     mindata = datatemp[i];
                                 }
+
+                                laverage += datatemp[i];
                             }
                         }
                         tempcol = 0;
@@ -831,16 +834,19 @@ public class DataAnalysis extends AppCompatActivity
                             temprow++;
                         }
                     }
+
+                    iaverage = (int)(laverage / (long) (rownum * colnum));
+
                     mtextView.setText(stringBuilder.toString());
                     tvMaximum.setText(Integer.toString(maxdata));
                     tvMinimum.setText(Integer.toString(mindata));
                     tvMaxSubMin.setText(Integer.toString(maxdata - mindata));
-                    if (mindata == 0){
-                        tvMaxDivMin.setText("NA");
+                    if (maxdata == 0){
+                        tvUniformity.setText("NA");
                     }else{
-                        tvMaxDivMin.setText(Integer.toString(maxdata/mindata));
+                        tvUniformity.setText(Integer.toString(100 - (mindata * 100) / maxdata));
                     }
-
+                    tvAverage.setText(Integer.toString(iaverage));
                     /*
                     for (int j = 0; j < rownum * colnum * 2; j++ ) {
                         // int v = mRawdataBytes[i] & 0xFF;
@@ -957,11 +963,7 @@ public class DataAnalysis extends AppCompatActivity
                     tvMaximum.setText(Integer.toString(maxdata));
                     tvMinimum.setText(Integer.toString(mindata));
                     tvMaxSubMin.setText(Integer.toString(maxdata - mindata));
-                    if (mindata == 0){
-                        tvMaxDivMin.setText("NA");
-                    }else {
-                        tvMaxDivMin.setText(Integer.toString(maxdata / mindata));
-                    }
+                    tvUniformity.setText("NA");
                     break;
                 case  MANUALDIFF_MESSAGE:
                     /*
@@ -1075,11 +1077,7 @@ public class DataAnalysis extends AppCompatActivity
                     tvMaximum.setText(Integer.toString(maxdata));
                     tvMinimum.setText(Integer.toString(mindata));
                     tvMaxSubMin.setText(Integer.toString(maxdata - mindata));
-                    if (mindata == 0){
-                        tvMaxDivMin.setText("NA");
-                    }else {
-                        tvMaxDivMin.setText(Integer.toString(maxdata / mindata));
-                    }
+                    tvUniformity.setText("NA");
                     break;
 
 

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

@@ -76,32 +76,22 @@ public class GT9MainActivity extends AppCompatActivity
 
     public static List<Activity> activityList = new LinkedList();
 
-    private int wproductId = 0xff;
-    private int wvendorId = 0xff;
-
     Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            StringBuilder stringBuilder = new StringBuilder("");
             switch (msg.what) {
                 case CONNECTED_SUCCESS://??????????????????
                     //mError.setText("");
                     //mSendMessage.setEnabled(true);
                     //String avalue = "S818 is connected";
-                    //stringBuilder.append(Integer.toString(wproductId));
-                    //stringBuilder.append(Integer.toString(wvendorId));
-                    //stringBuilder.append(R.string.connected);
-                    //mShow.setText(stringBuilder.toString());//????????
+
                     mShow.setText(R.string.connected);//????????
                     break;
                 case CONNECTED_FAILED://??????????????????
                     //String bvalue = "S818 is disconnected";
                     //mError.setText("");
                     //mSendMessage.setEnabled(true);
-                    //stringBuilder.append(Integer.toString(wproductId));
-                    //stringBuilder.append(Integer.toString(wvendorId));
-                    //stringBuilder.append(R.string.disconnected);
-                    //mShow.setText(stringBuilder.toString());//????????
+
                     mShow.setText(R.string.disconnected);//????????
                     break;
 
@@ -170,7 +160,7 @@ public class GT9MainActivity extends AppCompatActivity
         final RadioButton radioButtonLandscape = (RadioButton) findViewById(R.id.radio_landscape);
         final RadioButton radioButtonPortrait = (RadioButton) findViewById(R.id.radio_portrait);
 
-        if (ConstantsActivity.bScreenHaveChange.equals("landscape")) {
+        if (ConstantsActivity.screenview.equals("landscape")) {
             radioButtonLandscape.setChecked(true);
             radioButtonPortrait.setChecked(false);
         } else {
@@ -179,7 +169,7 @@ public class GT9MainActivity extends AppCompatActivity
         }
 
         if (ConstantsActivity.bScreenHaveChange == false) {
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         }
 
         screenradio.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@@ -383,8 +373,6 @@ public class GT9MainActivity extends AppCompatActivity
                             for (UsbDevice usbDevice : deviceList.values()) {
                                 int productId = usbDevice.getProductId();
                                 int vendorId = usbDevice.getVendorId();
-                                wproductId = productId;
-                                wvendorId = vendorId;
                                 if ((productId == 0x0818 && vendorId == 0x27C0)
                                         ||(productId == 0x0001 && vendorId == 0x222A))   //奕力的PID和VID
                                 {

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

@@ -136,37 +136,21 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/maxdivmin"
+                    android:id="@+id/uniformity"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/maxdivmin"
+                    android:text="@string/uniformity"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/maxdivminshow"
+                    android:id="@+id/uniformityshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/datacontent"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/datacontent"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/datacontentshow"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:text="[NA]"
-                    android:textSize="20dp"
-                    android:textColor="@color/back_red"/>
-
                 <TextView
                     android:id="@+id/average"
                     android:layout_row="1"
@@ -186,15 +170,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/std"
+                    android:id="@+id/rmd"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/std"
+                    android:text="@string/rmd"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/stdshow"
+                    android:id="@+id/rmdshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -202,15 +186,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/atr"
+                    android:id="@+id/mad"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/atr"
+                    android:text="@string/mad"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/atrshow"
+                    android:id="@+id/madshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -218,18 +202,18 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/mad"
+                    android:id="@+id/datacontent"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/mad"
+                    android:text="@string/datacontent"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/madshow"
+                    android:id="@+id/datacontentshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:text="NA"
+                    android:text="[NA]"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 

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

@@ -131,23 +131,24 @@
                     android:orientation="horizontal">
 
                     <RadioButton
-                        android:id="@+id/radio_portrait"
+                        android:id="@+id/radio_landscape"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:checked="true"
                         android:layout_marginLeft="16dp"
-                        android:text="@string/portrait"
+                        android:text="@string/landscape"
                         android:textSize="20dp"/>
 
                     <RadioButton
-                        android:id="@+id/radio_landscape"
+                        android:id="@+id/radio_portrait"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginLeft="16dp"
                         android:layout_marginRight="16dp"
-                        android:text="@string/landscape"
+                        android:text="@string/portrait"
                         android:textSize="20dp"/>
 
+                    
                 </RadioGroup>
             </LinearLayout>
 

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

@@ -136,37 +136,21 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/maxdivmin"
+                    android:id="@+id/uniformity"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/maxdivmin"
+                    android:text="@string/uniformity"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/maxdivminshow"
+                    android:id="@+id/uniformityshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/datacontent"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/datacontent"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/datacontentshow"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:text="[NA]"
-                    android:textSize="20dp"
-                    android:textColor="@color/back_red"/>
-
                 <TextView
                     android:id="@+id/average"
                     android:layout_row="1"
@@ -186,15 +170,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/std"
+                    android:id="@+id/rmd"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/std"
+                    android:text="@string/rmd"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/stdshow"
+                    android:id="@+id/rmdshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -202,15 +186,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/atr"
+                    android:id="@+id/mad"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/atr"
+                    android:text="@string/mad"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/atrshow"
+                    android:id="@+id/madshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -218,18 +202,18 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/mad"
+                    android:id="@+id/datacontent"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/mad"
+                    android:text="@string/datacontent"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/madshow"
+                    android:id="@+id/datacontentshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:text="NA"
+                    android:text="[NA]"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 

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

@@ -131,23 +131,24 @@
                     android:orientation="horizontal">
 
                     <RadioButton
-                        android:id="@+id/radio_portrait"
+                        android:id="@+id/radio_landscape"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:checked="true"
                         android:layout_marginLeft="16dp"
-                        android:text="@string/portrait"
+                        android:text="@string/landscape"
                         android:textSize="20dp"/>
 
                     <RadioButton
-                        android:id="@+id/radio_landscape"
+                        android:id="@+id/radio_portrait"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginLeft="16dp"
                         android:layout_marginRight="16dp"
-                        android:text="@string/landscape"
+                        android:text="@string/portrait"
                         android:textSize="20dp"/>
 
+                    
                 </RadioGroup>
             </LinearLayout>
 

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

@@ -136,37 +136,21 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/maxdivmin"
+                    android:id="@+id/uniformity"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/maxdivmin"
+                    android:text="@string/uniformity"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/maxdivminshow"
+                    android:id="@+id/uniformityshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/datacontent"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/datacontent"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/datacontentshow"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:text="[NA]"
-                    android:textSize="20dp"
-                    android:textColor="@color/back_red"/>
-
                 <TextView
                     android:id="@+id/average"
                     android:layout_row="1"
@@ -186,15 +170,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/std"
+                    android:id="@+id/rmd"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/std"
+                    android:text="@string/rmd"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/stdshow"
+                    android:id="@+id/rmdshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -202,15 +186,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/atr"
+                    android:id="@+id/mad"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/atr"
+                    android:text="@string/mad"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/atrshow"
+                    android:id="@+id/madshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -218,18 +202,18 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/mad"
+                    android:id="@+id/datacontent"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/mad"
+                    android:text="@string/datacontent"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/madshow"
+                    android:id="@+id/datacontentshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:text="NA"
+                    android:text="[NA]"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 

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

@@ -131,23 +131,24 @@
                     android:orientation="horizontal">
 
                     <RadioButton
-                        android:id="@+id/radio_portrait"
+                        android:id="@+id/radio_landscape"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:checked="true"
                         android:layout_marginLeft="16dp"
-                        android:text="@string/portrait"
+                        android:text="@string/landscape"
                         android:textSize="20dp"/>
 
                     <RadioButton
-                        android:id="@+id/radio_landscape"
+                        android:id="@+id/radio_portrait"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginLeft="16dp"
                         android:layout_marginRight="16dp"
-                        android:text="@string/landscape"
+                        android:text="@string/portrait"
                         android:textSize="20dp"/>
 
+                    
                 </RadioGroup>
             </LinearLayout>
 

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

@@ -136,37 +136,21 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/maxdivmin"
+                    android:id="@+id/uniformity"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/maxdivmin"
+                    android:text="@string/uniformity"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/maxdivminshow"
+                    android:id="@+id/uniformityshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/datacontent"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/datacontent"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/datacontentshow"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:text="[NA]"
-                    android:textSize="20dp"
-                    android:textColor="@color/back_red"/>
-
                 <TextView
                     android:id="@+id/average"
                     android:layout_row="1"
@@ -186,15 +170,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/std"
+                    android:id="@+id/rmd"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/std"
+                    android:text="@string/rmd"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/stdshow"
+                    android:id="@+id/rmdshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -202,15 +186,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/atr"
+                    android:id="@+id/mad"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/atr"
+                    android:text="@string/mad"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/atrshow"
+                    android:id="@+id/madshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -218,18 +202,18 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/mad"
+                    android:id="@+id/datacontent"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/mad"
+                    android:text="@string/datacontent"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/madshow"
+                    android:id="@+id/datacontentshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:text="NA"
+                    android:text="[NA]"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 

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

@@ -131,23 +131,24 @@
                     android:orientation="horizontal">
 
                     <RadioButton
-                        android:id="@+id/radio_portrait"
+                        android:id="@+id/radio_landscape"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:checked="true"
                         android:layout_marginLeft="16dp"
-                        android:text="@string/portrait"
+                        android:text="@string/landscape"
                         android:textSize="20dp"/>
 
                     <RadioButton
-                        android:id="@+id/radio_landscape"
+                        android:id="@+id/radio_portrait"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginLeft="16dp"
                         android:layout_marginRight="16dp"
-                        android:text="@string/landscape"
+                        android:text="@string/portrait"
                         android:textSize="20dp"/>
 
+                    
                 </RadioGroup>
             </LinearLayout>
 

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

@@ -136,37 +136,21 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/maxdivmin"
+                    android:id="@+id/uniformity"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/maxdivmin"
+                    android:text="@string/uniformity"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/maxdivminshow"
+                    android:id="@+id/uniformityshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/datacontent"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/datacontent"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/datacontentshow"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:text="[NA]"
-                    android:textSize="20dp"
-                    android:textColor="@color/back_red"/>
-
                 <TextView
                     android:id="@+id/average"
                     android:layout_row="1"
@@ -186,15 +170,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/std"
+                    android:id="@+id/rmd"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/std"
+                    android:text="@string/rmd"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/stdshow"
+                    android:id="@+id/rmdshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -202,15 +186,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/atr"
+                    android:id="@+id/mad"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/atr"
+                    android:text="@string/mad"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/atrshow"
+                    android:id="@+id/madshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -218,18 +202,18 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/mad"
+                    android:id="@+id/datacontent"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/mad"
+                    android:text="@string/datacontent"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/madshow"
+                    android:id="@+id/datacontentshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:text="NA"
+                    android:text="[NA]"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 

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

@@ -131,23 +131,24 @@
                     android:orientation="horizontal">
 
                     <RadioButton
-                        android:id="@+id/radio_portrait"
+                        android:id="@+id/radio_landscape"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:checked="true"
                         android:layout_marginLeft="16dp"
-                        android:text="@string/portrait"
+                        android:text="@string/landscape"
                         android:textSize="20dp"/>
 
                     <RadioButton
-                        android:id="@+id/radio_landscape"
+                        android:id="@+id/radio_portrait"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginLeft="16dp"
                         android:layout_marginRight="16dp"
-                        android:text="@string/landscape"
+                        android:text="@string/portrait"
                         android:textSize="20dp"/>
 
+                    
                 </RadioGroup>
             </LinearLayout>
 

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

@@ -136,37 +136,21 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/maxdivmin"
+                    android:id="@+id/uniformity"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/maxdivmin"
+                    android:text="@string/uniformity"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/maxdivminshow"
+                    android:id="@+id/uniformityshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/datacontent"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/datacontent"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/datacontentshow"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:text="[NA]"
-                    android:textSize="20dp"
-                    android:textColor="@color/back_red"/>
-
                 <TextView
                     android:id="@+id/average"
                     android:layout_row="1"
@@ -186,15 +170,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/std"
+                    android:id="@+id/rmd"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/std"
+                    android:text="@string/rmd"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/stdshow"
+                    android:id="@+id/rmdshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -202,15 +186,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/atr"
+                    android:id="@+id/mad"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/atr"
+                    android:text="@string/mad"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/atrshow"
+                    android:id="@+id/madshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -218,18 +202,18 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/mad"
+                    android:id="@+id/datacontent"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/mad"
+                    android:text="@string/datacontent"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/madshow"
+                    android:id="@+id/datacontentshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:text="NA"
+                    android:text="[NA]"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 

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

@@ -131,23 +131,24 @@
                     android:orientation="horizontal">
 
                     <RadioButton
-                        android:id="@+id/radio_portrait"
+                        android:id="@+id/radio_landscape"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:checked="true"
                         android:layout_marginLeft="16dp"
-                        android:text="@string/portrait"
+                        android:text="@string/landscape"
                         android:textSize="20dp"/>
 
                     <RadioButton
-                        android:id="@+id/radio_landscape"
+                        android:id="@+id/radio_portrait"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginLeft="16dp"
                         android:layout_marginRight="16dp"
-                        android:text="@string/landscape"
+                        android:text="@string/portrait"
                         android:textSize="20dp"/>
 
+                    
                 </RadioGroup>
             </LinearLayout>
 

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

@@ -136,37 +136,21 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/maxdivmin"
+                    android:id="@+id/uniformity"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/maxdivmin"
+                    android:text="@string/uniformity"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/maxdivminshow"
+                    android:id="@+id/uniformityshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/datacontent"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/datacontent"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/datacontentshow"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:text="[NA]"
-                    android:textSize="20dp"
-                    android:textColor="@color/back_red"/>
-
                 <TextView
                     android:id="@+id/average"
                     android:layout_row="1"
@@ -186,15 +170,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/std"
+                    android:id="@+id/rmd"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/std"
+                    android:text="@string/rmd"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/stdshow"
+                    android:id="@+id/rmdshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -202,15 +186,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/atr"
+                    android:id="@+id/mad"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/atr"
+                    android:text="@string/mad"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/atrshow"
+                    android:id="@+id/madshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -218,18 +202,18 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/mad"
+                    android:id="@+id/datacontent"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/mad"
+                    android:text="@string/datacontent"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/madshow"
+                    android:id="@+id/datacontentshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:text="NA"
+                    android:text="[NA]"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 

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

@@ -131,23 +131,24 @@
                     android:orientation="horizontal">
 
                     <RadioButton
-                        android:id="@+id/radio_portrait"
+                        android:id="@+id/radio_landscape"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:checked="true"
                         android:layout_marginLeft="16dp"
-                        android:text="@string/portrait"
+                        android:text="@string/landscape"
                         android:textSize="20dp"/>
 
                     <RadioButton
-                        android:id="@+id/radio_landscape"
+                        android:id="@+id/radio_portrait"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginLeft="16dp"
                         android:layout_marginRight="16dp"
-                        android:text="@string/landscape"
+                        android:text="@string/portrait"
                         android:textSize="20dp"/>
 
+                    
                 </RadioGroup>
             </LinearLayout>
 

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

@@ -136,37 +136,21 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/maxdivmin"
+                    android:id="@+id/uniformity"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/maxdivmin"
+                    android:text="@string/uniformity"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/maxdivminshow"
+                    android:id="@+id/uniformityshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/datacontent"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/datacontent"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/datacontentshow"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:text="[NA]"
-                    android:textSize="20dp"
-                    android:textColor="@color/back_red"/>
-
                 <TextView
                     android:id="@+id/average"
                     android:layout_row="1"
@@ -186,15 +170,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/std"
+                    android:id="@+id/rmd"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/std"
+                    android:text="@string/rmd"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/stdshow"
+                    android:id="@+id/rmdshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -202,15 +186,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/atr"
+                    android:id="@+id/mad"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/atr"
+                    android:text="@string/mad"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/atrshow"
+                    android:id="@+id/madshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -218,18 +202,18 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/mad"
+                    android:id="@+id/datacontent"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/mad"
+                    android:text="@string/datacontent"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/madshow"
+                    android:id="@+id/datacontentshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:text="NA"
+                    android:text="[NA]"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 

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

@@ -131,23 +131,24 @@
                     android:orientation="horizontal">
 
                     <RadioButton
-                        android:id="@+id/radio_portrait"
+                        android:id="@+id/radio_landscape"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:checked="true"
                         android:layout_marginLeft="16dp"
-                        android:text="@string/portrait"
+                        android:text="@string/landscape"
                         android:textSize="20dp"/>
 
                     <RadioButton
-                        android:id="@+id/radio_landscape"
+                        android:id="@+id/radio_portrait"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginLeft="16dp"
                         android:layout_marginRight="16dp"
-                        android:text="@string/landscape"
+                        android:text="@string/portrait"
                         android:textSize="20dp"/>
 
+                    
                 </RadioGroup>
             </LinearLayout>
 

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

@@ -136,37 +136,21 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/maxdivmin"
+                    android:id="@+id/uniformity"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/maxdivmin"
+                    android:text="@string/uniformity"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/maxdivminshow"
+                    android:id="@+id/uniformityshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/datacontent"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/datacontent"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/datacontentshow"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:text="[NA]"
-                    android:textSize="20dp"
-                    android:textColor="@color/back_red"/>
-
                 <TextView
                     android:id="@+id/average"
                     android:layout_row="1"
@@ -186,15 +170,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/std"
+                    android:id="@+id/rmd"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/std"
+                    android:text="@string/rmd"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/stdshow"
+                    android:id="@+id/rmdshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -202,15 +186,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/atr"
+                    android:id="@+id/mad"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/atr"
+                    android:text="@string/mad"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/atrshow"
+                    android:id="@+id/madshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -218,18 +202,18 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/mad"
+                    android:id="@+id/datacontent"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/mad"
+                    android:text="@string/datacontent"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/madshow"
+                    android:id="@+id/datacontentshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:text="NA"
+                    android:text="[NA]"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 

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

@@ -131,23 +131,24 @@
                     android:orientation="horizontal">
 
                     <RadioButton
-                        android:id="@+id/radio_portrait"
+                        android:id="@+id/radio_landscape"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:checked="true"
                         android:layout_marginLeft="16dp"
-                        android:text="@string/portrait"
+                        android:text="@string/landscape"
                         android:textSize="20dp"/>
 
                     <RadioButton
-                        android:id="@+id/radio_landscape"
+                        android:id="@+id/radio_portrait"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginLeft="16dp"
                         android:layout_marginRight="16dp"
-                        android:text="@string/landscape"
+                        android:text="@string/portrait"
                         android:textSize="20dp"/>
 
+                    
                 </RadioGroup>
             </LinearLayout>
 

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

@@ -136,37 +136,21 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/maxdivmin"
+                    android:id="@+id/uniformity"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/maxdivmin"
+                    android:text="@string/uniformity"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/maxdivminshow"
+                    android:id="@+id/uniformityshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/datacontent"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/datacontent"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/datacontentshow"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:text="[NA]"
-                    android:textSize="20dp"
-                    android:textColor="@color/back_red"/>
-
                 <TextView
                     android:id="@+id/average"
                     android:layout_row="1"
@@ -186,15 +170,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/std"
+                    android:id="@+id/rmd"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/std"
+                    android:text="@string/rmd"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/stdshow"
+                    android:id="@+id/rmdshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -202,15 +186,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/atr"
+                    android:id="@+id/mad"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/atr"
+                    android:text="@string/mad"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/atrshow"
+                    android:id="@+id/madshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -218,18 +202,18 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/mad"
+                    android:id="@+id/datacontent"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/mad"
+                    android:text="@string/datacontent"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/madshow"
+                    android:id="@+id/datacontentshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:text="NA"
+                    android:text="[NA]"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 

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

@@ -131,23 +131,24 @@
                     android:orientation="horizontal">
 
                     <RadioButton
-                        android:id="@+id/radio_portrait"
+                        android:id="@+id/radio_landscape"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:checked="true"
                         android:layout_marginLeft="16dp"
-                        android:text="@string/portrait"
+                        android:text="@string/landscape"
                         android:textSize="20dp"/>
 
                     <RadioButton
-                        android:id="@+id/radio_landscape"
+                        android:id="@+id/radio_portrait"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginLeft="16dp"
                         android:layout_marginRight="16dp"
-                        android:text="@string/landscape"
+                        android:text="@string/portrait"
                         android:textSize="20dp"/>
 
+                    
                 </RadioGroup>
             </LinearLayout>
 

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

@@ -136,37 +136,21 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/maxdivmin"
+                    android:id="@+id/uniformity"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/maxdivmin"
+                    android:text="@string/uniformity"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/maxdivminshow"
+                    android:id="@+id/uniformityshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/datacontent"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/datacontent"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/datacontentshow"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:text="[NA]"
-                    android:textSize="20dp"
-                    android:textColor="@color/back_red"/>
-
                 <TextView
                     android:id="@+id/average"
                     android:layout_row="1"
@@ -186,15 +170,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/std"
+                    android:id="@+id/rmd"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/std"
+                    android:text="@string/rmd"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/stdshow"
+                    android:id="@+id/rmdshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -202,15 +186,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/atr"
+                    android:id="@+id/mad"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/atr"
+                    android:text="@string/mad"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/atrshow"
+                    android:id="@+id/madshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -218,18 +202,18 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/mad"
+                    android:id="@+id/datacontent"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/mad"
+                    android:text="@string/datacontent"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/madshow"
+                    android:id="@+id/datacontentshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:text="NA"
+                    android:text="[NA]"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 

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

@@ -131,23 +131,24 @@
                     android:orientation="horizontal">
 
                     <RadioButton
-                        android:id="@+id/radio_portrait"
+                        android:id="@+id/radio_landscape"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:checked="true"
                         android:layout_marginLeft="16dp"
-                        android:text="@string/portrait"
+                        android:text="@string/landscape"
                         android:textSize="20dp"/>
 
                     <RadioButton
-                        android:id="@+id/radio_landscape"
+                        android:id="@+id/radio_portrait"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginLeft="16dp"
                         android:layout_marginRight="16dp"
-                        android:text="@string/landscape"
+                        android:text="@string/portrait"
                         android:textSize="20dp"/>
 
+                    
                 </RadioGroup>
             </LinearLayout>
 

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

@@ -136,37 +136,21 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/maxdivmin"
+                    android:id="@+id/uniformity"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/maxdivmin"
+                    android:text="@string/uniformity"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/maxdivminshow"
+                    android:id="@+id/uniformityshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/datacontent"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/datacontent"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/datacontentshow"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:text="[NA]"
-                    android:textSize="20dp"
-                    android:textColor="@color/back_red"/>
-
                 <TextView
                     android:id="@+id/average"
                     android:layout_row="1"
@@ -186,15 +170,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/std"
+                    android:id="@+id/rmd"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/std"
+                    android:text="@string/rmd"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/stdshow"
+                    android:id="@+id/rmdshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -202,15 +186,15 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/atr"
+                    android:id="@+id/mad"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/atr"
+                    android:text="@string/mad"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/atrshow"
+                    android:id="@+id/madshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="NA"
@@ -218,18 +202,18 @@
                     android:textColor="@color/back_red"/>
 
                 <TextView
-                    android:id="@+id/mad"
+                    android:id="@+id/datacontent"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginStart="50dp"
-                    android:text="@string/mad"
+                    android:text="@string/datacontent"
                     android:textSize="20dp"/>
 
                 <TextView
-                    android:id="@+id/madshow"
+                    android:id="@+id/datacontentshow"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:text="NA"
+                    android:text="[NA]"
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 

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

@@ -131,23 +131,24 @@
                     android:orientation="horizontal">
 
                     <RadioButton
-                        android:id="@+id/radio_portrait"
+                        android:id="@+id/radio_landscape"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:checked="true"
                         android:layout_marginLeft="16dp"
-                        android:text="@string/portrait"
+                        android:text="@string/landscape"
                         android:textSize="20dp"/>
 
                     <RadioButton
-                        android:id="@+id/radio_landscape"
+                        android:id="@+id/radio_portrait"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginLeft="16dp"
                         android:layout_marginRight="16dp"
-                        android:text="@string/landscape"
+                        android:text="@string/portrait"
                         android:textSize="20dp"/>
 
+
                 </RadioGroup>
             </LinearLayout>
 

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

@@ -39,12 +39,11 @@
     <string name="maximum">Maximum:</string>
     <string name="minimum">Minimum:</string>
     <string name="maxsubmin">Maximum - Minimum:</string>
-    <string name="maxdivmin">Maximum / Minimum:</string>
+    <string name="uniformity">Uniformity:</string>
     <string name="datacontent">Data Content:</string>
     <string name="average">AVG:</string>
-    <string name="std">STD:</string>
-    <string name="atr">Attenuation Ratio:</string>
-    <string name="mad">Maximum Adjacent Deviation:</string>
+    <string name="rmd">RMD:</string>
+    <string name="mad">Maximal Adjacent Deviation:</string>
     <string name="rownums">Row Nums</string>
     <string name="colnums">Col Nums</string>
     <string name="rawdata">Rawdata</string>
@@ -77,7 +76,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:v0.0.0.1_20200817-Internal Version</string>
+    <string name="version">APK Version:v0.0.0.1_20200818-Internal Version</string>
 
     <string name="app_name">WingCool(GT9)</string>
     <string name="input_num_character">0123456789ABCDEFabcdef</string>

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

@@ -38,11 +38,10 @@
     <string name="maximum">最大值：</string>
     <string name="minimum">最小值：</string>
     <string name="maxsubmin">最大值 - 最小值：</string>
-    <string name="maxdivmin">最大值 / 最小值：</string>
+    <string name="uniformity">一致性：</string>
     <string name="datacontent">数据内容：</string>
     <string name="average">平均值：</string>
-    <string name="std">标准差：</string>
-    <string name="atr">衰减比：</string>
+    <string name="rmd">相对平均值偏差：</string>
     <string name="mad">最大相邻偏差：</string>
     <string name="rownums">感应数</string>
     <string name="colnums">驱动数</string>
@@ -76,7 +75,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版本：v0.0.0.1_20200817-内部版本</string>
+    <string name="version">APK版本：v0.0.0.1_20200818-内部版本</string>
 
     <string name="app_name">WingCool(GT9)</string>
     <string name="input_num_character">0123456789ABCDEFabcdef</string>