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

Modified to compe with parameters sent by Garmin connectIQ makeWebRequest() function (and Merge branch 'V2.5' into V2.6)

Browse Source
This commit is contained in:
Graham Jones
2017-10-14 22:36:28 +01:00
parent 27f62ec347 b1b8659d55
commit 30bdc6bac5
7 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/app-release-2.5.2.apk Normal file
View File

Binary file not shown.

4
app/build.gradle
View File

@@ -7,8 +7,8 @@ android {
defaultConfig {
applicationId "uk.org.openseizuredetector"
minSdkVersion 20
targetSdkVersion 24
minSdkVersion 14
targetSdkVersion 14
}
buildTypes {

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

@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="uk.org.openseizuredetector"
android:versionCode="37"
android:versionCode="38"
android:versionName="2.6.0">
android:versionName="2.5.3">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

BIN
app/src/main/assets/pebble_sd.pbw
View File

Binary file not shown.

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

@@ -275,7 +275,7 @@ public class MainActivity extends Activity {
TextView tv;
tv = (TextView) findViewById(R.id.versionTv);
String versionName = mUtil.getAppVersionName();
tv.setText("OpenSeizureDetector Server Version " + versionName);
tv.setText("OpenSeizureDetector Android App Version " + versionName);
mUtil.writeToSysLogFile("MainActivity.onStart - Binding to Server");
mUtil.bindToServer(this, mConnection);

6
app/src/main/java/uk/org/openseizuredetector/SdWebServer.java
View File

@@ -90,10 +90,10 @@ public class SdWebServer extends NanoHTTPD {
Log.v(TAG, "WebServer.serve() - POST /data - receiving data from device: parameters=" + parameters.toString());
Log.v(TAG, " header=" + header.toString());
Log.v(TAG, " files=" + files.toString());
String postData = files.get("postData");
Log.v(TAG, " postData=" + postData);
//String postData = files.get("postData");
//Log.v(TAG, " postData=" + postData);
// Send the data to the SdDataSource so the app can pick it up.
mSdServer.mSdDataSource.updateFromJSON(postData);
mSdServer.mSdDataSource.updateFromJSON(parameters.toString());
break;
default:
Log.v(TAG, "WebServer.serve() - Unrecognised method - " + method);