1、添加 ICJniUtils 中对 温度传感器的检测函数。

2、根据ppg和temp检测函数设置Config，配置对应的sensor的有无。
3、除了h88，其他都默认不对ppg和 temp进行检测，除非下发指令。

diff --git a/app/app.iml b/app/app.iml
index cda70e3..ccb6451 100644 (file)
--- a/app/app.iml
+++ b/app/app.iml
@@ -101,12 +101,12 @@
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project"/>\r
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project"/>\r
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\android-logging-log4j-1.0.3.jar:unspecified@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\ftp4j-1.7.2.jar:unspecified@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\log4j-1.2.17.jar:unspecified@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\okio-2.4.3.jar:unspecified@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\frameworks-full-debug.jar:unspecified@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\telephony_common-full-debug.jar:unspecified@jar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\android-logging-log4j-1.0.3.jar:unspecified@jar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\ftp4j-1.7.2.jar:unspecified@jar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\log4j-1.2.17.jar:unspecified@jar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\okio-2.4.3.jar:unspecified@jar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\frameworks-full-debug.jar:unspecified@jar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\telephony_common-full-debug.jar:unspecified@jar" level="project"/>\r
     <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project"/>\r
     <orderEntry type="library" name="Gradle: com.android.support:support-annotations:25.1.0@jar" level="project"/>\r
     <orderEntry type="library" name="Gradle: io.reactivex:rxjava:1.1.0@jar" level="project"/>\r
@@ -126,11 +126,6 @@
     <orderEntry type="library" name="Gradle: com.kymjs.rxvolley:rxvolley:1.1.3@aar" level="project"/>\r
     <orderEntry type="library" name="Gradle: io.reactivex:rxandroid:1.1.0@aar" level="project"/>\r
     <orderEntry type="module" module-name="dNSCache"/>\r
-    <orderEntry type="module" module-name="dNSCache"/>\r
-    <orderEntry type="module" module-name="dNSCache"/>\r
-    <orderEntry type="module" module-name="dNSCache"/>\r
-    <orderEntry type="module" module-name="dNSCache"/>\r
-    <orderEntry type="module" module-name="dNSCache"/>\r
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK"/>\r
   </component>\r
 </module>\r

diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index d1d2dda..3d4b576 100644 (file)
--- 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;\r
 import com.enqualcomm.support.utils.TimeUtil;\r
 import com.enqualcomm.support.utils.Util;\r
+import com.ic.jni.ICJniUtils;\r
 import com.sina.util.dnscache.log.FileUtil;\r
 \r
 import org.json.JSONException;\r
@@ -287,12 +288,12 @@ public class Config {
       return port;\r
   }\r
 \r
-  public static void setH88InitFlag(Context context,int flag){\r
-    SharPreferenceUtil.setPrefInt(context,"H88InitFlag",flag);\r
+  public static void setConfigInitFlag(Context context,int flag){\r
+    SharPreferenceUtil.setPrefInt(context,"ConfigInitFlag",flag);\r
   }\r
 \r
-  public static int getH88InitFlag(Context context){\r
-    return SharPreferenceUtil.getPrefInt(context,"H88InitFlag",0);\r
+  public static int getConfigInitFlag(Context context){\r
+    return SharPreferenceUtil.getPrefInt(context,"ConfigInitFlag",0);\r
   }\r
   public static void setLogServerIP(Context context,String serverIP,int serverPort){\r
 \r
@@ -407,9 +408,13 @@ public class Config {
       needBroadcastAntiAlarm=false;\r
     }else if  ((c41_branch_name.equals("AK")) ){\r
       noPPGSensor=false;\r
-      noTempSensor=false;\r
+      noTempSensor=true;\r
     }\r
 \r
+\r
+    noPPGSensor=(ICJniUtils.isPPGavailable()==0);\r
+    noTempSensor=(ICJniUtils.isTemperatureDevAvailable()==0);\r
+\r
   }\r
 \r
   public static void loadTemperatureSettings(Runtime runtime){\r

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 10e6405..54d8dcc 100644 (file)
--- 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();\r
         if (Config.c41_branch_name.equals("H88")){\r
 \r
-            if (Config.getH88InitFlag(this)==0) {\r
+            if (Config.getConfigInitFlag(this)==0) {\r
                 Config.setLocationMode(this, CUSTOM_MOD);\r
                 Config.setLocationCycle(this, 3600);\r
                 Config.setPPGTestCycle(this, 60);\r
                 Config.setTemperatureTestCycle(runtime, 60);\r
-                Config.setH88InitFlag(this,1);\r
+                Config.setConfigInitFlag(this,1);\r
+            }\r
+        }else{\r
+\r
+            if (Config.getConfigInitFlag(this)==0) {\r
+                Config.setPPGTestCycle(this, 0);\r
+                Config.setTemperatureTestCycle(runtime, 0);\r
+                Config.setConfigInitFlag(this, 1);\r
             }\r
         }\r
         Config.setHeartBeatCycle(this,5); //临时设置为3分钟，给L03测试用。测试断线问题未解决，取消测试。\r

diff --git a/app/src/main/java/com/ic/jni/ICJniUtils.java b/app/src/main/java/com/ic/jni/ICJniUtils.java
index 338a64c..af93c61 100644 (file)
--- 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 {
     /*根据环境参考温度和腕温换算 体温*/\r
     public static native double getBodyTempFromWristTemp(double wrist_temp,double ref_temp);\r
 \r
+    /*有体温检测功能则返回1， 否则返回0 */\r
+    public static native int isTemperatureDevAvailable();\r
+\r
 }\r

diff --git a/local.properties b/local.properties
index be381b4..f174905 100644 (file)
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.\r
 # For customization when using a Version Control System, please read the\r
 # header note.\r
-#Thu Apr 23 14:33:06 CST 2020\r
-sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk\r
+#Wed Jul 22 00:25:44 CST 2020\r
+sdk.dir=D\:\\Android\\Sdk\r