release V45

解决心率退出有时不关闭问题

diff --git a/app/release/FactoryMode_V44_202008212233_release.apk b/app/release/FactoryMode_V45_202008222217_release.apk
similarity index 81%
rename from app/release/FactoryMode_V44_202008212233_release.apk
rename to app/release/FactoryMode_V45_202008222217_release.apk
index aef70ad..721707a 100644 (file)
Binary files a/app/release/FactoryMode_V44_202008212233_release.apk and b/app/release/FactoryMode_V45_202008222217_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 1627fb0..bf02fd7 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":44,"versionName":"202008212233","enabled":true,"outputFile":"FactoryMode_V44_202008212233_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V44_202008212233_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":45,"versionName":"202008222217","enabled":true,"outputFile":"FactoryMode_V45_202008222217_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V45_202008222217_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/mobile/miki/HeartRate.java b/app/src/main/java/mobile/miki/HeartRate.java
index 0a68c15..925fbf1 100644 (file)
--- a/app/src/main/java/mobile/miki/HeartRate.java
+++ b/app/src/main/java/mobile/miki/HeartRate.java
@@ -62,6 +62,14 @@ public class HeartRate extends BaseActivity implements View.OnClickListener, Sen
                 }\r
             };\r
             mTimer.schedule(HRTimerTask, 0, 1000L);\r
+            if(ICJniUtils.isPPGavailable()>0) {\r
+               // if (ICJniUtils.isPPGStarted()==0){\r
+                    ICJniUtils.enablePPG();\r
+               // }\r
+            }else{\r
+                tv_isweared.setText(" "+HeartRate.this.getResources().getString(R.string.no_heartrate));\r
+                tv_ppg.setText("");\r
+            }\r
         }\r
     }\r
 \r
@@ -71,40 +79,31 @@ public class HeartRate extends BaseActivity implements View.OnClickListener, Sen
 \r
             switch(message.what)\r
             {\r
-                case 0:\r
-                    if(ICJniUtils.isPPGavailable()>0) {\r
-                        if (ICJniUtils.isPPGStarted()==0){\r
-                            ICJniUtils.enablePPG();\r
-\r
-                        }\r
-                        int ppg = ICJniUtils.getPPG();\r
-                        int weared = ICJniUtils.isWeared();\r
+                case 0: {\r
+                    int ppg = ICJniUtils.getPPG();\r
+                    int weared = ICJniUtils.isWeared();\r
 \r
-                        String wearedstr = String.valueOf(weared);\r
-                        String ppgstr = String.valueOf(ppg);\r
+                    String wearedstr = String.valueOf(weared);\r
+                    String ppgstr = String.valueOf(ppg);\r
 \r
-                        tv_isweared.setText(" "+wearedstr);\r
-                        tv_ppg.setText(" "+ppgstr);\r
+                    tv_isweared.setText(" " + wearedstr);\r
+                    tv_ppg.setText(" " + ppgstr);\r
 \r
-                        Log.d("dxc","Weared:" + wearedstr + " PPG:" + ppgstr );\r
-                    }else{\r
-                        tv_isweared.setText(" "+HeartRate.this.getResources().getString(R.string.no_heartrate));\r
-                        tv_ppg.setText("");\r
-                    }\r
+                    Log.d("dxc", "Weared:" + wearedstr + " PPG:" + ppgstr);\r
+                }\r
                     break;\r
-                case 1:\r
-                    Bundle bdl=message.getData();\r
-                    String weared=bdl.getString("isweared");\r
-                    String ppg=bdl.getString("PPG");\r
-                    if (!weared.trim().isEmpty() && !ppg.trim().isEmpty())\r
-                    {\r
-                        tv_isweared.setText(" "+weared);\r
-                        tv_ppg.setText(" "+ppg);\r
-                    }else{\r
-                        tv_isweared.setText(" "+HeartRate.this.getResources().getString(R.string.no_heartrate));\r
+                case 1: {\r
+                    Bundle bdl = message.getData();\r
+                    String weared = bdl.getString("isweared");\r
+                    String ppg = bdl.getString("PPG");\r
+                    if (!weared.trim().isEmpty() && !ppg.trim().isEmpty()) {\r
+                        tv_isweared.setText(" " + weared);\r
+                        tv_ppg.setText(" " + ppg);\r
+                    } else {\r
+                        tv_isweared.setText(" " + HeartRate.this.getResources().getString(R.string.no_heartrate));\r
                         tv_ppg.setText("");\r
                     }\r
-\r
+                }\r
                     break;\r
 \r
             }\r
@@ -119,16 +118,23 @@ public class HeartRate extends BaseActivity implements View.OnClickListener, Sen
             mSensorManager.unregisterListener(this);\r
             Log.i( "dxc","Heart Rate PPG_EGC_TYPE_IC66  closed");\r
         }else if(hrsType>0) {\r
+            Log.i( "dxc","Heart Rate closed");\r
+\r
 \r
-            ICJniUtils.disablePPG();\r
             if(mTimer!=null) {\r
                 mTimer.cancel();\r
                 mTimer=null;\r
             }\r
+            ICJniUtils.disablePPG();\r
         }\r
     }\r
 \r
