update log to file,流程优化

李攀
1 parent cfa4f2e2
Showing 9 changed files with 409 additions and 246 deletions
gimiCinema/build.gradle
gimiCinema/src/main/java/com/gimi/common/cinema/utils/LogUtils.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/activity/QrCodeShowActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/SimpleAdsPlayer2.java
gimiCinema/src/main/java/com/xgimi/gimicinema/application/FangTangApplication.java
gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
--- a/gimiCinema/build.gradle
View file @bc654b2
+++ b/gimiCinema/build.gradle
View file @bc654b2
@@ -11,8 +11,8 @@ def isWindows = {
 }
 ext {
-    APP_VERSION_CODE = 2;
-    APP_VERSION_NAME = "v2.0";
+    APP_VERSION_CODE = 3;
+    APP_VERSION_NAME = "v2.1-0601";
 }
 android {
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/utils/LogUtils.java
View file @bc654b2
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/utils/LogUtils.java
View file @bc654b2
 package com.gimi.common.cinema.utils;
-import android.os.Environment;
 import android.support.annotation.IntDef;
 import android.util.Log;
 import org.json.JSONArray;
@@ -14,6 +13,7 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 import java.io.BufferedWriter;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -21,82 +21,109 @@ import java.io.StringReader;
 import java.io.StringWriter;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.text.Format;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Formatter;
 import java.util.Locale;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.zip.DataFormatException;
+import java.util.zip.Deflater;
+import java.util.zip.Inflater;
 /**
  * <pre>
  *     author: Blankj
  *     blog  : http://blankj.com
- *     time  : 2016/9/21
- *     desc  : 日志相关工具类
+ *     time  : 2016/09/21
+ *     desc  : Log相关工具类
  * </pre>
  */
 public final class LogUtils {
-    private LogUtils() {
-        throw new UnsupportedOperationException("u can't instantiate me...");
-    }
-
-    public static final int V = 0x01;
-    public static final int D = 0x02;
-    public static final int I = 0x04;
-    public static final int W = 0x08;
-    public static final int E = 0x10;
-    public static final int A = 0x20;
+    public static final int V = Log.VERBOSE;
+    public static final int D = Log.DEBUG;
+    public static final int I = Log.INFO;
+    public static final int W = Log.WARN;
+    public static final int E = Log.ERROR;
+    public static final int A = Log.ASSERT;
     @IntDef({V, D, I, W, E, A})
     @Retention(RetentionPolicy.SOURCE)
-    public @interface TYPE {
-    }
-
-    private static final int FILE = 0xF1;
-    private static final int JSON = 0xF2;
-    private static final int XML  = 0xF4;
+    private @interface TYPE {
+    }
+
+    private static final char[] T = new char[]{'V', 'D', 'I', 'W', 'E', 'A'};
+
+    private static final int FILE = 0x10;
+    private static final int JSON = 0x20;
+    private static final int XML = 0x30;
+    private static ExecutorService executor;
+    private static String defaultDir;// log默认存储目录
+    private static String dir;       // log存储目录
+
+    private static boolean sLogSwitch = true; // log总开关，默认开
+    private static boolean sLog2ConsoleSwitch = true; // logcat是否打印，默认打印
+    private static String sGlobalTag = null; // log标签
+    private static boolean sTagIsSpace = true; // log标签是否为空白
+    private static boolean sLogHeadSwitch = true; // log头部开关，默认开
+    private static boolean sLog2FileSwitch = false;// log写入文件开关，默认关
+    private static boolean sLogBorderSwitch = true; // log边框开关，默认开
+    private static int sConsoleFilter = V;    // log控制台过滤器
+    private static int sFileFilter = V;    // log文件过滤器
+
+    private static final String FILE_SEP = System.getProperty("file.separator");
+    private static final String LINE_SEP = System.getProperty("line.separator");
+    private static final String TOP_BORDER = "╔═══════════════════════════════════════════════════════════════════════════════════════════════════";
+    private static final String LEFT_BORDER = "║ ";
+    private static final String BOTTOM_BORDER = "╚═══════════════════════════════════════════════════════════════════════════════════════════════════";
+    private static final int MAX_LEN = 4000;
+    private static final Format FORMAT = new SimpleDateFormat("MM-dd HH:mm:ss.SSS ", Locale.getDefault());
-    private static String dir;                      // log存储目录
-    private static boolean sLogSwitch       = true; // log总开关
-    private static String  sGlobalTag       = null; // log标签
-    private static boolean sTagIsSpace      = true; // log标签是否为空白
-    private static boolean sLog2FileSwitch  = false;// log写入文件开关
-    private static boolean sLogBorderSwitch = true; // log边框开关
-    private static int     sLogFilter       = V;    // log过滤器
-
-    private static final String TOP_BORDER     = "╔═══════════════════════════════════════════════════════════════════════════════════════════════════";
-    private static final String LEFT_BORDER    = "║ ";
-    private static final String BOTTOM_BORDER  = "╚═══════════════════════════════════════════════════════════════════════════════════════════════════";
-    private static final String LINE_SEPARATOR = System.getProperty("line.separator");
-
-    private static final int    MAX_LEN   = 4000;
     private static final String NULL_TIPS = "Log with null object.";
-    private static final String NULL      = "null";
-    private static final String ARGS      = "args";
+    private static final String NULL = "null";
+    private static final String ARGS = "args";
-    public static class Builder {
+    private LogUtils() {
+        throw new UnsupportedOperationException("u can't instantiate me...");
+    }
+    public static class Builder {
         public Builder() {
-            if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
-//                dir = Utils.getContext().getExternalCacheDir() + File.separator + "log" + File.separator;
-            } else {
-//                dir = Utils.getContext().getCacheDir() + File.separator + "log" + File.separator;
-            }
+            if (defaultDir != null) return;
+            defaultDir = "/sdcard/log/";
+//            if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())
+//                    && Utils.getContext().getExternalCacheDir() != null)
+//                defaultDir = Utils.getContext().getExternalCacheDir() + FILE_SEP + "log" + FILE_SEP;
+//            else {
+//                defaultDir = Utils.getContext().getCacheDir() + FILE_SEP + "log" + FILE_SEP;
+//            }
         }
-        public Builder setGlobalTag(String tag) {
-            if (!isSpace(tag)) {
-                LogUtils.sGlobalTag = tag;
-                sTagIsSpace = false;
-            } else {
+        public Builder setLogSwitch(boolean logSwitch) {
+            LogUtils.sLogSwitch = logSwitch;
+            return this;
+        }
+
+        public Builder setConsoleSwitch(boolean consoleSwitch) {
+            LogUtils.sLog2ConsoleSwitch = consoleSwitch;
+            return this;
+        }
+
+        public Builder setGlobalTag(final String tag) {
+            if (isSpace(tag)) {
                 LogUtils.sGlobalTag = "";
                 sTagIsSpace = true;
+            } else {
+                LogUtils.sGlobalTag = tag;
+                sTagIsSpace = false;
             }
             return this;
         }
-        public Builder setLogSwitch(boolean logSwitch) {
-            LogUtils.sLogSwitch = logSwitch;
+        public Builder setLogHeadSwitch(boolean logHeadSwitch) {
+            LogUtils.sLogHeadSwitch = logHeadSwitch;
             return this;
         }
@@ -105,15 +132,47 @@ public final class LogUtils {
             return this;
         }
+        public Builder setDir(final String dir) {
+            if (isSpace(dir)) {
+                LogUtils.dir = null;
+            } else {
+                LogUtils.dir = dir.endsWith(FILE_SEP) ? dir : dir + FILE_SEP;
+            }
+            return this;
+        }
+
+        public Builder setDir(final File dir) {
+            LogUtils.dir = dir == null ? null : dir.getAbsolutePath() + FILE_SEP;
+            return this;
+        }
+
         public Builder setBorderSwitch(boolean borderSwitch) {
             LogUtils.sLogBorderSwitch = borderSwitch;
             return this;
         }
-        public Builder setLogFilter(@TYPE int logFilter) {
-            LogUtils.sLogFilter = logFilter;
+        public Builder setConsoleFilter(@TYPE int consoleFilter) {
+            LogUtils.sConsoleFilter = consoleFilter;
             return this;
         }
+
+        public Builder setFileFilter(@TYPE int fileFilter) {
+            LogUtils.sFileFilter = fileFilter;
+            return this;
+        }
+
+        @Override
+        public String toString() {
+            return "switch: " + sLogSwitch
+                    + LINE_SEP + "console: " + sLog2ConsoleSwitch
+                    + LINE_SEP + "tag: " + (sTagIsSpace ? "null" : sGlobalTag)
+                    + LINE_SEP + "head: " + sLogHeadSwitch
+                    + LINE_SEP + "file: " + sLog2FileSwitch
+                    + LINE_SEP + "dir: " + (dir == null ? defaultDir : dir)
+                    + LINE_SEP + "border: " + sLogBorderSwitch
+                    + LINE_SEP + "consoleFilter: " + T[sConsoleFilter - V]
+                    + LINE_SEP + "fileFilter: " + T[sFileFilter - V];
+        }
     }
     public static void v(Object contents) {
@@ -165,93 +224,108 @@ public final class LogUtils {
     }
     public static void file(Object contents) {
-        log(FILE, sGlobalTag, contents);
+        log(FILE | D, sGlobalTag, contents);
+    }
+
+    public static void file(@TYPE int type, Object contents) {
+        log(FILE | type, sGlobalTag, contents);
     }
     public static void file(String tag, Object contents) {
-        log(FILE, tag, contents);
+        log(FILE | D, tag, contents);
+    }
+
+    public static void file(@TYPE int type, String tag, Object contents) {
+        log(FILE | type, tag, contents);
     }
     public static void json(String contents) {
-        log(JSON, sGlobalTag, contents);
+        log(JSON | D, sGlobalTag, contents);
+    }
+
+    public static void json(@TYPE int type, String contents) {
+        log(JSON | type, sGlobalTag, contents);
     }
     public static void json(String tag, String contents) {
-        log(JSON, tag, contents);
+        log(JSON | D, tag, contents);
+    }
+
+    public static void json(@TYPE int type, String tag, String contents) {
+        log(JSON | type, tag, contents);
     }
     public static void xml(String contents) {
-        log(XML, sGlobalTag, contents);
+        log(XML | D, sGlobalTag, contents);
+    }
+
+    public static void xml(@TYPE int type, String contents) {
+        log(XML | type, sGlobalTag, contents);
     }
     public static void xml(String tag, String contents) {
-        log(XML, tag, contents);
-    }
-
-    private static void log(int type, String tag, Object... contents) {
-        if (!sLogSwitch) return;
-        final String[] processContents = processContents(type, tag, contents);
-        tag = processContents[0];
-        String msg = processContents[1];
-        switch (type) {
-            case V:
-            case D:
-            case I:
-            case W:
-            case E:
-            case A:
-                if (V == sLogFilter || type >= sLogFilter) {
-                    printLog(type, tag, msg);
-                }
-                if (sLog2FileSwitch) {
-                    print2File(tag, msg);
-                }
-                break;
-            case FILE:
-                print2File(tag, msg);
-                break;
-            case JSON:
-                printLog(D, tag, msg);
-                break;
-            case XML:
-                printLog(D, tag, msg);
-                break;
-        }
+        log(XML | D, tag, contents);
+    }
+    public static void xml(@TYPE int type, String tag, String contents) {
+        log(XML | type, tag, contents);
     }
-    private static String[] processContents(int type, String tag, Object... contents) {
-        StackTraceElement targetElement = Thread.currentThread().getStackTrace()[5];
-        String className = targetElement.getClassName();
-        String[] classNameInfo = className.split("\\.");
-        if (classNameInfo.length > 0) {
-            className = classNameInfo[classNameInfo.length - 1];
+    private static void log(final int type, String tag, final Object... contents) {
+        if (!sLogSwitch || (!sLog2ConsoleSwitch && !sLog2FileSwitch)) return;
+        int type_low = type & 0x0f, type_high = type & 0xf0;
+        if (type_low < sConsoleFilter && type_low < sFileFilter) return;
+        final String[] tagAndHead = processTagAndHead(tag);
+        String body = processBody(type_high, contents);
+        if (sLog2ConsoleSwitch && type_low >= sConsoleFilter) {
+            print2Console(type_low, tagAndHead[0], tagAndHead[1] + body);
         }
-        if (className.contains("$")) {
-            className = className.split("\\$")[0];
+        if (sLog2FileSwitch || type_high == FILE) {
+            if (type_low >= sFileFilter)
+                print2File(type_low, tagAndHead[0], tagAndHead[2] + body);
         }
-        if (!sTagIsSpace) {// 如果全局tag不为空，那就用全局tag
+    }
+
+    private static String[] processTagAndHead(String tag) {
+        if (!sTagIsSpace && !sLogHeadSwitch) {
             tag = sGlobalTag;
-        } else {// 全局tag为空时，如果传入的tag为空那就显示类名，否则显示tag
-            tag = isSpace(tag) ? className : tag;
+        } else {
+            StackTraceElement targetElement = Thread.currentThread().getStackTrace()[5];
+            String className = targetElement.getClassName();
+            String[] classNameInfo = className.split("\\.");
+            if (classNameInfo.length > 0) {
+                className = classNameInfo[classNameInfo.length - 1];
+            }
+            if (className.contains("$")) {
+                className = className.split("\\$")[0];
+            }
+            if (sTagIsSpace) {
+                tag = isSpace(tag) ? className : tag;
+            }
+            if (sLogHeadSwitch) {
+                String head = new Formatter()
+                        .format("%s, %s(%s.java:%d)",
+                                Thread.currentThread().getName(),
+                                targetElement.getMethodName(),
+                                className,
+                                targetElement.getLineNumber())
+                        .toString();
+                return new String[]{tag, head + LINE_SEP, " [" + head + "]: "};
+            }
         }
+        return new String[]{tag, "", ": "};
+    }
-        String head = new Formatter()
-                .format("Thread: %s, %s(%s.java:%d)" + LINE_SEPARATOR,
-                        Thread.currentThread().getName(),
-                        targetElement.getMethodName(),
-                        className,
-                        targetElement.getLineNumber())
-                .toString();
-        String msg = NULL_TIPS;
+    private static String processBody(int type, Object... contents) {
+        String body = NULL_TIPS;
         if (contents != null) {
             if (contents.length == 1) {
                 Object object = contents[0];
-                msg = object == null ? NULL : object.toString();
+                body = object == null ? NULL : object.toString();
                 if (type == JSON) {
-                    msg = formatJson(msg);
+                    body = formatJson(body);
                 } else if (type == XML) {
-                    msg = formatXml(msg);
+                    body = formatXml(body);
                 }
             } else {
                 StringBuilder sb = new StringBuilder();
@@ -263,20 +337,12 @@ public final class LogUtils {
                             .append("]")
                             .append(" = ")
                             .append(content == null ? NULL : content.toString())
-                            .append(LINE_SEPARATOR);
+                            .append(LINE_SEP);
                 }
-                msg = sb.toString();
-            }
-        }
-        if (sLogBorderSwitch) {
-            StringBuilder sb = new StringBuilder();
-            String[] lines = msg.split(LINE_SEPARATOR);
-            for (String line : lines) {
-                sb.append(LEFT_BORDER).append(line).append(LINE_SEPARATOR);
+                body = sb.toString();
             }
-            msg = sb.toString();
         }
-        return new String[]{tag, head + msg};
+        return body;
     }
     private static String formatJson(String json) {
@@ -300,106 +366,80 @@ public final class LogUtils {
             transformer.setOutputProperty(OutputKeys.INDENT, "yes");
             transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
             transformer.transform(xmlInput, xmlOutput);
-            xml = xmlOutput.getWriter().toString().replaceFirst(">", ">" + LINE_SEPARATOR);
+            xml = xmlOutput.getWriter().toString().replaceFirst(">", ">" + LINE_SEP);
         } catch (Exception e) {
             e.printStackTrace();
         }
         return xml;
     }
-    private static void printLog(int type, String tag, String msg) {
-        if (sLogBorderSwitch) printBorder(type, tag, true);
+    private static void print2Console(final int type, String tag, String msg) {
+        if (sLogBorderSwitch) {
+            print(type, tag, TOP_BORDER);
+            msg = addLeftBorder(msg);
+        }
         int len = msg.length();
         int countOfSub = len / MAX_LEN;
         if (countOfSub > 0) {
-            int index = 0;
+            print(type, tag, msg.substring(0, MAX_LEN));
             String sub;
-            for (int i = 0; i < countOfSub; i++) {
+            int index = MAX_LEN;
+            for (int i = 1; i < countOfSub; i++) {
                 sub = msg.substring(index, index + MAX_LEN);
-                printSubLog(type, tag, sub);
+                print(type, tag, sLogBorderSwitch ? LEFT_BORDER + sub : sub);
                 index += MAX_LEN;
             }
-            printSubLog(type, tag, msg.substring(index, len));
+            sub = msg.substring(index, len);
+            print(type, tag, sLogBorderSwitch ? LEFT_BORDER + sub : sub);
         } else {
-            printSubLog(type, tag, msg);
-        }
-        if (sLogBorderSwitch) printBorder(type, tag, false);
-    }
-
-    private static void printSubLog(final int type, final String tag, String msg) {
-        if (sLogBorderSwitch) msg = LEFT_BORDER + msg;
-        switch (type) {
-            case V:
-                Log.v(tag, msg);
-                break;
-            case D:
-                Log.d(tag, msg);
-                break;
-            case I:
-                Log.i(tag, msg);
-                break;
-            case W:
-                Log.w(tag, msg);
-                break;
-            case E:
-                Log.e(tag, msg);
-                break;
-            case A:
-                Log.wtf(tag, msg);
-                break;
+            print(type, tag, msg);
         }
+        if (sLogBorderSwitch) print(type, tag, BOTTOM_BORDER);
     }
-    private static void printBorder(int type, String tag, boolean isTop) {
-        String border = isTop ? TOP_BORDER : BOTTOM_BORDER;
-        switch (type) {
-            case V:
-                Log.v(tag, border);
-                break;
-            case D:
-                Log.d(tag, border);
-                break;
-            case I:
-                Log.i(tag, border);
-                break;
-            case W:
-                Log.w(tag, border);
-                break;
-            case E:
-                Log.e(tag, border);
-                break;
-            case A:
-                Log.wtf(tag, border);
-                break;
+    private static void print(final int type, final String tag, String msg) {
+        Log.println(type, tag, msg);
+    }
+
+    private static String addLeftBorder(String msg) {
+        if (!sLogBorderSwitch) return msg;
+        StringBuilder sb = new StringBuilder();
+        String[] lines = msg.split(LINE_SEP);
+        for (String line : lines) {
+            sb.append(LEFT_BORDER).append(line).append(LINE_SEP);
         }
+        return sb.toString();
     }
-    private synchronized static void print2File(final String tag, final String msg) {
-        Date now = new Date();
-        String date = new SimpleDateFormat("MM-dd", Locale.getDefault()).format(now);
-        final String fullPath = dir + date + ".txt";
+    private static void print2File(final int type, final String tag, final String msg) {
+        Date now = new Date(System.currentTimeMillis());
+        String format = FORMAT.format(now);
+        String date = format.substring(0, 5);
+        String time = format.substring(6);
+        final String fullPath = (dir == null ? defaultDir : dir) + date + ".txt";
         if (!createOrExistsFile(fullPath)) {
             Log.e(tag, "log to " + fullPath + " failed!");
             return;
         }
-        String time = new SimpleDateFormat("MM-dd HH:mm:ss.SSS ", Locale.getDefault()).format(now);
         StringBuilder sb = new StringBuilder();
-        if (sLogBorderSwitch) sb.append(TOP_BORDER).append(LINE_SEPARATOR);
         sb.append(time)
+                .append(T[type - V])
+                .append("/")
                 .append(tag)
-                .append(": ")
                 .append(msg)
-                .append(LINE_SEPARATOR);
-        if (sLogBorderSwitch) sb.append(BOTTOM_BORDER).append(LINE_SEPARATOR);
-        final String dateLogContent = sb.toString();
-        new Thread(new Runnable() {
+                .append(LINE_SEP);
+        final String content = sb.toString();
+        if (executor == null) {
+            executor = Executors.newSingleThreadExecutor();
+        }
+        executor.execute(new Runnable() {
             @Override
             public void run() {
                 BufferedWriter bw = null;
                 try {
                     bw = new BufferedWriter(new FileWriter(fullPath, true));
-                    bw.write(dateLogContent);
-                    Log.d(tag, "log to " + fullPath + " success!");
+                    bw.write(content);
+//                    Log.d(tag, "log to " + fullPath + " success!");
                 } catch (IOException e) {
                     e.printStackTrace();
                     Log.e(tag, "log to " + fullPath + " failed!");
@@ -413,15 +453,11 @@ public final class LogUtils {
                     }
                 }
             }
-        }).start();
+        });
     }
     private static boolean createOrExistsFile(String filePath) {
-        return createOrExistsFile(isSpace(filePath) ? null : new File(filePath));
-    }
-
-    private static boolean createOrExistsFile(File file) {
-        if (file == null) return false;
+        File file = new File(filePath);
         if (file.exists()) return file.isFile();
         if (!createOrExistsDir(file.getParentFile())) return false;
         try {
@@ -445,4 +481,43 @@ public final class LogUtils {
         }
         return true;
     }
+
+    public static byte[] compress(byte input[]) {
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        Deflater compressor = new Deflater(1);
+        try {
+            compressor.setInput(input);
+            compressor.finish();
+            final byte[] buf = new byte[2048];
+            while (!compressor.finished()) {
+                int count = compressor.deflate(buf);
+                bos.write(buf, 0, count);
+            }
+        } finally {
+            compressor.end();
+        }
+        return bos.toByteArray();
+    }
+
+    public static byte[] uncompress(byte[] input) {
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        Inflater decompressor = new Inflater();
+        try {
+            decompressor.setInput(input);
+            final byte[] buf = new byte[2048];
+            while (!decompressor.finished()) {
+                int count = 0;
+                try {
+                    count = decompressor.inflate(buf);
+                } catch (DataFormatException e) {
+                    e.printStackTrace();
+                }
+                bos.write(buf, 0, count);
+            }
+        } finally {
+            decompressor.end();
+        }
+        return bos.toByteArray();
+    }
+
 }
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlService.java
View file @bc654b2
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlService.java
View file @bc654b2
@@ -27,6 +27,7 @@ import com.gimi.common.cinema.model.RoomStatusInfo;
 import com.gimi.common.cinema.model.SambaMsg;
 import com.gimi.common.cinema.utils.ActivityCollector;
 import com.gimi.common.cinema.utils.CToast;
+import com.gimi.common.cinema.utils.LogUtils;
 import com.gimi.common.cinema.utils.OpenMMUtils;
 import com.gimi.common.cinema.utils.SambaFileCharge;
 import com.gimi.common.cinema.utils.Utils;
@@ -200,7 +201,7 @@ public class SmartControlService extends BaseService implements EventListener<St
     private void openDoor() {
         updateLastCompleteMovieInfo();
         presenter.getSysTime(this);
-        Log.d("room-info", "openDoor called");
+        LogUtils.d("room-info", "openDoor called");
         bleBroadcastReceiver.setResponseObj(new GREENCITYBLEProtocolFactory.GREENCITYBleDataWritten() {
             @Override
             public void writeSuccess() {
@@ -208,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);
-                    Log.d("room-info", "user open door ,report the open success status");
+                    LogUtils.d("room-info", "user open door ,report the open success status");
                 }
-                Log.d("room-info", "open success");
+                LogUtils.d("room-info", "open success");
             }
             @Override
             public void writeFailure(String error) {
-                Log.d("room-info", "open failure");
+                LogUtils.d("room-info", "open failure," + error.toString());
                 bleBroadcastReceiver.setResponseObj(null);
                 Toast.makeText(SmartControlService.this, "开门失败," + error, Toast.LENGTH_SHORT).show();
             }
@@ -343,7 +344,7 @@ public class SmartControlService extends BaseService implements EventListener<St
 //                }
                 break;
             case ORDER_PLAY_COMPLETE:
-                Log.d("room-info", messageEvent.getMessage());
+                LogUtils.d("room-info", messageEvent.getMessage());
                 Utils.saveString(this, "oder-play-completed", new Gson().toJson(roomStatusInfo));
                 playEndAds();
                 break;
@@ -575,6 +576,7 @@ public class SmartControlService extends BaseService implements EventListener<St
         int durationMinutes = data.getEnd_time() - data.getNow_time();
         Log.d("CountService", "durationMinutes:" + durationMinutes);
+        LogUtils.d("room-info", orderInfo.toString());
         if (durationMinutes <= 1) {
             return;
         }
@@ -596,6 +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());
                 if (offset > 3) {
                     CToast.makeText(this, "您已迟到" + offset + "分钟,请注意把握时间,没有找到电影信息,请联系客服", 90 * 1000).show();
                 } else {
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @bc654b2
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @bc654b2
@@ -10,14 +10,20 @@ import android.widget.Toast;
 import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.model.RoomInfo;
 import com.gimi.common.cinema.utils.ActivityCollector;
+import com.gimi.common.cinema.utils.CToast;
+import com.gimi.common.cinema.utils.LogUtils;
 import com.gimi.common.cinema.utils.SystemUtils;
 import com.gimi.common.cinema.utils.Utils;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 import com.qnbar.smc.utils.LightOperationUtils;
+import com.xgimi.gimicinema.activity.AdsPreVideoPlayerActivity;
 import com.xgimi.gimicinema.activity.MainActivity;
 import com.xgimi.gimicinema.activity.QrCodeShowActivity;
+import com.xgimi.gimicinema.activity.SimpleAdsPlayer2;
 import com.xgimi.gimicinema.application.FangTangApplication;
+import com.xgimi.gimicinema.poll.PollingUtils;
+import com.xgimi.gimicinema.service.CountService;
 import com.xgimi.smartscreen.encrypt.AuthCode;
 import org.greenrobot.eventbus.EventBus;
@@ -103,7 +109,7 @@ public class SocketService1 extends BaseService {
             mHandler.postDelayed(this, HEART_BEAT_RATE);
             boolean isSuccess = sendMsg(new Gson().toJson(new SocketSendMsg().contractHeartBeatMsg(testRoomSn)) + END_SYMBOL);//就发送一个HEART_BEAT_STRING过去 如果发送失败，就重新初始化一个socket
             if (!isSuccess) {
-                Log.d(TAG, "heart beat error restart");
+                LogUtils.d(TAG, "heart beat error restart");
                 mHandler.removeCallbacks(heartBeatRunnable);
                 mReadThread.release();
                 sendRegister = false;
@@ -118,12 +124,12 @@ public class SocketService1 extends BaseService {
         @Override
         public void run() {
             if (ActivityCollector.getActivity(MainActivity.class) == null) {
-                Log.d(TAG, "do start main activity");
-//                Intent intent = new Intent(context, MainActivity.class);
-//                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-//                startActivity(intent);
+                LogUtils.d(TAG, "do start main activity");
+                Intent intent = new Intent(context, MainActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
             } else {
-                Log.d(TAG, "already start main activity");
+                LogUtils.d(TAG, "already start main activity");
             }
         }
     };
@@ -140,13 +146,13 @@ public class SocketService1 extends BaseService {
         super.onCreate();
         gson = new Gson();
         context = this;
-        Log.d(TAG, "onCreate");
+        LogUtils.d(TAG, "onCreate");
     }
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         super.onStartCommand(intent, flags, startId);
-        Log.d(TAG, "onStartCommand");
+        LogUtils.d(TAG, "onStartCommand");
         int ftTest = Utils.getInt(this, "ft-test", 0);
         switch (ftTest) {
             case 0:
@@ -165,25 +171,25 @@ public class SocketService1 extends BaseService {
         String roomInfoStr = Utils.getString(this, "room-info");
         if (!TextUtils.isEmpty(roomInfoStr)) {
-            Log.d("room-info", "room info not null");
+            LogUtils.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");
+                LogUtils.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");
+                LogUtils.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");
+            LogUtils.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");
+        LogUtils.d(TAG, "socket service onCreate");
         return START_STICKY;
     }
@@ -191,7 +197,9 @@ public class SocketService1 extends BaseService {
         if (null == mSocket || null == mSocket.get()) {
             return false;
         }
-        Log.d(TAG, "send msg:" + msg);
+        if (!msg.contains("20025")) {
+            LogUtils.d(TAG, "send msg:" + msg);
+        }
         Socket soc = mSocket.get();
         try {
             if (!soc.isClosed() && !soc.isOutputShutdown()) {
@@ -202,6 +210,7 @@ public class SocketService1 extends BaseService {
                 return false;
             }
         } catch (IOException e) {
+            LogUtils.d(TAG, "error" + e.getMessage());
             e.printStackTrace();
             return false;
         }
@@ -209,7 +218,13 @@ public class SocketService1 extends BaseService {
     }
     private void initSocket() throws IOException {//初始化Socket
-        Log.d(TAG, "serverHost:serverPort:" + serverHost + ":" + serverPort);
+        LogUtils.d(TAG, "serverHost:serverPort:" + serverHost + ":" + serverPort);
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                CToast.makeText(context, "开始连接服务器", 10 * 1000).show();
+            }
+        });
         Socket so = new Socket(serverHost, serverPort);
         mSocket = new WeakReference<>(so);
         mReadThread = new ReadThread(so);
@@ -228,6 +243,7 @@ public class SocketService1 extends BaseService {
                 mSocket = null;
             }
         } catch (IOException e) {
+            LogUtils.d(TAG, "error" + e.getMessage());
             e.printStackTrace();
         }
     }
@@ -240,10 +256,11 @@ public class SocketService1 extends BaseService {
                 initSocket();
             } catch (IOException e) {
                 e.printStackTrace();
-                Log.d(TAG, "init socket thread error,restart again after " + HEART_BEAT_RATE / 1000 + " seconds");
+                LogUtils.d(TAG, "init socket thread error,restart again after " + HEART_BEAT_RATE / 1000 + " seconds");
                 try {
                     Thread.sleep(HEART_BEAT_RATE);
                 } catch (InterruptedException e1) {
+                    LogUtils.d(TAG, "error" + e1.getMessage());
                     e1.printStackTrace();
                 }
                 this.run();
@@ -272,14 +289,14 @@ public class SocketService1 extends BaseService {
             if (null != socket) {
                 try {
                     if (!sendRegister) {
-                        Log.d(TAG, "send register mes");
+                        LogUtils.d(TAG, "send register mes");
                         SocketSendMsg ssm = new SocketSendMsg().contractRegisterMsg(testRoomSn);
                         String msg = gson.toJson(ssm) + END_SYMBOL;
                         sendMsg(msg);
-                        Log.d(TAG, "" + msg);
+                        LogUtils.d(TAG, "" + msg);
                         sendRegister = true;
                     }
-                    Log.d(TAG, "send register mes end");
+                    LogUtils.d(TAG, "send register mes end");
                     InputStream is = socket.getInputStream();
                     byte[] buffer = new byte[1024 * 4];
                     int length = 0;
@@ -288,7 +305,11 @@ public class SocketService1 extends BaseService {
                         if (length > 0) {
                             String message = new String(Arrays.copyOf(buffer,
                                     length)).trim();
-                            Log.d(TAG, "recv msg:" + message);
+//                            if (!message.contains("9997")) {
+                            LogUtils.d(TAG, "recv msg:" + message);
+//                            } else {
+//                                LogUtils.d(TAG, "heat beat success");
+//                            }
                             try {
                                 if (message.endsWith(END_SYMBOL)) {
                                     message = message.replace(END_SYMBOL, "");
@@ -299,16 +320,16 @@ public class SocketService1 extends BaseService {
                                         Log.d(TAG, "SUCCESS_MESSAGE");
                                         break;
                                     case VERIFY_SUCCESS:
-                                        Log.d(TAG, "VERIFY_SUCCESS");
+                                        LogUtils.d(TAG, "VERIFY_SUCCESS");
                                         mHandler.post(heartBeatRunnable);
-                                        Log.d(TAG, "verify success start heart beat");
+                                        LogUtils.d(TAG, "verify success start heart beat");
                                         break;
                                     case HEART_BEAT_SUCCESS:
                                         //每成功5次心跳判定是否启动main activity
                                         if (++mainChargeCount == 5) {
                                             mainChargeCount = 0;
                                             if (ActivityCollector.getActivity(MainActivity.class) == null) {
-                                                Log.d(TAG, "charge start main activity");
+                                                LogUtils.d(TAG, "charge start main activity");
                                                 mHandler.postDelayed(startMainRunnable, 3 * 1000);
                                             }
                                         }
@@ -318,22 +339,22 @@ public class SocketService1 extends BaseService {
                                     case HEART_BEAT_ERROR_SYMBOL:
                                     case ROOM_SN_CONNECTED:
                                         String msg1 = socketResponse.getCode() == HEART_BEAT_ERROR_SYMBOL ? "HEART_BEAT_ERROR_SYMBOL" : "ROOM_SN_CONNECTED";
-                                        Log.d(TAG, msg1);
+                                        LogUtils.d(TAG, msg1);
                                         mHandler.removeCallbacks(heartBeatRunnable);
                                         mReadThread.release();
                                         sendRegister = false;
                                         releaseLastSocket(mSocket);
-                                        Log.d(TAG, msg1 + " before:" + +System.currentTimeMillis());
+                                        LogUtils.d(TAG, msg1 + " before:" + +System.currentTimeMillis());
                                         try {
                                             Thread.sleep(10 * 1000);
                                         } catch (InterruptedException e) {
                                             e.printStackTrace();
                                         }
-                                        Log.d(TAG, msg1 + "  after:" + System.currentTimeMillis());
+                                        LogUtils.d(TAG, msg1 + "  after:" + System.currentTimeMillis());
                                         new InitSocketThread().start();
                                         break;
                                     case RETURN_VERIFY_CODE:
-                                        Log.d(TAG, "RETURN_VERIFY_CODE");
+                                        LogUtils.d(TAG, "RETURN_VERIFY_CODE");
                                         if (!TextUtils.isEmpty(socketResponse.getData().getVerify())) {
                                             String verifyMsg = AuthCode.getDecodeStr(socketResponse.getData().getVerify());
                                             SocketSendMsg ssm = new SocketSendMsg().contractVerifyMsg(testRoomSn, verifyMsg);
@@ -342,7 +363,7 @@ public class SocketService1 extends BaseService {
                                         }
                                         break;
                                     case CONTAIN_MESSAGE:
-                                        Log.d(TAG, "CONTAIN_MESSAGE");
+                                        LogUtils.d(TAG, "CONTAIN_MESSAGE");
                                         if (socketResponse.getData() != null) {
                                             if (socketResponse.getCmd() == OPEN_DOOR) {
                                                 switch (socketResponse.getData().getUser()) {
@@ -362,7 +383,7 @@ public class SocketService1 extends BaseService {
                                                         break;
                                                     case 20:
                                                         if (TextUtils.isEmpty(((FangTangApplication) getApplication()).getCurrentPlayUrl())) {
-                                                            Log.d("LightOperationUtils", "admin open light");
+                                                            LogUtils.d("LightOperationUtils", "admin open light");
                                                             LightOperationUtils.open();
                                                             LightOperationUtils.setLightValue(Utils.getInt(context, "brightness", 50));
                                                         }
@@ -376,24 +397,39 @@ public class SocketService1 extends BaseService {
                                                         break;
                                                 }
                                             } else if (socketResponse.getCmd() == CLEAN_OVER) {
-                                                Log.d("LightOperationUtils", "admin clean over close light");
+                                                LogUtils.d("LightOperationUtils", "admin clean over close light");
                                                 LightOperationUtils.setLightValue(5);
                                                 LightOperationUtils.close();
                                                 new SystemUtils().closeFtLed(context.getApplicationContext());
                                                 sendMessage(QrCodeShowActivity.KILL_SELF, "finish the QR CODE activity when clean over");
+                                                if (ActivityCollector.isActivityExist(SimpleAdsPlayer2.class)) {
+                                                    ActivityCollector.getActivity(SimpleAdsPlayer2.class).finish();
+                                                }
+                                                if (ActivityCollector.isActivityExist(AdsPreVideoPlayerActivity.class)) {
+                                                    ActivityCollector.getActivity(AdsPreVideoPlayerActivity.class).finish();
+                                                }
+                                                if (ActivityCollector.isActivityExist(QrCodeShowActivity.class)) {
+                                                    ActivityCollector.getActivity(QrCodeShowActivity.class).finish();
+                                                }
+                                                try {
+                                                    PollingUtils.stopPollingService(context, CountService.class, CountService.STATUS_ACTION);
+                                                } catch (Exception e) {
+                                                    e.printStackTrace();
+                                                }
                                             }
                                         }
                                         break;
                                     default:
-                                        Log.d(TAG, "default msg:" + socketResponse.toString());
+                                        LogUtils.d(TAG, "default msg:" + socketResponse.toString());
                                 }
                             } catch (JsonSyntaxException e) {
-                                Log.d(TAG, message);
+                                LogUtils.d(TAG, "error" + message + e.getMessage());
                                 e.printStackTrace();
                             }
                         }
                     }
                 } catch (IOException e) {
+                    LogUtils.d(TAG, "error" + e.getCause());
                     e.printStackTrace();
                 }
             }
@@ -411,9 +447,9 @@ public class SocketService1 extends BaseService {
     @Override
     public void onDestroy() {
-//        Log.d("BaseService1", this.getClass().toString() + "");
+//        LogUtils.d("BaseService1", this.getClass().toString() + "");
 //        ServiceCommandCollector.removeService(this);
-        Log.d(TAG, "socket service destroy");
+        LogUtils.d(TAG, "socket service destroy");
         super.onDestroy();
     }
 }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/CheckActivity.java
View file @bc654b2
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/CheckActivity.java
View file @bc654b2
@@ -18,16 +18,21 @@ package com.xgimi.gimicinema.activity;
 import android.app.ListActivity;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.ArrayAdapter;
 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.LogUtils;
 import com.gimi.common.cinema.utils.NetStatusUtils;
 import com.gimi.common.cinema.utils.ShellUtils;
 import com.gimi.common.cinema.utils.SystemUtils;
 import com.gimi.common.cinema.utils.TimeoutCharge;
 import com.gimi.common.cinema.utils.Utils;
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
 import com.xgimi.gimicinema.R;
 import java.io.File;
@@ -61,6 +66,7 @@ public class CheckActivity extends ListActivity {
         data.add("log");
         data.add("结束log");
         data.add("考出log到服务器");
+        data.add("考出日志文件到服务器");
         return data;
     }
@@ -129,6 +135,28 @@ public class CheckActivity extends ListActivity {
                     msg = "debug.log文件不存在";
                 }
                 break;
+            case 6:
+                String roomInfoStr = Utils.getString(this, "room-info");
+                if (!TextUtils.isEmpty(roomInfoStr)) {
+                    LogUtils.d("room-info", "room info not null");
+                    RoomInfo roomInfo = null;
+                    try {
+                        roomInfo = new Gson().fromJson(roomInfoStr, RoomInfo.class);
+                        SambaMsg sambaMsg = Utils.getSambaMsg(this);
+                        LogUtils.d("room-info", "room info room_sn update");
+                        String meshName = TextUtils.isEmpty(roomInfo.getData().getMesh_name()) ? roomInfo.getData().getImei() : roomInfo.getData().getMesh_name();
+                        final String copy = "cp -r /sdcard/ft_log/ " + sambaMsg.getLocalPath() + "apks/" + meshName;
+                        ShellUtils.execCommand("mkdirs " + sambaMsg.getLocalPath() + "apks/" + meshName, false);
+                        ShellUtils.execCommand(copy, false);
+                        msg = "正在考出";
+                    } catch (JsonSyntaxException e) {
+                        LogUtils.d("room-info", "room gson parse exception return");
+                        msg = "房间信息配置出错";
+//                        Toast.makeText(this, "房间信息配置出错，请重新进入应用获取", Toast.LENGTH_SHORT).show();
+                        e.printStackTrace();
+                    }
+                }
+                break;
         }
         Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
     }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/QrCodeShowActivity.java
View file @bc654b2
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/QrCodeShowActivity.java
View file @bc654b2
@@ -11,6 +11,7 @@ import android.widget.Toast;
 import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.model.RoomQrCodeInfo;
 import com.gimi.common.cinema.model.WrongMsg;
+import com.gimi.common.cinema.utils.LogUtils;
 import com.gimi.common.cinema.utils.QRCodeUtils;
 import com.gimi.common.cinema.utils.SystemUtils;
 import com.google.zxing.WriterException;
@@ -44,7 +45,7 @@ public class QrCodeShowActivity extends Activity implements IUpdateQrCodeView {
     private Runnable updateQrCodeRunnable = new Runnable() {
         @Override
         public void run() {
-            Log.d("room-info", "QrCodeShowActivity update qr code runnable run");
+            LogUtils.d("room-info", "QrCodeShowActivity update qr code runnable run");
             handler.postDelayed(this, 10 * 60 * 1000);
             present.getQrCode(roomSn, orderSn);
         }
@@ -110,7 +111,7 @@ public class QrCodeShowActivity extends Activity implements IUpdateQrCodeView {
         switch (messageEvent.getEventId()) {
             case KILL_SELF:
                 QrCodeShowActivity.this.finish();
-                Log.d("room-info", messageEvent.getMessage());
+                LogUtils.d("room-info", messageEvent.getMessage());
                 break;
         }
     }
@@ -118,7 +119,7 @@ public class QrCodeShowActivity extends Activity implements IUpdateQrCodeView {
     @Override
     public void getQrCodeSuccess(RoomQrCodeInfo info) {
         try {
-            Log.d("QrCodeShowActivity", info.getData().getCode());
+            LogUtils.d("QrCodeShowActivity", info.getData().getCode());
             iv.setImageBitmap(QRCodeUtils.createQRCode(info.getData().getCode(), 400));
         } catch (WriterException e) {
             e.printStackTrace();
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/SimpleAdsPlayer2.java
View file @bc654b2
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/SimpleAdsPlayer2.java
View file @bc654b2
@@ -17,6 +17,7 @@ import android.widget.VideoView;
 import com.gimi.common.cinema.model.Constant;
 import com.gimi.common.cinema.model.RoomQrCodeInfo;
 import com.gimi.common.cinema.model.WrongMsg;
+import com.gimi.common.cinema.utils.LogUtils;
 import com.gimi.common.cinema.utils.QRCodeUtils;
 import com.google.zxing.WriterException;
 import com.xgimi.gimicinema.R;
@@ -40,7 +41,7 @@ public class SimpleAdsPlayer2 extends BaseActivity implements IUpdateQrCodeView 
     private Runnable updateQrCodeRunnable = new Runnable() {
         @Override
         public void run() {
-            Log.d("room-info", "update qr code runnable run");
+            LogUtils.d("room-info", "update qr code runnable run");
             handler.postDelayed(this, 10 * 60 * 1000);
             presenter.getQrCode(roomSn, orderSn);
         }
@@ -96,13 +97,10 @@ public class SimpleAdsPlayer2 extends BaseActivity implements IUpdateQrCodeView 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (System.currentTimeMillis() - startAdsTime < 5000) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            Toast.makeText(this, "请用管理端扫描或者等待清理时间结束", Toast.LENGTH_SHORT).show();
             return true;
         }
-        if (fromService) {
-            return true;
-        }
-        finish();
         return super.onKeyDown(keyCode, event);
     }
@@ -132,7 +130,7 @@ public class SimpleAdsPlayer2 extends BaseActivity implements IUpdateQrCodeView 
     @Override
     public void getQrCodeSuccess(RoomQrCodeInfo info) {
         try {
-            Log.d("SimpleAdsPlayer2", info.getData().getCode());
+            LogUtils.d("SimpleAdsPlayer2", info.getData().getCode());
             cleanQrCodeIv.setImageBitmap(QRCodeUtils.createQRCode(info.getData().getCode(), 400));
             qrCodeIv.setVisibility(View.VISIBLE);
         } catch (WriterException e) {
@@ -144,4 +142,5 @@ public class SimpleAdsPlayer2 extends BaseActivity implements IUpdateQrCodeView 
     public void getQrCodeFailure(WrongMsg wrongMsg) {
         Toast.makeText(this, wrongMsg.getMsg(), Toast.LENGTH_SHORT).show();
     }
+
 }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/application/FangTangApplication.java
View file @bc654b2
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/application/FangTangApplication.java
View file @bc654b2
@@ -2,6 +2,7 @@ package com.xgimi.gimicinema.application;
 import android.util.Log;
 import android.widget.Toast;
+import com.gimi.common.cinema.utils.LogUtils;
 import com.gimi.common.cinema.utils.Utils;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
@@ -20,7 +21,8 @@ public class FangTangApplication extends TelinkApplication {
         super.onCreate();
         AdvanceStrategy.setDefault(new MySampleAdvanceStrategy());
 //		CrashHandler crashHandler = CrashHandler.getInstance();
-//		crashHandler.init(getApplicationContext());
+//		crashHandler.init(getApplicationContext());initLog\\
+        initLog();
     }
     @Override
@@ -73,4 +75,21 @@ public class FangTangApplication extends TelinkApplication {
     public void setCurrentPlayUrl(String currentPlayUrl) {
         this.currentPlayUrl = currentPlayUrl;
     }
+
+    public static void initLog() {
+        LogUtils.Builder builder = new LogUtils.Builder()
+                .setLogSwitch(true)// 设置log总开关，包括输出到控制台和文件，默认开
+                .setConsoleSwitch(true)// 设置是否输出到控制台开关，默认开
+                .setGlobalTag(null)// 设置log全局标签，默认为空
+                // 当全局标签不为空时，我们输出的log全部为该tag，
+                // 为空时，如果传入的tag为空那就显示类名，否则显示tag
+                .setLogHeadSwitch(true)// 设置log头信息开关，默认为开
+                .setLog2FileSwitch(true)// 打印log时是否存到文件的开关，默认关
+                .setDir("/sdcard/ft_log/")// 当自定义路径为空时，写入应用的/cache/log/目录中
+                .setBorderSwitch(true)// 输出日志是否带边框开关，默认开
+                .setConsoleFilter(LogUtils.V)// log的控制台过滤器，和logcat过滤器同理，默认Verbose
+                .setFileFilter(LogUtils.V);// log文件过滤器，和logcat过滤器同理，默认Verbose
+        LogUtils.d(builder.toString());
+    }
+
 }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @bc654b2
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @bc654b2
@@ -25,6 +25,7 @@ import android.os.RemoteException;
 import android.util.Log;
 import android.widget.Toast;
 import com.gimi.common.cinema.model.MessageEvent;
+import com.gimi.common.cinema.utils.LogUtils;
 import com.gimi.common.cinema.utils.Utils;
 import com.qnbar.smc.model.Light;
 import com.qnbar.smc.model.Lights;
@@ -347,8 +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");
         } else {
-            Log.d("room-info", "stop media but not completed");
+            LogUtils.d("room-info", "stop media but not completed");
         }
     }
 }