tag v0.3.4

[rtmpclient.git] / app / src / main / java / ai / suanzi / rtmpclient / LogUtil.java

diff --git a/app/src/main/java/ai/suanzi/rtmpclient/LogUtil.java b/app/src/main/java/ai/suanzi/rtmpclient/LogUtil.java
index a547c9c..a50863a 100644 (file)
--- 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,8 +18,10 @@ import javax.mail.internet.MimeMultipart;
 
 import java.util.Date;
 
+import android.content.Context;
 import android.os.AsyncTask;
 import android.os.StrictMode;
+import android.widget.Toast;
 
 import java.io.File;
 import java.util.zip.ZipEntry;
@@ -38,25 +38,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();
-            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 for Android by suanzi.ai  ");
-            gLogger.error("Git Revision: " + BuildConfig.GIT_REVISION);
-            gLogger.error("Version : " + BuildConfig.VERSION_NAME);
-            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());
@@ -69,8 +73,7 @@ public class LogUtil {
 
         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) {
@@ -95,8 +98,10 @@ public class LogUtil {
                     gLogger.debug("Zip file completed");
                     File zz = new File(zfile);
                     zz.delete();
+                    Toast.makeText(mContext, "Completed", Toast.LENGTH_SHORT).show();
                 } else {
                     gLogger.error("zip file error");
+                    Toast.makeText(mContext, "Error, Send mail failed", Toast.LENGTH_SHORT).show();
                 }
             }
         };