添加DFU 的服务

Author: xiaoyunfei

app/build.gradle

@@ -38,6 +38,8 @@ android {
 }
 
 dependencies {
+ androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
  implementation 'androidx.navigation:navigation-fragment-ktx:2.3.2'
  implementation 'androidx.navigation:navigation-ui-ktx:2.3.2'
  implementation 'androidx.multidex:multidex:2.0.1'

app/src/androidTest/java/org/eson/liteble/ExampleInstrumentedTest.kt

@@ -0,0 +1,42 @@
+package org.eson.liteble
+
+import android.os.SystemClock
+import android.util.Log
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.eson.log.LogUtils
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.text.SimpleDateFormat
+import java.util.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+ @Test
+ fun useAppContext() {
+ LogUtils.d("11111111111111")
+ // Context of the app under test.
+ val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+ assertEquals("org.eson.liteble.test", appContext.packageName)
+
+ test()
+
+ }
+
+
+ private fun test() {
+ val rxTimestampMillis = System.currentTimeMillis() -
+ SystemClock.elapsedRealtime() +
+ 233821638290418L / 1000000
+ println("rxTimestampMillis = $rxTimestampMillis")
+ val rxDate = Date(rxTimestampMillis)
+ val sDate = SimpleDateFormat("HH:mm:ss.SSS").format(rxDate)
+ println("sDate = $sDate")
+ }
+}

app/src/main/java/org/eson/liteble/common/util/BleUUIDUtil.java

