temp commit

Author: brian512

app/src/main/java/com/brian/common/view/TitleBar.java

@@ -62,8 +62,6 @@ private void setStatusBarVisible(boolean visible) {
 
     /**
      * 左边按钮点击
-     * 
-     * @param l
      */
     public void setLeftListener(OnClickListener l) {
         mLeftBtn.setOnClickListener(l);
@@ -78,17 +76,13 @@ public void setLeftImageVisible(int visible) {
 
     /**
      * 设置左边按钮图标 默认是返回键
-     * 
-     * @param resourceID
      */
     public void setLeftImageResource(int resourceID) {
         mLeftBtn.setImageResource(resourceID);
     }
 
     /**
      * 右边按钮点击
-     * 
-     * @param l
      */
     public void setRightListener(OnClickListener l) {
         mRightBtn.setOnClickListener(l);
@@ -103,8 +97,6 @@ public void setRightImageVisible(int visible) {
 
     /**
      * 设置右边按钮图标 没有默认图标，需要自己设置
-     * 
-     * @param resourceID
      */
     public void setRightImageResource(int resourceID) {
         mRightBtn.setImageResource(resourceID);
@@ -119,17 +111,13 @@ public void setTitle(String title) {
 
     /**
      * 设置标题
-     * 
-     * @param resourceID
      */
     public void setTitleResource(int resourceID) {
         mTitleText.setText(resourceID);
     }
 
     /**
      * 设置title是否显示 默认显示title，没有文字
-     * 
-     * @param visible
      */
     public void setTitleVisible(int visible) {
         mTitleText.setVisibility(visible);
@@ -145,17 +133,13 @@ public void setTitleTextColor(int color) {
 
     /**
      * 获取右边按钮
-     * 
-     * @return
      */
     public ImageView getRightButton() {
         return mRightBtn;
     }
 
     /**
      * 获取左边按钮
-     * 
-     * @return
      */
     public ImageView getLeftButton() {
         return mLeftBtn;

app/src/main/java/com/brian/csdnblog/activity/BlogContentActivity.java

@@ -11,30 +11,34 @@
 import android.os.Message;
 import android.text.TextUtils;
 import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.PopupMenu;
 import android.widget.ProgressBar;
 
 import com.brian.common.view.TitleBar;
 import com.brian.csdnblog.Config;
 import com.brian.csdnblog.Env;
 import com.brian.csdnblog.R;
 import com.brian.csdnblog.datacenter.preference.SettingPreference;
+import com.brian.csdnblog.manager.BlogManager;
 import com.brian.csdnblog.manager.DataFetcher;
 import com.brian.csdnblog.manager.DataFetcher.OnFetchDataListener;
 import com.brian.csdnblog.manager.DataFetcher.Result;
 import com.brian.csdnblog.manager.DataManager;
-import com.brian.csdnblog.manager.BlogManager;
 import com.brian.csdnblog.manager.ShareManager;
 import com.brian.csdnblog.manager.ThreadManager;
 import com.brian.csdnblog.manager.TypeManager;
 import com.brian.csdnblog.manager.UsageStatsManager;
 import com.brian.csdnblog.model.BlogInfo;
+import com.brian.csdnblog.model.Bloger;
 import com.brian.csdnblog.model.SearchResult;
 import com.brian.csdnblog.parser.BlogHtmlParserFactory;
 import com.brian.csdnblog.parser.IBlogHtmlParser;
@@ -109,6 +113,7 @@ protected void onCreate(Bundle savedInstanceState) {
         ButterKnife.bind(this);
 
         initUI();// 初始化界面
+        initPopupMenu();
         initListener();
         initAd();
 
@@ -213,6 +218,47 @@ private void initUI() {
 //        webSettings.setLayoutAlgorithm(LayoutAlgorithm.SINGLE_COLUMN);//适应屏幕，内容将自动缩放
     }
 
+    PopupMenu popupMenu;
+    private void initPopupMenu() {
+        popupMenu = new PopupMenu(this, mTitleBar.getRightButton());
+        Menu menu = popupMenu.getMenu();
+        // 通过代码添加菜单项
+        menu.add(Menu.NONE, Menu.FIRST, 0, "分享");
+        menu.add(Menu.NONE, Menu.FIRST + 1, 1, "收藏");
+        menu.add(Menu.NONE, Menu.FIRST + 2, 2, "博主列表");
+
+        // 监听事件
+        popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                switch (item.getItemId()) {
+                    case Menu.FIRST + 0:
+                        onClickShare();
+                        break;
+                    case Menu.FIRST + 1:
+                        boolean hasFavoed = mBtnFavo.isSelected();
+                        BlogManager.getInstance().doFavo(mBlogInfo, !hasFavoed);
+                        mBtnFavo.setSelected(!hasFavoed);
+                        break;
+                    case Menu.FIRST + 2:
+                        if (!TextUtils.isEmpty(mBlogInfo.blogerID)) {
+                            LogUtil.log(mBlogInfo.blogerJson);
+                            Bloger bloger = Bloger.fromJson(mBlogInfo.blogerJson);
+                            if (bloger != null) {
+                                BlogerBlogListActivity.startActivity(BlogContentActivity.this, mBlogInfo.type, bloger);
+                                UsageStatsManager.sendUsageData(UsageStatsManager.USAGE_BLOGER_ENTR, "bloglist");
+                            }
+                        }
+                        break;
+                    default:
+                        break;
+                }
+                return false;
+            }
+        });
+    }
+
     private void initListener() {
         mTitleBar.setLeftListener(new OnClickListener() {
             @Override
@@ -224,7 +270,8 @@ public void onClick(View v) {
 
             @Override
             public void onClick(View v) {
-                onClickShare();
+//                onClickShare();
+                popupMenu.show();
             }
         });
         mReLoadImageView.setOnClickListener(new OnClickListener() {