release V9

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

diff --git a/app/release/FactoryMode_V9_202004241537_release.apk b/app/release/FactoryMode_V9_202004241537_release.apk
new file mode 100644 (file)
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 (file)
--- 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 (file)
--- 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\r
             public void onClick(View v) {\r
                 //log("shutdown");\r
-\r
+                finish();\r
                 try {\r
 \r
                     //获得ServiceManager类\r
@@ -63,7 +63,7 @@ public class shutdown_activity extends BaseActivity {
         btn_no.setOnClickListener(new View.OnClickListener() {\r
             @Override\r
             public void onClick(View v) {\r
-                shutdown_activity.this.finish();\r
+                finish();\r
             }\r
         });\r
     }\r

diff --git a/app/version_code.properties b/app/version_code.properties
index d3805e8..f299d9f 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Mar 24 00:14:29 CST 2020\r
-VERSION_CODE=8\r
+#Fri Apr 24 15:37:00 CST 2020\r
+VERSION_CODE=9\r