release V28

1、暂时禁用通过 串口发送NMEA GPS数据功能，因为有时会造成界面锁死
2、在HeartRate测试窗口显示温度检测的内容。包括可以看到校准值。

diff --git a/app/release/FactoryMode_V28_202006261247_release.apk b/app/release/FactoryMode_V28_202006261247_release.apk
new file mode 100644 (file)
index 0000000..2edf197
Binary files /dev/null and b/app/release/FactoryMode_V28_202006261247_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index fb3077e..a1793c7 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":24,"versionName":"202006242233","enabled":true,"outputFile":"FactoryMode_V24_202006242233_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V24_202006242233_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":28,"versionName":"202006261247","enabled":true,"outputFile":"FactoryMode_V28_202006261247_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V28_202006261247_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/mobile/miki/GPSActivity.java b/app/src/main/java/mobile/miki/GPSActivity.java
index 97b1f97..214d49f 100644 (file)
--- a/app/src/main/java/mobile/miki/GPSActivity.java
+++ b/app/src/main/java/mobile/miki/GPSActivity.java
@@ -302,7 +302,7 @@ public class GPSActivity extends BaseActivity  {
     public void mOnNmeaReceived(long paramLong, String nmeastr) {\r
 //    EqcAlgorithmNative.native_EqcAlgorithmMethod5(paramString);\r
 //    ICLogger.i("Nmea :"+nmeastr+" "+paramLong);\r
-        write_nmea_to_tty(nmeastr);\r
+        //write_nmea_to_tty(nmeastr);\r
         if(nmeastr.startsWith("$RD_RSSI"))  {\r
 \r
             searchCout++;\r

diff --git a/app/src/main/java/mobile/miki/HeartRate.java b/app/src/main/java/mobile/miki/HeartRate.java
index a192435..c1e0d97 100644 (file)
--- a/app/src/main/java/mobile/miki/HeartRate.java
+++ b/app/src/main/java/mobile/miki/HeartRate.java
@@ -11,6 +11,10 @@ import android.widget.TextView;
 \r
 import com.ic.jni.ICJniUtils;\r
 \r
+import java.io.DataInputStream;\r
+import java.io.File;\r
+import java.io.FileInputStream;\r
+import java.io.IOException;\r
 import java.util.Timer;\r
 import java.util.TimerTask;\r
 \r
@@ -46,7 +50,36 @@ public class HeartRate extends BaseActivity implements View.OnClickListener {
         };\r
         mTimer.schedule(HRTimerTask,0,1000L);\r
     }\r
+    public static String readFileLine(File file) {\r
+        DataInputStream dis = null;\r
+        try {\r
+            if (!file.exists()) {\r
+                file.createNewFile();\r
+            }\r
+            dis = new DataInputStream(new FileInputStream(file));\r
+            String tmp=dis.readLine();\r
+            return tmp;\r
+        } catch (IOException e) {\r
+            e.printStackTrace();\r
+        }\r
+        return "";\r
+    }\r
+    public static double getTempAdjustValue(){\r
+\r
+        String tmpstr=readFileLine(new File("/productinfo/temp_adjust_37.txt"));\r
+\r
+        double tmp=0.0f;\r
 \r
+        if (tmpstr==null || tmpstr.isEmpty())\r
+        {\r
+            tmpstr="0.0";\r
+        }\r
+        tmp=Double.valueOf(tmpstr);\r
+\r
+        Logger.d("get Temperature Adjust Value from /productinfo/temp_adjust_37.txt , value="+tmpstr);\r
+        return tmp;\r
+\r
+    }\r
     Handler mhandler=new Handler(new Handler.Callback() {\r
         @Override\r
         public boolean handleMessage(Message message) {\r
@@ -58,10 +91,11 @@ public class HeartRate extends BaseActivity implements View.OnClickListener {
             int ppg=ICJniUtils.getPPG();\r
             int weared=ICJniUtils.isWeared();\r
             double temp=ICJniUtils.getTemperature();\r
-\r
+            double adjust=getTempAdjustValue();\r
             String wearedstr=String.valueOf(weared);\r
             String ppgstr=String.valueOf(ppg);\r
             String tempstr=String.format("%1$.2f",temp);\r
+            tempstr=tempstr+"-("+String.format("%1$.2f",adjust)+")="+String.format("%1$.2f",(temp-adjust));\r
             tv_isweared.setText(wearedstr);\r
             tv_ppg.setText(ppgstr);\r
             tv_temperature.setText(tempstr);\r

diff --git a/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java b/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java
index c5fdcf6..268f389 100644 (file)
--- a/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java
+++ b/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java
@@ -2,6 +2,10 @@ package mobile.miki;
 \r
 import android.content.Context;\r
 import android.content.Intent;\r
+import android.hardware.Sensor;\r
+import android.hardware.SensorEvent;\r
+import android.hardware.SensorEventListener;\r
+import android.hardware.SensorManager;\r
 import android.os.Bundle;\r
 import android.os.Handler;\r
 import android.os.Message;\r
@@ -53,18 +57,56 @@ public class TemperatureAdjustActivity extends BaseActivity implements View.OnCl
             }\r
         };\r
         mTestTimer.schedule(HRTimerTask,0,1000L);\r
+        //startSensor();\r
+    }\r
+\r
+    private SensorManager mSensorManager;\r
+    /**\r
+     * 启动传感器。\r
+     */\r
+    private void startSensor() {\r
+        mSensorManager = (SensorManager) this.getSystemService(Context.SENSOR_SERVICE);\r
+        Sensor mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);\r
+\r
+        if (mSensorManager == null || mSensor == null) {\r
+            Log.d("近距离","设备不支持1");\r
+           return;\r
+           //throw new UnsupportedOperationException("设备不支持");\r
+        }\r
 \r
+        boolean isRegister = mSensorManager.registerListener(mSensorEventListener, mSensor, SensorManager.SENSOR_DELAY_NORMAL);\r
+        if (!isRegister) {\r
+            //throw new UnsupportedOperationException("设备不支持");\r
+            Log.d("近距离","设备不支持2");\r
+            return ;\r
+        }\r
     }\r
+    private SensorEventListener mSensorEventListener = new SensorEventListener() {\r
+\r
+        @Override\r
+        public void onSensorChanged(SensorEvent sensorEvent) {\r
+            float proximity=sensorEvent.values[0];\r
+            Log.d("近距离", String.valueOf(proximity));\r
+        }\r
+\r
+        @Override\r
+        public void onAccuracyChanged(Sensor sensor, int i) {\r
+\r
+        }\r
+    };\r
+\r
+\r
+\r
     PowerManager.WakeLock screenOnWakelock=null;\r
     @Override\r
     protected  void onResume() {\r
         super.onResume();\r
         if (screenOnWakelock==null)\r
-            screenOnWakelock = getScreenOnWakeLock(this,GPSActivity.class.getSimpleName());\r
+            screenOnWakelock = getScreenOnWakeLock(this,TemperatureAdjustActivity.class.getSimpleName());\r
 \r
     }\r
     public static PowerManager.WakeLock getScreenOnWakeLock(Context context, String tag) {\r
-        PowerManager.WakeLock wakeLock = ((PowerManager)(context.getSystemService(Context.POWER_SERVICE))).newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, tag);\r
+        PowerManager.WakeLock wakeLock = ((PowerManager)(context.getSystemService(Context.POWER_SERVICE))).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, tag);\r
         wakeLock.acquire();\r
         return wakeLock;\r
     }\r
@@ -117,12 +159,13 @@ public class TemperatureAdjustActivity extends BaseActivity implements View.OnCl
     @Override\r
     protected void onDestroy() {\r
         super.onDestroy();\r
-        ICJniUtils.disablePPG();\r
+\r
         if(mTestTimer!=null) {\r
 \r
             mTestTimer.cancel();\r
             mTestTimer=null;\r
         }\r
+       // mSensorManager.unregisterListener(mSensorEventListener);\r
     }\r
 \r
 \r

diff --git a/app/version_code.properties b/app/version_code.properties
index b293b5f..8325865 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Jun 24 22:33:02 CST 2020\r
-VERSION_CODE=24\r
+#Fri Jun 26 12:47:44 CST 2020\r
+VERSION_CODE=28\r