demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2025-01-11 01:21:56 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Huami: implement proper find device.

Browse Source
This commit is contained in:
NekoBox 2022-09-19 15:46:02 +03:00 committed by Gitea
parent ce456d6dcc
commit 2df6ce2aed
3 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
View File

@ -290,6 +290,7 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
private static long currentButtonTimerActivationTime = 0; private static long currentButtonTimerActivationTime = 0;
private Timer buttonActionTimer = null; private Timer buttonActionTimer = null;
private Timer findDeviceLoopTimer = null;
private static final Logger LOG = LoggerFactory.getLogger(HuamiSupport.class); private static final Logger LOG = LoggerFactory.getLogger(HuamiSupport.class);
private final DeviceInfoProfile<HuamiSupport> deviceInfoProfile; private final DeviceInfoProfile<HuamiSupport> deviceInfoProfile;
@ -311,7 +312,6 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
private boolean needsAuth; private boolean needsAuth;
private volatile boolean telephoneRinging; private volatile boolean telephoneRinging;
private volatile boolean isLocatingDevice;
private final GBDeviceEventVersionInfo versionCmd = new GBDeviceEventVersionInfo(); private final GBDeviceEventVersionInfo versionCmd = new GBDeviceEventVersionInfo();
private final GBDeviceEventBatteryInfo batteryCmd = new GBDeviceEventBatteryInfo(); private final GBDeviceEventBatteryInfo batteryCmd = new GBDeviceEventBatteryInfo();
@ -1565,17 +1565,47 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
@Override @Override
public void onFindDevice(boolean start) { public void onFindDevice(boolean start) {
isLocatingDevice = start; if(findDeviceLoopTimer != null)
findDeviceLoopTimer.cancel();
if (start) { if (start) {
AbortTransactionAction abortAction = new AbortTransactionAction() { int loopInterval = getFindDeviceInterval();
LOG.info("Sending find device, interval: " + loopInterval);
findDeviceLoopTimer = new Timer("Huami Find Loop Timer");
findDeviceLoopTimer.scheduleAtFixedRate(new TimerTask() {
@Override @Override
protected boolean shouldAbort() { public void run() {
return !isLocatingDevice; sendFindDeviceCommand(true);
} }
}; }, loopInterval, loopInterval);
SimpleNotification simpleNotification = new SimpleNotification(getContext().getString(R.string.find_device_you_found_it), AlertCategory.HighPriorityAlert, null); }
performDefaultNotification("locating device", simpleNotification, (short) 255, abortAction); sendFindDeviceCommand(start);
}
protected int getFindDeviceInterval() {
VibrationProfile findBand = HuamiCoordinator.getVibrationProfile(getDevice().getAddress(), HuamiVibrationPatternNotificationType.FIND_BAND);
int findDeviceInterval = 0;
for(int len : findBand.getOnOffSequence())
findDeviceInterval += len;
if(findBand.getRepeat() > 0)
findDeviceInterval *= findBand.getRepeat();
if(findDeviceInterval > 10000) // 10 seconds, about as long as Mi Fit allows
findDeviceInterval = 10000;
return findDeviceInterval;
}
private void sendFindDeviceCommand(boolean start) {
BluetoothGattCharacteristic characteristic = getCharacteristic(UUID_CHARACTERISTIC_ALERT_LEVEL);
try {
TransactionBuilder builder = performInitialized("find huami");
builder.write(characteristic, start ? new byte[] {3} : new byte[] {0});
builder.queue(getQueue());
} catch (IOException e) {
LOG.error("error while sending find Huami device command", e);
} }
} }

8
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipSupport.java
View File

@ -54,14 +54,6 @@ public class AmazfitBipSupport extends HuamiSupport {
return new AmazfitBipTextNotificationStrategy(this); return new AmazfitBipTextNotificationStrategy(this);
} }
@Override
public void onFindDevice(boolean start) {
CallSpec callSpec = new CallSpec();
callSpec.command = start ? CallSpec.CALL_INCOMING : CallSpec.CALL_END;
callSpec.name = "Gadgetbridge";
onSetCallState(callSpec);
}
@Override @Override
protected AmazfitBipSupport setDisplayItems(TransactionBuilder builder) { protected AmazfitBipSupport setDisplayItems(TransactionBuilder builder) {
Map<String, Integer> keyPosMap = new LinkedHashMap<>(); Map<String, Integer> keyPosMap = new LinkedHashMap<>();

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitneo/AmazfitNeoSupport.java
View File

@ -167,6 +167,11 @@ public class AmazfitNeoSupport extends MiBand5Support {
super.onSetCallState(callSpec); super.onSetCallState(callSpec);
} }
@Override
protected int getFindDeviceInterval() {
return 10000; //Neo find command lasts 10 seconds
}
@Override @Override
public HuamiFWHelper createFWHelper(Uri uri, Context context) throws IOException { public HuamiFWHelper createFWHelper(Uri uri, Context context) throws IOException {
return new AmazfitNeoFWHelper(uri, context); return new AmazfitNeoFWHelper(uri, context);