From: snickersun <scy@incartech.cn>
Date: Tue, 30 Jun 2020 10:04:08 +0000 (+0800)
Subject: release V29
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.js?a=commitdiff_plain;h=60e91ad8f6e5065fb4f75c0e6855eed2eddadb1a;p=factoryMode.git

release V29
更新ICJniUtils temperature api
---

diff --git a/app/release/FactoryMode_V29_202006301802_release.apk b/app/release/FactoryMode_V29_202006301802_release.apk
new file mode 100644
index 0000000..fb4d0ab
Binary files /dev/null and b/app/release/FactoryMode_V29_202006301802_release.apk differ
diff --git a/app/src/main/java/com/ic/jni/ICJniUtils.java b/app/src/main/java/com/ic/jni/ICJniUtils.java
index 5c1928b..ca48df9 100644
--- a/app/src/main/java/com/ic/jni/ICJniUtils.java
+++ b/app/src/main/java/com/ic/jni/ICJniUtils.java
@@ -59,5 +59,28 @@ public class ICJniUtils {
     public static native int getSPO2();
 
 
+    /*获取温度校准后= getTemperatureOrigin - adjustValue */
     public static native double getTemperature();
+
+    /*获取温度校准前*/
+    public static native double getTemperatureOrigin();
+
+    /*设置校准参数*/
+    public static native int setTemperatureAdjustValue(double value);
+
+    /*设置校准参数*/
+    public static native double getTemperatureAdjustValue();
+
+    /*设置当前温度标志位，实际上就是按照二进制位来定义的。
+    0、可以测温
+    第一位为1，0x1、充电超过2分钟或者充电超过2分钟后拔除5分钟内    0001
+    第二位为1，0x2、亮屏超过5分钟或者亮屏超过5分钟后灭屏5分钟内    0010
+    第三位为1，0x4、通话超过2分钟或者通话超过2分钟后挂断5分钟内    0100
+    所有大于0的都不能测温 */
+    public static native int setTemperatureValidFlag(int flag);
+
+    /*此操作仅仅为了检查标志状态设置成功与否，标志已经在内部被使用*/
+    public static native int getTemperatureValidFlag();
+
+
 }
diff --git a/app/src/main/java/mobile/miki/HeartRate.java b/app/src/main/java/mobile/miki/HeartRate.java
index c1e0d97..fa3f559 100644
--- a/app/src/main/java/mobile/miki/HeartRate.java
+++ b/app/src/main/java/mobile/miki/HeartRate.java
@@ -50,36 +50,7 @@ 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) {
@@ -91,11 +62,11 @@ public class HeartRate extends BaseActivity implements View.OnClickListener {
             int ppg=ICJniUtils.getPPG();
             int weared=ICJniUtils.isWeared();
             double temp=ICJniUtils.getTemperature();
-            double adjust=getTempAdjustValue();
+            double adjust=ICJniUtils.getTemperatureAdjustValue();
             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));
+            tempstr=tempstr+" ("+String.format("%1$.2f",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 268f389..de21e1d 100644
--- a/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java
+++ b/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java
@@ -125,8 +125,7 @@ public class TemperatureAdjustActivity extends BaseActivity implements View.OnCl
     Handler mhandler=new Handler(new Handler.Callback() {
         @Override
         public boolean handleMessage(Message message) {
-
-            double temp = ICJniUtils.getTemperature();
+            double temp = ICJniUtils.getTemperatureOrigin();
             String tempstr = String.format("%1$.2f", temp);
             tv_temperature.setText(tempstr);
             Logger.d("Temperature:" + tempstr);
@@ -138,7 +137,6 @@ public class TemperatureAdjustActivity extends BaseActivity implements View.OnCl
 
                 tv_mesg.setText("体温校准完毕，偏差数据"+String.format("%1$.2f",(avg_temp-37.0f))+"摄氏度！");
                 if(mTestTimer!=null) {
-
                     mTestTimer.cancel();
                     mTestTimer=null;
                 }
@@ -187,14 +185,9 @@ public class TemperatureAdjustActivity extends BaseActivity implements View.OnCl
     private void save_adjust_value(){
 
         if (adjust_start_seconds_left<=0){
-            try {
-                new FileOutputStream(new File("/productinfo/temp_adjust_37.txt")).write(String.format("%1$.2f",(avg_temp-37.0f)).getBytes());
-                Logger.d("write "+String.format("%1$.2f",(avg_temp-37.0f))+" to /productinfo/temp_adjust_37.txt success!");
-            } catch (IOException e) {
-                e.printStackTrace();
-                Logger.d("/productinfo/temp_adjust_37.txt 写入失败！");
-            }
-
+            double  adjustvalue=(avg_temp-37.0f);
+            ICJniUtils.setTemperatureAdjustValue(adjustvalue);
+            Logger.d("write Temp Adjust Value "+String.format("%1$.2f",adjustvalue)+" !");
         }
     }
     @Override
diff --git a/app/version_code.properties b/app/version_code.properties
index 8325865..c190948 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Jun 26 12:47:44 CST 2020
-VERSION_CODE=28
+#Tue Jun 30 18:02:55 CST 2020
+VERSION_CODE=29