format ,qr code null

李攀
1 parent b5aeb939
Showing 2 changed files with 48 additions and 69 deletions
gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/QrCodeShowActivity.java
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @6dfcf0b
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @6dfcf0b
@@ -53,8 +53,6 @@ import java.io.InterruptedIOException;
 import java.io.OutputStream;
 import java.net.Socket;
 import java.util.Arrays;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -100,9 +98,6 @@ public class SocketService1 extends BaseService {
     private static final int HEART_BEAT = 20025;
     private static final int CMD_REPORT_EQU_STATUS = 20030;//上报设备状态信息
-    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;
     //    online
     public static final String SERVER_HOST_ONLINE = "conn.ft.qnbar.com";// "192.168.1.21";//
@@ -118,7 +113,7 @@ public class SocketService1 extends BaseService {
     private String serverHost = SERVER_HOST;
     private int serverPort = SERVER_PORT;
-    public int heartbearNum = 0;
+    public int heartbeatNum = 0;
     public static final String END_SYMBOL = "\\r\\n\\r\\n";//心跳包内容
     //    public String testRoomSn = "R170413034374";
@@ -155,12 +150,12 @@ public class SocketService1 extends BaseService {
             mHandler.postDelayed(this, HEART_BEAT_RATE);
             //就发送一个HEART_BEAT_STRING过去 如果发送失败，就重新初始化一个socket
             Heartbeat heartbeat = new Heartbeat();
-            if (heartbearNum > 10) {
+            if (heartbeatNum > 10) {
                 heartbeat.setLightStatus(getLightStatus());
                 heartbeat.setPlayStatus(getPlayStatus());
                 heartbeat.setVolume(getAudioVolume() / 6 + 1);
             } else {
-                heartbearNum++;
+                heartbeatNum++;
             }
             heartbeat.setRoom_sn(testRoomSn);
             MainRequest rep = new MainRequest();
@@ -168,7 +163,7 @@ public class SocketService1 extends BaseService {
             rep.setData(heartbeat);
             String msg = gson.toJson(rep);
 //            final String msg = new Gson().toJson(
-//                    new SocketSendMsg().contractHeartBeatMsg(testRoomSn));
+//            new SocketSendMsg().contractHeartBeatMsg(testRoomSn));
             boolean isSuccess = sendMsg(msg + END_SYMBOL);
             if (!isSuccess) {
                 LogUtils.i(TAG, "send heart beat error restart");
@@ -203,7 +198,6 @@ public class SocketService1 extends BaseService {
         super.onCreate();
         LogUtils.i(TAG, "onCreate");
         bindService(new Intent(SocketService1.this, CinemaControlService.class), conn, Context.BIND_AUTO_CREATE);
-//        startService(new Intent(SocketService1.this, CinemaControlService.class));
     }
     @Override
@@ -224,7 +218,6 @@ public class SocketService1 extends BaseService {
             case 2:
                 serverHost = SERVER_HOST;
                 serverPort = SERVER_PORT;
-//                serverHost = "192.168.200.217";
                 break;
         }
@@ -261,7 +254,7 @@ public class SocketService1 extends BaseService {
         boolean availableByPing = NetStatusUtils.isAvailableByPing("www.baidu.com");
         boolean availableByPing1 = NetStatusUtils.isAvailableByPing(serverHost);
         boolean availableByPing2 = NetStatusUtils.isAvailableByPing("192.168.200.241");
-        LogUtils.i(TAG, "initsocket serverHost:serverPort:" + serverHost + ":" + serverPort);
+        LogUtils.i(TAG, "init socket serverHost:serverPort:" + serverHost + ":" + serverPort);
         LogUtils.i(TAG, "networkConnected:" + networkConnected + ":baidu:" + availableByPing + ",serverHost:" + availableByPing1 + ",serverIp:" + availableByPing2);
         mHandler.post(new Runnable() {
             @Override
@@ -332,9 +325,7 @@ public class SocketService1 extends BaseService {
                     msg.setLength(0);
                     msg.append(readingMsg.substring(0, pos));
                     readingMsg.delete(0, pos + END_SYMBOL.length());
-//                    if (msg.length() > 55) {
-                        LogUtils.d("recvMsg","from last:"+msg.length()+":"+msg);
-//                    }
+                    LogUtils.d("recvMsg", "from last:" + msg.length() + ":" + msg);
                     return true;
                 }
             }
@@ -346,21 +337,17 @@ public class SocketService1 extends BaseService {
                     && !socket.isInputShutdown()
                     && ((length = is.read(buffer)) > 0)) {
                 String tmp = new String(Arrays.copyOf(buffer, length));
-//                if (length > 55) {
-                    LogUtils.d("recvMsg", msgId + ":" + length + ":" + tmp);
-//                }
+                LogUtils.d("recvMsg", msgId + ":" + length + ":" + tmp);
                 readingMsg.append(tmp);
                 int pos = readingMsg.indexOf(END_SYMBOL);
                 if (pos != -1) {
                     msg.setLength(0);
                     msg.append(readingMsg.substring(0, pos));
                     readingMsg.delete(0, pos + END_SYMBOL.length());
-//                    if (length > 55) {
-                        LogUtils.d("recvMsg", msgId + ":" + length + ":" + msg);
-//                    }
+                    LogUtils.d("recvMsg", msgId + ":" + length + ":" + msg);
                     return true;
                 }
-                msgId ++;
+                msgId++;
             }
         } catch (InterruptedIOException e) {
             return false;
@@ -430,9 +417,7 @@ public class SocketService1 extends BaseService {
                 sleepTime = READ_THREAD_DEFAULT_SLEEP_MTIME;
                 while (recvMsg(message)) {
                     sleepTime = READ_THREAD_DEFAULT_SLEEP_MTIME;
-//                    if (message.length() > 55) {
-                        LogUtils.d("recvMsg",  "logic:" + message);
-//                    }
+                    LogUtils.d("recvMsg", "logic:" + message);
                     LogUtils.d(TAG, "recv msg:" + message);
                     MainResponse socketResponse;
                     try {
@@ -492,7 +477,6 @@ public class SocketService1 extends BaseService {
                         case CONTAIN_MESSAGE:
                             heartBeatErrorCount.set(0);
                             LogUtils.i(TAG, "CONTAIN_MESSAGE");
-//                            Log.d("getctrl","收到有命令的返回");
                             serverCommandDeal(socketResponse);
                             break;
                         default:
@@ -534,7 +518,6 @@ public class SocketService1 extends BaseService {
                     OpenDoor openDoorResponse = gson.fromJson(socketResponse.getData(), OpenDoor.class);
                     openDoor(openDoorResponse);
                 }
-//                Log.d("getctrl","开门");
                 break;
             case CLEAN_OVER://清洁完成处理
                 LogUtils.i("LightOperationUtils", "admin clean over close light");
@@ -559,15 +542,12 @@ public class SocketService1 extends BaseService {
                 break;
             case REPORT_EQU_STATUS://获取声音,灯光,播放暂停状态
-//                Log.d("ReportInfo", "收到上报命令");
                 //获取serverId
                 ReportEquStatus rps = gson.fromJson(socketResponse.getData(), ReportEquStatus.class);
-//                String serverId = rps.getServerId();
                 reportEquStatus(rps.getServerId(), 0);
                 break;
             case SET_EQU_STATUS://设置声音,灯光,播放暂停
-//                Log.d("getctrl","收到控制命令");
                 Log.d("ReportInfo", "收到控制命令:" + socketResponse.getData());
                 EquipmentControl equc = gson.fromJson(socketResponse.getData(), EquipmentControl.class);
                 setEquipmentStatus(equc);
@@ -617,7 +597,7 @@ public class SocketService1 extends BaseService {
         //填充返回数据
         int volume = getAudioVolume() / 6 + 1;
         int playStatus = getPlayStatus();
-        int lightStatus = 0;
+        int lightStatus;
         if (lightSet == 1 || lightSet == 2) {
             lightStatus = lightSet;
         } else {
@@ -645,42 +625,32 @@ public class SocketService1 extends BaseService {
     private void setLight(int op) {
         if (op == SERVER_CMD_OPEN_LIGHT) {//打开灯光
             Log.d("setEqu", "打开灯光");
-            try {
-                iPlayer.openLight();
-            } catch (RemoteException e) {
-                e.printStackTrace();
+            if (iPlayer != null) {
+                try {
+                    iPlayer.openLight();
+                } catch (RemoteException e) {
+                    e.printStackTrace();
+                }
             }
-//            LightOperationUtils.open();
-//            LightOperationUtils.setLightValue(5);
-//            //延时增亮
-//            Timer timer = new Timer();//实例化Timer类
-//            timer.schedule(new TimerTask() {
-//                public void run() {
-//                    LightOperationUtils.setLightValue(Utils.getInt(context, "brightness", 50));
-//                    this.cancel();
-//                }
-//            }, 2000);//毫秒
         } else if (op == SERVER_CMD_CLOSE_LIGHT) {//关闭灯光
             Log.d("setEqu", "关闭灯光");
-            try {
-                iPlayer.closeLight();
-            } catch (RemoteException e) {
-                e.printStackTrace();
+            if (iPlayer != null) {
+                try {
+                    iPlayer.closeLight();
+                } catch (RemoteException e) {
+                    e.printStackTrace();
+                }
             }
-//            LightOperationUtils.setLightValue(20);
-//            //延时关闭
-//            Timer timer = new Timer();//实例化Timer类
-//            timer.schedule(new TimerTask() {
-//                public void run() {
-//                    LightOperationUtils.close();
-//                    this.cancel();
-//                }
-//            }, 2000);//毫秒
         }
     }
     private void playCtl(int op) {
         int status = -1;
+
+        if (iPlayer == null) {
+            LogUtils.i("iPlayer is null");
+            return;
+        }
         try {
             status = iPlayer.getCurrentStatus();
         } catch (RemoteException e) {
@@ -698,18 +668,8 @@ public class SocketService1 extends BaseService {
     private void setEquipmentStatus(EquipmentControl equc) {
         setLight(equc.getLightCtl());
-
         playCtl(equc.getPlayCtl());
-
         setAudioVolume(equc.getAudioCtl());
-
-//        if (equc.getLightCtl() != 0) {
-//            try {
-//                Thread.sleep(500);
-//            } catch (InterruptedException e) {
-//                e.printStackTrace();
-//            }
-//        }
         reportEquStatus(equc.getServerId(), equc.getLightCtl());
     }
@@ -748,6 +708,7 @@ public class SocketService1 extends BaseService {
             DeviceInfo connectDevice = ((FangTangApplication) getApplication()).
                     getConnectDevice();
             if (connectDevice == null) {
+                LogUtils.i(TAG, "connectDevice is null");
                 return lightStatus;
             }
             ConnectionStatus stu = Lights.getInstance().
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/QrCodeShowActivity.java
View file @6dfcf0b
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/QrCodeShowActivity.java
View file @6dfcf0b
@@ -130,8 +130,26 @@ public class QrCodeShowActivity extends Activity implements IUpdateQrCodeView {
     @Override
     public void getQrCodeSuccess(RoomQrCodeInfo info) {
         try {
+            if (info == null) {
+                LogUtils.i("info = null");
+                return;
+            }
+            if (info.getData() == null) {
+                LogUtils.i("info.getData() = null");
+                return;
+            }
+            //TODO 连场修正
+            if (!TextUtils.isEmpty(info.getData().getOrder_sn())) {
+                LogUtils.i("get qr code order sn not null, record msg:" + info.getData());
+//                WrongMsg wrongMsg = new WrongMsg();
+//                wrongMsg.setMsg("请联系服务员处理");
+//                getQrCodeFailure(wrongMsg);
+                return;
+            }
             LogUtils.i("QrCodeShowActivity", info.getData().getCode());
-            iv.setImageBitmap(QRCodeUtils.createQRCode(info.getData().getCode(), 400));
+            if (!TextUtils.isEmpty(info.getData().getCode())) {
+                iv.setImageBitmap(QRCodeUtils.createQRCode(info.getData().getCode(), 400));
+            }
         } catch (WriterException e) {
             e.printStackTrace();
         }