diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java index f29ac0cd..87bcf303 100644 --- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java +++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java @@ -173,6 +173,7 @@ public class MicroPhotoService extends Service { intentFilter.addAction(ACTION_TAKE_PHOTO); intentFilter.addAction(ACTION_UPDATE_CONFIGS); intentFilter.addAction(ACTION_IMP_PUBKRY); + intentFilter.addAction(ACTION_TAKE_PHOTO_MANUALLY); // intentFilter.addAction(ACTION_HEARTBEAT_MANUALLY); // intentFilter.addAction(ACTION_MSG_BROADCAST); // intentFilter.addAction(ACTION_VIDEO_FINISHED); @@ -345,7 +346,7 @@ public class MicroPhotoService extends Service { mService.sendHeartbeat(mService.mNativeHandle, mService.getSignalLevel()); } else if (TextUtils.equals(ACTION_TAKE_PHOTO_MANUALLY, action)) { int channel = intent.getIntExtra(EXTRA_PARAM_CHANNEL, 0); - int preset = intent.getIntExtra(EXTRA_PARAM_PRESET, 0); + int preset = intent.getIntExtra(EXTRA_PARAM_PRESET, 0xFF); // long ts = intent.getLongExtra(EXTRA_PARAM_TIME, 0); boolean photoOrVideo = intent.getBooleanExtra(EXTRA_PARAM_PHOTO_OR_VIDEO, true); long ts = System.currentTimeMillis() / 1000; diff --git a/app/src/main/res/drawable/ic_spinner.xml b/app/src/main/res/drawable/ic_spinner.xml new file mode 100644 index 00000000..c1c897af --- /dev/null +++ b/app/src/main/res/drawable/ic_spinner.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/spinner_background.xml b/app/src/main/res/drawable/spinner_background.xml new file mode 100644 index 00000000..a2d3b516 --- /dev/null +++ b/app/src/main/res/drawable/spinner_background.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/textview_underline.xml b/app/src/main/res/drawable/textview_underline.xml new file mode 100644 index 00000000..2df3c1f3 --- /dev/null +++ b/app/src/main/res/drawable/textview_underline.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/spinner_dropdown_item.xml b/app/src/main/res/layout/spinner_dropdown_item.xml index 08580b72..6d50b930 100644 --- a/app/src/main/res/layout/spinner_dropdown_item.xml +++ b/app/src/main/res/layout/spinner_dropdown_item.xml @@ -1,12 +1,15 @@ + android:background="@drawable/textview_underline" + android:drawableRight="@drawable/ic_spinner" + >