修正采样周期设置实现

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

@@ -449,7 +449,7 @@ public class MicroPhotoService extends Service {
                     for (int idx = 0; idx < cnt; idx++) {
                         long val = intent.getLongExtra(EXTRA_PARAM_SCHEDULE + idx, 0);
 
-                        int channel = (int) ((val & 0xFF000L) >> 12);
+                        int channel = (int) ((val & 0xFFFF000L) >> 12);
                         int preset = (int) ((val & 0xFF0L) >> 4);
                         boolean photoOrVideo = ((val & 0xFL) == 0);
 
@@ -664,7 +664,7 @@ public class MicroPhotoService extends Service {
         for (int idx = 0; idx < cnt; idx++) {
             val = schedules.get(idx).longValue();
             intent.putExtra(EXTRA_PARAM_SCHEDULE + idx, schedules.get(idx).longValue());
-            channelStr.append("(" + ((val & 0XFF000) >> 12) + "-" + Long.toString (((val & 0XFF0) >> 4), 16).toUpperCase() + ") ");
+            channelStr.append("(" + ((val & 0XFFFF000) >> 12) + "-" + Long.toString (((val & 0XFF0) >> 4), 16).toUpperCase() + ") ");
         }
 
         intent.putExtra(EXTRA_PARAM_TIME, scheduleTime);
@@ -687,7 +687,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);
-            Log.d(TAG, "PhotoTimer Reg: " + dateStr + " currentTimeMillis=" + currentTimeMillis + " timeout=" + timeout + " CH-PR=" + channelStr.toString());
+            infoLog( "Timer Reg: " + dateStr + " currentTimeMillis=" + currentTimeMillis + " timeout=" + timeout + " CH-PR=" + channelStr.toString());
 
             alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + timeout, pendingIntent);
         }