Merge branch 'develop' of https://github.com/eson-yunfei/AndroidBle into develop

# Conflicts: #	app/src/main/java/org/eson/liteble/common/DeviceState.kt #	app/src/main/java/org/eson/liteble/detail/DeviceActivity.kt #	app/src/main/java/org/eson/liteble/detail/adapter/CharacterItem.kt #	app/src/main/java/org/eson/liteble/detail/adapter/DataItem.kt #	app/src/main/java/org/eson/liteble/detail/viewmodel/ConnectViewModel.java #	app/src/main/java/org/eson/liteble/detail/viewmodel/DeviceControlViewModel.kt #	app/src/main/java/org/eson/liteble/main/MainActivity.kt #	app/src/main/java/org/eson/liteble/main/ScannerLiveData.kt #	app/src/main/java/org/eson/liteble/main/ScannerViewModel.kt #	app/src/main/java/org/eson/liteble/main/fragment/BondedFragment.java #	app/src/main/java/org/eson/liteble/main/fragment/ScanFragment.kt #	bluetooth/src/main/java/com/shon/bluetooth/ConnectDispatcher.kt

Author: eson-yunfei

app/src/main/java/org/eson/liteble/utils/ByteUtil.java

@@ -84,12 +84,12 @@ public static void printHex(byte[] buffer) {
  for (byte b : buffer) {
  String intS = Integer.toHexString(b & 0xff);
  if (intS.length() == 1) {
- sb.append("  ").append("0").append(intS);
+ sb.append(" ").append("0").append(intS);
  } else {
- sb.append("  ").append(intS);
+ sb.append(" ").append(intS);
  }
  }
- sb.append("  ]");
+ sb.append(" ]");
 // LogUtil.e(sb.toString());
  }
 
@@ -100,9 +100,9 @@ public static void print(byte[] buffer) {
  StringBuilder sb = new StringBuilder();
  sb.append("[");
  for (byte b : buffer) {
- sb.append("  ").append(b & 0xff);
+ sb.append(" ").append(b & 0xff);
  }
- sb.append("  ]");
+ sb.append(" ]");
 // LogUtil.e(sb.toString());
  }
 
@@ -115,12 +115,12 @@ public static String getFormatHexString(byte[] buffer) {
  for (byte b : buffer) {
  String intS = Integer.toHexString(b & 0xff);
  if (intS.length() == 1) {
- sb.append("  ").append("0").append(intS);
+ sb.append(" ").append("0").append(intS);
  } else {
- sb.append("  ").append(intS);
+ sb.append(" ").append(intS);
  }
  }
- sb.append("  ]");
+ sb.append(" ]");
  return sb.toString();
  }
 }

app/src/main/res/layout/activity_main.xml

@@ -19,7 +19,8 @@
  app:tabIndicatorHeight="2dp"
  app:tabIndicatorFullWidth="false"
  app:tabSelectedTextColor="@color/colorPrimaryDark"
- app:tabTextColor="#999999">
+ app:tabTextColor="#999999"
+ android:visibility="gone">
  <com.google.android.material.tabs.TabItem
  android:layout_width="match_parent"
  android:layout_height="wrap_content"

app/src/main/res/layout/activity_setting.xml

@@ -10,11 +10,10 @@
 
  <TextView
  android:id="@+id/scan_time_title"
+ style="@style/ItemTitle"
  android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
+ android:layout_marginTop="15dp"
  android:text="搜索设备搜索时长："
- android:textColor="#666666"
  android:textSize="@dimen/text_size"
  app:layout_constraintStart_toStartOf="parent"
  app:layout_constraintTop_toTopOf="parent"
@@ -24,8 +23,8 @@
  android:id="@+id/scan_time_spinner"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- android:spinnerMode="dropdown"
  android:entries="@array/scanner_time"
+ android:spinnerMode="dropdown"
  app:layout_constraintBottom_toBottomOf="@id/scan_time_title"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintTop_toTopOf="@id/scan_time_title" />
@@ -34,7 +33,7 @@
  android:id="@+id/line1"
  android:layout_width="match_parent"
  android:layout_height="0.3dp"
