From 98d98979c37e2aba665a8f6eb28715cf9d4310e8 Mon Sep 17 00:00:00 2001
From: limqhz <l>
Date: Mon, 3 Aug 2020 00:25:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ydd/sportfaceid/service/MessageService.java | 3 ---
 .../java/com/ydd/sportfaceid/setting/SDSettingActivity.java   | 1 +
 app/src/main/res/layout/activity_main.xml                     | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/ydd/sportfaceid/service/MessageService.java b/app/src/main/java/com/ydd/sportfaceid/service/MessageService.java
index 5183cf5..d19eb64 100644
--- a/app/src/main/java/com/ydd/sportfaceid/service/MessageService.java
+++ b/app/src/main/java/com/ydd/sportfaceid/service/MessageService.java
@@ -65,18 +65,15 @@ public class MessageService {
                 EventBus.getDefault().post(new QRCodeEvent(QRCodeEvent.QR_EVENT_ACTION_LINK, message.getMessage()));
                 break;
 			case LOAD:
-				// TODO 安卓获取通知加载页面 （进入加载页面，显示欢迎用户的消息）
 				Log.d(TAG, "LOADING" + message.getMessage());
 				EventBus.getDefault().post(new QRCodeEvent(QRCodeEvent.QR_EVENT_ACTION_LOADING, message.getMessage()));
 				break;
 			case OPEN_DOOR:
-				// TODO 安卓获取通知开门的消息 无需校验，直接操作开门
 				//  进入一个页面，然后显示倒计时，回到主页
 				Log.d(TAG, "OPEN_DOOR" + message.getMessage());
 				EventBus.getDefault().post(new QRCodeEvent(QRCodeEvent.QR_EVENT_ACTION_OPEN_DOOR, message.getMessage()));
 				break;
 			case FAILED:
-				// TODO 安卓获取通知开门失败消息 进入一个页面，然后显示倒计时，回到主页
 				Log.d(TAG, "FAILED" + message.getMessage());
 				EventBus.getDefault().post(new QRCodeEvent(QRCodeEvent.QR_EVENT_ACTION_FAILED, message.getMessage()));
 				break;
diff --git a/app/src/main/java/com/ydd/sportfaceid/setting/SDSettingActivity.java b/app/src/main/java/com/ydd/sportfaceid/setting/SDSettingActivity.java
index 7e2c158..3f56dd7 100644
--- a/app/src/main/java/com/ydd/sportfaceid/setting/SDSettingActivity.java
+++ b/app/src/main/java/com/ydd/sportfaceid/setting/SDSettingActivity.java
@@ -122,6 +122,7 @@ public class SDSettingActivity extends SDBaseActivity {
 			String deviceType = deviceTypeStr;
 
 			SDAppConfig.getInstance().configSet(spinnerValue, deviceType);
+			// TODO 告诉客户端，进行修改数据，下线原本的数据（暂时不需要）
 			showToast("设置成功！");
 			onGoToMainAction();
 		} catch (Exception e) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1ac4faf..88b9574 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -123,8 +123,8 @@
                     <android.support.v4.widget.ContentLoadingProgressBar
                         android:id="@+id/qr_code_pb_cover"
                         tools:visibility="visible"
-                        style="?android:attr/progressBarStyleLargeInverse"
-                        android:background="@color/black"
+                        style="?android:attr/progressBarStyleSmallInverse"
+                        android:background="@color/white"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"/>