From 9ae9f307bc5febc2fa441ea3c0b291f7e8a33307 Mon Sep 17 00:00:00 2001 From: huangzhuanghua <401742778@qq.com> Date: Fri, 12 Aug 2016 10:16:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5actionbar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/game/GameFragment.java | 41 -------------- .../com/gh/gamecenter/news/NewsFragment.java | 44 --------------- .../drawable-hdpi/ic_actionbar_download.png | Bin 559 -> 3581 bytes .../ic_actionbar_notification.png | Bin 668 -> 3746 bytes .../main/res/drawable/actionbar_search_bg.xml | 2 +- app/src/main/res/layout/home_actionbar.xml | 50 ++++++------------ 6 files changed, 16 insertions(+), 121 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragment.java b/app/src/main/java/com/gh/gamecenter/game/GameFragment.java index 97e262baa1..ef7f8df79b 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragment.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragment.java @@ -3,7 +3,6 @@ package com.gh.gamecenter.game; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.graphics.Rect; import android.os.Build; import android.os.Bundle; import android.os.Handler; @@ -16,14 +15,12 @@ import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager.OnPageChangeListener; import android.text.TextUtils; import android.util.DisplayMetrics; -import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.LinearLayout.LayoutParams; -import android.widget.PopupWindow; import android.widget.RelativeLayout; import android.widget.TextView; @@ -36,7 +33,6 @@ import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SearchActivity; -import com.gh.gamecenter.SettingActivity; import com.gh.gamecenter.eventbus.EBRedDot; import com.gh.gamecenter.eventbus.EBTopState; import com.gh.gamecenter.eventbus.EBUISwitch; @@ -67,8 +63,6 @@ public class GameFragment extends Fragment implements OnClickListener, private TextView downloadHint; private TextView searchHint; - private PopupWindow popWindow; - private RelativeLayout.LayoutParams rparams; private String hint; @@ -214,8 +208,6 @@ public class GameFragment extends Fragment implements OnClickListener, view.findViewById(R.id.actionbar_notification).setOnClickListener(this); - view.findViewById(R.id.actionbar_overflow).setOnClickListener(this); - if (downloadSize != 0 || updateSize != 0) { EventBus.getDefault().post(new EBTopState("显示", null)); } @@ -301,19 +293,6 @@ public class GameFragment extends Fragment implements OnClickListener, searchIntent.putExtra("clicked", true); searchIntent.putExtra("hint", hint); startActivity(searchIntent); - } else if (id == R.id.actionbar_overflow) { - DataUtils.onEvent(getActivity(), "主页", "更多图标"); - - Map map = new HashMap(); - map.put("location", "更多图标"); - map.put("createOn", System.currentTimeMillis() / 1000); - map.put("page", "主页"); - DataCollectionManager.onEvent(getActivity(), "click-item", map); - - popUpOverflow(v); - } else if (id == R.id.menu_rl_set) { - popWindow.dismiss(); - startActivity(new Intent(getActivity(), SettingActivity.class)); } else if (id == R.id.jingpin_text) { viewPager.setCurrentItem(0); } else if (id == R.id.zuixin_text) { @@ -323,26 +302,6 @@ public class GameFragment extends Fragment implements OnClickListener, } } - private void popUpOverflow(View view) { - - Rect frame = new Rect(); - getActivity().getWindow().getDecorView().getWindowVisibleDisplayFrame(frame); - - int xOffset = DisplayUtils.dip2px(getActivity(), 5); - int yOffset = frame.top + DisplayUtils.dip2px(getActivity(), 48) + xOffset; - - View popView = View.inflate(getActivity(), R.layout.menu_popwindow, null); - popView.findViewById(R.id.menu_rl_set).setOnClickListener(this); - popWindow = new PopupWindow(popView, LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, true); - - popWindow.setOutsideTouchable(true); - popWindow.setAnimationStyle(android.R.style.Animation_Dialog); - popWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.shape)); - - popWindow.showAtLocation(view, Gravity.TOP | Gravity.RIGHT, xOffset, yOffset); - - } - @Override public void onPageSelected(int position) { if (position == 0) { diff --git a/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java b/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java index c003d275e3..e5073e1abe 100644 --- a/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java @@ -3,7 +3,6 @@ package com.gh.gamecenter.news; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.graphics.Rect; import android.os.Build; import android.os.Bundle; import android.os.Handler; @@ -15,12 +14,10 @@ import android.support.v4.app.FragmentTransaction; import android.support.v4.view.ViewPager; import android.text.TextUtils; import android.util.DisplayMetrics; -import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; -import android.widget.PopupWindow; import android.widget.RelativeLayout; import android.widget.TextView; @@ -33,7 +30,6 @@ import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SearchActivity; -import com.gh.gamecenter.SettingActivity; import com.gh.gamecenter.eventbus.EBRedDot; import com.gh.gamecenter.eventbus.EBTopState; import com.gh.gamecenter.eventbus.EBUISwitch; @@ -61,8 +57,6 @@ public class NewsFragment extends Fragment implements View.OnClickListener, View private TextView downloadHint; private TextView searchHint; - private PopupWindow popWindow; - private RelativeLayout.LayoutParams rparams; private String hint; @@ -222,8 +216,6 @@ public class NewsFragment extends Fragment implements View.OnClickListener, View view.findViewById(R.id.actionbar_notification).setOnClickListener(this); - view.findViewById(R.id.actionbar_overflow).setOnClickListener(this); - if (downloadSize != 0 || updateSize != 0) { EventBus.getDefault().post(new EBTopState("显示", null)); } @@ -310,19 +302,6 @@ public class NewsFragment extends Fragment implements View.OnClickListener, View searchIntent.putExtra("clicked", true); searchIntent.putExtra("hint", hint); startActivity(searchIntent); - } else if (id == R.id.actionbar_overflow) { - DataUtils.onEvent(getActivity(), "主页", "更多图标"); - - Map map = new HashMap(); - map.put("location", "更多图标"); - map.put("createOn", System.currentTimeMillis() / 1000); - map.put("page", "主页"); - DataCollectionManager.onEvent(getActivity(), "click-item", map); - - popUpOverflow(v); - } else if (id == R.id.menu_rl_set) { - popWindow.dismiss(); - startActivity(new Intent(getActivity(), SettingActivity.class)); } else if (id == R.id.zixun_text) { viewPager.setCurrentItem(0); } else if (id == R.id.yuanchuang_text) { @@ -334,28 +313,6 @@ public class NewsFragment extends Fragment implements View.OnClickListener, View } } - private void popUpOverflow(View view) { - - Rect frame = new Rect(); - getActivity().getWindow().getDecorView().getWindowVisibleDisplayFrame(frame); - - int xOffset = DisplayUtils.dip2px(getActivity(), 5); - int yOffset = frame.top + DisplayUtils.dip2px(getActivity(), 48) + xOffset; - - View popView = View.inflate(getActivity(), R.layout.menu_popwindow, null); - popView.findViewById(R.id.menu_rl_set).setOnClickListener(this); - popWindow = new PopupWindow(popView, LinearLayout.LayoutParams.WRAP_CONTENT, - LinearLayout.LayoutParams.WRAP_CONTENT, true); - - popWindow.setOutsideTouchable(true); - popWindow.setAnimationStyle(android.R.style.Animation_Dialog); - popWindow.setBackgroundDrawable(getResources().getDrawable( - R.drawable.shape)); - - popWindow.showAtLocation(view, Gravity.TOP | Gravity.RIGHT, xOffset, yOffset); - - } - @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { @@ -509,7 +466,6 @@ public class NewsFragment extends Fragment implements View.OnClickListener, View tvGuanzhu = null; downloadHint = null; searchHint = null; - popWindow = null; rparams = null; hint = null; handler = null; diff --git a/app/src/main/res/drawable-hdpi/ic_actionbar_download.png b/app/src/main/res/drawable-hdpi/ic_actionbar_download.png index 260300f74508621e3f020a5771f93f26f06c458c..b6ea3f99942541bd61500c6fa64986e450b84e18 100644 GIT binary patch literal 3581 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 M07*qoM6N<$g0Nr$jsO4v delta 658 zcmV;D0&V@G9h?OriBL{Q4GJ0x0000DNk~Le0000z0000z2nGNE03Kpt>5(B9e*hVD zMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0006hNklVp9611{kW8q^7HH>PMlIt8nOOy&>!qMOphvLOap=yee=q2W#}29B z*%(@ZU1hv@dROo_649#bqIqf6(D6sBA<`eiNu*vG}1GpBj>6XPATpQSCpXLZ|1Z;aa;RJ3B z>~bRO!0*Hf#op$RuK9Efe;t5*PJfRa-gdg4y&Ky^-ci*OXKxdw1kfoZv>M(NHz)}u zG=86|WQ(J2Ygh|n1!bWQ - + \ No newline at end of file diff --git a/app/src/main/res/layout/home_actionbar.xml b/app/src/main/res/layout/home_actionbar.xml index 21ef5be9be..d422c6d708 100644 --- a/app/src/main/res/layout/home_actionbar.xml +++ b/app/src/main/res/layout/home_actionbar.xml @@ -17,8 +17,8 @@ @@ -38,16 +38,26 @@ + + - - - - - - - - \ No newline at end of file