From: snickersun <scy@incartech.cn>
Date: Tue, 30 Jun 2020 10:22:49 +0000 (+0800)
Subject: release 430
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=bbd2f6d1cb9798e0b0570e022a9281001b9be984;p=protocol_srv.git

release 430
1、更新测温 ICJniUtils API
2、去掉内置 libICJniUtils.so 只用系统中的。
3、修正 体温测试周期设置setTempAlarm 及体温检测流程。
4、去掉BP00 设置时间，只用系统的NTP服务
5、修改SMSManager 支持更多的模式
---

diff --git a/app/release/ICSer_V429_2006271708_release.apk b/app/release/ICSer_V430_2006301816_release.apk
similarity index 79%
rename from app/release/ICSer_V429_2006271708_release.apk
rename to app/release/ICSer_V430_2006301816_release.apk
index 12deb133..a4e426bd 100644
Binary files a/app/release/ICSer_V429_2006271708_release.apk and b/app/release/ICSer_V430_2006301816_release.apk differ
diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index d8c840cc..1e27d38c 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -377,7 +377,7 @@ public class Config {
   }
 
   public static void setTemperatureTestCycle(Runtime runtime,int cycle_minutes) {
-    SharPreferenceUtil.setPrefInt(runtime.getContextProxy().context,KeyLocationCycle,cycle_minutes);
+    SharPreferenceUtil.setPrefInt(runtime.getContextProxy().context,KeyTempTestCycle,cycle_minutes);
     loadTemperatureSettings(runtime);
   }
     public static boolean isUsingCustomServer=false;
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index a855ccd4..a63c2bfc 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -517,7 +517,7 @@ public class CoreService extends Service {
             resetStepCount();
         }
 
-        Config.setHeartBeatCycle(this,3);
+        Config.setHeartBeatCycle(this,3); //临时设置为3分钟，给L03测试用。
         //初始化ServerHeartBeat Cycle
         Config.loadHearBeatSetting(runtime);
         //初始化PPG，LocationMod，LocationCycle
