Commit def8dd5132ae9a00647736867f321aecc3655c5d

Authored by wugian
1 parent c163c6ac

reinit sockt,network error

... ... @@ -34,6 +34,8 @@ public class SocketService extends Service {
34 34 public static final String HEART_BEAT_ACTION = "com.dingmore.terminal.socket.heart";
35 35
36 36 public static final String HEART_BEAT_STRING = "\\r\\n\\r\\n";//心跳包内容
  37 + public static final String REGISTER_STRING = "{\"cmd\":\"register\",\"data\":{\"room_sn\":\"000002\"}}\\r\\n\\r\\n";//注册内容
  38 + public static final String RECONNECT_STRING = "{\"cmd\":\"reconnect\",\"data\":{\"room_sn\":\"000002\"}}\\r\\n\\r\\n";//注册内容
37 39
38 40 private ReadThread mReadThread;
39 41 private Gson gson;
... ... @@ -166,7 +168,7 @@ public class SocketService extends Service {
166 168 try {
167 169 if (!sendRegister) {
168 170 Log.d(TAG, "send register mes");
169   - String msg = "{\"cmd\":\"register\",\"data\":{\"room_sn\":\"000002\"}}\\r\\n\\r\\n";
  171 + String msg = REGISTER_STRING;
170 172 sendMsg(msg);
171 173 Log.d(TAG, "" + msg);
172 174 sendRegister = true;
... ... @@ -185,7 +187,7 @@ public class SocketService extends Service {
185 187 SocketResponse socketResponse = gson.fromJson(message.trim(), SocketResponse.class);
186 188 switch (socketResponse.getCode()) {
187 189 case ROOM_HAS_REGISTERED:
188   - sendMsg("{\"cmd\":\"reconnect\",\"data\":{\"room_sn\":\"000002\"}}\\r\\n\\r\\n");
  190 + sendMsg(RECONNECT_STRING);
189 191 Log.d(TAG, "send reconnect mes");
190 192 break;
191 193 case ROOM_NOT_EXIST_M:
... ... @@ -249,6 +251,7 @@ public class SocketService extends Service {
249 251 Log.d(TAG, "heart beat error restart");
250 252 // mHandler.removeCallbacks(heartBeatRunnable);
251 253 mReadThread.release();
  254 + sendRegister = false;
252 255 releaseLastSocket(mSocket);
253 256 new InitSocketThread().start();
254 257 }
... ...
... ... @@ -30,14 +30,13 @@
30 30 android:layout_width="wrap_content"
31 31 android:layout_height="47dp"
32 32 android:layout_marginTop="35dp"
33   - android:layout_marginRight="30dp"
34 33 android:textSize="20sp"
35 34 android:textColor="@color/white"
36 35 android:id="@+id/promoteTv"
37 36 android:visibility="visible"
38 37 android:padding="5dp"
39   - android:paddingStart="10dp"
40   - android:paddingEnd="10dp"
  38 + android:paddingStart="15dp"
  39 + android:paddingEnd="5dp"
41 40 android:gravity="center"
42 41 android:background="@color/dark_background"
43 42 android:layout_gravity="right"/>
... ...
Please register or login to post a comment