From: snickersun Date: Sat, 29 Feb 2020 10:19:07 +0000 (+0800) Subject: 1、 修复CrashHandler不工作问题， X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=1846614f1ad861c25f679f22078de58f50ca8b42;p=protocol_srv.git 1、 修复CrashHandler不工作问题， 2、用log4j 重定向日志到 ExternalCacheDir log.txt 3、 修改日志上传功能，增加 crashlog.txt上传 4、编译relelase版本 V364 --- diff --git a/app/libs/android-logging-log4j-1.0.3.jar b/app/libs/android-logging-log4j-1.0.3.jar new file mode 100644 index 00000000..7d4146f0 Binary files /dev/null and b/app/libs/android-logging-log4j-1.0.3.jar differ diff --git a/app/libs/log4j-1.2.17.jar b/app/libs/log4j-1.2.17.jar new file mode 100644 index 00000000..068867eb Binary files /dev/null and b/app/libs/log4j-1.2.17.jar differ diff --git a/app/release/ICSer_V364_2002291814_release.apk b/app/release/ICSer_V364_2002291814_release.apk new file mode 100644 index 00000000..dee3a22f Binary files /dev/null and b/app/release/ICSer_V364_2002291814_release.apk differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bb6d0e91..6166794b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -119,6 +119,7 @@ 4) { @@ -157,7 +157,7 @@ public class CoreService extends Service { StringBuilder stringBuilder1 = new StringBuilder(); stringBuilder1.append("时间变化"); stringBuilder1.append(param1Intent.getAction()+stringBuilder2.toString()); - Logger.i(stringBuilder1.toString()); + ICLogger.i(stringBuilder1.toString()); CoreService.this.setSleepAlarm(); CoreService.this.setWakeAlarm(); CoreService.this.setHeartAlarm(); @@ -174,7 +174,7 @@ public class CoreService extends Service { StringBuilder stringBuilder2 = new StringBuilder(); stringBuilder2.append("broadcastReceiver action=="); stringBuilder2.append(param1Intent.getAction()); - Logger.i(stringBuilder2.toString()); + ICLogger.i(stringBuilder2.toString()); if (ACTION_SEND_EMEGENCY_LOCATION_START.equals(param1Intent.getAction())){ runtime.getLocationInstance().setWorkingMod(EMERGNECY_MOD); @@ -234,7 +234,7 @@ public class CoreService extends Service { CoreService coreService = (CoreService)this.mReference.get(); if (coreService == null) return; - Logger.i("onConnectionClose++ retry to connect again!"); + ICLogger.i("onConnectionClose++ retry to connect again!"); coreService.connectionServiceChain.processConnectionClose(coreService.connection, coreService.runtime); } @@ -243,13 +243,13 @@ public class CoreService extends Service { if (coreService == null) return; coreService.connectionServiceChain.processConnectionOpen(coreService.connection, coreService.runtime); - Logger.i("onConnectionOpen"); + ICLogger.i("onConnectionOpen"); } public void onReceive(StringMessage param1StringMessage) { CoreService coreService = (CoreService)this.mReference.get(); - Logger.i("onReceive " +param1StringMessage.cmd() +" coreService " + coreService ); + ICLogger.i("onReceive " +param1StringMessage.cmd() +" coreService " + coreService ); if (coreService == null) return; coreService.connectionServiceChain.processServerResponse(param1StringMessage, coreService.connection, coreService.runtime); @@ -289,7 +289,7 @@ public class CoreService extends Service { StringBuilder var3 = new StringBuilder(); var3.append("screen on wake is_wifi_network_ok="); var3.append(CoreService.is_wifi_network_ok); - Logger.i(var3.toString()); + ICLogger.i(var3.toString()); if (CoreService.is_in_sleep_mode) { /*屏幕亮起时，如果在sleep模式(夜晚的那个睡眠模式，非系统休眠，暂时没实现，还不会跑到这里)，则唤醒各个进程*/ @@ -348,7 +348,7 @@ public class CoreService extends Service { } private AbstractInvokeHandlerService getInvokeHandlerServiceChain() { - Logger.i("getInvokeHandlerServiceChain"); + ICLogger.i("getInvokeHandlerServiceChain"); SendChatMessage sendChatMessage = new SendChatMessage(); HeartRateManager heartRateManager= new HeartRateManager(this.runtime,this.connection); SilentManager silentManager = new SilentManager(); @@ -392,7 +392,7 @@ public class CoreService extends Service { // stringBuilder.append("SDK_INT="); // stringBuilder.append(Build.VERSION.SDK_INT); // -// Logger.i(stringBuilder.toString()); +// ICLogger.i(stringBuilder.toString()); // // alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, l + (1 * 60 * 1000), pendingIntent); @@ -465,7 +465,6 @@ public class CoreService extends Service { this.runtime.setDBHelper(new DBHelper(getContentResolver(), this)); this.runtime.setContextProxy(new ContextProxy(this)); this.runtime.setLbsHelper(new LBSHelper(this,this.runtime.getContextProxy().getWifiManager(), this.runtime)); - if (Config.getIMEI(runtime.getContextProxy().context).isEmpty()){ //如果配置里有IMEI，优先选配置里的，没有则选择系统的 runtime.setImeiAndCid(PhoneUtils.getIMEI(this),""); @@ -474,14 +473,13 @@ public class CoreService extends Service { } this.runtime.setHRS(new heartRateStatus()); this.runtime.setUseQueue(true); - this.runtime.initDnsUtil(this.getApplicationContext()); + this.runtime.initDnsUtil(ICApplication.getInstance().getApplicationContext()); this.connectionServiceChain = getConnectionServiceChain(); this.invokeHandlerServiceChain = getInvokeHandlerServiceChain(); - if (cmcm_call_eiot_into_powersave_mode() == 1) { - Logger.i("1 into powersave return"); - return; - } - +// if (cmcm_call_eiot_into_powersave_mode() == 1) { +// ICLogger.i("1 into powersave return"); +// return; +// } smsManager= new ICSmsManager(runtime); @@ -500,7 +498,7 @@ public class CoreService extends Service { // setAlarm(alarmCycle); - if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(runtime.getCacheDir(), "alarmCycle", "设置闹钟服务 alarmCycle"); +// if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(runtime.getCacheDir(), "log", "初始化网络协议服务"); this.locationClient = new LocationClient(this.connection, this.runtime); this.connection.open(); @@ -551,7 +549,7 @@ public class CoreService extends Service { //保证发送心跳时提前获取BatLevel数据 int batlevel=batteryUtil.getBatteryLevel(this); runtime.setBattery(String.format("%03d",batlevel)); - Logger.i("Battery get from api "+batlevel); + ICLogger.i("Battery get from api "+batlevel); //api直接获取batterylevel取消注册 receiver， 需要重新注册一下。 @@ -595,13 +593,13 @@ public class CoreService extends Service { stringBuilder.append(paramInt1); stringBuilder.append(" paramInt2="); stringBuilder.append(paramInt2); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); // if (ACTION_ALARM.equals(paramIntent.getAction())) { if (ACTION_LOCATION_ALARM.equals(paramIntent.getAction())){ // if (cmcm_call_eiot_into_powersave_mode() == 1) { -// Logger.i("2 into powersave return"); +// ICLogger.i("2 into powersave return"); // return Service.START_NOT_STICKY; // } @@ -647,7 +645,7 @@ public class CoreService extends Service { } else { StringBuilder stringBuilder1; if (Constants.SLEEP_ALARM.equals(paramIntent.getAction())) { - Logger.i("SLEEP_ALARM"); + ICLogger.i("SLEEP_ALARM"); is_allowed_in_sleep_mode = 1; if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(runtime.getCacheDir(), "alarmCycle", "SLEEP_ALARM alarmCycle"); setSleepAlarm(); @@ -655,7 +653,7 @@ public class CoreService extends Service { stringBuilder1 = new StringBuilder(); stringBuilder1.append("ifOpen = "); stringBuilder1.append(bool); - Logger.i(stringBuilder1.toString()); + ICLogger.i(stringBuilder1.toString()); if (!bool) { is_in_sleep_mode = true; if (this.mKeepAlive != null) @@ -693,7 +691,7 @@ public class CoreService extends Service { // this.upLoadDataPoints.uploadCurrentLocation(); // return Service.START_STICKY; // } -// Logger.i("upLoadDataPoints=null"); +// ICLogger.i("upLoadDataPoints=null"); // return Service.START_STICKY; // }else if (Constants.STWORKMODE_ALARM.equals(paramIntent.getAction())) { // if (this.startAlarmCount >= 5) { @@ -732,7 +730,7 @@ public class CoreService extends Service { intent.putExtra("command", "AT+CREG=2"); intent.putExtra("arg2", ""); (this.runtime.getContextProxy()).context.sendBroadcast(intent); - Logger.i("send_at_to_update_lbs "); + ICLogger.i("send_at_to_update_lbs "); } public void send_at_to_onoff_simcard(boolean simon){ @@ -745,7 +743,7 @@ public class CoreService extends Service { } intent.putExtra("arg2", ""); (this.runtime.getContextProxy()).context.sendBroadcast(intent); - Logger.i("send_at_to_update_lbs "); + ICLogger.i("send_at_to_update_lbs "); } //每一分钟设置一次 public void setAlarm(int paramInt) { @@ -762,7 +760,7 @@ public class CoreService extends Service { StringBuilder sb=new StringBuilder(); AlarmHelper.setRealTimeAlarm(runtime.getContextProxy().context,delayTimeInMinutes, ACTION_SEND_EMEGENCY_LOCATION_STOP); sb.append(" tEmegencyLocationSTOPAlarm "+ACTION_SEND_EMEGENCY_LOCATION_STOP); - Logger.i(sb.toString()); + ICLogger.i(sb.toString()); if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(runtime.getCacheDir(),"LocationAlarm",sb.toString()); } public void setLocationAlarm(int mod) { @@ -789,7 +787,7 @@ public class CoreService extends Service { sb.append(" setLocationAlarm "+ACTION_LOCATION_ALARM+" mod "+mod+", cycle in Seconds "+cycle); locationClient.triggerLocationProcess(); - Logger.i(sb.toString()); + ICLogger.i(sb.toString()); if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(runtime.getCacheDir(),"LocationAlarm",sb.toString()); } @@ -803,7 +801,7 @@ public class CoreService extends Service { sb.append(" setHeartAlarm "+HEART_ALARM+", cycle "+cycle); // locationClient.triggerLocationProcess(); - Logger.i(sb.toString()); + ICLogger.i(sb.toString()); FileOutputUtil.fileOutput(runtime.getCacheDir(),"HeartAlarm",sb.toString()); // AlarmHelper.setRealTimeAlarm(runtime.getContextProxy().context,1, HEART_ALARM); @@ -819,7 +817,7 @@ public class CoreService extends Service { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("interval="); stringBuilder.append(paramLong); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); AlarmHelper.setRealTimeAlarm( runtime.getContextProxy().context,(int)((System.currentTimeMillis() + paramLong)/1000),ACTION_ALARM_ADD_DATAPOINTS); } @@ -855,7 +853,7 @@ public class CoreService extends Service { private Timer mTimer_retry_connect=null; private void log(String msg) { - Logger.log(TAG,msg); + ICLogger.log(TAG,msg); } public static CoreService getInstance(){ diff --git a/app/src/main/java/com/enqualcomm/support/CrashHandler.java b/app/src/main/java/com/enqualcomm/support/CrashHandler.java index 5f958004..260ac33b 100644 --- a/app/src/main/java/com/enqualcomm/support/CrashHandler.java +++ b/app/src/main/java/com/enqualcomm/support/CrashHandler.java @@ -24,6 +24,7 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; + /** * Created by Administrator on 2017/5/18. */ @@ -194,10 +195,11 @@ public class CrashHandler implements Thread.UncaughtExceptionHandler { sb.append("\n\n"); try { - String fileName = "ICProtocol-" + dateFormatDate.format(new Date()) + ".log"; + String fileName = "crashlog.txt"; // if (Environment.getExternalStorageState().equals( // Environment.MEDIA_MOUNTED)) { - File dir = new File(Environment.getExternalStorageDirectory().getPath(), "crash"); +// File dir = new File(mContext.getExternalCacheDir(), "crash"); + File dir=mContext.getExternalCacheDir(); String path = dir.getPath(); if (!dir.exists()) { dir.mkdirs(); diff --git a/app/src/main/java/com/enqualcomm/support/GSensorListener.java b/app/src/main/java/com/enqualcomm/support/GSensorListener.java index 0e744eb5..a00075ea 100644 --- a/app/src/main/java/com/enqualcomm/support/GSensorListener.java +++ b/app/src/main/java/com/enqualcomm/support/GSensorListener.java @@ -8,7 +8,7 @@ import com.ic.jni.ICJniUtils; import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.utils.FileOutputUtil; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; /** * 由于Gsensor用的硬件计步，只需要保证打开计步器即可 @@ -29,7 +29,7 @@ public class GSensorListener { StringBuilder stringBuilder1 = new StringBuilder(); stringBuilder1.append("CURRENT_STEP ="); stringBuilder1.append(GSensorListener.this.CURRENT_STEP); - Logger.i(stringBuilder1.toString()); + ICLogger.i(stringBuilder1.toString()); runtime.setTotalStepCount(CURRENT_STEP); GSensorListener.getStepCountOver=false; if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(runtime.getCacheDir(), "CURRENT_STEP", stringBuilder1.toString()); diff --git a/app/src/main/java/com/enqualcomm/support/ICApplication.java b/app/src/main/java/com/enqualcomm/support/ICApplication.java index 8d453241..55647d9a 100644 --- a/app/src/main/java/com/enqualcomm/support/ICApplication.java +++ b/app/src/main/java/com/enqualcomm/support/ICApplication.java @@ -3,6 +3,7 @@ package com.enqualcomm.support; import android.app.Application; import android.content.Context; import android.content.res.Configuration; +import android.os.Environment; import android.os.Handler; import android.support.multidex.MultiDex; import android.util.Log; @@ -10,20 +11,24 @@ import android.util.SparseArray; import com.enqualcomm.support.BuildConfig; +import com.enqualcomm.support.utils.StorageUtils; import com.sina.util.dnscache.DNSCache; +import org.apache.log4j.Level; + +import java.io.File; import java.util.HashMap; -/** - * Created by Administrator on 2017/5/18. - */ + +import de.mindpipe.android.logging.log4j.LogConfigurator; + public class ICApplication extends Application { private static final String TAG = "protocol." + ICApplication.class.getSimpleName(); private static final boolean DEBUG = BuildConfig.DEBUG; - private static ICApplication instance; + private static ICApplication instance=null; private static HashMap> mConfigurationChangedHandlerHashMap = new HashMap<>(); @@ -46,6 +51,7 @@ public class ICApplication extends Application { public void onCreate() { super.onCreate(); + initLogger(); String info = String.format("VERSION_CODE:%s, VERSION_NAME:%s", BuildConfig.VERSION_CODE, BuildConfig.VERSION_NAME); log("onCreate", info); @@ -59,6 +65,45 @@ public class ICApplication extends Application { // log("softwareVersion:" + softwareVersion); } + /** + 初始化与配置Logger Log4j + 日志信息格式中符号所代表的含义 + （1）－X号: X信息输出时左对齐。 + （2）%p: 输出日志信息优先级，即DEBUG，INFO，WARN，ERROR，FATAL。 + （3）%d: 输出日志时间点的日期或时间，默认格式为ISO8601，也可以在其后指定格式，比如：%d{yyy MMM dd HH:mm:ss,SSS}，输出类似：2002å¹´10月18日 22：10：28，921。 + （4）%r: 输出自应用启动到输出该log信息耗费的毫秒数。 + （5）%c: 输出日志信息所属的类目，通常就是所在类的全名。 + （6）%t: 输出产生该日志事件的线程名。 + （7）%l: 输出日志事件的发生位置，相当于%C.%M(%F:%L)的组合,包括类目名、发生的线程，以及在代码中的行数。举例：Testlog4.main(TestLog4.java:10)。 + （8）%x: 输出和当前线程相关联的NDC(嵌套诊断环境),尤其用到像java servlets这样的多客户多线程的应用中。 + （9）%%: 输出一个"%"字符。 + （10）%F: 输出日志消息产生时所在的文件名称。 + （11）%L: 输出代码中的行号。 + （12）%m: 输出代码中指定的消息,产生的日志具体信息。 + （13）%n: 输出一个回车换行符，Windows平台为"\r\n"，Unix平台为"\n"输出日志信息换行。 + 可以在%与模式字符之间加上修饰符来控制其最小宽度、最大宽度、和文本的对齐方式。如： + (1)%20c：指定输出category的名称，最小的宽度是20，如果category的名称小于20的话，默认的情况下右对齐。 + (2)%-20c:指定输出category的名称，最小的宽度是20，如果category的名称小于20的话，"-"号指定左对齐。 + (3)%.30c:指定输出category的名称，最大的宽度是30，如果category的名称大于30的话，就会将左边多出的字符截掉，但小于30的话也不会有空格。 + (4)%20.30c:如果category的名称小于20就补空格，并且右对齐，如果其名称长于30字符，就从左边交远销出的字符截掉。 + ———————————————— + 版权声明：本文为CSDN博主「King-zi」的原创文章，遵循 CC 4.0 BY-SA 版权协议，转载请附上原文出处链接及本声明。 + 原文链接：https://blog.csdn.net/zjclugger/article/details/51576156 + */ + private void initLogger(){ + LogConfigurator logConfigurator = new LogConfigurator(); + + logConfigurator.setFileName(StorageUtils.getCacheDirectory(this.getApplicationContext()).getAbsolutePath() + + File.separator + "log.txt"); // 日志存储路径，如果该路径没有会自动创建文件 + logConfigurator.setRootLevel(Level.DEBUG); + logConfigurator.setLevel("log", Level.ERROR); +// 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.setMaxFileSize(1024 * 1024 * 20); + logConfigurator.setImmediateFlush(true); + logConfigurator.configure(); // 设置提交 + } public static ICApplication getInstance() { return instance; diff --git a/app/src/main/java/com/enqualcomm/support/ICContentProvider.java b/app/src/main/java/com/enqualcomm/support/ICContentProvider.java index 0d5aedbc..27c7951c 100644 --- a/app/src/main/java/com/enqualcomm/support/ICContentProvider.java +++ b/app/src/main/java/com/enqualcomm/support/ICContentProvider.java @@ -483,7 +483,7 @@ public class ICContentProvider extends ContentProvider { stringBuilder.append(paramUri); stringBuilder.append("=="); stringBuilder.append(URI_MATCHER.match(paramUri)); -// Logger.i(stringBuilder.toString()); +// ICLogger.i(stringBuilder.toString()); switch (URI_MATCHER.match(paramUri)) { case UNREADMSG: return UNREADMSG_MIME; diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java index 4912dc1a..2244f4b6 100644 --- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java +++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java @@ -19,7 +19,7 @@ import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.service.Deliver; import com.enqualcomm.support.utils.APNUtil; import com.enqualcomm.support.utils.DeviceInfoUtil; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.ServiceUtil; import com.enqualcomm.support.utils.TimeUtil; import com.enqualcomm.support.utils.Util; @@ -61,7 +61,7 @@ public class ICSmsManager { while(msgit.hasNext()) { String message= (String)msgit.next(); - Logger.i("reply message to "+phonenumber+", "+message); + ICLogger.i("reply message to "+phonenumber+", "+message); if (phonenumber!=null && !phonenumber.isEmpty()) { smsManager.sendTextMessage(phonenumber, (String) null, message, (PendingIntent) null, (PendingIntent) null); } @@ -166,17 +166,17 @@ public class ICSmsManager { } } else if (sms.startsWith("#deviceinfo#")) { - Logger.i("SMS " + sms + " reply " + DeviceInfoUtil.getDeviceVersion(runtime)); + ICLogger.i("SMS " + sms + " reply " + DeviceInfoUtil.getDeviceVersion(runtime)); sendSMS(phonenumber, DeviceInfoUtil.getDeviceVersion(runtime)); - Logger.i("SMS " + sms + " reply " + DeviceInfoUtil.getShortDeviceInfo(runtime)); + ICLogger.i("SMS " + sms + " reply " + DeviceInfoUtil.getShortDeviceInfo(runtime)); sendSMS(phonenumber, DeviceInfoUtil.getShortDeviceInfo(runtime)); } else if (sms.startsWith("#status#")) { String reply = "IMEI=" + runtime.IMEI() + "\nSW:" + DeviceInfoUtil.getVersionCode(mContext) + " " + DeviceInfoUtil.getSWVersionDisplayName(); - Logger.i("SMS " + sms + " reply \n" + reply); + ICLogger.i("SMS " + sms + " reply \n" + reply); sendSMS(phonenumber, reply); } else if (sms.startsWith("#imei:")) { String imei = sms.substring(6); - Logger.i("SMS " + sms + " imei=" + imei); + ICLogger.i("SMS " + sms + " imei=" + imei); if (imei.length() == 15) { Config.setIMEI(mContext, imei); runtime.setImeiAndCid(imei, ""); @@ -197,7 +197,7 @@ public class ICSmsManager { } else if (sms.startsWith("#ip#=") && sms.endsWith("#")) { String tmp[] = sms.split("="); String reply = ""; - Logger.i(sms + " len " + tmp.length); + ICLogger.i(sms + " len " + tmp.length); if (tmp.length == 2) { if (tmp[1].equals("reset#")) { Config.setProtocolServerHost(mContext, Config.DefaultHost); @@ -363,13 +363,13 @@ public class ICSmsManager { String logfile=cmdl[1]; if (logfile.isEmpty()|| logfile.equals("all")){ - String filelist[]={"APILog","GPS","LocationAlarm","Battery","log"}; + String filelist[]={"crashlog","APILog","GPS","LocationAlarm","Battery","log"}; // String filelist[]={"APILog","LocationAlarm","Battery"}; String time=TimeUtil.getSystemTime3(); StringBuilder sb=new StringBuilder(); Observable.timer(500L, TimeUnit.MILLISECONDS).subscribe(new Action1() { public void call(Long param1Long) { - sendSMS(phonenumber, "start Upload allLogfile [APILog log GPS LocationAlarm Battery] to " + Config.getFtpServer(mContext)); + sendSMS(phonenumber, "start Upload allLogfile [crashlog APILog log GPS LocationAlarm Battery] to " + Config.getFtpServer(mContext)); for (String file : filelist) { if (Util.LogfileExist(runtime, file)) { @@ -383,17 +383,21 @@ public class ICSmsManager { } if (ftpUtils.upload(serverurl, Config.getFtpUser(mContext), Config.getFtpPWD(mContext), new File(filepath))) { sb.append(" ").append(file); - Logger.i("Upload file "+file+" success! "); + ICLogger.i("Upload file "+file+" success! "); }else{ - Logger.i("Upload file "+file+" failed! "); + ICLogger.i("Upload file "+file+" failed! "); } } } - - sendSMS(phonenumber, "Upload allLogfile [" + sb.toString() + "] to " + Config.getFtpServer(mContext)); + if (sb.length()>0) { + sendSMS(phonenumber, "Upload [" + sb.toString() + "] success to " + Config.getFtpServer(mContext)); + }else + { + sendSMS(phonenumber, "Upload all files failed to " + Config.getFtpServer(mContext)); + } } }); }else{ @@ -468,17 +472,17 @@ public class ICSmsManager { //长短信会被分拆送来，因此可能会有多个PDU。Protocol Description Unit是短信的工业标准。  Object[] pduArray = (Object[])intent.getExtras().get("pdus"); - Logger.i("pdu number=" + pduArray.length); + ICLogger.i("pdu number=" + pduArray.length); String message = ""; String from = null; for(int i = 0 ; i < pduArray.length; i ++){ SmsMessage sms = SmsMessage.createFromPdu((byte[])pduArray[i]);//将PDU转换为SmsMessage格式 - Logger.i("From : " + sms.getDisplayOriginatingAddress()); - Logger.i("SMS : " + sms.getDisplayMessageBody()); + ICLogger.i("From : " + sms.getDisplayOriginatingAddress()); + ICLogger.i("SMS : " + sms.getDisplayMessageBody()); from = sms.getDisplayOriginatingAddress(); message += sms.getDisplayMessageBody(); } - Logger.i("收到" + from + "短信：" + message); + ICLogger.i("收到" + from + "短信：" + message); // Toast.makeText(context, "收到" + from + "短信：" + message, Toast.LENGTH_LONG).show(); if (handleSMS_CMD(from,message)==false){ //说明不是sms命令，提示短信接收。 diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java index d6efce2c..d54747ac 100644 --- a/app/src/main/java/com/enqualcomm/support/LocationClient.java +++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java @@ -22,7 +22,7 @@ import com.enqualcomm.support.utils.CellInfoUtil; import com.enqualcomm.support.utils.DeviceInfoUtil; import com.enqualcomm.support.utils.FileCache; import com.enqualcomm.support.utils.FileOutputUtil; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.NettyConnection; import com.enqualcomm.support.utils.ServiceUtil; import com.enqualcomm.support.utils.SharPreferenceUtil; @@ -147,7 +147,7 @@ public class LocationClient { stringBuilder.append(singal); stringBuilder.append("haveChanegTo4G="); stringBuilder.append(this.haveChanegTo4G); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); switch (networktype) { default: return; @@ -175,7 +175,7 @@ public class LocationClient { // this.H12StepCount = DeviceInfoUtil.getStepCount((runtime.getContextProxy()).context); // if (i != 0 && Math.abs(this.H12StepCount - this.mPedometer2) > 1000) { //// connection.send(API.H12(runtime, this.H12StepCount)); -// Logger.i("StepCount 运动开始后 变化超过1000 ，则发送给服务器！"); +// ICLogger.i("StepCount 运动开始后 变化超过1000 ，则发送给服务器！"); // } } @@ -201,14 +201,14 @@ public class LocationClient { private static boolean isLocating=false; public void startWifiScan(){ - Logger.i("开启wifi扫描"); + ICLogger.i("开启wifi扫描"); runtime.setWifiinfo(""); mHasWifiResult = false; this.mLbsHelper.registerBroadReceiver(); this.mLbsHelper.getWifiInfo(); this.mLbsHelper.setOnWiFiInfoListener(new LBSHelper.OnWiFiInfoListener() { public void getWifiInfoCallBack(String param1String) { - Logger.i("get wifi scan Callback " + param1String); + ICLogger.i("get wifi scan Callback " + param1String); LocationClient.mHasWifiResult=true; runtime.setWifiinfo(param1String==null?"":param1String); } @@ -216,7 +216,7 @@ public class LocationClient { } // public void EqcAlgorithmInterfaceMethod2() { public void startGpsLocate() { - Logger.i("开启GPS扫描"); + ICLogger.i("开启GPS扫描"); runtime.getLocationInstance().setLocationStat( ICLocation.LOCATION_STAT.LOCATION_OPEN); //此处为了检测是否定位时可以正确识别状态，以防一直处于GPS定位成功状态 Settings.Secure.setLocationProviderEnabled(runtime.getContextProxy().getResolver(), GPS_PROVIDER, true); Single.just(null).observeOn(AndroidSchedulers.mainThread()).subscribe(new Action1() { @@ -226,7 +226,7 @@ public class LocationClient { } public void clearGPSlocateStat(){ - Logger.i("clearGPSlocateStat"); + ICLogger.i("clearGPSlocateStat"); stopGpsLocate(); runtime.getLocationInstance().setLocationStat( ICLocation.LOCATION_STAT.LOCATION_CLOSED);//此处为了检测是否定位时可以正确识别状态，以防一直处于GPS定位成功状态 } @@ -286,8 +286,8 @@ public class LocationClient { && runtime.getLocationInstance().getMCC().equals("0") && runtime.getLocationInstance().getGSMStationCID() ==0 && runtime.getLocationInstance().getLAC()==0)) ?false:true; -// Logger.i("getMNC "+runtime.getLocationInstance().getMNC()+" getMCC "+runtime.getLocationInstance().getMCC()+" getGSMStationCID " + runtime.getLocationInstance().getGSMStationCID()+ " getLAC "+runtime.getLocationInstance().getLAC()+" changed "+runtime.getLocationInstance().isDataChanged()); - Logger.i("lbs_ok "+lbs_ok+" waitAndSendLocation wifi_ok " + wifi_ok+ " gps_ok "+gps_ok + " mode "+mode); +// ICLogger.i("getMNC "+runtime.getLocationInstance().getMNC()+" getMCC "+runtime.getLocationInstance().getMCC()+" getGSMStationCID " + runtime.getLocationInstance().getGSMStationCID()+ " getLAC "+runtime.getLocationInstance().getLAC()+" changed "+runtime.getLocationInstance().isDataChanged()); + ICLogger.i("lbs_ok "+lbs_ok+" waitAndSendLocation wifi_ok " + wifi_ok+ " gps_ok "+gps_ok + " mode "+mode); switch(mode){ case ICLocation.CUSTOM_MOD: @@ -327,7 +327,7 @@ public class LocationClient { runtime.getLocationInstance().setLocationType(locationtype); runtime.getLocationInstance().setLocationTime(TimeUtil.getSystemTime3()); }else if (timeout==true){ - Logger.i("timeout no location "); + ICLogger.i("timeout no location "); isLocating = false; if (mTimer!=null){ mTimer.cancel(); @@ -367,7 +367,7 @@ public class LocationClient { }else if (timeout==true){ - Logger.i("timeout no location "); + ICLogger.i("timeout no location "); isLocating = false; if (mTimer!=null){ mTimer.cancel(); @@ -418,7 +418,7 @@ public void updateCellInfo() { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("runtime.preCellInfo="); stringBuilder.append(runtime.preCellInfo); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); performAlarm(paramWakeLock); } @@ -433,15 +433,15 @@ public void updateCellInfo() { public void startLocationProcess(int mod){ updateStepCount();//update StepCount,保证每次定位前，计步数据是最新的。防止丢数据。 - Logger.i("forceLocation="+forceLocation+", WorkingMod="+mod+", isLocating="+isLocating+", lastStep="+runtime.getLastStepCount()+", currentStep="+ runtime.getTotalStepCount()); + ICLogger.i("forceLocation="+forceLocation+", WorkingMod="+mod+", isLocating="+isLocating+", lastStep="+runtime.getLastStepCount()+", currentStep="+ runtime.getTotalStepCount()); if (isLocating ) { - Logger.i("locating ,skip location!"); + ICLogger.i("locating ,skip location!"); return; } // 不强制定位 且 WorkingMod 不是紧急模式，且 没有移动过 if ( ( forceLocation != 1 ) && ( mod != ICLocation.REALTIME_MOD )&& ( mod != ICLocation.EMERGNECY_MOD ) && (mod != ICLocation.CUSTOM_MOD) && (runtime.getLastStepCount() == runtime.getTotalStepCount()) && (skipMoveCheck ==false )){ - Logger.i("No Move ,skip location!"); + ICLogger.i("No Move ,skip location!"); return ; } @@ -483,7 +483,7 @@ public void updateCellInfo() { private static int forceLocation=0; public void onReceive(StringMessage paramStringMessage) { - Logger.i("LocationClient onReceive " +paramStringMessage.cmd() ); + ICLogger.i("LocationClient onReceive " +paramStringMessage.cmd() ); // Deliver.triggerSendThread(); //响应定位指令 if ("StartLocate".equals(paramStringMessage.cmd()) ){ @@ -492,7 +492,7 @@ public void updateCellInfo() { }else if ("setWorkMod".equals(paramStringMessage.cmd())) { //此处不负责给工作模式赋值，在API接收的位置能够直接拿到变量，可以直接赋值较方便。 int mod = runtime.getLocationInstance().getWorkingMod(); - Logger.i("Set WorkMODE "+mod +" and reset Location AlarmCycle"); + ICLogger.i("Set WorkMODE "+mod +" and reset Location AlarmCycle"); CoreService.getInstance().setLocationAlarm(mod); //默认设置好Alarm后会触发一次定位，无需后面再触发定位了。 forceLocation=1; //不管是什么模式，都强制定位一次，然后再说其他情况 if(mod==ICLocation.EMERGNECY_MOD) @@ -517,7 +517,7 @@ public void updateCellInfo() { stringBuilder.append(runtime.getLocationInstance().getWorkingMod()); stringBuilder.append("LOCATION_CYCLE="); stringBuilder.append(runtime.getLocationInstance().getLocation_cycle()); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); /*注册 亮屏监控*/ @@ -557,7 +557,7 @@ public void updateCellInfo() { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("AirMode=="); stringBuilder.append(b); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); } })).start(); } @@ -566,12 +566,17 @@ public void updateCellInfo() { private void sendBatteryNotification() { if (runtime.getHaveBatteryChange() && !runtime.getBatterychanging() && !this.batteryNotification) { // connection.send(API.H05(runtime, "2")); - Logger.i("sendBatteryNotification LevelChanged "); + ICLogger.i("sendBatteryNotification LevelChanged "); this.batteryNotification = true; } if (runtime.getBatteryLow() && !runtime.getBatterychanging() && !this.batteryLowNotification) { // connection.send(API.H05(runtime, "1")); - Logger.i("sendBatteryNotification Low Battery "); + ICLogger.i("sendBatteryNotification Low Battery "); + + runtime.setAlarmType(false,runtime.getBatteryLow(),false,false); + //trigger AP10 报警低电 + connection.send(protocolAPIHelper.genStringMessage("AP10",protocolAPIHelper.AP10(runtime))); + this.batteryLowNotification = true; } if (runtime.getBatterychanging()) { diff --git a/app/src/main/java/com/enqualcomm/support/MainActivity.java b/app/src/main/java/com/enqualcomm/support/MainActivity.java index 0237d3e2..3ff21750 100644 --- a/app/src/main/java/com/enqualcomm/support/MainActivity.java +++ b/app/src/main/java/com/enqualcomm/support/MainActivity.java @@ -18,7 +18,7 @@ import com.enqualcomm.support.R; import com.enqualcomm.support.utils.DeviceInfoUtil; import com.ic.jni.ICJniUtils; import com.enqualcomm.support.CoreService; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; import java.util.Timer; import java.util.TimerTask; @@ -90,7 +90,7 @@ public class MainActivity extends AppCompatActivity { // last= ((int)latitude)*100 +intfen+miao; // latitude=last; // -// Logger.i(" lat="+latitude+",lon="+longitude); +// ICLogger.i(" lat="+latitude+",lon="+longitude); TextView tv_version=(TextView)findViewById(R.id.textViewVersion); diff --git a/app/src/main/java/com/enqualcomm/support/MySqlitOpenHelper.java b/app/src/main/java/com/enqualcomm/support/MySqlitOpenHelper.java index 95f7ef67..5abcc6a4 100644 --- a/app/src/main/java/com/enqualcomm/support/MySqlitOpenHelper.java +++ b/app/src/main/java/com/enqualcomm/support/MySqlitOpenHelper.java @@ -4,7 +4,7 @@ import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; public class MySqlitOpenHelper extends SQLiteOpenHelper { @@ -32,19 +32,19 @@ public class MySqlitOpenHelper extends SQLiteOpenHelper { if (paramInt1 < 3) paramSQLiteDatabase.execSQL("CREATE TABLE STHEART_RATE(_id INTEGER PRIMARY KEY AUTOINCREMENT ,START_TIME TEXT ,END_TIME TEXT ,WEEK TEXT ,STATUS TEXT,INTERVAL TEXT)"); if (paramInt1 < 4) { - Logger.i("数据库升级了"); + ICLogger.i("数据库升级了"); paramSQLiteDatabase.execSQL("ALTER TABLE MESSAGE ADD COLUMN ICON"); } if (paramInt1 < 5) { - Logger.i("数据库升级了 5"); + ICLogger.i("数据库升级了 5"); paramSQLiteDatabase.execSQL("CREATE TABLE ANTIOFF(_id INTEGER PRIMARY KEY AUTOINCREMENT ,START_TIME TEXT ,END_TIME TEXT ,WEEK TEXT ,STATUS TEXT,CUR_SYS_STATUS TEXT)"); } if (paramInt1 < 6) { - Logger.i("数据库升级了 6"); + ICLogger.i("数据库升级了 6"); paramSQLiteDatabase.execSQL("CREATE TABLE UNREADMSG(_id INTEGER PRIMARY KEY AUTOINCREMENT ,CATEGORY INTEGER ,ID TEXT ,COUNT INTEGER,RECVTIME INTEGER)"); } if (paramInt1 < 7) { - Logger.i("数据库升级了"); + ICLogger.i("数据库升级了"); paramSQLiteDatabase.execSQL("ALTER TABLE DEVICESTATUS ADD COLUMN IS_ALARM"); } } diff --git a/app/src/main/java/com/enqualcomm/support/NMEAListener.java b/app/src/main/java/com/enqualcomm/support/NMEAListener.java index 4f19b6cc..8d8ff56c 100644 --- a/app/src/main/java/com/enqualcomm/support/NMEAListener.java +++ b/app/src/main/java/com/enqualcomm/support/NMEAListener.java @@ -14,7 +14,7 @@ import android.os.Message; import com.enqualcomm.support.bean.ICLocation; import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.utils.FileOutputUtil; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.TimeUtil; import java.text.DecimalFormat; @@ -58,7 +58,7 @@ public class NMEAListener implements NmeaListener, LocationListener { public void onNmeaReceived(long paramLong, String paramString) { // EqcAlgorithmNative.native_EqcAlgorithmMethod5(paramString); - Logger.i("Nmea :"+paramString+" "+paramLong); + ICLogger.i("Nmea :"+paramString+" "+paramLong); } public void onProviderDisabled(String paramString) {} @@ -252,7 +252,7 @@ public class NMEAListener implements NmeaListener, LocationListener { } } if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(this.runtime.getCacheDir(),"GPS",sb2.toString()); - Logger.i( sb2.toString()); + ICLogger.i( sb2.toString()); getBestLocation(locationManager,status); return 0; @@ -268,7 +268,7 @@ public class NMEAListener implements NmeaListener, LocationListener { // runtime.setLatitude(strLatitude); // runtime.setLongitude(strLongitude); // -// Logger.i("Location " +runtime.getLocationInstance().getLocationStat().name()); +// ICLogger.i("Location " +runtime.getLocationInstance().getLocationStat().name()); //发送停止消息 NMEAListener.this.temHandler.sendEmptyMessage(id); } @@ -351,7 +351,7 @@ public class NMEAListener implements NmeaListener, LocationListener { sb.append(", gps time "+TimeUtil.getLocalTime(gpsTime)+" lon " + strLongitude + " lat " + strLatitude +" TimeToFirstFix "+status.getTimeToFirstFix()); - Logger.i( sb.toString()); + ICLogger.i( sb.toString()); if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(this.runtime.getCacheDir(),"GPS",sb.toString()); runtime.getLocationInstance().setLocation(latitude,longitude,speed,0,status.getMaxSatellites()); @@ -378,7 +378,7 @@ public class NMEAListener implements NmeaListener, LocationListener { String provider = locationManager.getBestProvider(criteria, true); - Logger.i("GPS StartListen with Provider " + provider); + ICLogger.i("GPS StartListen with Provider " + provider); this.locationManager.requestLocationUpdates(provider, 0L, 0.0F, this); this.listening = true; noSignalCount = 0; diff --git a/app/src/main/java/com/enqualcomm/support/ParseUpdate.java b/app/src/main/java/com/enqualcomm/support/ParseUpdate.java index 95dad8ac..b2bf87a1 100644 --- a/app/src/main/java/com/enqualcomm/support/ParseUpdate.java +++ b/app/src/main/java/com/enqualcomm/support/ParseUpdate.java @@ -98,7 +98,7 @@ public class ParseUpdate extends Object implements Observable.OnSubscribe { private Runtime mRuntime; - + private String[] msg; public PassData(StringMessage paramStringMessage, Runtime paramRuntime) { @@ -23,7 +23,7 @@ public class PassData extends Object implements Observable.OnSubscribe { StringBuilder stringBuilder2 = new StringBuilder(); stringBuilder2.append("size ="); stringBuilder2.append(i); - Logger.i(stringBuilder2.toString()); + ICLogger.i(stringBuilder2.toString()); if (i < 4) { paramSubscriber.onNext(null); return; @@ -35,7 +35,7 @@ public class PassData extends Object implements Observable.OnSubscribe { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("sss ="); stringBuilder.append(str); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); if (!bool) { stringBuilder1.append(str); bool = true; diff --git a/app/src/main/java/com/enqualcomm/support/adapter/LBSHelper.java b/app/src/main/java/com/enqualcomm/support/adapter/LBSHelper.java index 1eb15a96..c21765e3 100644 --- a/app/src/main/java/com/enqualcomm/support/adapter/LBSHelper.java +++ b/app/src/main/java/com/enqualcomm/support/adapter/LBSHelper.java @@ -24,7 +24,7 @@ import android.telephony.gsm.GsmCellLocation; import com.enqualcomm.support.Config; import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.utils.FileOutputUtil; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.SimSignalUtil; import java.util.Collections; @@ -235,7 +235,7 @@ public class LBSHelper { if (var3 > 23) { var4 = telephonyManager.getSimOperator(); if (var4 == null) { - Logger.i("operator == null"); + ICLogger.i("operator == null"); return null; } @@ -248,7 +248,7 @@ public class LBSHelper { CellLocation celllocation = telephonyManager.getCellLocation(); if (celllocation == null) { - Logger.i("cellLocation = null"); + ICLogger.i("cellLocation = null"); return null; } else { StringBuilder gsmSb = new StringBuilder(var4); @@ -269,7 +269,7 @@ public class LBSHelper { // this.runtime.setLAC(gsmCell.getLac()); this.runtime.setCellinfo(gsmSb.toString()); this.runtime.setCdmaInfo(null); - Logger.i("GsmCellLocation "+ gsmSb.toString()); + ICLogger.i("GsmCellLocation "+ gsmSb.toString()); if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(this.runtime.getCacheDir(), "onCellLocationChanged", gsmSb.toString()); List neighboringCell_list = telephonyManager.getNeighboringCellInfo(); @@ -297,7 +297,7 @@ public class LBSHelper { } } } - Logger.i("return "+ gsmSb.toString()); + ICLogger.i("return "+ gsmSb.toString()); return gsmSb.toString(); } else if (celllocation instanceof CdmaCellLocation) { CdmaCellLocation cdmaCelllocation = (CdmaCellLocation)celllocation; @@ -312,11 +312,11 @@ public class LBSHelper { cdmaSB.append(""); cdmaSB.append(","); cdmaSB.append(this.mLastSignal); - Logger.i("CdmaCellLocation"); + ICLogger.i("CdmaCellLocation"); StringBuilder var8 = new StringBuilder(); var8.append("CDMA_info="); var8.append(cdmaSB.toString()); - Logger.i(var8.toString()); + ICLogger.i(var8.toString()); this.runtime.setCellinfo(null); this.runtime.setCdmaInfo(cdmaSB.toString()); @@ -328,7 +328,7 @@ public class LBSHelper { return null; } } else { - Logger.i("operator == null || operator.length() <= 3"); + ICLogger.i("operator == null || operator.length() <= 3"); return null; } } diff --git a/app/src/main/java/com/enqualcomm/support/adapter/protocolAPIHelper.java b/app/src/main/java/com/enqualcomm/support/adapter/protocolAPIHelper.java index 52498767..0df8f4d6 100644 --- a/app/src/main/java/com/enqualcomm/support/adapter/protocolAPIHelper.java +++ b/app/src/main/java/com/enqualcomm/support/adapter/protocolAPIHelper.java @@ -22,7 +22,7 @@ import com.enqualcomm.support.CoreService; import com.enqualcomm.support.service.Deliver; import com.enqualcomm.support.utils.Connection; import com.enqualcomm.support.utils.DBHelper; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.NettyConnection; import com.enqualcomm.support.utils.ProcessReceiver; import com.enqualcomm.support.utils.ServiceUtil; @@ -196,11 +196,11 @@ public class protocolAPIHelper { } private void log(String msg) { - Logger.log(TAG, msg); + ICLogger.log(TAG, msg); } private void log(String function, String msg) { - Logger.log(TAG, function, msg); + ICLogger.log(TAG, function, msg); } @@ -404,10 +404,10 @@ public class protocolAPIHelper { if (list.length==3){ String index=list[2]; String imei=list[1]; - Logger.i("Handle BPXL IMEI "+imei+",index "+index); + ICLogger.i("Handle BPXL IMEI "+imei+",index "+index); connection.send(protocolAPIHelper.genStringMessage("APXL",APXL(index))); }else{ - Logger.i("BPXL format error!"); + ICLogger.i("BPXL format error!"); } } @@ -438,10 +438,10 @@ public class protocolAPIHelper { if (list.length==3){ String index=list[2]; String imei=list[1]; - Logger.i("Handle BPXY IMEI "+imei+",index "+index); + ICLogger.i("Handle BPXY IMEI "+imei+",index "+index); connection.send(protocolAPIHelper.genStringMessage("APXY",APXY(index))); }else{ - Logger.i("BPXY format error!"); + ICLogger.i("BPXY format error!"); } } @@ -491,9 +491,9 @@ public class protocolAPIHelper { connection.send(protocolAPIHelper.genStringMessage("APJZ",APJZ(index,strBPH,strBPL,strAge,strSex))); runtime.getHRS().setXY_Ref(Integer.valueOf(strBPH),Integer.valueOf(strBPL),Integer.valueOf(strAge),Integer.valueOf(strSex)); - Logger.i("Handle BPJZ IMEI "+imei+",index "+index+", BPH "+strBPH+", BPL "+strBPL+", Age "+ strAge +", Sex "+ (strSex.equals("1")?"男":"女")); + ICLogger.i("Handle BPJZ IMEI "+imei+",index "+index+", BPH "+strBPH+", BPL "+strBPL+", Age "+ strAge +", Sex "+ (strSex.equals("1")?"男":"女")); }else{ - Logger.i("BPXY format error!"); + ICLogger.i("BPXY format error!"); } } @@ -574,7 +574,7 @@ public class protocolAPIHelper { String phNum1=cmdlist.length==3?"":cmdlist[3]; String phNum2=cmdlist.length>3?(cmdlist.length==4?"":cmdlist[4]):""; String phNum3=(cmdlist.length>4)?(cmdlist.length==5? "":cmdlist[5]):""; - Logger.i(new StringBuffer().append("get Emegency Numbs "+phNum1+","+phNum2+","+phNum3).toString()); + ICLogger.i(new StringBuffer().append("get Emegency Numbs "+phNum1+","+phNum2+","+phNum3).toString()); connection.send(genStringMessage("AP12",AP12(index,phNum1,phNum2,phNum3))); ArrayList contactArray=new ArrayList(); @@ -585,7 +585,7 @@ public class protocolAPIHelper { runtime.getDbHelper().saveContacts(contactArray,false,false,false,false,false,true); }else{ - Logger.i(" BP12 format error!"); + ICLogger.i(" BP12 format error!"); } } @@ -660,7 +660,7 @@ public class protocolAPIHelper { } String index=cmdlist[2]; - Logger.i(sb.toString()); + ICLogger.i(sb.toString()); connection.send(genStringMessage("AP14",AP14(index,phnums))); ArrayList contactArray=new ArrayList(); for (int i=0; i< phnums.length;i++){ @@ -668,10 +668,10 @@ public class protocolAPIHelper { if (tmp.length==2){ String name=Util.decodeUnicode2Utf8(tmp[0]); String phonem=tmp[1]; - Logger.i("phnums["+i+"]="+phnums[i]+",split = "+tmp.length+" , name="+name+",-"+phonem); + ICLogger.i("phnums["+i+"]="+phnums[i]+",split = "+tmp.length+" , name="+name+",-"+phonem); contactArray.add(new Contact(Contact.CATEGORY_CALL,name,phonem)); }else{ - Logger.i("phnums["+i+"]="+phnums[i]+",split = "+tmp.length); + ICLogger.i("phnums["+i+"]="+phnums[i]+",split = "+tmp.length); } } @@ -683,7 +683,7 @@ public class protocolAPIHelper { runtime.getDbHelper().saveContacts(contactArray,false,false,true,false,false,false); }else{ - Logger.i(" BP14 format error!"); + ICLogger.i(" BP14 format error!"); } } @@ -790,7 +790,7 @@ public class protocolAPIHelper { String replacement=new StringBuilder("IWBP85,").append(imei).append(",").toString(); String replycmd = cmd.replace(replacement,""); - Logger.i("gen reply "+replacement+" "+replycmd); + ICLogger.i("gen reply "+replacement+" "+replycmd); connection.send(genStringMessage("AP85",AP85(runtime,replycmd))); } @@ -810,7 +810,7 @@ public class protocolAPIHelper { //// IWBP05,6# // String[] cmdlist=cmd.split(CMDSPLIT); // if (cmdlist.length>1){ -// Logger.i(" 服务器有 " +cmdlist[1]+" 条语音未接收！"); +// ICLogger.i(" 服务器有 " +cmdlist[1]+" 条语音未接收！"); // } // } @@ -862,7 +862,7 @@ public class protocolAPIHelper { int packetCount=Integer.valueOf(cmdlist[2]); int packetIndex=Integer.valueOf(cmdlist[3]); int receiveSuccess=Integer.valueOf(cmdlist[4]); - Logger.i("服务器在"+time+" 收到语音 "+packetIndex+"/"+packetCount+" "+ (receiveSuccess==1?"成功":"失敗")); + ICLogger.i("服务器在"+time+" 收到语音 "+packetIndex+"/"+packetCount+" "+ (receiveSuccess==1?"成功":"失敗")); if (receiveSuccess == 1){ //如果服务器接收 语音成功，则设置下一个要发送的语音包Index，当index == packetCount的时候表示所有包发送完毕，停止继续发送 voicePacket.getInstanceSent().setCurrentIndexToSent(packetIndex); @@ -871,7 +871,7 @@ public class protocolAPIHelper { connection.DeliverCMDMessageToSystem("BP07","SentVoicePacket"); }else{ - Logger.i(" BP07 Format error！"); + ICLogger.i(" BP07 Format error！"); } } @@ -1048,9 +1048,9 @@ public class protocolAPIHelper { String time=list[1]; String lat=list[2]; String lon=list[3]; - Logger.i("BPTM , time="+time+", lat="+lat+", lon="+lon); + ICLogger.i("BPTM , time="+time+", lat="+lat+", lon="+lon); }else{ - Logger.i("BPTM format error"); + ICLogger.i("BPTM format error"); } @@ -1077,7 +1077,7 @@ public static String AP15(String index){ String index=list[2]; String time=list[3]; connection.send(protocolAPIHelper.genStringMessage("AP15",AP15(index))); - Logger.i("BP15 , 定位周期="+time+"分钟"); + ICLogger.i("BP15 , 定位周期="+time+"分钟"); Config.setLocationMode(runtime.getContextProxy().context, ICLocation.CUSTOM_MOD); Config.setLocationCycle(runtime.getContextProxy().context,Integer.valueOf(time)); @@ -1086,7 +1086,7 @@ public static String AP15(String index){ //set AlarmCycle and trigger Location CoreService.getInstance().setLocationAlarm(runtime.getLocationInstance().getWorkingMod()); }else{ - Logger.i("BP15 format error"); + ICLogger.i("BP15 format error"); } } @@ -1167,7 +1167,7 @@ public static String AP15(String index){ String dir = Environment.getExternalStorageDirectory()+ "/Android/VoiceCache"; String amrFilepath=Util.saveFile(voicePacket.getInstance().getVoicePacketBytes(),0,voicePacket.getInstance().getVoicePacketLen(),new File(dir),"receive_"+voicePacket.getInstance().getPacketTime()+".amr"); - Logger.i("save Amr file to "+amrFilepath); + ICLogger.i("save Amr file to "+amrFilepath); voicePacket.getInstance().clearPacket(); VoiceContent voiceContent=VoiceContent.placeHolderIn(Content.CONTACT_CATEGORY_GROUP,GROUP_ALL,amrFilepath); @@ -1231,10 +1231,10 @@ public static String AP15(String index){ String index=list[2]; String whitelist_switch=list[3]; connection.send(protocolAPIHelper.genStringMessage("AP84",AP84(index,1))); - Logger.i("收到服务器指令：白名单"+(whitelist_switch.equals("1")?"开":"关")); + ICLogger.i("收到服务器指令：白名单"+(whitelist_switch.equals("1")?"开":"关")); }else{ - Logger.i("BP84 format error!"); + ICLogger.i("BP84 format error!"); } } @@ -1268,14 +1268,14 @@ public static String AP15(String index){ String type=list[3]; String cycle=list[4]; connection.send(protocolAPIHelper.genStringMessage("AP86",AP86(index))); - Logger.i("收到服务器指令：设置"+(type.equals("1")?"心率周期 ":"血压周期 ")+cycle+"分钟"); + ICLogger.i("收到服务器指令：设置"+(type.equals("1")?"心率周期 ":"血压周期 ")+cycle+"分钟"); //发送重置PPGCycle的广播，会在CoreServer里面执行 Intent intent = new Intent(); intent.putExtra("PPGTestCycle",Integer.valueOf(cycle)); runtime.getContextProxy().sendBrodcast(ACTION_HEATR_RATE_START,intent); }else{ - Logger.i("BP86 format error!"); + ICLogger.i("BP86 format error!"); } } @@ -1315,9 +1315,9 @@ public static String AP15(String index){ String BPL_H=list[7]; String BPL_L=list[8]; connection.send(protocolAPIHelper.genStringMessage("AP89",AP89(index))); - Logger.i("收到服务器指令：心率/血压阀值 "+PPGH+","+PPGL+","+BPH_H+","+BPH_L+","+BPL_H+","+BPL_L); + ICLogger.i("收到服务器指令：心率/血压阀值 "+PPGH+","+PPGL+","+BPH_H+","+BPH_L+","+BPL_H+","+BPL_L); }else{ - Logger.i("BP89 format error!"); + ICLogger.i("BP89 format error!"); } } diff --git a/app/src/main/java/com/enqualcomm/support/bean/DeviceStatus.java b/app/src/main/java/com/enqualcomm/support/bean/DeviceStatus.java index 7c575fa1..b9a29f90 100644 --- a/app/src/main/java/com/enqualcomm/support/bean/DeviceStatus.java +++ b/app/src/main/java/com/enqualcomm/support/bean/DeviceStatus.java @@ -1,6 +1,6 @@ package com.enqualcomm.support.bean; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java index dc33187a..7110bdbd 100644 --- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java +++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java @@ -7,7 +7,7 @@ import com.enqualcomm.support.adapter.LBSHelper; import com.enqualcomm.support.utils.ContextProxy; import com.enqualcomm.support.utils.DBHelper; import com.enqualcomm.support.utils.DnsUtil; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; import java.io.File; import java.text.ParseException; @@ -324,7 +324,7 @@ public class Runtime { stringBuilder.append(","); stringBuilder.append(paramString2); this.imei_cid = stringBuilder.toString(); - Logger.i("imei:"+imei+",cid:"+cid); + ICLogger.i("imei:"+imei+",cid:"+cid); } public void setImsi(String paramString) { this.imsi = paramString; } @@ -357,7 +357,7 @@ public class Runtime { gpsp.setMCC(list[0]); gpsp.setMNC(list[1]); } - Logger.i("setMccAndMnc "+MccMnc); + ICLogger.i("setMccAndMnc "+MccMnc); } public void setSaveStepCount(int paramInt) { this.saveStepCount = paramInt; } @@ -366,7 +366,7 @@ public class Runtime { public void setSignalStrength(int signal) { this.SignalStrength = signal; -// Logger.i("setSignalStrength "+signal); +// ICLogger.i("setSignalStrength "+signal); } public void setTestServerProp(boolean paramBoolean) { this.testServerProp = paramBoolean; } diff --git a/app/src/main/java/com/enqualcomm/support/bean/Update.java b/app/src/main/java/com/enqualcomm/support/bean/Update.java index 318dda88..8bba67db 100644 --- a/app/src/main/java/com/enqualcomm/support/bean/Update.java +++ b/app/src/main/java/com/enqualcomm/support/bean/Update.java @@ -1,6 +1,6 @@ package com.enqualcomm.support.bean; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; import java.util.ArrayList; @@ -278,7 +278,7 @@ public class Update { stringBuilder.append(param1String1); stringBuilder.append("number="); stringBuilder.append(param1String2); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); } public void setAdminIcon(String param1String) { this.admin_icon_index = param1String; } diff --git a/app/src/main/java/com/enqualcomm/support/service/AudioService.java b/app/src/main/java/com/enqualcomm/support/service/AudioService.java index e31af749..ccc26d30 100644 --- a/app/src/main/java/com/enqualcomm/support/service/AudioService.java +++ b/app/src/main/java/com/enqualcomm/support/service/AudioService.java @@ -4,7 +4,7 @@ import android.content.res.AssetFileDescriptor; import android.content.res.AssetManager; import android.media.MediaPlayer; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; public class AudioService implements MediaPlayer.OnErrorListener, MediaPlayer.OnCompletionListener { @@ -32,7 +32,7 @@ public class AudioService implements MediaPlayer.OnErrorListener, MediaPlayer.On } public void play(AssetManager paramAssetManager, String paramString) { - Logger.i("mMediaPlayer play"); + ICLogger.i("mMediaPlayer play"); if (this.mMediaPlayer == null) initMediaPlayer(); this.mMediaPlayer.reset(); diff --git a/app/src/main/java/com/enqualcomm/support/service/Deliver.java b/app/src/main/java/com/enqualcomm/support/service/Deliver.java index fa8d55c3..b979ca98 100644 --- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java +++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java @@ -36,7 +36,7 @@ import com.enqualcomm.support.utils.DBHelper; import com.enqualcomm.support.utils.FileCache; import com.enqualcomm.support.utils.FileOutputUtil; import com.enqualcomm.support.utils.GetContact; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.NettyConnection; import com.enqualcomm.support.utils.ServiceUtil; import com.enqualcomm.support.utils.SharPreferenceUtil; @@ -129,7 +129,7 @@ public class Deliver extends AbstractConnectionService { public void run() { // if (sendingMsg==true) // { -// Logger.i("Sending MSG in Thread, skip this send Command."); +// ICLogger.i("Sending MSG in Thread, skip this send Command."); // return; // } // sendingMsg=true; @@ -144,7 +144,7 @@ public class Deliver extends AbstractConnectionService { mSendMSGHandler.postDelayed(delaySendMSG,5000); } // sendingMsg=false; -// Logger.i("exit delaySendMSG!"); +// ICLogger.i("exit delaySendMSG!"); } }; } @@ -161,7 +161,7 @@ public class Deliver extends AbstractConnectionService { int signal=mRuntime.getSignalStrength(); int networkType=SimSignalUtil.getInstance((mRuntime.getContextProxy()).context).getNetworkType(); if (signal + 110 < getMinSignalStrength(networkType)) { - Logger.i("Skip Send for SignalStrengh "+(signal + 110 )+" < "+getMinSignalStrength(networkType)); + ICLogger.i("Skip Send for SignalStrengh "+(signal + 110 )+" < "+getMinSignalStrength(networkType)); //如果信号不好，把msg放回去 ret=false; } else { @@ -179,7 +179,7 @@ public class Deliver extends AbstractConnectionService { public static boolean getAndSendMsgFromQueue(){ boolean ret=false; if (mRuntime.getUseQueue()) { - Logger.i("queue locked "+mLock.isLocked()); + ICLogger.i("queue locked "+mLock.isLocked()); if(mLock.isLocked()) return false; mLock.lock(); try @@ -213,8 +213,8 @@ public class Deliver extends AbstractConnectionService { } else { str = "no message!\n"; } - Logger.i("send cached cmd : \n"+str); - Logger.i("\n"+queue.size()+" left in Queue!"); + ICLogger.i("send cached cmd : \n"+str); + ICLogger.i("\n"+queue.size()+" left in Queue!"); }finally { if(mLock!=null && mLock.isLocked()) mLock.unlock(); @@ -260,7 +260,7 @@ public class Deliver extends AbstractConnectionService { } else { str = null; } - Logger.i("save queue to cache : \n"+str); + ICLogger.i("save queue to cache : \n"+str); lock.unlock(); return; } finally { @@ -277,10 +277,10 @@ public static void sendLocationMSG( String Msg){ triggerSendThread(); }else { if (connection.isServerConnected() && KeepAlive.isConnected) { - Logger.i(" first send " + Msg); + ICLogger.i(" first send " + Msg); connection.send(protocolAPIHelper.genStringMessage("queue",Msg)); } else { - Logger.i("offline skip " + Msg); + ICLogger.i("offline skip " + Msg); if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(mRuntime.getCacheDir(), "APILog", " offlineskip " + Msg); } } @@ -311,7 +311,7 @@ public static void sendLocationMSG( String Msg){ public static void releaseWakeLockForGetWifiList() { if (WifiListWakeLock == null) { - Logger.i("WifiListWakeLock 没有加锁"); + ICLogger.i("WifiListWakeLock 没有加锁"); return; } if (WifiListWakeLock.isHeld()) { @@ -340,7 +340,7 @@ public static void sendLocationMSG( String Msg){ this.mConnection = paramConnection; this.mRuntime = paramRuntime; String cmd = paramStringMessage.cmd(); - Logger.i("Deliver receive cmd " + paramStringMessage.cmd()); + ICLogger.i("Deliver receive cmd " + paramStringMessage.cmd()); if (cmd.equals("BP07") || cmd.equals("SentVoicePacket")) { //收到BP07 表示服务器收到一个voicePacket 分包成功，开始检查下一个包是否存在需要发送。 //收到SentVoicePacket 表示 有一个VoiceMessage要发送，需要从第0个包开始发送语音分包。 @@ -348,7 +348,7 @@ public static void sendLocationMSG( String Msg){ voicePacket voicepacket = voicePacket.getInstanceSent(); if (voicepacket.getCurrentIndexToSent() < voicepacket.getPacketCount()) { - Logger.i("voicepacket " + voicepacket.getName() + " " + voicepacket.getPacketTime() + " send " + (voicepacket.getCurrentIndexToSent() + 1) + "/" + voicepacket.getPacketCount()); + ICLogger.i("voicepacket " + voicepacket.getName() + " " + voicepacket.getPacketTime() + " send " + (voicepacket.getCurrentIndexToSent() + 1) + "/" + voicepacket.getPacketCount()); ((NettyConnection) mConnection).sendMsg( protocolAPIHelper.AP07(voicepacket.getPacketTime(), voicepacket.getPacketCount(), @@ -357,7 +357,7 @@ public static void sendLocationMSG( String Msg){ voicepacket.getVoicePacketWithIndex(voicepacket.getCurrentIndexToSent()).getPacketData()) ); } else { - Logger.i("voicepacket " + voicepacket.getName() + " " + voicepacket.getPacketTime() + " sent Done!"); + ICLogger.i("voicepacket " + voicepacket.getName() + " " + voicepacket.getPacketTime() + " sent Done!"); } return true; } else if ("poweroff".equals(paramStringMessage.cmd())) { @@ -412,7 +412,7 @@ public static void sendLocationMSG( String Msg){ public static void releaseOneWakeLock() { if (ReceiveWakeLock == null) { - Logger.i("ReceiveWakeLock 没有加锁"); + ICLogger.i("ReceiveWakeLock 没有加锁"); return; } if (!wakeLockWifiList && !wakeLockWifiSet && ReceiveWakeLock.isHeld()) { @@ -423,7 +423,7 @@ public static void sendLocationMSG( String Msg){ public void releaseReceiveWakeLock() { if (this.ReceiveWakeLock == null) { - Logger.i("ReceiveWakeLock 没有加锁"); + ICLogger.i("ReceiveWakeLock 没有加锁"); return; } if (this.ReceiveWakeLock.isHeld()) { @@ -451,7 +451,7 @@ public static void sendLocationMSG( String Msg){ wifiManager.saveConfiguration(); networkid = wifiManager.addNetwork(wifiConfiguration); if (Util.connectWifiByReflectMethod(mRuntime.getContextProxy().context, networkid) == null && !wifiManager.enableNetwork(networkid, true)) { - Logger.i("连接失败 3"); + ICLogger.i("连接失败 3"); SystemClock.sleep(3000L); wifiManager.setWifiEnabled(false); @@ -477,7 +477,7 @@ public static void sendLocationMSG( String Msg){ stringBuilder.append(23); stringBuilder.append(",kitkat="); stringBuilder.append(19); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); if (Build.VERSION.SDK_INT >= 19) { alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, l + 10000L, pendingIntent); return; @@ -496,7 +496,7 @@ public static void sendLocationMSG( String Msg){ var4.append(var3); var4.append(" isAppSetWifi="); var4.append(Deliver.isAppSetWifi); - Logger.i(var4.toString()); + ICLogger.i(var4.toString()); if (var3.equals("android.net.conn.CONNECTIVITY_CHANGE")) { if (Deliver.isAppSetWifi == 0) { return; @@ -512,7 +512,7 @@ public static void sendLocationMSG( String Msg){ WifiManager var5 = (WifiManager)var1.getSystemService(Context.WIFI_SERVICE); if (((ConnectivityManager)var1.getSystemService(Context.CONNECTIVITY_SERVICE)).getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()) { - Logger.i("连接成功"); + ICLogger.i("连接成功"); Deliver.isAppSetWifi = 0; Deliver.haveSendH42 = true; Deliver.this.mConnection.connect(Deliver.this.mRuntime.getHost(), Deliver.this.mRuntime.getPort()); @@ -530,7 +530,7 @@ public static void sendLocationMSG( String Msg){ StringBuilder var6 = new StringBuilder(); var6.append("连接失败 222 delayHandler="); var6.append(Deliver.this.delayHandler); - Logger.i(var6.toString()); + ICLogger.i(var6.toString()); Deliver.isAppSetWifi = 2; var5.reconnect(); if (Deliver.this.delayHandler == null) { @@ -540,14 +540,14 @@ public static void sendLocationMSG( String Msg){ StringBuilder var1x = new StringBuilder(); var1x.append("连接失败 超时 wifiEnabled="); var1x.append(Deliver.this.wifiEnabled); - Logger.i(var1x.toString()); + ICLogger.i(var1x.toString()); if (Deliver.isAppSetWifi != 1) { Deliver.isAppSetWifi = 0; var1.unregisterReceiver(Deliver.this.mMyWifiReceiver); Deliver.this.mMyWifiReceiver = null; WifiManager var3 = (WifiManager)var1.getSystemService(Context.WIFI_SERVICE); if (((ConnectivityManager)var1.getSystemService(Context.CONNECTIVITY_SERVICE)).getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()) { - Logger.i("连接成功 1"); + ICLogger.i("连接成功 1"); Deliver.haveSendH42 = true; Deliver.this.mConnection.connect(Deliver.this.mRuntime.getHost(), Deliver.this.mRuntime.getPort()); Deliver.this.wakeLockWifiSet = false; @@ -562,7 +562,7 @@ public static void sendLocationMSG( String Msg){ Deliver.this.releaseOneWakeLock(); Deliver.WifiListWakeLock = Deliver.WakeLockForGetWifiList(Deliver.this.mRuntime); } else { - Logger.i("连接失败 2-2"); + ICLogger.i("连接失败 2-2"); // ServiceUtil.offerQueue(API.H42(Deliver.this.mRuntime, "3")); Deliver.this.wakeLockWifiSet = false; Deliver.this.releaseOneWakeLock(); diff --git a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java index 81b13b5b..b78e8f89 100644 --- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java +++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java @@ -22,7 +22,7 @@ import com.enqualcomm.support.bean.StringMessage; import com.enqualcomm.support.bean.heartRateStatus; import com.enqualcomm.support.service.base.AbstractInvokeHandlerService; import com.enqualcomm.support.utils.Connection; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.NettyConnection; import com.enqualcomm.support.utils.SimSignalUtil; import com.enqualcomm.support.utils.TimeUtil; @@ -69,12 +69,12 @@ public class HeartRateManager extends AbstractInvokeHandlerService { //因为协议中没有时间变量，所以只能实时传输，如果恰巧没有网络也只能丢弃，有时间变量的话，可以考虑通过deliver的buffer来进行缓存发送 if (connection.isServerConnected()) { connection.send(protocolAPIHelper.genStringMessage("APHT", PPGDATA)); - Logger.i("Send PPG " + PPGDATA); + ICLogger.i("Send PPG " + PPGDATA); } else { - Logger.i("Skip PPG " + PPGDATA); + ICLogger.i("Skip PPG " + PPGDATA); } } else { - Logger.i("PPG Failed for Timeout!"); + ICLogger.i("PPG Failed for Timeout!"); } stopPPG(); } @@ -105,7 +105,7 @@ public class HeartRateManager extends AbstractInvokeHandlerService { if (ppgtestCycle >0){ Config.setPPGTestCycle(runtime.getContextProxy().context,ppgtestCycle); runtime.setPpgTestCycle(Config.getPPGTestCycle(runtime.getContextProxy().context)); - Logger.i("get and set PPGTestCycle "+ppgtestCycle); + ICLogger.i("get and set PPGTestCycle "+ppgtestCycle); } CoreService.getInstance().setHeartRateDetectAlarm(runtime.getPpgTestCycle()); HeartRateManager.this.startPPG(); @@ -160,7 +160,7 @@ public class HeartRateManager extends AbstractInvokeHandlerService { BPL=ICJniUtils.getLowBloodPressure(); isWared = (ICJniUtils.isWeared()==1); isPPGTesting = (ICJniUtils.isPPGStarted()==1 ); - Logger.i("PPG TESTING="+isPPGTesting+", isWared="+isWared+", PPG="+PPG+", BPH="+BPH+", BPL="+BPL); + ICLogger.i("PPG TESTING="+isPPGTesting+", isWared="+isWared+", PPG="+PPG+", BPH="+BPH+", BPL="+BPL); if (isPPGTesting){ if (isWared ) { if (PPG > 0) { @@ -180,7 +180,7 @@ public class HeartRateManager extends AbstractInvokeHandlerService { if (currentStat== heartRateStatus.HEARTRATE_WORKINGSTAT.HEARTRATE_NOTWARED){ notWaredCount--; if( notWaredCount <0){ //没有佩戴次数到限制后，停止检测 - Logger.i("HEARTRATE_NOTWARED 超过时限，取消检测报告！"); + ICLogger.i("HEARTRATE_NOTWARED 超过时限，取消检测报告！"); stopPPG(); } } @@ -202,7 +202,7 @@ public class HeartRateManager extends AbstractInvokeHandlerService { testCount--; if (testCount<0) { - Logger.i("PPG 超过 "+MAX_TESTTIMES+"秒 未能得出结果，取消检测报告！"); + ICLogger.i("PPG 超过 "+MAX_TESTTIMES+"秒 未能得出结果，取消检测报告！"); stopPPG(); } @@ -286,7 +286,7 @@ public class HeartRateManager extends AbstractInvokeHandlerService { // stringBuilder.append(str); // stringBuilder.append("number == "); // stringBuilder.append(str1); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); //do something startPPG(); } @@ -312,7 +312,7 @@ public static void triggerPPGtest(){ String bph = bundle3.getString(key_bph); String bpl = bundle3.getString(key_bpl); if (ppg == null || bph == null || bpl==null || ppg.isEmpty()||bph.isEmpty()||bpl.isEmpty()) { - Logger.i("MSG_WHAT_PPG Data is null or empty ! Skip!"); + ICLogger.i("MSG_WHAT_PPG Data is null or empty ! Skip!"); callback(message.replyTo, Constants.RESULT_ERROR); return true; @@ -321,9 +321,9 @@ public static void triggerPPGtest(){ String PPGDATA = protocolAPIHelper.APHT(ppg,bph,bpl); if (((NettyConnection)connection).isServerConnected()) { connection.send(protocolAPIHelper.genStringMessage("APHT", PPGDATA)); - Logger.i("Send PPG " + PPGDATA); + ICLogger.i("Send PPG " + PPGDATA); } else { - Logger.i("Skip PPG " + PPGDATA); + ICLogger.i("Skip PPG " + PPGDATA); } callback(message.replyTo, Constants.RESULT_OK); diff --git a/app/src/main/java/com/enqualcomm/support/service/Initialize.java b/app/src/main/java/com/enqualcomm/support/service/Initialize.java index d29e6306..0ba8cc40 100644 --- a/app/src/main/java/com/enqualcomm/support/service/Initialize.java +++ b/app/src/main/java/com/enqualcomm/support/service/Initialize.java @@ -10,7 +10,7 @@ import com.enqualcomm.support.service.base.AbstractConnectionService; import com.enqualcomm.support.utils.Connection; import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.utils.DeviceInfoUtil; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.SharPreferenceUtil; import com.enqualcomm.support.utils.SimSignalUtil; @@ -102,15 +102,15 @@ public class Initialize extends AbstractConnectionService { // } if (!hasContacts(paramRuntime)) { // paramConnection.send(API.H06(paramRuntime)); - Logger.i("没有联系人"); + ICLogger.i("没有联系人"); } else { - Logger.i("有联系人"); + ICLogger.i("有联系人"); } // EqcAlgorithmNative.native_EqcAlgorithmMethod3(1); StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("imei_key ="); stringBuilder.append(paramRuntime.IMEI()); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); // paramConnection.send(API.H139(paramRuntime)); this.nextService.processConnectionOpen(paramConnection, paramRuntime); } diff --git a/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java index b09dcd65..a22aac25 100644 --- a/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java +++ b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java @@ -16,7 +16,7 @@ import com.enqualcomm.support.service.base.AbstractConnectionService; import com.enqualcomm.support.utils.AlarmHelper; import com.enqualcomm.support.utils.AlarmWakeUp; import com.enqualcomm.support.utils.Connection; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.NettyConnection; import com.enqualcomm.support.utils.NetworkObservable; import com.enqualcomm.support.utils.ServiceUtil; @@ -84,7 +84,7 @@ public class KeepAlive extends AbstractConnectionService { public void onAlarmClock(Connection paramConnection, Runtime paramRuntime) { - Logger.i("onAlarmClock"); + ICLogger.i("onAlarmClock"); long l = SystemClock.elapsedRealtime(); @@ -93,7 +93,7 @@ public class KeepAlive extends AbstractConnectionService { // StringBuilder stringBuilder = new StringBuilder(); // stringBuilder.append("重连"); // stringBuilder.append(isConnected); -// Logger.i(stringBuilder.toString()); +// ICLogger.i(stringBuilder.toString()); // if (!isConnected && this.firstReConnected) { // this.reConnectionNumber++; // this.firstReConnected = false; @@ -117,7 +117,7 @@ public class KeepAlive extends AbstractConnectionService { stringBuilder.append(param1Integer); stringBuilder.append(",,first="); stringBuilder.append(this.first); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); if (param1Integer.intValue() > 0) { if (this.first) { this.first = false; @@ -145,7 +145,7 @@ public class KeepAlive extends AbstractConnectionService { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("onConnectionClose="); stringBuilder.append(",set KeepAlive isConnected = false"); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); LauncherCtrl.getInstance(this.mContext).setStatusBarIcon("server_connected", STATUS_BAR_STATE_SERVER_CONNECTED_OFF); //网络断开后，重连成功后发送一个定位 // CoreService.needLocateInAfterHeartBeat=true; @@ -160,7 +160,7 @@ public class KeepAlive extends AbstractConnectionService { stringBuilder.append(",sInSleepMode ="); stringBuilder.append(isInSleepMode); stringBuilder.append(",set KeepAlive isConnected = true"); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); // if (!connectionError) { connectionError = false; @@ -194,7 +194,7 @@ public class KeepAlive extends AbstractConnectionService { } public void onHeartAlarm(NettyConnection paramNettyConnection, Runtime paramRuntime) { - Logger.i("onHeartAlarm"); + ICLogger.i("onHeartAlarm"); // UpdateHeartBeatTimeout(); // if (this.reCycleTimes == 0 && this.currentReConnectInterval != 11){ // paramNettyConnection.send(protocolAPIHelper.genStringMessage("AP00",protocolAPIHelper.AP00(paramRuntime))); diff --git a/app/src/main/java/com/enqualcomm/support/service/SendChatMessage.java b/app/src/main/java/com/enqualcomm/support/service/SendChatMessage.java index fbeda2bd..bdaab221 100644 --- a/app/src/main/java/com/enqualcomm/support/service/SendChatMessage.java +++ b/app/src/main/java/com/enqualcomm/support/service/SendChatMessage.java @@ -12,7 +12,7 @@ import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.bean.VoiceContent; import com.enqualcomm.support.service.base.AbstractInvokeHandlerService; import com.enqualcomm.support.utils.Connection; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.NettyConnection; import com.enqualcomm.support.utils.SimSignalUtil; import com.enqualcomm.support.utils.TimeUtil; @@ -58,10 +58,10 @@ public class SendChatMessage extends AbstractInvokeHandlerService { // bool = (new File(uri1).delete(); // } // if (bool) { -// Logger.i("删除成功"); +// ICLogger.i("删除成功"); // return; // } -// Logger.i("删除失败"); +// ICLogger.i("删除失败"); } public void onAlarmClock(Connection paramConnection, Runtime paramRuntime) {} @@ -84,14 +84,14 @@ public class SendChatMessage extends AbstractInvokeHandlerService { stringBuilder.append(str); stringBuilder.append("number == "); stringBuilder.append(str1); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); // final PictureContent pictureContent = PictureContent.placeHolderOut(1, str1, str); // final Uri uri = runtime.getDbHelper().insertOrUpdate(pictureContent, 0L); // Observable.create(new SendFileMessage(API.H30(paramRuntime, str1, "2", new File(str)), paramRuntime)).subscribeOn(Schedulers.io()).subscribe(new Subscriber() { // public void onCompleted() {} // // public void onError(Throwable param1Throwable) { -// Logger.i("发送失败"); +// ICLogger.i("发送失败"); //// this.val$pictureContent.status = 5; // runtime.getDbHelper().updateMessage(pictureContent, uri); // } @@ -100,7 +100,7 @@ public class SendChatMessage extends AbstractInvokeHandlerService { // StringBuilder stringBuilder = new StringBuilder(); // stringBuilder.append("发送成功:"); // stringBuilder.append(param1String); -// Logger.i(stringBuilder.toString()); +// ICLogger.i(stringBuilder.toString()); // this.val$pictureContent.status = 3; // this.val$pictureContent.serverTime = TimeUtil.getSystemTime3(); // this.val$pictureContent.content = Util.cutFile(this.val$pictureContent.content, runtime.getCacheDir()); @@ -111,14 +111,14 @@ public class SendChatMessage extends AbstractInvokeHandlerService { return true; } } else if (!"SYNC".equals(str) && "com.enqualcomm.imessage.ACTION_ADDTEST_CONTACTS".equals(str)) { - Logger.i("添加测试人员名单"); + ICLogger.i("添加测试人员名单"); } return false; } public boolean onUserRequest(Message paramMessage, Connection paramConnection, final Runtime runtime) { - Logger.i("=============received Message What="+paramMessage.what); + ICLogger.i("=============received Message What="+paramMessage.what); int i = 1; switch (paramMessage.what) { default: @@ -130,7 +130,7 @@ public class SendChatMessage extends AbstractInvokeHandlerService { String filepath = bundle.getString("filepath"); String number = bundle.getString("number"); int category = bundle.getInt("category", -1); - Logger.i(" msg.what 101 category="+category+", filepath="+filepath+",number="+number); + ICLogger.i(" msg.what 101 category="+category+", filepath="+filepath+",number="+number); if (filepath == null || number == null || category == -1) diff --git a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java index bcc296a2..c1a7763c 100644 --- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java +++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java @@ -27,7 +27,7 @@ import com.enqualcomm.support.service.base.AbstractInvokeHandlerService; import com.enqualcomm.support.utils.AlarmHelper; import com.enqualcomm.support.utils.Connection; import com.enqualcomm.support.utils.DBHelper; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.MissedCallContentObserver; import com.enqualcomm.support.utils.SharPreferenceUtil; import com.enqualcomm.support.utils.TimeUtil; @@ -49,7 +49,7 @@ public class SilentManager extends AbstractInvokeHandlerService { Connection mConnection; ContentObserver mContentObserver = new ContentObserver(new Handler()) { public void onChange(boolean var1) { - Logger.i("静默有变化"); + ICLogger.i("静默有变化"); SilentManager.this.silentList = SilentManager.this.querySilent(); SilentManager.this.getSilentListStartAndEndTime(); SilentManager.this.handleSilent(SilentManager.this.mRuntime, true); @@ -282,7 +282,7 @@ public class SilentManager extends AbstractInvokeHandlerService { StringBuilder var5 = new StringBuilder(); var5.append("inSilent="); var5.append(var4); - Logger.i(var5.toString()); + ICLogger.i(var5.toString()); if (!this.mInSilent && var4) { this.onSilentStateChange(true); this.handSilence(this.mContext, true); @@ -344,7 +344,7 @@ public class SilentManager extends AbstractInvokeHandlerService { var8.append(var11); var8.append("minute+"); var8.append(var5); - Logger.i(var8.toString()); + ICLogger.i(var8.toString()); } var9 = var6.endTimeMillis - var2; @@ -357,7 +357,7 @@ public class SilentManager extends AbstractInvokeHandlerService { var8.append(var11); var8.append("minute+"); var8.append(var5); - Logger.i(var8.toString()); + ICLogger.i(var8.toString()); } if (var6.startTimeMillis <= var2 && var6.endTimeMillis > var2) { @@ -405,7 +405,7 @@ public class SilentManager extends AbstractInvokeHandlerService { var13.append(var11); var13.append("minute+"); var13.append(var4); - Logger.i(var13.toString()); + ICLogger.i(var13.toString()); } var9 = var12.endTimeMillis - var1; @@ -418,7 +418,7 @@ public class SilentManager extends AbstractInvokeHandlerService { var13.append(var11); var13.append("minute+"); var13.append(var4); - Logger.i(var13.toString()); + ICLogger.i(var13.toString()); } if (var12.startTimeMillis <= var1 && var12.endTimeMillis > var1) { @@ -696,7 +696,7 @@ public class SilentManager extends AbstractInvokeHandlerService { } } } else { - Logger.i("静默闹钟来了"); + ICLogger.i("静默闹钟来了"); boolean var4; if (!"com.eqc.heartrate.action.SILENT_START".equals(var11) && !"com.enqualcomm.support.OTHER_HEARTRATE_ALARM_START".equals(var11)) { var4 = false; @@ -728,7 +728,7 @@ public class SilentManager extends AbstractInvokeHandlerService { StringBuilder var3 = new StringBuilder(); var3.append("action = "); var3.append(var6); - Logger.i(var3.toString()); + ICLogger.i(var3.toString()); if ("com.enqualcomm.support.ACTION_NOTICE_ALARM_CHANGE".equals(var6)) { SilentManager.this.voiceNotice = SilentManager.this.queryNotice(); } else if ("com.enqualcomm.support.ACTION_ALARM_ALARM_CHANGE".equals(var6)) { diff --git a/app/src/main/java/com/enqualcomm/support/service/SynchronousTime.java b/app/src/main/java/com/enqualcomm/support/service/SynchronousTime.java index f12d74a8..30bb6894 100644 --- a/app/src/main/java/com/enqualcomm/support/service/SynchronousTime.java +++ b/app/src/main/java/com/enqualcomm/support/service/SynchronousTime.java @@ -7,7 +7,7 @@ import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.bean.StringMessage; import com.enqualcomm.support.service.base.AbstractConnectionService; import com.enqualcomm.support.utils.Connection; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.NettyConnection; import com.enqualcomm.support.utils.TimeUtil; import com.enqualcomm.support.bean.Runtime; @@ -21,7 +21,7 @@ public class SynchronousTime extends AbstractConnectionService { private void getCoder() { // if (CoderFactory.getCoderFactoryInstance().getCoder() != null) -// Logger.i("成功获取"); +// ICLogger.i("成功获取"); } private void setDateAndTime(long paramLong) { @@ -29,7 +29,7 @@ public class SynchronousTime extends AbstractConnectionService { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("设置时间"); stringBuilder.append(TimeUtil.getSystemTime()); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); } public void onAlarmClock(Connection paramConnection, Runtime paramRuntime) {} @@ -51,7 +51,7 @@ public class SynchronousTime extends AbstractConnectionService { // StringBuilder stringBuilder = new StringBuilder(); // stringBuilder.append("成功返回"); // stringBuilder.append(str); -// Logger.i(stringBuilder.toString()); +// ICLogger.i(stringBuilder.toString()); // str = str.substring(5); // str = str.substring(0, str.length() - 1); // SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd,HH:mm:ss"); @@ -64,7 +64,7 @@ public class SynchronousTime extends AbstractConnectionService { // stringBuilder1.append(l1); // stringBuilder1.append("---localTime="); // stringBuilder1.append(l2); -// Logger.i(stringBuilder1.toString()); +// ICLogger.i(stringBuilder1.toString()); // if (Math.abs(l1 - l2) > 60000L) { // setDateAndTime(l1); // return false; diff --git a/app/src/main/java/com/enqualcomm/support/service/UpLoadDataPoints.java b/app/src/main/java/com/enqualcomm/support/service/UpLoadDataPoints.java index 4ec24f98..1ed34dab 100644 --- a/app/src/main/java/com/enqualcomm/support/service/UpLoadDataPoints.java +++ b/app/src/main/java/com/enqualcomm/support/service/UpLoadDataPoints.java @@ -9,7 +9,7 @@ import com.enqualcomm.support.bean.Locations; import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.service.base.AbstractInvokeHandlerService; import com.enqualcomm.support.utils.Connection; -import com.enqualcomm.support.utils.Logger; +import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.SharPreferenceUtil; import org.json.JSONArray; @@ -57,7 +57,7 @@ public class UpLoadDataPoints extends AbstractInvokeHandlerService { stringBuilder.append(this.mUpLoadSuccess); stringBuilder.append("reLoadNum="); stringBuilder.append(this.reLoadNum); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); } } @@ -71,7 +71,7 @@ public class UpLoadDataPoints extends AbstractInvokeHandlerService { stringBuilder.append(str2); stringBuilder.append("device_key="); stringBuilder.append(str1); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); paramRuntime.setDevice_key(str1); paramRuntime.setDevice_id(str2); } diff --git a/app/src/main/java/com/enqualcomm/support/utils/APNUtil.java b/app/src/main/java/com/enqualcomm/support/utils/APNUtil.java index e283f4af..52d61f2e 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/APNUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/APNUtil.java @@ -34,9 +34,9 @@ public class APNUtil { String user=c.getString(c.getColumnIndex("user")); String pwd=c.getString(c.getColumnIndex("password")); APNSTR="Current APN "+id+","+mcc+","+mnc+","+name+","+apnname+","+user+","+pwd; - Logger.i(APNSTR); + ICLogger.i(APNSTR); } else { - Logger.i("APN不存在"); + ICLogger.i("APN不存在"); return "APN 不存在"; } return APNSTR; @@ -44,7 +44,7 @@ public class APNUtil { public static boolean addVPN(String apnName, String apn, String mcc,String mnc , String user,String passwd,Context context) { if (checkAPN(mcc,mnc,apn,context)==true){ - Logger.i("VPN 已经存在，不需要添加！"); + ICLogger.i("VPN 已经存在，不需要添加！"); return false; } //添加新的APN到系统 @@ -56,11 +56,11 @@ public class APNUtil { boolean isAddSuccess = checkAPN(mcc,mnc,apn,context); if (isAddSuccess) { - Logger.i("APN 添加成功！"); + ICLogger.i("APN 添加成功！"); return true; // Toast.makeText(NewAPNActivity.this, "新增APN成功", Toast.LENGTH_SHORT).show(); } else { - Logger.i("APN 添加失败！"); + ICLogger.i("APN 添加失败！"); return false; // Toast.makeText(NewAPNActivity.this, "新增APN失败", Toast.LENGTH_SHORT).show(); } @@ -87,7 +87,7 @@ public class APNUtil { public static int AddNewApn(String apnName,String apn, String mcc,String mnc , String user,String passwd, Context context) { - Logger.i("添加一个新的apn ==> "+apnName+", mcc="+mcc+", mnc="+mnc+", user="+user+", password="+passwd); + ICLogger.i("添加一个新的apn ==> "+apnName+", mcc="+mcc+", mnc="+mnc+", user="+user+", password="+passwd); int apnId = -1; ContentResolver resolver = context.getContentResolver(); ContentValues values = new ContentValues(); diff --git a/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java b/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java index 74204990..cdd566c4 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java +++ b/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java @@ -86,7 +86,7 @@ public class AlarmHelper { stringBuilder.append(23); stringBuilder.append(",kitkat="); stringBuilder.append(19); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); if (Build.VERSION.SDK_INT >= 19) { alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, l + (minutes * 60 * 1000), pendingIntent); return; @@ -108,7 +108,7 @@ public class AlarmHelper { stringBuilder.append(23); stringBuilder.append(",kitkat="); stringBuilder.append(19); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); if (Build.VERSION.SDK_INT >= 19) { alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, l + (seconds * 1000), pendingIntent); return; diff --git a/app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java b/app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java index 0b0a321f..cb163b99 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java +++ b/app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java @@ -30,7 +30,7 @@ public class AlarmWakeUp { stringBuilder.append(l); stringBuilder.append("---lastAlarmTime="); stringBuilder.append(lastAlarmTime); - Logger.i("AlarmWakeUp "+ stringBuilder.toString()); + ICLogger.i("AlarmWakeUp "+ stringBuilder.toString()); if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(runtime.getCacheDir(), "alarmWakeUp", stringBuilder.toString()); } } diff --git a/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java b/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java index 8698d542..0edad1b3 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java @@ -34,7 +34,7 @@ public class BatteryUtil { // 当前电池电压 int batteryVolt = param1Intent.getIntExtra(EXTRA_VOLTAGE, -1); BatteryUtil.this.mRuntime.setBatteryVoltage(batteryVolt); - Logger.i("BatteryLevel "+i + " BatteryVotage "+batteryVolt); + ICLogger.i("BatteryLevel "+i + " BatteryVotage "+batteryVolt); if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(mRuntime.getCacheDir(),"Battery","BatteryLevel "+i + " BatteryVotage "+batteryVolt); if (i >= 100) { Runtime runtime = BatteryUtil.this.mRuntime; @@ -92,7 +92,7 @@ public class BatteryUtil { } if ("android.intent.action.BATTERY_LOW".equals(param1Intent.getAction())) { BatteryUtil.this.mRuntime.setBatteryLow(true); - Logger.i("lowbattery finish video_end_call"); + ICLogger.i("lowbattery finish video_end_call"); mRuntime.setAlarmType(false,mRuntime.getBatteryLow(),false,false); //trigger AP10 报警定位 diff --git a/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java b/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java index dbe360a3..ae29a78a 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java @@ -27,7 +27,7 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("format="); stringBuilder.append(CameraUtil.this.mPs.getPictureFormat()); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); if (CameraUtil.this.mPs.getPictureFormat() == 256) { String str = CameraUtil.this.savePicture(param1ArrayOfByte); if (str != null) { @@ -37,7 +37,7 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener { intent.putExtra("number", CameraUtil.this.mNumber); CameraUtil.this.context.startService(intent); } else { - Logger.i("空间不足,保存失败"); + ICLogger.i("空间不足,保存失败"); } } CameraUtil.this.releaseCamera(); @@ -53,7 +53,7 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener { private Camera.Parameters mPs; private Camera.ShutterCallback shutterCallback = new Camera.ShutterCallback() { - public void onShutter() { Logger.i("shutterCallback"); } + public void onShutter() { ICLogger.i("shutterCallback"); } }; private SurfaceTexture surfaceTexture; @@ -122,7 +122,7 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener { bufferedOutputStream.flush(); bufferedOutputStream.close(); - Logger.i("Take Photo and Save to "+str); + ICLogger.i("Take Photo and Save to "+str); } return str; } catch (Exception e) { @@ -138,10 +138,10 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener { this.mCamera.setPreviewDisplay(surfaceView.getHolder()); this.mPs = this.mCamera.getParameters(); this.mPs.setPictureSize(640, 480); - Logger.i("CameraUtil---setCameraDisplayOrientation"); + ICLogger.i("CameraUtil---setCameraDisplayOrientation"); setCameraDisplayOrientation(paramContext, 0, this.mCamera); this.mCamera.setParameters(this.mPs); - Logger.i("CameraUtil---startPreview"); + ICLogger.i("CameraUtil---startPreview"); this.surfaceTexture = new SurfaceTexture(10); this.surfaceTexture.setOnFrameAvailableListener(this); this.mCamera.setPreviewTexture(this.surfaceTexture); @@ -173,7 +173,7 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("getDisplayRotation rotation="); stringBuilder.append(i); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); switch (i) { default: return 0; @@ -195,7 +195,7 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener { this.mNumber = paramString; } - public void onFrameAvailable(SurfaceTexture paramSurfaceTexture) { Logger.i("onFrameAvailable"); } + public void onFrameAvailable(SurfaceTexture paramSurfaceTexture) { ICLogger.i("onFrameAvailable"); } public void setCameraDisplayOrientation(Context paramContext, int paramInt, Camera paramCamera) { Camera.CameraInfo cameraInfo = new Camera.CameraInfo(); diff --git a/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java b/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java index 27b2877f..31b8e553 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java @@ -37,7 +37,7 @@ public class CellInfoUtil { super.handleMessage(param1Message); if (param1Message.what != 100) return; - Logger.i("延时获取基站信息"); + ICLogger.i("延时获取基站信息"); CellInfoUtil.setCurrentAttachCellInfo(mRuntime, mWakeLock); @@ -55,7 +55,7 @@ public class CellInfoUtil { private static void releaseWakeLock(PowerManager.WakeLock paramWakeLock) { if (paramWakeLock == null) { - Logger.i("cellInfo 没有加锁"); + ICLogger.i("cellInfo 没有加锁"); return; } if (GSensorListener.getStepCountOver) { @@ -109,7 +109,7 @@ public class CellInfoUtil { } if (Config.LOG_TOFILE)FileOutputUtil.fileOutput(mRuntime.getCacheDir(),"onCellLocationChanged", mCellInfo); CellInfoUtil.releaseWakeLock(mWakeLock); - Logger.i(" setCurrentAttachCellInfo " + mCellInfo); + ICLogger.i(" setCurrentAttachCellInfo " + mCellInfo); } if (IS2SECOND <= 0) { @@ -135,7 +135,7 @@ public class CellInfoUtil { // EqcAlgorithmNative.native_EqcAlgorithmMethod4(1, 0, CellInfoUtil.BSSS, CellInfoUtil.MCC, CellInfoUtil.MNC, CellInfoUtil.LAC, CellInfoUtil.CELL_ID); if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(mRuntime.getCacheDir(), "onCellLocationChanged", mRuntime.cellinfo); CellInfoUtil.releaseWakeLock(mWakeLock); - Logger.i(" setCurrentAttachCellInfo " + mCellInfo); + ICLogger.i(" setCurrentAttachCellInfo " + mCellInfo); } mRuntime.getLocationInstance().setMNC(String.valueOf(CellInfoUtil.getMNC())); diff --git a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java index edea5e16..7c235782 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java @@ -320,7 +320,7 @@ public class ContextProxy { PowerManager powerManager = (PowerManager)this.context.getSystemService(Context.POWER_SERVICE); try { powerManager.reboot("remote reboot"); - Logger.i("命令重启"); + ICLogger.i("命令重启"); return; } catch (Exception e) { e.printStackTrace(); diff --git a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java index 79ad8ef3..6705d891 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java +++ b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java @@ -82,7 +82,7 @@ public class DBHelper { StringBuilder sb = new StringBuilder(); sb.append("where="); sb.append(where); - Logger.i(sb.toString()); + ICLogger.i(sb.toString()); Cursor cursor = resolver.query(ICContentProvider.CONTACT_URI, (String[])null, where, (String[])null, "CATEGORY ASC"); Iterator contactIT = contactArraylist.iterator(); @@ -106,7 +106,7 @@ public class DBHelper { StringBuilder log = new StringBuilder(); log.append("saveContactsImpl contactList = "); log.append(contactArray.toString()); - Logger.i(log.toString()); + ICLogger.i(log.toString()); StringBuilder where = new StringBuilder("CATEGORY IN ("); if (admin) { where.append(CATEGORY_ADMIN); @@ -157,7 +157,7 @@ public class DBHelper { StringBuilder log1 = new StringBuilder(); log1.append("contact="); log1.append(contact.toString()); - Logger.i(log1.toString()); + ICLogger.i(log1.toString()); } this.cr.bulkInsert(ICContentProvider.CONTACT_URI, contentlist); @@ -240,7 +240,7 @@ public class DBHelper { var6.append(var4); var6.append("weather_index="); var6.append(var7); - Logger.i(var6.toString()); + ICLogger.i(var6.toString()); return true; } else { return false; @@ -362,7 +362,7 @@ public class DBHelper { this.cr.update(var11, var8, (String)null, (String[])null); return var11; } else { - Logger.i("插入"); + ICLogger.i("插入"); return this.insertDownLoadInfo(var1, var2, var3, var4); } } @@ -546,7 +546,7 @@ public class DBHelper { StringBuilder var5 = new StringBuilder(); var5.append("powersave mode ="); var5.append(var1); - Logger.i(var5.toString()); + ICLogger.i(var5.toString()); break; } @@ -799,7 +799,7 @@ public class DBHelper { var4.append(var1.size()); var4.append("stheartRateList="); var4.append(var1.toString()); - Logger.i(var4.toString()); + ICLogger.i(var4.toString()); this.cr.delete(ICContentProvider.STHEART_RATE_URL, (String)null, (String[])null); int var3 = var1.size(); if (var3 != 0) { @@ -867,7 +867,7 @@ public class DBHelper { var3.append(var1.toString()); var3.append("条目="); var3.append(var4); - Logger.i(var3.toString()); + ICLogger.i(var3.toString()); } public void upDateMonitor(final String var1, final String var2) { diff --git a/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java b/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java index 37968af8..70dedfd8 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java @@ -84,7 +84,7 @@ public class DeviceInfoUtil { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("ro.custom.id = "); stringBuilder.append(customid); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); int j = i; if (customid != null) { j = Integer.valueOf(customid).intValue(); @@ -92,7 +92,7 @@ public class DeviceInfoUtil { StringBuilder stringBuilder1 = new StringBuilder(); stringBuilder1.append("---id="); stringBuilder1.append(j); - Logger.i(stringBuilder1.toString()); + ICLogger.i(stringBuilder1.toString()); return j; } catch (Exception e) { i = j; @@ -123,7 +123,7 @@ public class DeviceInfoUtil { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("simIsBlocked:"); stringBuilder.append(i); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); } catch (Settings.SettingNotFoundException e) { e.printStackTrace(); } diff --git a/app/src/main/java/com/enqualcomm/support/utils/DnsUtil.java b/app/src/main/java/com/enqualcomm/support/utils/DnsUtil.java index 90214afc..bd01b615 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/DnsUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/DnsUtil.java @@ -46,7 +46,7 @@ public class DnsUtil { Thread.currentThread().setName("Task Pool"); - Logger.log("TAG", "任务开始"); + ICLogger.log("TAG", "任务开始"); model.taskStartTime = System.currentTimeMillis(); model.taskID = ++ID_NUMBER; @@ -112,7 +112,7 @@ public class DnsUtil { // model.taskStopTime = System.currentTimeMillis(); // model.taskExpendTime = model.taskStopTime - model.taskStartTime ; - Logger.log("TAG", "任务结束"); + ICLogger.log("TAG", "任务结束"); call.call(); } catch (Exception e) { @@ -122,7 +122,7 @@ public class DnsUtil { } catch (Exception e) { - Logger.log("TAG", "任务失败"); + ICLogger.log("TAG", "任务失败"); e.printStackTrace(); } @@ -178,14 +178,14 @@ public class DnsUtil { Callable call = new Callable() { @Override public DNSTaskModel call() throws Exception { - Logger.i("get "+temp.url+" "+temp.domainIp+" , DnsCacheIP "+temp.hostIp); + ICLogger.i("get "+temp.url+" "+temp.domainIp+" , DnsCacheIP "+temp.hostIp); return temp; } }; runTask(temp, call); String ip; -// Logger.i(temp.toString()); +// ICLogger.i(temp.toString()); if (temp.domainIp!=null){ if (temp.hostIp!=null){ ip=temp.hostIp.toString(); diff --git a/app/src/main/java/com/enqualcomm/support/utils/Logger.java b/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java similarity index 67% rename from app/src/main/java/com/enqualcomm/support/utils/Logger.java rename to app/src/main/java/com/enqualcomm/support/utils/ICLogger.java index 6b6514b5..72f73e5e 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/Logger.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java @@ -5,7 +5,13 @@ import android.util.Log; import com.enqualcomm.support.Config; import com.enqualcomm.support.CoreService; -public class Logger { +import org.apache.log4j.Level; +import org.apache.log4j.Logger; + +public class ICLogger { + + private static Logger Log = Logger.getLogger(ICLogger.class); +// private static java.util.logging.Logger originLog= java.util.logging.Logger.getLogger(ICLogger.class.getSimpleName()); private static final boolean DEBUG = true; //BuildConfig.DEBUG; private static String getFunctionName() { StackTraceElement[] currentStack = Thread.currentThread().getStackTrace(); @@ -16,7 +22,7 @@ public class Logger { for(int i = 0; i < stackLen; ++i) { StackTraceElement stackElement = currentStack[i]; - if (!stackElement.isNativeMethod() && !stackElement.getClassName().equals(Thread.class.getName()) && !stackElement.getClassName().equals(Logger.class.getName())) { + if (!stackElement.isNativeMethod() && !stackElement.getClassName().equals(Thread.class.getName()) && !stackElement.getClassName().equals(ICLogger.class.getName())) { StringBuilder sb = new StringBuilder(); sb.append("[ "); sb.append(Thread.currentThread().getName()); @@ -68,10 +74,11 @@ public class Logger { } public static void log(String TAG, String msg) { if (DEBUG) { - Log.e(TAG, msg); - if (CoreService.getInstance()!=null) { - if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(CoreService.getInstance().getRuntime().getCacheDir(), "log", TAG + " " + msg); - } + Log.error(TAG+ " "+msg); +// originLog.warning(TAG+msg); +// if (CoreService.getInstance()!=null) { +// if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(CoreService.getInstance().getRuntime().getCacheDir(), "logic", TAG + " " + msg); +// } } @@ -79,10 +86,11 @@ public class Logger { public static void log(String TAG,String funcName, String msg) { if (DEBUG) { - Log.e(TAG, "[" + funcName + "]" + msg); - if (CoreService.getInstance()!=null) { - if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(CoreService.getInstance().getRuntime().getCacheDir(), "log", TAG + " " + "[" + funcName + "]" + msg); - } + Log.error(TAG+ " [" + funcName + "]" + msg); +// originLog.warning(TAG+ "[" + funcName + "]" + msg); +// if (CoreService.getInstance()!=null) { +// if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(CoreService.getInstance().getRuntime().getCacheDir(), "logic", TAG + " " + "[" + funcName + "]" + msg); +// } } } } diff --git a/app/src/main/java/com/enqualcomm/support/utils/MissedCallContentObserver.java b/app/src/main/java/com/enqualcomm/support/utils/MissedCallContentObserver.java index b040d209..baf1a0c4 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/MissedCallContentObserver.java +++ b/app/src/main/java/com/enqualcomm/support/utils/MissedCallContentObserver.java @@ -29,7 +29,7 @@ public class MissedCallContentObserver extends ContentObserver { var4.append(var5.contact.number); var4.append(", date: "); var4.append(var5.date); - Logger.i(var4.toString()); + ICLogger.i(var4.toString()); var2 = MissedCallContentObserver.this.mRuntime.getContextProxy().getTelephonyManager().getCallState(); if (MissedCallContentObserver.this.mRuntime.getBatteryLow() || 1 == var2 || 2 == var2) { var3 = false; @@ -71,19 +71,19 @@ public class MissedCallContentObserver extends ContentObserver { if (var2.moveToFirst()) { switch(var2.getInt(var2.getColumnIndex("type"))) { case 1: - Logger.i("incoming type"); + ICLogger.i("incoming type"); break; case 2: - Logger.i("outgoing type"); + ICLogger.i("outgoing type"); break; case 3: - Logger.i("missed type"); + ICLogger.i("missed type"); if (var2.getInt(var2.getColumnIndex("new")) == 1) { String var3 = var2.getString(var2.getColumnIndex("number")); var2.getString(var2.getColumnIndex("name")); long var4 = var2.getLong(var2.getColumnIndex("date")); if (!this.checkSameItem(var4)) { - Logger.i(" not the same missed!"); + ICLogger.i(" not the same missed!"); this.mMissedCallDate = var4; Date var6 = new Date(var4); (new SimpleDateFormat("yyyy-MM-dd;HH:mm:ss")).format(var6); @@ -92,7 +92,7 @@ public class MissedCallContentObserver extends ContentObserver { StringBuilder var7 = new StringBuilder(); var7.append("cursor1.size = "); var7.append(var13.getCount()); - Logger.i(var7.toString()); + ICLogger.i(var7.toString()); while(var13.moveToNext()) { String var8 = var13.getString(3); @@ -106,7 +106,7 @@ public class MissedCallContentObserver extends ContentObserver { var12.append(var10); var12.append("...number="); var12.append(var8); - Logger.i(var12.toString()); + ICLogger.i(var12.toString()); new Contact(var9, var10, var3, var14, var11); break; } @@ -114,10 +114,10 @@ public class MissedCallContentObserver extends ContentObserver { var13.close(); } else { - Logger.i("don't know who called"); + ICLogger.i("don't know who called"); } } else { - Logger.i(" The same missed call, ignore it!"); + ICLogger.i(" The same missed call, ignore it!"); } } } diff --git a/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java b/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java index a44e4e08..6280ce07 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java +++ b/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java @@ -51,21 +51,21 @@ public class NettyConnection implements Connection { //普通非二进制命令用此函数处理 Runtime runtime=CoreService.getInstance().getRuntime(); boolean ret=true; - Logger.i("handleCmd "+type.name() + " strLen="+cmd.length()); + ICLogger.i("handleCmd "+type.name() + " strLen="+cmd.length()); if (Config.LOG_TOFILE)FileOutputUtil.fileOutput(CoreService.getInstance().getRuntime().getCacheDir(),"APILog", " recv " + cmd); switch (type){ case BP00: API.handleBP00(cmd); - Logger.i("服务器收到登录包AP00"); + ICLogger.i("服务器收到登录包AP00"); DeliverCMDMessageToSystem("BP00",cmd);//通知下面线程状态变化 break; case BP01: API.handleBP01(cmd); - Logger.i("服务器收到定位AP01"); + ICLogger.i("服务器收到定位AP01"); break; case BP03: API.handleBP03(cmd); - Logger.i("服务器收到心跳包AP03"); + ICLogger.i("服务器收到心跳包AP03"); DeliverCMDMessageToSystem("BP03",cmd);//通知下面线程状态变化 break; @@ -75,12 +75,12 @@ public class NettyConnection implements Connection { break; case BPTM: API.handleBPTM(cmd); - Logger.i("服务器收到校时命令APTM"); + ICLogger.i("服务器收到校时命令APTM"); DeliverCMDMessageToSystem("APTM",cmd);//通知下面线程状态变化 break; case BP85://设置闹钟 API.handleBP85(cmd,NettyConnection.this,runtime); - Logger.i("收到服务器设置闹钟命令BP85"); + ICLogger.i("收到服务器设置闹钟命令BP85"); DeliverCMDMessageToSystem("AP85",cmd);//通知下面线程状态变化 break; case BP33: @@ -103,64 +103,64 @@ public class NettyConnection implements Connection { case BP12: //收到设置SOS号码 API.handleBP12(NettyConnection.this,cmd,runtime); - Logger.i("收到服务器设置SOS号码命令BP12"); + ICLogger.i("收到服务器设置SOS号码命令BP12"); break; case BP14: //收到设置白名单号码 API.handleBP14(NettyConnection.this,cmd,runtime); - Logger.i("收到服务器设置白名单号码命令BP14"); + ICLogger.i("收到服务器设置白名单号码命令BP14"); break; case BP15: API.handleBP15(cmd,NettyConnection.this,runtime); - Logger.i("收到服务器设置定位命令BP15"); + ICLogger.i("收到服务器设置定位命令BP15"); break; case BP17: //收到恢复出厂设置 API.handleBP17(NettyConnection.this,cmd); - Logger.i("收到服务器恢复出厂设置命令BP17"); + ICLogger.i("收到服务器恢复出厂设置命令BP17"); DeliverCMDMessageToSystem("FactoryReset",cmd);//通知下面线程状态变化 break; case BP18: //收到重启 API.handleBP18(NettyConnection.this,cmd); - Logger.i("收到服务器重启命令BP18"); + ICLogger.i("收到服务器重启命令BP18"); DeliverCMDMessageToSystem("Reboot",cmd);//通知下面线程状态变化 break; case BP31: //收到关机 API.handleBP31(NettyConnection.this,cmd); - Logger.i("收到服务器关机命令BP31"); + ICLogger.i("收到服务器关机命令BP31"); DeliverCMDMessageToSystem("poweroff",cmd);//通知下面线程状态变化 break; case BPXL: API.handleBPXL(cmd,NettyConnection.this); - Logger.i("收到服务器心率检测命令"); + ICLogger.i("收到服务器心率检测命令"); HeartRateManager.triggerPPGtest(); break; case BPXY: API.handleBPXY(cmd,NettyConnection.this); - Logger.i("收到服务器血压检测命令"); + ICLogger.i("收到服务器血压检测命令"); HeartRateManager.triggerPPGtest(); break; case BPJZ: API.handleBPJZ(cmd,NettyConnection.this,runtime); - Logger.i("收到服务器血压校准命令"); + ICLogger.i("收到服务器血压校准命令"); break; case BPHT: - Logger.i("服务器收到上传的心率血压"); + ICLogger.i("服务器收到上传的心率血压"); break; case BP84: API.handleBP84(cmd,NettyConnection.this); - Logger.i("收到服务器白名单命令"); + ICLogger.i("收到服务器白名单命令"); break; case BP86: //心率血压周期设置 API.handleBP86(cmd,NettyConnection.this,runtime); -// Logger.i(""); +// ICLogger.i(""); break; case BP89: //心率/血压阀值 @@ -178,12 +178,12 @@ public class NettyConnection implements Connection { //只有需要传递二级制数据的才需要这个函数，目前只有BP28需要 Runtime runtime=CoreService.getInstance().getRuntime(); boolean ret=true; - Logger.i("handleCmd "+type.name() + " "+cmd+" bytelen="+bytes.length ); + ICLogger.i("handleCmd "+type.name() + " "+cmd+" bytelen="+bytes.length ); if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(CoreService.getInstance().getRuntime().getCacheDir(),"APILog", " recv " +new String(bytes)); switch (type) { case BP28: API.handleBP28(NettyConnection.this,cmd, runtime,bytes); - Logger.i("收到服务器语音BP28"); + ICLogger.i("收到服务器语音BP28"); DeliverCMDMessageToSystem("BP28", "");//通知下面线程状态变化 break; } @@ -209,20 +209,20 @@ public class NettyConnection implements Connection { public void connect(final String host, final int port) { long l = SystemClock.elapsedRealtime(); if (host.isEmpty()||host ==null){ - Logger.i("host name error "+host); + ICLogger.i("host name error "+host); return ; } if (l - realtime_old < 3000L ) { - Logger.i("3秒内skip 重连！"); + ICLogger.i("3秒内skip 重连！"); return; } realtime_old = l; - Logger.i("connect1 "+host+":"+port); + ICLogger.i("connect1 "+host+":"+port); // disconnect(); this.executorService.execute(new Runnable() { public void run() { NettyConnection.this.connectImpl(host, port); - Logger.i("connect2"); + ICLogger.i("connect2"); } }); } @@ -275,11 +275,11 @@ public class NettyConnection implements Connection { return true; } private void log(String msg) { - Logger.log(TAG,msg); + ICLogger.log(TAG,msg); } private void log(String funcName, String msg) { - Logger.log(TAG,funcName,msg); + ICLogger.log(TAG,funcName,msg); } @@ -458,12 +458,12 @@ public class NettyConnection implements Connection { public void send(StringMessage paramStringMessage) { sendMsg(paramStringMessage.isFromCache()); - Logger.i(paramStringMessage.isFromCache()); + ICLogger.i(paramStringMessage.isFromCache()); } public boolean sendBlocking(StringMessage paramStringMessage) { - Logger.i(paramStringMessage.isFromCache()); + ICLogger.i(paramStringMessage.isFromCache()); sendMsg(paramStringMessage.isFromCache()); return true; } diff --git a/app/src/main/java/com/enqualcomm/support/utils/NetworkObservable.java b/app/src/main/java/com/enqualcomm/support/utils/NetworkObservable.java index fc250d8f..5e137de9 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/NetworkObservable.java +++ b/app/src/main/java/com/enqualcomm/support/utils/NetworkObservable.java @@ -22,7 +22,7 @@ public class NetworkObservable { var4.append(NetworkObservable.this.network_is_down); var4.append(",network_is_from_no_to_yes="); var4.append(NetworkObservable.this.network_is_from_no_to_yes); - Logger.i(var4.toString()); + ICLogger.i(var4.toString()); if (!KeepAlive.isConnected && !NetworkObservable.this.network_is_from_no_to_yes) { if (NetworkObservable.this.network_is_down) { @@ -39,7 +39,7 @@ public class NetworkObservable { } NetworkObservable.this.network_is_from_no_to_yes = false; } else { - Logger.i("网络断开"); + ICLogger.i("网络断开"); NetworkObservable.this.network_is_from_no_to_yes = true; NetworkObservable.this.objectPublishSubject.onNext(0); } diff --git a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java index e2de82c4..d90fd6b6 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java @@ -89,7 +89,7 @@ public class ProcessReceiver extends BroadcastReceiver { .append(mCustomDialog) .append(" , appid ").append(app_id); - Logger.i(var5.toString()); + ICLogger.i(var5.toString()); if (mCustomDialog != null && mCustomDialog.isShowing() && last_message_name != null && var4 != null && last_message_name.equals(var4) && last_app_id == app_id) { mCustomDialog.dismiss(); } @@ -215,7 +215,7 @@ public class ProcessReceiver extends BroadcastReceiver { // StringBuilder var3x = new StringBuilder(); // var3x.append("msgCount="); // var3x.append(var2x); -// Logger.i(var3x.toString()); +// ICLogger.i(var3x.toString()); // switch(var1x.category) { // case 1: // var6.post(new Runnable() { @@ -230,7 +230,7 @@ public class ProcessReceiver extends BroadcastReceiver { // StringBuilder var2xx = new StringBuilder(); // var2xx.append("setContent="); // var2xx.append(var1x); -// Logger.i(var2xx.toString()); +// ICLogger.i(var2xx.toString()); // ProcessReceiver.this.mCustomNotification = ProcessReceiver.this.mNotificationDialog.setTitle(2131165274, 2131624055, 0).setMessage(var2.name, var2x).setContentMessage(var1x).setLayoutViewClick(new View.OnTouchListener() { // public boolean onTouch(View var1x, MotionEvent var2xx) { // switch(var2xx.getAction()) { @@ -244,7 +244,7 @@ public class ProcessReceiver extends BroadcastReceiver { // if (ProcessReceiver.this.y1 - ProcessReceiver.this.y2 > 50.0F) { // ProcessReceiver.this.mCustomNotification.dismiss(); // } else { -// Logger.i("action up to do "); +// ICLogger.i("action up to do "); // ProcessReceiver.this.mCustomNotification.dismiss(); // ComponentName var8 = new ComponentName("com.enqualcomm.imessage", "com.enqualcomm.imessage.ui.chat.ChatActivity_"); // Intent var6x = new Intent("android.intent.action.MAIN"); @@ -339,7 +339,7 @@ public class ProcessReceiver extends BroadcastReceiver { // StringBuilder var2xx = new StringBuilder(); // var2xx.append("setContent="); // var2xx.append(var1x); -// Logger.i(var2xx.toString()); +// ICLogger.i(var2xx.toString()); // ProcessReceiver.this.mCustomNotification = ProcessReceiver.this.mNotificationDialog.setTitle(2131165268, 2131624051, 0).setMessage(var2.name, 0).setContentMessage(var1x).setLayoutViewClick(new View.OnTouchListener() { // public boolean onTouch(View var1x, MotionEvent var2xx) { // switch(var2xx.getAction()) { @@ -353,7 +353,7 @@ public class ProcessReceiver extends BroadcastReceiver { // if (ProcessReceiver.this.y1 - ProcessReceiver.this.y2 > 50.0F) { // ProcessReceiver.this.mCustomNotification.dismiss(); // } else { -// Logger.i("action up to do "); +// ICLogger.i("action up to do "); // ProcessReceiver.this.mCustomNotification.dismiss(); // // Exception var10000; @@ -453,7 +453,7 @@ public class ProcessReceiver extends BroadcastReceiver { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("action=="); stringBuilder.append(str); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); if (STEP_COUNT_ALARM_ACTION.equals(str)) { ICJniUtils.resetStepCount(); AlarmHelper.setCleanStepCountAlarm(paramContext, 23, 59, STEP_COUNT_ALARM_ACTION); diff --git a/app/src/main/java/com/enqualcomm/support/utils/RxSocket.java b/app/src/main/java/com/enqualcomm/support/utils/RxSocket.java index 55bc205a..15489fe1 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/RxSocket.java +++ b/app/src/main/java/com/enqualcomm/support/utils/RxSocket.java @@ -105,7 +105,7 @@ public class RxSocket { @Override public void call(Subscriber subscriber) { - Logger.log(TAG,"connectRx:"+"status:"+socketStatus.name()); + ICLogger.log(TAG,"connectRx:"+"status:"+socketStatus.name()); //正在连接 if (socketStatus == SocketStatus.CONNECTING) { @@ -122,19 +122,19 @@ public class RxSocket { try { selector.close(); } catch (Exception e) { - Logger.log(TAG,"selector.close"); + ICLogger.log(TAG,"selector.close"); } if (selectionKey!=null) try { selectionKey.cancel(); } catch (Exception e) { - Logger.log(TAG,"selectionKey.cancel"); + ICLogger.log(TAG,"selectionKey.cancel"); } if (socketChannel!=null) try { socketChannel.close(); } catch (Exception e) { - Logger.log(TAG,"socketChannel.close"); + ICLogger.log(TAG,"socketChannel.close"); } //重启Socket @@ -145,7 +145,7 @@ public class RxSocket { socketReconnectCallback = new SocketReconnectCallback() { @Override public void onSuccess() { - Logger.log( TAG, "connectRx:" + "CONNECTED"); + ICLogger.log( TAG, "connectRx:" + "CONNECTED"); socketStatus = SocketStatus.CONNECTED; subscriber.onNext(true); subscriber.onCompleted(); @@ -153,7 +153,7 @@ public class RxSocket { @Override public void onFail(String msg) { - Logger.log( TAG, "connectRx:" + msg); + ICLogger.log( TAG, "connectRx:" + msg); subscriber.onNext(false); subscriber.onCompleted(); } @@ -191,19 +191,19 @@ public class RxSocket { try { selector.close(); } catch (Exception e) { - Logger.log(TAG,"selector.close"); + ICLogger.log(TAG,"selector.close"); } if (selectionKey!=null) try { selectionKey.cancel(); } catch (Exception e) { - Logger.log(TAG,"selectionKey.cancel"); + ICLogger.log(TAG,"selectionKey.cancel"); } if (socketChannel!=null) try { socketChannel.close(); } catch (Exception e) { - Logger.log(TAG,"socketChannel.close"); + ICLogger.log(TAG,"socketChannel.close"); } subscriber.onNext(true); subscriber.onCompleted(); @@ -235,7 +235,7 @@ public class RxSocket { @Override public void call(Subscriber subscriber) { if (socketStatus != SocketStatus.CONNECTED) { - Logger.log( TAG, "write." + "SocketStatus.DISCONNECTED"); + ICLogger.log( TAG, "write." + "SocketStatus.DISCONNECTED"); subscriber.onNext(false); subscriber.onCompleted(); } @@ -244,24 +244,24 @@ public class RxSocket { try { int result = socketChannel.write(buffer); if (result<0) { - Logger.log( TAG, "write." + "发送出错"); + ICLogger.log( TAG, "write." + "发送出错"); subscriber.onNext(false); subscriber.onCompleted(); } else { - Logger.log( TAG, "write." + "success!"); + ICLogger.log( TAG, "write." + "success!"); subscriber.onNext(true); subscriber.onCompleted(); } } catch (Exception e) { - Logger.log(TAG,"write exception ."+e.getMessage()); + ICLogger.log(TAG,"write exception ."+e.getMessage()); e.printStackTrace(); subscriber.onNext(false); subscriber.onCompleted(); } } else { - Logger.log(TAG,"write."+"close"); + ICLogger.log(TAG,"write."+"close"); subscriber.onNext(false); subscriber.onCompleted(); } @@ -291,7 +291,7 @@ public class RxSocket { } @Override public void run() { - Logger.log(TAG,"ReadThread:"+"start"); + ICLogger.log(TAG,"ReadThread:"+"start"); while (isReadThreadAlive) { //连接 if (socketStatus == SocketStatus.DIS_CONNECT) { @@ -310,7 +310,7 @@ public class RxSocket { isReadThreadAlive = false; socketStatus = SocketStatus.DIS_CONNECT; connectStatus.onNext(SocketStatus.DIS_CONNECT); - Logger.log( TAG, "ReadThread:init exception:" + e); + ICLogger.log( TAG, "ReadThread:init exception:" + e); e.printStackTrace(); if (socketReconnectCallback!=null) socketReconnectCallback.onFail("SocketConnectFail1"); @@ -339,7 +339,7 @@ public class RxSocket { isReadThreadAlive = false; socketStatus = SocketStatus.DIS_CONNECT; connectStatus.onNext(SocketStatus.DIS_CONNECT); - Logger.log( TAG, "ReadThread:finish exception:" + e); + ICLogger.log( TAG, "ReadThread:finish exception:" + e); e.printStackTrace(); if (socketReconnectCallback!=null) socketReconnectCallback.onFail("SocketConnectFail2"); @@ -350,7 +350,7 @@ public class RxSocket { ByteBuffer buf = ByteBuffer.allocate(10000); int length = socketChannel.read(buf); if (length <= 0) { - Logger.log( TAG, "服务器主动断开链接！"); + ICLogger.log( TAG, "服务器主动断开链接！"); isReadThreadAlive = false; socketStatus = SocketStatus.DIS_CONNECT; connectStatus.onNext(SocketStatus.DIS_CONNECT); @@ -358,7 +358,7 @@ public class RxSocket { socketReconnectCallback.onFail("SocketConnectFail3"); } else { - Logger.log( TAG, "readSubject:msg！"+ "length:" + length); + ICLogger.log( TAG, "readSubject:msg！"+ "length:" + length); byte[] bytes = new byte[length]; for (int i = 0; i < length; i++) { bytes[i] = buf.get(i); @@ -374,7 +374,7 @@ public class RxSocket { isReadThreadAlive = false; socketStatus = SocketStatus.DIS_CONNECT; connectStatus.onNext(SocketStatus.DIS_CONNECT); - Logger.log( TAG, "ReadThread:read exception :" + e); + ICLogger.log( TAG, "ReadThread:read exception :" + e); e.printStackTrace(); if (socketReconnectCallback!=null) socketReconnectCallback.onFail("SocketConnectFail4"); diff --git a/app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java b/app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java index 5c9bb109..1a043d90 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java @@ -60,7 +60,7 @@ public class SimSignalUtil { stringBuilder.append(paramInt1); stringBuilder.append("flag="); stringBuilder.append(paramInt2); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); } public static int getMinSignalStrength(int NetworkType) { byte b2 = -105; @@ -90,7 +90,7 @@ public class SimSignalUtil { result = false; break; } -// Logger.i( result ? "有SIM卡" : "无SIM卡"); +// ICLogger.i( result ? "有SIM卡" : "无SIM卡"); return result; } @@ -101,7 +101,7 @@ public class SimSignalUtil { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("changeNetWorkType="); stringBuilder.append(paramString); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); } /** @@ -210,7 +210,7 @@ public class SimSignalUtil { } intent.putExtra("arg2", ""); ( runtime.getContextProxy()).context.sendBroadcast(intent); - Logger.i("send_at_to_update_lbs "); + ICLogger.i("send_at_to_update_lbs "); } public void setAirMode(String paramString) { diff --git a/app/src/main/java/com/enqualcomm/support/utils/Util.java b/app/src/main/java/com/enqualcomm/support/utils/Util.java index 7d0a2992..6783d340 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/Util.java +++ b/app/src/main/java/com/enqualcomm/support/utils/Util.java @@ -67,7 +67,7 @@ public class Util { } } catch (Exception e) { // e.printStackTrace(); - Logger.i("GetHostIpByName Failed " + host); + ICLogger.i("GetHostIpByName Failed " + host); return null; } return serverip.toString(); @@ -296,7 +296,7 @@ public class Util { Method var11; StringBuilder var12; - Logger.i("connectWifiByReflectMethod road 1"); + ICLogger.i("connectWifiByReflectMethod road 1"); var3 = var2.getClass().getDeclaredMethods(); var4 = var3.length; var11 = null; @@ -331,7 +331,7 @@ public class Util { var12.append("connectWifiByReflectMethod Android "); var12.append(Build.VERSION.SDK_INT); var12.append(" error!"); - Logger.i(var12.toString()); + ICLogger.i(var12.toString()); return null; } @@ -400,7 +400,7 @@ public class Util { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("yls wifi="); stringBuilder.append(state); - Logger.i(stringBuilder.toString()); + ICLogger.i(stringBuilder.toString()); return (state == NetworkInfo.State.DISCONNECTED); } @@ -415,7 +415,7 @@ public class Util { // StringBuilder stringBuilder2 = new StringBuilder(); // stringBuilder2.append("压缩前dataSize="); // stringBuilder2.append(paramFile.length()); -// Logger.i(stringBuilder2.toString()); +// ICLogger.i(stringBuilder2.toString()); // ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); // Bitmap bitmap = BitmapFactory.decodeFile(paramFile.getAbsolutePath()); // bitmap.compress(Bitmap.CompressFormat.JPEG, 80, byteArrayOutputStream); @@ -424,7 +424,7 @@ public class Util { // StringBuilder stringBuilder1 = new StringBuilder(); // stringBuilder1.append("压缩后dataSize="); // stringBuilder1.append(null.length); -// Logger.i(stringBuilder1.toString()); +// ICLogger.i(stringBuilder1.toString()); // return null; // } // return Okio.buffer(Okio.source(null)).readByteArray(); @@ -568,7 +568,7 @@ public class Util { int count= (int)(filesize/1024); if ((filesize%1024)>0) count++; - Logger.i("File "+voiceContent.content+", size "+filesize+", count "+count); + ICLogger.i("File "+voiceContent.content+", size "+filesize+", count "+count); voicePacket.getInstanceSent().clearPacket(); try { FileInputStream fis = new FileInputStream(voicefile); diff --git a/app/src/main/java/com/enqualcomm/support/utils/ftpUtils.java b/app/src/main/java/com/enqualcomm/support/utils/ftpUtils.java index 23c4aa83..68909c07 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ftpUtils.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ftpUtils.java @@ -244,16 +244,16 @@ public class ftpUtils { port = 21; } String[] welcome = client.connect(url.getHost(), port); - Logger.i("welcome = " + welcome.length); + ICLogger.i("welcome = " + welcome.length); //登录验证 client.login(username, password); String path = url.getPath(); - Logger.i("path = " + path); + ICLogger.i("path = " + path); if(path.indexOf(".") != -1){//文件 int index = path.lastIndexOf("/"); String p = path.substring(0, index); String f = path.substring(index + 1); - Logger.i("p = " + p + ", f = " + f); + ICLogger.i("p = " + p + ", f = " + f); client.changeDirectory(p); FTPFile[] ftpFiles = client.list(); for(FTPFile ftpFile : ftpFiles){ diff --git a/app/version_code.properties b/app/version_code.properties index 7c63b588..916a26d5 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Tue Feb 25 15:02:51 CST 2020 -VERSION_CODE=362 +#Sat Feb 29 18:14:15 CST 2020 +VERSION_CODE=364 diff --git a/local.properties b/local.properties index 28f12975..e532068d 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. -#Fri Jan 17 00:04:53 CST 2020 -sdk.dir=C\:\\Users\\Admin\\AppData\\Local\\Android\\Sdk +#Sat Feb 29 15:03:30 CST 2020 +sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk