1、 修复CrashHandler不工作问题,
authorsnickersun <scy@incartech.cn>
Sat, 29 Feb 2020 10:19:07 +0000 (18:19 +0800)
committersnickersun <scy@incartech.cn>
Sat, 29 Feb 2020 10:19:07 +0000 (18:19 +0800)
2、用log4j 重定向日志到 ExternalCacheDir log.txt
3、 修改日志上传功能,增加 crashlog.txt上传
4、编译relelase版本 V364

52 files changed:
app/libs/android-logging-log4j-1.0.3.jar [new file with mode: 0644]
app/libs/log4j-1.2.17.jar [new file with mode: 0644]
app/release/ICSer_V364_2002291814_release.apk [new file with mode: 0644]
app/src/main/AndroidManifest.xml
app/src/main/java/com/enqualcomm/support/BootCompleteReceiver.java
app/src/main/java/com/enqualcomm/support/CoreService.java
app/src/main/java/com/enqualcomm/support/CrashHandler.java
app/src/main/java/com/enqualcomm/support/GSensorListener.java
app/src/main/java/com/enqualcomm/support/ICApplication.java
app/src/main/java/com/enqualcomm/support/ICContentProvider.java
app/src/main/java/com/enqualcomm/support/ICSmsManager.java
app/src/main/java/com/enqualcomm/support/LocationClient.java
app/src/main/java/com/enqualcomm/support/MainActivity.java
app/src/main/java/com/enqualcomm/support/MySqlitOpenHelper.java
app/src/main/java/com/enqualcomm/support/NMEAListener.java
app/src/main/java/com/enqualcomm/support/ParseUpdate.java
app/src/main/java/com/enqualcomm/support/PassData.java
app/src/main/java/com/enqualcomm/support/adapter/LBSHelper.java
app/src/main/java/com/enqualcomm/support/adapter/protocolAPIHelper.java
app/src/main/java/com/enqualcomm/support/bean/DeviceStatus.java
app/src/main/java/com/enqualcomm/support/bean/Runtime.java
app/src/main/java/com/enqualcomm/support/bean/Update.java
app/src/main/java/com/enqualcomm/support/service/AudioService.java
app/src/main/java/com/enqualcomm/support/service/Deliver.java
app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
app/src/main/java/com/enqualcomm/support/service/Initialize.java
app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
app/src/main/java/com/enqualcomm/support/service/SendChatMessage.java
app/src/main/java/com/enqualcomm/support/service/SilentManager.java
app/src/main/java/com/enqualcomm/support/service/SynchronousTime.java
app/src/main/java/com/enqualcomm/support/service/UpLoadDataPoints.java
app/src/main/java/com/enqualcomm/support/utils/APNUtil.java
app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java
app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java
app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java
app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java
app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java
app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java
app/src/main/java/com/enqualcomm/support/utils/DnsUtil.java
app/src/main/java/com/enqualcomm/support/utils/ICLogger.java [moved from app/src/main/java/com/enqualcomm/support/utils/Logger.java with 67% similarity]
app/src/main/java/com/enqualcomm/support/utils/MissedCallContentObserver.java
app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java
app/src/main/java/com/enqualcomm/support/utils/NetworkObservable.java
app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
app/src/main/java/com/enqualcomm/support/utils/RxSocket.java
app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java
app/src/main/java/com/enqualcomm/support/utils/Util.java
app/src/main/java/com/enqualcomm/support/utils/ftpUtils.java
app/version_code.properties
local.properties

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