update open door,print some log

@@ -8,7 +8,21 @@ public class RoomInfo extends BaseModel {
     /**
      * code : 0
      * msg :
-     * data : {"id":5,"room_sn":"R170321112367","room_name":"海贼王008","create_time":1490067794,"mac_address":"123","imei":"LETEST","store_sn":"S170321113056","qr_code":"83e60eaa5de46498209fe83614cede9c","sort":0,"status":0,"picture":"none.png","create_name":"amdin","info":"海贼王008专用","mesh_name":"","password":""}
+     * data : {"id":5,
+     * "room_sn":"R170321112367",
+     * "room_name":"海贼王008",
+     * "create_time":1490067794,
+     * "mac_address":"123",
+     * "imei":"LETEST",
+     * "store_sn":"S170321113056",
+     * "qr_code":"83e60eaa5de46498209fe83614cede9c",
+     * "sort":0,
+     * "status":0,
+     * "picture":"none.png",
+     * "create_name":"amdin",
+     * "info":"海贼王008专用",
+     * "mesh_name":"",
+     * "password":""}
      */
     private DataEntity data;
 
@@ -196,4 +210,11 @@ public class RoomInfo extends BaseModel {
                     '}';
         }
     }
+
+    @Override
+    public String toString() {
+        return "RoomInfo{" +
+                "data=" + data +
+                '}';
+    }
 }

@@ -34,4 +34,11 @@ public class RoomQrCodeInfo extends BaseModel {
                     '}';
         }
     }
+
+    @Override
+    public String toString() {
+        return "RoomQrCodeInfo{" +
+                "data=" + data +
+                '}';
+    }
 }

@@ -74,4 +74,11 @@ public class RoomStatusInfo extends BaseModel {
                     '}';
         }
     }
+
+    @Override
+    public String toString() {
+        return "RoomStatusInfo{" +
+                "data=" + data +
+                '}';
+    }
 }

@@ -32,8 +32,11 @@ public class SocketService extends Service {
     private static final int ROOM_NOT_EXIST_M = 1002;
     private static final int HEAT_BEAT_RTN = 1003;
 
+//    public static final String HOST = "10.10.4.6";// "192.168.1.21";//
+//    public static final int PORT = 9501;
+
     public static final String HOST = "10.10.4.6";// "192.168.1.21";//
-    public static final int PORT = 9501;
+    public static final int PORT = 8899;
 
     public static final String END_SYMBOL = "\\r\\n\\r\\n";//心跳包内容
     //    public String testRoomSn = "R170413034374";

@@ -52,6 +52,7 @@ import com.adroplat.fist_switch.utils.protocol.one.FistProtocol;
 import com.bluetoothle.BLEBroadcastReceiver;
 import com.bluetoothle.BLEOpenRecord;
 import com.bluetoothle.GREENBluetoothLeService;
+import com.bluetoothle.greencity.GREENBLE;
 import com.bluetoothle.greencity.GREENCITYBLEProtocolFactory;
 import com.gimi.common.cinema.db.NewDBManager;
 import com.gimi.common.cinema.model.ClassificationItem;
@@ -235,13 +236,13 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         presenter.load(this);
         Intent intent = new Intent(this, SocketService.class);
         startService(intent);
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                Log.d("room-info", "test open door report");
-                openDoor();
-            }
-        }, 20 * 1000);
+//        new Handler().postDelayed(new Runnable() {
+//            @Override
+//            public void run() {
+//                Log.d("room-info", "test open door report");
+//                openDoor();
+//            }
+//        }, 20 * 1000);
     }
 
     @Override
@@ -1004,7 +1005,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     }
 
     private void openDoor() {
-        handler.post(reportRunnable);
+//        handler.post(reportRunnable);
 
         bleBroadcastReceiver.setResponseObj(new GREENCITYBLEProtocolFactory.GREENCITYBleDataWritten() {
 
@@ -1032,8 +1033,8 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
             }
 
         });
