From: snickersun <scy@incartech.cn>
Date: Sat, 27 Jun 2020 10:13:32 +0000 (+0800)
Subject: release V28
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=33d296db1057a5430d5ef290293f1e1d01af0b2a;p=factoryMode.git

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
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
--- 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
--- 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) {
 //    EqcAlgorithmNative.native_EqcAlgorithmMethod5(paramString);
 //    ICLogger.i("Nmea :"+nmeastr+" "+paramLong);
-        write_nmea_to_tty(nmeastr);
+        //write_nmea_to_tty(nmeastr);
         if(nmeastr.startsWith("$RD_RSSI"))  {
 
             searchCout++;
diff --git a/app/src/main/java/mobile/miki/HeartRate.java b/app/src/main/java/mobile/miki/HeartRate.java
index a192435..c1e0d97 100644
--- 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;
 
 import com.ic.jni.ICJniUtils;
 
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -46,7 +50,36 @@ public class HeartRate extends BaseActivity implements View.OnClickListener {
         };
         mTimer.schedule(HRTimerTask,0,1000L);
     }
+    public static String readFileLine(File file) {
+        DataInputStream dis = null;
+        try {
+            if (!file.exists()) {
+                file.createNewFile();
+            }
+            dis = new DataInputStream(new FileInputStream(file));
+            String tmp=dis.readLine();
+            return tmp;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+    public static double getTempAdjustValue(){
+
+        String tmpstr=readFileLine(new File("/productinfo/temp_adjust_37.txt"));
+
+        double tmp=0.0f;
 
+        if (tmpstr==null || tmpstr.isEmpty())
+        {
+            tmpstr="0.0";
+        }
+        tmp=Double.valueOf(tmpstr);
+
+        Logger.d("get Temperature Adjust Value from /productinfo/temp_adjust_37.txt , value="+tmpstr);
+        return tmp;
+
+    }
     Handler mhandler=new Handler(new Handler.Callback() {
         @Override
         public boolean handleMessage(Message message) {
@@ -58,10 +91,11 @@ public class HeartRate extends BaseActivity implements View.OnClickListener {
             int ppg=ICJniUtils.getPPG();
             int weared=ICJniUtils.isWeared();
             double temp=ICJniUtils.getTemperature();
-
+            double adjust=getTempAdjustValue();
             String wearedstr=String.valueOf(weared);
             String ppgstr=String.valueOf(ppg);
             String tempstr=String.format("%1$.2f",temp);
+            tempstr=tempstr+"-("+String.format("%1$.2f",adjust)+")="+String.format("%1$.2f",(temp-adjust));
             tv_isweared.setText(wearedstr);
             tv_ppg.setText(ppgstr);
             tv_temperature.setText(tempstr);
diff --git a/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java b/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java
index c5fdcf6..268f389 100644
--- 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;
 
 import android.content.Context;
 import android.content.Intent;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -53,18 +57,56 @@ public class TemperatureAdjustActivity extends BaseActivity implements View.OnCl
             }
         };
         mTestTimer.schedule(HRTimerTask,0,1000L);
+        //startSensor();
+    }
+
+    private SensorManager mSensorManager;
+    /**
+     * 启动传感器。
+     */
+    private void startSensor() {
+        mSensorManager = (SensorManager) this.getSystemService(Context.SENSOR_SERVICE);
+        Sensor mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);
+
+        if (mSensorManager == null || mSensor == null) {
+            Log.d("近距离","设备不支持1");
+           return;
+           //throw new UnsupportedOperationException("设备不支持");
+        }
 
+        boolean isRegister = mSensorManager.registerListener(mSensorEventListener, mSensor, SensorManager.SENSOR_DELAY_NORMAL);
+        if (!isRegister) {
+            //throw new UnsupportedOperationException("设备不支持");
+            Log.d("近距离","设备不支持2");
+            return ;
+        }
     }
+    private SensorEventListener mSensorEventListener = new SensorEventListener() {
+
+        @Override
+        public void onSensorChanged(SensorEvent sensorEvent) {
+            float proximity=sensorEvent.values[0];
+            Log.d("近距离", String.valueOf(proximity));
+        }
+
+        @Override
+        public void onAccuracyChanged(Sensor sensor, int i) {
+
+        }
+    };
+
+
+
     PowerManager.WakeLock screenOnWakelock=null;
     @Override
     protected  void onResume() {
         super.onResume();
         if (screenOnWakelock==null)
-            screenOnWakelock = getScreenOnWakeLock(this,GPSActivity.class.getSimpleName());
+            screenOnWakelock = getScreenOnWakeLock(this,TemperatureAdjustActivity.class.getSimpleName());
 
     }
     public static PowerManager.WakeLock getScreenOnWakeLock(Context context, String tag) {
-        PowerManager.WakeLock wakeLock = ((PowerManager)(context.getSystemService(Context.POWER_SERVICE))).newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, tag);
+        PowerManager.WakeLock wakeLock = ((PowerManager)(context.getSystemService(Context.POWER_SERVICE))).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, tag);
         wakeLock.acquire();
         return wakeLock;
     }
@@ -117,12 +159,13 @@ public class TemperatureAdjustActivity extends BaseActivity implements View.OnCl
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        ICJniUtils.disablePPG();
+
         if(mTestTimer!=null) {
 
             mTestTimer.cancel();
             mTestTimer=null;
         }
+       // mSensorManager.unregisterListener(mSensorEventListener);
     }
 
 
diff --git a/app/version_code.properties b/app/version_code.properties
index b293b5f..8325865 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Jun 24 22:33:02 CST 2020
-VERSION_CODE=24
+#Fri Jun 26 12:47:44 CST 2020
+VERSION_CODE=28