Support for OKOK Nameless (v3), Merge Yoda1 and OkOk handlers (#1233)

* Restore the support for OKOK Nameless scales

* 2 digit precision

* Merge OkOkHandler and Yoda1Handler

---------

Co-authored-by: Florin9doi <Florin9doi@users.noreply.github.com>

Author: Florin9doi

android_app/app/src/main/java/com/health/openscale/core/bluetooth/ScaleFactory.kt

@@ -54,7 +54,6 @@ import com.health.openscale.core.bluetooth.scales.SppScaleAdapter
 import com.health.openscale.core.bluetooth.scales.StandardBeurerSanitasHandler
 import com.health.openscale.core.bluetooth.scales.TrisaBodyAnalyzeHandler
 import com.health.openscale.core.bluetooth.scales.TuningProfile
-import com.health.openscale.core.bluetooth.scales.Yoda1Handler
 import com.health.openscale.core.bluetooth.scales.YunmaiHandler
 import com.health.openscale.core.facade.MeasurementFacade
 import com.health.openscale.core.facade.SettingsFacade
@@ -86,7 +85,6 @@ class ScaleFactory @Inject constructor(
     private val modernKotlinHandlers: List<ScaleDeviceHandler> = listOf(
         YunmaiHandler(isMini = false),
         YunmaiHandler(isMini = true),
-        Yoda1Handler(),
         TrisaBodyAnalyzeHandler(),
         SanitasSbf72Handler(),
         StandardBeurerSanitasHandler(),

android_app/app/src/main/java/com/health/openscale/core/bluetooth/scales/OkOkHandler.kt

@@ -30,7 +30,7 @@ import com.health.openscale.core.utils.ConverterUtils
  *  - "OKOK V20"  (manufacturer id 0x20CA): stable flag + XOR checksum
  *  - "OKOK V11"  (manufacturer id 0x11CA): XOR checksum, unit & resolution in body properties
  *  - "OKOK VF0"  (manufacturer id 0xF0FF): simple weight field
- *  - "OKOK Nameless" (any manufacturer id where low byte == 0xC0): MAC-embedded, unit & resolution in attrib
+ *  - "OKOK C0" (any manufacturer id where low byte == 0xC0): MAC-embedded, unit & resolution in attrib
  *
  * Link mode: BROADCAST_ONLY (no GATT connection).
  */
@@ -59,31 +59,40 @@ class OkOkHandler : ScaleDeviceHandler() {
     private val IDX_VF0_WEIGHT_MSB = 3
     private val IDX_VF0_WEIGHT_LSB = 2
 
-    // Nameless/0xC0 indices
+    // 0xC0 indices
     private val IDX_WEIGHT_MSB = 0
     private val IDX_WEIGHT_LSB = 1
     private val IDX_ATTRIB     = 6
     private val UNIT_KG   = 0
+    private val UNIT_JIN  = 1
     private val UNIT_LB   = 2
     private val UNIT_STLB = 3
 
+    private val NamelessAlias = "OKOK Nameless"
+
     /**
      * Decide support + build a *dynamic* displayName based on manufacturer data present
      * in the advertisement that matched this device.
      */
     override fun supportFor(device: ScannedDeviceInfo): DeviceSupport? {
         val m = device.manufacturerData ?: return null
 
+        if (device.name.isEmpty() && containsLowByteC0(m))
+            device.name = NamelessAlias
         val name = device.name
 
-        val supports = name.equals("NoName OkOk") || name.equals("ADV") || name.equals("Chipsea-BLE")
+        val supports = name.equals(NamelessAlias)
+                    || name.equals("ADV")
+                    || name.equals("Chipsea-BLE")
+                    || name.startsWith("Yoda0", ignoreCase = true)
+                    || name.startsWith("Yoda1", ignoreCase = true)
         if (!supports) return null
 
         val variantName = when {
             hasKey(m, MANUF_V20) -> "OKOK V20"
             hasKey(m, MANUF_V11) -> "OKOK V11"
             hasKey(m, MANUF_VF0) -> "OKOK VF0"
-            containsLowByteC0(m) -> "OKOK Nameless"
+            containsLowByteC0(m) -> "OKOK C0"
             else -> null
         } ?: return null
 
@@ -128,8 +137,8 @@ class OkOkHandler : ScaleDeviceHandler() {
             return BroadcastAction.CONSUMED_STOP
         }
 
-        // Fallback: nameless 0xC0 vendor
-        parseNameless(m)?.let { kg ->
+        // Fallback: 0xC0 vendor
+        parseC0(m)?.let { kg ->
             publish(ScaleMeasurement().apply { userId = user.id; weight = kg })
             return BroadcastAction.CONSUMED_STOP
         }
@@ -186,10 +195,10 @@ class OkOkHandler : ScaleDeviceHandler() {
 
         // unit ((props >> 3) & 3)
         return when ((props shr 3) and 0x3) {
-            0 -> weight / divider                              // kg
-            1 -> weight / (divider * 2.0f)                      // jin → kg (approx.)
-            2 -> (weight / divider) / 2.204623f                 // lb  → kg
-            3 -> {                                              // st&lb
+            UNIT_KG -> weight / divider
+            UNIT_JIN -> weight / (divider * 2.0f)
+            UNIT_LB -> (weight / divider) / 2.204623f
+            UNIT_STLB -> {
                 val stones = (weight shr 8)
                 val pounds = (weight and 0xFF) / divider
                 stones * 6.350293f + pounds * 0.453592f
@@ -205,7 +214,7 @@ class OkOkHandler : ScaleDeviceHandler() {
         return raw / 10.0f
     }
 
-    private fun parseNameless(m: SparseArray<ByteArray>): Float? {
+    private fun parseC0(m: SparseArray<ByteArray>): Float? {
         val key = firstKeyWithLowByteC0(m) ?: return null
         val data = m.get(key) ?: return null
         if (data.size < 13) return null
@@ -226,6 +235,10 @@ class OkOkHandler : ScaleDeviceHandler() {
                 val raw = u16be(data[IDX_WEIGHT_MSB], data[IDX_WEIGHT_LSB])
                 raw / divider
             }
+            UNIT_JIN -> {
+                val raw = u16be(data[IDX_WEIGHT_MSB], data[IDX_WEIGHT_LSB])
+                raw / divider / 2
+            }
             UNIT_LB -> {
                 val raw = u16be(data[IDX_WEIGHT_MSB], data[IDX_WEIGHT_LSB])
                 ConverterUtils.toKilogram(raw / divider, WeightUnit.LB)

android_app/app/src/main/java/com/health/openscale/core/bluetooth/scales/Yoda1Handler.kt

@@ -52,7 +52,7 @@ import androidx.core.util.isNotEmpty
  * @property determinedHandlerDisplayName The display name of the handler determined for this device, if any.
  */
 data class ScannedDeviceInfo(
-    val name: String,
+    var name: String,
     val address: String,
     val rssi: Int,
     val serviceUuids: List<UUID>,

android_app/app/src/main/java/com/health/openscale/core/service/BleScanner.kt

@@ -20,8 +20,6 @@ package com.health.openscale.core.utils
 import com.health.openscale.core.data.MeasureUnit
 import com.health.openscale.core.data.UnitType
 import com.health.openscale.core.data.WeightUnit
-import java.text.NumberFormat
-import java.util.Locale
 import kotlin.math.floor
 import kotlin.math.roundToInt
 

android_app/app/src/main/java/com/health/openscale/core/utils/ConverterUtils.kt

@@ -143,7 +143,7 @@ object LocaleUtils {
                 val (st, lb) = ConverterUtils.decimalStToStLb(absVal)
                 "$signPrefix$st st $lb lb"
             }
-            UnitType.KG  -> "$signPrefix${formatNumber(absVal, maxFraction = 1, locale)} kg"
+            UnitType.KG  -> "$signPrefix${formatNumber(absVal, maxFraction = 2, locale)} kg"
             UnitType.LB  -> "$signPrefix${formatNumber(absVal, maxFraction = 1, locale)} lb"
             UnitType.PERCENT -> "$signPrefix${formatNumber(absVal, maxFraction = 1, locale)} %"
             UnitType.CM  -> "$signPrefix${formatNumber(absVal, maxFraction = 1, locale)} cm"