-//        String openCMD = "Open the door";
-//        GREENBLE.send(this, lockMac, openCMD.getBytes());
+        String openCMD = "Open the door";
+        GREENBLE.send(this, lockMac, openCMD.getBytes());
 //        List<LocalMovieMessage> localMovieMessages = new NewDBManager(this).queryRandomMovies();
 //        if (localMovieMessages != null && localMovieMessages.size() > 0) {
 //            OpenMMUtils.openMMWithAds(this, localMovieMessages.get(0).getPlayPath(), null);

@@ -2,6 +2,7 @@ package com.xgimi.gimicinema.model;
 
 import android.content.Context;
 import android.text.TextUtils;
+import android.util.Log;
 import com.gimi.common.cinema.model.RoomInfo;
 import com.gimi.common.cinema.model.RoomQrCodeInfo;
 import com.gimi.common.cinema.model.RoomStatusInfo;
@@ -17,11 +18,12 @@ import com.xgimi.gimicinema.application.FangTangApplication;
  * Created by wugian on 2017/4/7
  */
 public class RoomInfoModelImpl implements IRoomInfoModel {
-    private static final String ROOT_URL = "https://ft.qnbar.cn/develop/api/";
+    //    private static final String ROOT_URL = "https://ft.qnbar.cn/develop/api/";
+    private static final String ROOT_URL = "https://ft.qnbar.cn/test/api/";
     private static final String ROOM_INFO_BY_IMEI_URL = ROOT_URL + "tcp/getRoomInfoByimei?imei=";
     private static final String ROOM_STATUS_BY_ROOM_SN_URL = ROOT_URL + "tcp/getRoomStatus?room_sn=";
     private static final String ROOM_QRCODE_BY_ORDER_SN = ROOT_URL + "tcp/getEndQRCode?order_sn=";
-    private static final String ROOM_REPORT_ROOM_STATUS = ROOT_URL + "tcp/tcp/reportRoomStatus?order_sn=";
+    private static final String ROOM_REPORT_ROOM_STATUS = ROOT_URL + "tcp/reportRoomStatus?order_sn=";
 
     @Override
     public void getRoomInfo(String imei, boolean needUpdate, final GetRoomInfoListener listener) {
@@ -139,6 +141,7 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
 
                     @Override
                     public void onResponse(String response) {
+                        Log.d("cccccc", response);
                         listener.onOpenDoorSuccess();
                     }
                 });

@@ -252,9 +252,11 @@ public class MainPresenter extends BasePresenter
         roomInfoModel.getRoomInfo(imei, false, new RoomInfoModelImpl.GetRoomInfoListener() {
             @Override
             public void onGetRoomInfoSuccess(RoomInfo info) {
+                Log.d("room-info", "getOrderInfo:" + info.toString());
                 roomInfoModel.getRoomStatus(info.getData().getRoom_sn(), new RoomInfoModelImpl.GetRoomStatusListener() {
                     @Override
                     public void onGetRoomStatusSuccess(RoomStatusInfo info) {
+                        Log.d("room-info", "getOrderInfo#onGetRoomStatusSuccess:" + info.toString());
                         RoomStatusInfo.DataEntity data = info.getData();
                         int durationMinutes = data.getEnd_time() - data.getBegin_time();
                         Log.d("CountService", "durationMinutes:" + durationMinutes);
@@ -262,6 +264,7 @@ public class MainPresenter extends BasePresenter
                         roomInfoModel.getRoomQrCode(data.getOrder_sn(), new RoomInfoModelImpl.GetRoomQrCodeListener() {
                             @Override
                             public void onGetRoomQrCodeSuccess(RoomQrCodeInfo info) {
+                                Log.d("room-info", "getOrderInfo#onGetRoomStatusSuccess#onGetRoomQrCodeSuccess:" + info.toString());
                                 mainView.prepareRoomQrCodeInfo(info);
                             }