fix log config

Author: brian512

app/build.gradle

@@ -110,23 +110,23 @@ android {
  // 配置渠道包
  productFlavors {
  WANDOUJIA {
- manifestPlaceholders = [UMENG_CHANNEL_VALUE: "WANDOUJIA", DEBUG_ENABLE: false]
+ manifestPlaceholders = [UMENG_CHANNEL_VALUE: "WANDOUJIA"]
  }
 
  BAIDU {
- manifestPlaceholders = [UMENG_CHANNEL_VALUE: "BAIDU", DEBUG_ENABLE: false]
+ manifestPlaceholders = [UMENG_CHANNEL_VALUE: "BAIDU"]
  }
 
  QIHU360 {
- manifestPlaceholders = [UMENG_CHANNEL_VALUE: "QIHU360", DEBUG_ENABLE: false]
+ manifestPlaceholders = [UMENG_CHANNEL_VALUE: "QIHU360"]
  }
 
  XIAOMI {
- manifestPlaceholders = [UMENG_CHANNEL_VALUE: "XIAOMI", DEBUG_ENABLE: false]
+ manifestPlaceholders = [UMENG_CHANNEL_VALUE: "XIAOMI"]
  }
 
  YINGYONGBAO {
- manifestPlaceholders = [UMENG_CHANNEL_VALUE: "YINGYONGBAO", DEBUG_ENABLE: false]
+ manifestPlaceholders = [UMENG_CHANNEL_VALUE: "YINGYONGBAO"]
  }
  }
 }

app/src/main/AndroidManifest.xml

@@ -35,8 +35,6 @@
  android:label="@string/app_name"
  android:theme="@style/AppTheme">
 
- <meta-data android:name="DEBUG_ENABLE" android:value="${DEBUG_ENABLE}" />
-
  <activity
  android:name="com.brian.csdnblog.activity.SplashActivity"
  android:theme="@style/AppBaseTheme"

app/src/main/java/com/brian/csdnblog/activity/BlogContentActivity.java

@@ -138,16 +138,21 @@ protected void onCreate(Bundle savedInstanceState) {
  mTitleBar.setTitle(mBlogInfo.title);
  mCurrentTitle = mBlogInfo.title;
 
- // 开始请求数据
- if (TypeManager.getWebType(mBlogInfo.type) == TypeManager.TYPE_WEB_JCC) {
- BlogManager.getInstance().fetchBlogContent(mCurrentUrl, "GB2312", this);
- } else {
- BlogManager.getInstance().fetchBlogContent(mCurrentUrl, this);
- }
-
  mProgressBar.setVisibility(View.VISIBLE);
- 
- BlogManager.getInstance().saveBlog(mBlogInfo);
+
+ getUIHandler().post(new Runnable() {
+ @Override
+ public void run() {
+ // 开始请求数据
+ if (TypeManager.getWebType(mBlogInfo.type) == TypeManager.TYPE_WEB_JCC) {
+ BlogManager.getInstance().fetchBlogContent(mCurrentUrl, "GB2312", BlogContentActivity.this);
+ } else {
+ BlogManager.getInstance().fetchBlogContent(mCurrentUrl, BlogContentActivity.this);
+ }
+
+ BlogManager.getInstance().saveBlog(mBlogInfo);
+ }
+ });
  }
 
  private void initBlogInfo() {
@@ -216,7 +221,7 @@ public void onSpotClicked(boolean isWebPage) {
  }
 
  private void toggleAdShow(boolean isShow) {
- if (isShow && SettingPreference.getInstance().getAdsEnable()) {
+ if (mAdView != null && isShow && SettingPreference.getInstance().getAdsEnable()) {
  RelativeLayout.LayoutParams layoutParams =
  new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
  ViewGroup.LayoutParams.WRAP_CONTENT);

app/src/main/java/com/brian/csdnblog/activity/SplashActivity.java

@@ -41,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) {
  super.onCreate(savedInstanceState);
  setContentView(R.layout.activity_splash);
  ButterKnife.bind(this);
- AdManager.getInstance(this).init(Constants.APPID, Constants.APPSECTET, true, true);
+ AdManager.getInstance(this).init(Constants.APPID, Constants.APPSECTET, Config.isDebug, Config.isDebug);
 
  // 打开调试模式
  MobclickAgent.setDebugMode(Config.isDebug);

app/src/main/java/com/brian/csdnblog/util/ConfigHelper.java

@@ -5,6 +5,7 @@
 import android.content.pm.PackageManager;
 import android.util.Log;
 
+import com.brian.csdnblog.BuildConfig;
 import com.brian.csdnblog.Config;
 
 /**
@@ -17,7 +18,7 @@ public static void init(Context context) {
  try {
  ApplicationInfo info = context.getPackageManager().getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);
  // 调试 (PS:默认为false)
-// Config.isDebug = info.metaData.getBoolean("DEBUG_ENABLE");
+ Config.isDebug = BuildConfig.LOG_DEBUG;
  Log.w("ConfigHelper", "Config.isDebug=" + Config.isDebug);
 
  AppInfoUtil.sChannelName = info.metaData.getString("UMENG_CHANNEL");