save log files

@@ -235,6 +235,7 @@ public class SmartControlService extends BaseService implements EventListener<St
         switch (messageEvent.getEventId()) {
         switch (messageEvent.getEventId()) {
             case SocketService1.JUST_OPEN_DOOR:
             case SocketService1.JUST_OPEN_DOOR:
                 //check qr code is showing
                 //check qr code is showing
+                needReport = false;
                 openDoor();
                 openDoor();
                 if (ActivityCollector.isActivityExist(QrCodeShowActivity.class)
                 if (ActivityCollector.isActivityExist(QrCodeShowActivity.class)
                         || ActivityCollector.isActivityExist(SimpleAdsPlayer2.class)
                         || ActivityCollector.isActivityExist(SimpleAdsPlayer2.class)

@@ -57,29 +57,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicInteger;
 
 
 public class SocketService1 extends BaseService {
 public class SocketService1 extends BaseService {
-    private static final String TAG = "BackService1";
+    private static final String TAG = "BackService";
     private static final long HEART_BEAT_RATE = 2 * 1000;
     private static final long HEART_BEAT_RATE = 2 * 1000;
     private final long READ_THREAD_DEFAULT_SLEEP_MTIME = 100;
     private final long READ_THREAD_DEFAULT_SLEEP_MTIME = 100;
     public static final int JUST_OPEN_DOOR = 1701;
     public static final int JUST_OPEN_DOOR = 1701;
     public static final int USER_OPEN_DOOR_AND_GET_MOVIE = 1703;
     public static final int USER_OPEN_DOOR_AND_GET_MOVIE = 1703;
     public static final int USER_OPEN_DOOR = 1704;
     public static final int USER_OPEN_DOOR = 1704;
-
-    //    public static final int USER_OPEN_DOOR_AND_GET_MOVIE = 1703;
-    /*
-      10001 //服务器发送了命令(带命令的返回消息),这个一般是服务器主动发消息的时候code为这个值
-      10002 //连接(认证)失败
-      10003 //还未注册连接就进行认证
-      10004 //终端编号未传
-      10005 //心跳异常,没有找到房间连接信息
-      10006 //心跳异常,连接标识符不一致
-      10007 //收到未知命令
-      10008 //收到无法解析的消息
-      10009 //已经认证过了,不允许再认证
-      10010 //room_sn 已连接,不能再连接
-      9997  //心跳成功
-      9998  //请求认证被服务器接受了,服务器返回了认证码
-      9999  //认证成功,可以开始心跳了
-    */
     private static final int HEART_BEAT_SUCCESS = 9997;
     private static final int HEART_BEAT_SUCCESS = 9997;
     private static final int RETURN_VERIFY_CODE = 9998;
     private static final int RETURN_VERIFY_CODE = 9998;
     private static final int VERIFY_SUCCESS = 9999;
     private static final int VERIFY_SUCCESS = 9999;
@@ -116,13 +99,9 @@ public class SocketService1 extends BaseService {
     public int heartbeatNum = 0;
     public int heartbeatNum = 0;
 
 
     public static final String END_SYMBOL = "\\r\\n\\r\\n";//心跳包内容
     public static final String END_SYMBOL = "\\r\\n\\r\\n";//心跳包内容
-    //    public String testRoomSn = "R170413034374";
     public String testRoomSn = "c";
     public String testRoomSn = "c";
 
 
-    //    private ReadThread mReadThread;
     private Gson gson = new Gson();
     private Gson gson = new Gson();
-
-    //    private WeakReference<Socket> mSocket;
     private Socket socket = null;
     private Socket socket = null;
     StringBuilder readingMsg = new StringBuilder();
     StringBuilder readingMsg = new StringBuilder();
 
 
@@ -135,11 +114,12 @@ public class SocketService1 extends BaseService {
     public ICinemaControl iPlayer = null;
     public ICinemaControl iPlayer = null;
     private ServiceConnection conn = new ServiceConnection() {
     private ServiceConnection conn = new ServiceConnection() {
         public void onServiceConnected(ComponentName className, IBinder service) {
         public void onServiceConnected(ComponentName className, IBinder service) {
-            Log.d("yao", "ServiceConnection -> onServiceConnected");
+            LogUtils.i("bind cinema control service success");
             iPlayer = ICinemaControl.Stub.asInterface(service);
             iPlayer = ICinemaControl.Stub.asInterface(service);
         }
         }
 
 
         public void onServiceDisconnected(ComponentName className) {
         public void onServiceDisconnected(ComponentName className) {
+            LogUtils.i("cinema control service error");
         }
         }
     };
     };
 
 
@@ -162,12 +142,9 @@ public class SocketService1 extends BaseService {
             rep.setCmd(HEART_BEAT);
             rep.setCmd(HEART_BEAT);
             rep.setData(heartbeat);
             rep.setData(heartbeat);
             String msg = gson.toJson(rep);
             String msg = gson.toJson(rep);
-//            final String msg = new Gson().toJson(
-//            new SocketSendMsg().contractHeartBeatMsg(testRoomSn));
             boolean isSuccess = sendMsg(msg + END_SYMBOL);
             boolean isSuccess = sendMsg(msg + END_SYMBOL);
             if (!isSuccess) {
             if (!isSuccess) {
                 LogUtils.i(TAG, "send heart beat error restart");
                 LogUtils.i(TAG, "send heart beat error restart");
-                Log.d("heartbeat content", msg);
             }
             }
         }
         }
     };
     };
@@ -205,7 +182,6 @@ public class SocketService1 extends BaseService {
         super.onStartCommand(intent, flags, startId);
         super.onStartCommand(intent, flags, startId);
         LogUtils.i(TAG, "onStartCommand");
         LogUtils.i(TAG, "onStartCommand");
         int ftTest = Utils.getInt(this, "ft-test", 0);
         int ftTest = Utils.getInt(this, "ft-test", 0);
-        Log.d("Host", "" + ftTest);
         switch (ftTest) {
         switch (ftTest) {
             case 0:
             case 0:
                 serverHost = SERVER_HOST_ONLINE;
                 serverHost = SERVER_HOST_ONLINE;
@@ -229,7 +205,7 @@ public class SocketService1 extends BaseService {
         }
         }
 
 
         LogUtils.i("room-info", "room info not null");
         LogUtils.i("room-info", "room info not null");
-        RoomInfo roomInfo = null;
+        RoomInfo roomInfo;
         try {
         try {
             roomInfo = gson.fromJson(roomInfoStr, RoomInfo.class);
             roomInfo = gson.fromJson(roomInfoStr, RoomInfo.class);
             LogUtils.i("room-info", "room info room_sn update");
             LogUtils.i("room-info", "room info room_sn update");
@@ -337,14 +313,12 @@ public class SocketService1 extends BaseService {
                     && !socket.isInputShutdown()
                     && !socket.isInputShutdown()
                     && ((length = is.read(buffer)) > 0)) {
                     && ((length = is.read(buffer)) > 0)) {
                 String tmp = new String(Arrays.copyOf(buffer, length));
                 String tmp = new String(Arrays.copyOf(buffer, length));
-                LogUtils.d("recvMsg", msgId + ":" + length + ":" + tmp);
                 readingMsg.append(tmp);
                 readingMsg.append(tmp);
                 int pos = readingMsg.indexOf(END_SYMBOL);
                 int pos = readingMsg.indexOf(END_SYMBOL);
                 if (pos != -1) {
                 if (pos != -1) {
                     msg.setLength(0);
                     msg.setLength(0);
                     msg.append(readingMsg.substring(0, pos));
                     msg.append(readingMsg.substring(0, pos));
                     readingMsg.delete(0, pos + END_SYMBOL.length());
                     readingMsg.delete(0, pos + END_SYMBOL.length());
-                    LogUtils.d("recvMsg", msgId + ":" + length + ":" + msg);
                     return true;
                     return true;
                 }
                 }
                 msgId++;
                 msgId++;
@@ -412,12 +386,9 @@ public class SocketService1 extends BaseService {
                     sendRegister.set(true);
                     sendRegister.set(true);
                 }
                 }
 
 
-                LogUtils.d(TAG, "begin to recv msg");
-
                 sleepTime = READ_THREAD_DEFAULT_SLEEP_MTIME;
                 sleepTime = READ_THREAD_DEFAULT_SLEEP_MTIME;
                 while (recvMsg(message)) {
                 while (recvMsg(message)) {
                     sleepTime = READ_THREAD_DEFAULT_SLEEP_MTIME;
                     sleepTime = READ_THREAD_DEFAULT_SLEEP_MTIME;
-                    LogUtils.d("recvMsg", "logic:" + message);
                     LogUtils.d(TAG, "recv msg:" + message);
                     LogUtils.d(TAG, "recv msg:" + message);
                     MainResponse socketResponse;
                     MainResponse socketResponse;
                     try {
                     try {
@@ -540,23 +511,20 @@ public class SocketService1 extends BaseService {
                     e.printStackTrace();
                     e.printStackTrace();
                 }
                 }
                 break;
                 break;
-
-            case REPORT_EQU_STATUS://获取声音,灯光,播放暂停状态
+            case REPORT_EQU_STATUS:
+                //获取声音,灯光,播放暂停状态并上报
                 //获取serverId
                 //获取serverId
                 ReportEquStatus rps = gson.fromJson(socketResponse.getData(), ReportEquStatus.class);
                 ReportEquStatus rps = gson.fromJson(socketResponse.getData(), ReportEquStatus.class);
                 reportEquStatus(rps.getServerId(), 0);
                 reportEquStatus(rps.getServerId(), 0);
                 break;
                 break;
-
             case SET_EQU_STATUS://设置声音,灯光,播放暂停
             case SET_EQU_STATUS://设置声音,灯光,播放暂停
-                Log.d("ReportInfo", "收到控制命令:" + socketResponse.getData());
+                LogUtils.i("ReportInfo", "收到控制命令:" + socketResponse.getData());
                 EquipmentControl equc = gson.fromJson(socketResponse.getData(), EquipmentControl.class);
                 EquipmentControl equc = gson.fromJson(socketResponse.getData(), EquipmentControl.class);
                 setEquipmentStatus(equc);
                 setEquipmentStatus(equc);
                 break;
                 break;
         }
         }
     }
     }
 
 
-    /*--命令处理-start-----------------------------------*/
-
     private void openDoor(OpenDoor openDoorResponse) {
     private void openDoor(OpenDoor openDoorResponse) {
         switch (openDoorResponse.getUser()) {
         switch (openDoorResponse.getUser()) {
             //10用户,20管理员,默认值为0
             //10用户,20管理员,默认值为0
@@ -572,7 +540,6 @@ public class SocketService1 extends BaseService {
                 } else {
                 } else {
                     sendMessage(USER_OPEN_DOOR, "user open the door");
                     sendMessage(USER_OPEN_DOOR, "user open the door");
                 }
                 }
-                Log.d("op", "开门");
                 break;
                 break;
             case 20:
             case 20:
                 LogUtils.i(TAG, "admin open the door,del the log");
                 LogUtils.i(TAG, "admin open the door,del the log");
@@ -673,8 +640,6 @@ public class SocketService1 extends BaseService {
         reportEquStatus(equc.getServerId(), equc.getLightCtl());
         reportEquStatus(equc.getServerId(), equc.getLightCtl());
     }
     }
 
 
-/*--命令处理-end-----------------------------------*/
-
     public int getAudioVolume() {
     public int getAudioVolume() {
         AudioManager mAudioManager;
         AudioManager mAudioManager;
         mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
         mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);

 package com.qnbar.smc.socketProtocol;
 package com.qnbar.smc.socketProtocol;
 
 
-/**
- * Created by jinyan.yi on 2017/5/23.
- */
-
 public abstract class DataInfo {}
 public abstract class DataInfo {}

 package com.qnbar.smc.socketProtocol;
 package com.qnbar.smc.socketProtocol;
 
 
-import com.qnbar.smc.socketProtocol.toServer.Heartbeat;
-
-/**
- * Created by jinyan.yi on 2017/5/23.
- */
-
 public class MainRequest {
 public class MainRequest {
     private int cmd;
     private int cmd;
     private DataInfo data;
     private DataInfo data;

 package com.qnbar.smc.socketProtocol;
 package com.qnbar.smc.socketProtocol;
 
 
-/**
- * Created by jinyan.yi on 2017/5/23.
- */
-
 public class MainResponse {
 public class MainResponse {
     private int code;
     private int code;
     private String msg;
     private String msg;

@@ -3,7 +3,6 @@ package com.qnbar.smc.socketProtocol.fromServer;
 /**
 /**
  * Created by jinyan.yi on 2017/5/23.
  * Created by jinyan.yi on 2017/5/23.
  */
  */
-
 public class EquipmentControl {
 public class EquipmentControl {
     private int audioCtl;
     private int audioCtl;
     private int playCtl;
     private int playCtl;

@@ -3,7 +3,6 @@ package com.qnbar.smc.socketProtocol.fromServer;
 /**
 /**
  * Created by jinyan.yi on 2017/5/23.
  * Created by jinyan.yi on 2017/5/23.
  */
  */
-
 public class OpenDoor {
 public class OpenDoor {
     private String verify;
     private String verify;
     private int user;
     private int user;

@@ -3,7 +3,6 @@ package com.qnbar.smc.socketProtocol.fromServer;
 /**
 /**
  * Created by jinyan.yi on 2017/5/23.
  * Created by jinyan.yi on 2017/5/23.
  */
  */
-
 public class ReportEquStatus {
 public class ReportEquStatus {
     private String serverId;
     private String serverId;
 
 

@@ -3,7 +3,6 @@ package com.qnbar.smc.socketProtocol.fromServer;
 /**
 /**
  * Created by jinyan.yi on 2017/6/2.
  * Created by jinyan.yi on 2017/6/2.
  */
  */
-
 public class VerifyCode {
 public class VerifyCode {
     private String verify;
     private String verify;
 
 

@@ -5,7 +5,6 @@ import com.qnbar.smc.socketProtocol.DataInfo;
 /**
 /**
  * Created by jinyan.yi on 2017/5/23.
  * Created by jinyan.yi on 2017/5/23.
  */
  */
-
 public class EquipmentStatus extends DataInfo {
 public class EquipmentStatus extends DataInfo {
     private int volume;
     private int volume;
     private int lightStatus;
     private int lightStatus;

@@ -2,10 +2,6 @@ package com.qnbar.smc.socketProtocol.toServer;
 
 
 import com.qnbar.smc.socketProtocol.DataInfo;
 import com.qnbar.smc.socketProtocol.DataInfo;
 
 
-/**
- * Created by jinyan.yi on 2017/6/14.
- */
-
 public class Heartbeat extends DataInfo {
 public class Heartbeat extends DataInfo {
     private int lightStatus;
     private int lightStatus;
     private int volume;
     private int volume;

@@ -639,11 +639,11 @@ public class MainActivity extends BaseActivity implements IMainView/*, EventList
         startService(new Intent(this, ConfigService.class));
         startService(new Intent(this, ConfigService.class));
         mDeviceIp = Utils.getString(context, "screen-ip");
         mDeviceIp = Utils.getString(context, "screen-ip");
         if (TextUtils.isEmpty(mDeviceIp)) {
         if (TextUtils.isEmpty(mDeviceIp)) {
-            show("没有配置智能幕布");
+//            show("没有配置智能幕布");
             return;
             return;
         }
         }
         if (!NetStatusUtils.isAvailableByPing(mDeviceIp)) {
         if (!NetStatusUtils.isAvailableByPing(mDeviceIp)) {
-            show("没有找到智能幕布");
+//            show("没有找到智能幕布");
             return;
             return;
         }
         }
         messageThread = new MessageThread();
         messageThread = new MessageThread();

@@ -37,6 +37,7 @@ public class QrCodeShowActivity extends Activity implements IUpdateQrCodeView {
     };
     };
 
 
     private void closeSystem() {
     private void closeSystem() {
+        LogUtils.i("closeSystem");
         LightOperationUtils.close();
         LightOperationUtils.close();
         LightOperationUtils.setLightValue(5);
         LightOperationUtils.setLightValue(5);
         new SystemUtils().closeFtLed(QrCodeShowActivity.this.getApplicationContext());
         new SystemUtils().closeFtLed(QrCodeShowActivity.this.getApplicationContext());
@@ -67,17 +68,9 @@ public class QrCodeShowActivity extends Activity implements IUpdateQrCodeView {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_qr_code_show);
         setContentView(R.layout.activity_qr_code_show);
         EventBus.getDefault().register(this);
         EventBus.getDefault().register(this);
-        //back press,movie length
         present = new QrCodeShowPresent(this);
         present = new QrCodeShowPresent(this);
-//        final String qr = getIntent().getStringExtra("qr");
         orderSn = getIntent().getStringExtra("order_sn");
         orderSn = getIntent().getStringExtra("order_sn");
         roomSn = getIntent().getStringExtra("room_sn");
         roomSn = getIntent().getStringExtra("room_sn");
-//        boolean countCall = getIntent().getBooleanExtra("count_call", false);
-//        if (countCall) {
-//            Toast.makeText(this, "你预定的时段已结束，请携带好随身物品，欢迎下次光临", Toast.LENGTH_LONG).show();
-//        } else {
-//            Toast.makeText(this, "电影观看完成，请携带好随身物品，欢迎下次光临", Toast.LENGTH_LONG).show();
-//        }
         iv = (ImageView) findViewById(qrCodeIv);
         iv = (ImageView) findViewById(qrCodeIv);
         handler.postDelayed(r, 20 * 60 * 1000);
         handler.postDelayed(r, 20 * 60 * 1000);
 
 
@@ -122,7 +115,7 @@ public class QrCodeShowActivity extends Activity implements IUpdateQrCodeView {
         switch (messageEvent.getEventId()) {
         switch (messageEvent.getEventId()) {
             case KILL_SELF:
             case KILL_SELF:
                 QrCodeShowActivity.this.finish();
                 QrCodeShowActivity.this.finish();
-                LogUtils.d("room-info", messageEvent.getMessage());
+                LogUtils.i("room-info", "kill qr code show activity " + messageEvent.getMessage());
                 break;
                 break;
         }
         }
     }
     }

@@ -27,6 +27,7 @@ import com.gimi.common.cinema.model.SambaMsg;
 import com.gimi.common.cinema.model.WrongMsg;
 import com.gimi.common.cinema.model.WrongMsg;
 import com.gimi.common.cinema.utils.FolderUtils;
 import com.gimi.common.cinema.utils.FolderUtils;
 import com.gimi.common.cinema.utils.LeeImageLoader;
 import com.gimi.common.cinema.utils.LeeImageLoader;
+import com.gimi.common.cinema.utils.LogUtils;
 import com.gimi.common.cinema.utils.MovieMessageUtils;
 import com.gimi.common.cinema.utils.MovieMessageUtils;
 import com.gimi.common.cinema.utils.NameFilterUtils;
 import com.gimi.common.cinema.utils.NameFilterUtils;
 import com.gimi.common.cinema.utils.SambaFileCharge;
 import com.gimi.common.cinema.utils.SambaFileCharge;
@@ -261,6 +262,7 @@ public class MovieDetailPresenter extends BasePresenter
     public void playPath(String path) {
     public void playPath(String path) {
         String playPath = TextUtils.isEmpty(path)
         String playPath = TextUtils.isEmpty(path)
                 ? view.getMovieItem().getPlayPath() : path;
                 ? view.getMovieItem().getPlayPath() : path;
+        LogUtils.i("admin play the movie:" + path);
         if (SambaFileCharge.fileExist(playPath)) {
         if (SambaFileCharge.fileExist(playPath)) {
             view.jumpToPlay(playPath);
             view.jumpToPlay(playPath);
         } else {
         } else {

@@ -107,7 +107,6 @@ public class CinemaControlService extends Service {
             }
             }
             if (state != currentState) {
             if (state != currentState) {
                 currentState = state;
                 currentState = state;
-//                ShellUtils.execCommand("input keyevent 23", false);
                 Log.d("aidl", "state change," + currentPath + "," + duration + "," + currentPosition + ",state:" + state);
                 Log.d("aidl", "state change," + currentPath + "," + duration + "," + currentPosition + ",state:" + state);
                 Log.d("aidl", "state change cinemaSMC not null");
                 Log.d("aidl", "state change cinemaSMC not null");
 //                if (true) {
 //                if (true) {
@@ -174,11 +173,11 @@ public class CinemaControlService extends Service {
             CinemaControlService.this.movies.addAll(movies);
             CinemaControlService.this.movies.addAll(movies);
         }
         }
 
 
-        public void openLight()throws RemoteException {
+        public void openLight() throws RemoteException {
             fadeIn();
             fadeIn();
         }
         }
 
 
-        public void closeLight()throws RemoteException {
+        public void closeLight() throws RemoteException {
             fadeOut();
             fadeOut();
         }
         }
     };
     };
@@ -346,12 +345,6 @@ public class CinemaControlService extends Service {
 
 
     private void showQrCodeRightNow() {
     private void showQrCodeRightNow() {
         if (duration - currentPosition < 1000 * 60) {
         if (duration - currentPosition < 1000 * 60) {
-            //save order complete
-//            Constant.count = -1;
-//            MessageEvent messageEvent = new MessageEvent();
-//            messageEvent.setEventId(COUNT_DOWN_ZERO);
-//            messageEvent.setMessage("CinemaControlService,记数为0");
-//            EventBus.getDefault().post(messageEvent);
             MessageEvent messageEvent = new MessageEvent();
             MessageEvent messageEvent = new MessageEvent();
             messageEvent.setEventId(SmartControlService.ORDER_PLAY_COMPLETE);
             messageEvent.setEventId(SmartControlService.ORDER_PLAY_COMPLETE);
             messageEvent.setMessage("电影播放完成，记录完成订单信息");
             messageEvent.setMessage("电影播放完成，记录完成订单信息");