From: snickersun <scy@incartech.cn>
Date: Sat, 22 Aug 2020 14:22:08 +0000 (+0800)
Subject: release V45
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=cfa9faed90f0ca5120959cf18ad7e6840a1f4c52;p=factoryMode.git

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
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
--- 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
--- 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
                 }
             };
             mTimer.schedule(HRTimerTask, 0, 1000L);
+            if(ICJniUtils.isPPGavailable()>0) {
+               // if (ICJniUtils.isPPGStarted()==0){
+                    ICJniUtils.enablePPG();
+               // }
+            }else{
+                tv_isweared.setText(" "+HeartRate.this.getResources().getString(R.string.no_heartrate));
+                tv_ppg.setText("");
+            }
         }
     }
 
@@ -71,40 +79,31 @@ public class HeartRate extends BaseActivity implements View.OnClickListener, Sen
 
             switch(message.what)
             {
-                case 0:
-                    if(ICJniUtils.isPPGavailable()>0) {
-                        if (ICJniUtils.isPPGStarted()==0){
-                            ICJniUtils.enablePPG();
-
-                        }
-                        int ppg = ICJniUtils.getPPG();
-                        int weared = ICJniUtils.isWeared();
+                case 0: {
+                    int ppg = ICJniUtils.getPPG();
+                    int weared = ICJniUtils.isWeared();
 
-                        String wearedstr = String.valueOf(weared);
-                        String ppgstr = String.valueOf(ppg);
+                    String wearedstr = String.valueOf(weared);
+                    String ppgstr = String.valueOf(ppg);
 
-                        tv_isweared.setText(" "+wearedstr);
-                        tv_ppg.setText(" "+ppgstr);
+                    tv_isweared.setText(" " + wearedstr);
+                    tv_ppg.setText(" " + ppgstr);
 
-                        Log.d("dxc","Weared:" + wearedstr + " PPG:" + ppgstr );
-                    }else{
-                        tv_isweared.setText(" "+HeartRate.this.getResources().getString(R.string.no_heartrate));
-                        tv_ppg.setText("");
-                    }
+                    Log.d("dxc", "Weared:" + wearedstr + " PPG:" + ppgstr);
+                }
                     break;
-                case 1:
-                    Bundle bdl=message.getData();
-                    String weared=bdl.getString("isweared");
-                    String ppg=bdl.getString("PPG");
-                    if (!weared.trim().isEmpty() && !ppg.trim().isEmpty())
-                    {
-                        tv_isweared.setText(" "+weared);
-                        tv_ppg.setText(" "+ppg);
-                    }else{
-                        tv_isweared.setText(" "+HeartRate.this.getResources().getString(R.string.no_heartrate));
+                case 1: {
+                    Bundle bdl = message.getData();
+                    String weared = bdl.getString("isweared");
+                    String ppg = bdl.getString("PPG");
+                    if (!weared.trim().isEmpty() && !ppg.trim().isEmpty()) {
+                        tv_isweared.setText(" " + weared);
+                        tv_ppg.setText(" " + ppg);
+                    } else {
+                        tv_isweared.setText(" " + HeartRate.this.getResources().getString(R.string.no_heartrate));
                         tv_ppg.setText("");
                     }
-
+                }
                     break;
 
             }
@@ -119,16 +118,23 @@ public class HeartRate extends BaseActivity implements View.OnClickListener, Sen
             mSensorManager.unregisterListener(this);
             Log.i( "dxc","Heart Rate PPG_EGC_TYPE_IC66  closed");
         }else if(hrsType>0) {
+            Log.i( "dxc","Heart Rate closed");
+
 
-            ICJniUtils.disablePPG();
             if(mTimer!=null) {
                 mTimer.cancel();
                 mTimer=null;
             }
+            ICJniUtils.disablePPG();
         }
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+        Log.i( "dxc","Heart Rate onPause");
 
+    }
 
     private void initView() {
         buttonView = (ButtonViewTwo) findViewById(R.id.btn_set);
diff --git a/app/src/main/java/mobile/miki/TemperatureActivity.java b/app/src/main/java/mobile/miki/TemperatureActivity.java
index f8dda2d..b51b9e4 100644
--- 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();
                 mTimer=null;
             }
+            Log.i( "dxc","Temperature onPause");
             ICJniUtils.disableTemperature();
         }else{
             Log.i("dxc","No temperature!");
@@ -89,7 +90,16 @@ public class TemperatureActivity extends BaseActivity implements View.OnClickLis
 
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+        Log.i( "dxc","Temperature onPause");
+    }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
 
     private void initView() {
         buttonView = (ButtonViewTwo) findViewById(R.id.btn_set);
diff --git a/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java b/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java
index f36eb5b..ead2f47 100644
--- 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
             }
             screenOnWakelock=null;
         }
-
+        Log.i( "dxc","Temperature adjust onPause");
+        ICJniUtils.disableTemperature();
 
     }
     Handler mhandler=new Handler(new Handler.Callback() {
@@ -183,7 +184,7 @@ public class TemperatureAdjustActivity extends Activity implements View.OnClickL
             mTestTimer=null;
         }
 
-        ICJniUtils.disableTemperature();
+
        // mSensorManager.unregisterListener(mSensorEventListener);
     }
 
diff --git a/app/version_code.properties b/app/version_code.properties
index a1e2d23..ca42494 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Aug 21 22:33:06 CST 2020
-VERSION_CODE=44
+#Sat Aug 22 22:17:37 CST 2020
+VERSION_CODE=45