完善代码,修改一些错误

LuckyCodeer · LuckyCodeer · commit fce88f7cf783 · 2017-11-14T10:32:44.000+08:00
diff --git a/README.md b/README.md
@@ -1,11 +1,13 @@
 # AndroidLogLib
 一个Android日志打印工具库
+
 # Android studio使用方法
-compile 'com.yhw.loglib:loglib:1.0.0'
+在gradle中加入 compile 'com.yhw.loglib:loglib:1.0.0'
 
 # 代码中使用
 
-1、在Application中初始化配置
+1.在Application中初始化配置
+ ```java
 //初始化日志配置
 LogConfig logConfig = new LogConfig.Builder()
         .setLog(true) //设置日志打印开关 默认为true
@@ -18,17 +20,19 @@ LogConfig logConfig = new LogConfig.Builder()
         .setMaxSaveDay(7)//设置日志在客户端最大保存天数 默认为7天
         .setUploadUrl("http://xxx") //设置日志上传服务器地址 不上传的情况下可以不设置
         .build();
-//设置日志配置
-Logger.init(logConfig);
+ ```
 
-2、日志打印
+2.日志打印
+ ```java
 如：Logger.i("test");
 或者
 Logger.i("TAG","test");
+ ```
 
-3、日志上传
-必须在初始化的时候设置服务器上传Url才可以
-使用方法
+3.日志上传
+ ```java
+//必须在初始化的时候设置服务器上传Url才可以
+//使用方法
  Logger.upLoadLog(context, new UploadLog.UploadLogListener() {
         @Override
         public void onSuccess(String msg) {
@@ -39,4 +43,5 @@ Logger.i("TAG","test");
         public void onFailure(String errorMsg, int errorCode) {
             //处理失败
         }
-});
+});
+ ```
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.yhw.log" >
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/java/com/yhw/log/MainActivity.java b/app/src/main/java/com/yhw/log/MainActivity.java
@@ -6,6 +6,7 @@
 import android.widget.Button;
 
 import com.yhw.loglib.Logger;
+import com.yhw.loglib.http.UploadLog;
 
 /**
  * demo
@@ -19,12 +20,32 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
         Button logBtn = (Button) findViewById(R.id.log_btn);
+        //打印
         logBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Logger.i("hello world!");
                 Logger.i(TAG,"hello world 2!");
             }
         });
+
+        Button logUploadBtn = (Button) findViewById(R.id.log_upload_btn);
+        //上传日志
+        logUploadBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Logger.upLoadLog(MainActivity.this, new UploadLog.UploadLogListener() {
+                    @Override
+                    public void onSuccess(String msg) {
+                        Logger.i(msg);
+                    }
+
+                    @Override
+                    public void onFailure(String errorMsg, int errorCode) {
+                        Logger.e(errorMsg+" , "+errorCode);
+                    }
+                });
+            }
+        });
     }
 }
diff --git a/app/src/main/java/com/yhw/log/MyApplication.java b/app/src/main/java/com/yhw/log/MyApplication.java
@@ -17,18 +17,21 @@ public void onCreate() {
         super.onCreate();
 
         //初始化日志配置
-        LogConfig logConfig = new LogConfig.Builder()
-                .setLog(true) //设置日志打印开关 默认为true
-                .setTAG("AAAAA") //统一设置日志TAG 默认为LOG_TAG
-                .setSaveFile(true) //设置日志是否保存到文件 默认为false
+        new LogConfig.Builder()
+                //设置日志打印开关 默认为true
+                .setLog(true)
+                //统一设置日志TAG 默认为LOG_TAG
+                .setTAG("AAAAA")
+                //设置日志是否保存到文件 默认为false
+                .setSaveFile(true)
                 //设置日志保存路径，在设置setSaveFile为true的情况下必须设置该路径
                 .setLogPath(Environment.getExternalStorageDirectory().getPath())
                 //设置日志名称 默认为当天的日期如2017-11-13，设置后变为log_2017-11-13
                 .setLogFileName("log")
-                .setMaxSaveDay(7)//设置日志在客户端最大保存天数 默认为7天
-                .setUploadUrl("http://xxx") //设置日志上传服务器地址 不上传的情况下可以不设置
+                //设置日志在客户端最大保存天数 默认为7天
+                .setMaxSaveDay(7)
+                //设置日志上传服务器地址 不上传的情况下可以不设置
+                .setUploadUrl("http://xxx")
                 .build();
-        //设置日志配置
-        Logger.init(logConfig);
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,16 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
     tools:context="com.yhw.log.MainActivity">
 
+
     <Button
         android:id="@+id/log_btn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:text="测试打印" />
 
-</FrameLayout>
+    <Button
+        android:id="@+id/log_upload_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
+        android:text="上传日志" />
+
+</LinearLayout>
diff --git a/loglib/src/main/AndroidManifest.xml b/loglib/src/main/AndroidManifest.xml
@@ -2,6 +2,10 @@
 
     package="com.yhw.loglib">
 
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+
     <application android:allowBackup="true" android:label="@string/app_name"
         android:supportsRtl="true">
 
diff --git a/loglib/src/main/java/com/yhw/loglib/Logger.java b/loglib/src/main/java/com/yhw/loglib/Logger.java
@@ -27,7 +27,7 @@ public class Logger {
     /**
      * 设置配置文件
      */
