Skip to content

修复小爱同学 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liux-pro wants to merge 1 commit into
base: typescript
Choose a base branch
from
Open

修复小爱同学 #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 15 additions & 6 deletions lib/voice-assistant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,19 @@ import { vaLog } from "./debug"
export class VoiceAssistant {

get subTopic() {
return `/sys/${this.device.config.productKey}/${this.device.config.deviceName}/rrpc/request/+`
if (this.vaName == 'MIOT'){
return this.device.subTopic;
}else {
return `/sys/${this.device.config.productKey}/${this.device.config.deviceName}/rrpc/request/+`
}
}

get pubTopic() {
return `/sys/${this.device.config.productKey}/${this.device.config.deviceName}/rrpc/response/`
if (this.vaName == 'MIOT'){
return this.device.pubTopic;
}else {
return `/sys/${this.device.config.productKey}/${this.device.config.deviceName}/rrpc/response/`
}
}

vaType;
Expand Down Expand Up @@ -104,7 +112,7 @@ export class VoiceAssistant {
} catch (error) {
console.log(error);
}
if (fromDevice == this.vaName)
if (data.from == this.vaName)
this.processData(messageId, data)
}
})
Expand Down Expand Up @@ -204,10 +212,11 @@ export class VaMessage extends Message {
}

update() {
let messageId = {messageId:this.data.messageId}
this.response = Object.assign(this.response,messageId)
let responseStr = JSON.stringify(this.response)
let data = `{ "fromDevice": "${this.device.config.deviceName}", "toDevice": "${this.voiceAssistant.vaName}_r", "data": ${responseStr}, "deviceType": "vAssistant"}`
let base64Data = Buffer.from(data).toString('base64')
this.device.mqttClient.publish(this.voiceAssistant.pubTopic + this.id, base64Data)
let data = `{ "fromDevice": "${this.device.config.deviceName}", "toDevice": "ServerReceiver", "data": ${responseStr}, "deviceType": "vAssistant"}`
this.device.mqttClient.publish(this.voiceAssistant.pubTopic, data)
vaLog(responseStr, `device>${this.voiceAssistant.vaName}`)
}
}
Expand Down