From 6176c47e2f2fd7037b4e56c942db3ca3bd1b66bb Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Tue, 30 Jan 2018 19:45:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?= =?UTF-8?q?=EF=BC=8Cdebug=E7=8A=B6=E6=80=81=E5=85=B3=E9=97=AD=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8A=E6=8A=A5=EF=BC=8Crelease=E5=A2=9E=E5=8A=A0ti?= =?UTF-8?q?nker=E5=BC=80=E5=8F=91=E8=AE=BE=E5=A4=87=EF=BC=88channel?= =?UTF-8?q?=EF=BC=9AGH=5FTEST=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/debug/java/com/gh/gamecenter/DataUtils.java | 2 +- app/src/main/java/com/gh/gamecenter/NormalActivity.java | 1 + .../java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java | 3 +-- .../com/gh/gamecenter/subject/SubjectTileFragment.java | 7 +++++-- app/src/main/java/com/halo/assistant/HaloApp.java | 8 ++++++-- app/src/release/java/com/gh/gamecenter/DataUtils.java | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/src/debug/java/com/gh/gamecenter/DataUtils.java b/app/src/debug/java/com/gh/gamecenter/DataUtils.java index 345c0f02ea..ec467d7af4 100644 --- a/app/src/debug/java/com/gh/gamecenter/DataUtils.java +++ b/app/src/debug/java/com/gh/gamecenter/DataUtils.java @@ -35,7 +35,7 @@ public class DataUtils { public static void init(final Application context, String channel) { // 神烦这些SDK上报，debug就不开了 - if (!DEBUG) return; + if (DEBUG) return; //TalkingData try { diff --git a/app/src/main/java/com/gh/gamecenter/NormalActivity.java b/app/src/main/java/com/gh/gamecenter/NormalActivity.java index 539c5e157c..74c8b94efa 100644 --- a/app/src/main/java/com/gh/gamecenter/NormalActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NormalActivity.java @@ -143,6 +143,7 @@ public class NormalActivity extends BaseActivity implements ToolbarController, T @Override public void setToolbarMenu(@MenuRes int res) { + if (mNormalToolbar == null) return; mNormalToolbar.inflateMenu(res); mNormalToolbar.setOnMenuItemClickListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java index 478ddaa5c8..73418ade2a 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java @@ -24,7 +24,6 @@ import com.gh.gamecenter.entity.KaiFuServerEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.lightgame.download.DataWatcher; import com.lightgame.download.DownloadEntity; -import com.lightgame.utils.Utils; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -257,7 +256,7 @@ public class KaiFuVpFragment extends BaseFragment { @Override public void loadError() { super.loadError(); - Utils.toast(getContext(), getContext().getString(R.string.loading_failed_hint)); + toast(R.string.loading_failed_hint); mNoConn.setVisibility(View.VISIBLE); mNoneData.setVisibility(View.GONE); mLoading.setVisibility(View.GONE); diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectTileFragment.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectTileFragment.java index f9b9de7fbb..b79a063ffe 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectTileFragment.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectTileFragment.java @@ -21,6 +21,7 @@ import com.gh.common.util.StringUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.SubjectTypeAdapter; import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.normal.ToolbarController; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -123,9 +124,11 @@ public class SubjectTileFragment extends BaseFragment implements SubjectTypeAdap if (!TextUtils.isEmpty(mName)) { int totalScrollRange = appBarLayout.getTotalScrollRange(); if (Math.abs(verticalOffset) < totalScrollRange / 2) { - setNavigationTitle(mName); + if (getActivity() instanceof ToolbarController) + ((ToolbarController) getActivity()).setNavigationTitle(mName); } else if (Math.abs(verticalOffset) == totalScrollRange && totalScrollRange != 0) { - setNavigationTitle(StringUtils.buildString(mName, "-", mType, "↑")); + if (getActivity() instanceof ToolbarController) + ((ToolbarController) getActivity()).setNavigationTitle(StringUtils.buildString(mName, "-", mType, "↑")); } } } diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index a079be0af7..86fa791b8f 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -141,8 +141,12 @@ public class HaloApp extends TinkerAppLike { e.printStackTrace(); } - // 启用EventBus3.0加速功能 - EventBus.builder().addIndex(new EventBusIndex()).installDefaultEventBus(); + // 启用EventBus3.0加速功能 多次调用会报异常 + try { + EventBus.builder().addIndex(new EventBusIndex()).installDefaultEventBus(); + } catch (Exception e) { + e.printStackTrace(); + } } diff --git a/app/src/release/java/com/gh/gamecenter/DataUtils.java b/app/src/release/java/com/gh/gamecenter/DataUtils.java index d7ce6598ef..bc502668b2 100644 --- a/app/src/release/java/com/gh/gamecenter/DataUtils.java +++ b/app/src/release/java/com/gh/gamecenter/DataUtils.java @@ -81,7 +81,7 @@ public class DataUtils { // init bugly try { - CrashReport.setIsDevelopmentDevice(context, false); + CrashReport.setIsDevelopmentDevice(context, "GH_TEST".equals(channel)); CrashReport.UserStrategy strategy = new CrashReport.UserStrategy(context); strategy.setEnableANRCrashMonitor(false);