diff --git a/app/build.gradle b/app/build.gradle
index 911c6d3..1b25266 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -79,7 +79,7 @@ dependencies {
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.google.code.gson:gson:2.8.4'
implementation 'com.squareup.okhttp3:okhttp:3.3.1'
- implementation 'io.netty:netty-all:4.1.17.Final'
+ implementation 'io.netty:netty-all:4.1.10.Final'
implementation 'org.greenrobot:eventbus:3.1.1'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
diff --git a/app/src/main/java/com/ydd/sportfaceid/MainActivity.java b/app/src/main/java/com/ydd/sportfaceid/MainActivity.java
index 2bbfd35..a687ad6 100644
--- a/app/src/main/java/com/ydd/sportfaceid/MainActivity.java
+++ b/app/src/main/java/com/ydd/sportfaceid/MainActivity.java
@@ -1,12 +1,10 @@
package com.ydd.sportfaceid;
import android.content.Intent;
-import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.net.Uri;
import android.os.CountDownTimer;
import android.os.Handler;
-import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.DisplayMetrics;
@@ -19,19 +17,13 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.bumptech.glide.Glide;
-import com.tencent.bugly.Bugly;
import com.tencent.bugly.crashreport.CrashReport;
import com.ydd.sportfaceid.config.SDAppConfig;
-import com.ydd.sportfaceid.event.FaceidEvent;
-import com.ydd.sportfaceid.event.MessageEvent;
+import com.ydd.sportfaceid.event.QRCodeEvent;
import com.ydd.sportfaceid.main.SDBaseActivity;
-import com.ydd.sportfaceid.net.ClientThread;
-import com.ydd.sportfaceid.net.dto.MemberDto;
import com.ydd.sportfaceid.service.ClientService;
import com.ydd.sportfaceid.setting.SDSettingActivity;
import com.ydd.sportfaceid.utils.EggClickUtil;
-import com.ydd.sportfaceid.websocket.FaceWsClient;
-import com.ydd.sportfaceid.websocket.FaceWsClientService;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -297,70 +289,49 @@ public class MainActivity extends SDBaseActivity implements IVLCVout.OnNewVideoL
* 加载人脸识别信息
*/
@Subscribe(threadMode = ThreadMode.MAIN)
- public void loadFaceidInfo(FaceidEvent faceidEvent) {
- if (faceidEvent.isDebug){
- // 这里检测到 debug模式下,显示toast
- showToast(faceidEvent.msg);
- return;
- }
-
- MemberDto memberDto = faceidEvent.getMember();
- if (memberDto != null){
- // 这个是会员进入现场
- if (errorDialog != null){
- if (errorDialog.isShow){
- errorDialog.dismiss();
- }
- }
- CrashReport.postCatchedException(new Throwable("接受到命令 " + memberDto.getCode()));
-
-
- // 监听到头像
- Glide.with(this).load(memberDto.getAvatar()).into(this.avator_imageview);
- String message = memberDto.getMessage();
- user_name_label.setText(memberDto.getName());
- user_phone_label.setText(memberDto.getMobile());
- if (memberDto.getAmount()!= null){
- user_amount_label.setText(memberDto.getAmount().toString());
- }
- if (memberDto.getPlacePrice() != null){
- unit_price_label.setText(memberDto.getPlacePrice().toString());
- }
-// welcome_label.setText(String.format("欢迎%s进场", memberDto.getName()));
- welcome_label.setText(message);
- if (TextUtils.isEmpty(memberDto.getCardName())) {
- memberInfoLineView.setVisibility(View.GONE);
- memberInfopackLayout.setVisibility(View.GONE); // 场地的信息
- } else {
- memberInfoLineView.setVisibility(View.VISIBLE);
- memberInfopackLayout.setVisibility(View.VISIBLE);
- this.user_place_label.setText(memberDto.getCardName());
- }
-
- if (memberDto.getCode() == 2){
- // 出场成功
- startCountDownTime(user_info_out_ok);
- }else if (memberDto.getCode() == 1){
- // 入场成功
- if (memberDto.isFirst()){
- // 每天的第一次
- firstEnterHome();
- }else{
- startCountDownTime(user_info_ok);
- }
-
- }else if (memberDto.getCode() == 0 ){
- // 入场失败
- startCountDownTime(user_info_fail);
- }else if (memberDto.getCode() == -1){
- // 余额不足
- startCountDownTime(user_info_recahrge);
- }
- }else {
+ public void loadFaceidInfo(QRCodeEvent qrCodeEvent) {
+ if (qrCodeEvent.msg.equals("不是会员")){
// 这个是非会员进入现场
this.showStrangerDialog();
+ return;
+ }
+ CrashReport.postCatchedException(new Throwable("接受到命令 " + qrCodeEvent.msg));
+ // 监听到头像
+ Glide.with(this).load("https://www.baidu.com").into(this.avator_imageview);
+ user_name_label.setText("张三");
+ user_phone_label.setText("1234567");
+ user_amount_label.setText("amount");
+ unit_price_label.setText("price");
+ welcome_label.setText(String.format("欢迎%s进场", "张三"));
+ if (TextUtils.isEmpty(qrCodeEvent.msg)) {
+ memberInfoLineView.setVisibility(View.GONE);
+ memberInfopackLayout.setVisibility(View.GONE); // 场地的信息
+ } else {
+ memberInfoLineView.setVisibility(View.VISIBLE);
+ memberInfopackLayout.setVisibility(View.VISIBLE);
+ this.user_place_label.setText(qrCodeEvent.msg);
}
+ int code = 1; // TODO 这个是获取事件的参数
+ if (code == 2){
+ // 出场成功
+ startCountDownTime(user_info_out_ok);
+ }else if (code == 1){
+ // 入场成功
+ if ("firstTime".equals(code)){
+ // 每天的第一次
+ firstEnterHome();
+ }else{
+ startCountDownTime(user_info_ok);
+ }
+
+ }else if (code == 0 ){
+ // 入场失败
+ startCountDownTime(user_info_fail);
+ }else if (code == -1){
+ // 余额不足
+ startCountDownTime(user_info_recahrge);
+ }
}
@Override
diff --git a/app/src/main/java/com/ydd/sportfaceid/config/GlobalConfig.java b/app/src/main/java/com/ydd/sportfaceid/config/GlobalConfig.java
index fe8e954..b37f090 100644
--- a/app/src/main/java/com/ydd/sportfaceid/config/GlobalConfig.java
+++ b/app/src/main/java/com/ydd/sportfaceid/config/GlobalConfig.java
@@ -10,13 +10,9 @@ package com.ydd.sportfaceid.config;
public class GlobalConfig {
+ /**
+ * 与服务器通讯状态
+ */
public static boolean isConnected = false;
-
- /**
- * face++的websocket连接状态
- */
- public static boolean FACE_WS_CONNECTED = false;
-
-
}
diff --git a/app/src/main/java/com/ydd/sportfaceid/event/FaceidEvent.java b/app/src/main/java/com/ydd/sportfaceid/event/FaceidEvent.java
deleted file mode 100644
index fc2b810..0000000
--- a/app/src/main/java/com/ydd/sportfaceid/event/FaceidEvent.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.ydd.sportfaceid.event;
-
-import com.ydd.sportfaceid.net.dto.MemberDto;
-
-/**
- * 消息事件
- *
- * @author peakren
- * @date 08/12/2017 11:16 PM
- */
-public class FaceidEvent {
-
- private MemberDto member;
-
- public FaceidEvent(MemberDto member) {
- this.member = member;
- }
-
- public MemberDto getMember() {
- return member;
- }
-
- public void setMember(MemberDto member) {
- this.member = member;
- }
-
- public boolean isDebug;
-
- public String msg;
-}
diff --git a/app/src/main/java/com/ydd/sportfaceid/event/MessageEvent.java b/app/src/main/java/com/ydd/sportfaceid/event/MessageEvent.java
index 393e0e2..e3717d5 100644
--- a/app/src/main/java/com/ydd/sportfaceid/event/MessageEvent.java
+++ b/app/src/main/java/com/ydd/sportfaceid/event/MessageEvent.java
@@ -1,7 +1,5 @@
package com.ydd.sportfaceid.event;
-import com.ydd.sportfaceid.net.dto.MemberDto;
-
/**
* 消息事件
*
diff --git a/app/src/main/java/com/ydd/sportfaceid/event/QRCodeEvent.java b/app/src/main/java/com/ydd/sportfaceid/event/QRCodeEvent.java
new file mode 100644
index 0000000..f0724f4
--- /dev/null
+++ b/app/src/main/java/com/ydd/sportfaceid/event/QRCodeEvent.java
@@ -0,0 +1,10 @@
+package com.ydd.sportfaceid.event;
+/**
+ * 扫码之后通知时间
+ *
+ * @author peakren
+ * @date 08/12/2017 11:16 PM
+ */
+public class QRCodeEvent {
+ public String msg;
+}
diff --git a/app/src/main/java/com/ydd/sportfaceid/net/ClientHandler.java b/app/src/main/java/com/ydd/sportfaceid/net/ClientHandler.java
deleted file mode 100644
index 6a2a672..0000000
--- a/app/src/main/java/com/ydd/sportfaceid/net/ClientHandler.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.ydd.sportfaceid.net;
-
-import android.app.Activity;
-import android.util.Log;
-import android.widget.Toast;
-
-import com.ydd.sportfaceid.StartApplication;
-import com.ydd.sportfaceid.config.GlobalConfig;
-import com.ydd.sportfaceid.session.ClientTcpSession;
-import com.ydd.sportfaceid.service.MessageService;
-import com.ydd.sportfaceid.net.dto.HeartBeat;
-import com.ydd.sportfaceid.net.dto.Message;
-import com.ydd.sportfaceid.utils.AppUtil;
-import com.ydd.sportfaceid.utils.DeviceIdUtil;
-import com.ydd.sportfaceid.utils.JsonMapper;
-
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.handler.timeout.IdleState;
-import io.netty.handler.timeout.IdleStateEvent;
-
-/**
- * 通讯服务器请求处理
- *
- * @author peakren
- * @date 05/12/2017 10:27 PM
- */
-@ChannelHandler.Sharable
-public class ClientHandler extends ChannelInboundHandlerAdapter {
-
- private final static String TAG = "ClientHandler";
-
- private boolean hasRead = false;
-
- private Activity mContext;
-
- public ClientHandler(Activity context) {
- mContext = context;
- }
-
- @Override
- public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
- super.channelRegistered(ctx);
- ClientTcpSession.getInstance().setContext(ctx);
- }
-
- @Override
- public void channelActive(ChannelHandlerContext ctx) throws Exception {
- super.channelActive(ctx);
- //服务器连上以后立即模拟心跳返回
- ctx.writeAndFlush(getHbMessage());
- }
-
- @Override
- public void channelInactive(ChannelHandlerContext ctx) throws Exception {
- super.channelInactive(ctx);
- Log.e(TAG, "----close----");
- GlobalConfig.isConnected =false;
- ClientThread.getInstance().clearFuture();
- ClientThread.getInstance().restart();
- }
-
- @Override
- public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
- super.channelRead(ctx, msg);
- Log.i(TAG, "----read data: " + msg.toString() + "----");
- Message message = JsonMapper.fromJson(msg.toString(), Message.class);
- MessageService.getInstance().execute(message);
- }
-
- @Override
- public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
- super.exceptionCaught(ctx, cause);
- Log.e(TAG, "----tcp exception----");
- GlobalConfig.isConnected = false;
- ctx.close();
- }
-
- /**
- * 获取心跳返回消息
- *
- * @return
- */
- private Message getHbMessage() {
- HeartBeat hb = new HeartBeat();
- hb.setVersionCode(AppUtil.getVersionCode(StartApplication.getAppContext()));
- Message message = new Message();
- message.setCmdId(Cmd.HB.id);
-// message.setDeviceId(DeviceIdUtil.generateDeviceId(mContext));
- return message;
- }
-
- /**
- * 心跳处理
- *
- * @param ctx
- * @param evt
- * @throws Exception
- */
- @Override
- public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
- if (IdleStateEvent.class.isAssignableFrom(evt.getClass())) {
- IdleStateEvent event = (IdleStateEvent) evt;
- if (event.state() == IdleState.ALL_IDLE) {
- ctx.writeAndFlush(getHbMessage());
- }
- }
- }
-
-}
diff --git a/app/src/main/java/com/ydd/sportfaceid/net/Cmd.java b/app/src/main/java/com/ydd/sportfaceid/net/Cmd.java
deleted file mode 100644
index 626118a..0000000
--- a/app/src/main/java/com/ydd/sportfaceid/net/Cmd.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.ydd.sportfaceid.net;
-
-/**
- * 消息协议指令定义
- *
- * @Author peakren
- * @Date 08/12/2017 11:51 AM
- */
-public enum Cmd {
-
-
- HB("hb", "心跳"),
-
- FACEID("faceid", "人脸识别"),
-
- FACEID_RESPONSE("faceid_response_upload", "识别结果"),
-
- RECEV_FACE_IMAGE("recev_face_image", "接收人脸照片"),
-
- RECEV_FACE_IMAGE_R("recev_face_image_r", "返回上传图片结果"),
-
- OPEN_DOOR("open_door", "开门禁");
-
-
- public String id;
-
- public String text;
-
- Cmd(String id, String text) {
- this.id = id;
- this.text = text;
-
- }
-
- public static Cmd getCmd(String id) {
- for (Cmd cmd : Cmd.values()) {
- if (cmd.id.equalsIgnoreCase(id)) {
- return cmd;
- }
- }
- return Cmd.HB;
- }
-
-}
-
diff --git a/app/src/main/java/com/ydd/sportfaceid/net/CustomDecoder.java b/app/src/main/java/com/ydd/sportfaceid/net/CustomDecoder.java
deleted file mode 100644
index 032f8cd..0000000
--- a/app/src/main/java/com/ydd/sportfaceid/net/CustomDecoder.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.ydd.sportfaceid.net;
-
-import java.nio.ByteOrder;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
-
-
-/**
- * 自定义解码器,解决粘包和分包问题
- *
- * @author peakren
- * @date 07/12/2017 10:03 PM
- */
-public class CustomDecoder extends LengthFieldBasedFrameDecoder {
-
- public CustomDecoder(int maxFrameLength, int lengthFieldOffset, int lengthFieldLength) {
- super(maxFrameLength, lengthFieldOffset, lengthFieldLength);
- }
-
- public CustomDecoder(int maxFrameLength, int lengthFieldOffset, int lengthFieldLength, int lengthAdjustment, int initialBytesToStrip) {
- super(maxFrameLength, lengthFieldOffset, lengthFieldLength, lengthAdjustment, initialBytesToStrip);
- }
-
- public CustomDecoder(int maxFrameLength, int lengthFieldOffset, int lengthFieldLength, int lengthAdjustment, int initialBytesToStrip, boolean failFast) {
- super(maxFrameLength, lengthFieldOffset, lengthFieldLength, lengthAdjustment, initialBytesToStrip, failFast);
- }
-
- public CustomDecoder(ByteOrder byteOrder, int maxFrameLength, int lengthFieldOffset, int lengthFieldLength, int lengthAdjustment, int initialBytesToStrip, boolean failFast) {
- super(byteOrder, maxFrameLength, lengthFieldOffset, lengthFieldLength, lengthAdjustment, initialBytesToStrip, failFast);
- }
-
-
- @Override
- protected Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception {
- return super.decode(ctx, in);
- }
-
-}
diff --git a/app/src/main/java/com/ydd/sportfaceid/net/DataConfig.java b/app/src/main/java/com/ydd/sportfaceid/net/DataConfig.java
deleted file mode 100644
index 1b3c248..0000000
--- a/app/src/main/java/com/ydd/sportfaceid/net/DataConfig.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.ydd.sportfaceid.net;
-
-/**
- * Created by hehelt on 16/2/26.
- */
-public class DataConfig {
-
- public static final int MAGIC_WORD = 0x9DDD;
- public static final int MAGIC_WORD_INDEX = 0;
- public static final int LENGTH_INDEX = 4;
- public static final int DATA_INDEX = 8;
-
-
-}
diff --git a/app/src/main/java/com/ydd/sportfaceid/net/DoorHandler.java b/app/src/main/java/com/ydd/sportfaceid/net/DoorHandler.java
deleted file mode 100644
index a4468e0..0000000
--- a/app/src/main/java/com/ydd/sportfaceid/net/DoorHandler.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.ydd.sportfaceid.net;
-
-
-/**
- * 门禁处理
- * DoorHandler.java
- *
- * @author peakren
- * @date 2019/4/17 12:44 PM
- */
-public class DoorHandler {
-
-
-}
diff --git a/app/src/main/java/com/ydd/sportfaceid/net/MessageDecoder.java b/app/src/main/java/com/ydd/sportfaceid/net/MessageDecoder.java
deleted file mode 100644
index f314018..0000000
--- a/app/src/main/java/com/ydd/sportfaceid/net/MessageDecoder.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.ydd.sportfaceid.net;
-
-import java.io.UnsupportedEncodingException;
-import java.util.List;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.ByteToMessageDecoder;
-
-/**
- * Created by hehelt on 16/2/26.
- *
- * 解码器
- */
-public class MessageDecoder extends ByteToMessageDecoder {
-
- @Override
- protected void decode(ChannelHandlerContext ctx, ByteBuf in, List