- android:layout_marginTop="15dp"
+ android:layout_marginTop="20dp"
  android:background="#cccccc"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintStart_toStartOf="parent"
@@ -44,10 +43,10 @@
  <TextView
  android:id="@+id/filter_empty_title"
  android:layout_width="wrap_content"
- android:layout_height="wrap_content"
  android:layout_centerVertical="true"
- android:layout_marginTop="15dp"
+ android:layout_marginTop="20dp"
  android:text="过滤无名称设备"
+ style="@style/ItemTitle"
  android:textSize="@dimen/text_size"
  app:layout_constraintStart_toStartOf="parent"
  app:layout_constraintTop_toBottomOf="@id/line1"
@@ -66,7 +65,7 @@
  android:id="@+id/line2"
  android:layout_width="match_parent"
  android:layout_height="0.3dp"
- android:layout_marginTop="15dp"
+ android:layout_marginTop="20dp"
  android:background="#cccccc"
  app:layout_constraintTop_toBottomOf="@id/filter_no_name" />
 
@@ -76,7 +75,7 @@
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:layout_centerVertical="true"
- android:layout_marginTop="15dp"
+ android:layout_marginTop="20dp"
  android:text="允许连接多个设备"
  android:textSize="@dimen/text_size"
  app:layout_constraintStart_toStartOf="parent"
@@ -92,12 +91,18 @@
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintTop_toTopOf="@id/link_more_title" />
 
+ <androidx.constraintlayout.widget.Group
+ android:id="@+id/max_link_switch_group"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ app:constraint_referenced_ids="line2,link_more_title,switchBtn" />
 
  <View
  android:id="@+id/line3"
  android:layout_width="match_parent"
  android:layout_height="0.3dp"
- android:layout_marginTop="15dp"
+ android:layout_marginTop="20dp"
  android:background="#cccccc"
  app:layout_constraintTop_toBottomOf="@id/link_more_title" />
 
@@ -107,7 +112,7 @@
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:layout_centerVertical="true"
- android:layout_marginTop="15dp"
+ android:layout_marginTop="20dp"
  android:text="最大连接设备个数："
  android:textSize="@dimen/text_size"
  app:layout_constraintStart_toStartOf="parent"
@@ -117,8 +122,8 @@
  <androidx.appcompat.widget.AppCompatSpinner
  android:id="@+id/maxNumber"
  android:layout_width="wrap_content"
- android:entries="@array/max_connect_size"
  android:layout_height="wrap_content"
+ android:entries="@array/max_connect_size"
  app:layout_constraintBottom_toBottomOf="@id/max_link_title"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintTop_toTopOf="@id/max_link_title" />

app/src/main/res/layout/fragment_bonded_device.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
  ~ Copyright (c) 2017. xiaoyunfei
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,12 +15,12 @@
  -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:orientation="vertical">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
 
  <ListView
  android:id="@+id/bondedDeviceList"
  android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
+ android:layout_height="wrap_content" />
 </LinearLayout>

app/src/main/res/layout/fragment_device_log.xml

@@ -5,14 +5,26 @@
  xmlns:tools="http://schemas.android.com/tools"
  xmlns:app="http://schemas.android.com/apk/res-auto">
 
+ <TextView
+ android:id="@+id/log_title"
+ android:layout_width="330dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ android:text="数据日志"
+ android:textSize="18sp"
+ style="@style/ItemTitle"
+ android:gravity="center"
+ android:paddingTop="16dp"
+ android:paddingBottom="16dp" />
  <androidx.recyclerview.widget.RecyclerView
  android:id="@+id/data_List"
  app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/log_title"
  app:layout_constraintStart_toStartOf="parent"
  app:layout_constraintEnd_toEndOf="parent"
  android:layout_width="match_parent"
- android:layout_height="400dp"
+ android:layout_height="350dp"
  app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
  tools:listitem="@layout/item_data"/>
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_scan_device.xml

