From da23e781a4ed4c37e3772d02e8000d9b006d01b9 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期二, 24 十一月 2020 17:35:49 +0800
Subject: [PATCH] 加入蓝牙扫描界面和功能 并发送蓝牙信息给远程服务进行连接；展示 蓝牙状态
---
app/src/main/res/layout/activity_auto_ble_list.xml | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/app/src/main/res/layout/activity_auto_ble_list.xml b/app/src/main/res/layout/activity_auto_ble_list.xml
index a27708c..1930e1b 100644
--- a/app/src/main/res/layout/activity_auto_ble_list.xml
+++ b/app/src/main/res/layout/activity_auto_ble_list.xml
@@ -1,11 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
+
+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_f6f8f8"
android:orientation="vertical">
-
+ <include layout="@layout/toolbar"/>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@drawable/ic_bground"
+ android:orientation="vertical"
+ >
@@ -15,8 +22,8 @@
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:layout_marginStart="15dp"
- android:text="@string/auto_act_to_select"
- android:textColor="@color/color_939393"
+ android:text="@string/auto_act_to_refresh"
+ android:textColor="#ffffffff"
android:textSize="15sp" />
<TextView
@@ -27,7 +34,7 @@
android:gravity="center_vertical"
android:paddingEnd="15dp"
android:paddingStart="15dp"
- android:text="鏈娴嬪埌鍙屼韩鍙稰ro璁惧"
+ android:text="鏈娴嬪埌钃濈墮璁惧"
android:textColor="@color/color_f76260"
android:textSize="16sp"
android:visibility="gone" />
@@ -54,4 +61,5 @@
<include layout="@layout/view_load_more" />
</safeluck.drive.evaluation.customview.PullToRefreshLayout>
+</LinearLayout>
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0