@@ -763,6 +763,7 @@ public class CoreService extends Service {
                     if (connection.isServerConnected() && runtime.isServerProtocolConnected()) {
                         //测试温度并上报
                         String temperatureMsg=protocolAPIHelper.getTemperatureMSG(TemperatureUtil.get_temp_value_adjusted());
+                        ICLogger.i("发送体温测量值 "+temperatureMsg);
                         Deliver.sendLocationMSG(temperatureMsg);
                     }
                     setTempAlarm();
@@ -904,7 +905,7 @@ public class CoreService extends Service {
         int cycle=runtime.temp_test_Cycle;
 
         AlarmHelper.setRealTimeAlarm(runtime.getContextProxy().context,cycle, TEMP_ALARM);
-        sb.append(" setHeartAlarm  "+TEMP_ALARM+", cycle "+cycle);
+        sb.append(" setTempAlarm  "+TEMP_ALARM+", cycle "+cycle);
 //        locationClient.triggerLocationProcess();
         ICLogger.i(sb.toString());
         FileOutputUtil.fileOutput(runtime.getCacheDir(),"alarmCycle",sb.toString());
diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index 13461b98..aebc7250 100644
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -351,6 +351,13 @@ public class ICSmsManager {
                                     case ICLocation.EMERGNECY_MOD:
                                         cycle = 60;
                                         break;
+                                    case ICLocation.CUSTOM_MOD:
+                                    case ICLocation.CUSTOM_MOD8_GPS:
+                                    case ICLocation.CUSTOM_MOD8_WIFI:
+                                        break;
+                                    default:
+                                        sendSMS(phonenumber, "set to Location Failed ,value range should be Mod in (1,2,3,4,5,8,9) and cycle >=30!");
+                                        return true;
                                 }
                                 LocationClient.setForceLocation(1); //短信设置的至少强制执行第一次定位。否则NORMAL_MOD和LOWPOWER_MOD如果没有运动就无法正常定位
                                 runtime.getLocationInstance().setLocation_cycle(cycle);
@@ -361,7 +368,7 @@ public class ICSmsManager {
                                 }
                                 sendSMS(phonenumber, "set to Location Mode=" + runtime.getLocationInstance().getWorkingMod() + ", Cycle=" + runtime.getLocationInstance().getLocation_cycle());
                             } else {
-                                sendSMS(phonenumber, "set to Location Failed ,value range should be 1<= Mode <=5 and cycle >=30!");
+                                sendSMS(phonenumber, "set to Location Failed ,value range should be Mod in (1,2,3,4,5,8,9) and cycle >=30!");
                             }
 
                         } else {
diff --git a/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java b/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java
index bd15d48a..94052f4b 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java
@@ -234,7 +234,7 @@ public class DeviceInfoUtil {
             .append(runtime.IMEI())
             .append("\n Srv [").append(runtime.getHost()).append(":").append(runtime.getPort()).append("]").append(KeepAlive.isConnected).append(" , HBcycle ").append(runtime.getHeartBeatCycle())
             .append("\n ServerConnected is ").append(runtime.isServerProtocolConnected())
-            .append(",Temp ").append(String.format("%1$.2f",TemperatureUtil.get_temp_value_adjusted())).append(",TA ").append(String.format("%1$.2f",runtime.temperature_adjustValue))
+            .append(",Temp ").append(String.format("%1$.2f",TemperatureUtil.get_temp_value_adjusted())).append(",TA ").append(String.format("%1$.2f",TemperatureUtil.getTempAdjustValue()))
             .append(" \n Bat ").append(runtime.getBattery()).append(",").append(runtime.getBatteryVotage())
             .append(" charged ").append(runtime.isPowerConnected())
             .append(" StepCount ").append(runtime.getTotalStepCount())
@@ -276,7 +276,7 @@ public class DeviceInfoUtil {
             .append(",H").append(runtime.getHRS().getBPH())
             .append(",L").append(runtime.getHRS().getBPL())
             .append(",T").append(String.format("%1$.2f",TemperatureUtil.get_temp_value_adjusted()))
-            .append(",TA").append(String.format("%1$.2f",runtime.temperature_adjustValue))
+            .append(",TA").append(String.format("%1$.2f",TemperatureUtil.getTempAdjustValue()))
             .append(",").append(runtime.getHRS().getTestTime()).append("]")
             .toString();
   }
diff --git a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
index 1abf1a54..b0d3d119 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
@@ -12,31 +12,20 @@ public class TemperatureUtil {
     private static double temp_adjust_value=0.0f;
     public static double get_temp_value_origin()
     {
-
         temp_value_orig= ICJniUtils.getTemperature();
+        ICLogger.i("测量体温 原始值 "+temp_value_orig);
         return temp_value_orig;
     }
     public static double get_temp_value_adjusted()
     {
-        get_temp_value_origin();
-        return (temp_value_orig-temp_adjust_value);
+        return ICJniUtils.getTemperature();
     }
 
     public static double getTempAdjustValue(){
 
-        String tmpstr= FileUtil.readFileLine(new File("/productinfo/temp_adjust_37.txt"));
-
-        double tmp=0.0f;
-
-        if (tmpstr==null || tmpstr.isEmpty())
-        {
-            tmpstr="0.0";
-        }
-        tmp=Double.valueOf(tmpstr);
-
-        temp_adjust_value=tmp;
-        ICLogger.i("get Temperature Adjust Value from /productinfo/temp_adjust_37.txt , value="+tmpstr);
-        return tmp;
+        temp_adjust_value=ICJniUtils.getTemperatureAdjustValue();
+        ICLogger.i("get Temperature Adjust value="+temp_adjust_value);
+        return temp_adjust_value;
 
     }
 }
diff --git a/app/src/main/java/com/ic/jni/ICJniUtils.java b/app/src/main/java/com/ic/jni/ICJniUtils.java
index 6fbc460b..ca48df91 100644
--- a/app/src/main/java/com/ic/jni/ICJniUtils.java
+++ b/app/src/main/java/com/ic/jni/ICJniUtils.java
@@ -59,6 +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/com/ic/protocols/protocol_beehome.java b/app/src/main/java/com/ic/protocols/protocol_beehome.java
index b477a0fc..43053205 100644
--- a/app/src/main/java/com/ic/protocols/protocol_beehome.java
+++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java
@@ -19,6 +19,7 @@ import com.enqualcomm.support.service.HeartRateManager;
 import com.enqualcomm.support.utils.Connection;
 import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.NettyConnection;
+import com.enqualcomm.support.utils.TemperatureUtil;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
 
@@ -33,7 +34,7 @@ import static com.enqualcomm.support.bean.Contact.GROUP_ALL;
 import static java.lang.Math.abs;
 
 public class protocol_beehome {
-    private static final String TAG = "ICSrv." + protocol_jiai.class.getSimpleName();
+    private static final String TAG = "ICSrv." + protocol_beehome.class.getSimpleName();
 
     private static final String CMDHEADER = "IW";
     private static final String CMDEND = "#";
@@ -87,6 +88,8 @@ public class protocol_beehome {
         BP34,//自定义工作模式
         AP40,
         BP40,//下发文本
+        AP68,
+        BP68,//绑定解绑
         APXL,
         BPXL,//测量心率
         APXY,
@@ -160,6 +163,8 @@ public class protocol_beehome {
         cmdMap.put(CMD_TYPE.BP34, "BP34");
         cmdMap.put(CMD_TYPE.AP40, "AP40");
         cmdMap.put(CMD_TYPE.BP40, "BP40");
+        cmdMap.put(CMD_TYPE.AP68, "AP68");
+        cmdMap.put(CMD_TYPE.BP68, "BP68");
         cmdMap.put(CMD_TYPE.APXL, "APXL");
         cmdMap.put(CMD_TYPE.BPXL, "BPXL");
         cmdMap.put(CMD_TYPE.APXY, "APXY");
@@ -178,6 +183,8 @@ public class protocol_beehome {
         cmdMap.put(CMD_TYPE.BP89, "BP89");
         cmdMap.put(CMD_TYPE.APTE, "APTE");
         cmdMap.put(CMD_TYPE.BPTE, "BPTE");
+        cmdMap.put(CMD_TYPE.APTP, "APTP");
+        cmdMap.put(CMD_TYPE.BPTP, "BPTP");
     }
 
 
@@ -326,18 +333,18 @@ public class protocol_beehome {
             log("handleBP00", "Set Datetime " + msg[1]);
             log("handleBP00", "Set TimeZone " + msg[2]);
 
-            Date datetime= TimeUtil.parseDatetiime(msg[1]);
-            int timezone=Integer.parseInt(msg[2]);
-            if (datetime!=null){
-                ICLogger.i("==="+TimeUtil.getDefaultTimeZone());
-                TimeUtil.setTimeZone(timezone);
-
-
-                ICLogger.i("==="+TimeUtil.getDefaultTimeZone());
-                TimeUtil.setSysDateTime(runtime.getContextProxy().context,datetime,timezone);
-                ICLogger.i("==="+TimeUtil.getDefaultTimeZone());
-
-            }
+//            Date datetime= TimeUtil.parseDatetiime(msg[1]);
+//            int timezone=Integer.parseInt(msg[2]);
+//            if (datetime!=null){
+//                ICLogger.i("==="+TimeUtil.getDefaultTimeZone());
+//                TimeUtil.setTimeZone(timezone);
+//
+//
+//                ICLogger.i("==="+TimeUtil.getDefaultTimeZone());
+//                TimeUtil.setSysDateTime(runtime.getContextProxy().context,datetime,timezone);
+//                ICLogger.i("==="+TimeUtil.getDefaultTimeZone());
+//
+//            }
 //            Set Datetime 20200505112734
 //            Set TimeZone 8
 
@@ -1417,7 +1424,41 @@ public class protocol_beehome {
 
     }
 
-    //17.绑定解绑（下行协议号：BP86，响应：AP86）
+    //17.绑定解绑（下行协议号：BP68，响应：AP68）
+    public static String AP68(String index){
+
+        //设备响应：	IWAP86, 080835#
+        //080835:指令流水号
+        return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP68))
+                .append(CMDSPLIT).append(index)
+                .append(CMDEND).toString();
+    }
+
+    public void handleBP68(String cmd,Connection connection,Runtime runtime){
+
+        //示例：
+        //IWBP68,353456789012345,080835,1#
+        //说明：
+        //IW：标识符
+        //BP68 : 命令字符
+        //353456789012345:IMEI号，设备唯一ID
+        //080835 :指令流水号
+        //1 : 表示设备为激活状态（绑定成功） 0：表示设备为未激活状态（解绑成功）
+
+        String[] list=cmd.split(CMDSPLIT);
+
+        if (list.length==4){
+            String index=list[2];
+            String type=list[3];
+            connection.send(genStringMessage("AP86",AP68(index)));
+            ICLogger.i("收到服务器消息："+(type.equals("1")?"绑定成功 ":"未激活或者解绑"));
+
+        }else{
+            ICLogger.i("BP86 format error!");
+        }
+
+    }
+    //17.设置心率/血压测量周期（下行协议号：BP86，响应：AP86）
     public static String AP86(String index){
 
         //设备响应：	IWAP86, 080835#
@@ -1430,28 +1471,33 @@ public class protocol_beehome {
     public void handleBP86(String cmd,Connection connection,Runtime runtime){
 
         //示例：
-        //IWBP86, 353456789012345, 080835,1#
+        //IWBP86, 353456789012345, 080835,1,720#
         //说明：
         //IW：标识符
         //BP86 : 命令字符
         //353456789012345:IMEI号，设备唯一ID
         //080835 :指令流水号
-        //1 : 表示设备为激活状态（绑定成功） 0：表示设备为未激活状态（解绑成功）
+        //1: 表示心率周期；2 ：表示血压周期
+        //720: 表示720分钟
 
         String[] list=cmd.split(CMDSPLIT);
 
-        if (list.length==4){
+        if (list.length==5){
             String index=list[2];
             String type=list[3];
+            String cycle=list[4];
             connection.send(genStringMessage("AP86",AP86(index)));
-            ICLogger.i("收到服务器消息："+(type.equals("1")?"绑定成功 ":"未激活或者解绑"));
+            ICLogger.i("收到服务器指令：设置"+(type.equals("1")?"心率周期 ":"血压周期 ")+cycle+"分钟");
 
+            //发送重置PPGCycle的广播，会在CoreServer里面执行
+            Intent intent = new Intent();
+            intent.putExtra("PPGTestCycle",Integer.valueOf(cycle));
+            runtime.getContextProxy().sendBrodcast(ACTION_HEATR_RATE_START,intent);
         }else{
             ICLogger.i("BP86 format error!");
         }
 
     }
-
     public static String AP88(String index){
         //设备响应：	IWAP88, 080835#
         //080835:指令流水号
@@ -1547,6 +1593,9 @@ public class protocol_beehome {
             ICLogger.i("收到服务器指令：测量体温 "+freq+"分钟一次。");
             Config.setTemperatureTestCycle(runtime,freq);
             CoreService.getInstance().setTempAlarm();
+            String temperatureMsg=APTP(TemperatureUtil.get_temp_value_adjusted());
+             connection.send(genStringMessage("APTP",temperatureMsg));
+            ICLogger.i("发送体温测量值 "+temperatureMsg);
         }else{
             ICLogger.i("BP89 format error!");
         }
@@ -1710,6 +1759,7 @@ public class protocol_beehome {
             case BP86:
                 //绑定解绑消息
                 handleBP86(cmd,mConnection,mRuntime);
+                mConnection.DeliverCMDMessageToSystem("AP86",cmd);//通知下面线程状态变化
 
                 break;
 
@@ -1721,14 +1771,17 @@ public class protocol_beehome {
             case BP89:
                 //心率/血压阀值
                 handleBP89(cmd,mConnection);
+                mConnection.DeliverCMDMessageToSystem("AP89",cmd);//通知下面线程状态变化
                 break;
 
             case BPTE: //设置测试体温
                 handleBPTE(cmd,mConnection,mRuntime);
+                mConnection.DeliverCMDMessageToSystem("APTE",cmd);//通知下面线程状态变化
                 break;
 
             case BPTP:
                 handleBPTP();
+                mConnection.DeliverCMDMessageToSystem("APTP",cmd);//通知下面线程状态变化
                 break;
         }
 
diff --git a/app/src/main/java/com/ic/protocols/protocol_jiai.java b/app/src/main/java/com/ic/protocols/protocol_jiai.java
index 824f693d..e3a20104 100644
--- a/app/src/main/java/com/ic/protocols/protocol_jiai.java
+++ b/app/src/main/java/com/ic/protocols/protocol_jiai.java
@@ -311,18 +311,18 @@ public class protocol_jiai {
             log("handleBP00", "Set Datetime " + msg[1]);
             log("handleBP00", "Set TimeZone " + msg[2]);
 
-            Date datetime= TimeUtil.parseDatetiime(msg[1]);
-            int timezone=Integer.parseInt(msg[2]);
-            if (datetime!=null){
-                ICLogger.i("==="+TimeUtil.getDefaultTimeZone());
-                TimeUtil.setTimeZone(timezone);
-
-
-                ICLogger.i("==="+TimeUtil.getDefaultTimeZone());
-                TimeUtil.setSysDateTime(runtime.getContextProxy().context,datetime,timezone);
-                ICLogger.i("==="+TimeUtil.getDefaultTimeZone());
-
-            }
+//            Date datetime= TimeUtil.parseDatetiime(msg[1]);
+//            int timezone=Integer.parseInt(msg[2]);
+//            if (datetime!=null){
+//                ICLogger.i("==="+TimeUtil.getDefaultTimeZone());
+//                TimeUtil.setTimeZone(timezone);
+//
+//
+//                ICLogger.i("==="+TimeUtil.getDefaultTimeZone());
+//                TimeUtil.setSysDateTime(runtime.getContextProxy().context,datetime,timezone);
+//                ICLogger.i("==="+TimeUtil.getDefaultTimeZone());
+//
+//            }
 //            Set Datetime 20200505112734
 //            Set TimeZone 8
 
diff --git a/app/src/main/jni/jni_interface/com_ic_jni_ICJniUtils.h b/app/src/main/jni/jni_interface/com_ic_jni_ICJniUtils.h
deleted file mode 100644
index cbbde17a..00000000
--- a/app/src/main/jni/jni_interface/com_ic_jni_ICJniUtils.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_ic_jni_ICJniUtils */
-
-#ifndef _Included_com_ic_jni_ICJniUtils
-#define _Included_com_ic_jni_ICJniUtils
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    resetStepCount
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_resetStepCount
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    getStepCount
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_getStepCount
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    enablePedometer
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_enablePedometer
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    disablePedometer
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_disablePedometer
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    isPedometerEnabled
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_isPedometerEnabled
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    saveStepCount
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_saveStepCount
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    recoverStepCount
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_recoverStepCount
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    isPPGavailable
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_isPPGavailable
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    enablePPG
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_enablePPG
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    disablePPG
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_disablePPG
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    getPPG
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_getPPG
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    isPPGStarted
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_isPPGStarted
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    isWeared
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_isWeared
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    getHighBloodPressure
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_getHighBloodPressure
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    getLowBloodPressure
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_getLowBloodPressure
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    getSPO2
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_getSPO2
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    getTemperature
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_com_ic_jni_ICJniUtils_getTemperature
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    enable_ps
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_enable_1ps
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_ic_jni_ICJniUtils
- * Method:    get_ps_data
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_get_1ps_1data
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/app/src/main/libs/arm64-v8a/libICJniUtils.so b/app/src/main/libs/arm64-v8a/libICJniUtils.so
deleted file mode 100644
index 78b371a1..00000000
Binary files a/app/src/main/libs/arm64-v8a/libICJniUtils.so and /dev/null differ
diff --git a/app/src/main/libs/armeabi-v7a/libICJniUtils.so b/app/src/main/libs/armeabi-v7a/libICJniUtils.so
deleted file mode 100644
index a447aaf9..00000000
Binary files a/app/src/main/libs/armeabi-v7a/libICJniUtils.so and /dev/null differ
diff --git a/app/src/main/libs/x86/libICJniUtils.so b/app/src/main/libs/x86/libICJniUtils.so
deleted file mode 100644
index 9f22c851..00000000
Binary files a/app/src/main/libs/x86/libICJniUtils.so and /dev/null differ
diff --git a/app/src/main/libs/x86_64/libICJniUtils.so b/app/src/main/libs/x86_64/libICJniUtils.so
deleted file mode 100644
index 56dbe64a..00000000
Binary files a/app/src/main/libs/x86_64/libICJniUtils.so and /dev/null differ
diff --git a/app/version_code.properties b/app/version_code.properties
index f17a46fa..cd9fe541 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Jun 27 17:08:46 CST 2020
-VERSION_CODE=429
+#Tue Jun 30 18:16:52 CST 2020
+VERSION_CODE=430