Переглянути джерело

主要修改了数据读取和显示,去掉一些复杂的计算,可以正常运行不卡死了。
显示差值的时候比较乱,还没改

robbin 3 роки тому
батько
коміт
8b71da5889
29 змінених файлів з 1108 додано та 1479 видалено
  1. 80 93
      app/src/main/java/com/example/administrator/wingcool_gt9_apk/DataAnalysis.java
  2. 2 2
      app/src/main/java/com/example/administrator/wingcool_gt9_apk/GT9MainActivity.java
  3. 4 4
      app/src/main/java/com/example/administrator/wingcool_gt9_apk/TestOperation.java
  4. 84 68
      app/src/main/res/layout-hdpi/activity_dataanalysis.xml
  5. 0 46
      app/src/main/res/layout-hdpi/activity_testoperation.xml
  6. 84 68
      app/src/main/res/layout-land-hdpi/activity_dataanalysis.xml
  7. 0 46
      app/src/main/res/layout-land-hdpi/activity_testoperation.xml
  8. 84 68
      app/src/main/res/layout-land-mdpi/activity_dataanalysis.xml
  9. 0 46
      app/src/main/res/layout-land-mdpi/activity_testoperation.xml
  10. 84 68
      app/src/main/res/layout-land-xhdpi/activity_dataanalysis.xml
  11. 0 46
      app/src/main/res/layout-land-xhdpi/activity_testoperation.xml
  12. 84 68
      app/src/main/res/layout-land-xxhdpi/activity_dataanalysis.xml
  13. 0 46
      app/src/main/res/layout-land-xxhdpi/activity_testoperation.xml
  14. 84 68
      app/src/main/res/layout-land-xxxhdpi/activity_dataanalysis.xml
  15. 0 46
      app/src/main/res/layout-land-xxxhdpi/activity_testoperation.xml
  16. 84 68
      app/src/main/res/layout-land/activity_dataanalysis.xml
  17. 0 46
      app/src/main/res/layout-land/activity_testoperation.xml
  18. 84 68
      app/src/main/res/layout-mdpi/activity_dataanalysis.xml
  19. 0 46
      app/src/main/res/layout-mdpi/activity_testoperation.xml
  20. 84 68
      app/src/main/res/layout-xhdpi/activity_dataanalysis.xml
  21. 0 46
      app/src/main/res/layout-xhdpi/activity_testoperation.xml
  22. 84 68
      app/src/main/res/layout-xxhdpi/activity_dataanalysis.xml
  23. 0 46
      app/src/main/res/layout-xxhdpi/activity_testoperation.xml
  24. 84 68
      app/src/main/res/layout-xxxhdpi/activity_dataanalysis.xml
  25. 0 46
      app/src/main/res/layout-xxxhdpi/activity_testoperation.xml
  26. 84 68
      app/src/main/res/layout/activity_dataanalysis.xml
  27. 0 46
      app/src/main/res/layout/activity_testoperation.xml
  28. 7 6
      app/src/main/res/values-en/strings.xml
  29. 7 6
      app/src/main/res/values/strings.xml

+ 80 - 93
app/src/main/java/com/example/administrator/wingcool_gt9_apk/DataAnalysis.java

@@ -68,6 +68,7 @@ public class DataAnalysis extends AppCompatActivity
     private Button btn_ReffdataShow;
     private Button btn_ManualdiffdataShow;
     private Button btn_Manualreff;
+    private Button btn_Test;
     private Button btn_Stop;
 
     private byte[] mBytes = new byte[1024];
@@ -88,11 +89,7 @@ public class DataAnalysis extends AppCompatActivity
     private int rownum;
     private TextView tvMaximum;      //显示最大值
     private TextView tvMinimum;      //显示最小值
-    private TextView tvMaxSubMin;    //显示最大值减最小值
-    private TextView tvUniformity;   //显示一致性:最小值/最大值
     private TextView tvDataContent;  //显示当前处于何种数值模式:原始值、差值、基准……
-    private TextView tvAverage;      //显示平均值
-    private TextView tvRMD;          //显示相对平均值偏差
     private TextView tvMAD;          //显示最大相邻偏差
 
     @Override
@@ -143,7 +140,15 @@ public class DataAnalysis extends AppCompatActivity
         btn_ReffdataShow = (Button) findViewById(R.id.reffdata);
         btn_ManualdiffdataShow = (Button) findViewById(R.id.manualdiff);
         btn_Manualreff = (Button) findViewById(R.id.manualreff);
+        btn_Test = (Button) findViewById(R.id.testting);
         btn_Stop = (Button) findViewById(R.id.stop);
