Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion accelerator-home-ui/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"log": true,
"enableAppSuspended": true,
"showVersion": false,
"version": "5.0.22"
"version": "5.0.23"
}
}
34 changes: 17 additions & 17 deletions accelerator-home-ui/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -700,11 +700,11 @@ export default class App extends Router.App {
this.SubscribeToHdmiCecSourcevent(result[0].state, self.appIdentifiers)
let getfriendlyname, getosdname;
setTimeout(() => {
xcastApi.getFriendlyName().then(res => {
getfriendlyname = res.friendlyname;
this.LOG("XcastApi getFriendlyName :" + JSON.stringify(getfriendlyname));
appApi.getFriendlyName().then(res => {
getfriendlyname = res.friendlyName;
this.LOG("AppApi getFriendlyName :" + JSON.stringify(getfriendlyname));
}).catch(err => {
this.ERR("XcastApi getFriendlyName Error: " + JSON.stringify(err));
this.ERR("AppApi getFriendlyName Error: " + JSON.stringify(err));
})
cecApi.getOSDName().then(result => {
getosdname = result.name;
Expand All @@ -724,11 +724,11 @@ export default class App extends Router.App {
cecApi.activate().then(() => {
let getfriendlyname, getosdname;
setTimeout(() => {
xcastApi.getFriendlyName().then(res => {
getfriendlyname = res.friendlyname;
this.LOG("XcastApi getFriendlyName :" + JSON.stringify(getfriendlyname));
appApi.getFriendlyName().then(res => {
getfriendlyname = res.friendlyName;
this.LOG("AppApi getFriendlyName :" + JSON.stringify(getfriendlyname));
}).catch(err => {
this.ERR("XcastApi getFriendlyName Error: " + JSON.stringify(err));
this.ERR("AppApi getFriendlyName Error: " + JSON.stringify(err));
})
cecApi.getOSDName().then(result => {
getosdname = result.name;
Expand Down Expand Up @@ -756,18 +756,18 @@ export default class App extends Router.App {
console.warn("Xcast plugin activate");
if (result) {
this.registerXcastListeners();
// Update Xcast friendly name
let serialnumber = "DefaultSLNO";
let modelName = "RDK" + GLOBALS.deviceType;
await appApi.getSerialNumber().then(async res => {
// Reduce display length; trim to last 6 characters
serialnumber = (res.length < 6) ? res : res.slice(-6);
});
await this.xcastApi.getModelName().then(model => {
modelName = model + serialnumber;
});
const serialRes = await appApi.getSerialNumber();
serialnumber = (serialRes.length < 6) ? serialRes : serialRes.slice(-6);
const model = await this.xcastApi.getModelName();
modelName = (model || modelName) + serialnumber;
this.LOG("Xcast friendly name to be set: " + JSON.stringify(modelName));
await this.xcastApi.setFriendlyName(modelName);
try {
await appApi.setFriendlyName(modelName);
} catch (err) {
this.ERR("AppApi setFriendlyName error: " + JSON.stringify(err) + " - continuing Xcast activation");
}
await this.xcastApi.setEnabled(true).then(res => {
GLOBALS.LocalDeviceDiscoveryStatus = true;
console.warn("Xcast setEnabled success" + JSON.stringify(res));
Expand Down
45 changes: 43 additions & 2 deletions accelerator-home-ui/src/api/AppApi.js
Original file line number Diff line number Diff line change
Expand Up @@ -1529,11 +1529,52 @@ export default class AppApi {
})
}

getFriendlyName() {
return new Promise((resolve, reject) => {
thunder.call('org.rdk.System', 'getFriendlyName').then(result => {
if (result.success) {
resolve(result)
} else {
const error = new Error('getFriendlyName failed: success=false');
error.result = result;
reject(error)
}
}).catch(err => {
this.ERR("AppAPI getFriendlyName error:", JSON.stringify(err, 3, null))
Metrics.error(Metrics.ErrorType.OTHER, "PluginError", "Error in Thunder system getFriendlyName " + JSON.stringify(err), false, null)
reject(err)
})
})
}

setFriendlyName(name) {
return new Promise((resolve, reject) => {
thunder.call('org.rdk.System', 'setFriendlyName', { "friendlyName": name }).then(result => {
if (result.success) {
resolve(result)
} else {
const error = new Error('setFriendlyName failed: success=false');
error.result = result;
reject(error)
}
}).catch(err => {
this.ERR("AppAPI setFriendlyName error:", JSON.stringify(err, 3, null))
Metrics.error(Metrics.ErrorType.OTHER, "PluginError", "Error in Thunder system setFriendlyName " + JSON.stringify(err), false, null)
reject(err)
})
})
}

getRFCConfig(rfcParamsList) {
return new Promise((resolve, reject) => {
thunder.call('org.rdk.System', 'getRFCConfig', rfcParamsList).then(result => {
if (result.success) resolve(result)
reject(false)
if (result.success) {
resolve(result)
} else {
const error = new Error('getRFCConfig failed: success=false');
error.result = result;
reject(error)
}
}).catch(err => {
this.ERR("AppAPI getRFCConfig error:", JSON.stringify(err, 3, null))
Metrics.error(Metrics.ErrorType.OTHER, "PluginError", "Error in Thunder system getRFCConfig " + JSON.stringify(err), false, null)
Expand Down
Loading