Added onboard/mp3 horn option and new theme.

Author: JumpMaster

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.cooper.wheellog"
         minSdkVersion 18
         targetSdkVersion 24
-        versionCode 1
-        versionName "0.1"
+        versionCode 2
+        versionName "0.9"
     }
     buildTypes {
         release {
@@ -23,4 +23,6 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.getpebble:pebblekit:3.0.0'
     compile 'com.android.support:appcompat-v7:24.0.0'
+    compile 'com.android.support:design:24.0.0'
+    compile 'com.android.support:gridlayout-v7:24.0.0'
 }

app/src/main/AndroidManifest.xml

@@ -9,14 +9,18 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
+        android:name=".WheelLog"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:resizeableActivity="false"
+        android:supportsPictureInPicture="false">
         <activity
             android:name=".MainActivity"
-            android:launchMode="singleInstance">
+            android:launchMode="singleInstance"
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

app/src/main/java/com/cooper/wheellog/BluetoothLeService.java

@@ -12,11 +12,11 @@
 import android.bluetooth.BluetoothGattService;
 import android.bluetooth.BluetoothManager;
 import android.bluetooth.BluetoothProfile;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Binder;
-import android.os.Handler;
 import android.os.IBinder;
 import android.support.v7.app.NotificationCompat;
 import android.util.Log;
@@ -49,15 +49,58 @@ public class BluetoothLeService extends Service {
     public static final int STATE_CONNECTING = 1;
     public static final int STATE_CONNECTED = 2;
 
-    private Handler mHandler = new Handler();
+
+    private final BroadcastReceiver messageReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (mConnectionState != STATE_CONNECTED)
+                return;
+
+            final String action = intent.getAction();
+            if (Constants.ACTION_REQUEST_NAME_DATA.equals(action)) {
+
+                byte[] data = new byte[20];
+                data[0] = (byte) -86;
+                data[1] = (byte) 85;
+                data[16] = (byte) -101;
+                data[17] = (byte) 20;
+                data[18] = (byte) 90;
+                data[19] = (byte) 90;
+                writeBluetoothGattCharacteristic(data);
+            } else if (Constants.ACTION_REQUEST_SERIAL_DATA.equals(action)) {
+
+                byte[] data = new byte[20];
+                data[0] = (byte) -86;
+                data[1] = (byte) 85;
+                data[16] = (byte) 99;
+                data[17] = (byte) 20;
+                data[18] = (byte) 90;
+                data[19] = (byte) 90;
+                writeBluetoothGattCharacteristic(data);
+            } else if (Constants.ACTION_REQUEST_HORN.equals(action)) {
+
+                byte[] data = new byte[20];
+                data[0] = (byte) -86;
+                data[1] = (byte) 85;
+                data[16] = (byte) -120;
+                data[17] = (byte) 20;
+                data[18] = (byte) 90;
+                data[19] = (byte) 90;
+                writeBluetoothGattCharacteristic(data);
+            }
+        }
+    };
 
     public static IntentFilter makeBluetoothUpdateIntentFilter() {
         final IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(Constants.ACTION_BLUETOOTH_CONNECTING);
         intentFilter.addAction(Constants.ACTION_BLUETOOTH_CONNECTED);
         intentFilter.addAction(Constants.ACTION_BLUETOOTH_DISCONNECTED);
         intentFilter.addAction(Constants.ACTION_BLUETOOTH_DATA_AVAILABLE);
         intentFilter.addAction(Constants.ACTION_WHEEL_DATA_AVAILABLE);
         intentFilter.addAction(Constants.ACTION_REQUEST_SERIAL_DATA);
+        intentFilter.addAction(Constants.ACTION_REQUEST_NAME_DATA);
+        intentFilter.addAction(Constants.ACTION_REQUEST_HORN);
         return intentFilter;
     }
 
@@ -84,7 +127,7 @@ public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState
 
             } else if (newState == BluetoothProfile.STATE_DISCONNECTED) {
                 mConnectionState = STATE_DISCONNECTED;
-                Wheel.getInstance().setConnectionState(false);
+                ((WheelLog) getApplicationContext()).setConnectionState(false);
                 LOGI("Disconnected from GATT server.");
                 broadcastUpdate(Constants.ACTION_BLUETOOTH_DISCONNECTED);
             }
@@ -120,7 +163,6 @@ public void onServicesDiscovered(BluetoothGatt gatt, int status) {
                 BluetoothGattDescriptor descriptor = characteristic.getDescriptor(UUID.fromString(BluetoothLeService.DESCRIPTER_UUID));
                 descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
                 mBluetoothGatt.writeDescriptor(descriptor);
-                mConnectionState = BluetoothLeService.STATE_CONNECTED;
                 mConnectionState = STATE_CONNECTED;
                 return;
             }
@@ -150,9 +192,7 @@ public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteris
 //                    stringBuilder.append(String.format("%02X ", objArr));
 //                }
 //                LOGI("received data = " + stringBuilder);
-                int result = Wheel.getInstance().decodeResponse(value);
-                if (result == Constants.REQUEST_SERIAL_DATA)
-                    sendBroadcast(new Intent(Constants.ACTION_REQUEST_SERIAL_DATA));
+                ((WheelLog) getApplicationContext()).decodeResponse(value);
 
                 Intent intent = new Intent(Constants.ACTION_WHEEL_DATA_AVAILABLE);
                 sendBroadcast(intent);
