<?xml version="1.0" encoding="UTF-8"?>\r
<project version="4">\r
<component name="CompilerConfiguration">\r
- <bytecodeTargetLevel target="1.8" />\r
+ <bytecodeTargetLevel target="11" />\r
</component>\r
</project>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project version="4">\r
+ <component name="Encoding">\r
+ <file url="PROJECT" charset="UTF-8" />\r
+ </component>\r
+</project>
\ No newline at end of file
<option name="priority" value="Medium" />
<option name="excludeFilter" value="" />
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
+ <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.1","enabled":true,"outputFile":"IcL02WorkService_V61_202305022333_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V61_202305022333_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.1","enabled":true,"outputFile":"IcL02WorkService_V61_202306112300_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V61_202306112300_release.apk","properties":{}}]
\ No newline at end of file
import android.widget.Button;
import com.ic.work.hardware.BeforeDawnRunnable;
-import com.ic.work.utils.IcLog;
+import com.ic.work.utils.ICLogger;
import com.ic.work.utils.ServiceUtil;
import com.ic.work.weather.LocationState;
import com.ic.work.weather.WeatherHelper;
OffsetDateTime old = OffsetDateTime.parse("2020-04-11T10:19:16.341+08:00");
Duration interval = Duration.between(old,now);
- IcLog.i(TAG,"interval： "+interval.toDays());
+ ICLogger.i("interval： "+interval.toDays());
}
import com.ic.work.hardware.TemperatureHelper;
import com.ic.work.utils.ICLogger;
import com.ic.work.utils.ICWorkConstants;
-import com.ic.work.utils.IcLog;
+import com.ic.work.utils.ICLogger;
import com.ic.work.utils.IcSystemProperty;
import org.greenrobot.eventbus.EventBus;
String packageName = intent.getPackage();
//其他的进行action判断
String action = intent.getAction();
- IcLog.d(TAG, "on service bind package name -- > "
+ ICLogger.d( "on service bind package name -- > "
+ packageName + " action name is == > " + action);
if (ACTION_BLOOD.equals(packageName) ||
ICWorkConstants.SensorServiceAction.ACTION_HEART_RATE.equals(action)) {
//保持CPU运行
wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ic:sensorDataService");
wakeLock.acquire(10 * 60 * 1000L /*10 minutes*/);
- IcLog.d(TAG, "task == start == > " + testTaskEvent);
+ ICLogger.d( "task == start == > " + testTaskEvent);
//当结果回来的时候，如果队列里没有了，那么就false了
isRunning = true;
//这里处理指令，不可以开启子线程
getTemperatureInfo();
break;
default:
- IcLog.d(TAG, "not support sensor..or you can add new one by coding..");
+ ICLogger.d( "not support sensor..or you can add new one by coding..");
break;
}
}
dispatchTemperatureResult(temperature);
//处理温度测量数据给掌育的
String isSupportTemperature = IcSystemProperty.getSystemProperties("jx.temperature", "false");
- IcLog.d(TAG, "isSupportTemperature == > " + isSupportTemperature);
+ ICLogger.d( "isSupportTemperature == > " + isSupportTemperature);
if (jxTempMode != -1 && "true".equals(isSupportTemperature)) {
sendTemperatureBroadcast2Jx(true, wristTemp, bodyTemp);
jxTempMode = -1;
private void dispatchTemperatureResult(Temperature temperature) {
synchronized (mLock) {
int i = temperatureCallbacks.beginBroadcast();
- IcLog.d(TAG, "temperature callback size == > " + i + " temperature is " + temperature);
+ ICLogger.d( "temperature callback size == > " + i + " temperature is " + temperature);
try {
while (i > 0) {
i--;
* 获取温度相关的信息
*/
private void getTemperatureInfo() {
- IcLog.d(TAG, "getTemperatureInfo..." + Thread.currentThread().getName());
+ ICLogger.d( "getTemperatureInfo..." + Thread.currentThread().getName());
TemperatureHelper.getInstance().getTemperature();
}
//获取心率，这里要完成整个过程
private void getHeartInfo() {
- IcLog.d(TAG, "getHeartInfo..." + Thread.currentThread().getName());
+ ICLogger.d( "getHeartInfo..." + Thread.currentThread().getName());
BloodInfoHelper.getInstance().getBloodInfo();
}
@Override
public void getHeartRateInfo(int from, String tag) {
jxHeartRateMode = 2;
- IcLog.d(TAG, "getHeartRateInfo..." + from + " tag == > " + tag);
+ ICLogger.d( "getHeartRateInfo..." + from + " tag == > " + tag);
createTask(from, TestTaskEvent.SensorType.HEART_RATE, tag);
}
+
};
private TestTaskEvent.From getFromByValue(int value) {
@Override
public void getTemperatureInfo(int from, String tag) {
- IcLog.d(TAG, "getTemperatureInfo..." + from);
+ ICLogger.d( "getTemperatureInfo..." + from);
jxTempMode = 2;
TestTaskEvent.SensorType censorType = TestTaskEvent.SensorType.TEMPERATURE;
createTask(from, censorType, tag);
private void createTask(int from, TestTaskEvent.SensorType censorType, String tag) {
TestTaskEvent.From fromByValue = getFromByValue(from);
if (fromByValue == null) {
- IcLog.d(TAG, "from is not invalid..." + from + tag);
+ ICLogger.d( "from is not invalid..." + from + tag);
return;
}
TestTaskEvent taskEvent = new TestTaskEvent(censorType, fromByValue, System.currentTimeMillis());
- IcLog.d(TAG, "create new task == > " + taskEvent);
+ ICLogger.d( "create new task == > " + taskEvent);
synchronized (mTaskLock) {
//判断队列里是否有同样的任务，如果有的话不用发了，
if (mTaskList.contains(taskEvent)) {
- IcLog.d(TAG, "task contains..." + fromByValue);
+ ICLogger.d( "task contains..." + fromByValue);
//通知正在等待执行
if (tag != null) {
dispatchWaiting(censorType, tag);
return;
}
if (taskEvent.equals(currentTask)) {
- IcLog.d(TAG, "current task running...");
+ ICLogger.d( "current task running...");
//通知正在执行
if (tag != null) {
dispatchTaskRunning(censorType, tag);
}
return;
}
- IcLog.d(TAG, "is running =-== > " + isRunning + " queue size == > " + mTaskList.size());
+ ICLogger.d( "is running =-== > " + isRunning + " queue size == > " + mTaskList.size());
//判断是否繁忙
//如果没有的话则发送一下
if (!isRunning && mTaskList.size() == 0) {
//直接运行不需要放到队列里了
EventBus.getDefault().post(taskEvent);
} else {
- IcLog.d(TAG, "new task waiting..." + taskEvent);
+ ICLogger.d( "new task waiting..." + taskEvent);
//要放到队列里头，提示调用者正在等待执行
if (tag != null) {
dispatchWaiting(censorType, tag);
isRunning = false;
currentTask = null;
int size = mTaskList.size();
- IcLog.d(TAG, "task list size == > " + size);
+ ICLogger.d( "task list size == > " + size);
if (size > 0) {
EventBus.getDefault().post(mTaskList.poll());
}
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
- IcLog.i(TAG, "WorkService onStartCommand");
+ ICLogger.i( "WorkService onStartCommand");
// 掌育会startService的方式来启动服务，如果已经启动了
// 不走onCreate，则会走这里
//可以获取到相关的值，然后去获取心率/体温
return super.onStartCommand(null, flags, startId);
}
String action = intent.getAction();
- IcLog.d(TAG, "onStartCommand action == > " + action);
+ ICLogger.d( "onStartCommand action == > " + action);
//可以通过action来判断
if (ACTION_GET_HEART_RATE.equals(action)) {
jxHeartRateMode = intent.getIntExtra(JX_KEY_MODE, -1);
private void dispatchHeartRateResult(HeartRate heartRate) {
synchronized (mLock) {
int i = heartRateCallbacks.beginBroadcast();
- IcLog.d(TAG, "heart rate callback size == > " + i);
+ ICLogger.d( "heart rate callback size == > " + i);
try {
while (i > 0) {
i--;
public int[] getPPG_ECG_adjustValue() {
String value = IcSystemProperty.getSystemProperties("persist.sys.PpgEcgAdjust", "0,0,0,0");
- IcLog.i(TAG, "getPPG_ECG_adjustValue:" + value);
+ ICLogger.i( "getPPG_ECG_adjustValue:" + value);
String[] result = value.split(",");
if (result.length == 4) {
int[] res = new int[4];
* @param oxygen
*/
private void sendHeartRateBroadcast2Jx(boolean isSuccess, int high, int low, int heart, int oxygen) {
- IcLog.d(TAG, "sendHeartRateBroadcast2Jx -- > " +
+ ICLogger.d( "sendHeartRateBroadcast2Jx -- > " +
isSuccess + " high == > " + high
+ "low == > " + low
+ " heart is =-= > " + heart
private void dispatchTemperatureUpdate(Temperature temperature) {
synchronized (mLock) {
int i = temperatureCallbacks.beginBroadcast();
- IcLog.d(TAG, "dispatch temperature update == > " + temperature);
+ ICLogger.d( "dispatch temperature update == > " + temperature);
try {
while (i > 0) {
i--;
* @param animal 可能是体温（测试以后再决定是否使用这个）
*/
private void sendTemperatureBroadcast2Jx(boolean isSuccess, double value, double animal) {
- IcLog.d(TAG, "sendTemperatureBroadcast2Jx -- > " +
+ ICLogger.d( "sendTemperatureBroadcast2Jx -- > " +
isSuccess + " wrist == > " + value
+ "body == > " + animal);
Intent intent = new Intent();
pedIntent.putExtra(KEY_TEMP_BODY, bodyTemp);
pedIntent.putExtra(KEY_TEMP_OUT, envTemp);
sendBroadcast(pedIntent);
- IcLog.d(TAG, " sendTempBroadcast...");
+ ICLogger.d( " sendTempBroadcast...");
}
@Override
@Override
public void onTemperatureResult(double wristTemp, double bodyTemp, double envTemp) {
- IcLog.d(TAG, "lastWristTemp == > " + wristTemp);
- IcLog.d(TAG, "bodyTemp == > " + bodyTemp);
- IcLog.d(TAG, "envTemp == > " + envTemp);
- IcLog.d(TAG, "on temperature test end...");
+ ICLogger.d( "lastWristTemp == > " + wristTemp);
+ ICLogger.d( "bodyTemp == > " + bodyTemp);
+ ICLogger.d( "envTemp == > " + envTemp);
+ ICLogger.d( "on temperature test end...");
handleTemperature(wristTemp, bodyTemp, envTemp);
//判断是否要执行新的任务
checkContinue();
@Override
public void onHeartRateResult(int high, int low, int heart, int oxygen) {
handleBloodResult(high, low, heart, oxygen);
- IcLog.d(TAG, "high == > " + high);
- IcLog.d(TAG, "low == > " + low);
- IcLog.d(TAG, "heart == > " + heart);
- IcLog.d(TAG, "oxygen == > " + oxygen);
+ ICLogger.d( "high == > " + high);
+ ICLogger.d( "low == > " + low);
+ ICLogger.d( "heart == > " + heart);
+ ICLogger.d( "oxygen == > " + oxygen);
//处理心率测量数据给掌育的
//发广播给掌育,如果不为-1，说明有掌育的份
- IcLog.d(TAG, "jxHeartRateMode..." + jxHeartRateMode);
+ ICLogger.d( "jxHeartRateMode..." + jxHeartRateMode);
//获取一下是不是掌育设备
String isSupportHeartRate = IcSystemProperty.getSystemProperties("jx.heartrate", "false");
- IcLog.d(TAG, "isSupportHeartRate == > " + isSupportHeartRate);
+ ICLogger.d( "isSupportHeartRate == > " + isSupportHeartRate);
if (jxHeartRateMode != -1 && "true".equals(isSupportHeartRate)) {
sendHeartRateBroadcast2Jx(heart != 0, high,
low, heart, oxygen);
jxHeartRateMode = -1;
}
//reset data.
- IcLog.d(TAG, "on blood test end...");
+ ICLogger.d( "on blood test end...");
//checkContinue();
// 心率有一个方去结束
}
package com.ic.work;
-import com.ic.work.utils.IcLog;
+import com.ic.work.utils.ICLogger;
import java.util.ArrayList;
import java.util.List;
* 从线程池中移除任务
*/
public void remove() {
- IcLog.d(TAG, "remove all task..");
+ ICLogger.d( "remove all task..");
for (Future<?> future : futures) {
future.cancel(true);
}
import com.ic.work.process.PedProcess;
import com.ic.work.process.TempProcess;
import com.ic.work.process.WeatherProcess;
-import com.ic.work.utils.IcLog;
+import com.ic.work.utils.ICLogger;
import com.ic.work.utils.SPUtils;
import com.ic.work.weather.WeatherDBRun;
import com.ic.work.weather.WeatherHelper;
@Override
public IBinder onBind(Intent intent) {
if (intent != null) {
- IcLog.i(TAG, intent.getPackage());
+ ICLogger.i( intent.getPackage());
switch (intent.getPackage()) {
case ACTION_WEATHER:
//天气
coreService = new MessengerCoreService();
coreService.bindCoreService(getApplicationContext());
- IcLog.i(TAG, "work service is start");
+ ICLogger.i( "work service is start");
}
@Override
public void onDestroy() {
super.onDestroy();
- IcLog.i(TAG, "WorkService onDestroy");
+ ICLogger.i( "WorkService onDestroy");
bloodProcess = null;
mApp = null;
EventBus.getDefault().unregister(this);
@Subscribe(threadMode = ThreadMode.MAIN)
public void onMessageEvent(ThreadPoolEvent event) {
int eventType = event.getEventType();
- IcLog.i(TAG, "onMessageEvent EventType " + eventType);
+ ICLogger.i( "onMessageEvent EventType " + eventType);
if (eventType == STOP_ALL_TASK) {
ThreadPoolManager.getInstance().remove();
mIsBusy = false;
return;
}
if (mIsBusy) {
- IcLog.d(TAG, "task is running..");
+ ICLogger.d( "task is running..");
return;
}
//进来了就繁忙了，除非是停止了，也就是4的Case，停止检测
return;
}
}
- IcLog.i(TAG, "everyDayFinish");
+ ICLogger.i( "everyDayFinish");
mFinishTime = LocalDateTime.now(ZoneId.systemDefault());
//完成，需要把所有的今天的数据全部写入到数据中
ThreadPoolManager.getInstance().execute(new BeforeDawnRunnable(
import com.ic.work.db.PedInjection;
import com.ic.work.db.WeatherInjection;
import com.ic.work.utils.CrashHandler;
-import com.ic.work.utils.IcLog;
+import com.ic.work.utils.ICLogger;
import com.jakewharton.threetenabp.AndroidThreeTen;
public class WorkServiceApp extends Application {
@Override
public void onCreate() {
super.onCreate();
- IcLog.setLogHead("IcWorkService");
AndroidThreeTen.init(this);
import android.content.Context;
import com.ic.work.db.PedInjection;
-import com.ic.work.db.WeatherInjection;
-import com.ic.work.utils.IcLog;
+import com.ic.work.utils.ICLogger;
public class BeforeDawnRunnable extends PedBaseRunnable implements Runnable {
@Override
public void run() {
- IcLog.i(TAG, "Before Ped Count" + mTotalPed);
+ ICLogger.i( "Before Ped Count" + mTotalPed);
updateCountDB(mTotalPed, getFrontOffsetDateTime());
import com.ic.work.SensorDataService;
import com.ic.work.WorkServiceApp;
import com.ic.work.utils.ICLogger;
-import com.ic.work.utils.IcLog;
import com.ic.work.utils.Utils;
import java.util.Random;
//这部分代码要做超时处理｛
getPPGStartTime = System.currentTimeMillis();
checkBloodStartTime = System.currentTimeMillis();
- IcLog.d(TAG, "start time == > " + checkBloodStartTime);
+ ICLogger.d( "start time == > " + checkBloodStartTime);
ndkHeart = 0;
ndkHigh = 0;
ndkLow = 0;
mListener.onHeartRateTestFinished();
}
try {
- IcLog.d(TAG, "disable ppg..");
+ ICLogger.d( "disable ppg..");
mSensorManager.unregisterListener(this);
} catch (Exception e) {
- IcLog.e(TAG, "Stop Get Heart Value", e);
+ ICLogger.e( "Stop Get Heart Value", e);
}
- IcLog.d(TAG, "total use time == checkBloodStartTime > " + (System.currentTimeMillis() - checkBloodStartTime));
+ ICLogger.d( "total use time == checkBloodStartTime > " + (System.currentTimeMillis() - checkBloodStartTime));
}
* 按秒钟检查测试结果，防止无佩戴时长时间不超时。
*/
public void checkResultData(){
- IcLog.d(TAG, "isWear == > " + isWear);
+ ICLogger.d( "isWear == > " + isWear);
if (!isWear) {
//延时1秒进行检查
noWearCount++;
- IcLog.d(TAG, "noWearCount == > " + noWearCount);
+ ICLogger.d( "noWearCount == > " + noWearCount);
if (noWearCount > 20) {
handleResult();
return;
if (ndkHeart > 0) {
if (mListener != null) {
- IcLog.d(TAG, "ndkHigh == > " + ndkHigh + "ndkLow == > " + ndkLow + "oxygen == > " + oxygen);
+ ICLogger.d( "ndkHigh == > " + ndkHigh + "ndkLow == > " + ndkLow + "oxygen == > " + oxygen);
mListener.onHeartRateUpdate(ndkHigh, ndkLow, ndkHeart, oxygen);
}
checkCount++;
- IcLog.d(TAG, "checkCount == > " + checkCount);
+ ICLogger.d( "checkCount == > " + checkCount);
if (checkCount <= 10) {
//继续测试
} else {
handleResult();
return;
}
- IcLog.d(TAG, "use time == > " + (System.currentTimeMillis() - getPPGStartTime));
+ ICLogger.d( "use time == > " + (System.currentTimeMillis() - getPPGStartTime));
} else {
//如果为0的话，记录下来
invalidateTime++;
- IcLog.d(TAG, "invalidateTime == > " + invalidateTime);
+ ICLogger.d( "invalidateTime == > " + invalidateTime);
if (invalidateTime <= 30) {
} else {
handleResult();
import android.os.Messenger;
import android.os.RemoteException;
-import com.ic.work.utils.IcLog;
+import com.ic.work.utils.ICLogger;
public class MessengerCoreService {
}
//协议里的CoreService
ComponentName componentName = new ComponentName(
- "com.enqualcomm.support",
- "com.enqualcomm.support.CoreService");
+ "com.ic.protocolSrv",
+ "com.ic.protocolSrv.CoreService");
Intent mIntent = new Intent().setComponent(componentName);
context.bindService(mIntent, mServiceConnection, Context.BIND_AUTO_CREATE);
mGetReplyMessenger = new Messenger(new MessageHandler());
*/
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
- IcLog.i(TAG, "onServiceConnected");
+ ICLogger.i( "onServiceConnected");
//拿到Message，可以往对面发消息了
mService = new Messenger(service);
Message msg = Message.obtain(null, MSG_WHAT_SEND_VOICE);
try {
mService.send(msg);
} catch (RemoteException e) {
- IcLog.e(TAG, "onServiceConnected", e);
+ ICLogger.e( "onServiceConnected", e);
}
}
@Override
public void onServiceDisconnected(ComponentName name) {
mService = null;
- IcLog.i(TAG, "onServiceDisconnected");
+ ICLogger.i( "onServiceDisconnected");
}
};
public void sendBloodValueMessage(int high, int low, int heart, int oxygen) {
- IcLog.d(TAG, "sendBloodValueMessage...");
+ ICLogger.d( "sendBloodValueMessage...");
Bundle data = new Bundle();
data.putString(key_ppg, String.valueOf(heart));
if (mService != null)
mService.send(msg);
} catch (Exception e) {
- IcLog.e(TAG, "sendBloodValueMessage", e);
+ ICLogger.e( "sendBloodValueMessage", e);
}
}
public void handleMessage(Message msg) {
switch (msg.what) {
case RESULT_ERROR:
- IcLog.i(TAG, " PPG Data Send Error!");
+ ICLogger.i( " PPG Data Send Error!");
break;
case RESULT_OK:
- IcLog.i(TAG, " PPG Data Send Success!");
+ ICLogger.i( " PPG Data Send Success!");
break;
default:
super.handleMessage(msg);
import com.ic.work.db.PedInjection;
import com.ic.work.event.PedCountEvent;
import com.ic.work.event.TaskFinishedEvent;
-import com.ic.work.utils.IcLog;
+import com.ic.work.utils.ICLogger;
import org.greenrobot.eventbus.EventBus;
@Override
public void run() {
int ped = ICJniUtils.getStepCount();
- IcLog.i(TAG, "Get Ped Count" + ped);
+ ICLogger.i( "Get Ped Count" + ped);
//发送给主线程。主线更新数据UI
EventBus.getDefault().post(new PedCountEvent(ped));
updateCountDB(ped, getOffsetDateTime());
import com.ic.work.WorkServiceApp;
import com.ic.work.utils.ICLogger;
-import com.ic.work.utils.IcLog;
import com.ic.work.utils.TemperatureUtil;
import static android.content.Context.SENSOR_SERVICE;
lastBodyTemp = 0.0;
lastWristTemp = 0.0;
delayTimesInSeconds = DefaultDelayTimesInSeconds;
- IcLog.i(TAG, "getTemperature ..." );
+ ICLogger.i( "getTemperature ..." );
mSensorManager = (SensorManager) WorkServiceApp.sContext.getSystemService(SENSOR_SERVICE);
mSensorTemp = mSensorManager.getDefaultSensor(Sensor.TYPE_TEMPERATURE);
boolean ret = mSensorManager.registerListener(this, mSensorTemp, SensorManager.SENSOR_DELAY_NORMAL);
float values[] = sensorEvent.values;
int length = values.length;
if(sensorEvent.sensor.getType() == Sensor.TYPE_TEMPERATURE) {
- IcLog.d(TAG, "type is == >" + sensorEvent.sensor.getName());
+ ICLogger.d( "type is == >" + sensorEvent.sensor.getName());
lastWristTemp = values[0] / 100.0f;
- lastTempOut = values[1] / 100.0f;
+ lastTempOut = 0.0f;// values[1] / 100.0f;
Log.d(TAG, "on sensor change == > lastWristTemp= " + lastWristTemp + " lastTempOut=" + lastTempOut);
/*
} else {
lastBodyTemp = TemperatureUtil.getBodyTemp(lastWristTemp, 26.0f);
}
- IcLog.d(TAG, "testing..." + lastWristTemp + " " + lastBodyTemp + " " + lastTempOut);
+ ICLogger.d( "testing..." + lastWristTemp + " " + lastBodyTemp + " " + lastTempOut);
//前10秒不更新内容，后10秒再更新数据
if (delayTimesInSeconds <= 10 && mListener != null) {
- IcLog.d(TAG, "update temperature info..thread name is ." + Thread.currentThread().getName());
+ ICLogger.d( "update temperature info..thread name is ." + Thread.currentThread().getName());
//获取
- IcLog.d(TAG, "lastWristTemp == > " + lastWristTemp);
- IcLog.d(TAG, "lastBodyTemp == > " + lastBodyTemp);
- IcLog.d(TAG, "lastTempOut == > " + lastTempOut);
+ ICLogger.d( "lastWristTemp == > " + lastWristTemp);
+ ICLogger.d( "lastBodyTemp == > " + lastBodyTemp);
+ ICLogger.d( "lastTempOut == > " + lastTempOut);
mListener.onTemperatureUpdate(lastWristTemp, lastBodyTemp, lastTempOut);
}
ICLogger.d("get temperature data use time == > " + (System.currentTimeMillis() - getTempStartTime));
delayTimesInSeconds--;
- IcLog.d(TAG, "delayTimesInSeconds " + delayTimesInSeconds);
+ ICLogger.d( "delayTimesInSeconds " + delayTimesInSeconds);
if (delayTimesInSeconds <= 0) {
if (mListener != null) {
ICLogger.d("result == >lastWristTemp " + lastWristTemp + " lastBodyTemp" + lastBodyTemp + " lastTempOut" + lastTempOut);
import com.ic.aidl.blood.IBloodAidlInterface;
import com.ic.aidl.blood.IBloodRemoteService;
import com.ic.work.event.ThreadPoolEvent;
-import com.ic.work.utils.IcLog;
+import com.ic.work.utils.ICLogger;
import org.greenrobot.eventbus.EventBus;
@Override
public void stopCheckBlood() throws RemoteException {
- IcLog.d(TAG, "remote call stopCheckBlood..");
+ ICLogger.d( "remote call stopCheckBlood..");
EventBus.getDefault().post(new ThreadPoolEvent(STOP_ALL_TASK));
}
};
mCallbacks.getBroadcastItem(i).updateBloodCheckResult(heih, low, heart, oxygen);
}
} catch (NullPointerException e) {
- IcLog.e(TAG, "", e);
+ ICLogger.e( "", e);
} catch (RemoteException er) {
- IcLog.e(TAG, "", er);
+ ICLogger.e( "", er);
} finally {
try {
if (N > 0) {
mCallbacks.finishBroadcast();
}
} catch (IllegalArgumentException ll) {
- IcLog.e(TAG, "", ll);
+ ICLogger.e( "", ll);
}
}
}
mCallbacks.getBroadcastItem(i).updateBloodCheckTemp(heih, low, heart, oxygen);
}
} catch (NullPointerException e) {
- IcLog.e(TAG, "", e);
+ ICLogger.e( "", e);
} catch (RemoteException er) {
- IcLog.e(TAG, "", er);
+ ICLogger.e( "", er);
} finally {
try {
if (N > 0) {
mCallbacks.finishBroadcast();
}
} catch (IllegalArgumentException ll) {
- IcLog.e(TAG, "", ll);
+ ICLogger.e( "", ll);
}
}
}
mCallbacks.getBroadcastItem(i).updateBloodCheckTips(top, bottom);
}
} catch (NullPointerException e) {
- IcLog.e(TAG, "", e);
+ ICLogger.e( "", e);
} catch (RemoteException er) {
- IcLog.e(TAG, "", er);
+ ICLogger.e( "", er);
} finally {
try {
if (N > 0) {
mCallbacks.finishBroadcast();
}
} catch (IllegalArgumentException ll) {
- IcLog.e(TAG, "", ll);
+ ICLogger.e( "", ll);
}
}
}
import com.ic.aidl.ped.RecordParcelable;
import com.ic.work.event.PedSettingEvent;
import com.ic.work.event.ThreadPoolEvent;
-import com.ic.work.utils.IcLog;
+import com.ic.work.utils.ICLogger;
import org.greenrobot.eventbus.EventBus;
mCallbacks.getBroadcastItem(i).updatePedCount(count);
}
} catch (NullPointerException e) {
- IcLog.e(TAG, "", e);
+ ICLogger.e( "", e);
} catch (RemoteException er) {
- IcLog.e(TAG, "", er);
+ ICLogger.e( "", er);
} finally {
try {
if (N > 0) {
mCallbacks.finishBroadcast();
}
} catch (IllegalArgumentException ll) {
- IcLog.e(TAG, "", ll);
+ ICLogger.e( "", ll);
}
}
}
mCallbacks.getBroadcastItem(i).updatePedRecord(record);
}
} catch (NullPointerException e) {
- IcLog.e(TAG, "", e);
+ ICLogger.e( "", e);
} catch (RemoteException er) {
- IcLog.e(TAG, "", er);
+ ICLogger.e( "", er);
} finally {
try {
if (N > 0) {
mCallbacks.finishBroadcast();
}
} catch (IllegalArgumentException ll) {
- IcLog.e(TAG, "", ll);
+ ICLogger.e( "", ll);
}
}
}
import com.ic.aidl.temp.ITempAidlInterface;
import com.ic.aidl.temp.ITempRemoteService;
import com.ic.work.event.ThreadPoolEvent;
-import com.ic.work.utils.IcLog;
+import com.ic.work.utils.ICLogger;
import org.greenrobot.eventbus.EventBus;
@Override
public void onStartQueryTemp() throws RemoteException {
- IcLog.i(TAG, "onStartQueryTemp");
+ ICLogger.i( "onStartQueryTemp");
EventBus.getDefault().post(new ThreadPoolEvent(TEST_TEMPERATURE));
}
@Override
public void onStopQueryTemp() throws RemoteException {
- IcLog.i(TAG, "onStopQueryTemp");
+ ICLogger.i( "onStopQueryTemp");
EventBus.getDefault().post(new ThreadPoolEvent(STOP_ALL_TASK));
}
};
public void sendCurrTempValue(double value, double animal, double tempOut) {
int N = 0;
- IcLog.d(TAG, "sendCurrTempValue " + value);
+ ICLogger.d( "sendCurrTempValue " + value);
try {
N = mCallbacks.beginBroadcast();
for (int i = 0; i < N; i++) {
mCallbacks.getBroadcastItem(i).updateCurrTempValue(value, animal, tempOut);
}
} catch (NullPointerException | RemoteException e) {
- IcLog.e(TAG, "", e);
+ ICLogger.e( "", e);
} finally {
try {
if (N > 0) {
mCallbacks.finishBroadcast();
}
} catch (IllegalArgumentException ll) {
- IcLog.e(TAG, "", ll);
+ ICLogger.e( "", ll);
}
}
}
mCallbacks.getBroadcastItem(i).updateResultTempValue(value, animal, tempOut);
}
} catch (NullPointerException | RemoteException e) {
- IcLog.e(TAG, "", e);
+ ICLogger.e( "", e);
} finally {
try {
if (N > 0) {
mCallbacks.finishBroadcast();
}
} catch (IllegalArgumentException ll) {
- IcLog.e(TAG, "", ll);
+ ICLogger.e( "", ll);
}
}
}
import com.ic.aidl.weather.IWeatherRemoteService;
import com.ic.aidl.weather.WeatherParcelable;
import com.ic.work.event.ThreadPoolEvent;
-import com.ic.work.utils.IcLog;
+import com.ic.work.utils.ICLogger;
import org.greenrobot.eventbus.EventBus;
mCallbacks.getBroadcastItem(i).updateCurrWeather(parcelable);
}
} catch (NullPointerException e) {
- IcLog.e(TAG, "",e);
+ ICLogger.e( "",e);
} catch (RemoteException er) {
- IcLog.e(TAG, "",er);
+ ICLogger.e( "",er);
} finally {
try {
if (N > 0) {
mCallbacks.finishBroadcast();
}
} catch (IllegalArgumentException ll) {
- IcLog.e(TAG, "",ll);
+ ICLogger.e( "",ll);
}
}
}
envSlope = "0.6205";
}
- IcLog.d(TAG, "envSlope == > " + envSlope + " envDy == > " + envDy);
+ ICLogger.d( "envSlope == > " + envSlope + " envDy == > " + envDy);
//这个值是不可能的，所以有这个-100表示数据出错
double resultEnvTemp = -100;
if (!TextUtils.isEmpty(envDy) && !TextUtils.isEmpty(envSlope) && boardTemp > 39) {
//进行换算
- IcLog.d(TAG, "env temp with board temp...");
+ ICLogger.d( "env temp with board temp...");
resultEnvTemp = evnTemp - (Float.parseFloat(envSlope) * boardTemp + Float.parseFloat(envDy));
// resultEnvTemp = evnTemp - (0.8492 * boardTemp - 25.204);
} else if (boardTemp <= 39 && boardTemp >= 27) {
- IcLog.d(TAG, "in range of 27 to 39");
+ ICLogger.d( "in range of 27 to 39");
//Ut = St-(Bt*0.869-27.167) Bt∈[32，38)
resultEnvTemp = evnTemp - (0.2441 * boardTemp - 2.3248);
}
bodyDy = "-15.294";
}
- IcLog.d(TAG, "bodySlope == > " + bodySlope + " bodyDy == > " + bodyDy);
+ ICLogger.d( "bodySlope == > " + bodySlope + " bodyDy == > " + bodyDy);
double resultBodyTemp = bodyTemp;
if (!TextUtils.isEmpty(bodyDy) && !TextUtils.isEmpty(bodySlope)) {
- IcLog.d(TAG, "body temp with board temp...");
+ ICLogger.d( "body temp with board temp...");
resultBodyTemp = bodyTemp - (Float.parseFloat(bodySlope) * boardTemp + Float.parseFloat(bodyDy));
}
return resultBodyTemp;
logConfigurator.setRootLevel(Level.ALL);
logConfigurator.setLevel("log", Level.ALL);
-// logConfigurator.setFilePattern("%d %-5p [%c{2}]-[%L] %m%n");// 设置文件输出模式
+ // logConfigurator.setFilePattern("%d %-5p [%c{2}]-[%L] %m%n");// 设置文件输出模式
logConfigurator.setFilePattern("%d %m%n ");// 设置文件输出模式
// 02-29 16:28:38.195 4629-4658/com.enqualcomm.support E/com.enqualcomm.support.utils.ICLogger:
logConfigurator.setMaxBackupSize(2); // 设置最大备份数量
//Log 和log目前是同一个配置
Log = getLogger("log");
- Log.info("init Logger " + Log.getName());
- //Log.addAppender( getRollingFileAppender("log","%d %m%n "));
- //Log.info("init Logger "+Log.getName()+" "+((RollingFileAppender)Log.getAppender("log")).getFile());
+ //Log.info("init Logger " + Log.getName());
+ Log.addAppender( getRollingFileAppender("log","%d %m%n "));
+ Log.info("init Logger "+Log.getName()+" "+((RollingFileAppender)Log.getAppender("log")).getFile());
isInitConfig = true;
}
}
private static RollingFileAppender getRollingFileAppender(String name, String layoutpattern) {
PatternLayout fileLayout = new PatternLayout(layoutpattern);
- String filename = StorageUtils.getExternalStorageLogDir() + File.separator + name + ".txt";
+ String filename = StorageUtils.getExternalStorageLogDir() + File.separator + "IcWorkService"+name + ".txt";
RollingFileAppender rollingFileAppender = null;
try {
rollingFileAppender = new RollingFileAppender(fileLayout, filename);
}
rollingFileAppender.setName(name);
rollingFileAppender.setMaxBackupIndex(2); //最多3个备份文件
- rollingFileAppender.setMaximumFileSize(10 * 1024 * 1024); //10M 大小
+ rollingFileAppender.setMaximumFileSize(20 * 1024 * 1024); //10M 大小
rollingFileAppender.setImmediateFlush(true);
return rollingFileAppender;
+++ /dev/null
-package com.ic.work.utils;
-
-/**
- * @author RyanLee
- * @date 2018/2/2
- */
-
-public class IcLog {
-
- private static final String DOT = ".";
- private static boolean isDebug = true;
- private static String tagHead = "";
-
- public static void v(String tag, String msg) {
- ICLogger.v(tag + " : " + msg);
- }
-
- public static void d(String tag, String msg) {
- ICLogger.d(tag + " : " + msg);
- }
-
- public static void i(String tag, String msg) {
- ICLogger.i(tag + " : " + msg);
- }
-
- public static void w(String tag, String msg) {
- ICLogger.w(tag + " : " + msg);
- }
-
- public static void e(String tag, String msg, Throwable e) {
- ICLogger.e(tag + " : " + msg);
- }
-
-
- public static void setDebug(boolean debug) {
- isDebug = debug;
- }
-
- public static void setLogHead(String head) {
- tagHead = head + DOT;
- }
-
- private static String mergeHeadTag(final String tag) {
- return tagHead + tag;
- }
-}
if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
File dir;
Log.d(TAG, "current system version is == > " + Build.VERSION.SDK_INT);
- if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
- dir = new File(Environment.getExternalStoragePublicDirectory(DIRECTORY_DOCUMENTS), "Android/ic/icWorkService");
- } else {
- dir = new File(Environment.getExternalStorageDirectory().getPath(), "Android/ic/icWorkService");
- }
+ //if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
+ // dir = new File(Environment.getExternalStorageDirectory(DIRECTORY_DOCUMENTS), "Android/ic/logs");
+ //} else {
+ dir = new File(Environment.getExternalStorageDirectory().getPath(), "Android/ic/logs");
+ //}
String path = dir.getPath();
if (!dir.exists()) {
return path;
}
- return "/storage/emulated/0/Android/ic/icWorkService";
+ return "/storage/emulated/0/Android/ic/logs";
}
/**
resultEnvTemp = AlgorithmUtils.s123GetEnvData(evnTemp, boardTemp);
resultBodyTemp = AlgorithmUtils.s123GetBodyTemp(bodyTemp, boardTemp);
- IcLog.d(TAG, "evnTemp == > " + evnTemp + " resultEnvTemp = > " + resultEnvTemp);
- IcLog.d(TAG, "bodyTemp == > " + bodyTemp + " resultBodyTemp = > " + resultBodyTemp);
+ ICLogger.d( "evnTemp == > " + evnTemp + " resultEnvTemp = > " + resultEnvTemp);
+ ICLogger.d( "bodyTemp == > " + bodyTemp + " resultBodyTemp = > " + resultBodyTemp);
}
if (resultBodyTemp <= 0) {
import com.amap.api.location.AMapLocationClientOption;
import com.amap.api.location.AMapLocationListener;
import com.ic.work.event.LocationResultEvent;
-import com.ic.work.utils.IcLog;
+import com.ic.work.utils.ICLogger;
import org.greenrobot.eventbus.EventBus;
import org.threeten.bp.LocalDateTime;
LocalDateTime time = LocalDateTime.now(ZoneId.systemDefault());
if (aMapLocation != null) {
if (aMapLocation.getErrorCode() == 0) {
- IcLog.i(TAG, "Loaction City:" + aMapLocation.getCity());
+ ICLogger.i( "Loaction City:" + aMapLocation.getCity());
LocationState state = new LocationState(time, true, aMapLocation.getCity());
EventBus.getDefault().post(new LocationResultEvent(state));
} else {
//定位失败时，可通过ErrCode（错误码）信息来确定失败的原因，errInfo是错误信息，详见错误码表。
- IcLog.e(TAG, "location Error, ErrCode:"
+ ICLogger.e( "location Error, ErrCode:"
+ aMapLocation.getErrorCode() + ", errInfo:"
+ aMapLocation.getErrorInfo(), null);
EventBus.getDefault().post(new LocationResultEvent(new LocationState(time, false, null)));
import com.ic.work.db.WeatherInjection;
import com.ic.work.db.entity.WeatherEntity;
import com.ic.work.event.WeatherResultEvent;
-import com.ic.work.utils.IcLog;
+import com.ic.work.utils.ICLogger;
import org.greenrobot.eventbus.EventBus;
import org.threeten.bp.OffsetDateTime;
mContext=context;
registerBroadcast();
}
-
+ private void unregisterBroadcast() {
+ mContext.unregisterReceiver(mIntentReceiver);
+ }
private void registerBroadcast() {
IntentFilter filter = new IntentFilter();
private void parseWeatherString(String stringWeather) {
- IcLog.i(TAG, "getprop weather " + stringWeather);
+ ICLogger.i( "getprop weather " + stringWeather);
List<WeatherParcelable> wpList = new ArrayList<>(3);
List<WeatherEntity> dbList = new ArrayList<>(3);
for (int i = 0; i < 3; i++) {
String wlist[]=list[1+i].split(",");
- IcLog.i(TAG,list[1+i]+" "+wlist.length);
+ ICLogger.i(list[1+i]+" "+wlist.length);
if(wlist.length==6) {
WeatherParcelable weather = new WeatherParcelable();
WeatherEntity db = new WeatherEntity();
.append(weather.getTemperatureDay()).append("-").append(weather.getTemperatureNight())
.append("|")
.append(weather.getUpdateTime());
- IcLog.i(TAG, "Response is weather:" + stringBuffer.toString());
+ ICLogger.i( "Response is weather:" + stringBuffer.toString());
}
wpList.add(weather);
dbList.add(db);
}else{
- IcLog.i(TAG,"Weather Format error!");
+ ICLogger.i("Weather Format error!");
success=false;
break;
}
weatherInjection.insertWeatherEntity(dbList);
}
}else{
- IcLog.i(TAG,"Weather Format error!");
+ ICLogger.i("Weather Format error!");
}
}
}
\ No newline at end of file
import com.ic.work.db.WeatherInjection;
import com.ic.work.db.entity.WeatherEntity;
import com.ic.work.event.WeatherResultEvent;
-import com.ic.work.utils.IcLog;
+import com.ic.work.utils.ICLogger;
import org.greenrobot.eventbus.EventBus;
import org.threeten.bp.LocalDate;
private void parseWeatherServerInfo(String stringJson) {
- IcLog.i(TAG, stringJson);
+ ICLogger.i( stringJson);
JSONObject responseJsonObj = JSONObject.parseObject(stringJson);
JSONObject serverInfo = responseJsonObj.getJSONObject("result");
}
private void parseWeatherJSONString(String stringJson) {
- IcLog.i(TAG, "Response is weather" + stringJson);
+ ICLogger.i( "Response is weather" + stringJson);
JSONObject responseJsonObj = JSONObject.parseObject(stringJson);
JSONArray jsonArray = responseJsonObj.getJSONArray("HeWeather data service 3.0");
.append(weather.getTemperatureDay()).append("-").append(weather.getTemperatureNight())
.append("|")
.append(weather.getUpdateTime());
- IcLog.i(TAG, "Response is weather:" + stringBuffer.toString());
+ ICLogger.i( "Response is weather:" + stringBuffer.toString());
}
wpList.add(weather);
projects / icworkservice.git / commitdiff