From: snickersun Date: Mon, 3 Aug 2020 02:51:01 +0000 (+0800) Subject: 添加 PPG和 Temperature的Demo 主要时为了IC66,IC68修改测试逻辑。 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=9816b5f24c22f9fd4ae25dd572920cbcee9feffc;p=ag3335m_download_demo.git 添加 PPG和 Temperature的Demo 主要时为了IC66,IC68修改测试逻辑。 --- diff --git a/app/src/main/java/com/ic/jni/MainActivity.java b/app/src/main/java/com/ic/jni/MainActivity.java index d651ebe..a030f2b 100644 --- a/app/src/main/java/com/ic/jni/MainActivity.java +++ b/app/src/main/java/com/ic/jni/MainActivity.java @@ -7,6 +7,10 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.hardware.Sensor; +import android.hardware.SensorEvent; +import android.hardware.SensorEventListener; +import android.hardware.SensorManager; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -20,6 +24,7 @@ import java.util.Calendar; import java.util.Date; import java.util.Timer; import java.util.TimerTask; +import java.util.logging.Logger; public class MainActivity extends AppCompatActivity { @@ -154,14 +159,93 @@ public class MainActivity extends AppCompatActivity { // ICJniUtils.enablePPG(); } + /******************PPG Demo start ****************/ + private SensorManager mSensorManager=null; + private Sensor mHeartRate; + private SensorEventListener sensorEventListener= new SensorEventListener(){ + @Override + public void onSensorChanged(SensorEvent sensorEvent) { + float values[]=sensorEvent.values; + int length = values.length; + Log.e(TAG, "onSensorChanged() is called "+length + +" "+values[0] + +" "+values[1] + +" "+values[2] + +" "+values[3] + +" "+values[4] + ); + + /*[0]---心率;[1]---血压高压;[2]---血压低压;[3]---血氧;[4]---佩戴检测(1--脱手,2--上手);*/ + Log.d("Demo","Weared= "+values[4]+" ,BPH= "+values[1]+" ,BPL= "+values[2]+" ,PPG= "+values[0]+", spo2= "+ values[3]); + + + if (values[4]==2 && values[0]> 0 ){ + //结果检测出来后停止检测 + mSensorManager.unregisterListener(sensorEventListener); + } + } + + @Override + public void onAccuracyChanged(Sensor sensor, int i) { + Log.e(TAG, "onAccuracyChanged() is called "+sensor.getName()+" accuracy="+i); + } + }; public void check_ppg(){ + int ppgDevType=ICJniUtils.isPPGavailable(); + //大于 TYPE NONE 表示有心率传感器 + if (ppgDevType > ICJniUtils.PPG_EGC_SensorType.PPG_EGC_TYPE_NONE.ordinal()){ + if(ppgDevType == ICJniUtils.PPG_EGC_SensorType.PPG_EGC_TYPE_IC66.ordinal()){ + mSensorManager = (SensorManager) getSystemService(SENSOR_SERVICE); + mHeartRate = mSensorManager.getDefaultSensor(Sensor.TYPE_HEART_RATE); + boolean ret = mSensorManager.registerListener(sensorEventListener, mHeartRate, SensorManager.SENSOR_DELAY_UI); + Log.e(TAG, "Heart Rate already opened ret :: " + ret); + + + }else{ + if (ICJniUtils.isPPGStarted()==0){ + ICJniUtils.enablePPG(); + } + boolean gotPPG=false; + while (gotPPG==false){ + //getPPG()函数必须先执行,否则其他数据都无法正确取出。 + int ppg=ICJniUtils.getPPG(); + int isweared=ICJniUtils.isWeared(); + + /** + * 佩戴且心率大于0 ,则认为数据测试完毕 + */ + + if (isweared==1 && ppg > 0){ + Log.d("Demo"," PPG = "+ppg +" , isWeared="+ isweared+" , bph="+ICJniUtils.getHighBloodPressure() + +", bpl = "+ICJniUtils.getLowBloodPressure()+", Spo2="+ICJniUtils.getSPO2()); + } + + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + } + + ICJniUtils.disablePPG(); + + } + + + + } } + /********************PPG Demo End************************************/ + + + /********************Temperature Demo Start * ***********************************/ public void check_temp(){ @@ -204,7 +288,7 @@ public class MainActivity extends AppCompatActivity { } - } + } /********************Temperature Demo End * ***********************************/ public void send_at_to_onoff_simcard(Context context, boolean simon){ diff --git a/app/src/main/jni/native-lib.c b/app/src/main/jni/native-lib.c index f031856..bd9e762 100644 --- a/app/src/main/jni/native-lib.c +++ b/app/src/main/jni/native-lib.c @@ -304,4 +304,3 @@ JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_isTemperatureDevOpened return get_temp_open_status(); } -} \ No newline at end of file diff --git a/app/src/main/libs/armeabi-v7a/libICJniUtils.so b/app/src/main/libs/armeabi-v7a/libICJniUtils.so index a47a063..cc1eb4b 100644 Binary files a/app/src/main/libs/armeabi-v7a/libICJniUtils.so and b/app/src/main/libs/armeabi-v7a/libICJniUtils.so differ