gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved to use v3 of Pebblekit library for compatibility with Pebble Time. - Release 2.0a for testing.

Browse Source
This commit is contained in:
Graham Jones
2016-01-16 19:16:58 +00:00
parent 6d4c2495b8
commit be7814c9b8
7 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/app-release-2.0a.apk Normal file
View File

Binary file not shown.

BIN
app/app-release.apk
View File

Binary file not shown.

5
app/app.iml
View File

@@ -72,6 +72,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.getpebble/pebblekit/3.0.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
@@ -89,12 +90,12 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" scope="TEST" name="mockable-android-22" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
<orderEntry type="library" exported="" name="pebblekit-3.0.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
<orderEntry type="library" exported="" name="pebblekit-2.6.0-eclipse" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.10.19" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.1" level="project" />
<orderEntry type="library" exported="" name="mpandroidchartlibrary-2-0-7" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="objenesis-2.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />

12
app/build.gradle
View File

@@ -6,8 +6,8 @@ android {
defaultConfig {
applicationId "uk.org.openseizuredetector"
minSdkVersion 11
targetSdkVersion 11
minSdkVersion 14
targetSdkVersion 14
}
buildTypes {
@@ -24,7 +24,8 @@ android {
dependencies {
compile files('libs/mpandroidchartlibrary-2-0-7.jar')
compile files('libs/pebblekit-2.6.0-eclipse.jar')
//compile files('libs/pebblekit-2.6.0-eclipse.jar')
compile 'com.getpebble:pebblekit:3.0.0@aar'
// Unit testing dependencies
testCompile 'junit:junit:4.12'
@@ -36,3 +37,8 @@ dependencies {
compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:support-v4:22.2.1'
}
repositories {
mavenCentral()
maven { url "https://oss.sonatype.org/content/groups/public/" }
}

2
app/src/main/AndroidManifest.xml
View File

@@ -4,7 +4,7 @@
android:versionCode="17"
android:versionName="2.0a" >
<uses-sdk android:minSdkVersion="11" />
<uses-sdk android:minSdkVersion="14" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

4
app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java
View File

@@ -94,7 +94,6 @@ public class SdDataSourcePebble extends SdDataSource {
private int DATA_TYPE_RESULTS = 1; // Analysis Results
private int DATA_TYPE_SETTINGS = 2; // Settings
private int DATA_TYPE_SPEC = 3; // FFT Spectrum (or part of a spectrum)
public SdDataSourcePebble(Context context, SdDataReceiver sdDataReceiver) {
super(context,sdDataReceiver);
mName = "Pebble";
@@ -344,6 +343,9 @@ public class SdDataSourcePebble extends SdDataSource {
}
};
PebbleKit.registerReceivedDataHandler(mContext, msgDataHandler);
// We struggle to connect to pebble time if app is already running, so stop app so we can
// re-connect to it.
stopWatchApp();
}
/**

2
app/src/main/java/uk/org/openseizuredetector/SdServer.java
View File

@@ -636,7 +636,7 @@ public class SdServer extends Service implements SdDataReceiver {
SharedPreferences SP = PreferenceManager
.getDefaultSharedPreferences(getBaseContext());
try {
mSdDataSourceName = SP.getString("DataSource", "undefined");
mSdDataSourceName = SP.getString("DataSource", "Pebble");
Log.v(TAG, "updatePrefs() - DataSource = " + mSdDataSourceName);
mLatchAlarms = SP.getBoolean("LatchAlarms", false);
Log.v(TAG, "updatePrefs() - mLatchAlarms = " + mLatchAlarms);