some log ,send success charge

@@ -11,8 +11,8 @@ def isWindows = {
 }
 
 ext {
-    APP_VERSION_CODE = 3;
-    APP_VERSION_NAME = "v2.1-0601";
+    APP_VERSION_CODE = 4;
+    APP_VERSION_NAME = "v2.1-0603";
 }
 
 android {

@@ -35,6 +35,7 @@ import java.io.OutputStream;
 import java.net.Socket;
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static com.qnbar.smc.service.SocketService.JUST_OPEN_DOOR;
 import static com.qnbar.smc.service.SocketService.USER_OPEN_DOOR;
@@ -109,6 +110,7 @@ public class SocketService1 extends BaseService {
     private Handler mHandler = new Handler();
 
     AtomicBoolean sendRegister = new AtomicBoolean(false);
+    AtomicInteger heartBeatErrorCount = new AtomicInteger(0);
 
     private Runnable heartBeatRunnable = new Runnable() {
         @Override
@@ -123,7 +125,6 @@ public class SocketService1 extends BaseService {
             }
         }
     };
-
     int mainChargeCount = 0;
     private Runnable startMainRunnable = new Runnable() {
         @Override
@@ -226,6 +227,9 @@ public class SocketService1 extends BaseService {
         if (!msg.contains("20025")) {
             LogUtils.d(TAG, "send msg:" + msg);
         } else {
+            if (heartBeatErrorCount.getAndDecrement() > 3) {
+                clearConnect();
+            }
             LogUtils.d(TAG, "send heart beat msg:" + msg);
         }
         Socket soc = socket;
@@ -297,6 +301,7 @@ public class SocketService1 extends BaseService {
         LogUtils.d(TAG, "clearConnect");
         mHandler.removeCallbacks(heartBeatRunnable);
         sendRegister.set(false);
+        heartBeatErrorCount.set(0);
         releaseLastSocket();
     }
     ///end socket operation
@@ -366,6 +371,7 @@ public class SocketService1 extends BaseService {
 
                     switch (socketResponse.getCode()) {
                         case SUCCESS_MESSAGE:
+                            heartBeatErrorCount.set(0);
                             Log.d(TAG, "SUCCESS_MESSAGE");
                             break;
                         case VERIFY_SUCCESS:
@@ -374,6 +380,7 @@ public class SocketService1 extends BaseService {
                             LogUtils.d(TAG, "verify success start heart beat");
                             break;
                         case HEART_BEAT_SUCCESS:
+                            heartBeatErrorCount.set(0);
                             //每成功5次心跳判定是否启动main activity
                             if (++mainChargeCount == 5) {
                                 mainChargeCount = 0;
@@ -385,7 +392,6 @@ public class SocketService1 extends BaseService {
                             boolean serviceLaunched = ActivityCollector.getActivity(MainActivity.class) != null;
                             Log.d(TAG, "HEART_BEAT_SUCCESS,MainActivity Launched:" + serviceLaunched);
                             break;
-
                         case HEART_BEAT_ERROR_SYMBOL:
                         case ROOM_SN_CONNECTED:
                             String msg1 = socketResponse.getCode() == HEART_BEAT_ERROR_SYMBOL ? "HEART_BEAT_ERROR_SYMBOL" : "ROOM_SN_CONNECTED";
@@ -402,6 +408,7 @@ public class SocketService1 extends BaseService {
                             }
                             break;
                         case CONTAIN_MESSAGE:
+                            heartBeatErrorCount.set(0);
                             LogUtils.d(TAG, "CONTAIN_MESSAGE");
                             if (socketResponse.getData() != null) {
                                 if (socketResponse.getCmd() == OPEN_DOOR) {

@@ -32,19 +32,30 @@ public class QrCodeShowActivity extends Activity implements IUpdateQrCodeView {
     Runnable r = new Runnable() {
         @Override
         public void run() {
-            LightOperationUtils.close();
-            LightOperationUtils.setLightValue(5);
-            new SystemUtils().closeFtLed(QrCodeShowActivity.this.getApplicationContext());
-            present.reportSleepStatus(orderSn, roomSn);
-            QrCodeShowActivity.this.finish();
+            closeSystem();
         }
     };
+
+    private void closeSystem() {
+        LightOperationUtils.close();
+        LightOperationUtils.setLightValue(5);
+        new SystemUtils().closeFtLed(QrCodeShowActivity.this.getApplicationContext());
+        present.reportSleepStatus(orderSn, roomSn);
+        QrCodeShowActivity.this.finish();
+    }
+
     private String orderSn;
     private String roomSn;
     private ImageView iv;
+    int updateCount = 0;
     private Runnable updateQrCodeRunnable = new Runnable() {
         @Override
         public void run() {
+            //日志显示，没有结束，以此确保20min后关闭相关
+            if (updateCount++ == 2) {
+                closeSystem();
+                return;
+            }
             LogUtils.d("room-info", "QrCodeShowActivity update qr code runnable run");
             handler.postDelayed(this, 10 * 60 * 1000);
             present.getQrCode(roomSn, orderSn);

 package com.xgimi.gimicinema.presenter;
 
-import android.util.Log;
 import com.gimi.common.cinema.model.RoomQrCodeInfo;
 import com.gimi.common.cinema.model.WrongMsg;
+import com.gimi.common.cinema.utils.LogUtils;
 import com.xgimi.gimicinema.model.IRoomInfoModel;
 import com.xgimi.gimicinema.model.RoomInfoModelImpl;
 import com.xgimi.gimicinema.mview.IUpdateQrCodeView;
@@ -23,12 +23,12 @@ public class QrCodeShowPresent {
         roomInfoModel.reportSleepSysStatus(orderSn, roomSn, new RoomInfoModelImpl.SleepSysStatusListener() {
             @Override
             public void onSleepSuccess() {
-                Log.d("room-info", "onSleepSuccess");
+                LogUtils.d("room-info", "onSleepSuccess");
             }
 
             @Override
             public void onSleepFailure() {
-                Log.d("room-info", "onSleepFailure");
+                LogUtils.d("room-info", "onSleepFailure");
             }
         });
     }

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+
+    <TextView
+            android:id="@+id/LauncherMetro_Category"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/actor"
+            android:layout_marginLeft="5dp"
+            android:layout_centerHorizontal="true"
+            android:layout_alignBottom="@+id/LauncherMetro_Substance"/>
+
+    <TextView
+            android:id="@+id/LauncherMetro_Substance"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/actor"
+            android:maxWidth="150dp"
+    />
+
+</RelativeLayout>
\ No newline at end of file