diff --git a/app/src/main/java/com/gh/gamecenter/discover/DiscoverFragment.java b/app/src/main/java/com/gh/gamecenter/discover/DiscoverFragment.java index 80a5acc71e..90555a5bb8 100644 --- a/app/src/main/java/com/gh/gamecenter/discover/DiscoverFragment.java +++ b/app/src/main/java/com/gh/gamecenter/discover/DiscoverFragment.java @@ -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; } } diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java b/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java index 0ba36a1280..1ed6c60200 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java @@ -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 { } } - 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 { 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); diff --git a/app/src/main/res/drawable-hdpi/concern_select_true.png b/app/src/main/res/drawable-hdpi/concern_select_true.png index 705706b70b..f37324a668 100644 Binary files a/app/src/main/res/drawable-hdpi/concern_select_true.png and b/app/src/main/res/drawable-hdpi/concern_select_true.png differ diff --git a/app/src/main/res/drawable-hdpi/home_plug_upgrade.png b/app/src/main/res/drawable-hdpi/home_plug_upgrade.png index c85e4e43bd..3765392cc7 100644 Binary files a/app/src/main/res/drawable-hdpi/home_plug_upgrade.png and b/app/src/main/res/drawable-hdpi/home_plug_upgrade.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_like_select.png b/app/src/main/res/drawable-hdpi/ic_like_select.png index c4308f52a7..1e5e84383f 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_like_select.png and b/app/src/main/res/drawable-hdpi/ic_like_select.png differ diff --git a/app/src/main/res/drawable-hdpi/kc_checkbox_select.png b/app/src/main/res/drawable-hdpi/kc_checkbox_select.png index 9798c1c171..6fcfd71c55 100644 Binary files a/app/src/main/res/drawable-hdpi/kc_checkbox_select.png and b/app/src/main/res/drawable-hdpi/kc_checkbox_select.png differ diff --git a/app/src/main/res/drawable-hdpi/kc_send_over_icon.png b/app/src/main/res/drawable-hdpi/kc_send_over_icon.png index e7318bef40..8de720c613 100644 Binary files a/app/src/main/res/drawable-hdpi/kc_send_over_icon.png and b/app/src/main/res/drawable-hdpi/kc_send_over_icon.png differ diff --git a/app/src/main/res/drawable-hdpi/login_auto_dn.png b/app/src/main/res/drawable-hdpi/login_auto_dn.png index 0a44a6c7b0..765438e9c7 100644 Binary files a/app/src/main/res/drawable-hdpi/login_auto_dn.png and b/app/src/main/res/drawable-hdpi/login_auto_dn.png differ diff --git a/app/src/main/res/drawable-hdpi/login_auto_up.png b/app/src/main/res/drawable-hdpi/login_auto_up.png index 35cacaee56..fbd948749c 100644 Binary files a/app/src/main/res/drawable-hdpi/login_auto_up.png and b/app/src/main/res/drawable-hdpi/login_auto_up.png differ diff --git a/app/src/main/res/drawable-hdpi/message_vote_icon.png b/app/src/main/res/drawable-hdpi/message_vote_icon.png index b3294fbdc4..c8a27aa281 100644 Binary files a/app/src/main/res/drawable-hdpi/message_vote_icon.png and b/app/src/main/res/drawable-hdpi/message_vote_icon.png differ diff --git a/app/src/main/res/drawable-hdpi/personal_ask_icon.png b/app/src/main/res/drawable-hdpi/personal_ask_icon.png new file mode 100644 index 0000000000..bdcf4b31b7 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/personal_ask_icon.png differ diff --git a/app/src/main/res/drawable-hdpi/personal_collection_icon.png b/app/src/main/res/drawable-hdpi/personal_collection_icon.png index fb123a1963..d45c54213f 100644 Binary files a/app/src/main/res/drawable-hdpi/personal_collection_icon.png and b/app/src/main/res/drawable-hdpi/personal_collection_icon.png differ diff --git a/app/src/main/res/drawable-hdpi/personal_game_icon.png b/app/src/main/res/drawable-hdpi/personal_game_icon.png index 1c3fff9c1d..3b39ce91fc 100644 Binary files a/app/src/main/res/drawable-hdpi/personal_game_icon.png and b/app/src/main/res/drawable-hdpi/personal_game_icon.png differ diff --git a/app/src/main/res/drawable-hdpi/personal_libao_icon.png b/app/src/main/res/drawable-hdpi/personal_libao_icon.png index f271100f67..1da9e9d67c 100644 Binary files a/app/src/main/res/drawable-hdpi/personal_libao_icon.png and b/app/src/main/res/drawable-hdpi/personal_libao_icon.png differ diff --git a/app/src/main/res/drawable-hdpi/personal_message_icon.png b/app/src/main/res/drawable-hdpi/personal_message_icon.png index 59dd19d304..b7bcb7ea0e 100644 Binary files a/app/src/main/res/drawable-hdpi/personal_message_icon.png and b/app/src/main/res/drawable-hdpi/personal_message_icon.png differ diff --git a/app/src/main/res/drawable-hdpi/personal_setting_icon.png b/app/src/main/res/drawable-hdpi/personal_setting_icon.png index 9533d5d081..a391f89d79 100644 Binary files a/app/src/main/res/drawable-hdpi/personal_setting_icon.png and b/app/src/main/res/drawable-hdpi/personal_setting_icon.png differ diff --git a/app/src/main/res/drawable-hdpi/personal_share_icon.png b/app/src/main/res/drawable-hdpi/personal_share_icon.png index 60f5796239..a336e7d419 100644 Binary files a/app/src/main/res/drawable-hdpi/personal_share_icon.png and b/app/src/main/res/drawable-hdpi/personal_share_icon.png differ diff --git a/app/src/main/res/drawable-hdpi/personal_sign_icon.png b/app/src/main/res/drawable-hdpi/personal_sign_icon.png index 0e8fc9ac8e..02ecb55bb6 100644 Binary files a/app/src/main/res/drawable-hdpi/personal_sign_icon.png and b/app/src/main/res/drawable-hdpi/personal_sign_icon.png differ diff --git a/app/src/main/res/drawable-hdpi/personal_suggestion_icon.png b/app/src/main/res/drawable-hdpi/personal_suggestion_icon.png index b7fc28be8d..34e16d09df 100644 Binary files a/app/src/main/res/drawable-hdpi/personal_suggestion_icon.png and b/app/src/main/res/drawable-hdpi/personal_suggestion_icon.png differ diff --git a/app/src/main/res/drawable-hdpi/qq_login_icon.png b/app/src/main/res/drawable-hdpi/qq_login_icon.png index a458aa9440..f1c85ba229 100644 Binary files a/app/src/main/res/drawable-hdpi/qq_login_icon.png and b/app/src/main/res/drawable-hdpi/qq_login_icon.png differ diff --git a/app/src/main/res/drawable-hdpi/strategy_game_select.png b/app/src/main/res/drawable-hdpi/strategy_game_select.png index e1e0427deb..cc5807f035 100644 Binary files a/app/src/main/res/drawable-hdpi/strategy_game_select.png and b/app/src/main/res/drawable-hdpi/strategy_game_select.png differ diff --git a/app/src/main/res/drawable-hdpi/strategy_open.png b/app/src/main/res/drawable-hdpi/strategy_open.png index e66e0e5d3a..b54b3d0f46 100644 Binary files a/app/src/main/res/drawable-hdpi/strategy_open.png and b/app/src/main/res/drawable-hdpi/strategy_open.png differ diff --git a/app/src/main/res/drawable-hdpi/wechat_login_icon.png b/app/src/main/res/drawable-hdpi/wechat_login_icon.png index becef15867..d16633fda8 100644 Binary files a/app/src/main/res/drawable-hdpi/wechat_login_icon.png and b/app/src/main/res/drawable-hdpi/wechat_login_icon.png differ diff --git a/app/src/main/res/drawable-hdpi/weibo_login_icon.png b/app/src/main/res/drawable-hdpi/weibo_login_icon.png index a6a4c55e2b..b091d66c69 100644 Binary files a/app/src/main/res/drawable-hdpi/weibo_login_icon.png and b/app/src/main/res/drawable-hdpi/weibo_login_icon.png differ diff --git a/app/src/main/res/drawable-xhdpi/ask_tab_all_icon.png b/app/src/main/res/drawable-xhdpi/ask_tab_all_icon.png index 1e7e3bc5de..9f51e524f3 100644 Binary files a/app/src/main/res/drawable-xhdpi/ask_tab_all_icon.png and b/app/src/main/res/drawable-xhdpi/ask_tab_all_icon.png differ diff --git a/app/src/main/res/drawable-xhdpi/font_size_select.png b/app/src/main/res/drawable-xhdpi/font_size_select.png index 866af1a69f..db7baf8e63 100644 Binary files a/app/src/main/res/drawable-xhdpi/font_size_select.png and b/app/src/main/res/drawable-xhdpi/font_size_select.png differ diff --git a/app/src/main/res/drawable-xhdpi/message_kefu_icon.png b/app/src/main/res/drawable-xhdpi/message_kefu_icon.png index 1936944eed..cf68afac60 100644 Binary files a/app/src/main/res/drawable-xhdpi/message_kefu_icon.png and b/app/src/main/res/drawable-xhdpi/message_kefu_icon.png differ diff --git a/app/src/main/res/drawable-xxhdpi/answer_detail_unvote.png b/app/src/main/res/drawable-xxhdpi/answer_detail_unvote.png index b413038f0d..970c57a282 100644 Binary files a/app/src/main/res/drawable-xxhdpi/answer_detail_unvote.png and b/app/src/main/res/drawable-xxhdpi/answer_detail_unvote.png differ diff --git a/app/src/main/res/drawable-xxhdpi/answer_edit_questions_icon.png b/app/src/main/res/drawable-xxhdpi/answer_edit_questions_icon.png index 8ec13e435a..6e82ea6a94 100644 Binary files a/app/src/main/res/drawable-xxhdpi/answer_edit_questions_icon.png and b/app/src/main/res/drawable-xxhdpi/answer_edit_questions_icon.png differ diff --git a/app/src/main/res/drawable-xxhdpi/discover_apk_cleaner_icon.png b/app/src/main/res/drawable-xxhdpi/discover_apk_cleaner_icon.png index 2365bb7efa..d274c62233 100644 Binary files a/app/src/main/res/drawable-xxhdpi/discover_apk_cleaner_icon.png and b/app/src/main/res/drawable-xxhdpi/discover_apk_cleaner_icon.png differ diff --git a/app/src/main/res/drawable-xxhdpi/discover_game_trends_icon.png b/app/src/main/res/drawable-xxhdpi/discover_game_trends_icon.png index 980cceb800..ce264e06f5 100644 Binary files a/app/src/main/res/drawable-xxhdpi/discover_game_trends_icon.png and b/app/src/main/res/drawable-xxhdpi/discover_game_trends_icon.png differ diff --git a/app/src/main/res/drawable-xxhdpi/discover_info_icon.png b/app/src/main/res/drawable-xxhdpi/discover_info_icon.png index 787147a2e0..c69d41b475 100644 Binary files a/app/src/main/res/drawable-xxhdpi/discover_info_icon.png and b/app/src/main/res/drawable-xxhdpi/discover_info_icon.png differ diff --git a/app/src/main/res/drawable-xxhdpi/discover_kuaichuan_icon.png b/app/src/main/res/drawable-xxhdpi/discover_kuaichuan_icon.png index b7a5968914..46835d7b68 100644 Binary files a/app/src/main/res/drawable-xxhdpi/discover_kuaichuan_icon.png and b/app/src/main/res/drawable-xxhdpi/discover_kuaichuan_icon.png differ diff --git a/app/src/main/res/drawable-xxhdpi/discover_tools_icon.png b/app/src/main/res/drawable-xxhdpi/discover_tools_icon.png new file mode 100644 index 0000000000..ed2514eb0e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/discover_tools_icon.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_ask_select.png b/app/src/main/res/drawable-xxhdpi/ic_ask_select.png index dd8ebc986b..4eff948cc5 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_ask_select.png and b/app/src/main/res/drawable-xxhdpi/ic_ask_select.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_discover_select.png b/app/src/main/res/drawable-xxhdpi/ic_discover_select.png index 37e66a3ce4..7ea5459bde 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_discover_select.png and b/app/src/main/res/drawable-xxhdpi/ic_discover_select.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_game_select.png b/app/src/main/res/drawable-xxhdpi/ic_game_select.png index 1c5e7027f8..48c2bb674b 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_game_select.png and b/app/src/main/res/drawable-xxhdpi/ic_game_select.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_news_select.png b/app/src/main/res/drawable-xxhdpi/ic_news_select.png index e23115865e..35846f4566 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_news_select.png and b/app/src/main/res/drawable-xxhdpi/ic_news_select.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_user_select.png b/app/src/main/res/drawable-xxhdpi/ic_user_select.png index d5f87a4752..9c21a76240 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_user_select.png and b/app/src/main/res/drawable-xxhdpi/ic_user_select.png differ diff --git a/app/src/main/res/drawable-xxhdpi/personal_ask_icon.png b/app/src/main/res/drawable-xxhdpi/personal_ask_icon.png deleted file mode 100644 index 75392c2615..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/personal_ask_icon.png and /dev/null differ diff --git a/app/src/main/res/layout/fragment_discover.xml b/app/src/main/res/layout/fragment_discover.xml index d9db0cc661..0a080b69c2 100644 --- a/app/src/main/res/layout/fragment_discover.xml +++ b/app/src/main/res/layout/fragment_discover.xml @@ -204,6 +204,37 @@ + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_personal.xml b/app/src/main/res/layout/fragment_personal.xml index bd7cffaa1e..53c5698b4f 100644 --- a/app/src/main/res/layout/fragment_personal.xml +++ b/app/src/main/res/layout/fragment_personal.xml @@ -23,10 +23,10 @@ @@ -46,7 +46,7 @@ android:layout_height = "wrap_content" android:layout_below = "@+id/personal_user_icon" android:layout_centerHorizontal = "true" - android:layout_marginTop = "20dp" + android:layout_marginTop = "16dp" android:text = "@string/personal_default_username" android:textColor = "@android:color/black" android:textSize = "15sp" /> @@ -56,7 +56,7 @@ android:layout_width = "match_parent" android:layout_height = "wrap_content" android:background = "@android:color/white" - android:paddingTop = "28dp" > + android:paddingTop = "35dp" > + android:paddingBottom = "15dp" > @@ -99,7 +99,7 @@ android:background = "@drawable/reuse_listview_item_style" android:gravity = "center" android:orientation = "vertical" - android:paddingBottom = "18dp" > + android:paddingBottom = "15dp" > @@ -140,13 +140,12 @@ android:background = "@drawable/reuse_listview_item_style" android:gravity = "center" android:orientation = "vertical" - android:paddingBottom = "18dp" > + android:paddingBottom = "15dp" > -