demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Zepp OS: Unify voice assistant service

Browse Source 
It looks like Zepp Flow uses the same protocol as Alexa - or at least
very similar, since voice data comes in the same command and format.
This commit is contained in:
José Rebelo
2025-03-23 16:35:29 +00:00
parent 160027d756
commit a615807945
6 changed files with 74 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsCoordinator.java
+5 -5
View File
@@ -59,7 +59,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiLanguageT
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiVibrationPatternNotificationType;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFwInstallHandler;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsAlexaService;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsAssistantService;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsConfigService;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsContactsService;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsLogsService;
@@ -465,8 +465,8 @@ public abstract class ZeppOsCoordinator extends HuamiCoordinator {
if (ZeppOsLogsService.isSupported(getPrefs(device))) {
developer.add(R.xml.devicesettings_app_logs_start_stop);
}
if (supportsAlexa(device)) {
developer.add(R.xml.devicesettings_huami2021_alexa);
if (supportsAssistant(device)) {
developer.add(R.xml.devicesettings_zeppos_assistant);
}
if (supportsWifiHotspot(device)) {
developer.add(R.xml.devicesettings_wifi_hotspot);
@@ -582,8 +582,8 @@ public abstract class ZeppOsCoordinator extends HuamiCoordinator {
return ZeppOsShortcutCardsService.isSupported(getPrefs(device));
}
public boolean supportsAlexa(final GBDevice device) {
return experimentalFeatures(device) && ZeppOsAlexaService.isSupported(getPrefs(device));
public boolean supportsAssistant(final GBDevice device) {
return experimentalFeatures(device) && ZeppOsAssistantService.isSupported(getPrefs(device));
}
private boolean supportsConfig(final GBDevice device, final ZeppOsConfigService.ConfigArg config) {
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsSettingsCustomizer.java
+3 -3
View File
@@ -380,9 +380,9 @@ public class ZeppOsSettingsCustomizer extends HuamiSettingsCustomizer {
handler.findPreference(DeviceSettingsPreferenceConst.FTP_SERVER_START),
handler.findPreference(DeviceSettingsPreferenceConst.FTP_SERVER_STOP),
// TODO: These are temporary for debugging and will be removed
handler.findPreference("zepp_os_alexa_btn_trigger"),
handler.findPreference("zepp_os_alexa_btn_send_simple"),
handler.findPreference("zepp_os_alexa_btn_send_complex")
handler.findPreference("zepp_os_assistant_btn_trigger"),
handler.findPreference("zepp_os_assistant_btn_send_simple"),
handler.findPreference("zepp_os_assistant_btn_send_complex")
);
for (final Preference btn : wifiFtpButtons) {
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/AbstractZeppOsService.java
+2 -2
View File
@@ -28,11 +28,11 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsAlexaService;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsAssistantService;
import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
public abstract class AbstractZeppOsService {
private static final Logger LOG = LoggerFactory.getLogger(ZeppOsAlexaService.class);
private static final Logger LOG = LoggerFactory.getLogger(ZeppOsAssistantService.class);
private final ZeppOsSupport mSupport;
private boolean encrypted;
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java
+4 -2
View File
@@ -130,7 +130,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.operati
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.operations.ZeppOsGpxRouteUploadOperation;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsAgpsService;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsAlarmsService;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsAlexaService;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsAssistantService;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsAppsService;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsCalendarService;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsCannedMessagesService;
@@ -185,7 +185,8 @@ public class ZeppOsSupport extends HuamiSupport implements ZeppOsFileTransferSer
private final ZeppOsCalendarService calendarService = new ZeppOsCalendarService(this);
private final ZeppOsCannedMessagesService cannedMessagesService = new ZeppOsCannedMessagesService(this);
private final ZeppOsNotificationService notificationService = new ZeppOsNotificationService(this, fileTransferService);
private final ZeppOsAlexaService alexaService = new ZeppOsAlexaService(this);
private final ZeppOsAssistantService alexaService = new ZeppOsAssistantService(this, ZeppOsAssistantService.ENDPOINT_ALEXA);
private final ZeppOsAssistantService zeppFlowService = new ZeppOsAssistantService(this, ZeppOsAssistantService.ENDPOINT_ZEPP_FLOW);
private final ZeppOsAppsService appsService = new ZeppOsAppsService(this);
private final ZeppOsLogsService logsService = new ZeppOsLogsService(this);
private final ZeppOsDisplayItemsService displayItemsService = new ZeppOsDisplayItemsService(this);
@@ -215,6 +216,7 @@ public class ZeppOsSupport extends HuamiSupport implements ZeppOsFileTransferSer
put(cannedMessagesService.getEndpoint(), cannedMessagesService);
put(notificationService.getEndpoint(), notificationService);
put(alexaService.getEndpoint(), alexaService);
put(zeppFlowService.getEndpoint(), zeppFlowService);
put(appsService.getEndpoint(), appsService);
put(logsService.getEndpoint(), logsService);
put(displayItemsService.getEndpoint(), displayItemsService);
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAssistantService.java
+51 -38
View File
@@ -46,10 +46,11 @@ import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
public class ZeppOsAlexaService extends AbstractZeppOsService {
private static final Logger LOG = LoggerFactory.getLogger(ZeppOsAlexaService.class);
public class ZeppOsAssistantService extends AbstractZeppOsService {
private static final Logger LOG = LoggerFactory.getLogger(ZeppOsAssistantService.class);
private static final short ENDPOINT = 0x0011;
public static final short ENDPOINT_ALEXA = 0x0011;
public static final short ENDPOINT_ZEPP_FLOW = 0x004a;
private static final byte CMD_START = 0x01;
private static final byte CMD_END = 0x02;
@@ -75,19 +76,21 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
private static final byte ERROR_NO_INTERNET = 0x03;
private static final byte ERROR_UNAUTHORIZED = 0x06;
public static final String PREF_VERSION = "zepp_os_alexa_version";
public static final String PREF_VERSION = "zepp_os_assistant_version";
private final Handler handler = new Handler();
private final short endpoint;
final ByteArrayOutputStream voiceBuffer = new ByteArrayOutputStream();
public ZeppOsAlexaService(final ZeppOsSupport support) {
public ZeppOsAssistantService(final ZeppOsSupport support, final short endpoint) {
super(support, true);
this.endpoint = endpoint;
}
@Override
public short getEndpoint() {
return ENDPOINT;
return endpoint;
}
@Override
@@ -106,13 +109,13 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
handleLanguagesResponse(payload);
break;
case CMD_SET_LANGUAGE_ACK:
LOG.info("Alexa set language ack, status = {}", payload[1]);
LOG.info("Assistant set language ack, status = {}", payload[1]);
break;
case CMD_CAPABILITIES_RESPONSE:
handleCapabilitiesResponse(payload);
break;
default:
LOG.warn("Unexpected alexa byte {}", String.format("0x%02x", payload[0]));
LOG.warn("Unexpected assistant byte {}", String.format("0x%02x", payload[0]));
}
}
@@ -120,24 +123,24 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
public boolean onSendConfiguration(final String config, final Prefs prefs) {
switch (config) {
case DeviceSettingsPreferenceConst.PREF_VOICE_SERVICE_LANGUAGE:
final String alexaLanguage = prefs.getString(DeviceSettingsPreferenceConst.PREF_VOICE_SERVICE_LANGUAGE, null);
LOG.info("Setting alexa language to {}", alexaLanguage);
setLanguage(alexaLanguage);
final String language = prefs.getString(DeviceSettingsPreferenceConst.PREF_VOICE_SERVICE_LANGUAGE, null);
LOG.info("Setting assistant language to {}", language);
setLanguage(language);
return true;
case "zepp_os_alexa_btn_trigger":
GB.toast("Alexa cmd trigger", Toast.LENGTH_SHORT, GB.INFO);
case "zepp_os_assistant_btn_trigger":
GB.toast("Assistant cmd trigger", Toast.LENGTH_SHORT, GB.INFO);
sendCmdTriggered();
return true;
case "zepp_os_alexa_btn_send_simple":
GB.toast("Alexa simple reply", Toast.LENGTH_SHORT, GB.INFO);
final String simpleText = prefs.getString("zepp_os_alexa_reply_text", null);
case "zepp_os_assistant_btn_send_simple":
GB.toast("Assistant simple reply", Toast.LENGTH_SHORT, GB.INFO);
final String simpleText = prefs.getString("zepp_os_assistant_reply_text", null);
sendReply(simpleText);
return true;
case "zepp_os_alexa_btn_send_complex":
GB.toast("Alexa complex reply", Toast.LENGTH_SHORT, GB.INFO);
final String title = prefs.getString("zepp_os_alexa_reply_title", null);
final String subtitle = prefs.getString("zepp_os_alexa_reply_subtitle", null);
final String text = prefs.getString("zepp_os_alexa_reply_text", null);
case "zepp_os_assistant_btn_send_complex":
GB.toast("Assistant complex reply", Toast.LENGTH_SHORT, GB.INFO);
final String title = prefs.getString("zepp_os_assistant_reply_title", null);
final String subtitle = prefs.getString("zepp_os_assistant_reply_subtitle", null);
final String text = prefs.getString("zepp_os_assistant_reply_text", null);
sendReply(title, subtitle, text);
return true;
}
@@ -149,7 +152,6 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
public void initialize(final TransactionBuilder builder) {
if (ZeppOsCoordinator.experimentalFeatures(getSupport().getDevice())) {
requestCapabilities(builder);
requestLanguages(builder);
}
}
@@ -157,12 +159,12 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
write(builder, CMD_CAPABILITIES_REQUEST);
}
public void requestLanguages(final TransactionBuilder builder) {
write(builder, CMD_LANGUAGES_REQUEST);
public void requestLanguages() {
write("assistant request languages", CMD_LANGUAGES_REQUEST);
}
public void sendReply(final String text) {
LOG.debug("Sending alexa simple text reply '{}'", text);
LOG.debug("Sending assistant simple text reply '{}'", text);
final byte[] textBytes = StringUtils.ensureNotNull(text).getBytes(StandardCharsets.UTF_8);
@@ -177,7 +179,7 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
}
public void sendReply(final String title, final String subtitle, final String text) {
LOG.debug("Sending alexa complex text reply '{}', '{}', '{}'", title, subtitle, text);
LOG.debug("Sending assistant complex text reply '{}', '{}', '{}'", title, subtitle, text);
final byte[] titleBytes = StringUtils.ensureNotNull(title).getBytes(StandardCharsets.UTF_8);
final byte[] subtitleBytes = StringUtils.ensureNotNull(subtitle).getBytes(StandardCharsets.UTF_8);
@@ -276,7 +278,7 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
public void setLanguage(final String language) {
if (language == null) {
LOG.warn("Alexa language is null");
LOG.warn("Assistant language is null");
return;
}
@@ -289,7 +291,7 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
buf.put(languageBytes);
buf.put((byte) 0);
write("set alexa language", buf.array());
write("set assistant language", buf.array());
}
public void sendError(final byte errorCode, final String errorMessage) {
@@ -303,25 +305,25 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
buf.put(messageBytes);
buf.put((byte) 0);
write("send alexa error", buf.array());
write("send assistant error", buf.array());
}
public void sendStartAck() {
write("send alexa start ack", new byte[]{CMD_START_ACK, 0x00});
write("send assistant start ack", new byte[]{CMD_START_ACK, 0x00});
}
public void sendCmdTriggered() {
write("alexa cmd triggered", CMD_TRIGGERED);
write("assistant cmd triggered", CMD_TRIGGERED);
}
public void sendVoiceMore() {
write("alexa request more voice", CMD_REPLY_VOICE_MORE);
write("assistant request more voice", CMD_REPLY_VOICE_MORE);
}
private void handleCapabilitiesResponse(final byte[] payload) {
final int version = payload[1] & 0xFF;
if (version != 3) {
LOG.warn("Unsupported alexa service version {}", version);
if (version != 3 && version != 5) {
LOG.warn("Unsupported assistant service version {}", version);
return;
}
final byte var1 = payload[2];
@@ -335,7 +337,12 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
getSupport().evaluateGBDeviceEvent(new GBDeviceEventUpdatePreferences(PREF_VERSION, version));
LOG.info("Alexa version={}, var1={}, var2={}", version, var1, var2);
LOG.info("Assistant version={}, var1={}, var2={}", version, var1, var2);
if (version == 3) {
// only in Alexa (?)
requestLanguages();
}
}
private void handleStart(final byte[] payload) {
@@ -345,7 +352,7 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
final byte var4 = payload[4];
final String params = StringUtils.untilNullTerminator(payload, 5);
LOG.info("Alexa starting: var1={}, var2={}, var3={}, var4={}, params={}", var1, var2, var3, var4, params);
LOG.info("Assistant starting: var1={}, var2={}, var3={}, var4={}, params={}", var1, var2, var3, var4, params);
// Send the start ack with a slight delay, to give enough time for the connection to switch to fast mode
// I can't seem to get the callback for onConnectionUpdated working, and if we reply too soon the watch
@@ -364,6 +371,11 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
}
private void handleLanguagesResponse(final byte[] payload) {
if (payload[1] != 1) {
LOG.warn("Assistant language response status = {}", payload[1]);
return;
}
int pos = 2;
final String currentLanguage = StringUtils.untilNullTerminator(payload, pos);
pos = pos + currentLanguage.length() + 1;
@@ -377,7 +389,7 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
pos = pos + language.length() + 1;
}
LOG.info("Got alexa language = {}, supported languages = {}", currentLanguage, allLanguages);
LOG.info("Got assistant language = {}, supported languages = {}", currentLanguage, allLanguages);
final GBDeviceEventUpdatePreferences evt = new GBDeviceEventUpdatePreferences()
.withPreference(PREF_VOICE_SERVICE_LANGUAGE, currentLanguage.replace("-", "_"))
@@ -386,6 +398,7 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
}
public static boolean isSupported(final Prefs devicePrefs) {
return devicePrefs.getInt(PREF_VERSION, 0) == 3;
final int version = devicePrefs.getInt(PREF_VERSION, 0);
return version >= 3 && version <= 5;
}
}
app/src/main/res/xml/devicesettings_huami2021_alexa.xml → app/src/main/res/xml/devicesettings_zeppos_assistant.xml
+9 -9
View File
@@ -4,8 +4,8 @@
<PreferenceScreen
android:icon="@drawable/ic_voice"
android:key="pref_screen_alexa"
android:title="@string/menuitem_alexa">
android:key="pref_screen_voice_assistant"
android:title="@string/pref_title_touch_voice_assistant">
<ListPreference
android:defaultValue="auto"
@@ -40,41 +40,41 @@
<EditTextPreference
android:defaultValue=""
android:key="zepp_os_alexa_reply_title"
android:key="zepp_os_assistant_reply_title"
android:title="Reply Title"
app:useSimpleSummaryProvider="true" />
<EditTextPreference
android:defaultValue=""
android:key="zepp_os_alexa_reply_subtitle"
android:key="zepp_os_assistant_reply_subtitle"
android:title="Reply Subtitle"
app:useSimpleSummaryProvider="true" />
<EditTextPreference
android:defaultValue=""
android:key="zepp_os_alexa_reply_text"
android:key="zepp_os_assistant_reply_text"
android:title="Reply Text"
app:useSimpleSummaryProvider="true" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="zepp_os_alexa_ask_more_input"
android:key="zepp_os_assistant_ask_more_input"
android:layout="@layout/preference_checkbox"
android:summary="Continue listening after sending the reply"
android:title="Ask for more input" />
<Preference
android:key="zepp_os_alexa_btn_trigger"
android:key="zepp_os_assistant_btn_trigger"
android:summary="Send a command trigger to the watch (stops sending voice data)"
android:title="Send command trigger" />
<Preference
android:key="zepp_os_alexa_btn_send_simple"
android:key="zepp_os_assistant_btn_send_simple"
android:summary="Send a simple reply to the watch (just text)"
android:title="Send simple reply" />
<Preference
android:key="zepp_os_alexa_btn_send_complex"
android:key="zepp_os_assistant_btn_send_complex"
android:summary="Send a complex reply to the watch (title, subtitle, text)"
android:title="Send complex reply" />
</PreferenceCategory>