+    @Override\r
+    protected void onPause() {\r
+        super.onPause();\r
+        Log.i( "dxc","Heart Rate onPause");\r
 \r
+    }\r
 \r
     private void initView() {\r
         buttonView = (ButtonViewTwo) findViewById(R.id.btn_set);\r

diff --git a/app/src/main/java/mobile/miki/TemperatureActivity.java b/app/src/main/java/mobile/miki/TemperatureActivity.java
index f8dda2d..b51b9e4 100644 (file)
--- a/app/src/main/java/mobile/miki/TemperatureActivity.java
+++ b/app/src/main/java/mobile/miki/TemperatureActivity.java
@@ -82,6 +82,7 @@ public class TemperatureActivity extends BaseActivity implements View.OnClickLis
                 mTimer.cancel();\r
                 mTimer=null;\r
             }\r
+            Log.i( "dxc","Temperature onPause");\r
             ICJniUtils.disableTemperature();\r
         }else{\r
             Log.i("dxc","No temperature!");\r
@@ -89,7 +90,16 @@ public class TemperatureActivity extends BaseActivity implements View.OnClickLis
 \r
     }\r
 \r
+    @Override\r
+    protected void onPause() {\r
+        super.onPause();\r
+        Log.i( "dxc","Temperature onPause");\r
+    }\r
 \r
+    @Override\r
+    protected void onResume() {\r
+        super.onResume();\r
+    }\r
 \r
     private void initView() {\r
         buttonView = (ButtonViewTwo) findViewById(R.id.btn_set);\r

diff --git a/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java b/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java
index f36eb5b..ead2f47 100644 (file)
--- a/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java
+++ b/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java
@@ -130,7 +130,8 @@ public class TemperatureAdjustActivity extends Activity implements View.OnClickL
             }\r
             screenOnWakelock=null;\r
         }\r
-\r
+        Log.i( "dxc","Temperature adjust onPause");\r
+        ICJniUtils.disableTemperature();\r
 \r
     }\r
     Handler mhandler=new Handler(new Handler.Callback() {\r
@@ -183,7 +184,7 @@ public class TemperatureAdjustActivity extends Activity implements View.OnClickL
             mTestTimer=null;\r
         }\r
 \r
-        ICJniUtils.disableTemperature();\r
+\r
        // mSensorManager.unregisterListener(mSensorEventListener);\r
     }\r
 \r

diff --git a/app/version_code.properties b/app/version_code.properties
index a1e2d23..ca42494 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Aug 21 22:33:06 CST 2020\r
-VERSION_CODE=44\r
+#Sat Aug 22 22:17:37 CST 2020\r
+VERSION_CODE=45\r