优化日志

app/src/main/java/com/xypower/mpapp/MicroPhotoService.java

@@ -661,10 +661,20 @@ public class MicroPhotoService extends Service {
         intent.putExtra(EXTRA_PARAM_SCHEDULES, cnt);
         StringBuilder channelStr = new StringBuilder();
         long val = 0;
+        long channel = 0;
         for (int idx = 0; idx < cnt; idx++) {
             val = schedules.get(idx).longValue();
+            channel = ((val & 0XFFFF000) >> 12);
             intent.putExtra(EXTRA_PARAM_SCHEDULE + idx, schedules.get(idx).longValue());
-            channelStr.append("(" + ((val & 0XFFFF000) >> 12) + "-" + Long.toString (((val & 0XFF0) >> 4), 16).toUpperCase() + ") ");
+            if (channel > 0xFF)
+            {
+                channel &= 0xFF;
+                channelStr.append("(" + channel + "-" + Long.toString (((val & 0XFF0) >> 4), 16).toUpperCase() + "/SERIAL) ");
+            }
+            else
+            {
+                channelStr.append("(" + channel + "-" + Long.toString (((val & 0XFF0) >> 4), 16).toUpperCase() + "/IMG) ");
+            }
         }
 
         intent.putExtra(EXTRA_PARAM_TIME, scheduleTime);
@@ -687,7 +697,7 @@ public class MicroPhotoService extends Service {
             long currentTimeMillis = System.currentTimeMillis();
             Date date = new Date(currentTimeMillis + timeout);
             String dateStr = (String) DateFormat.format("MM-dd kk:mm:ss", date);
-            infoLog( "Timer Reg: " + dateStr + " currentTimeMillis=" + currentTimeMillis + " timeout=" + timeout + " CH-PR=" + channelStr.toString());
+            infoLog( "Timer Reg: " + dateStr + " TS=" + currentTimeMillis + " Timeout=" + timeout + " " + channelStr.toString());
 
             alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + timeout, pendingIntent);
         }