Skip to content

Commit fed7eb3

Browse files
authored
Merge pull request #285 from smartdevicelink/release/1.1.0
Release/1.1.0
2 parents f52ed2c + 0af0b72 commit fed7eb3

35 files changed

+14554
-4556
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[Things to note: Pull Requests **must** fix an issue. Discussion about the feature / bug takes place in the issue, discussion of the implementation takes place in the PR. Please also see the [Contributing Guide](./CONTRIBUTING.md) for information on branch naming and the CLA, and the [SmartDeviceLink GitHub Best Practices](https://d83tozu1c8tt6.cloudfront.net/media/resources/SDL_GitHub_BestPractices.pdf) document for more information on how to enter a pull request. Once this PR is ready for review, please request one from @nickschwab.
1+
[Things to note: Pull Requests **must** fix an issue. Discussion about the feature / bug takes place in the issue, discussion of the implementation takes place in the PR. Please also see the [Contributing Guide](./CONTRIBUTING.md) for information on branch naming and the CLA, and the [SmartDeviceLink GitHub Best Practices](https://d83tozu1c8tt6.cloudfront.net/media/resources/SDL_GitHub_BestPractices.pdf) document for more information on how to enter a pull request. Once this PR is ready for review, please request one from @crokita.
22

33
Delete the above section when you've read it.]
44

examples/js/hello-sdl/SDL.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/js/hello-sdl/index.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@
5656
SDL.rpc.enums.AppHMIType.DEFAULT,
5757
])
5858
.setTransportConfig(new SDL.transport.WebSocketClientConfig('ws://localhost', 5050))
59-
.setAppIcon(file);
59+
.setAppIcon(file)
60+
.setRpcNotificationListeners({
61+
[SDL.rpc.enums.FunctionID.OnHMIStatus]: this._onHmiStatusListener.bind(this),
62+
});
6063

6164
this._appConfig = new SDL.manager.AppConfig()
6265
.setLifecycleConfig(this._lifecycleConfig);
@@ -94,9 +97,7 @@
9497
});
9598

9699
this._sdlManager = new SDL.manager.SdlManager(this._appConfig, managerListener);
97-
this._sdlManager
98-
.start()
99-
.addRpcListener(SDL.rpc.enums.FunctionID.OnHMIStatus, this._onHmiStatusListener.bind(this));
100+
this._sdlManager.start();
100101
}
101102

102103
async _onConnected () {
@@ -168,13 +169,13 @@
168169
.setMainField2('')
169170
.setMainField3('');
170171

171-
this._sdlManager.sendRpc(showCountdown); // don't wait for a response
172+
this._sdlManager.sendRpcResolve(showCountdown); // don't wait for a response
172173

173174
await this._sleep();
174175
}
175176

176177
// tear down the app
177-
await this._sdlManager.sendRpc(new SDL.rpc.messages.UnregisterAppInterface());
178+
await this._sdlManager.sendRpcResolve(new SDL.rpc.messages.UnregisterAppInterface());
178179

179180
this._sdlManager.dispose();
180181
}

0 commit comments

Comments
 (0)