1、删除一些不必要的代码和显示信息

2、读取数据的长度根据配置信息来

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

@@ -84,11 +84,6 @@ public class DataAnalysis extends AppCompatActivity
     private UsbInterface mUsbInterface;
     private Context mContext;
 
-    private TableLayout tab;
-    private TableRow tabRow;
-    private TextView tv;
-    private final int H = ViewGroup.LayoutParams.WRAP_CONTENT;
-    private final int W = ViewGroup.LayoutParams.MATCH_PARENT;
     private int colnum;
     private int rownum;
     private TextView tvMaximum;      //显示最大值
@@ -99,8 +94,6 @@ public class DataAnalysis extends AppCompatActivity
     private TextView tvAverage;      //显示平均值
     private TextView tvRMD;          //显示相对平均值偏差
     private TextView tvMAD;          //显示最大相邻偏差
-    private ArrayList<String> tabCol = new ArrayList<>();
-    private ArrayList<String> tabH = new ArrayList<>();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -174,7 +167,6 @@ public class DataAnalysis extends AppCompatActivity
         //btn_ManualdiffdataShow.setEnabled(false);
         //btn_Manualreff.setEnabled(false);
         //btn_Stop.setEnabled(false);
-        tab = (TableLayout) findViewById(R.id.tab_01);
     }
 
     /**
@@ -577,7 +569,7 @@ public class DataAnalysis extends AppCompatActivity
         }
 
 
-        if(!iicRead(showAddressHigh,showAddressLow,mRawdataBytes,42*30*2)) {  //读取rawData
+        if(!iicRead(showAddressHigh,showAddressLow,mRawdataBytes,colnum*rownum*2)) {  //读取rawData
             // mrawlog.setText("iicRead rawdata failed");
             return false;
         }
@@ -592,29 +584,7 @@ public class DataAnalysis extends AppCompatActivity
             //  mrawlog.setText("0x814E_SYNC write failed");
             return false;
         }
-        /*
-        int idtemp;
-        int i = 0;
-        //控制行数
-        for (int row = 0; row < rownum; row++) {
-            //控制列数
-            for (int col = 0; col < colnum; col++) {
-
-                idtemp = row + col * rownum;
-
-                if (showFlag == 3) { //diffdata
-                    datatemp[i++] = (mRawdataBytes[idtemp] & 0xFF);
-                } else { //rawdata || reffdata || manual diffdata
-                    datatemp[i] = ((mRawdataBytes[idtemp * 2] & 0xFF) << 8) + (mRawdataBytes[idtemp * 2 + 1] & 0xFF);
-
-                    if (showFlag == 2) { //manual diffdata
-                        datatemp[i] = mManualRefInt[idtemp] - datatemp[i];
-                    }
-                    i++;
-                }
-            }
-        }
-        */
+
         return true;
     }
 
@@ -709,12 +679,12 @@ public class DataAnalysis extends AppCompatActivity
                         //while ((syncFlag == 0 )|| (syncFlag == 0x77)) {
                         if (((syncFlag == 0) || (syncFlag == 0x77)) ){
                             SystemClock.sleep(1);
-                            mHandler.sendEmptyMessage(LOG1_MESSAG);
+                            //mHandler.sendEmptyMessage(LOG1_MESSAG);
                         }
                         else
                         {
                             if(count == 0) {
-                                mHandler.sendEmptyMessage(LOG2_MESSAGE);
+                                //mHandler.sendEmptyMessage(LOG2_MESSAGE);
                             }
                             else {
                                 // mHandler.sendEmptyMessage(SEND_MESSAGE_SUCCESS); //清空文本框
@@ -727,7 +697,7 @@ public class DataAnalysis extends AppCompatActivity
                         }
                     }
 
-                    SystemClock.sleep(100);
+                    SystemClock.sleep(400);
                 }
 
             }   //ThreadPool
