diff --git a/app/src/main/java/com/ydd/sportfaceid/MainActivity.java b/app/src/main/java/com/ydd/sportfaceid/MainActivity.java index f59df5c..7ff4deb 100644 --- a/app/src/main/java/com/ydd/sportfaceid/MainActivity.java +++ b/app/src/main/java/com/ydd/sportfaceid/MainActivity.java @@ -37,6 +37,7 @@ import butterknife.OnClick; import static com.ydd.sportfaceid.event.QRCodeEvent.QR_EVENT_ACTION_FAILED; import static com.ydd.sportfaceid.event.QRCodeEvent.QR_EVENT_ACTION_LOADING; import static com.ydd.sportfaceid.event.QRCodeEvent.QR_EVENT_ACTION_OPEN_DOOR; +import static com.ydd.sportfaceid.event.QRCodeEvent.QR_EVENT_ACTION_LINK; public class MainActivity extends SDBaseActivity { @@ -137,6 +138,7 @@ public class MainActivity extends SDBaseActivity { break; case QR_EVENT_ACTION_OPEN_DOOR: case QR_EVENT_ACTION_FAILED: + case QR_EVENT_ACTION_LINK: qrCodePbCover.setVisibility(View.GONE); qrCodePbCover.hide(); break; diff --git a/app/src/main/java/com/ydd/sportfaceid/event/QRCodeEvent.java b/app/src/main/java/com/ydd/sportfaceid/event/QRCodeEvent.java index e5b73cf..51045d7 100644 --- a/app/src/main/java/com/ydd/sportfaceid/event/QRCodeEvent.java +++ b/app/src/main/java/com/ydd/sportfaceid/event/QRCodeEvent.java @@ -9,6 +9,7 @@ public class QRCodeEvent { public static final int QR_EVENT_ACTION_LOADING = 1; public static final int QR_EVENT_ACTION_OPEN_DOOR = 2; public static final int QR_EVENT_ACTION_FAILED = 3; + public static final int QR_EVENT_ACTION_LINK = 4; private int action; private String msg; diff --git a/app/src/main/java/com/ydd/sportfaceid/netty/ClientThread.java b/app/src/main/java/com/ydd/sportfaceid/netty/ClientThread.java index 8933e65..6ea8e08 100644 --- a/app/src/main/java/com/ydd/sportfaceid/netty/ClientThread.java +++ b/app/src/main/java/com/ydd/sportfaceid/netty/ClientThread.java @@ -36,7 +36,6 @@ public class ClientThread { private static ClientThread instance; private volatile EventLoopGroup workerGroup; private volatile Bootstrap bootstrap; - private volatile boolean closed = false; private String remoteHost; private int remotePort; private Activity mContext; diff --git a/app/src/main/java/com/ydd/sportfaceid/netty/message/MessageType.java b/app/src/main/java/com/ydd/sportfaceid/netty/message/MessageType.java index 304dcf7..073437e 100644 --- a/app/src/main/java/com/ydd/sportfaceid/netty/message/MessageType.java +++ b/app/src/main/java/com/ydd/sportfaceid/netty/message/MessageType.java @@ -1,6 +1,7 @@ package com.ydd.sportfaceid.netty.message; public enum MessageType { + LINK("连接"), LOAD("加载"), OPEN_DOOR("开门"), FAILED("开门校验失败"); 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 2396e9c..5183cf5 100644 --- a/app/src/main/java/com/ydd/sportfaceid/service/MessageService.java +++ b/app/src/main/java/com/ydd/sportfaceid/service/MessageService.java @@ -60,6 +60,10 @@ public class MessageService { */ public void execute(MessageDTO message) { switch (message.getMessageType()) { + case LINK: + Log.d(TAG, "LINK" + message.getMessage()); + EventBus.getDefault().post(new QRCodeEvent(QRCodeEvent.QR_EVENT_ACTION_LINK, message.getMessage())); + break; case LOAD: // TODO 安卓获取通知加载页面 (进入加载页面,显示欢迎用户的消息) Log.d(TAG, "LOADING" + message.getMessage()); 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 a7272b7..7e2c158 100644 --- a/app/src/main/java/com/ydd/sportfaceid/setting/SDSettingActivity.java +++ b/app/src/main/java/com/ydd/sportfaceid/setting/SDSettingActivity.java @@ -74,7 +74,6 @@ public class SDSettingActivity extends SDBaseActivity { String result = null; try { result = response.body().string(); - System.out.println("result ================" + result); } catch (IOException e) { e.printStackTrace(); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ccc096d..1ac4faf 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -109,6 +109,7 @@ android:layout_height="wrap_content"/> @@ -116,15 +117,14 @@