From db5ef19cf9124fde5ac8ca5aa6a5c5ccb97d3baf Mon Sep 17 00:00:00 2001 From: snickersun Date: Mon, 29 Mar 2021 12:05:37 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=AD=A3=20GH301=E7=9A=84=E6=B5=8B?= =?utf8?q?=E8=AF=95=E6=96=B9=E5=BC=8F=EF=BC=8C=E8=A6=81=E4=B8=8EIC66?= =?utf8?q?=E4=B8=80=E8=87=B4=E3=80=82=20=E5=B7=B2=E7=9F=A5=E9=97=AE?= =?utf8?q?=E9=A2=98=20=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90=E5=90=8E?= =?utf8?q?=E6=9C=AA=E4=BD=9C=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/ic/work/WorkService.java | 1 + .../com/ic/work/hardware/BloodInfoHelper.java | 2 +- .../java/com/ic/work/hardware/BloodRunnable.java | 6 +++--- .../java/com/ic/work/utils/HardwareUtils.java | 15 +-------------- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/ic/work/WorkService.java b/app/src/main/java/com/ic/work/WorkService.java index 25ade05..b3f1e90 100644 --- a/app/src/main/java/com/ic/work/WorkService.java +++ b/app/src/main/java/com/ic/work/WorkService.java @@ -296,6 +296,7 @@ public class WorkService extends Service { switch (acyion) { case GET_PED_ACTION: //ThreadPoolManager.getInstance().execute(new PedRunnable(mApp.getApplicationContext(), mApp.getRepository())); + IcLog.d(TAG,"GET_PED_ACTION "); new Thread(new PedRunnable(mApp.getApplicationContext(), mApp.getRepository())).start(); break; case Intent.ACTION_TIMEZONE_CHANGED: diff --git a/app/src/main/java/com/ic/work/hardware/BloodInfoHelper.java b/app/src/main/java/com/ic/work/hardware/BloodInfoHelper.java index 65ced8d..112b2ba 100644 --- a/app/src/main/java/com/ic/work/hardware/BloodInfoHelper.java +++ b/app/src/main/java/com/ic/work/hardware/BloodInfoHelper.java @@ -53,7 +53,7 @@ public class BloodInfoHelper implements SensorEventListener { public void getBloodInfo() { ICLogger.d("getBloodInfo..."); - boolean[] deviceState = HardwareUtils.isPPGavailableGH301(); + boolean[] deviceState = HardwareUtils.isPPGavailableIc66(); if (!deviceState[0]) { IcLog.d(TAG, "deviceState[0] == > false"); diff --git a/app/src/main/java/com/ic/work/hardware/BloodRunnable.java b/app/src/main/java/com/ic/work/hardware/BloodRunnable.java index 19cda8d..4961c22 100644 --- a/app/src/main/java/com/ic/work/hardware/BloodRunnable.java +++ b/app/src/main/java/com/ic/work/hardware/BloodRunnable.java @@ -30,17 +30,17 @@ public class BloodRunnable implements Runnable { boolean[] deviceState = HardwareUtils.isPPGavailableIc66(); - if (!deviceState[0]) { + if (!deviceState[0]) {//没有 ECG sensor sendTipsEventBus(BLOOD_NULL_TIPS, BLOOD_NOT_DEVICE); //add by TrillGates notify task finished. EventBus.getDefault().post(new TaskFinishedEvent()); return; } - if (deviceState[1]) { + if (deviceState[1]) {//有 IC66或者GH301 sendTipsEventBus(BLOOD_PLEASE_QUIET, BLOOD_START_CHECK); EventBus.getDefault().post(new BloodSensorEvent(1)); - } else { + } else {// 其他ECG Sensor checkBloodOther(); } //add by TrillGates notify task finished. diff --git a/app/src/main/java/com/ic/work/utils/HardwareUtils.java b/app/src/main/java/com/ic/work/utils/HardwareUtils.java index cf5dbae..b629522 100644 --- a/app/src/main/java/com/ic/work/utils/HardwareUtils.java +++ b/app/src/main/java/com/ic/work/utils/HardwareUtils.java @@ -11,20 +11,7 @@ public class HardwareUtils { int value = ICJniUtils.isPPGavailable(); return new boolean[]{ value > ICJniUtils.PPG_EGC_SensorType.PPG_EGC_TYPE_NONE.ordinal(), - value == ICJniUtils.PPG_EGC_SensorType.PPG_EGC_TYPE_IC66.ordinal() - }; - } catch (Exception e) { - IcLog.e(TAG, "", e); - return new boolean[]{false, false}; - } - } - - public static boolean[] isPPGavailableGH301() { - try { - int value = ICJniUtils.isPPGavailable(); - return new boolean[]{ - value > ICJniUtils.PPG_EGC_SensorType.PPG_EGC_TYPE_NONE.ordinal(), - value == ICJniUtils.PPG_EGC_SensorType.PPG_EGC_TYPE_GH301.ordinal() + value == ICJniUtils.PPG_EGC_SensorType.PPG_EGC_TYPE_IC66.ordinal()||value == ICJniUtils.PPG_EGC_SensorType.PPG_EGC_TYPE_GH301.ordinal() }; } catch (Exception e) { IcLog.e(TAG, "", e); -- 2.17.1