@@ -25,8 +25,10 @@
  <androidx.recyclerview.widget.RecyclerView
  android:id="@+id/listview"
  android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="0dp"
  android:layout_marginTop="6dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_marginBottom="5dp"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintStart_toStartOf="parent"
  app:layout_constraintTop_toTopOf="parent"
@@ -41,6 +43,7 @@
  app:layout_constraintBottom_toBottomOf="parent"
  app:layout_constraintStart_toStartOf="parent"
  app:layout_constraintEnd_toEndOf="parent"
+ android:layout_marginBottom="150dp"
  app:cardCornerRadius="8dp">
 
  <LinearLayout

app/src/main/res/layout/item_data.xml

@@ -19,12 +19,13 @@
  android:id="@+id/data_text"
  android:layout_width="350dp"
  android:layout_height="wrap_content"
- android:maxLines="3"
+ android:maxLines="5"
  android:paddingTop="6dp"
  android:paddingBottom="6dp"
  android:paddingStart="10dp"
  android:textSize="12sp"
  android:typeface="serif"
  android:text="1111"
+ android:textColor="@color/color_69"
  android:textStyle="bold"
  tools:ignore="HardcodedText,MissingPrefix,RtlSymmetry" />

app/src/main/res/layout/item_scan_device.xml

@@ -20,40 +20,40 @@
 
  <TextView
  android:id="@+id/deviceName"
+ style="@style/ItemTitle"
  android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:minLines="1"
  android:text="deviceName"
- android:textColor="#333333"
- android:textSize="18sp"
- android:textStyle="bold"
+ android:textSize="14sp"
  android:layout_marginEnd="10dp"
  app:layout_constraintEnd_toStartOf="@id/deviceRssi"
  app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent"
+ tools:ignore="HardcodedText" />
 
 
  <TextView
+ style="@style/ItemContent"
  android:id="@+id/deviceMac"
  android:layout_width="0dp"
- android:layout_height="wrap_content"
+ android:textSize="12sp"
  android:layout_marginTop="6dp"
  android:text="deviceMac"
  android:layout_marginEnd="10dp"
  app:layout_constraintEnd_toStartOf="@id/deviceRssi"
  app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/deviceName" />
+ app:layout_constraintTop_toBottomOf="@id/deviceName"
+ tools:ignore="HardcodedText" />
 
 
  <TextView
  android:id="@+id/scanRet"
+ style="@style/ItemContent"
  android:layout_width="0dp"
- android:layout_height="wrap_content"
  android:layout_marginTop="6dp"
  android:visibility="invisible"
  android:text="[00 00 00]"
  android:maxLines="3"
- android:textSize="11sp"
+ android:textSize="10sp"
  android:layout_marginEnd="10dp"
  app:layout_constraintEnd_toStartOf="@id/deviceRssi"
  app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/item_uuid.xml

@@ -17,7 +17,7 @@
  app:layout_constraintBottom_toBottomOf="parent"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UseAppTint" />
+ tools:ignore="ContentDescription,UseAppTint" />
 
 
  <ImageView
@@ -31,7 +31,7 @@
  app:layout_constraintBottom_toBottomOf="parent"
  app:layout_constraintEnd_toStartOf="@id/notification_image"
  app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UseAppTint" />
+ tools:ignore="ContentDescription,UseAppTint" />
 
  <ImageView
  android:id="@+id/send_image"
@@ -44,7 +44,7 @@
  app:layout_constraintBottom_toBottomOf="parent"
  app:layout_constraintEnd_toStartOf="@id/read_image"
  app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UseAppTint" />
+ tools:ignore="ContentDescription,UseAppTint" />
 
 
  <TextView

app/src/main/res/menu/menu_detail.xml

@@ -3,6 +3,13 @@
  xmlns:tools="http://schemas.android.com/tools"
  tools:context="org.eson.liteble.detail.DeviceActivity">
 
+ <item
+ android:id="@+id/menu_refresh"
+ android:checkable="false"
+ android:orderInCategory="1"
+ android:title=""
+ app:showAsAction="ifRoom"/>
+
  <item
  android:id="@+id/device_state"
  android:checkable="false"