X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fai%2Fsuanzi%2Frtmpclient%2FLogUtil.java;h=b15d4357b8053637230810006760d61b33adfb1a;hb=3c832ad69b0475ee433b27eaf12f0ae7d7033d65;hp=9018d9d0f8fad470acbffadc424826d2fac19ecd;hpb=edf5b6603fc32ed012f765763db6fa03de3715e5;p=rtmpclient.git

diff --git a/app/src/main/java/ai/suanzi/rtmpclient/LogUtil.java b/app/src/main/java/ai/suanzi/rtmpclient/LogUtil.java
index 9018d9d..b15d435 100644
--- a/app/src/main/java/ai/suanzi/rtmpclient/LogUtil.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/LogUtil.java
@@ -1,7 +1,5 @@
 package ai.suanzi.rtmpclient;
 
-import android.content.Intent;
-
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import de.mindpipe.android.logging.log4j.LogConfigurator;
@@ -20,6 +18,7 @@ import javax.mail.internet.MimeMultipart;
 
 import java.util.Date;
 
+import android.content.Context;
 import android.os.AsyncTask;
 import android.os.StrictMode;
 
@@ -38,24 +37,29 @@ public class LogUtil {
     private static final String FILE_NAME = "log.txt";
     private static final long MAX_SIZE = 1024 * 1024 * 10; // 10M
     private static String logFile = "";
-    private static File DIR;
+    //private static File DIR;
+    private static Context mContext;
 
 
-    public static void config(File dir) {
+    public static void config(Context context) {
         try {
             final LogConfigurator logConfigurator = new LogConfigurator();
-            //String fname = getExternalFilesDir(null) + File.separator + "log.txt";
-            DIR = dir;
-            logFile = dir + File.separator + FILE_NAME;
+            mContext = context;
+            logFile = context.getExternalFilesDir(null) + File.separator + FILE_NAME;
             logConfigurator.setFileName(logFile);
             logConfigurator.setRootLevel(Level.DEBUG);
             logConfigurator.setLevel("org.apache", Level.ERROR);
             logConfigurator.setMaxFileSize(MAX_SIZE);
+            logConfigurator.setFilePattern("%d [%-6.6t] %-5p [%c{2}]-[%L] %m%n");
             logConfigurator.configure();
             gLogger = Logger.getLogger("LogUtil");
-            gLogger.error("#######################################");
-            gLogger.error("RtmpClient by suanzi.ai");
-            gLogger.debug("Log file is located at: " + logFile);
+            gLogger.error("");
+            gLogger.error("##################################################");
+            gLogger.error("### RtmpClient for Android by " + BuildConfig.COMPANY);
+            gLogger.error("### Git Revision: " + BuildConfig.GIT_REVISION);
+            gLogger.error("### Version : " + BuildConfig.VERSION_NAME);
+            gLogger.debug("### Log file is located at: " + logFile);
+            gLogger.debug("");
 
         } catch (Exception e){
             gLogger.error("LogUtil.config error: " + e.getMessage());
@@ -63,17 +67,16 @@ public class LogUtil {
         }
     }
 
+
     public static void sendLogs (){
 
         AsyncTask<Void, Integer, Boolean> mailTask = new AsyncTask<Void, Integer, Boolean>() {
 
-            private String zfile = DIR + File.separator + "log.zip";
-
+            private String zfile = mContext.getExternalCacheDir() + File.separator + "log.zip";
 
             @Override
             protected Boolean doInBackground(Void... voids) {
 
-                // zip log.txt to log.zip
                 String[] s = new String[1];
                 s[0] = logFile;
                 gLogger.debug("zipLog - " + zfile);
@@ -103,9 +106,6 @@ public class LogUtil {
 
     }
 
-
-
-
     private static final String SMTP_SERVER = "smtp.exmail.qq.com";
     private static final String USER = "support@suanzi.ai";
     private static final String SENT_MAIL = "support@suanzi.ai";
@@ -115,7 +115,7 @@ public class LogUtil {
     private static boolean sendMail(String attachment){
 
         String account = UserInfo.user;
-        String macAddr = UserInfo.macAddr;
+        String subject = UserInfo.macAddr + " - " + BuildConfig.VERSION_NAME + " - " + BuildConfig.GIT_REVISION;
         StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
         StrictMode.setThreadPolicy(policy);
 
@@ -135,7 +135,7 @@ public class LogUtil {
         try {
             message.setFrom(new InternetAddress(SENT_MAIL, account, "UTF-8"));
             message.setRecipient(MimeMessage.RecipientType.TO, new InternetAddress(RECV_MAIL, "support", "UTF-8"));
-            message.setSubject(macAddr, "UTF-8");
+            message.setSubject(subject, "UTF-8");
             //message.setContent("hahaha", "text/html;charset=UTF-8");
             message.setSentDate(new Date());