Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

首页+发现+我的光环 页面优化:http://gitlab.ghzhushou.com/pm/halo-app-issues/issues/175(全部完成)

Browse Source
This commit is contained in:
kehaoyuan
2018-03-13 15:01:01 +08:00
parent b3fe87b79a
commit 39aee1ce89
42 changed files with 55 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/gh/gamecenter/discover/DiscoverFragment.java
View File

@ -19,6 +19,7 @@ import com.gh.gamecenter.DownloadManagerActivity;
import com.gh.gamecenter.LibaoActivity;
import com.gh.gamecenter.NormalActivity;
import com.gh.gamecenter.R;
import com.gh.gamecenter.ToolBoxActivity;
import com.gh.gamecenter.db.GameTrendsDao;
import com.gh.gamecenter.db.info.GameTrendsInfo;
import com.gh.gamecenter.eventbus.EBReuse;
@ -60,6 +61,8 @@ public class DiscoverFragment extends BaseFragment {
RelativeLayout mDiscoverKuaichuan;
@BindView(R.id.discover_apk_cleaner)
RelativeLayout mDiscoverApkCleaner;
@BindView(R.id.discover_tools)
RelativeLayout mDiscoverTools;
@BindView(R.id.login_message_hint)
View mLoginMessageHint;
@BindView(R.id.discover_info_icon)
@ -97,7 +100,8 @@ public class DiscoverFragment extends BaseFragment {
}
}
@OnClick({R.id.discover_game_trends, R.id.discover_info, R.id.discover_libao, R.id.discover_kuaichuan, R.id.discover_apk_cleaner})
@OnClick({R.id.discover_game_trends, R.id.discover_info, R.id.discover_libao, R.id.discover_kuaichuan
, R.id.discover_apk_cleaner, R.id.discover_tools})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.discover_game_trends:
@ -136,6 +140,12 @@ public class DiscoverFragment extends BaseFragment {
DataCollectionUtils.uploadClick(getActivity(), "安装包清理", "发现");
startActivity(CleanApkActivity.getIntent(getContext()));
break;
case R.id.discover_tools:
DataUtils.onEvent(getActivity(), "发现", "工具箱");
DataCollectionUtils.uploadClick(getActivity(), "工具箱", "发现");
startActivity(ToolBoxActivity.getIntent(getContext(), "(发现:工具箱)"));
break;
}
}

13
app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java
View File

@ -26,7 +26,6 @@ import com.gh.common.constant.Config;
import com.gh.common.constant.ItemViewType;
import com.gh.common.util.ApkActiveUtils;
import com.gh.common.util.DataCollectionUtils;
import com.gh.gamecenter.DataUtils;
import com.gh.common.util.DisplayUtils;
import com.gh.common.util.DownloadItemUtils;
import com.gh.common.util.GameUtils;
@ -37,13 +36,13 @@ import com.gh.common.util.PlatformUtils;
import com.gh.common.util.RandomUtils;
import com.gh.common.util.StringUtils;
import com.gh.download.DownloadManager;
import com.gh.gamecenter.DataUtils;
import com.gh.gamecenter.GameDetailActivity;
import com.gh.gamecenter.KaiFuActivity;
import com.gh.gamecenter.MainActivity;
import com.gh.gamecenter.NewsDetailActivity;
import com.gh.gamecenter.R;
import com.gh.gamecenter.SubjectActivity;
import com.gh.gamecenter.ToolBoxActivity;
import com.gh.gamecenter.adapter.ImagePagerAdapter;
import com.gh.gamecenter.adapter.viewholder.FooterViewHolder;
import com.gh.gamecenter.adapter.viewholder.GameHeadViewHolder;
@ -719,10 +718,6 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
}
}
if (i == 3) {
ImageUtils.Companion.display(subjectIcon, R.drawable.home_entrance_tool);
subjectName.setText(R.string.toolkit);
}
if (i == 4) {
subjectName.setText(R.string.title_kaifu);
ImageUtils.Companion.display(subjectIcon, R.drawable.home_entrance_kaifu);
@ -732,17 +727,13 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
contentView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (finalI < 3 && !mIsSubjectDigestError && mSubjectDigestList.size() > finalI) {
if (finalI < 4 && !mIsSubjectDigestError && mSubjectDigestList.size() > finalI) {
SubjectDigestEntity entity = mSubjectDigestList.get(finalI);
SubjectActivity.startSubjectActivity(mContext, entity.getColumnId(), entity.getColumnName(), entity.getOrder()
, StringUtils.buildString("(游戏-专题:", entity.getName(), "[1-", String.valueOf(finalI + 1), "]", ")"));
DataCollectionUtils.uploadPosition(mContext, "游戏", String.valueOf(finalI + 1),
mSubjectDigestList.get(finalI).getName());
} else if (finalI == 3) {
mContext.startActivity(ToolBoxActivity.getIntent(mContext, "(游戏-专题:工具箱[1-5])"));
DataCollectionUtils.uploadPosition(mContext, "游戏", "5", "工具箱");
} else if (finalI == 4) {
Intent intent = KaiFuActivity.getIntent(mContext, "(游戏-专题:开服表[1-6])");
mContext.startActivity(intent);