+
+        //btn_RawdataShow.setEnabled(false);
+        //btn_DiffdataShow.setEnabled(false);
+        //btn_ReffdataShow.setEnabled(false);
+        //btn_ManualdiffdataShow.setEnabled(false);
+        btn_Manualreff.setEnabled(false);
+        //btn_Stop.setEnabled(false);
     }
 
     private void InitEditText(){
@@ -157,16 +162,12 @@ public class DataAnalysis extends AppCompatActivity
         btn_ReffdataShow.setOnClickListener(this);
         btn_ManualdiffdataShow.setOnClickListener(this);
         btn_Manualreff.setOnClickListener(this);
+        btn_Test.setOnClickListener(this);
         btn_Stop.setOnClickListener(this);
     }
 
     private void InitData(){
-        //btn_RawdataShow.setEnabled(false);
-        //btn_DiffdataShow.setEnabled(false);
-        //btn_ReffdataShow.setEnabled(false);
-        //btn_ManualdiffdataShow.setEnabled(false);
-        //btn_Manualreff.setEnabled(false);
-        //btn_Stop.setEnabled(false);
+
     }
 
     /**
@@ -542,12 +543,14 @@ public class DataAnalysis extends AppCompatActivity
         byte mdata = (byte)0x00;
 
         if(!iicByteWrite(maddressHigh,maddressLow,msubcommand,mdata)) {
-            //   mrawlog.setText("[changeNormal]0x8040 write failed");
+
+            //mrawlog.setText("[changeNormal]0x8040 write failed");
+
             return false;
         }
         else
         {
-            mrawlog.setText("[changeNormal]0x8040 write success");
+            //mrawlog.setText("[changeNormal]0x8040 write success");
         }
 
         return true;
@@ -563,10 +566,10 @@ public class DataAnalysis extends AppCompatActivity
         byte maddressLow = (byte)0x40;  //rawdata address
         byte msubcommand =0x0d ;  //  READ_SYNC
         byte mdata = (byte)0x01;
-        if(!iicByteWrite(maddressHigh,maddressLow,msubcommand,mdata)) {
+        //if(!iicByteWrite(maddressHigh,maddressLow,msubcommand,mdata)) {
             // mrawlog.setText("READ_SYNC write failed");
-            return false;
-        }
+        //    return false;
+        //}
 
 
         if(!iicRead(showAddressHigh,showAddressLow,mRawdataBytes,colnum*rownum*2)) {  //读取rawData
@@ -606,11 +609,7 @@ public class DataAnalysis extends AppCompatActivity
         mtextView = (TextView) findViewById(R.id.textView);
         tvMaximum = (TextView) findViewById(R.id.maximumshow);
         tvMinimum = (TextView) findViewById(R.id.minimumshow);
-        tvMaxSubMin = (TextView) findViewById(R.id.maxsubminshow);
-        tvUniformity = (TextView) findViewById(R.id.uniformityshow);
         tvDataContent = (TextView) findViewById(R.id.datacontentshow);
-        tvAverage = (TextView) findViewById(R.id.averageshow);
-        tvRMD = (TextView) findViewById(R.id.rmdshow);
         tvMAD = (TextView) findViewById(R.id.madshow);
     }
 
@@ -623,10 +622,6 @@ public class DataAnalysis extends AppCompatActivity
 
                 int watch_dog = 0;
                 byte syncFlag = 1;
-                //if (!changeToDebugMode())
-                //  return false;
-                // if(false) {
-                changeToDebugMode();
 
                 while(showFlag!=4) {
 
@@ -635,6 +630,33 @@ public class DataAnalysis extends AppCompatActivity
                         count = 0;
                     }
 
+                    while(true) {
+                        //轮询读取0x814E,如果非0,则读取rawdata
+                        byte maddressHigh = (byte) 0x81;
+                        byte maddressLow = (byte) 0x4E;  //_rRW_MISCTL__SWRST_B0_
+                        syncFlag = iicByteRead(maddressHigh, maddressLow);
+                        watch_dog++;
+                        //while ((syncFlag == 0 )|| (syncFlag == 0x77)) {
+                        if (((syncFlag == 0) || (syncFlag == 0x77)) ){
+                            SystemClock.sleep(1);
+                            //mHandler.sendEmptyMessage(LOG1_MESSAG);
+                        }
+                        else
+                        {
+                            if(count == 0) {
+                                //mHandler.sendEmptyMessage(LOG2_MESSAGE);
+                            }
+                            else {
+                                // mHandler.sendEmptyMessage(SEND_MESSAGE_SUCCESS); //清空文本框
+                            }
+                            for (int i = 0; i <mRawdataBytes.length; i++)
+                            {
+                                mRawdataBytes[i] = (byte)0x00;
+                            }
+                            break;
+                        }
+                    }
+
                     if (getRawdata() == true) {
 
                         switch (showFlag) {
@@ -659,7 +681,11 @@ public class DataAnalysis extends AppCompatActivity
                             case 3://
                                 mHandler.sendEmptyMessage(DIFF_MESSAGE);
                                 break;
-
+                            case 5:  //stop
+                                showFlag = 4;
+                                count = 1000;
+                                changeToNormalMode();
+                                break;
                         }
                     }
                     else
@@ -670,36 +696,9 @@ public class DataAnalysis extends AppCompatActivity
 
                     // }
 
-                    while(true) {
-                        //轮询读取0x814E,如果非0,则读取rawdata
-                        byte maddressHigh = (byte) 0x81;
-                        byte maddressLow = (byte) 0x4E;  //_rRW_MISCTL__SWRST_B0_
-                        syncFlag = iicByteRead(maddressHigh, maddressLow);
-                        watch_dog++;
-                        //while ((syncFlag == 0 )|| (syncFlag == 0x77)) {
-                        if (((syncFlag == 0) || (syncFlag == 0x77)) ){
-                            SystemClock.sleep(1);
-                            //mHandler.sendEmptyMessage(LOG1_MESSAG);
-                        }
-                        else
-                        {
-                            if(count == 0) {
-                                //mHandler.sendEmptyMessage(LOG2_MESSAGE);
-                            }
-                            else {
-                                // mHandler.sendEmptyMessage(SEND_MESSAGE_SUCCESS); //清空文本框
-                            }
-                            for (int i = 0; i <mRawdataBytes.length; i++)
-                            {
-                                mRawdataBytes[i] = (byte)0x00;
-                            }
-                            break;
-                        }
-                    }
 
-                    SystemClock.sleep(400);
+                    //SystemClock.sleep(50);
                 }
-
             }   //ThreadPool
         });   //ThreadPool
         //   return true;
@@ -722,16 +721,12 @@ public class DataAnalysis extends AppCompatActivity
             //String dvhex;
             int maxdata;
             int mindata;
-            long laverage;  //平均值,临时存储和值
-            int iaverage;   //平均值
-            int irmd = 0;  //相对平均值偏差
             int itemp;  //临时存放
             switch (msg.what) {
                 case RAWDATA_MESSAGE://
 
                     maxdata = 0;
                     mindata = 65535;
-                    laverage = 0;
                     //控制行数
                     for (int row = 0; row < rownum + 1; row++) {
                         //控制列数
@@ -797,8 +792,6 @@ public class DataAnalysis extends AppCompatActivity
                                     mindata = datatemp[i];
                                 }
 
-                                laverage += datatemp[i];
-
                                 i++;
                             }
                         }
@@ -808,36 +801,9 @@ public class DataAnalysis extends AppCompatActivity
                         }
                     }
 
-                    iaverage = (int)(laverage / (long) (rownum * colnum));
-
-                    for (i = 0; i < (rownum * colnum); i++) {
-                        if (datatemp[i] >= iaverage)
-                        {
-                            itemp = (int)((long)((datatemp[i] - iaverage) * 100) / iaverage);
-                        }
-                        else
-                        {
-                            itemp = (int)((long)((iaverage - datatemp[i]) * 100) / iaverage);
-
-                        }
-                        if (itemp > irmd)
-                        {
-                            irmd = itemp;
-                        }
-                    }
-
                     mtextView.setText(stringBuilder.toString());
                     tvMaximum.setText(Integer.toString(maxdata));
                     tvMinimum.setText(Integer.toString(mindata));
-                    tvMaxSubMin.setText(Integer.toString(maxdata - mindata));
-                    if (maxdata == 0){
-                        tvUniformity.setText("NA");
-                    }else{
-                        tvUniformity.setText(Integer.toString(100 - (mindata * 100) / maxdata));
-                    }
-                    tvAverage.setText(Integer.toString(iaverage));
-                    tvRMD.setText(Integer.toString(irmd));
-
 
                     /*
                     for (int j = 0; j < rownum * colnum * 2; j++ ) {
@@ -953,8 +919,6 @@ public class DataAnalysis extends AppCompatActivity
                     mtextView.setText(stringBuilder.toString());
                     tvMaximum.setText(Integer.toString(maxdata));
                     tvMinimum.setText(Integer.toString(mindata));
-                    tvMaxSubMin.setText(Integer.toString(maxdata - mindata));
-                    tvUniformity.setText("NA");
                     break;
                 case  MANUALDIFF_MESSAGE:
                     /*
@@ -1066,8 +1030,6 @@ public class DataAnalysis extends AppCompatActivity
                     mtextView.setText(stringBuilder.toString());
                     tvMaximum.setText(Integer.toString(maxdata));
                     tvMinimum.setText(Integer.toString(mindata));
-                    tvMaxSubMin.setText(Integer.toString(maxdata - mindata));
-                    tvUniformity.setText("NA");
                     break;
 
 
@@ -1118,9 +1080,18 @@ public class DataAnalysis extends AppCompatActivity
             edt_RowNum.setText(Integer.toString(rownum));
         }
 
+        btn_RawdataShow.setEnabled(false);
+        btn_DiffdataShow.setEnabled(false);
+        btn_ReffdataShow.setEnabled(false);
+        btn_ManualdiffdataShow.setEnabled(false);
+        btn_Manualreff.setEnabled(false);
+        btn_Test.setEnabled(false);
+
         switch (view.getId()) {
             case R.id.rawdata:   //Read RawData
                 showFlag =1;
+
+                changeToDebugMode();
                 //count = 1000;
                 showAddressHigh = (byte)0x8b;
                 showAddressLow = (byte)0x98;
@@ -1133,6 +1104,8 @@ public class DataAnalysis extends AppCompatActivity
 
             case R.id.diffdata:
                 showFlag =3;
+
+                changeToDebugMode();
                 showAddressHigh = (byte)0xbb;
                 showAddressLow = (byte)0x10;
                 if(count == 1000) {
@@ -1154,6 +1127,8 @@ public class DataAnalysis extends AppCompatActivity
 
             case R.id.manualdiff:
                 showFlag =2;
+                btn_Manualreff.setEnabled(true);
+                changeToDebugMode();
                 showAddressHigh = (byte)0x8b;
                 showAddressLow = (byte)0x98;
                 if(count == 1000) {
@@ -1166,18 +1141,30 @@ public class DataAnalysis extends AppCompatActivity
                 }
                 break;
 				
-			case  R.id.manualreff:  //set up manual ref
+			case R.id.manualreff:  //set up manual ref
                 showFlag =2;
+                btn_Manualreff.setEnabled(true);
                 count = 1000;
                 showAddressHigh = (byte)0x8b;
                 showAddressLow = (byte)0x98;
                // showRawdata();
                 break;
 
+            case R.id.testting:
+
+                break;
+
             case R.id.stop:    //back
-                showFlag =4;
-                count = 1000;
-                changeToNormalMode();
+                showFlag =5;
+
+                btn_RawdataShow.setEnabled(true);
+                btn_DiffdataShow.setEnabled(true);
+                btn_ReffdataShow.setEnabled(true);
+                btn_ManualdiffdataShow.setEnabled(true);
+                btn_Manualreff.setEnabled(false);
+                btn_Test.setEnabled(true);
+                //count = 1000;
+                //changeToNormalMode();
                 break;
 				
             default:

+ 2 - 2
app/src/main/java/com/example/administrator/wingcool_gt9_apk/GT9MainActivity.java

@@ -418,7 +418,7 @@ public class GT9MainActivity extends AppCompatActivity
                     btnFWUpdate.setEnabled(false);
                     btnDataAnalysis.setEnabled(false);
                     btnNoiseAnalysis.setEnabled(false);
-                    btnDemoTools.setEnabled(false);
+                    //btnDemoTools.setEnabled(false);
                     btnIICOperation.setEnabled(false);
                     btnTestOperation.setEnabled(false);
                     btnContactUs.setEnabled(false);
@@ -530,7 +530,7 @@ public class GT9MainActivity extends AppCompatActivity
                     btnFWUpdate.setEnabled(true);
                     btnDataAnalysis.setEnabled(true);
                     btnNoiseAnalysis.setEnabled(true);
-                    btnDemoTools.setEnabled(true);
+                    //btnDemoTools.setEnabled(true);
                     btnIICOperation.setEnabled(true);
                     btnTestOperation.setEnabled(true);
                     btnContactUs.setEnabled(true);

+ 4 - 4
app/src/main/java/com/example/administrator/wingcool_gt9_apk/TestOperation.java

@@ -860,8 +860,8 @@ public class TestOperation extends AppCompatActivity
 
         if (edt_Maximum.getText().length()==0)
         {
-            edt_Maximum.setText(Integer.toString(3000));
-            iMaximum = 3000;
+            edt_Maximum.setText(Integer.toString(3500));
+            iMaximum = 3500;
         }
         else
         {
@@ -870,8 +870,8 @@ public class TestOperation extends AppCompatActivity
 
         if (edt_Minimum.getText().length()==0)
         {
-            edt_Minimum.setText(Integer.toString(1000));
-            iMinimum = 1000;
+            edt_Minimum.setText(Integer.toString(1750));
+            iMinimum = 1750;
         }
         else
         {

+ 84 - 68
app/src/main/res/layout-hdpi/activity_dataanalysis.xml

@@ -73,9 +73,9 @@
                 android:layout_marginEnd="8dp"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/bg_frame_line"
-                android:columnCount="16"
+                android:columnCount="8"
                 android:orientation="horizontal"
-                android:rowCount="2">
+                android:rowCount="1">
 
                 <TextView
                     android:id="@+id/maximum"
@@ -109,72 +109,6 @@
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/maxsubmin"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/maxsubmin"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/maxsubminshow"
-                    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/uniformity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/uniformity"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    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/average"
-                    android:layout_row="1"
-                    android:layout_column="0"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="20dp"
-                    android:text="@string/average"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/averageshow"
-                    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/rmd"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/rmd"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/rmdshow"
-                    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/mad"
                     android:layout_width="wrap_content"
@@ -265,6 +199,75 @@
                     android:padding="5dp"
                     android:textSize="20dp"
                     android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/maximumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/maximumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputmaximum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true"/>
+
+                <TextView
+                    android:id="@+id/minimumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/minimumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputminimum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/adjacentdeviationthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/adjacentdeviationthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputadjacentdeviation"
+                    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:textAlignment="center"
+                    android:maxLength="2"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
             </LinearLayout>
 
             <LinearLayout
@@ -346,6 +349,19 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/testting"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="0dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/test"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/stop"
                     android:layout_width="match_parent"

+ 0 - 46
app/src/main/res/layout-hdpi/activity_testoperation.xml

@@ -177,52 +177,6 @@
                     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"

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

@@ -73,9 +73,9 @@
                 android:layout_marginEnd="8dp"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/bg_frame_line"
-                android:columnCount="16"
+                android:columnCount="8"
                 android:orientation="horizontal"
-                android:rowCount="2">
+                android:rowCount="1">
 
                 <TextView
                     android:id="@+id/maximum"
@@ -109,72 +109,6 @@
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/maxsubmin"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/maxsubmin"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/maxsubminshow"
-                    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/uniformity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/uniformity"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    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/average"
-                    android:layout_row="1"
-                    android:layout_column="0"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="20dp"
-                    android:text="@string/average"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/averageshow"
-                    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/rmd"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/rmd"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/rmdshow"
-                    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/mad"
                     android:layout_width="wrap_content"
@@ -265,6 +199,75 @@
                     android:padding="5dp"
                     android:textSize="20dp"
                     android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/maximumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/maximumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputmaximum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true"/>
+
+                <TextView
+                    android:id="@+id/minimumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/minimumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputminimum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/adjacentdeviationthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/adjacentdeviationthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputadjacentdeviation"
+                    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:textAlignment="center"
+                    android:maxLength="2"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
             </LinearLayout>
 
             <LinearLayout
@@ -346,6 +349,19 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/testting"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="0dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/test"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/stop"
                     android:layout_width="match_parent"

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

@@ -177,52 +177,6 @@
                     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"

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

@@ -73,9 +73,9 @@
                 android:layout_marginEnd="8dp"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/bg_frame_line"
-                android:columnCount="16"
+                android:columnCount="8"
                 android:orientation="horizontal"
-                android:rowCount="2">
+                android:rowCount="1">
 
                 <TextView
                     android:id="@+id/maximum"
@@ -109,72 +109,6 @@
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/maxsubmin"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/maxsubmin"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/maxsubminshow"
-                    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/uniformity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/uniformity"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    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/average"
-                    android:layout_row="1"
-                    android:layout_column="0"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="20dp"
-                    android:text="@string/average"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/averageshow"
-                    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/rmd"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/rmd"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/rmdshow"
-                    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/mad"
                     android:layout_width="wrap_content"
@@ -265,6 +199,75 @@
                     android:padding="5dp"
                     android:textSize="20dp"
                     android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/maximumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/maximumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputmaximum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true"/>
+
+                <TextView
+                    android:id="@+id/minimumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/minimumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputminimum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/adjacentdeviationthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/adjacentdeviationthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputadjacentdeviation"
+                    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:textAlignment="center"
+                    android:maxLength="2"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
             </LinearLayout>
 
             <LinearLayout
@@ -346,6 +349,19 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/testting"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="0dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/test"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/stop"
                     android:layout_width="match_parent"

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

@@ -177,52 +177,6 @@
                     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"

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

@@ -73,9 +73,9 @@
                 android:layout_marginEnd="8dp"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/bg_frame_line"
-                android:columnCount="16"
+                android:columnCount="8"
                 android:orientation="horizontal"
-                android:rowCount="2">
+                android:rowCount="1">
 
                 <TextView
                     android:id="@+id/maximum"
@@ -109,72 +109,6 @@
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/maxsubmin"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/maxsubmin"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/maxsubminshow"
-                    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/uniformity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/uniformity"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    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/average"
-                    android:layout_row="1"
-                    android:layout_column="0"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="20dp"
-                    android:text="@string/average"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/averageshow"
-                    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/rmd"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/rmd"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/rmdshow"
-                    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/mad"
                     android:layout_width="wrap_content"
@@ -265,6 +199,75 @@
                     android:padding="5dp"
                     android:textSize="20dp"
                     android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/maximumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/maximumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputmaximum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true"/>
+
+                <TextView
+                    android:id="@+id/minimumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/minimumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputminimum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/adjacentdeviationthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/adjacentdeviationthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputadjacentdeviation"
+                    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:textAlignment="center"
+                    android:maxLength="2"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
             </LinearLayout>
 
             <LinearLayout
@@ -346,6 +349,19 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/testting"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="0dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/test"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/stop"
                     android:layout_width="match_parent"

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

@@ -177,52 +177,6 @@
                     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"

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

@@ -73,9 +73,9 @@
                 android:layout_marginEnd="8dp"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/bg_frame_line"
-                android:columnCount="16"
+                android:columnCount="8"
                 android:orientation="horizontal"
-                android:rowCount="2">
+                android:rowCount="1">
 
                 <TextView
                     android:id="@+id/maximum"
@@ -109,72 +109,6 @@
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/maxsubmin"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/maxsubmin"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/maxsubminshow"
-                    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/uniformity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/uniformity"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    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/average"
-                    android:layout_row="1"
-                    android:layout_column="0"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="20dp"
-                    android:text="@string/average"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/averageshow"
-                    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/rmd"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/rmd"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/rmdshow"
-                    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/mad"
                     android:layout_width="wrap_content"
@@ -265,6 +199,75 @@
                     android:padding="5dp"
                     android:textSize="20dp"
                     android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/maximumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/maximumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputmaximum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true"/>
+
+                <TextView
+                    android:id="@+id/minimumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/minimumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputminimum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/adjacentdeviationthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/adjacentdeviationthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputadjacentdeviation"
+                    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:textAlignment="center"
+                    android:maxLength="2"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
             </LinearLayout>
 
             <LinearLayout
@@ -346,6 +349,19 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/testting"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="0dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/test"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/stop"
                     android:layout_width="match_parent"

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

@@ -177,52 +177,6 @@
                     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"

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

@@ -73,9 +73,9 @@
                 android:layout_marginEnd="8dp"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/bg_frame_line"
-                android:columnCount="16"
+                android:columnCount="8"
                 android:orientation="horizontal"
-                android:rowCount="2">
+                android:rowCount="1">
 
                 <TextView
                     android:id="@+id/maximum"
@@ -109,72 +109,6 @@
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/maxsubmin"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/maxsubmin"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/maxsubminshow"
-                    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/uniformity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/uniformity"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    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/average"
-                    android:layout_row="1"
-                    android:layout_column="0"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="20dp"
-                    android:text="@string/average"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/averageshow"
-                    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/rmd"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/rmd"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/rmdshow"
-                    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/mad"
                     android:layout_width="wrap_content"
@@ -265,6 +199,75 @@
                     android:padding="5dp"
                     android:textSize="20dp"
                     android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/maximumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/maximumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputmaximum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true"/>
+
+                <TextView
+                    android:id="@+id/minimumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/minimumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputminimum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/adjacentdeviationthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/adjacentdeviationthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputadjacentdeviation"
+                    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:textAlignment="center"
+                    android:maxLength="2"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
             </LinearLayout>
 
             <LinearLayout
@@ -346,6 +349,19 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/testting"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="0dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/test"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/stop"
                     android:layout_width="match_parent"

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

@@ -177,52 +177,6 @@
                     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"

+ 84 - 68
app/src/main/res/layout-land/activity_dataanalysis.xml

@@ -73,9 +73,9 @@
                 android:layout_marginEnd="8dp"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/bg_frame_line"
-                android:columnCount="16"
+                android:columnCount="8"
                 android:orientation="horizontal"
-                android:rowCount="2">
+                android:rowCount="1">
 
                 <TextView
                     android:id="@+id/maximum"
@@ -109,72 +109,6 @@
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/maxsubmin"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/maxsubmin"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/maxsubminshow"
-                    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/uniformity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/uniformity"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    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/average"
-                    android:layout_row="1"
-                    android:layout_column="0"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="20dp"
-                    android:text="@string/average"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/averageshow"
-                    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/rmd"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/rmd"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/rmdshow"
-                    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/mad"
                     android:layout_width="wrap_content"
@@ -265,6 +199,75 @@
                     android:padding="5dp"
                     android:textSize="20dp"
                     android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/maximumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/maximumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputmaximum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true"/>
+
+                <TextView
+                    android:id="@+id/minimumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/minimumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputminimum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/adjacentdeviationthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/adjacentdeviationthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputadjacentdeviation"
+                    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:textAlignment="center"
+                    android:maxLength="2"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
             </LinearLayout>
 
             <LinearLayout
@@ -346,6 +349,19 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/testting"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="0dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/test"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/stop"
                     android:layout_width="match_parent"

+ 0 - 46
app/src/main/res/layout-land/activity_testoperation.xml

@@ -177,52 +177,6 @@
                     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"

+ 84 - 68
app/src/main/res/layout-mdpi/activity_dataanalysis.xml

@@ -73,9 +73,9 @@
                 android:layout_marginEnd="8dp"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/bg_frame_line"
-                android:columnCount="16"
+                android:columnCount="8"
                 android:orientation="horizontal"
-                android:rowCount="2">
+                android:rowCount="1">
 
                 <TextView
                     android:id="@+id/maximum"
@@ -109,72 +109,6 @@
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/maxsubmin"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/maxsubmin"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/maxsubminshow"
-                    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/uniformity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/uniformity"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    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/average"
-                    android:layout_row="1"
-                    android:layout_column="0"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="20dp"
-                    android:text="@string/average"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/averageshow"
-                    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/rmd"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/rmd"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/rmdshow"
-                    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/mad"
                     android:layout_width="wrap_content"
@@ -265,6 +199,75 @@
                     android:padding="5dp"
                     android:textSize="20dp"
                     android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/maximumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/maximumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputmaximum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true"/>
+
+                <TextView
+                    android:id="@+id/minimumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/minimumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputminimum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/adjacentdeviationthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/adjacentdeviationthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputadjacentdeviation"
+                    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:textAlignment="center"
+                    android:maxLength="2"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
             </LinearLayout>
 
             <LinearLayout
@@ -346,6 +349,19 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/testting"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="0dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/test"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/stop"
                     android:layout_width="match_parent"

+ 0 - 46
app/src/main/res/layout-mdpi/activity_testoperation.xml

@@ -177,52 +177,6 @@
                     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"

+ 84 - 68
app/src/main/res/layout-xhdpi/activity_dataanalysis.xml

@@ -73,9 +73,9 @@
                 android:layout_marginEnd="8dp"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/bg_frame_line"
-                android:columnCount="16"
+                android:columnCount="8"
                 android:orientation="horizontal"
-                android:rowCount="2">
+                android:rowCount="1">
 
                 <TextView
                     android:id="@+id/maximum"
@@ -109,72 +109,6 @@
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/maxsubmin"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/maxsubmin"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/maxsubminshow"
-                    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/uniformity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/uniformity"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    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/average"
-                    android:layout_row="1"
-                    android:layout_column="0"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="20dp"
-                    android:text="@string/average"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/averageshow"
-                    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/rmd"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/rmd"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/rmdshow"
-                    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/mad"
                     android:layout_width="wrap_content"
@@ -265,6 +199,75 @@
                     android:padding="5dp"
                     android:textSize="20dp"
                     android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/maximumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/maximumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputmaximum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true"/>
+
+                <TextView
+                    android:id="@+id/minimumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/minimumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputminimum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/adjacentdeviationthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/adjacentdeviationthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputadjacentdeviation"
+                    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:textAlignment="center"
+                    android:maxLength="2"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
             </LinearLayout>
 
             <LinearLayout
@@ -346,6 +349,19 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/testting"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="0dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/test"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/stop"
                     android:layout_width="match_parent"

+ 0 - 46
app/src/main/res/layout-xhdpi/activity_testoperation.xml

@@ -177,52 +177,6 @@
                     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"

+ 84 - 68
app/src/main/res/layout-xxhdpi/activity_dataanalysis.xml

@@ -73,9 +73,9 @@
                 android:layout_marginEnd="8dp"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/bg_frame_line"
-                android:columnCount="16"
+                android:columnCount="8"
                 android:orientation="horizontal"
-                android:rowCount="2">
+                android:rowCount="1">
 
                 <TextView
                     android:id="@+id/maximum"
@@ -109,72 +109,6 @@
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/maxsubmin"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/maxsubmin"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/maxsubminshow"
-                    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/uniformity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/uniformity"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    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/average"
-                    android:layout_row="1"
-                    android:layout_column="0"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="20dp"
-                    android:text="@string/average"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/averageshow"
-                    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/rmd"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/rmd"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/rmdshow"
-                    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/mad"
                     android:layout_width="wrap_content"
@@ -265,6 +199,75 @@
                     android:padding="5dp"
                     android:textSize="20dp"
                     android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/maximumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/maximumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputmaximum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true"/>
+
+                <TextView
+                    android:id="@+id/minimumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/minimumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputminimum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/adjacentdeviationthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/adjacentdeviationthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputadjacentdeviation"
+                    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:textAlignment="center"
+                    android:maxLength="2"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
             </LinearLayout>
 
             <LinearLayout
@@ -346,6 +349,19 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/testting"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="0dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/test"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/stop"
                     android:layout_width="match_parent"

+ 0 - 46
app/src/main/res/layout-xxhdpi/activity_testoperation.xml

@@ -177,52 +177,6 @@
                     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"

+ 84 - 68
app/src/main/res/layout-xxxhdpi/activity_dataanalysis.xml

@@ -73,9 +73,9 @@
                 android:layout_marginEnd="8dp"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/bg_frame_line"
-                android:columnCount="16"
+                android:columnCount="8"
                 android:orientation="horizontal"
-                android:rowCount="2">
+                android:rowCount="1">
 
                 <TextView
                     android:id="@+id/maximum"
@@ -109,72 +109,6 @@
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/maxsubmin"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/maxsubmin"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/maxsubminshow"
-                    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/uniformity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/uniformity"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    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/average"
-                    android:layout_row="1"
-                    android:layout_column="0"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="20dp"
-                    android:text="@string/average"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/averageshow"
-                    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/rmd"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/rmd"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/rmdshow"
-                    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/mad"
                     android:layout_width="wrap_content"
@@ -265,6 +199,75 @@
                     android:padding="5dp"
                     android:textSize="20dp"
                     android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/maximumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/maximumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputmaximum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true"/>
+
+                <TextView
+                    android:id="@+id/minimumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/minimumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputminimum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/adjacentdeviationthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/adjacentdeviationthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputadjacentdeviation"
+                    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:textAlignment="center"
+                    android:maxLength="2"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
             </LinearLayout>
 
             <LinearLayout
@@ -346,6 +349,19 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/testting"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="0dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/test"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/stop"
                     android:layout_width="match_parent"

+ 0 - 46
app/src/main/res/layout-xxxhdpi/activity_testoperation.xml

@@ -177,52 +177,6 @@
                     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"

+ 84 - 68
app/src/main/res/layout/activity_dataanalysis.xml

@@ -73,9 +73,9 @@
                 android:layout_marginEnd="8dp"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/bg_frame_line"
-                android:columnCount="16"
+                android:columnCount="8"
                 android:orientation="horizontal"
-                android:rowCount="2">
+                android:rowCount="1">
 
                 <TextView
                     android:id="@+id/maximum"
@@ -109,72 +109,6 @@
                     android:textSize="20dp"
                     android:textColor="@color/back_red"/>
 
-                <TextView
-                    android:id="@+id/maxsubmin"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/maxsubmin"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/maxsubminshow"
-                    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/uniformity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/uniformity"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    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/average"
-                    android:layout_row="1"
-                    android:layout_column="0"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="20dp"
-                    android:text="@string/average"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/averageshow"
-                    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/rmd"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="50dp"
-                    android:text="@string/rmd"
-                    android:textSize="20dp"/>
-
-                <TextView
-                    android:id="@+id/rmdshow"
-                    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/mad"
                     android:layout_width="wrap_content"
@@ -265,6 +199,75 @@
                     android:padding="5dp"
                     android:textSize="20dp"
                     android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/maximumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/maximumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputmaximum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true"/>
+
+                <TextView
+                    android:id="@+id/minimumthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/minimumthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputminimum"
+                    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:textAlignment="center"
+                    android:maxLength="5"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/adjacentdeviationthreshold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/adjacentdeviationthreshold"
+                    android:padding="5dp"
+                    android:textSize="20dp"/>
+
+                <EditText
+                    android:id="@+id/inputadjacentdeviation"
+                    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:textAlignment="center"
+                    android:maxLength="2"
+                    android:padding="5dp"
+                    android:textSize="20dp"
+                    android:singleLine="true" />
             </LinearLayout>
 
             <LinearLayout
@@ -346,6 +349,19 @@
                     android:textAllCaps="false"
                     android:textSize="20dp" />
 
+                <Button
+                    android:id="@+id/testting"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="0dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:text="@string/test"
+                    android:textAllCaps="false"
+                    android:textSize="20dp" />
+
                 <Button
                     android:id="@+id/stop"
                     android:layout_width="match_parent"

+ 0 - 46
app/src/main/res/layout/activity_testoperation.xml

@@ -177,52 +177,6 @@
                     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"

+ 7 - 6
app/src/main/res/values-en/strings.xml

@@ -52,6 +52,7 @@
     <string name="reffdata">Reffdata</string>
     <string name="manualdiff">Manualdiff</string>
     <string name="manualreff">Manualreff</string>
+    <string name="test">Test</string>
     <string name="stop">Stop</string>
 
     <string name="currentfrequency">Current Frequency:</string>
@@ -70,16 +71,16 @@
     <string name="writedata">Write</string>
 
     <string name="starttesting">Start Testing</string>
-    <string name="maximumthreshold">Maximum Threshold:</string>
-    <string name="minimumthreshold">Minimum Threshold:</string>
-    <string name="uniformitythreshold">Uniformity Threshold</string>
-    <string name="rmdthreshold">RMD Threshold</string>
-    <string name="adjacentdeviationthreshold">MAD Threshold</string>
+    <string name="maximumthreshold">Maximum Threshold</string>
+    <string name="minimumthreshold">Minimum 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>
     <string name="emailaddr">Email:max@wingcool.cn</string>
-    <string name="version">APK Version:v1.0.0_20210601-Release Version</string>
+    <string name="version">APK Version:v1.1.0_20210728-Release Version</string>
 
     <string name="app_name">WingCoolAPK</string>
     <string name="input_num_character">0123456789ABCDEFabcdef</string>

+ 7 - 6
app/src/main/res/values/strings.xml

@@ -51,6 +51,7 @@
     <string name="reffdata">基准值</string>
     <string name="manualdiff">手动差值</string>
     <string name="manualreff">手动基准</string>
+    <string name="test">测 试</string>
     <string name="stop">停 止</string>
 
     <string name="currentfrequency">当前频点:</string>
@@ -69,16 +70,16 @@
     <string name="writedata">发 送</string>
 
     <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="maximumthreshold">最大值阈值</string>
+    <string name="minimumthreshold">最小值阈值</string>
+    <string name="uniformitythreshold">一致性阈值</string>
+    <string name="rmdthreshold">相对平均值偏差阈值</string>
+    <string name="adjacentdeviationthreshold">最大相邻偏差阈值</string>
 
     <string name="companyaddr">地址:深圳市宝安区留仙三路 36 号创兴达商务大厦 2008 室</string>
     <string name="telephonenum">电话:186 8896 1937</string>
     <string name="emailaddr">邮箱:max@wingcool.cn</string>
-    <string name="version">APK版本:v1.0.0_20210601-发布版本</string>
+    <string name="version">APK版本:v1.1.0_20210728-发布版本</string>
 
     <string name="app_name">WingCoolAPK</string>
     <string name="input_num_character">0123456789ABCDEFabcdef</string>