From: snickersun <scy@incartech.cn>
Date: Fri, 24 Apr 2020 07:42:24 +0000 (+0800)
Subject: release V9
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=4b65aa5c0c8ac078c7dc125fd0658b9243af883e;p=factoryMode.git

release V9
解决关机时最后一个页面会被显示的问题。
---

diff --git a/app/release/FactoryMode_V9_202004241537_release.apk b/app/release/FactoryMode_V9_202004241537_release.apk
new file mode 100644
index 0000000..a1ff639
Binary files /dev/null and b/app/release/FactoryMode_V9_202004241537_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 275acc9..d804849 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":7,"versionName":"202003191209","enabled":true,"outputFile":"FactoryMode_V7_202003191209_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V7_202003191209_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":9,"versionName":"202004241537","enabled":true,"outputFile":"FactoryMode_V9_202004241537_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V9_202004241537_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/mobile/miki/shutdown_activity.java b/app/src/main/java/mobile/miki/shutdown_activity.java
index 3f07f12..a6ff49d 100644
--- a/app/src/main/java/mobile/miki/shutdown_activity.java
+++ b/app/src/main/java/mobile/miki/shutdown_activity.java
@@ -29,7 +29,7 @@ public class shutdown_activity extends BaseActivity {
             @Override
             public void onClick(View v) {
                 //log("shutdown");
-
+                finish();
                 try {
 
                     //获得ServiceManager类
@@ -63,7 +63,7 @@ public class shutdown_activity extends BaseActivity {
         btn_no.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                shutdown_activity.this.finish();
+                finish();
             }
         });
     }
diff --git a/app/version_code.properties b/app/version_code.properties
index d3805e8..f299d9f 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Mar 24 00:14:29 CST 2020
-VERSION_CODE=8
+#Fri Apr 24 15:37:00 CST 2020
+VERSION_CODE=9