日志整理及清除

李攀
1 parent bc17a3c7
Showing 8 changed files with 320 additions and 62 deletions
gimiCinema/src/main/java/com/gimi/common/cinema/utils/CompressUtils.java
gimiCinema/src/main/java/com/gimi/common/cinema/utils/LogUtils.java
gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlPresenter.java
gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlService.java
gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/CheckActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/application/FangTangApplication.java
gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/utils/CompressUtils.java 0 → 100644
View file @0d04647
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/utils/CompressUtils.java 0 → 100644
View file @0d04647
+package com.gimi.common.cinema.utils;
+
+import java.io.InputStream;
+
+/**
+ * Created by wugian on 2017/6/7.
+ */
+
+public class CompressUtils {
+    /**
+     * 取得压缩包中的 文件列表(文件夹,文件自选)
+     *
+     * @param zipFileString  压缩包名字
+     * @param bContainFolder 是否包括 文件夹
+     * @param bContainFile   是否包括 文件
+     * @return
+     * @throws Exception
+     */
+    public static java.util.List<java.io.File> getFileList(String zipFileString, boolean bContainFolder,
+                                                           boolean bContainFile) throws Exception {
+        java.util.List<java.io.File> fileList = new java.util.ArrayList<java.io.File>();
+        java.util.zip.ZipInputStream inZip =
+                new java.util.zip.ZipInputStream(new java.io.FileInputStream(zipFileString));
+        java.util.zip.ZipEntry zipEntry;
+        String szName = "";
+        while ((zipEntry = inZip.getNextEntry()) != null) {
+            szName = zipEntry.getName();
+            if (zipEntry.isDirectory()) {
+                // get the folder name of the widget
+                szName = szName.substring(0, szName.length() - 1);
+                java.io.File folder = new java.io.File(szName);
+                if (bContainFolder) {
+                    fileList.add(folder);
+                }
+            } else {
+                java.io.File file = new java.io.File(szName);
+                if (bContainFile) {
+                    fileList.add(file);
+                }
+            }
+        }//end of while
+        inZip.close();
+        return fileList;
+    }
+
+    /**
+     * 返回压缩包中的文件InputStream
+     *
+     * @param zipFilePath 压缩文件的名字
+     * @param fileString  解压文件的名字
+     * @return InputStream
+     * @throws Exception
+     */
+    public static java.io.InputStream upZip(String zipFilePath, String fileString) throws Exception {
+        java.util.zip.ZipFile zipFile = new java.util.zip.ZipFile(zipFilePath);
+        java.util.zip.ZipEntry zipEntry = zipFile.getEntry(fileString);
+
+        return zipFile.getInputStream(zipEntry);
+    }
+
+    /**
+     * 解压一个压缩文档 到指定位置
+     *
+     * @param input 压缩包的名字
+     * @param outPathString 指定的路径
+     * @throws Exception
+     */
+    public static void unZipFolder(InputStream input, String outPathString) throws Exception {
+        java.util.zip.ZipInputStream inZip = new java.util.zip.ZipInputStream(input);
+        java.util.zip.ZipEntry zipEntry = null;
+        String szName = "";
+
+        while ((zipEntry = inZip.getNextEntry()) != null) {
+            szName = zipEntry.getName();
+
+            if (zipEntry.isDirectory()) {
+                // get the folder name of the widget
+                szName = szName.substring(0, szName.length() - 1);
+                java.io.File folder = new java.io.File(outPathString + java.io.File.separator + szName);
+                folder.mkdirs();
+            } else {
+                java.io.File file = new java.io.File(outPathString + java.io.File.separator + szName);
+                file.createNewFile();
+                // get the output stream of the file
+                java.io.FileOutputStream out = new java.io.FileOutputStream(file);
+                int len;
+                byte[] buffer = new byte[1024];
+                // read (len) bytes into buffer
+                while ((len = inZip.read(buffer)) != -1) {
+                    // write (len) byte from buffer at the position 0
+                    out.write(buffer, 0, len);
+                    out.flush();
+                }
+                out.close();
+            }
+        }//end of while
+        inZip.close();
+    }
+
+    /**
+     * 解压一个压缩文档 到指定位置
+     *
+     * @param zipFileString 压缩包的名字
+     * @param outPathString 指定的路径
+     * @throws Exception
+     */
+    public static void unZipFolder(String zipFileString, String outPathString) throws Exception {
+        unZipFolder(new java.io.FileInputStream(zipFileString), outPathString);
+    }//end of func
+
+
+    /**
+     * 压缩文件,文件夹
+     *
+     * @param srcFilePath 要压缩的文件/文件夹名字
+     * @param zipFilePath 指定压缩的目的和名字
+     * @throws Exception
+     */
+    public static void zipFolder(String srcFilePath, String zipFilePath) throws Exception {
+        //创建Zip包
+        java.util.zip.ZipOutputStream outZip =
+                new java.util.zip.ZipOutputStream(new java.io.FileOutputStream(zipFilePath));
+
+        //打开要输出的文件
+        java.io.File file = new java.io.File(srcFilePath);
+
+        //压缩
+        zipFiles(file.getParent() + java.io.File.separator, file.getName(), outZip);
+
+        //完成,关闭
+        outZip.finish();
+        outZip.close();
+
+    }//end of func
+
+    /**
+     * 压缩文件
+     *
+     * @param folderPath
+     * @param filePath
+     * @param zipOut
+     * @throws Exception
+     */
+    private static void zipFiles(String folderPath, String filePath,
+                                 java.util.zip.ZipOutputStream zipOut) throws Exception {
+        if (zipOut == null) {
+            return;
+        }
+
+        java.io.File file = new java.io.File(folderPath + filePath);
+
+        //判断是不是文件
+        if (file.isFile()) {
+            java.util.zip.ZipEntry zipEntry = new java.util.zip.ZipEntry(filePath);
+            java.io.FileInputStream inputStream = new java.io.FileInputStream(file);
+            zipOut.putNextEntry(zipEntry);
+
+            int len;
+            byte[] buffer = new byte[4096];
+
+            while ((len = inputStream.read(buffer)) != -1) {
+                zipOut.write(buffer, 0, len);
+            }
+
+            zipOut.closeEntry();
+        } else {
+            //文件夹的方式,获取文件夹下的子文件
+            String fileList[] = file.list();
+
+            //如果没有子文件, 则添加进去即可
+            if (fileList.length <= 0) {
+                java.util.zip.ZipEntry zipEntry =
+                        new java.util.zip.ZipEntry(filePath + java.io.File.separator);
+                zipOut.putNextEntry(zipEntry);
+                zipOut.closeEntry();
+            }
+
+            //如果有子文件, 遍历子文件
+            for (int i = 0; i < fileList.length; i++) {
+                zipFiles(folderPath, filePath + java.io.File.separator + fileList[i], zipOut);
+            }//end of for
+
+        }//end of if
+
+    }//end of func
+}
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/utils/LogUtils.java
View file @0d04647
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/utils/LogUtils.java
View file @0d04647
@@ -23,6 +23,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.text.Format;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.Formatter;
 import java.util.Locale;
