Skip to content

Commit 61fe792

Browse files
brian512brian512
committed
adjust packages
1 parent 2a8d283 commit 61fe792

File tree

81 files changed

+178
-316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+178
-316
lines changed

‎app/build.gradle‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ android {
4343
// 打测试包
4444
debug{
4545
// 显示Log
46-
buildConfigField "boolean", "LOG_DEBUG", "true"
46+
buildConfigField "boolean", "DEBUG_ENABLE", "true"
4747
// versionNameSuffix "-debug"
4848
minifyEnabled false
4949
zipAlignEnabled false
@@ -54,7 +54,7 @@ android {
5454
// 打正式包
5555
release {
5656
// 不显示Log
57-
buildConfigField "boolean", "LOG_DEBUG", "false"
57+
buildConfigField "boolean", "DEBUG_ENABLE", "false"
5858
// 启用混淆
5959
minifyEnabled false
6060
// Zipalign优化
@@ -109,6 +109,10 @@ android {
109109

110110
// 配置渠道包
111111
productFlavors {
112+
MAIN {
113+
manifestPlaceholders = [UMENG_CHANNEL_VALUE: "MAIN"]
114+
}
115+
112116
WANDOUJIA {
113117
manifestPlaceholders = [UMENG_CHANNEL_VALUE: "WANDOUJIA"]
114118
}

‎app/src/main/java/com/brian/codeblog/App.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import android.content.Context;
66
import android.os.StrictMode;
77

8-
import com.brian.codeblog.util.AppInfoUtil;
9-
import com.brian.codeblog.util.ConfigHelper;
10-
import com.brian.codeblog.util.LogUtil;
8+
import com.brian.common.utils.AppInfoUtil;
9+
import com.brian.codeblog.manager.ConfigHelper;
10+
import com.brian.common.utils.LogUtil;
1111
import com.tencent.bugly.crashreport.CrashReport;
1212
import com.umeng.analytics.MobclickAgent;
1313

@@ -29,8 +29,8 @@ public void onCreate() {
2929
super.onCreate();
3030
if (PROCESS_NAME_MAIN.equals(AppInfoUtil.getProcessName(this))) {
3131
ConfigHelper.init(this);
32-
LogUtil.w("Config.isDebug=" + Config.isDebug);
33-
setStrictModeEnable(Config.isDebug);
32+
LogUtil.w("Config.DEBUG_ENABLE=" + Config.DEBUG_ENABLE);
33+
setStrictModeEnable(Config.DEBUG_ENABLE);
3434
}
3535
handleCrash();
3636
}

‎app/src/main/java/com/brian/codeblog/Config.java‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,12 @@
66
import com.brian.codeblog.manager.Constants;
77
import com.umeng.onlineconfig.OnlineConfigAgent;
88

9-
import java.util.concurrent.TimeUnit;
10-
119
public class Config {
1210

1311
/**
1412
* 正式版本打包时自动更改为false
1513
*/
16-
public static boolean isDebug = true;
17-
18-
public static final boolean DEBUG_BUGTAGS_ENABLE = isDebug;
19-
20-
public static final boolean DEBUG_LEAKCANARY_ENABLE = false;
21-
22-
public static final boolean isDebug_AD = false;
23-
24-
public static boolean isDebug_AD_ROBOT = true;
25-
26-
public static final long INTERVAL_REFRESH = TimeUnit.MINUTES.toMillis(30);// 刷新间隔为30分钟
27-
14+
public static boolean DEBUG_ENABLE = true;
2815

2916
private static final String KEY_TULING = "api_key_tuling";
3017
private static final String KEY_XIAODOUBI = "api_key_xiaodoubi";
@@ -34,10 +21,6 @@ public class Config {
3421

3522
private static final String KEY_URL_SHARE_APP = "url_share_app";
3623

37-
private static final String KEY_AD_BANNER = "key_ad_banner";
38-
private static final String KEY_AD_SPLASH = "key_ad_splash";
39-
40-
private static final String KEY_BLOG_LIST = "key_blog_list";
4124
private static final String KEY_CHAT = "key_chat";
4225
private static final String KEY_CHAT_WELCOME = "key_chat_welcome";
4326
private static final String KEY_CHAT_UNKNOW = "key_chat_unknow";
@@ -59,14 +42,6 @@ public static String getTencentAppKey() {
5942
return getConfigParams(KEY_TENCENT_APPKEY);
6043
}
6144

62-
public static String getAdBannerKey() {
63-
return getConfigParams(KEY_AD_BANNER);
64-
}
65-
66-
public static String getAdSplashKey() {
67-
return getConfigParams(KEY_AD_SPLASH);
68-
}
69-
7045
public static String getShareAppUrl() {
7146
String url = getConfigParams(KEY_URL_SHARE_APP);
7247
url = TextUtils.isEmpty(url) ? Constants.SHARE_YINGYONGBAO : url;
@@ -85,10 +60,6 @@ public static String getChatJson() {
8560
return getConfigParams(KEY_CHAT);
8661
}
8762

88-
public static String getBlogListJson() {
89-
return getConfigParams(KEY_BLOG_LIST);
90-
}
91-
9263
private static String getConfigParams(String key) {
9364
return OnlineConfigAgent.getInstance().getConfigParams(Env.getContext(), key);
9465
}

‎app/src/main/java/com/brian/codeblog/activity/AboutActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import com.brian.codeblog.manager.ShareManager;
1616
import com.brian.codeblog.manager.UsageStatsManager;
17-
import com.brian.codeblog.util.AppInfoUtil;
17+
import com.brian.common.utils.AppInfoUtil;
1818
import com.brian.common.view.TitleBar;
1919
import com.brian.csdnblog.R;
2020

‎app/src/main/java/com/brian/codeblog/activity/BaseActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import android.view.Window;
1010
import android.view.WindowManager;
1111

12-
import com.brian.codeblog.util.LogUtil;
13-
import com.brian.codeblog.util.ResourceUtil;
12+
import com.brian.common.utils.LogUtil;
13+
import com.brian.common.utils.ResourceUtil;
1414
import com.brian.csdnblog.R;
1515
import com.umeng.analytics.MobclickAgent;
1616

‎app/src/main/java/com/brian/codeblog/activity/BlogContentActivity.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
import com.brian.codeblog.manager.AdHelper;
3131
import com.brian.codeblog.manager.BlogManager;
3232
import com.brian.codeblog.manager.BlogerManager;
33-
import com.brian.codeblog.manager.DataManager;
33+
import com.brian.codeblog.datacenter.DataManager;
3434
import com.brian.codeblog.manager.ShareManager;
35-
import com.brian.codeblog.manager.ThreadManager;
35+
import com.brian.common.tools.ThreadManager;
3636
import com.brian.codeblog.manager.TypeManager;
3737
import com.brian.codeblog.manager.UsageStatsManager;
3838
import com.brian.codeblog.model.BlogInfo;
@@ -42,10 +42,10 @@
4242
import com.brian.codeblog.parser.IBlogHtmlParser;
4343
import com.brian.codeblog.proctocol.HttpGetBlogContentRequest;
4444
import com.brian.codeblog.proctocol.base.IResponseCallback;
45-
import com.brian.codeblog.util.FileUtil;
46-
import com.brian.codeblog.util.LogUtil;
47-
import com.brian.codeblog.util.NetStatusUtil;
48-
import com.brian.codeblog.util.ToastUtil;
45+
import com.brian.common.utils.FileUtil;
46+
import com.brian.common.utils.LogUtil;
47+
import com.brian.common.utils.NetStatusUtil;
48+
import com.brian.common.utils.ToastUtil;
4949
import com.brian.common.view.TitleBar;
5050
import com.brian.csdnblog.R;
5151
import com.tencent.connect.share.QQShare;

‎app/src/main/java/com/brian/codeblog/activity/BlogListFrag.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import com.brian.codeblog.datacenter.preference.SettingPreference;
2626
import com.brian.codeblog.manager.AdHelper;
2727
import com.brian.codeblog.manager.BlogManager;
28-
import com.brian.codeblog.manager.ThreadManager;
28+
import com.brian.common.tools.ThreadManager;
2929
import com.brian.codeblog.manager.TypeManager;
3030
import com.brian.codeblog.manager.UsageStatsManager;
3131
import com.brian.codeblog.model.BlogInfo;
@@ -35,10 +35,10 @@
3535
import com.brian.codeblog.parser.IBlogHtmlParser;
3636
import com.brian.codeblog.proctocol.HttpGetBlogListRequest;
3737
import com.brian.codeblog.proctocol.base.IResponseCallback;
38-
import com.brian.codeblog.util.CommonAdapter;
39-
import com.brian.codeblog.util.FileUtil;
40-
import com.brian.codeblog.util.LogUtil;
41-
import com.brian.codeblog.util.ResourceUtil;
38+
import com.brian.common.tools.CommonAdapter;
39+
import com.brian.common.utils.FileUtil;
40+
import com.brian.common.utils.LogUtil;
41+
import com.brian.common.utils.ResourceUtil;
4242
import com.brian.common.view.RefreshLayout;
4343
import com.brian.csdnblog.R;
4444
import com.google.gson.Gson;
@@ -55,8 +55,6 @@
5555
import tj.zl.op.normal.banner.BannerManager;
5656
import tj.zl.op.normal.banner.BannerViewListener;
5757

58-
import static com.brian.csdnblog.R.id.msg;
59-
6058
/**
6159
* Fragment页面
6260
*/
@@ -478,7 +476,7 @@ public void onEventMainThread(TypeChangeEvent event) {
478476
}
479477

480478
private void startRefresh() {
481-
if (mRefreshable && (checkUpdateTime()||Config.isDebug)) {
479+
if (mRefreshable && (checkUpdateTime()||Config.DEBUG_ENABLE)) {
482480
mRefreshLayout.setRefreshing(true);
483481
loadData(true);
484482
}

‎app/src/main/java/com/brian/codeblog/activity/ChatActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
import android.view.View.OnClickListener;
1010
import android.widget.ListView;
1111

12-
import com.brian.codeblog.adapter.ChatListAdapter;
13-
import com.brian.codeblog.manager.ThreadManager;
12+
import com.brian.codeblog.activity.adapter.ChatListAdapter;
13+
import com.brian.common.tools.ThreadManager;
1414
import com.brian.codeblog.manager.UsageStatsManager;
1515
import com.brian.codeblog.model.ChatMsgInfo;
1616
import com.brian.codeblog.robot.ChatRobot;
1717
import com.brian.codeblog.robot.ChatRobot.OnReplyListener;
18-
import com.brian.codeblog.util.DeviceUtil;
18+
import com.brian.common.utils.DeviceUtil;
1919
import com.brian.common.view.ChatToolLayout;
2020
import com.brian.common.view.TitleBar;
2121
import com.brian.csdnblog.R;

‎app/src/main/java/com/brian/codeblog/activity/MainTabActivity.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
import android.widget.ImageView;
1212

1313
import com.brian.codeblog.Config;
14-
import com.brian.codeblog.adapter.MainTabAdapter;
14+
import com.brian.codeblog.activity.adapter.MainTabAdapter;
1515
import com.brian.codeblog.datacenter.preference.CommonPreference;
1616
import com.brian.codeblog.datacenter.preference.SettingPreference;
1717
import com.brian.codeblog.manager.PushManager;
1818
import com.brian.codeblog.manager.ShareManager;
19-
import com.brian.codeblog.manager.UpdateManager;
19+
import com.brian.codeblog.update.UpdateManager;
2020
import com.brian.codeblog.manager.UsageStatsManager;
21-
import com.brian.codeblog.util.LogUtil;
22-
import com.brian.codeblog.util.TimeUtil;
23-
import com.brian.codeblog.util.ToastUtil;
21+
import com.brian.common.utils.LogUtil;
22+
import com.brian.common.utils.TimeUtil;
23+
import com.brian.common.utils.ToastUtil;
2424
import com.brian.common.view.DrawerArrowDrawable;
2525
import com.brian.csdnblog.R;
2626
import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu;
@@ -259,7 +259,7 @@ protected void onNewIntent(Intent intent) {
259259
}
260260

261261
private void initOnlineParams() {
262-
OnlineConfigAgent.getInstance().setDebugMode(Config.isDebug);
262+
OnlineConfigAgent.getInstance().setDebugMode(Config.DEBUG_ENABLE);
263263
OnlineConfigAgent.getInstance().updateOnlineConfig(this);
264264

265265
OnlineConfigAgent.getInstance().setOnlineConfigListener(new UmengOnlineConfigureListener() {

‎app/src/main/java/com/brian/codeblog/activity/SearchActivity.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
import com.brian.codeblog.parser.CSDNHtmlParser;
2828
import com.brian.codeblog.proctocol.HttpGetSearchBlogRequest;
2929
import com.brian.codeblog.proctocol.base.IResponseCallback;
30-
import com.brian.codeblog.util.CommonAdapter;
31-
import com.brian.codeblog.util.LogUtil;
32-
import com.brian.codeblog.util.ResourceUtil;
33-
import com.brian.codeblog.util.ToastUtil;
34-
import com.brian.codeblog.util.UIUtil;
30+
import com.brian.common.tools.CommonAdapter;
31+
import com.brian.common.utils.LogUtil;
32+
import com.brian.common.utils.ResourceUtil;
33+
import com.brian.common.utils.ToastUtil;
34+
import com.brian.common.utils.UIUtil;
3535
import com.brian.common.view.RefreshLayout;
3636
import com.brian.common.view.TitleBar;
3737
import com.brian.csdnblog.R;

0 commit comments

Comments
 (0)