修正在数据分析模式下，按返回键无法退出界面的问题

app/build.gradle

@@ -7,14 +7,14 @@ android {
         minSdkVersion 18
         targetSdkVersion 28
         versionCode 1
-        versionName "2.0"
+        versionName "2.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     android.applicationVariants.all {
         variant ->
             variant.outputs.all{
                 //´Ë´¦Ö¸¶¨Éú³ÉµÄapkÎļþÃû
-                outputFileName = "WingCoolAPK(GT9)_V2.0.1_20211011.apk"
+                outputFileName = "WingCoolAPK_V2.1.0_20211029.apk"
             }
     }
     lintOptions {

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

@@ -1146,7 +1146,7 @@ public class DataAnalysis extends AppCompatActivity
                     }
                     if (byDisplayFrame == byDisplayFrameCount) {
 
-                        if ((showFlag != 6) && (showFlag != 8)) {  //测试模式和读取主动笔数据时
+                        if ((showFlag != 6) && (showFlag != 8) && (showFlag != 5)) {  //测试模式、读取主动笔数据和停止时
                             byDisplayFrameCount = 0;
                         }
 
@@ -1185,10 +1185,11 @@ public class DataAnalysis extends AppCompatActivity
                                     mHandler.sendEmptyMessage(DIFF_MESSAGE);
                                     break;
                                 case 5:  //stop
+                                    changeToNormalMode();
+                                    SystemClock.sleep(40);
                                     showFlag = 4;
                                     count = 1000;
                                     btTestStep = 0;
-                                    changeToNormalMode();
                                     break;
                                 case 6:  //test
                                     mHandler.sendEmptyMessage(TEST_DATA_MESSAGE);
@@ -3163,22 +3164,29 @@ public class DataAnalysis extends AppCompatActivity
             }
 
              */
-            if ((showFlag) > 0 && (showFlag != 4))
-            {
-                showFlag = 5;
+            switch (showFlag){
+                case 1:  //GT9 rawdata
+                case 2:  //manualdiff
+                case 3:  //diffdata
+                case 6:  //test
+                case 7:  //GT738X rawdata
+                case 8:  //stylusdata
+                    showFlag = 5;
 
-                btn_RawdataShow.setEnabled(true);
-                btn_DiffdataShow.setEnabled(true);
-                btn_ReffdataShow.setEnabled(true);
-                btn_ManualdiffdataShow.setEnabled(true);
-                btn_Manualreff.setEnabled(false);
-                btn_StylusDataShow.setEnabled(true);
-                btn_Test.setEnabled(true);
+                    btn_RawdataShow.setEnabled(true);
+                    btn_DiffdataShow.setEnabled(true);
+                    btn_ReffdataShow.setEnabled(true);
+                    btn_ManualdiffdataShow.setEnabled(true);
+                    btn_Manualreff.setEnabled(false);
+                    btn_StylusDataShow.setEnabled(true);
+                    btn_Test.setEnabled(true);
 
-            }
-            else
-            {
-                finish();
+                    break;
+                case 4:  //test end
+                case 5:  //stop
+                default:
+                    finish();
+                    break;
             }
             return true;
         }

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

@@ -103,7 +103,7 @@
     <string name="companyaddr">Address:Room 2008, Chuangxingda Business Building, No.36 Liuxian 3rd Road, Baoan District, Shenzhen</string>
     <string name="telephonenum">Telephone:186 8896 1937</string>
     <string name="emailaddr">Email:max@wingcool.cn</string>
-    <string name="version">APK Version:v2.0.1_20211028-Debug Version</string>
+    <string name="version">APK Version:v2.0.1_20211029-Debug Version</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>

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

@@ -103,7 +103,7 @@
     <string name="companyaddr">地址：深圳市宝安区留仙三路 36 号创兴达商务大厦 2008 室</string>
     <string name="telephonenum">电话：186 8896 1937</string>
     <string name="emailaddr">邮箱：max@wingcool.cn</string>
-    <string name="version">APK版本：v2.0.1_20211028-内部版本</string>
+    <string name="version">APK版本：v2.0.1_20211029-内部版本</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>