@@ -742,7 +712,6 @@ public class DataAnalysis extends AppCompatActivity
         public void handleMessage(Message msg) {
 
             StringBuilder stringBuilder = new StringBuilder("");
-            StringBuffer resultSb = new StringBuffer();
             int idtemp;
             int i = 0;
             int tempcol = 0;
@@ -750,7 +719,7 @@ public class DataAnalysis extends AppCompatActivity
             boolean flag = false;
             int length;
             String dv;
-            String dvhex;
+            //String dvhex;
             int maxdata;
             int mindata;
             long laverage;  //平均值，临时存储和值
@@ -759,7 +728,7 @@ public class DataAnalysis extends AppCompatActivity
             int itemp;  //临时存放
             switch (msg.what) {
                 case RAWDATA_MESSAGE://
-                    //ShowData();
+
                     maxdata = 0;
                     mindata = 65535;
                     laverage = 0;
@@ -841,7 +810,7 @@ public class DataAnalysis extends AppCompatActivity
 
                     iaverage = (int)(laverage / (long) (rownum * colnum));
 
-                    for (i = 0; i < (int)(rownum * colnum); i++) {
+                    for (i = 0; i < (rownum * colnum); i++) {
                         if (datatemp[i] >= iaverage)
                         {
                             itemp = (int)((long)((datatemp[i] - iaverage) * 100) / iaverage);
@@ -868,6 +837,8 @@ public class DataAnalysis extends AppCompatActivity
                     }
                     tvAverage.setText(Integer.toString(iaverage));
                     tvRMD.setText(Integer.toString(irmd));
+
+
                     /*
                     for (int j = 0; j < rownum * colnum * 2; j++ ) {
                         // int v = mRawdataBytes[i] & 0xFF;
@@ -916,7 +887,6 @@ public class DataAnalysis extends AppCompatActivity
                     */
                     maxdata = 0;
                     mindata = 255;
-                    //ShowData();
                     for (int row = 0; row < rownum + 1; row++) {
                         //控制列数
                         for (int col = 0; col < colnum + 1; col++) {
@@ -1002,7 +972,6 @@ public class DataAnalysis extends AppCompatActivity
                     */
                     maxdata = -32767;
                     mindata = 32768;
-                    //ShowData();
                     for (int row = 0; row < rownum + 1; row++) {
                         //控制列数
                         for (int col = 0; col < colnum + 1; col++) {
@@ -1149,19 +1118,6 @@ public class DataAnalysis extends AppCompatActivity
             edt_RowNum.setText(Integer.toString(rownum));
         }
 
-        tabCol = new ArrayList<>();
-        tabH = new ArrayList<>();
-
-        for (int i = 0;i <= colnum;i++){
-
-            tabCol.add(""+i+"");
-        }
-
-        for (int i = 0;i <= rownum;i++){
-
-            tabH.add(""+i+"");
-        }
-
         switch (view.getId()) {
             case R.id.rawdata:   //Read RawData
                 showFlag =1;
@@ -1173,7 +1129,6 @@ public class DataAnalysis extends AppCompatActivity
                     showRawdata();
                 }
 
-                //ShowData();
                 break;
 
             case R.id.diffdata:
@@ -1229,157 +1184,6 @@ public class DataAnalysis extends AppCompatActivity
                 break;
         }
     }
-    int idtemp = 0;
-    public void ShowData(){
-        //int tempcol = 0;
-        //int temprow = 0;
-        //boolean flag = false;
-        //int datatemp;
-        //int idtemp = 0;
-        //int colnum;
-        //int rownum;
-
-        //final int H = ViewGroup.LayoutParams.WRAP_CONTENT;
-        //final int W = ViewGroup.LayoutParams.MATCH_PARENT;
-
-        //TableLayout tab;
-        //tab = (TableLayout) findViewById(R.id.tab_01);
-
-        TableRow tabRow;
-        TextView tv;
-
-        //ArrayList<String> tabCol = new ArrayList<>();
-        //ArrayList<String> tabH = new ArrayList<>();
-
-        //colnum = (byte) Integer.parseInt(edt_ColNum.getText().toString(),10);
-        //rownum = (byte) Integer.parseInt(edt_RowNum.getText().toString(), 10);
-
-        //if (colnum == 0){
-        //    colnum = 42;
-        //}
-
-        //if (rownum == 0){
-        //    rownum = 30;
-        //}
-        /*
-        for (int i = 0;i <= colnum;i++){
-
-            tabCol.add(""+i+"");
-        }
-
-        for (int i = 0;i <= rownum;i++){
-
-            tabH.add(""+i+"");
-        }
-        */
-        //全部列自动填充空白处
-        tab.setStretchAllColumns(true);
-        tab.removeAllViews();
-        /*
-        //控制行数
-        for (int row = 0; row < tabH.size(); row++){
-            tabRow = new TableRow(this);
-            //控制列数
-            for (int col = 0; col < tabCol.size(); col++){
-
-                tv = new TextView(this);
-
-                if (row == 0){
-                    if (col == 0){
-                        tv.setText("");
-                    }else{
-                        tv.setText(tabCol.get(col - 1));
-                        tv.setBackgroundResource(R.color.text_yellow);
-                    }
-                } else if (col == 0){
-                    tv.setText(tabH.get(row - 1));
-                    tv.setBackgroundResource(R.color.text_yellow);
-                }else{
-                    int v =  ((mRawdataBytes[temp] & 0xFF)<<8) +  (mRawdataBytes[temp+1] & 0xFF);
-                    // String hv = Integer.toHexString(v);
-                    String dv = Integer.toString(v);
-                    tv.setText(dv.toString());
-                    tv.setBackgroundResource(R.drawable.bg_frame_search);
-                }
-                temp = temp + 2;
-                //tv.setText(tabCol.get(col)+tabH.get(row));
-                tv.setGravity(Gravity.CENTER);
-
-                tabRow.addView(tv);
-            }
-
-            tab.addView(tabRow,new TableLayout.LayoutParams(W,H));
-        }
-        */
-        //控制行数
-        for (int row = 0; row < rownum + 1; row++) {
-            tabRow = new TableRow(this);
-            //控制列数
-            for (int col = 0; col < colnum + 1; col++){
-                //flag = false;
-                tv = new TextView(this);
-                /*
-                if (row == 0){
-                    if (col == 0){
-                        tv.setText("");
-                    }else{
-                        tv.setText(tabCol.get(col - 1));
-                        //tv.setBackgroundResource(R.color.text_yellow);
-                    }
-                } else if (col == 0){
-                    tv.setText(tabH.get(row - 1));
-                    //tv.setBackgroundResource(R.color.text_yellow);
-                }else{
-                    //idtemp = temprow + tempcol * rownum;
-
-                    if (showFlag == 3) { //diffdata
-                        datatemp =  (mRawdataBytes[idtemp] & 0xFF);
-                    }
-                    else{ //rawdata || reffdata || manual diffdata
-                        datatemp =  ((mRawdataBytes[idtemp * 2] & 0xFF)<<8) +  (mRawdataBytes[idtemp * 2 + 1] & 0xFF);
-
-                        if (showFlag == 2) { //manual diffdata
-                            datatemp = mManualRefInt[idtemp] - datatemp;
-                        }
-                    }
-
-                    //int v =  testData[temprow + tempcol * rownum];
-                    //String hv = Integer.toHexString(v);
-                    //datatemp =  ((mRawdataBytes[idtemp * 2] & 0xFF)<<8) +  (mRawdataBytes[idtemp * 2 + 1] & 0xFF);
-                    //String dv = Integer.toString(datatemp[idtemp++]);
-                    String dv = Integer.toString(idtemp++);
-                    tv.setText(" "+dv.toString()+" ");
-                    //tv.setBackgroundResource(R.drawable.bg_frame_search);
-
-                    //tempcol++;
-                    //flag = true;
-                    if (idtemp>10000){
-                        idtemp = 0;
-                    }
-                }
-                */
-                String dv = Integer.toString(idtemp++);
-                tv.setText(" "+dv.toString()+" ");
-                //tv.setBackgroundResource(R.drawable.bg_frame_search);
-
-                //tempcol++;
-                //flag = true;
-                if (idtemp>10000){
-                    idtemp = 0;
-                }
-                //tv.setText(tabCol.get(col)+tabH.get(row));
-                tv.setGravity(Gravity.CENTER);
-                tabRow.addView(tv);
-            }
-            //tempcol = 0;
-            //if (flag){
-            //    temprow++;
-            //}
-
-            //tab.addView(tabRow,new TableLayout.LayoutParams(W,H));
-            tab.addView(tabRow);
-        }
-    }
 
     @Override
     protected void onDestroy() {

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

@@ -64,16 +64,6 @@
                 </LinearLayout>
             </HorizontalScrollView>
 
-            <HorizontalScrollView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <TableLayout
-                    android:id="@+id/tab_01"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </HorizontalScrollView>
-
             <GridLayout
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/SpecialDataGridLayout"

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

@@ -177,6 +177,52 @@
                     android:textAlignment="center"
                     android:textSize="20dp" />
 
+                <TextView
+                    android:id="@+id/uniformitythreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/uniformitythreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputuniformity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
+                <TextView
+                    android:id="@+id/rmdthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/rmdthreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputrmd"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
                 <TextView
                     android:id="@+id/adjacentdeviationthreshold"
                     android:layout_width="wrap_content"

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

@@ -64,16 +64,6 @@
                 </LinearLayout>
             </HorizontalScrollView>
 
-            <HorizontalScrollView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <TableLayout
-                    android:id="@+id/tab_01"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </HorizontalScrollView>
-
             <GridLayout
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/SpecialDataGridLayout"

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

@@ -177,6 +177,52 @@
                     android:textAlignment="center"
                     android:textSize="20dp" />
 
+                <TextView
+                    android:id="@+id/uniformitythreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/uniformitythreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputuniformity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
+                <TextView
+                    android:id="@+id/rmdthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/rmdthreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputrmd"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
                 <TextView
                     android:id="@+id/adjacentdeviationthreshold"
                     android:layout_width="wrap_content"

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

@@ -64,16 +64,6 @@
                 </LinearLayout>
             </HorizontalScrollView>
 
-            <HorizontalScrollView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <TableLayout
-                    android:id="@+id/tab_01"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </HorizontalScrollView>
-
             <GridLayout
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/SpecialDataGridLayout"

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

@@ -177,6 +177,52 @@
                     android:textAlignment="center"
                     android:textSize="20dp" />
 
+                <TextView
+                    android:id="@+id/uniformitythreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/uniformitythreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputuniformity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
+                <TextView
+                    android:id="@+id/rmdthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/rmdthreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputrmd"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
                 <TextView
                     android:id="@+id/adjacentdeviationthreshold"
                     android:layout_width="wrap_content"

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

@@ -64,16 +64,6 @@
                 </LinearLayout>
             </HorizontalScrollView>
 
-            <HorizontalScrollView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <TableLayout
-                    android:id="@+id/tab_01"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </HorizontalScrollView>
-
             <GridLayout
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/SpecialDataGridLayout"

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

@@ -177,6 +177,52 @@
                     android:textAlignment="center"
                     android:textSize="20dp" />
 
+                <TextView
+                    android:id="@+id/uniformitythreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/uniformitythreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputuniformity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
+                <TextView
+                    android:id="@+id/rmdthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/rmdthreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputrmd"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
                 <TextView
                     android:id="@+id/adjacentdeviationthreshold"
                     android:layout_width="wrap_content"

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

@@ -64,16 +64,6 @@
                 </LinearLayout>
             </HorizontalScrollView>
 
-            <HorizontalScrollView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <TableLayout
-                    android:id="@+id/tab_01"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </HorizontalScrollView>
-
             <GridLayout
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/SpecialDataGridLayout"

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

@@ -177,6 +177,52 @@
                     android:textAlignment="center"
                     android:textSize="20dp" />
 
+                <TextView
+                    android:id="@+id/uniformitythreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/uniformitythreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputuniformity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
+                <TextView
+                    android:id="@+id/rmdthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/rmdthreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputrmd"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
                 <TextView
                     android:id="@+id/adjacentdeviationthreshold"
                     android:layout_width="wrap_content"

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

@@ -64,16 +64,6 @@
                 </LinearLayout>
             </HorizontalScrollView>
 
-            <HorizontalScrollView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <TableLayout
-                    android:id="@+id/tab_01"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </HorizontalScrollView>
-
             <GridLayout
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/SpecialDataGridLayout"

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

@@ -177,6 +177,52 @@
                     android:textAlignment="center"
                     android:textSize="20dp" />
 
+                <TextView
+                    android:id="@+id/uniformitythreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/uniformitythreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputuniformity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
+                <TextView
+                    android:id="@+id/rmdthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/rmdthreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputrmd"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
                 <TextView
                     android:id="@+id/adjacentdeviationthreshold"
                     android:layout_width="wrap_content"

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

@@ -64,16 +64,6 @@
                 </LinearLayout>
             </HorizontalScrollView>
 
-            <HorizontalScrollView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <TableLayout
-                    android:id="@+id/tab_01"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </HorizontalScrollView>
-
             <GridLayout
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/SpecialDataGridLayout"

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

@@ -177,6 +177,52 @@
                     android:textAlignment="center"
                     android:textSize="20dp" />
 
+                <TextView
+                    android:id="@+id/uniformitythreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/uniformitythreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputuniformity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
+                <TextView
+                    android:id="@+id/rmdthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/rmdthreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputrmd"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
                 <TextView
                     android:id="@+id/adjacentdeviationthreshold"
                     android:layout_width="wrap_content"

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

@@ -64,16 +64,6 @@
                 </LinearLayout>
             </HorizontalScrollView>
 
-            <HorizontalScrollView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <TableLayout
-                    android:id="@+id/tab_01"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </HorizontalScrollView>
-
             <GridLayout
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/SpecialDataGridLayout"

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

@@ -177,6 +177,52 @@
                     android:textAlignment="center"
                     android:textSize="20dp" />
 
+                <TextView
+                    android:id="@+id/uniformitythreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/uniformitythreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputuniformity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
+                <TextView
+                    android:id="@+id/rmdthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/rmdthreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputrmd"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
                 <TextView
                     android:id="@+id/adjacentdeviationthreshold"
                     android:layout_width="wrap_content"

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

@@ -64,16 +64,6 @@
                 </LinearLayout>
             </HorizontalScrollView>
 
-            <HorizontalScrollView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <TableLayout
-                    android:id="@+id/tab_01"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </HorizontalScrollView>
-
             <GridLayout
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/SpecialDataGridLayout"

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

@@ -177,6 +177,52 @@
                     android:textAlignment="center"
                     android:textSize="20dp" />
 
+                <TextView
+                    android:id="@+id/uniformitythreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/uniformitythreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputuniformity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
+                <TextView
+                    android:id="@+id/rmdthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/rmdthreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputrmd"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
                 <TextView
                     android:id="@+id/adjacentdeviationthreshold"
                     android:layout_width="wrap_content"

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

@@ -64,16 +64,6 @@
                 </LinearLayout>
             </HorizontalScrollView>
 
-            <HorizontalScrollView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <TableLayout
-                    android:id="@+id/tab_01"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </HorizontalScrollView>
-
             <GridLayout
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/SpecialDataGridLayout"

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

@@ -177,6 +177,52 @@
                     android:textAlignment="center"
                     android:textSize="20dp" />
 
+                <TextView
+                    android:id="@+id/uniformitythreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/uniformitythreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputuniformity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
+                <TextView
+                    android:id="@+id/rmdthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/rmdthreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputrmd"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
                 <TextView
                     android:id="@+id/adjacentdeviationthreshold"
                     android:layout_width="wrap_content"

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

@@ -64,16 +64,6 @@
                 </LinearLayout>
             </HorizontalScrollView>
 
-            <HorizontalScrollView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <TableLayout
-                    android:id="@+id/tab_01"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </HorizontalScrollView>
-
             <GridLayout
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/SpecialDataGridLayout"

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

@@ -177,6 +177,52 @@
                     android:textAlignment="center"
                     android:textSize="20dp" />
 
+                <TextView
+                    android:id="@+id/uniformitythreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/uniformitythreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputuniformity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
+                <TextView
+                    android:id="@+id/rmdthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/rmdthreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputrmd"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
                 <TextView
                     android:id="@+id/adjacentdeviationthreshold"
                     android:layout_width="wrap_content"

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

@@ -64,16 +64,6 @@
                 </LinearLayout>
             </HorizontalScrollView>
 
-            <HorizontalScrollView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <TableLayout
-                    android:id="@+id/tab_01"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </HorizontalScrollView>
-
             <GridLayout
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/SpecialDataGridLayout"

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

@@ -177,6 +177,52 @@
                     android:textAlignment="center"
                     android:textSize="20dp" />
 
+                <TextView
+                    android:id="@+id/uniformitythreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/uniformitythreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputuniformity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
+                <TextView
+                    android:id="@+id/rmdthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="5dp"
+                    android:text="@string/rmdthreshold"
+                    android:textSize="20dp" />
+
+                <EditText
+                    android:id="@+id/inputrmd"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="0dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_frame_search"
+                    android:digits="@string/input_num"
+                    android:hint="0"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textSize="20dp" />
+
                 <TextView
                     android:id="@+id/adjacentdeviationthreshold"
                     android:layout_width="wrap_content"

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

@@ -43,7 +43,7 @@
     <string name="datacontent">Data Content:</string>
     <string name="average">AVG:</string>
     <string name="rmd">RMD:</string>
-    <string name="mad">Maximal Adjacent Deviation:</string>
+    <string name="mad">MAD:</string>
     <string name="rownums">Row Nums</string>
     <string name="colnums">Col Nums</string>
     <string name="rawdata">Rawdata</string>
@@ -71,7 +71,9 @@
     <string name="starttesting">Start Testing</string>
     <string name="maximumthreshold">Maximum Threshold:</string>
     <string name="minimumthreshold">Minimum Threshold:</string>
-    <string name="adjacentdeviationthreshold">Adjacent Deviation Threshold：</string>
+    <string name="uniformitythreshold">Uniformity Threshold：</string>
+    <string name="rmdthreshold">RMD Threshold：</string>
+    <string name="adjacentdeviationthreshold">MAD Threshold：</string>
 
     <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>

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

@@ -70,6 +70,8 @@
     <string name="starttesting">开 始 测 试</string>
     <string name="maximumthreshold">最大值阈值：</string>
     <string name="minimumthreshold">最小值阈值：</string>
+    <string name="uniformitythreshold">一致性阈值：</string>
+    <string name="rmdthreshold">相对平均值偏差阈值：</string>
     <string name="adjacentdeviationthreshold">最大相邻偏差阈值：</string>
 
     <string name="companyaddr">地址：深圳市宝安区留仙三路 36 号创兴达商务大厦 2008 室</string>