From: TrillGates Date: Fri, 24 Sep 2021 07:17:20 +0000 (+0800) Subject: completed get tempearture of board. X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=dd0c5bef069e836042b023f9a72558a404e7dd0c;p=icworkservice.git completed get tempearture of board. --- diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4889914..1099437 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -73,6 +73,7 @@ + diff --git a/app/src/main/java/com/ic/work/SensorDataService.java b/app/src/main/java/com/ic/work/SensorDataService.java index 68c5779..1adb0cf 100644 --- a/app/src/main/java/com/ic/work/SensorDataService.java +++ b/app/src/main/java/com/ic/work/SensorDataService.java @@ -415,7 +415,7 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp intent.putExtra("id", AlarmManagerUtil.DEFAULT_ALARM_ID); intent.putExtra("intervalMillis", nextDistance); AlarmManagerUtil.setAlarmTime(SensorDataService.this, - nextDistance, + System.currentTimeMillis() + nextDistance, intent); } else { //取消alarm @@ -681,8 +681,13 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp jxTempMode = intent.getIntExtra(JX_KEY_MODE, -1); //创建测试温度的任务 createTask(jxTempMode, TestTaskEvent.SensorType.TEMPERATURE, null); + } else if (AlarmManagerUtil.ALARM_ACTION.equals(action)) { + //如果是检测主板温度的 + //获取主板温度,设置下一次检测周期 + long intervalMillis = intent.getLongExtra("intervalMillis", 0); + AlarmManagerUtil.setAlarmTime(this, System.currentTimeMillis() + intervalMillis, + intent); } - return super.onStartCommand(intent, flags, startId); } diff --git a/app/src/main/java/com/ic/work/utils/TemperatureUtil.java b/app/src/main/java/com/ic/work/utils/TemperatureUtil.java index 6e414a5..2bb87c9 100644 --- a/app/src/main/java/com/ic/work/utils/TemperatureUtil.java +++ b/app/src/main/java/com/ic/work/utils/TemperatureUtil.java @@ -24,7 +24,6 @@ public class TemperatureUtil { return temp_value_orig; } - public static double getBodyTemp(double wristtemp, double envtemp) { return ICJniUtils.getBodyTempFromWristTemp(wristtemp, envtemp); }