Explorar o código

1.修改Android Apex Driver Alarm记录日志文件。

Pen Li %!s(int64=7) %!d(string=hai) anos
pai
achega
dd4ce08f5f

+ 14 - 17
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/receiver/ApexDriverAlarmReceiver.java

@@ -1,7 +1,6 @@
 package com.usai.redant.apexdrivers.receiver;
 
 import android.app.AlarmManager;
-import android.app.Application;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -12,8 +11,6 @@ import android.util.Log;
 import com.usai.redant.apexdrivers.ApexDriverApplication;
 import com.usai.redant.rautils.receiver.AlarmReceiver;
 import com.usai.redant.rautils.receiver.RABroadcast;
-import com.usai.redant.rautils.utils.Network;
-import com.usai.redant.rautils.utils.RAUtil;
 import com.usai.redant.rautils.utils.dbgUtil;
 
 import org.json.JSONArray;
@@ -25,7 +22,7 @@ import static com.usai.redant.rautils.utils.Network.RESULT_TRUE;
 public class ApexDriverAlarmReceiver extends AlarmReceiver {
     //负责通过alarm 从后台取notification 列表
 
-    final static String TAG = "Apex Driver Alarm Receiver";
+    final static String TAG = "Alarm Receiver";
 
 //    protected static final int	SO_TIMEOUT						= 15 * 1000;
     @Override
@@ -35,7 +32,7 @@ public class ApexDriverAlarmReceiver extends AlarmReceiver {
         int alarm_timeInterval = aggressive_alarm_timeInterval;
         if(ApexDriverApplication.sharedApplication().isbackground)
             alarm_timeInterval = normal_alarm_timeInterval;
-        Log.d("ApexDriverAlarmReceiver", "InitAlarm ");
+        dbgUtil.fileLog(context, TAG + " InitAlarm ");
 
 
         // 启动完成
@@ -54,7 +51,7 @@ public class ApexDriverAlarmReceiver extends AlarmReceiver {
 
 
         if(am==null) {
-            dbgUtil.Logd(TAG, "init alarm Alarm Manager am == null");
+            dbgUtil.fileLog(context, TAG + " init alarm Alarm Manager am == null");
             return;
         }
 
@@ -62,21 +59,21 @@ public class ApexDriverAlarmReceiver extends AlarmReceiver {
 
 
 
-        Log.d("ApexDriverAlarmReceiver", "setup up alarm");
+        dbgUtil.fileLog(context, TAG + " setup up alarm");
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             am.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime(), sender);
 
-            dbgUtil.Logd(TAG, "init alarm Alarm Manager am.setExactAndAllowWhileIdle");
+            dbgUtil.fileLog(context, TAG + " init alarm Alarm Manager am.setExactAndAllowWhileIdle");
 
         } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             am.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime(), sender);
 
-            dbgUtil.Logd(TAG, "init alarm Alarm Manager am.setExact");
+            dbgUtil.fileLog(context, TAG + " init alarm Alarm Manager am.setExact");
 
         } else {
             am.setRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime(), alarm_timeInterval, sender);
 
-            dbgUtil.Logd(TAG, "init alarm Alarm Manager am.setRepeating");
+            dbgUtil.fileLog(context, TAG + " init alarm Alarm Manager am.setRepeating");
         }
 
     }
@@ -131,7 +128,7 @@ public class ApexDriverAlarmReceiver extends AlarmReceiver {
         if(ApexDriverApplication.sharedApplication().isbackground)
             alarm_timeInterval = normal_alarm_timeInterval;
 
-        Log.d("ApexDriverAlarmReceiver", "AlarmProc ");
+        dbgUtil.fileLog(context, TAG + " AlarmProc ");
 
         check_push(context);
 
@@ -146,21 +143,21 @@ public class ApexDriverAlarmReceiver extends AlarmReceiver {
         AlarmManager am = (AlarmManager) context.getSystemService(
                 Context.ALARM_SERVICE);
         if(am==null) {
-            dbgUtil.Logd(TAG, "Alarm Process Alarm Manager am == null");
+            dbgUtil.fileLog(context, TAG + " Alarm Process Alarm Manager am == null");
             return;
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             am.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + alarm_timeInterval, sender);
 
-            dbgUtil.Logd(TAG, "Alarm Process am.setExactAndAllowWhileIdle");
+            dbgUtil.fileLog(context, TAG + " Alarm Process am.setExactAndAllowWhileIdle");
 
         } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             am.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + alarm_timeInterval, sender);
 
-            dbgUtil.Logd(TAG, "Alarm Process am.setExact");
+            dbgUtil.fileLog(context, TAG + " Alarm Process am.setExact");
         } else {
 
-            dbgUtil.Logd(TAG, "Alarm Process else");
+            dbgUtil.fileLog(context, TAG + " Alarm Process else");
         }
     }
 
@@ -176,7 +173,7 @@ public class ApexDriverAlarmReceiver extends AlarmReceiver {
     private void check_push(final Context context)
     {
 
-        dbgUtil.Logd(TAG, "Check Push");
+        dbgUtil.fileLog(context, TAG + " Check Push");
 //        String dev_id = RAUtil.getDeviceId(context);
         new Thread(new Runnable() {
             @Override
@@ -186,7 +183,7 @@ public class ApexDriverAlarmReceiver extends AlarmReceiver {
 
                     JSONObject json = com.usai.redant.apexdrivers.network.Network.pullNotification();
 
-                    dbgUtil.Logd(TAG, "Get Push " + (json == null ? "null" : json.toString()));
+                    dbgUtil.fileLog(context, TAG + " Get Push " + (json == null ? "null" : json.toString()));
 
                     if (json != null) {