S16_support

Wheellog · Feb 29, 2024 · ebe6f72 · ebe6f72
1 parent 6628d1e
commit ebe6f72
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/app/src/main/java/com/cooper/wheellog/MainPageAdapter.kt b/app/src/main/java/com/cooper/wheellog/MainPageAdapter.kt
@@ -714,7 +714,7 @@ class MainPageAdapter(private var pages: MutableList<Int>, val activity: MainAct
         smartBms2PageValues.clear()
         when (WheelData.getInstance().wheelType) {
             WHEEL_TYPE.KINGSONG -> {
-                if (inArray(WheelData.getInstance().model, arrayOf("KS-S20", "KS-S22"))) {
+                if (inArray(WheelData.getInstance().model, arrayOf("KS-S20", "KS-S22", "KS-S19", "KS-S16"))) {
                     addPage(R.layout.main_view_smart_bms, 2)
                     setupFieldForSmartBmsPage(R.string.bmsSn)
                     setupFieldForSmartBmsPage(R.string.bmsFw)

diff --git a/app/src/main/java/com/cooper/wheellog/utils/KingsongAdapter.java b/app/src/main/java/com/cooper/wheellog/utils/KingsongAdapter.java
@@ -350,7 +350,7 @@ public void setLightMode(int lightMode) {
 
     private boolean is84vWheel() {
         WheelData wd = WheelData.getInstance();
-        return StringUtil.inArray(wd.getModel(), new String[]{"KS-18L", "KS-16X", "KS-16XF", "RW", "KS-18LH", "KS-18LY", "KS-S18"})
+        return StringUtil.inArray(wd.getModel(), new String[]{"KS-18L", "KS-16X", "KS-16XF", "RW", "KS-18LH", "KS-18LY", "KS-S18", "KS-S16"})
                 || wd.getName().startsWith("ROCKW") // support rockwheel models
                 || wd.getBtName().compareTo("RW") == 0;
     }

diff --git a/app/src/main/res/raw/bluetooth_services.json b/app/src/main/res/raw/bluetooth_services.json
@@ -169,6 +169,41 @@
       "0000ffe1-0000-1000-8000-00805f9b34fb"
     ]
   },
+  {
+    "adapter": "kingsong",
+    "00001800-0000-1000-8000-00805f9b34fb": [
+      "00002a00-0000-1000-8000-00805f9b34fb",
+      "00002a01-0000-1000-8000-00805f9b34fb",
+      "00002a04-0000-1000-8000-00805f9b34fb",
+      "00002ac9-0000-1000-8000-00805f9b34fb"
+    ],
+    "00001801-0000-1000-8000-00805f9b34fb": [
+      "00002a05-0000-1000-8000-00805f9b34fb"
+    ],
+    "0000180a-0000-1000-8000-00805f9b34fb": [
+      "00002a23-0000-1000-8000-00805f9b34fb",
+      "00002a24-0000-1000-8000-00805f9b34fb",
+      "00002a25-0000-1000-8000-00805f9b34fb",
+      "00002a26-0000-1000-8000-00805f9b34fb",
+      "00002a27-0000-1000-8000-00805f9b34fb",
+      "00002a28-0000-1000-8000-00805f9b34fb",
+      "00002a29-0000-1000-8000-00805f9b34fb",
+      "00002a50-0000-1000-8000-00805f9b34fb"
+    ],
+    "02f00000-0000-0000-0000-00000000fe00": [
+      "02f00000-0000-0000-0000-00000000ff03",
+      "02f00000-0000-0000-0000-00000000ff02",
+      "02f00000-0000-0000-0000-00000000ff00",
+      "02f00000-0000-0000-0000-00000000ff01"
+    ],
+    "0000ffe0-0000-1000-8000-00805f9b34fb": [
+      "0000ffe1-0000-1000-8000-00805f9b34fb",
+      "0000fff3-0000-1000-8000-00805f9b34fb",
+      "0000fff5-0000-1000-8000-00805f9b34fb",
+      "0783b03e-8535-b5a0-7140-a304d2495cba",
+      "0783b03e-8535-b5a0-7140-a304d2495cb8"
+    ]
+  },
   {
     "adapter": "kingsong",
     "00001800-0000-1000-8000-00805f9b34fb": [