From: snickersun <snickersun@qq.com>
Date: Tue, 21 Jul 2020 17:44:01 +0000 (+0800)
Subject: 1、添加 ICJniUtils 中对 温度传感器的检测函数。
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=b9faa3a0f233b5779007b0c5e87ffa93a7e624c7;p=protocol_srv.git

1、添加 ICJniUtils 中对 温度传感器的检测函数。
2、根据ppg和temp检测函数设置Config，配置对应的sensor的有无。
3、除了h88，其他都默认不对ppg和 temp进行检测，除非下发指令。
---

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