Turn screen on Plugin #7031
Merged
Turn screen on Plugin #7031
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Please rename OsmAnd-Plugin-TurnScreenOn |
crimean
reviewed
Jun 24, 2019
| private RadioGroupWrapper osmandVersionRadioGroup; | ||
| private FrameLayout btnOpenOsmand; | ||
|
|
||
| private LayoutInflater inflater; |
|
|
||
| if (!settings.isProgramOpenedEarlier()) { | ||
| settings.setOpened(); | ||
| isReturnedFromAnotherActivity = true; |
There was a problem hiding this comment.
Why this var needed? Is it possible to move code from onResume to onCreate?
| settings.setOpened(); | ||
| isReturnedFromAnotherActivity = true; | ||
| startPluginDescriptionActivity(PluginDescriptionActivity.MODE_FIRST_OPEN); | ||
| } |
| if (settings.hasAvailableOsmandVersions()) { | ||
| try { | ||
| if (!isReturnedFromAnotherActivity) { | ||
| Log.d("ttpl2", "no returned"); |
| setContentView(R.layout.activity_main); | ||
|
|
||
| app = (TurnScreenApp) getApplicationContext(); | ||
|
|
|
|
||
| public void registerForVoiceRouterMessages() { | ||
| try { | ||
| Log.d("ttpl", "try add a listener"); |
| isRegistered = false; | ||
| } | ||
| } catch (RemoteException e) { | ||
| e.printStackTrace(); |
There was a problem hiding this comment.
do not use e.printStackTrace() (even if you copy-pasted it)
| refreshUI(); | ||
| } | ||
| } catch (Exception e) { | ||
| Log.d("ttpl2", "take an exception"); |
| @@ -0,0 +1,8 @@ | |||
| package net.osmand.turnScreenOn.listener; | |||
|
|
|||
| public interface MessageSender { | |||
There was a problem hiding this comment.
Looks like abstract, but used for single purpose. Needs to be renamed?
| import android.util.SparseArray; | ||
| import android.widget.RadioButton; | ||
|
|
||
| public class RadioGroupWrapper { |
vshcherb
reviewed
Jun 24, 2019
| voiceMessageListeners.remove(voiceMessageListener); | ||
| } | ||
|
|
||
| public void notifyOnVoiceMessage() { | ||
| Log.d("ttpl", "notify listeners: "); |
There was a problem hiding this comment.
Log.d should be deleted - only for dev and we use commons logging for prod
vshcherb
reviewed
Jun 24, 2019
| @@ -1897,6 +1899,33 @@ public void unregisterFromUpdates(long id) { | |||
| navUpdateCallbacks.remove(id); | |||
| } | |||
|
|
|||
| private Map<Long, VoiceRouter.VoiceMessageListener> voiceRouterMessageCallbacks= new ConcurrentHashMap<>(); | |||
vshcherb
reviewed
Jun 24, 2019
| int i = 0; | ||
| for (VoiceMessageListener lnt : voiceMessageListeners.keySet()) { | ||
| Log.d("ttpl", "listner " + ++i); | ||
| lnt.onVoiceMessage(); |
There was a problem hiding this comment.
Paramater which voice message should be present
vshcherb
reviewed
Jun 24, 2019
| @@ -8,6 +8,7 @@ | |||
| import java.util.concurrent.ConcurrentHashMap; | |||
|
|
|||
| import net.osmand.Location; | |||
| import net.osmand.aidl.OsmandAidlService; | |||
There was a problem hiding this comment.
this class shouldn't be present here
vshcherb
reviewed
Jun 24, 2019
| @@ -27,6 +28,7 @@ | |||
| import alice.tuprolog.Term; | |||
| import android.media.AudioManager; | |||
| import android.media.SoundPool; | |||
| import android.util.Log; | |||
vshcherb
reviewed
Jun 24, 2019
| @@ -27,6 +28,7 @@ | |||
| import alice.tuprolog.Term; | |||
| import android.media.AudioManager; | |||
| import android.media.SoundPool; | |||
| import android.util.Log; | |||
|
|
|||
There was a problem hiding this comment.
Use weakreference for listeners
vshcherb
reviewed
Jul 3, 2019
vshcherb
reviewed
Jul 3, 2019
| public final CommonPreference<Integer> WAKE_ON_VOICE_TIME_INT = new IntPreference("wake_on_voice_time_int", 0).makeProfile(); | ||
|
|
||
| { | ||
| // 0 means never |
vshcherb
reviewed
Jul 3, 2019
|
|
||
| { | ||
| // 0 means never | ||
| WAKE_ON_VOICE_SENSOR.setModeDefaultValue(ApplicationMode.CAR, false); |
vshcherb
reviewed
Jul 3, 2019
| LOG.debug("switch on sensor"); | ||
| mSensorManager.registerListener(this, mProximity, SensorManager.SENSOR_DELAY_NORMAL); | ||
| } else { | ||
| LOG.debug("switch off sensor"); |
vshcherb
reviewed
Jul 3, 2019
| } | ||
| play(null); |
vshcherb
reviewed
Jul 3, 2019
| } | ||
|
|
||
| public void switchOnSensor() { | ||
| LOG.debug("switch on sensor"); |
vshcherb
reviewed
Jul 3, 2019
| voiceMessageListener = new VoiceRouter.VoiceMessageListener() { | ||
| @Override | ||
| public void onVoiceMessage() { | ||
| LOG.debug("onVoiceMessage"); |
vshcherb
reviewed
Jul 3, 2019
| @@ -705,4 +706,7 @@ interface IOsmAndAidlInterface { | |||
| boolean areOsmandSettingsCustomized(in OsmandSettingsInfoParams params); | |||
|
|
|||
| boolean setCustomization(in CustomizationInfoParams params); | |||
| long registerForVoiceRouterMessages(in ANavigationVoiceRouterMessageParams params, IOsmAndAidlCallback callback); | |||
|
|
|||
| boolean changeMapActivityKeyguardFlags(in boolean enable); | |||
…_screen_on_plugin
crimean
reviewed
Jul 3, 2019
| }; | ||
|
|
||
| setVoiceRouterListener(true); | ||
| setSensor(true); |
There was a problem hiding this comment.
Start sensor only if turned on in settings
| public void onSensorChanged(SensorEvent event) { | ||
| if (event.sensor.getType() == Sensor.TYPE_PROXIMITY) { | ||
| if (event.values[0] >= -SENSOR_SENSITIVITY && event.values[0] <= SENSOR_SENSITIVITY) { | ||
| if (isSensorEnabled()) { |
There was a problem hiding this comment.
Such check must be at top of the method
| } | ||
| }; | ||
|
|
||
| setVoiceRouterListener(true); |
There was a problem hiding this comment.
Why it is not the same - f9cd73d#diff-33da24854a630e0918b813683c839fbbL79
move sensor state verification
Now it activates only if enable in the settings and the screen is off while navigation. Remove router checkbox from preferences
Now it activates only if enable in the settings and the screen is off while navigation. Remove router checkbox from preferences
fix changeKeyguardFlags (MapActivity) multithreading problem
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.