-    public static void init(LogConfig logConfig){
+    public static void setLogConfig(LogConfig logConfig){
         if(logConfig==null){
             return;
         }
@@ -147,6 +147,9 @@ public static void upLoadLog(Context context, UploadLog.UploadLogListener upload
         if(mLogConfig==null){
             throw new IllegalArgumentException("Logger没有初始化成功,LogConfig不能为null！");
         }
+        if(TextUtils.isEmpty(mLogConfig.getUploadUrl())){
+            throw new IllegalArgumentException("日志服务器上传地址不能为空！");
+        }
         UploadLog uploadLog = new UploadLog(context,uploadLogListener);
         uploadLog.setLogUrl(mLogConfig.getUploadUrl());
         uploadLog.setLogPath(mLogConfig.getLogPath());
diff --git a/loglib/src/main/java/com/yhw/loglib/config/LogConfig.java b/loglib/src/main/java/com/yhw/loglib/config/LogConfig.java
@@ -2,6 +2,7 @@
 
 import android.text.TextUtils;
 
+import com.yhw.loglib.Logger;
 import com.yhw.loglib.utils.DateUtil;
 
 import java.io.File;
@@ -132,6 +133,7 @@ public LogConfig build(){
                     logConfig.logFileName = logConfig.logFileName+"_"+DateUtil.getDate();
                 }
             }
+            Logger.setLogConfig(logConfig);
             return logConfig;
         }
     }
diff --git a/loglib/src/main/java/com/yhw/loglib/http/UploadLog.java b/loglib/src/main/java/com/yhw/loglib/http/UploadLog.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.os.Handler;
+import android.util.Log;
 
 import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.AsyncHttpResponseHandler;
@@ -19,6 +20,7 @@
  */
 
 public final class UploadLog {
+    private static final String TAG = UploadLog.class.getSimpleName();
     private String mLogUrl; //上传服务器地址
     private String mLogPath; //日志路径
     private Context mContext;
@@ -40,6 +42,7 @@ public void upload(){
             @Override
             public void run() {
                 try {
+                    Log.i(TAG,"mLogPath: "+mLogPath);
                     File file = new File(mLogPath);
                     String logZipPath = file.getParent()+File.separator+"log.zip";
                     zipUtil.setZipListener(new ZipUtil.ZIPListener() {
@@ -73,21 +76,37 @@ private void upload(String logPath) {
             httpClient.post(mContext, mLogUrl, params, new AsyncHttpResponseHandler() {
                 @Override
                 public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) {
-                    if(mUploadLogListener!=null){
-                        String msg =new String(responseBody);
-                        if(statusCode==200){
-                            mUploadLogListener.onSuccess(msg);
-                        }else{
-                            mUploadLogListener.onFailure(msg,statusCode);
+                    try {
+                        if(mUploadLogListener!=null){
+                            if(responseBody==null){
+                                mUploadLogListener.onFailure("上传日志发生错误！",statusCode);
+                                return;
+                            }
+                            String msg =new String(responseBody);
+                            if(statusCode==200){
+                                mUploadLogListener.onSuccess(msg);
+                            }else{
+                                mUploadLogListener.onFailure(msg,statusCode);
+                            }
                         }
+                    } catch (Exception e) {
+                        e.printStackTrace();
                     }
                 }
 
                 @Override
                 public void onFailure(int statusCode, Header[] headers, byte[] responseBody, Throwable error) {
-                    if(mUploadLogListener!=null){
-                        String msg =new String(responseBody);
-                        mUploadLogListener.onFailure(msg,statusCode);
+                    try {
+                        if(mUploadLogListener!=null){
+                            if(responseBody==null){
+                                mUploadLogListener.onFailure("上传日志发生错误！",statusCode);
+                                return;
+                            }
+                            String msg =new String(responseBody);
+                            mUploadLogListener.onFailure(msg,statusCode);
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
                     }
                 }
             });
@@ -101,15 +120,11 @@ public interface UploadLogListener{
         void onFailure(String errorMsg, int errorCode);
     }
 
-    public void setUploadLogListener(UploadLogListener uploadLogListener) {
-        this.mUploadLogListener = uploadLogListener;
-    }
-
     public void setLogUrl(String logUrl) {
-        this.mLogUrl = mLogUrl;
+        this.mLogUrl = logUrl;
     }
 
     public void setLogPath(String logPath) {
-        this.mLogPath = mLogPath;
+        this.mLogPath = logPath;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import android.text.TextUtils;`
`4`	`4`
	`5`	`+import com.yhw.loglib.Logger;`
`5`	`6`	`import com.yhw.loglib.utils.DateUtil;`
`6`	`7`
`7`	`8`	`import java.io.File;`
`@@ -132,6 +133,7 @@ public LogConfig build(){`
`132`	`133`	`logConfig.logFileName = logConfig.logFileName+"_"+DateUtil.getDate();`
`133`	`134`	`}`
`134`	`135`	`}`
	`136`	`+ Logger.setLogConfig(logConfig);`
`135`	`137`	`return logConfig;`
`136`	`138`	`}`
`137`	`139`	`}`