去掉一些LOG

raee · raee · commit 9ba50c211709 · 2017-08-13T20:16:10.000+08:00
diff --git a/app/src/androidTest/java/com/rae/cnblogs/RaeTest.java b/app/src/androidTest/java/com/rae/cnblogs/RaeTest.java
@@ -21,7 +21,6 @@ public class RaeTest {
     public void testString() {
 
         long memory = Runtime.getRuntime().freeMemory();
-        Log.w("rae", "开始内存：" + memory);
         String id;
         int size = 10;
         List<BlogBean> data = new ArrayList<>();
diff --git a/app/src/main/java/com/rae/cnblogs/AppMobclickAgent.java b/app/src/main/java/com/rae/cnblogs/AppMobclickAgent.java
@@ -29,7 +29,6 @@ public static void onAppOpenEvent(Context context) {
 
     public static void onCategoryEvent(Context context, String category) {
         MobclickAgent.onEvent(context, "APP_CATEGORY", category);
-        Log.i("Rae", "统计分类：" + category);
     }
 
     private static void onAdEvent(Context context, Map<String, String> map) {
diff --git a/app/src/main/java/com/rae/cnblogs/activity/BlogContentActivity.java b/app/src/main/java/com/rae/cnblogs/activity/BlogContentActivity.java
@@ -137,7 +137,6 @@ public void onActionMenuMoreClick() {
     // 查看评论
     @OnClick(R.id.layout_content_comment)
     public void onCommentClick() {
-        Log.i("rae", "点击评论");
         mCommentLayout.toggleSmoothScroll();
     }
 
diff --git a/app/src/main/java/com/rae/cnblogs/activity/FriendsActivity.java b/app/src/main/java/com/rae/cnblogs/activity/FriendsActivity.java
@@ -130,7 +130,6 @@ protected void onResume() {
     }
 
     private void start() {
-        Log.i("Rae", "开始假装数量");
         mPage = 1;
         loadData();
     }
diff --git a/app/src/main/java/com/rae/cnblogs/activity/SwipeBackBaseActivity.java b/app/src/main/java/com/rae/cnblogs/activity/SwipeBackBaseActivity.java
@@ -48,7 +48,6 @@ public void onEdgeTouch(int edgeFlag) {
 
             @Override
             public void onScrollOverThreshold() {
-                Log.w("rae", "onScrollOverThreshold");
             }
         });
     }
diff --git a/app/src/main/java/com/rae/cnblogs/model/CategoriesOverallItem.java b/app/src/main/java/com/rae/cnblogs/model/CategoriesOverallItem.java
@@ -53,7 +53,7 @@ public void bindViewHolder(FlexibleAdapter flexibleAdapter, CategoriesViewHolder
         holder.setTitle(mCategory.getName());
         holder.setBackgroundResource(isDraggable() ? R.drawable.bg_category : R.drawable.bg_category_lock);
         holder.setTitleColor(isDraggable() ? R.color.ph2 : R.color.ph3); // 拖动颜色
-        Log.i("rae", "bindViewHolder -->  " + i);
+//        Log.i("rae", "bindViewHolder -->  " + i);
 
     }
 
diff --git a/app/src/main/java/com/rae/cnblogs/service/task/BlogContentTask.java b/app/src/main/java/com/rae/cnblogs/service/task/BlogContentTask.java
@@ -44,7 +44,7 @@ private boolean isWIFI() {
     @Override
     public void run() {
         if (!isWIFI() || TextUtils.isEmpty(mBlogId)) {
-            Log.e("rae", "非WIFI环境，或者博客ID为空！缓存不下载");
+//            Log.e("rae", "非WIFI环境，或者博客ID为空！缓存不下载");
             return;
         }
 
@@ -56,11 +56,11 @@ public void run() {
         BlogType type = BlogType.typeOf(blogInfo.getBlogType());
 
         try {
-            Log.i("rae", "正在执行任务：[" + blogInfo.getBlogType() + "] --> " + mBlogId);
+//            Log.i("rae", "正在执行任务：[" + blogInfo.getBlogType() + "] --> " + mBlogId);
             Response<String> response = createBlogTask(type, mBlogId);
             String content = response.body();
             mDbBlog.updateBlogContent(mBlogId, blogInfo.getBlogType(), content);
-            Log.i("rae", "执行任务成功：[" + blogInfo.getBlogType() + "] --> " + mBlogId);
+//            Log.i("rae", "执行任务成功：[" + blogInfo.getBlogType() + "] --> " + mBlogId);
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/app/src/main/java/com/rae/cnblogs/widget/BloggerLayout.java b/app/src/main/java/com/rae/cnblogs/widget/BloggerLayout.java
@@ -132,7 +132,6 @@ public boolean dispatchTouchEvent(MotionEvent ev) {
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
-        Log.w("rae", "onInterceptTouchEvent");
         if (measureScrollPercent() < 1 && ev.getAction() == MotionEvent.ACTION_MOVE) {
             return true;
         }
diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -4,17 +4,17 @@ android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
 
-    defaultPublishConfig "debug"
-
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         testApplicationId "com.rae.cnblogs.sdk.test"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        buildConfigField "boolean", "LOG_DEBUG", "true"
     }
     buildTypes {
         release {
             minifyEnabled false
+            buildConfigField "boolean", "LOG_DEBUG", "false"
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/sdk/src/androidTest/java/rae/com/cnblogs/sdk/BaseTest.java b/sdk/src/androidTest/java/rae/com/cnblogs/sdk/BaseTest.java
@@ -47,10 +47,6 @@ protected void autoLogin() {
         cookieManager.setCookie(url, ".CNBlogsCookie=0922AD7D418324B66C0A8A363EB224DA99247FA6A4C6CC60BC6FAB2487D35CE07224CA0CFC44A98B4691A9474AFB12559B3A8B881EABBCF76F9C3BE44295739B4F38D9F382ECE1B8FD2217CF4D731C81977DD9B0; domain=.cnblogs.com; expires=Fri, 07-Jul-2017 11:01:57 GMT; path=/; HttpOnly");
         cookieManager.setCookie(url, ".Cnblogs.AspNetCore.Cookies=CfDJ8PhlBN8IFxtHhqIV3s0LCDlIlVzo-JtdoAJZpM5efI0M21VjySKRmE_LqL1kpnDotIQHtbrxOzGSkWWDRHathr9hmjPlV7M-FwiXaUJbXp9UU2jTEk3iMLmCL3gzIHHbKQ24nFj3SxD4JyIPfjuGnTo8ZzPJoLACtNEat1UDOQet8M3rdkMogzJNxtnr8ZhsikiMisKIdb1YzZ3jNX2lw2KD9GQxG2oFDtsIv-w0Y5JlJCZ_2G2Y9YRS1OcI5OKhN_RNLmY3c8aVe9Q0ajrmGLqmDBP4HaQk_u3r5Uk-SQpWvddw262cAo9l85rlQ8b1Aw; domain=.cnblogs.com; expires=Fri, 07-Jul-2017 11:01:57 GMT; path=/; HttpOnly");
         cookieManager.flush();
-
-        String cookie = cookieManager.getCookie(url);
-
-        Log.i("rae", cookie == null ? "empty" : cookie);
     }
 
     protected CnblogsApiProvider getApiProvider() {
diff --git a/sdk/src/main/java/com/rae/cnblogs/sdk/CnblogsApiProvider.java b/sdk/src/main/java/com/rae/cnblogs/sdk/CnblogsApiProvider.java
@@ -34,7 +34,7 @@ protected CnblogsApiProvider(Context context) {
         mContext = context;
         OkHttpExtBuilder builder = new OkHttpExtBuilder();
 
-        if (BuildConfig.DEBUG) {
+        if (BuildConfig.LOG_DEBUG) {
             builder.debug("CNBLOGS-API");
         }
 
diff --git a/sdk/src/main/java/com/rae/cnblogs/sdk/db/DbCnblogs.java b/sdk/src/main/java/com/rae/cnblogs/sdk/db/DbCnblogs.java
@@ -4,6 +4,7 @@
 
 import com.activeandroid.ActiveAndroid;
 import com.activeandroid.Configuration;
+import com.rae.cnblogs.sdk.BuildConfig;
 import com.rae.cnblogs.sdk.bean.AdvertBean;
 import com.rae.cnblogs.sdk.bean.BlogBean;
 import com.rae.cnblogs.sdk.bean.CategoryBean;
@@ -29,7 +30,7 @@ public static void init(Context applicationContext) {
                 .addModelClass(AdvertBean.class)
                 .addModelClass(BlogBean.class)
                 .create();
-        ActiveAndroid.initialize(config, true);
+        ActiveAndroid.initialize(config, BuildConfig.LOG_DEBUG);
     }
 
     protected void executeTransaction(Runnable runnable) {

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ public static void onAppOpenEvent(Context context) {`
`29`	`29`
`30`	`30`	`public static void onCategoryEvent(Context context, String category) {`
`31`	`31`	`MobclickAgent.onEvent(context, "APP_CATEGORY", category);`
`32`		`- Log.i("Rae", "统计分类：" + category);`
`33`	`32`	`}`
`34`	`33`
`35`	`34`	`private static void onAdEvent(Context context, Map<String, String> map) {`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,6 @@ public void onActionMenuMoreClick() {`
`137`	`137`	`// 查看评论`
`138`	`138`	`@OnClick(R.id.layout_content_comment)`
`139`	`139`	`public void onCommentClick() {`
`140`		`- Log.i("rae", "点击评论");`
`141`	`140`	`mCommentLayout.toggleSmoothScroll();`
`142`	`141`	`}`
`143`	`142`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,6 @@ protected void onResume() {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`private void start() {`
`133`		`- Log.i("Rae", "开始假装数量");`
`134`	`133`	`mPage = 1;`
`135`	`134`	`loadData();`
`136`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ public void onEdgeTouch(int edgeFlag) {`
`48`	`48`
`49`	`49`	`@Override`
`50`	`50`	`public void onScrollOverThreshold() {`
`51`		`- Log.w("rae", "onScrollOverThreshold");`
`52`	`51`	`}`
`53`	`52`	`});`
`54`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void bindViewHolder(FlexibleAdapter flexibleAdapter, CategoriesViewHolder`
`53`	`53`	`holder.setTitle(mCategory.getName());`
`54`	`54`	`holder.setBackgroundResource(isDraggable() ? R.drawable.bg_category : R.drawable.bg_category_lock);`
`55`	`55`	`holder.setTitleColor(isDraggable() ? R.color.ph2 : R.color.ph3); // 拖动颜色`
`56`		`- Log.i("rae", "bindViewHolder --> " + i);`
	`56`	`+// Log.i("rae", "bindViewHolder --> " + i);`
`57`	`57`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,6 @@ public boolean dispatchTouchEvent(MotionEvent ev) {`
`132`	`132`
`133`	`133`	`@Override`
`134`	`134`	`public boolean onInterceptTouchEvent(MotionEvent ev) {`
`135`		`- Log.w("rae", "onInterceptTouchEvent");`
`136`	`135`	`if (measureScrollPercent() < 1 && ev.getAction() == MotionEvent.ACTION_MOVE) {`
`137`	`136`	`return true;`
`138`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,17 +4,17 @@ android {`
`4`	`4`	`compileSdkVersion rootProject.ext.compileSdkVersion`
`5`	`5`	`buildToolsVersion rootProject.ext.buildToolsVersion`
`6`	`6`
`7`		`- defaultPublishConfig "debug"`
`8`		`-`
`9`	`7`	`defaultConfig {`
`10`	`8`	`minSdkVersion rootProject.ext.minSdkVersion`
`11`	`9`	`targetSdkVersion rootProject.ext.targetSdkVersion`
`12`	`10`	`testApplicationId "com.rae.cnblogs.sdk.test"`
`13`	`11`	`testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"`
	`12`	`+ buildConfigField "boolean", "LOG_DEBUG", "true"`
`14`	`13`	`}`
`15`	`14`	`buildTypes {`
`16`	`15`	`release {`
`17`	`16`	`minifyEnabled false`
	`17`	`+ buildConfigField "boolean", "LOG_DEBUG", "false"`
`18`	`18`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ protected CnblogsApiProvider(Context context) {`
`34`	`34`	`mContext = context;`
`35`	`35`	`OkHttpExtBuilder builder = new OkHttpExtBuilder();`
`36`	`36`
`37`		`- if (BuildConfig.DEBUG) {`
	`37`	`+ if (BuildConfig.LOG_DEBUG) {`
`38`	`38`	`builder.debug("CNBLOGS-API");`
`39`	`39`	`}`
`40`	`40`