test room sn add ,constract socket send msg

wugian
1 parent 69a8a55d
Showing 3 changed files with 94 additions and 14 deletions
gimiCinema/src/main/java/com/qnbar/smc/service/SocketSendMsg.java
gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketSendMsg.java 0 → 100644
View file @81dbb8a
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketSendMsg.java 0 → 100644
View file @81dbb8a
+package com.qnbar.smc.service;
+
+/**
+ * Created by wugian on 2017/3/29
+ */
+public class SocketSendMsg {
+    public static final String REGISTER = "register";
+    public static final String RECONNECT = "reconnect";
+    /**
+     * cmd : register
+     * data : {"room_sn":"000002"}
+     */
+
+    private String cmd;
+    private DataEntity data;
+
+    public String getCmd() {
+        return cmd;
+    }
+
+    public void setCmd(String cmd) {
+        this.cmd = cmd;
+    }
+
+    public DataEntity getData() {
+        return data;
+    }
+
+    public void setData(DataEntity data) {
+        this.data = data;
+    }
+
+    public static class DataEntity {
+        /**
+         * room_sn : 000002
+         */
+
+        private String room_sn;
+
+        public String getRoom_sn() {
+            return room_sn;
+        }
+
+        public void setRoom_sn(String room_sn) {
+            this.room_sn = room_sn;
+        }
+    }
+
+    public SocketSendMsg contractRegisterMsg(String roomSn) {
+        this.cmd = REGISTER;
+        getDataEntity(roomSn);
+        return this;
+    }
+
+    private void getDataEntity(String roomSn) {
+        DataEntity dataEntity = new DataEntity();
+        dataEntity.setRoom_sn(roomSn);
+        this.data = dataEntity;
+    }
+
+    public SocketSendMsg contractReconnectMsg(String roomSn) {
+        this.cmd = RECONNECT;
+        getDataEntity(roomSn);
+        return this;
+    }
+
+}
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
View file @81dbb8a
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
View file @81dbb8a
 package com.qnbar.smc.service;
 import android.app.Service;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Handler;
 import android.os.IBinder;
 import android.util.Log;
 import com.gimi.common.cinema.model.MessageEvent;
+import com.gimi.common.cinema.utils.SystemUtils;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
+import com.xgimi.gimicinema.BuildConfig;
 import org.greenrobot.eventbus.EventBus;
 import java.io.IOException;
@@ -26,17 +29,13 @@ public class SocketService extends Service {
     private static final int ROOM_HAS_REGISTERED = 1001;
     private static final int ROOM_NOT_EXIST_M = 1002;
+    private static final int HEAT_BEAT_RTN = 1003;
     public static final String HOST = "121.43.189.162";// "192.168.1.21";//
     public static final int PORT = 9501;
-    public static final String MESSAGE_ACTION = "com.dingmore.terminal.socket";
-    public static final String HEART_BEAT_ACTION = "com.dingmore.terminal.socket.heart";
-
     public static final String HEART_BEAT_STRING = "\\r\\n\\r\\n";//心跳包内容
-    public static final String REGISTER_STRING = "{\"cmd\":\"register\",\"data\":{\"room_sn\":\"000003\"}}\\r\\n\\r\\n";//注册内容
-    public static final String RECONNECT_STRING = "{\"cmd\":\"reconnect\",\"data\":{\"room_sn\":\"000003\"}}\\r\\n\\r\\n";//注册内容
-
+    public String testRoomSn = "000003";
     private ReadThread mReadThread;
     private Gson gson;
@@ -68,6 +67,7 @@ public class SocketService extends Service {
     };
     private long sendTime = 0L;
+    private Context context;
     @Override
     public IBinder onBind(Intent arg0) {
@@ -78,10 +78,12 @@ public class SocketService extends Service {
     public void onCreate() {
         super.onCreate();
         gson = new Gson();
+        context = this;
+        if (!"LETEST".equals(SystemUtils.getPid(context, BuildConfig.MACHINE_TYPE))) {
+            testRoomSn = "000002";
+        }
         new InitSocketThread().start();
         Log.d(TAG, "socket service onCreate");
-//        mLocalBroadcastManager = LocalBroadcastManager.getInstance(this);
-
     }
     public boolean sendMsg(String msg) {
@@ -168,7 +170,8 @@ public class SocketService extends Service {
                 try {
                     if (!sendRegister) {
                         Log.d(TAG, "send register mes");
-                        String msg = REGISTER_STRING;
+                        SocketSendMsg ssm = new SocketSendMsg().contractRegisterMsg(testRoomSn);
+                        String msg = gson.toJson(ssm) + HEART_BEAT_STRING;
                         sendMsg(msg);
                         Log.d(TAG, "" + msg);
                         sendRegister = true;
@@ -187,8 +190,10 @@ public class SocketService extends Service {
                                 SocketResponse socketResponse = gson.fromJson(message.trim(), SocketResponse.class);
                                 switch (socketResponse.getCode()) {
                                     case ROOM_HAS_REGISTERED:
-                                        sendMsg(RECONNECT_STRING);
-                                        Log.d(TAG, "send reconnect mes");
+                                        SocketSendMsg ssm = new SocketSendMsg().contractReconnectMsg(testRoomSn);
+                                        String msg = gson.toJson(ssm) + HEART_BEAT_STRING;
+                                        sendMsg(msg);
+                                        Log.d(TAG, "send reconnect mes: " + msg);
                                         break;
                                     case ROOM_NOT_EXIST_M:
                                         Log.d(TAG, "re init socket");
@@ -196,6 +201,10 @@ public class SocketService extends Service {
                                         releaseLastSocket(mWeakSocket);
                                         initSocket();
                                         break;
+                                    case HEAT_BEAT_RTN:
+                                        Log.d(TAG, "HEAT_BEAT_RTN");
+                                        sendTime = System.currentTimeMillis();
+                                        break;
                                 }
                                 if (("openDoor").equals(socketResponse.getCmd())) {
                                     MessageEvent messageEvent = new MessageEvent();
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @81dbb8a
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @81dbb8a
@@ -758,6 +758,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     private void show(String msg) {
+//        Log.d(TAG, "show: " + msg);
         Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
     }
@@ -768,13 +769,16 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         switch (deviceInfo.status) {
             case LightAdapter.STATUS_LOGIN:
                 connectMeshAddress = mApplication.getConnectDevice().meshAddress;
-                show("main login success");
+//                show("main login success");
+                show("灯光配对成功");
                 break;
             case LightAdapter.STATUS_CONNECTING:
-                show("login");
+//                show("login");
+                show("与灯光配对");
                 break;
             case LightAdapter.STATUS_LOGOUT:
-                show("disconnect");
+//                show("disconnect");
+                show("灯光断开");
                 break;
             default:
                 break;