release V44

解决release版 测试软件测试结束后用home键 退出应用，下次进入马上显示上次的测试结束界面问题。

diff --git a/app/release/ICL02Blood_V41_202009081116_release.apk b/app/release/ICL02Blood_V44_202009081835_release.apk
similarity index 55%
rename from app/release/ICL02Blood_V41_202009081116_release.apk
rename to app/release/ICL02Blood_V44_202009081835_release.apk
index d52ffd7..687e9f9 100644 (file)
Binary files a/app/release/ICL02Blood_V41_202009081116_release.apk and b/app/release/ICL02Blood_V44_202009081835_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index b322cf2..a72466a 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":41,"versionName":"202009081116","enabled":true,"outputFile":"ICL02Blood_V41_202009081116_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V41_202009081116_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":44,"versionName":"202009081835","enabled":true,"outputFile":"ICL02Blood_V44_202009081835_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V44_202009081835_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/blood/BloodActivity.java b/app/src/main/java/com/ic/blood/BloodActivity.java
index 74a975c..e4e88c3 100644 (file)
--- a/app/src/main/java/com/ic/blood/BloodActivity.java
+++ b/app/src/main/java/com/ic/blood/BloodActivity.java
@@ -10,6 +10,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.view.WindowManager;
 
 import com.ic.blood.fragment.BloodFragment;
 import com.ic.blood.util.IcLog;
@@ -30,6 +31,7 @@ public class BloodActivity extends AppCompatActivity {
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
         registerReceiver(screenOnOffReceiver, intentFilter);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
     }
 
     private void commitFragment(Fragment fragment) {

diff --git a/app/src/main/java/com/ic/blood/fragment/BloodFragment.java b/app/src/main/java/com/ic/blood/fragment/BloodFragment.java
index 3d21f70..0433099 100644 (file)
--- a/app/src/main/java/com/ic/blood/fragment/BloodFragment.java
+++ b/app/src/main/java/com/ic/blood/fragment/BloodFragment.java
@@ -96,6 +96,8 @@ public class BloodFragment extends Fragment {
         gifFromAssets.stop();
 
         releaseWakeLock();
+        IcLog.i(TAG, "finish");
+        ((BloodActivity) mContext).finish();
     }
 
     private void initBloodModel() {

diff --git a/app/version_code.properties b/app/version_code.properties
index bbdc4b0..d88bc0d 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Sep 08 11:16:23 CST 2020\r
-VERSION_CODE=41\r
+#Tue Sep 08 18:35:11 CST 2020\r
+VERSION_CODE=44\r