@@ -468,6 +470,55 @@ public final class LogUtils {
         }
     }
+    /**
+     * 系统时间问题导致经常性删除失败在管理开门时进行日志清除
+     */
+    public static void delLog() {
+        try {
+            deleteOldLog();
+        } catch (Exception e) {
+            e.printStackTrace();
+            Log.d("cinema", e.getMessage());
+        }
+    }
+
+    private static void deleteOldLog() {
+        long start = System.currentTimeMillis();
+        Calendar cal = Calendar.getInstance();
+        int day = cal.get(Calendar.DAY_OF_MONTH);
+        int mouth = cal.get(Calendar.MONTH);
+        String[] newestName = new String[5];
+        if (day > 4) {
+            newestName[0] = String.format("%02d-%02d", mouth + 1, day--);
+            newestName[1] = String.format("%02d-%02d", mouth + 1, day--);
+            newestName[2] = String.format("%02d-%02d", mouth + 1, day--);
+        }
+        //不删除1月1，2日的日志
+        newestName[3] = String.format("%02d-%02d", 1, 1);
+        newestName[4] = String.format("%02d-%02d", 1, 2);
+        Log.d("delete-log", Arrays.toString(newestName));
+        Log.d("cinema", Arrays.toString(newestName));
+        File[] files = new File(dir == null ? defaultDir : dir).listFiles();
+        if (files != null && files.length > 0) {
+            for (File file : files) {
+                boolean delete = true;
+                for (String s : newestName) {
+                    if (file.getPath().contains(s)) {
+                        delete = false;
+                        break;
+                    }
+                }
+                Log.d("delete-log", (delete ? "delete:" : "keep:") + file.getPath());
+                Log.d("cinema", (delete ? "delete:" : "keep:") + file.getPath());
+                if (delete) {
+                    file.delete();
+                }
+            }
+        }
+        Log.d("delete-log", "total time:" + (System.currentTimeMillis() - start));
+
+    }
+
     private static boolean createOrExistsDir(File file) {
         return file != null && (file.exists() ? file.isDirectory() : file.mkdirs());
     }
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlPresenter.java
View file @0d04647
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlPresenter.java
View file @0d04647
@@ -7,6 +7,7 @@ import com.gimi.common.cinema.model.RoomInfo;
 import com.gimi.common.cinema.model.RoomQrCodeInfo;
 import com.gimi.common.cinema.model.RoomStatusInfo;
 import com.gimi.common.cinema.model.WrongMsg;