@@ -30,6 +30,10 @@
 
 public class BleUUIDUtil {
 
+ private static final int COMPANY_ID_MICROSOFT = 0x0006;
+ private static final int COMPANY_ID_APPLE = 0x004C;
+ private static final int COMPANY_ID_NORDIC_SEMI = 0x0059;
+
  public static final String UUID_FORMAT = "0000%04x-0000-1000-8000-00805f9b34fb";
 
  public static final String UNKNOWN_SERVICE = "Unknown Service";
@@ -39,6 +43,8 @@ public static final class GattService {
  public static final int Generic_Access = 0x1800;
  public static final int Generic_Attribute = 0x1801;
  public static final int Device_Information = 0x180A;
+ public static final int Nordic_Service = 0x1530;
+
  }
 
 
@@ -51,23 +57,30 @@ public static final class GattCharacteristics {
  public static final int Firmware_Revision_String = 0x2A26;
  public static final int Hardware_Revision_String = 0x2A27;
  public static final int Manufacturer_Name_String = 0x2A29;
+
+ public static final int DFU_Control_Point = 0x1531;
+ public static final int DFU_Packet = 0x1532;
+ public static final int DFU_Status_Report = 0x1533;
+ public static final int DFU_Revision = 0x1534;
  }
 
 
  public static String getServiceNameByUUID(UUID uuid) {
  int serviceID = getValue(uuid);
- UUID uuid1 = makeUUID(serviceID);
+// UUID uuid1 = makeUUID(serviceID);
 
- if (!TextUtils.equals(uuid.toString(), uuid1.toString())) {
- return UNKNOWN_SERVICE;
- }
+// if (!TextUtils.equals(uuid.toString(), uuid1.toString())) {
+// return UNKNOWN_SERVICE;
+// }
  switch (serviceID) {
  case GattService.Generic_Access:
  return "Generic Access";
  case GattService.Generic_Attribute:
  return "Generic Attribute";
  case GattService.Device_Information:
  return "Device Information";
+ case GattService.Nordic_Service:
+ return "Nordic (DFU) Service";
  default:
  return UNKNOWN_SERVICE;
  }
@@ -76,11 +89,11 @@ public static String getServiceNameByUUID(UUID uuid) {
 
  public static String getCharacterNameByUUID(UUID characterUUID) {
  int characterID = getValue(characterUUID);
- UUID uuid1 = makeUUID(characterID);
-
- if (!TextUtils.equals(characterUUID.toString(), uuid1.toString())) {
- return UNKNOWN_CHARACTER;
- }
+// UUID uuid1 = makeUUID(characterID);
+//
+// if (!TextUtils.equals(characterUUID.toString(), uuid1.toString())) {
+// return UNKNOWN_CHARACTER;
+// }
 
  switch (characterID) {
  case GattCharacteristics.Device_Name:
@@ -97,6 +110,15 @@ public static String getCharacterNameByUUID(UUID characterUUID) {
  return "Hardware Revision String";
  case GattCharacteristics.Manufacturer_Name_String:
  return "Manufacturer Name String";
+
+ case GattCharacteristics.DFU_Control_Point:
+ return "DFU Control Point";
+ case GattCharacteristics.DFU_Packet:
+ return "DFU Packet";
+ case GattCharacteristics.DFU_Status_Report:
+ return "DFU Status Report";
+ case GattCharacteristics.DFU_Revision:
+ return "DFU Revision";
  default:
  return UNKNOWN_CHARACTER;
  }

app/src/main/java/org/eson/liteble/main/ScannerLiveData.kt

@@ -9,7 +9,6 @@ import org.eson.log.LogUtils
 class ScannerLiveData : LiveData<ScannerLiveData>() {
 
  private val scanResultList = mutableListOf<ScanResult>()
-
  fun getScanResultList(): MutableList<ScanResult> {
  scanResultList.sortByDescending {
  it.rssi

app/src/main/java/org/eson/liteble/main/adapter/ScanBLEItem.java

@@ -8,6 +8,8 @@
 
 import org.eson.liteble.R;
 import org.eson.liteble.common.util.ByteUtil;
+import org.eson.log.LogUtils;
+import org.eson.test.band.TimeTest;
 
 import kale.adapter.item.AdapterItem;
 import no.nordicsemi.android.support.v18.scanner.ScanRecord;
@@ -70,6 +72,10 @@ public void handleData(ScanResult device, final int position) {
  rootView.setOnClickListener(v -> mOnClickListener.onItemClick(device));
 
 
+// LogUtils.d("device.isLegacy() = "+ device.isLegacy());
+// LogUtils.d("device.isConnectable() = "+ device.isConnectable());
+ TimeTest.test(device.getTimestampNanos());
+
  ScanRecord scanRecord = device.getScanRecord();
  if (scanRecord == null) {
  return;
@@ -82,17 +88,20 @@ public void handleData(ScanResult device, final int position) {
  StringBuilder builder = new StringBuilder();
  scanRet.setVisibility(View.VISIBLE);
  for (int i = 0; i < array.size(); i++) {
- int key = array.keyAt(0);
- byte[] b = (byte[]) array.get(key);
+ int key = array.keyAt(i);
+ byte[] b = array.get(key);
 
  builder.append(ByteUtil.getFormatHexString(b));
+ String s = com.shon.bluetooth.util.ByteUtil.byteToCharSequenceUTF(b);
+ LogUtils.d("s == "+ s);
  if (i != array.size() - 1) {
  builder.append("\n");
  }
  }
  scanRet.setText(builder.toString());
 
 
+
  }
 
  public interface ItemClickListener {

app/src/main/java/org/eson/test/band/Test.kt

@@ -5,6 +5,7 @@ import org.eson.liteble.common.util.ByteUtil
 
 fun main(){
 
+// TimeTest.test()
 }
 
 

app/src/main/java/org/eson/test/band/TimeTest.java

@@ -0,0 +1,18 @@
+package org.eson.test.band;
+
+import android.os.SystemClock;
+
+import org.eson.log.LogUtils;
+
+public class TimeTest {
+ public static void test(long timeNanos){
+ long rxTimestampMillis = System.currentTimeMillis() -
+ SystemClock.elapsedRealtime() +
+ timeNanos / 1000000;
+
+ LogUtils.d("rxTimestampMillis = "+ rxTimestampMillis);
+// Date rxDate = new Date(rxTimestampMillis);
+// String sDate = new SimpleDateFormat("HH:mm:ss.SSS").format(rxDate);
+// LogUtils.d("sDate = "+ sDate);
+ }
+}

bluetooth/src/main/java/com/shon/bluetooth/util/ByteUtil.java

@@ -46,6 +46,18 @@ public static String byteToCharSequence(byte[] buffer) {
  }
  return sendString;
  }
+ public static String byteToCharSequenceUTF(byte[] buffer) {
+ if (buffer == null || buffer.length == 0) {
+ return "";
+ }
+ String sendString = "";
+ try {
+ sendString = new String(buffer);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return sendString;
+ }
 
  /**
  * 把16进制字符串转换成字节数组 * @param hex * @return