Integration for haptic manager into the SMM #753
Merged
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
* Interface tweaks to SDLHapticHitTester, now just takes a point instead of a touch * SMM configuration has a window property that, if set, will create the haptic manager in the SMM * When the SMM receives video capabilities, it will check the `hapticSpatialDataSupported` property and enable / disable the haptic manager’s sending of RPCs based on it * TouchManager now takes an optional haptic hit tester to check view locations * TouchManagerDelegate now has view passthrough on many delegate methods
* Fixes to test cases to make them clearer
|
Touch Manager tests were attempted to be updated, but OCMock crashed. They should be entirely rewritten without OCMock if possible. |
SmartDeviceLink/SDLHapticManager.m
Outdated
| if ((currentView.canBecomeFocused || isButton) && focusableSubviews.count == 0) { | ||
| //if current view is focusable and it doesn't have any focusable sub views then add the cuurent view and return |
| if (configuration.window != nil) { | ||
| _hapticInterface = [[SDLHapticManager alloc] initWithWindow:configuration.window connectionManager:_connectionManager]; | ||
| } | ||
| // __weak typeof(_hapticInterface) weakHaptic = _hapticInterface; |
There was a problem hiding this comment.
Commented out code can be removed
| } | ||
| // __weak typeof(_hapticInterface) weakHaptic = _hapticInterface; | ||
| _touchManager = [[SDLTouchManager alloc] initWithHitTester:_hapticInterface]; | ||
|
|
There was a problem hiding this comment.
I am getting a warning for _touchManager initialization.
Sending 'id _Nullable __strong' to parameter of incompatible type 'id _Nullable'
Casting _hapticInterface to id clears this warning for me.
_touchManager = [[SDLTouchManager alloc] initWithHitTester:(id)_hapticInterface]
NicoleYarroch
approved these changes
Oct 2, 2017
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Fixes #698, #728
This PR is ready for review.
Risk
This PR makes major API changes.
Testing Plan
Tests must still be developed
Summary
This PR integrates the haptic manager (PR #751) into the streaming media manager (SMM) and the associated touch manager (TM). The flow now looks like this:
UIWindowonSDLStreamingMediaConfiguration, or not.SDLHapticManageris created on theSDLStreamingMediaManager. It is started with sending haptic RPCs disabled.SDLTouchManagerwith the haptic manager if it exists (depending on whether the window was set on the configuration).Changelog
Breaking Changes
SDLTouchManagerDelegatenow has view passthrough on many delegate methodsEnhancements
SDLHapticHitTester, now just takes a point instead of a touchhapticSpatialDataSupportedproperty and enable / disable the haptic manager’s sending of RPCs based on itTasks Remaining:
CLA