+import com.gimi.common.cinema.utils.LogUtils;
 import com.gimi.common.cinema.utils.SystemUtils;
 import com.telink.bluetooth.light.model.Mesh;
 import com.xgimi.gimicinema.BuildConfig;
@@ -127,13 +128,13 @@ public class SmartControlPresenter implements SmartControlContract.Presenter {
             @Override
             public void onOpenDoorSuccess() {
                 mainView.reportResult(true);
-                Log.d("room-info", "report success");
+                LogUtils.i("room-info", "report success");
             }
             @Override
             public void onOpenDoorFailure() {
                 mainView.reportResult(false);
-                Log.d("room-info", "report failure");
+                LogUtils.i("room-info", "report failure");
             }
         });
     }
@@ -143,13 +144,13 @@ public class SmartControlPresenter implements SmartControlContract.Presenter {
         roomInfoModel.getRoomQrCode(orderSn, roomSn, new RoomInfoModelImpl.GetRoomQrCodeListener() {
             @Override
             public void onGetRoomQrCodeSuccess(RoomQrCodeInfo info) {
-                Log.d("room-info", "getCleanQrCode#onGetRoomQrCodeSuccess:" + info.toString());
+                LogUtils.i("room-info", "getCleanQrCode#onGetRoomQrCodeSuccess:" + info.toString());
                 mainView.prepareRoomQrCodeInfo(info);
             }
             @Override
             public void onGetRoomQrCodeFailure(WrongMsg wrongMsg) {
-                Log.d("room-info", "onGetRoomQrCodeFailure:" + wrongMsg.toString());
+                LogUtils.i("room-info", "onGetRoomQrCodeFailure:" + wrongMsg.toString());
             }
         });
     }
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlService.java
View file @0d04647
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlService.java
View file @0d04647
@@ -201,7 +201,7 @@ public class SmartControlService extends BaseService implements EventListener<St
     private void openDoor() {
         updateLastCompleteMovieInfo();
         presenter.getSysTime(this);
-        LogUtils.d("room-info", "openDoor called");
+        LogUtils.i("room-info", "openDoor called");
         bleBroadcastReceiver.setResponseObj(new GREENCITYBLEProtocolFactory.GREENCITYBleDataWritten() {
             @Override
             public void writeSuccess() {
@@ -209,14 +209,14 @@ public class SmartControlService extends BaseService implements EventListener<St
                 Toast.makeText(SmartControlService.this, "开门成功", Toast.LENGTH_SHORT).show();
                 if (needReport) {
                     mHandler.postDelayed(reportRunnable, 10 * 1000);
-                    LogUtils.d("room-info", "user open door ,report the open success status");
+                    LogUtils.i("room-info", "user open door ,report the open success status");
                 }
-                LogUtils.d("room-info", "open success");
+                LogUtils.i("room-info", "open success");
             }
             @Override
             public void writeFailure(String error) {
-                LogUtils.d("room-info", "open failure," + error.toString());
+                LogUtils.i("room-info", "open failure," + error.toString());
                 bleBroadcastReceiver.setResponseObj(null);
                 Toast.makeText(SmartControlService.this, "开门失败," + error, Toast.LENGTH_SHORT).show();
             }
@@ -237,13 +237,14 @@ public class SmartControlService extends BaseService implements EventListener<St
                         || !TextUtils.isEmpty(((FangTangApplication) FangTangApplication.getInstance()).getCurrentPlayUrl())) {
                     break;
                 }
-                Log.d("event bus", "open door" + messageEvent.getMessage());
+                Log.i("event bus", "open door" + messageEvent.getMessage());
                 //异常2清理时段管理扫码进入，没有显示清洁码
                 if (messageEvent.getMessage().startsWith("administrator")) {
                     if (roomStatusInfo != null) {
                         int spaceTime = openDoorServerTime - roomStatusInfo.getData().getEnd_time();
                         if (spaceTime < 20 && spaceTime > 0) {
                             if (!ActivityCollector.isActivityExist(QrCodeShowActivity.class)) {
+                                Log.i("event bus", "admin open door show qr code activity");
                                 Intent intent = new Intent(this, QrCodeShowActivity.class)
                                         .putExtra("room_sn", roomInfo.getData().getRoom_sn())
                                         .putExtra("order_sn", roomStatusInfo.getData().getOrder_sn());
@@ -255,11 +256,11 @@ public class SmartControlService extends BaseService implements EventListener<St
                                 break;
                             }
                             //异常3 观景时段内 没有放电影
-                            if (roomStatusInfo.getData().getEnd_time() > openDoorServerTime
-                                    && openDoorServerTime > roomStatusInfo.getData().getBegin_time()
-                                    && TextUtils.isEmpty(((FangTangApplication) FangTangApplication.getInstance()).getCurrentPlayUrl())) {
-                                presenter.getOrderInfo(this);
-                            }
+//                            if (roomStatusInfo.getData().getEnd_time() > openDoorServerTime
+//                                    && openDoorServerTime > roomStatusInfo.getData().getBegin_time()
+//                                    && TextUtils.isEmpty(((FangTangApplication) FangTangApplication.getInstance()).getCurrentPlayUrl())) {
+//                                presenter.getOrderInfo(this);
+//                            }
                         }
                     }
                 }
@@ -268,11 +269,12 @@ public class SmartControlService extends BaseService implements EventListener<St
                 needReport = true;
                 openDoor();
                 presenter.getOrderInfo(this);
-                Log.d("event bus", "open door" + messageEvent.getMessage());
+                Log.i("event bus", "user open door" + messageEvent.getMessage());
                 break;
             case SocketService.USER_OPEN_DOOR:
                 needReport = true;
                 openDoor();
+                Log.i("event bus", "user open door" + messageEvent.getMessage());
 //                if (rightSn) {
 //                    down();
 //                }
@@ -292,7 +294,7 @@ public class SmartControlService extends BaseService implements EventListener<St
                     if (!TextUtils.isEmpty(roomStatusInfo.getData().getFilm_hash())) {
                         LocalMovieMessage lmm = new NewDBManager(this).queryPlayMovie(roomStatusInfo.getData().getFilm_hash());
                         if (lmm == null) {
-                            Log.d("room-info", "movie not exits");
+                            Log.e("room-info", "movie not exits");
                             break;
                         }
                         if (!roomStatusInfo.getData().getFilm_hash().equals(lmm.getMd5())) {
@@ -310,6 +312,7 @@ public class SmartControlService extends BaseService implements EventListener<St
 //                if (info == null || info.getData() == null) {
 //                    break;
 //                }
+                Log.i("room-info", "COUNT_DOWN_ZERO stop polling finish some activity,jump to qr code activity");
                 try {
                     PollingUtils.stopPollingService(this, CountService.class, CountService.STATUS_ACTION);
                 } catch (Exception e) {
@@ -318,7 +321,6 @@ public class SmartControlService extends BaseService implements EventListener<St
                 if (ActivityCollector.isActivityExist(SimpleAdsPlayer2.class)) {
                     ActivityCollector.getActivity(SimpleAdsPlayer2.class).finish();
                 }
-//                cc
                 Intent intent = new Intent(this, QrCodeShowActivity.class)
 //                        .putExtra("qr", info.getData().getCode())
                         .putExtra("room_sn", roomInfo.getData().getRoom_sn())
@@ -329,7 +331,6 @@ public class SmartControlService extends BaseService implements EventListener<St
                 intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 startActivity(intent);
                 roomStatusInfo = null;
-                Log.d("room-info", "into clean activity clear oder info");
 //                if (roomStatusInfo != null && roomStatusInfo.getData() != null & roomInfo != null && roomInfo.getData() != null) {
 //                    if (System.currentTimeMillis() - lastRequest > 3000) {
 //                        lastRequest = System.currentTimeMillis();
@@ -344,7 +345,7 @@ public class SmartControlService extends BaseService implements EventListener<St
 //                }
                 break;
             case ORDER_PLAY_COMPLETE:
-                LogUtils.d("room-info", messageEvent.getMessage());
+                LogUtils.i("room-info", messageEvent.getMessage());
                 Utils.saveString(this, "oder-play-completed", new Gson().toJson(roomStatusInfo));
                 playEndAds();
                 break;
@@ -575,8 +576,7 @@ public class SmartControlService extends BaseService implements EventListener<St
         int offset = data.getNow_time() - data.getBegin_time();
         int durationMinutes = data.getEnd_time() - data.getNow_time();
-        Log.d("CountService", "durationMinutes:" + durationMinutes);
-        LogUtils.d("room-info", orderInfo.toString());
+        LogUtils.i("room-info", orderInfo.toString());
         if (durationMinutes <= 1) {
             return;
         }
@@ -598,7 +598,7 @@ public class SmartControlService extends BaseService implements EventListener<St
             localMovieMessages = new NewDBManager(this).queryPlayMovie(data.getFilm_hash());
             if (localMovieMessages == null) {
                 show("电影信息出错,找不到相关电影");
-                LogUtils.d("room-info", "file not exists:" + orderInfo.getData().getFilm_hash());
+                LogUtils.e("room-info", "file not exists:" + orderInfo.toString());
                 if (offset > 3) {
                     CToast.makeText(this, "您已迟到" + offset + "分钟,请注意把握时间,没有找到电影信息,请联系客服", 90 * 1000).show();
                 } else {
@@ -610,8 +610,10 @@ public class SmartControlService extends BaseService implements EventListener<St
             if (offset > 3) {
                 CToast.makeText(this, "您已迟到" + offset + "分钟,请注意把握时间", 100 * 1000).show();
             }
+            LogUtils.i("room-info", "play movie" + localMovieMessages.toString());
             OpenMMUtils.openMMWithAds(this, localMovieMessages.getPlayPath(), null);
         } else {
+            LogUtils.e("room-info", "file not exists:" + orderInfo.toString());
             show("没有找到电影");
         }
     }
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @0d04647
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @0d04647
@@ -121,7 +121,7 @@ public class SocketService1 extends BaseService {
                     new SocketSendMsg().contractHeartBeatMsg(testRoomSn));
             boolean isSuccess = sendMsg(s + END_SYMBOL);
             if (!isSuccess) {
-                LogUtils.d(TAG, "send heart beat error restart");
+                LogUtils.i(TAG, "send heart beat error restart");
             }
         }
     };
@@ -130,12 +130,12 @@ public class SocketService1 extends BaseService {
         @Override
         public void run() {
             if (ActivityCollector.getActivity(MainActivity.class) == null) {
-                LogUtils.d(TAG, "do start main activity");
+                LogUtils.i(TAG, "do start main activity");
                 Intent intent = new Intent(context, MainActivity.class);
                 intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 startActivity(intent);
             } else {
-                LogUtils.d(TAG, "already start main activity");
+                LogUtils.i(TAG, "already start main activity");
             }
         }
     };
@@ -150,13 +150,13 @@ public class SocketService1 extends BaseService {
     @Override
     public void onCreate() {
         super.onCreate();
-        LogUtils.d(TAG, "onCreate");
+        LogUtils.i(TAG, "onCreate");
     }
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         super.onStartCommand(intent, flags, startId);
-        LogUtils.d(TAG, "onStartCommand");
+        LogUtils.i(TAG, "onStartCommand");
         int ftTest = Utils.getInt(this, "ft-test", 0);
         switch (ftTest) {
             case 0:
@@ -175,19 +175,19 @@ public class SocketService1 extends BaseService {
         String roomInfoStr = Utils.getString(this, "room-info");
         if (TextUtils.isEmpty(roomInfoStr)) {
-            LogUtils.d("room-info", "room info not exist");
+            LogUtils.i("room-info", "room info not exist");
             Toast.makeText(this, "没有获取到房间信息，请查看后台配置", Toast.LENGTH_SHORT).show();
             return super.onStartCommand(intent, flags, startId);
         }
-        LogUtils.d("room-info", "room info not null");
+        LogUtils.i("room-info", "room info not null");
         RoomInfo roomInfo = null;
         try {
             roomInfo = gson.fromJson(roomInfoStr, RoomInfo.class);
-            LogUtils.d("room-info", "room info room_sn update");
+            LogUtils.i("room-info", "room info room_sn update");
             testRoomSn = roomInfo.getData().getRoom_sn();
         } catch (JsonSyntaxException e) {
-            LogUtils.d("room-info", "room gson parse exception return");
+            LogUtils.i("room-info", "room gson parse exception return");
             Toast.makeText(this, "房间信息配置出错，请重新进入应用获取", Toast.LENGTH_SHORT).show();
             e.printStackTrace();
             return super.onStartCommand(intent, flags, startId);
@@ -206,8 +206,8 @@ 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.d(TAG, "initsocket serverHost:serverPort:" + serverHost + ":" + serverPort);
-        LogUtils.d(TAG, "networkConnected:" + networkConnected + ":baidu:" + availableByPing + ",serverHost:" + availableByPing1 + ",serverIp:" + availableByPing2);
+        LogUtils.i(TAG, "initsocket serverHost:serverPort:" + serverHost + ":" + serverPort);
+        LogUtils.i(TAG, "networkConnected:" + networkConnected + ":baidu:" + availableByPing + ",serverHost:" + availableByPing1 + ",serverIp:" + availableByPing2);
         mHandler.post(new Runnable() {
             @Override
             public void run() {
@@ -225,7 +225,7 @@ public class SocketService1 extends BaseService {
             return false;
         }
         if (!msg.contains("20025")) {
-            LogUtils.d(TAG, "send msg:" + msg);
+            LogUtils.i(TAG, "send msg:" + msg);
         } else {
             if (heartBeatErrorCount.getAndDecrement() > 3) {
                 clearConnect();
@@ -242,7 +242,7 @@ public class SocketService1 extends BaseService {
                 return false;
             }
         } catch (IOException e) {
-            LogUtils.d(TAG, "error" + e.getMessage());
+            LogUtils.e(TAG, "error" + e.getMessage());
             e.printStackTrace();
             clearConnect();
             return false;
@@ -256,7 +256,7 @@ public class SocketService1 extends BaseService {
                 socket.close();
             }
         } catch (IOException e) {
-            LogUtils.d(TAG, "error" + e.getMessage());
+            LogUtils.e(TAG, "error" + e.getMessage());
             e.printStackTrace();
         } finally {
             socket = null;
@@ -290,7 +290,7 @@ public class SocketService1 extends BaseService {
             return false;
         } catch (IOException e) {
             e.printStackTrace();
-            LogUtils.d(TAG, e.getMessage());
+            LogUtils.e(TAG, e.getMessage());
             clearConnect();
             return false;
         }
@@ -298,7 +298,7 @@ public class SocketService1 extends BaseService {
     }
     private synchronized void clearConnect() {
-        LogUtils.d(TAG, "clearConnect");
+        LogUtils.i(TAG, "clearConnect");
         mHandler.removeCallbacks(heartBeatRunnable);
         sendRegister.set(false);
         heartBeatErrorCount.set(0);
@@ -314,13 +314,13 @@ public class SocketService1 extends BaseService {
                     initSocket();
                 } catch (IOException e) {
                     e.printStackTrace();
-                    LogUtils.d(TAG, "init socket thread error,restart again after " + HEART_BEAT_RATE / 1000 + " seconds");
+                    LogUtils.e(TAG, "init socket thread error,restart again after " + HEART_BEAT_RATE / 1000 + " seconds");
                 }
                 try {
                     Thread.sleep(1000);
                 } catch (InterruptedException e1) {
-                    LogUtils.d(TAG, "error" + e1.getMessage());
+                    LogUtils.e(TAG, "error" + e1.getMessage());
                     e1.printStackTrace();
                 }
             }
@@ -336,9 +336,9 @@ public class SocketService1 extends BaseService {
             StringBuilder message = new StringBuilder();
             while (!isInterrupted()) {
                 if (!sendRegister.get()) {
-                    LogUtils.d(TAG, "send register mes");
                     SocketSendMsg ssm = new SocketSendMsg().contractRegisterMsg(testRoomSn);
                     String msg = gson.toJson(ssm) + END_SYMBOL;
+                    LogUtils.i(TAG, "send register mes:" + msg);
                     if (!sendMsg(msg)) {
                         try {
                             Thread.sleep(READ_THREAD_DEFAULT_SLEEP_MTIME);
@@ -347,7 +347,6 @@ public class SocketService1 extends BaseService {
                         }
                         continue;
                     }
-                    LogUtils.d(TAG, "" + msg);
                     sendRegister.set(true);
                 }
@@ -362,44 +361,47 @@ public class SocketService1 extends BaseService {
                     try {
                         socketResponse = gson.fromJson(message.toString(),
                                 SocketResponse.class);
+                        if (socketResponse.getCode() != HEART_BEAT_SUCCESS) {
+                            LogUtils.i(TAG, "recv msg:" + message);
+                        }
                     } catch (JsonSyntaxException e) {
                         LogUtils.e(TAG, "invalid msg:", message + e.getMessage());
                         e.printStackTrace();
                         clearConnect();
                         break;
                     }
-
                     switch (socketResponse.getCode()) {
                         case SUCCESS_MESSAGE:
                             heartBeatErrorCount.set(0);
                             Log.d(TAG, "SUCCESS_MESSAGE");
                             break;
                         case VERIFY_SUCCESS:
-                            LogUtils.d(TAG, "VERIFY_SUCCESS");
                             mHandler.post(heartBeatRunnable);
-                            LogUtils.d(TAG, "verify success start heart beat");
+                            LogUtils.i(TAG, "verify success start heart beat");
                             break;
                         case HEART_BEAT_SUCCESS:
+                            LogUtils.d(TAG, "HEART_BEAT_SUCCESS,MainActivity Launched:" + ActivityCollector.isActivityExist(MainActivity.class));
                             heartBeatErrorCount.set(0);
                             //每成功5次心跳判定是否启动main activity
                             if (++mainChargeCount == 5) {
                                 mainChargeCount = 0;
-                                if (ActivityCollector.getActivity(MainActivity.class) == null) {
-                                    LogUtils.d(TAG, "charge start main activity");
+                                if (heartBeatErrorCount.get() < 3) {
+                                    LogUtils.i(TAG, "heart beat regular");
+                                }
+                                if (!ActivityCollector.isActivityExist(MainActivity.class)) {
+                                    LogUtils.i(TAG, "charge start main activity");
                                     mHandler.postDelayed(startMainRunnable, 3 * 1000);
                                 }
                             }
-                            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";
-                            LogUtils.d(TAG, msg1);
+                            LogUtils.e(TAG, msg1);
                             clearConnect();
                             break;
                         case RETURN_VERIFY_CODE:
-                            LogUtils.d(TAG, "RETURN_VERIFY_CODE");
+                            LogUtils.i(TAG, "RETURN_VERIFY_CODE");
                             if (!TextUtils.isEmpty(socketResponse.getData().getVerify())) {
                                 String verifyMsg = AuthCode.getDecodeStr(socketResponse.getData().getVerify());
                                 SocketSendMsg ssm = new SocketSendMsg().contractVerifyMsg(testRoomSn, verifyMsg);
@@ -409,7 +411,7 @@ public class SocketService1 extends BaseService {
                             break;
                         case CONTAIN_MESSAGE:
                             heartBeatErrorCount.set(0);
-                            LogUtils.d(TAG, "CONTAIN_MESSAGE");
+                            LogUtils.i(TAG, "CONTAIN_MESSAGE");
                             if (socketResponse.getData() != null) {
                                 if (socketResponse.getCmd() == OPEN_DOOR) {
                                     switch (socketResponse.getData().getUser()) {
@@ -428,8 +430,10 @@ public class SocketService1 extends BaseService {
                                             }
                                             break;
                                         case 20:
+                                            LogUtils.i(TAG, "admin open the door,del the log");
+                                            LogUtils.delLog();
                                             if (TextUtils.isEmpty(((FangTangApplication) getApplication()).getCurrentPlayUrl())) {
-                                                LogUtils.d("LightOperationUtils", "admin open light");
+                                                LogUtils.i("LightOperationUtils", "admin open light");
                                                 LightOperationUtils.open();
                                                 LightOperationUtils.setLightValue(Utils.getInt(context, "brightness", 50));
                                             }
@@ -443,7 +447,7 @@ public class SocketService1 extends BaseService {
                                             break;
                                     }
                                 } else if (socketResponse.getCmd() == CLEAN_OVER) {
-                                    LogUtils.d("LightOperationUtils", "admin clean over close light");
+                                    LogUtils.i("LightOperationUtils", "admin clean over close light");
                                     LightOperationUtils.setLightValue(5);
                                     LightOperationUtils.close();
                                     new SystemUtils().closeFtLed(context.getApplicationContext());
@@ -467,9 +471,8 @@ public class SocketService1 extends BaseService {
                             break;
                         default:
                             clearConnect();
-                            LogUtils.d(TAG, "default msg clearConnect:" + socketResponse.toString());
+                            LogUtils.i(TAG, "default msg clearConnect:" + socketResponse.toString());
                     }
-                    LogUtils.d(TAG, "recv msg:" + message);
                 }
                 try {
                     Thread.sleep(sleepTime);
@@ -489,7 +492,7 @@ public class SocketService1 extends BaseService {
     @Override
     public void onDestroy() {
-        LogUtils.d(TAG, "socket service destroy");
+        LogUtils.i(TAG, "socket service destroy");
         super.onDestroy();
     }
 }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/CheckActivity.java
View file @0d04647
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/CheckActivity.java
View file @0d04647
@@ -25,6 +25,7 @@ import android.widget.ListView;
 import android.widget.Toast;
 import com.gimi.common.cinema.model.RoomInfo;
 import com.gimi.common.cinema.model.SambaMsg;
+import com.gimi.common.cinema.utils.CompressUtils;
 import com.gimi.common.cinema.utils.LogUtils;
 import com.gimi.common.cinema.utils.NetStatusUtils;
 import com.gimi.common.cinema.utils.ShellUtils;
@@ -34,6 +35,7 @@ import com.gimi.common.cinema.utils.Utils;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 import com.xgimi.gimicinema.R;
+import com.xgimi.gimicinema.application.FangTangApplication;
 import java.io.File;
 import java.io.FileInputStream;
@@ -58,6 +60,14 @@ public class CheckActivity extends ListActivity {
         setListAdapter(adapter);
     }
+    void compres() {
+        try {
+            CompressUtils.zipFolder("/sdcard/ft_log/", "/sdcard/log.zip");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     private List<String> getData() {
         List<String> data = new ArrayList<>();
         data.add("网络状况");//0
@@ -67,6 +77,7 @@ public class CheckActivity extends ListActivity {
         data.add("结束log");
         data.add("考出log到服务器");
         data.add("考出日志文件到服务器");
+        data.add("生成全部日志");
         return data;
     }
@@ -157,6 +168,10 @@ public class CheckActivity extends ListActivity {
                     }
                 }
                 break;
+            case 7:
+                FangTangApplication.initLog(LogUtils.D);
+                msg = "保存日志已重置，重启后失效";
+                break;
         }
         Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
     }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/application/FangTangApplication.java
View file @0d04647
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/application/FangTangApplication.java
View file @0d04647
@@ -22,7 +22,7 @@ public class FangTangApplication extends TelinkApplication {
         AdvanceStrategy.setDefault(new MySampleAdvanceStrategy());
 //		CrashHandler crashHandler = CrashHandler.getInstance();
 //		crashHandler.init(getApplicationContext());initLog\\
-        initLog();
+        initLog(LogUtils.I);
     }
     @Override
@@ -76,7 +76,7 @@ public class FangTangApplication extends TelinkApplication {
         this.currentPlayUrl = currentPlayUrl;
     }
-    public static void initLog() {
+    public static void initLog(int logLever) {
         LogUtils.Builder builder = new LogUtils.Builder()
                 .setLogSwitch(true)// 设置log总开关，包括输出到控制台和文件，默认开
                 .setConsoleSwitch(true)// 设置是否输出到控制台开关，默认开
@@ -88,7 +88,7 @@ public class FangTangApplication extends TelinkApplication {
                 .setDir("/sdcard/ft_log/")// 当自定义路径为空时，写入应用的/cache/log/目录中
                 .setBorderSwitch(false)// 输出日志是否带边框开关，默认开
                 .setConsoleFilter(LogUtils.V)// log的控制台过滤器，和logcat过滤器同理，默认Verbose
-                .setFileFilter(LogUtils.V);// log文件过滤器，和logcat过滤器同理，默认Verbose
+                .setFileFilter(logLever);// log文件过滤器，和logcat过滤器同理，默认Verbose
         LogUtils.d(builder.toString());
     }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @0d04647
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @0d04647
@@ -348,9 +348,9 @@ public class CinemaControlService extends Service {
             messageEvent.setEventId(SmartControlService.ORDER_PLAY_COMPLETE);
             messageEvent.setMessage("电影播放完成，记录完成订单信息");
             EventBus.getDefault().post(messageEvent);
-            LogUtils.d("room-info", "stop media completed");
+            LogUtils.i("room-info", "stop media completed:" + currentPath);
         } else {
-            LogUtils.d("room-info", "stop media but not completed");
+            LogUtils.i("room-info", "stop media but not completed:" + currentPath);
         }
     }
 }