Merge branch 'dev_2.6.4' into jc_master

# Conflicts:
#	app/src/main/java/com/example/zhpan/circleviewpager/activity/MainActivity.kt
#	app/src/main/java/com/example/zhpan/circleviewpager/adapter/AdapterFragmentPager.kt

app/src/main/java/com/example/zhpan/circleviewpager/App.java

@@ -2,6 +2,7 @@ package com.example.zhpan.circleviewpager;
 
 import android.app.Application;
 
+import com.zhpan.bannerview.utils.BannerUtils;
 import com.zhpan.idea.utils.Utils;
 
 /**
@@ -16,5 +17,6 @@ public class App extends Application {
     public void onCreate() {
         super.onCreate();
         Utils.init(getApplicationContext());
+        BannerUtils.setDebugMode(true);
     }
 }

app/src/main/java/com/example/zhpan/circleviewpager/adapter/AdapterFragmentPager.kt

@@ -6,7 +6,6 @@ import android.support.v4.app.FragmentPagerAdapter
 import android.util.SparseArray
 import android.view.ViewGroup
 import com.example.zhpan.circleviewpager.fragment.*
-
 class AdapterFragmentPager(fm: FragmentManager) : FragmentPagerAdapter(fm) {
 
     private val fragmentList: SparseArray<BaseFragment>?

app/src/main/java/com/example/zhpan/circleviewpager/net/ApiService.java

@@ -16,11 +16,11 @@ import retrofit2.http.Headers;
  */
 public interface ApiService {
 
-    @Headers("Cache-Control: public, max-age=" + 3600)
+    @Headers("Cache-Control: public, max-age=" + 3600 * 24)
     @GET("banner/json")
     Observable<List<BannerData>> getBannerData();
 
-    @Headers("Cache-Control: public, max-age=" + 3600)
+    @Headers("Cache-Control: public, max-age=" + 3600 * 24)
     @GET("article/list/0/json")
     Observable<ArticleWrapper> getArticle();
 }

bannerview/src/main/java/com/zhpan/bannerview/utils/BannerUtils.java

@@ -11,12 +11,14 @@ import android.util.Log;
  */
 public class BannerUtils {
 
-    private static final boolean DEBUG = true;
+    private static boolean debugMode = false;
 
-    public float density;
+    public static void setDebugMode(boolean isDebug) {
+        debugMode = isDebug;
+    }
 
-    public BannerUtils() {
-        this.density = Resources.getSystem().getDisplayMetrics().density;
+    public static boolean isDebugMode() {
+        return debugMode;
     }
 
     public static int dp2px(float dpValue) {
@@ -24,13 +26,13 @@ public class BannerUtils {
     }
 
     public static void log(String tag, String msg) {
-        if (DEBUG) {
+        if (debugMode) {
             Log.e(tag, msg);
         }
     }
 
     public static void log(String msg) {
-        if (DEBUG) {
+        if (debugMode) {
             Log.e("BannerView", msg);
         }
     }