mirrors
/
Gadgetbridge
mirror of https://github.com/nico202/Gadgetbridge.git
1
0
Fork 0
Code Issues Releases Wiki Activity

More refactoring: new service/devices package and service/bt package

live-activity-data
cpfeiffer 2015-08-03 23:51:53 +02:00
parent 7c597b325a
commit db4261e02b
15 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java
View File

@ -22,7 +22,7 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream; import java.util.zip.ZipInputStream;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp; import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp;
import nodomain.freeyourgadget.gadgetbridge.service.pebble.PebbleProtocol; import nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.PebbleProtocol;
public class PBWReader { public class PBWReader {
private static final Logger LOG = LoggerFactory.getLogger(PBWReader.class); private static final Logger LOG = LoggerFactory.getLogger(PBWReader.class);

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/BluetoothCommunicationService.java
View File

@ -31,8 +31,8 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice.State; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice.State;
import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.model.Alarm; import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
import nodomain.freeyourgadget.gadgetbridge.service.miband.MiBandSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.miband.MiBandSupport;
import nodomain.freeyourgadget.gadgetbridge.service.pebble.PebbleSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.PebbleSupport;
public class BluetoothCommunicationService extends Service { public class BluetoothCommunicationService extends Service {
public static final String ACTION_START public static final String ACTION_START

3
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractBTDeviceSupport.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/AbstractBTDeviceSupport.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.service; package nodomain.freeyourgadget.gadgetbridge.service.bt;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -9,6 +9,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.EventHandler;
import nodomain.freeyourgadget.gadgetbridge.model.ServiceCommand; import nodomain.freeyourgadget.gadgetbridge.model.ServiceCommand;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSendBytes; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSendBytes;
import nodomain.freeyourgadget.gadgetbridge.service.AbstractDeviceSupport;
/** /**
* An abstract base class for all devices connected via Bluetooth * An abstract base class for all devices connected via Bluetooth

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/GBDeviceIoThread.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/GBDeviceIoThread.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.service; package nodomain.freeyourgadget.gadgetbridge.service.bt;
import android.content.Context; import android.content.Context;

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/GBDeviceProtocol.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/GBDeviceProtocol.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.service; package nodomain.freeyourgadget.gadgetbridge.service.bt;
import java.util.UUID; import java.util.UUID;

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/AbstractInfo.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractInfo.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.service.miband; package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
public class AbstractInfo { public class AbstractInfo {
protected byte[] mData; protected byte[] mData;

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/BatteryInfo.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/BatteryInfo.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.service.miband; package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.R;

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/DeviceInfo.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/DeviceInfo.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.service.miband; package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
import java.util.Locale; import java.util.Locale;

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/MiBandSupport.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.service.miband; package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
import android.bluetooth.BluetoothGatt; import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCharacteristic; import android.bluetooth.BluetoothGattCharacteristic;

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/GadgetbridgePblSupport.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/GadgetbridgePblSupport.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.service.pebble; package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
import android.util.Pair; import android.util.Pair;

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/MorpheuzSupport.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/MorpheuzSupport.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.service.pebble; package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
import android.util.Pair; import android.util.Pair;

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/PebbleIoThread.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.service.pebble; package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothDevice;
@ -23,12 +23,12 @@ import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.devices.pebble.PBWReader; import nodomain.freeyourgadget.gadgetbridge.devices.pebble.PBWReader;
import nodomain.freeyourgadget.gadgetbridge.devices.pebble.PebbleInstallable; import nodomain.freeyourgadget.gadgetbridge.devices.pebble.PebbleInstallable;
import nodomain.freeyourgadget.gadgetbridge.service.GBDeviceIoThread; import nodomain.freeyourgadget.gadgetbridge.service.bt.GBDeviceIoThread;
import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventAppInfo; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventAppInfo;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventAppManagementResult; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventAppManagementResult;
import nodomain.freeyourgadget.gadgetbridge.service.GBDeviceProtocol; import nodomain.freeyourgadget.gadgetbridge.service.bt.GBDeviceProtocol;
public class PebbleIoThread extends GBDeviceIoThread { public class PebbleIoThread extends GBDeviceIoThread {
private static final Logger LOG = LoggerFactory.getLogger(PebbleIoThread.class); private static final Logger LOG = LoggerFactory.getLogger(PebbleIoThread.class);

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/PebbleProtocol.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.service.pebble; package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
import android.util.Pair; import android.util.Pair;
@ -24,7 +24,7 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventMusicContr
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventScreenshot; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventScreenshot;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSendBytes; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSendBytes;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
import nodomain.freeyourgadget.gadgetbridge.service.GBDeviceProtocol; import nodomain.freeyourgadget.gadgetbridge.service.bt.GBDeviceProtocol;
public class PebbleProtocol extends GBDeviceProtocol { public class PebbleProtocol extends GBDeviceProtocol {

8
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/PebbleSupport.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java
View File

@ -1,13 +1,13 @@
package nodomain.freeyourgadget.gadgetbridge.service.pebble; package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
import android.net.Uri; import android.net.Uri;
import java.util.ArrayList; import java.util.ArrayList;
import nodomain.freeyourgadget.gadgetbridge.model.Alarm; import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
import nodomain.freeyourgadget.gadgetbridge.service.AbstractBTDeviceSupport; import nodomain.freeyourgadget.gadgetbridge.service.bt.AbstractBTDeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.GBDeviceIoThread; import nodomain.freeyourgadget.gadgetbridge.service.bt.GBDeviceIoThread;
import nodomain.freeyourgadget.gadgetbridge.service.GBDeviceProtocol; import nodomain.freeyourgadget.gadgetbridge.service.bt.GBDeviceProtocol;
public class PebbleSupport extends AbstractBTDeviceSupport { public class PebbleSupport extends AbstractBTDeviceSupport {

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/WeatherNeatSupport.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/WeatherNeatSupport.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.service.pebble; package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
import android.util.Pair; import android.util.Pair;