From b9faa3a0f233b5779007b0c5e87ffa93a7e624c7 Mon Sep 17 00:00:00 2001 From: snickersun Date: Wed, 22 Jul 2020 01:44:01 +0800 Subject: [PATCH] =?utf8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=20ICJniUtils=20?= =?utf8?q?=E4=B8=AD=E5=AF=B9=20=E6=B8=A9=E5=BA=A6=E4=BC=A0=E6=84=9F?= =?utf8?q?=E5=99=A8=E7=9A=84=E6=A3=80=E6=B5=8B=E5=87=BD=E6=95=B0=E3=80=82?= =?utf8?q?=202=E3=80=81=E6=A0=B9=E6=8D=AEppg=E5=92=8Ctemp=E6=A3=80?= =?utf8?q?=E6=B5=8B=E5=87=BD=E6=95=B0=E8=AE=BE=E7=BD=AEConfig=EF=BC=8C?= =?utf8?q?=E9=85=8D=E7=BD=AE=E5=AF=B9=E5=BA=94=E7=9A=84sensor=E7=9A=84?= =?utf8?q?=E6=9C=89=E6=97=A0=E3=80=82=203=E3=80=81=E9=99=A4=E4=BA=86h88?= =?utf8?q?=EF=BC=8C=E5=85=B6=E4=BB=96=E9=83=BD=E9=BB=98=E8=AE=A4=E4=B8=8D?= =?utf8?q?=E5=AF=B9ppg=E5=92=8C=20temp=E8=BF=9B=E8=A1=8C=E6=A3=80=E6=B5=8B?= =?utf8?q?=EF=BC=8C=E9=99=A4=E9=9D=9E=E4=B8=8B=E5=8F=91=E6=8C=87=E4=BB=A4?= =?utf8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- app/app.iml | 17 ++++++----------- .../java/com/enqualcomm/support/Config.java | 15 ++++++++++----- .../com/enqualcomm/support/CoreService.java | 11 +++++++++-- app/src/main/java/com/ic/jni/ICJniUtils.java | 3 +++ local.properties | 4 ++-- 5 files changed, 30 insertions(+), 20 deletions(-) diff --git a/app/app.iml b/app/app.iml index cda70e38..ccb6451e 100644 --- a/app/app.iml +++ b/app/app.iml @@ -101,12 +101,12 @@ - - - - - - + + + + + + @@ -126,11 +126,6 @@ - - - - - diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java index d1d2ddad..3d4b576b 100644 --- a/app/src/main/java/com/enqualcomm/support/Config.java +++ b/app/src/main/java/com/enqualcomm/support/Config.java @@ -10,6 +10,7 @@ import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.SharPreferenceUtil; import com.enqualcomm.support.utils.TimeUtil; import com.enqualcomm.support.utils.Util; +import com.ic.jni.ICJniUtils; import com.sina.util.dnscache.log.FileUtil; import org.json.JSONException; @@ -287,12 +288,12 @@ public class Config { return port; } - public static void setH88InitFlag(Context context,int flag){ - SharPreferenceUtil.setPrefInt(context,"H88InitFlag",flag); + public static void setConfigInitFlag(Context context,int flag){ + SharPreferenceUtil.setPrefInt(context,"ConfigInitFlag",flag); } - public static int getH88InitFlag(Context context){ - return SharPreferenceUtil.getPrefInt(context,"H88InitFlag",0); + public static int getConfigInitFlag(Context context){ + return SharPreferenceUtil.getPrefInt(context,"ConfigInitFlag",0); } public static void setLogServerIP(Context context,String serverIP,int serverPort){ @@ -407,9 +408,13 @@ public class Config { needBroadcastAntiAlarm=false; }else if ((c41_branch_name.equals("AK")) ){ noPPGSensor=false; - noTempSensor=false; + noTempSensor=true; } + + noPPGSensor=(ICJniUtils.isPPGavailable()==0); + noTempSensor=(ICJniUtils.isTemperatureDevAvailable()==0); + } public static void loadTemperatureSettings(Runtime runtime){ diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java index 10e64054..54d8dccf 100644 --- a/app/src/main/java/com/enqualcomm/support/CoreService.java +++ b/app/src/main/java/com/enqualcomm/support/CoreService.java @@ -528,12 +528,19 @@ public class CoreService extends Service { Config.LoadMessageConfigs(); if (Config.c41_branch_name.equals("H88")){ - if (Config.getH88InitFlag(this)==0) { + if (Config.getConfigInitFlag(this)==0) { Config.setLocationMode(this, CUSTOM_MOD); Config.setLocationCycle(this, 3600); Config.setPPGTestCycle(this, 60); Config.setTemperatureTestCycle(runtime, 60); - Config.setH88InitFlag(this,1); + Config.setConfigInitFlag(this,1); + } + }else{ + + if (Config.getConfigInitFlag(this)==0) { + Config.setPPGTestCycle(this, 0); + Config.setTemperatureTestCycle(runtime, 0); + Config.setConfigInitFlag(this, 1); } } Config.setHeartBeatCycle(this,5); //临时设置为3分钟，给L03测试用。测试断线问题未解决，取消测试。 diff --git a/app/src/main/java/com/ic/jni/ICJniUtils.java b/app/src/main/java/com/ic/jni/ICJniUtils.java index 338a64cd..af93c61a 100644 --- a/app/src/main/java/com/ic/jni/ICJniUtils.java +++ b/app/src/main/java/com/ic/jni/ICJniUtils.java @@ -85,4 +85,7 @@ public class ICJniUtils { /*根据环境参考温度和腕温换算 体温*/ public static native double getBodyTempFromWristTemp(double wrist_temp,double ref_temp); + /*有体温检测功能则返回1， 否则返回0 */ + public static native int isTemperatureDevAvailable(); + } diff --git a/local.properties b/local.properties index be381b4c..f1749057 100644 --- a/local.properties +++ b/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Thu Apr 23 14:33:06 CST 2020 -sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk +#Wed Jul 22 00:25:44 CST 2020 +sdk.dir=D\:\\Android\\Sdk -- 2.17.1