diff options
author | Bjørn Mork <bjorn@mork.no> | 2019-05-30 22:02:15 +0200 |
---|---|---|
committer | Bjørn Mork <bjorn@mork.no> | 2019-05-31 14:51:51 +0200 |
commit | 6ff4c162dd984b2cfd61d2e9019cefbdb4446d47 (patch) | |
tree | 22415fb433b7b5c107a45a6a8d1733e0d91daac4 | |
parent | 33f293216833f91306e495992b3d02d64765ef2e (diff) |
splitting into KV pairs
Signed-off-by: Bjørn Mork <bjorn@mork.no>
-rw-r--r-- | Defogger/res/layout/activity_main.xml | 13 | ||||
-rw-r--r-- | Defogger/src/no/mork/android/defogger/MainActivity.java | 19 |
2 files changed, 29 insertions, 3 deletions
diff --git a/Defogger/res/layout/activity_main.xml b/Defogger/res/layout/activity_main.xml index 70dbdfa..90d876d 100644 --- a/Defogger/res/layout/activity_main.xml +++ b/Defogger/res/layout/activity_main.xml @@ -1,6 +1,7 @@ -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_height="match_parent" + android:orientation="vertical" > <TextView android:id="@+id/hello_text" @@ -17,4 +18,10 @@ android:layout_height="wrap_content" android:text="@string/start_scan"/> -</RelativeLayout> + <EditText + android:id="@+id/pincode" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:inputType="numberPassword" /> + +</LinearLayout> diff --git a/Defogger/src/no/mork/android/defogger/MainActivity.java b/Defogger/src/no/mork/android/defogger/MainActivity.java index c9baf69..e15f31d 100644 --- a/Defogger/src/no/mork/android/defogger/MainActivity.java +++ b/Defogger/src/no/mork/android/defogger/MainActivity.java @@ -15,8 +15,11 @@ import android.os.Bundle; import android.util.Log; import android.view.View; import android.widget.Button; +import android.widget.EditText; import android.widget.TextView; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.UUID; import no.mork.android.defogger.ScannerActivity; @@ -107,6 +110,16 @@ public class MainActivity extends Activity implements GattClientActionListener { } + private Map<String,String> splitKV(String kv) + { + Map<String,String> ret = new HashMap(); + + for (String s : kv.split(";")) { + String[] foo = s.split("="); + ret.put(foo[0], foo[1]); + } + return ret; + } // Gatt connection @@ -141,7 +154,13 @@ public class MainActivity extends Activity implements GattClientActionListener { } public void onCharacteristicRead (BluetoothGatt gatt, BluetoothGattCharacteristic c, int status) { + EditText pincode = (EditText) findViewById(R.id.pincode); + Map<String,String> kv = splitKV(c.getStringValue(0)); + Log.d(msg, c.getUuid().toString() + " read " + c.getStringValue(0)); + Log.d(msg, "pincode is " + pincode.getText()); + Log.d(msg, "challenge is " + kv.get("C")); + } } |