From a5a016e266f8b06354201812afcc596c7df7ce68 Mon Sep 17 00:00:00 2001
From: Stefan Zabka <stefan.zabka@hu-berlin.de>
Date: Fri, 23 Aug 2019 19:37:22 +0200
Subject: [PATCH] ble: personal status fixing all of the bugs
---
.../java/de/ccc/events/badge/card10/mood/MoodFragment.kt | 8 ++++----
.../java/de/ccc/events/badge/card10/time/Card10Service.kt | 4 ++--
app/src/main/res/layout/mood_fragment.xml | 4 ++--
app/src/main/res/values/strings.xml | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/de/ccc/events/badge/card10/mood/MoodFragment.kt b/app/src/main/java/de/ccc/events/badge/card10/mood/MoodFragment.kt
index 8ee6b40..a8b3ef6 100644
--- a/app/src/main/java/de/ccc/events/badge/card10/mood/MoodFragment.kt
+++ b/app/src/main/java/de/ccc/events/badge/card10/mood/MoodFragment.kt
@@ -41,19 +41,19 @@ class MoodFragment : Fragment() {
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- mood_congress.setOnClickListener{
+ mood_chaos.setOnClickListener{
card10Service?.setPersonalState(PersonalState.CHAOS)
}
- mood_chaos.setOnClickListener{
+ mood_communication.setOnClickListener{
card10Service?.setPersonalState(PersonalState.COMMUNICATION)
}
- mood_congress.setOnClickListener{
+ mood_camp.setOnClickListener{
card10Service?.setPersonalState(PersonalState.CAMP)
}
no_contact.setOnClickListener{
card10Service?.setPersonalState(PersonalState.NO_CONTACT)
}
- no_contact.setOnClickListener{
+ no_state.setOnClickListener{
card10Service?.setPersonalState(PersonalState.NONE)
}
}
diff --git a/app/src/main/java/de/ccc/events/badge/card10/time/Card10Service.kt b/app/src/main/java/de/ccc/events/badge/card10/time/Card10Service.kt
index 1822c05..8ab408f 100644
--- a/app/src/main/java/de/ccc/events/badge/card10/time/Card10Service.kt
+++ b/app/src/main/java/de/ccc/events/badge/card10/time/Card10Service.kt
@@ -63,8 +63,8 @@ class Card10Service(
fun setPersonalState(value: PersonalState) {
personalStateCharacteristic.value = ByteArray(2)
- personalStateCharacteristic.value[0] = value.v.toByte()
- personalStateCharacteristic.value[1] = (value.v shr 8).toByte()
+ personalStateCharacteristic.value[1] = value.v.toByte()
+ personalStateCharacteristic.value[0] = (value.v shr 8).toByte()
println("=== Writing personal State array : ${personalStateCharacteristic.value[0]},${personalStateCharacteristic.value[1]} ")
ConnectionService.writeCharacteristic(personalStateCharacteristic)
}
diff --git a/app/src/main/res/layout/mood_fragment.xml b/app/src/main/res/layout/mood_fragment.xml
index ee8f213..622421e 100644
--- a/app/src/main/res/layout/mood_fragment.xml
+++ b/app/src/main/res/layout/mood_fragment.xml
@@ -13,8 +13,8 @@
android:text="@string/chaos"/>
<Button android:id="@+id/mood_communication" android:layout_width="wrap_content" android:layout_height="wrap_content"
android:text="@string/communication"/>
- <Button android:id="@+id/mood_congress" android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:text="@string/congress"/>
+ <Button android:id="@+id/mood_camp" android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:text="@string/camp"/>
<Button android:id="@+id/no_contact" android:layout_width="wrap_content" android:layout_height="wrap_content"
android:text="@string/no_contact"/>
<Button android:id="@+id/no_state" android:layout_width="wrap_content" android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ae99bfc..d789f84 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -47,7 +47,7 @@
<string name="personal_state">Personal State</string>
<string name="chaos">Chaos</string>
<string name="communication">Communication</string>
- <string name="congress">Congress</string>
+ <string name="camp">Camp</string>
<string name="no_contact">No Contact</string>
<string name="off">Off</string>
</resources>
--
GitLab