@@ -164,7 +204,7 @@ public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descri
             super.onDescriptorWrite(gatt, descriptor, status);
             LOGI("onDescriptorWrite " + String.valueOf(status));
             if (status == BluetoothGatt.GATT_SUCCESS) {
-                Wheel.getInstance().setConnectionState(true);
+                ((WheelLog) getApplicationContext()).setConnectionState(true);
                 broadcastUpdate(Constants.ACTION_BLUETOOTH_CONNECTED);
             }
         }
@@ -202,6 +242,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                 .setContentIntent(pendingIntent)
                 .build();
 
+        registerReceiver(messageReceiver, makeBluetoothUpdateIntentFilter());
         startForeground(1, notification);
 
         return START_STICKY;
@@ -263,6 +304,7 @@ public boolean connect(final String address) {
             Log.d(TAG, "Trying to use an existing mBluetoothGatt for connection.");
             if (mBluetoothGatt.connect()) {
                 mConnectionState = STATE_CONNECTING;
+                broadcastUpdate(Constants.ACTION_BLUETOOTH_CONNECTING);
                 return true;
             } else {
                 return false;
@@ -279,6 +321,7 @@ public boolean connect(final String address) {
         Log.d(TAG, "Trying to create a new connection.");
         mBluetoothDeviceAddress = address;
         mConnectionState = STATE_CONNECTING;
+        broadcastUpdate(Constants.ACTION_BLUETOOTH_CONNECTING);
         return true;
     }
 
@@ -305,7 +348,6 @@ public void disconnect() {
      * released properly.
      */
     public void close() {
-        mHandler.removeCallbacksAndMessages(null);
 
         if (mBluetoothGatt == null) {
             return;

app/src/main/java/com/cooper/wheellog/Constants.java

@@ -4,17 +4,21 @@
 
 public class Constants {
 
+    public static final String ACTION_BLUETOOTH_CONNECTING = "com.cooper.wheellog.bluetoothConnecting";
     public static final String ACTION_BLUETOOTH_CONNECTED = "com.cooper.wheellog.bluetoothConnected";
     public static final String ACTION_BLUETOOTH_DISCONNECTED = "com.cooper.wheellog.bluetoothDisconnected";
     public static final String ACTION_BLUETOOTH_DATA_AVAILABLE = "com.cooper.wheellog.bluetoothDataAvailable";
     public static final String ACTION_WHEEL_DATA_AVAILABLE = "com.cooper.wheellog.wheelDataAvailable";
     public static final String ACTION_REQUEST_SERIAL_DATA = "com.cooper.wheellog.requestSerialData";
+    public static final String ACTION_REQUEST_NAME_DATA = "com.cooper.wheellog.requestNameData";
+    public static final String ACTION_REQUEST_HORN = "com.cooper.wheellog.requestHorn";
 //    public static final String ACTION_PEBBLE_SERVICE_STARTED = "com.cooper.wheellog.pebbleServiceStarted";
 //    public static final String ACTION_LOGGING_SERVICE_STARTED = "com.cooper.wheellog.loggingServiceStarted";
 
     public static final UUID PEBBLE_APP_UUID = UUID.fromString("185c8ae9-7e72-451a-a1c7-8f1e81df9a3d");
-    public static final int PEBBLE_KEY_LAUNCH_APP = 10007;
-    public static final int PEBBLE_KEY_PLAY_HORN = 10008;
+    public static final int PEBBLE_KEY_LAUNCH_APP = 10008;
+    public static final int PEBBLE_KEY_PLAY_HORN = 10009;
+    public static final int PEBBLE_KEY_PLAY_HORN_MP3 = 10010;
 
     public static final String LAUNCHED_FROM_PEBBLE = "launched_from_pebble";
 

app/src/main/java/com/cooper/wheellog/DataLogger.java

@@ -27,6 +27,7 @@ public class DataLogger extends Service
     SimpleDateFormat sdf;
     private boolean fileExists;
     private File file;
+    private WheelLog wheelLog;
 
     public static boolean isInstanceCreated() {
         return instance != null;
@@ -69,7 +70,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
             file = new File(dir, fileName);
             fileExists = file.exists();
-
+            wheelLog = (WheelLog) getApplicationContext();
             Log.d(TAG, "DataLogger Started");
             return START_STICKY;
         }
@@ -120,13 +121,13 @@ private void writeToSDFile(){
 
             pw.println(String.format(Locale.US, "%s,%f,%f,%f,%d,%f,%d,%d",
                     sdf.format(new Date()),
-                    Wheel.getInstance().getSpeedDouble(),
-                    Wheel.getInstance().getVoltageDouble(),
-                    Wheel.getInstance().getCurrentDouble(),
-                    Wheel.getInstance().getBatteryLevel(),
-                    Wheel.getInstance().getCurrentDistanceDouble(),
-                    Wheel.getInstance().getTemperature(),
-                    Wheel.getInstance().getFanStatus()
+                    wheelLog.getSpeedDouble(),
+                    wheelLog.getVoltageDouble(),
+                    wheelLog.getCurrentDouble(),
+                    wheelLog.getBatteryLevel(),
+                    wheelLog.getDistanceDouble(),
+                    wheelLog.getTemperature(),
+                    wheelLog.getFanStatus()
                     ));
             pw.flush();
             pw.close();