get room info update service start command

@@ -4,12 +4,14 @@ import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
+import android.text.TextUtils;
 import android.util.Log;
+import android.widget.Toast;
 import com.gimi.common.cinema.model.MessageEvent;
-import com.gimi.common.cinema.utils.SystemUtils;
+import com.gimi.common.cinema.model.RoomInfo;
+import com.gimi.common.cinema.utils.Utils;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
-import com.xgimi.gimicinema.BuildConfig;
 import org.greenrobot.eventbus.EventBus;
 
 import java.io.IOException;
@@ -25,7 +27,7 @@ public class SocketService extends Service {
 
     public static final int OPEN_DOOR_CMD = 1701;
 
-    private static final int SUCESS_MESSAGE = 0;
+    private static final int SUCCESS_MESSAGE = 0;
     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;
@@ -34,7 +36,8 @@ public class SocketService extends Service {
     public static final int PORT = 9501;
 
     public static final String END_SYMBOL = "\\r\\n\\r\\n";//心跳包内容
-    public String testRoomSn = "R170413034374";
+    //    public String testRoomSn = "R170413034374";
+    public String testRoomSn = "c";
 
     private ReadThread mReadThread;
     private HeatBeatThread mHeatBeatThread;
@@ -81,12 +84,33 @@ public class SocketService extends Service {
         super.onCreate();
         gson = new Gson();
         context = this;
-        //TODO change the room sn
-        if (!"LETEST".equals(SystemUtils.getPid(context, BuildConfig.MACHINE_TYPE))) {
-            testRoomSn = "R170413034374";
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        String roomInfoStr = Utils.getString(this, "room-info");
+        if (!TextUtils.isEmpty(roomInfoStr)) {
+            Log.d("room-info", "room info not null");
+            RoomInfo roomInfo = null;
+            try {
+                roomInfo = gson.fromJson(roomInfoStr, RoomInfo.class);
+                Log.d("room-info", "room info room_sn update");
+                testRoomSn = roomInfo.getData().getRoom_sn();
+            } catch (JsonSyntaxException e) {
+                Log.d("room-info", "room gson parse exception return");
+                Toast.makeText(this, "房间信息配置出错，请重新进入应用获取", Toast.LENGTH_SHORT).show();
+                e.printStackTrace();
+                return super.onStartCommand(intent, flags, startId);
+            }
+        } else {
+            Log.d("room-info", "room info not exist");
+            Toast.makeText(this, "没有获取到房间信息，请查看后台配置", Toast.LENGTH_SHORT).show();
+            return super.onStartCommand(intent, flags, startId);
         }
+//        }
         new InitSocketThread().start();
         Log.d(TAG, "socket service onCreate");
+        return super.onStartCommand(intent, flags, startId);
     }
 
     public boolean sendMsg(String msg) {
@@ -197,9 +221,12 @@ public class SocketService extends Service {
                             Log.d(TAG, "end:" + message.contains(END_SYMBOL) + "");
                             Log.d(TAG, "recv msg:" + message);
                             try {
-                                SocketResponse socketResponse = gson.fromJson(message.substring(0, message.length() - 8), SocketResponse.class);
+                                if (message.endsWith(END_SYMBOL)) {
+                                    message = message.replace(END_SYMBOL, "");
+                                }
+                                SocketResponse socketResponse = gson.fromJson(message/*.substring(0, message.length() - 8)*/, SocketResponse.class);
                                 switch (socketResponse.getCode()) {
-                                    case SUCESS_MESSAGE:
+                                    case SUCCESS_MESSAGE:
                                         Log.d(TAG, "success:" + socketResponse.getCmd());
                                         break;
                                     case ROOM_HAS_REGISTERED:
@@ -298,7 +325,7 @@ public class SocketService extends Service {
 
     @Override
     public void onDestroy() {
-        super.onDestroy();
         Log.d(TAG, "socket service destroy");
+        super.onDestroy();
     }
 }
\ No newline at end of file

@@ -18,6 +18,7 @@ package com.xgimi.gimicinema.activity;
 import android.app.AlertDialog;
 import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -44,7 +45,6 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.Toast;
-
 import com.adroplat.fist_switch.jni.Device;
 import com.adroplat.fist_switch.jni.FistJni;
 import com.adroplat.fist_switch.jni.SubDevice;
@@ -105,7 +105,6 @@ import com.xgimi.gimicinema.view.MovieItem;
 import com.xgimi.gimicinema.view.OrderRecyclerView;
 import com.xgimi.smartscreen.SmartScreenBean;
 import com.xgimi.smartscreen.service.ConfigService;
-
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -494,6 +493,27 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         }
     }
 
+    @Override
+    public void notifyUpdateRoomInfo(RoomInfo info) {
+        if (!TextUtils.isEmpty(info.getData().getMac_address())) {
+            lockMac = info.getData().getMac_address();
+        } else {
+            show("没有配置门禁相关网信息，使用默认信息");
+        }
+        Log.d("room-info", "start socket service");
+        try {
+            Thread.sleep(3 * 1000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+//        Intent intent = new Intent(this, SocketService.class);
+//        startService(intent);
+        Intent intent = new Intent();
+        ComponentName componentName = new ComponentName("com.xgimi.gimicinema", "com.qnbar.smc.service.SocketService");
+        intent.setComponent(componentName);
+        context.startService(intent);
+    }
+
 
     int findCount = 0;
 

@@ -62,4 +62,6 @@ public interface IMainView {
     void prepareRoomQrCodeInfo(RoomQrCodeInfo info);
 
     void notifyGetRoomInfo(RoomInfo info);
+
+    void notifyUpdateRoomInfo(RoomInfo info);
 }

@@ -220,8 +220,8 @@ public class MainPresenter extends BasePresenter
 
             @Override
             public void onGetRoomInfoUpdate(RoomInfo info) {
-                mainView.notifyGetRoomInfo(info);
                 Log.d("room-info", "update success:" + info.toString());
+                mainView.notifyUpdateRoomInfo(info);
             }
 
             @Override