adjust setting item

Author: brian512

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

@@ -1,6 +1,8 @@
 package com.brian.csdnblog.activity;
 
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.FragmentTransaction;
@@ -59,12 +61,9 @@ public void onClick(View view) {
         mTitleBar.setRightListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (mType == TYPE_FAVO) {
-                    BlogManager.getInstance().clearByType(TYPE_FAVO);
-                } else if (mType == TYPE_HISTORY) {
-                    BlogManager.getInstance().clear();
+                if (!mListFrag.isListEmpty()) {
+                    showClearConfirmDialog();
                 }
-                mListFrag.clearList();
             }
         });
 
@@ -88,4 +87,25 @@ public void onClick(View v) {
         trans.add(R.id.list, mListFrag, null);
         trans.commit();
     }
+
+    private void showClearConfirmDialog() {
+        new AlertDialog.Builder(this).setTitle("确认清空列表数据吗？")
+                .setIcon(android.R.drawable.ic_dialog_info)
+                .setPositiveButton("Just Do IT!", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (mType == TYPE_FAVO) {
+                            BlogManager.getInstance().clearFavoList();
+                        } else if (mType == TYPE_HISTORY) {
+                            BlogManager.getInstance().clearHistoryList();
+                        }
+                        mListFrag.clearList();
+                    }
+                })
+                .setNegativeButton("不删，手抖了", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                    }
+                }).show();
+    }
 }

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

@@ -373,7 +373,11 @@ public void clearList() {
             mAdapter.removeAllDatas();
         }
     }
-    
+
+    public boolean isListEmpty() {
+        return mAdapter == null || mAdapter.isEmpty();
+    }
+
     @Override
     public void onStart() {
         super.onStart();

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

@@ -14,11 +14,12 @@
 import com.brian.csdnblog.Config;
 import com.brian.csdnblog.R;
 import com.brian.csdnblog.adapter.MainTabAdapter;
+import com.brian.csdnblog.datacenter.preference.CommonPreference;
+import com.brian.csdnblog.datacenter.preference.SettingPreference;
 import com.brian.csdnblog.manager.PushManager;
 import com.brian.csdnblog.manager.ShareManager;
+import com.brian.csdnblog.manager.UpdateManager;
 import com.brian.csdnblog.manager.UsageStatsManager;
-import com.brian.csdnblog.datacenter.preference.CommonPreference;
-import com.brian.csdnblog.datacenter.preference.SettingPreference;
 import com.brian.csdnblog.util.LogUtil;
 import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu;
 import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu.OnCloseListener;
@@ -29,7 +30,6 @@
 import com.umeng.onlineconfig.OnlineConfigAgent;
 import com.umeng.onlineconfig.OnlineConfigLog;
 import com.umeng.onlineconfig.UmengOnlineConfigureListener;
-import com.xiaomi.market.sdk.XiaomiUpdateAgent;
 
 import org.json.JSONObject;
 
@@ -60,9 +60,8 @@ public void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main_tab);
         ButterKnife.bind(this);
 
-        // 小米更新
-        XiaomiUpdateAgent.update(this, Config.isDebug);
-        XiaomiUpdateAgent.setCheckUpdateOnlyWifi(false);
+        // 初始化更新模块
+        UpdateManager.getInstance().initUpdate();
 
         MobclickAgent.enableEncrypt(true);
 

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

@@ -11,10 +11,12 @@
 import android.widget.TextView;
 
 import com.brian.common.view.TitleBar;
+import com.brian.csdnblog.Env;
 import com.brian.csdnblog.R;
+import com.brian.csdnblog.datacenter.preference.SettingPreference;
 import com.brian.csdnblog.manager.ShareManager;
+import com.brian.csdnblog.manager.UpdateManager;
 import com.brian.csdnblog.manager.UsageStatsManager;
-import com.brian.csdnblog.datacenter.preference.SettingPreference;
 import com.brian.csdnblog.util.MarketUtils;
 import com.umeng.analytics.MobclickAgent;
 
@@ -23,15 +25,14 @@
 
 public class SettingActivity extends BaseActivity {
 
-    private static final String TAG = SettingActivity.class.getSimpleName();
+    @BindView(R.id.title_bar)               TitleBar mTitleBar;
 
-    @BindView(R.id.title_bar) TitleBar mTitleBar;
-
-    @BindView(R.id.switch_show_ad_text) TextView mSwitchAdText;
-    @BindView(R.id.switch_vertical_text) TextView mSwitchVerticalText;
-    @BindView(R.id.switch_picinfwifi_text) TextView mSwitchPicWifiText;
-    @BindView(R.id.switch_staybg_text) TextView mSwitchStayBgText;
-    @BindView(R.id.market) TextView mMarketText;
+    @BindView(R.id.switch_show_ad_text)     TextView mSwitchAdText;
+    @BindView(R.id.switch_vertical_text)    TextView mSwitchVerticalText;
+    @BindView(R.id.switch_picinfwifi_text)  TextView mSwitchPicWifiText;
+    @BindView(R.id.switch_staybg_text)      TextView mSwitchStayBgText;
+    @BindView(R.id.market)                  TextView mMarketText;
+    @BindView(R.id.update)                  TextView mCheckUpdateText;
 
     public static void startActivity(Activity activity) {
         Intent intent = new Intent();
@@ -131,9 +132,18 @@ public void onClick(View v) {
         mMarketText.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
+                UsageStatsManager.sendUsageData(UsageStatsManager.SETTING_LIST, "market");
                 MarketUtils.launchAppDetail(getPackageName(), "");
             }
         });
+
+        mCheckUpdateText.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                UsageStatsManager.sendUsageData(UsageStatsManager.SETTING_LIST, "update");
+                UpdateManager.getInstance().checkUpdate(Env.getContext());
+            }
+        });
     }
 
     private void showAdConfirmDialog() {

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

@@ -2,7 +2,6 @@
 package com.brian.csdnblog.activity;
 
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
@@ -12,34 +11,26 @@
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.brian.common.view.CircleImageView;
-import com.brian.csdnblog.Env;
 import com.brian.csdnblog.R;
 import com.brian.csdnblog.manager.Constants;
 import com.brian.csdnblog.manager.TypeManager;
 import com.brian.csdnblog.manager.UsageStatsManager;
 import com.brian.csdnblog.util.LogUtil;
 import com.umeng.analytics.MobclickAgent;
-import com.xiaomi.market.sdk.UpdateResponse;
-import com.xiaomi.market.sdk.UpdateStatus;
-import com.xiaomi.market.sdk.XiaomiUpdateAgent;
-import com.xiaomi.market.sdk.XiaomiUpdateListener;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
 /**
- * 个人中心
+ * 侧边栏
  */
 public class SidePageFragment extends Fragment implements OnClickListener {
-    private static final String TAG = "CSNDBlog_PersonCenterFragment";
 
     @BindView(R.id.bloger)              View mBlogerLy; // 博主
     @BindView(R.id.bloger_head)         CircleImageView mBlogerHeadView; // 博主头像
     @BindView(R.id.bloger_name)         TextView mBlogerNameView; // 博主名
-    @BindView(R.id.checkUpdateView)     View mCheckUpdateLy; // 检查更新
     @BindView(R.id.select_article_type) View mSelectTypeLy; // 设置类型
     @BindView(R.id.blog_history)        View mHistoryLy;
     @BindView(R.id.blog_favo)           View mFavoLy;
@@ -48,11 +39,11 @@ public class SidePageFragment extends Fragment implements OnClickListener {
     @BindView(R.id.settings)            View mSettingsLy;
     @BindView(R.id.chat)                View viewChat;
     @BindView(R.id.tv_select_type)      TextView mSelectTypeView;
-    
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        LogUtil.i(TAG, "onActivityCreated");
+        LogUtil.i("onActivityCreated");
     }
 
     @Override
@@ -72,7 +63,6 @@ private void initUI() {
 
         mBlogerLy.setOnClickListener(this);
         mSelectTypeLy.setOnClickListener(this);
-        mCheckUpdateLy.setOnClickListener(this);
         mFavoLy.setOnClickListener(this);
         mNewsLy.setOnClickListener(this);
         mHistoryLy.setOnClickListener(this);
@@ -84,105 +74,72 @@ private void initUI() {
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-        case R.id.bloger: // 博主博文列表入口
-            UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "bloger");
-            BlogerBlogListActivity.startActivity(getActivity(), 256, "brian512");
-            break;
-        case R.id.aboutView: // 关于
-            UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "about");
-            AboutActivity.startActivity(getActivity());
-            break;
-        case R.id.settings: // 设置
-            UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "setting");
-            
-            SettingActivity.startActivity(getActivity());
-            break;
-        case R.id.chat: // 聊天
-            UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "chat");
-            
-            ChatActivity.startActivity(getActivity());
-            break;
-        case R.id.blog_favo: // 收藏的文章
-            UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "favo");
-            BlogListActivity.startActivity(getActivity(), BlogListActivity.TYPE_FAVO);
-            break;
-        case R.id.news: // 新闻
-            UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "news");
-            BlogListActivity.startActivity(getActivity(), BlogListActivity.TYPE_NEWS);
-            break;
-        case R.id.blog_history: // 查看过的文章
-            UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "history");
-            BlogListActivity.startActivity(getActivity(), BlogListActivity.TYPE_HISTORY);
-            break;
-        case R.id.checkUpdateView: // 检测更新
-            UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "update");
-            checkUpdate(Env.getContext());
-            break;
-        case R.id.select_article_type: // 设置文章类型
-            UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "articletype");
-            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-            builder.setTitle("选择文章类型");
-
-            // 设置一个下拉的列表选择项
-            builder.setItems(Constants.TYPES_WORD, new DialogInterface.OnClickListener() {
+            case R.id.bloger: // 博主博文列表入口
+                UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "bloger");
+                BlogerBlogListActivity.startActivity(getActivity(), 256, "brian512");
+                break;
+            case R.id.aboutView: // 关于
+                UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "about");
+                AboutActivity.startActivity(getActivity());
+                break;
+            case R.id.settings: // 设置
+                UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "setting");
+                SettingActivity.startActivity(getActivity());
+                break;
+            case R.id.chat: // 聊天
+                UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "chat");
+                ChatActivity.startActivity(getActivity());
+                break;
+            case R.id.blog_favo: // 收藏的文章
+                UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "favo");
+                BlogListActivity.startActivity(getActivity(), BlogListActivity.TYPE_FAVO);
+                break;
+            case R.id.news: // 新闻
+                UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "news");
+                BlogListActivity.startActivity(getActivity(), BlogListActivity.TYPE_NEWS);
+                break;
+            case R.id.blog_history: // 查看过的文章
+                UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "history");
+                BlogListActivity.startActivity(getActivity(), BlogListActivity.TYPE_HISTORY);
+                break;
+            case R.id.select_article_type: // 设置文章类型
+                UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "articletype");
+                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+                builder.setTitle("选择文章类型");
+
+                // 设置一个下拉的列表选择项
+                builder.setItems(Constants.TYPES_WORD, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                    	TypeManager.setCateType(which);
-                    	mSelectTypeView.setText(TypeManager.getCurrCateName());
+                        TypeManager.setCateType(which);
+                        mSelectTypeView.setText(TypeManager.getCurrCateName());
                     }
                 });
-            builder.show();
-            break;
-        default:
-            UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "unknow");
-            break;
+                builder.show();
+                break;
+            default:
+                UsageStatsManager.sendUsageData(UsageStatsManager.MENU_LIST, "unknow");
+                break;
         }
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        LogUtil.i(TAG, "onActivityResult");
+        LogUtil.i("onActivityResult");
     }
-    
-    private void checkUpdate(final Context context) {
-        XiaomiUpdateAgent.setUpdateAutoPopup(false);
-        XiaomiUpdateAgent.setUpdateListener(new XiaomiUpdateListener() {
-            @Override
-            public void onUpdateReturned(int updateStatus, UpdateResponse updateInfo) {
-                switch (updateStatus) {
-                case UpdateStatus.STATUS_UPDATE: // has update
-                    XiaomiUpdateAgent.arrange();
-                    break;
-                case UpdateStatus.STATUS_NO_UPDATE: // has no update
-                    Toast.makeText(context, "当前已是最新版本", Toast.LENGTH_SHORT).show();
-                    break;
-                case UpdateStatus.STATUS_NO_WIFI: // none wifi
-                    Toast.makeText(context, "没有wifi连接， 只在wifi下更新", Toast.LENGTH_SHORT).show();
-                    break;
-                case UpdateStatus.STATUS_NO_NET: // time out
-                case UpdateStatus.STATUS_FAILED: // time out
-                case UpdateStatus.STATUS_LOCAL_APP_FAILED: // time out
-                    Toast.makeText(context, "服务器访问超时", Toast.LENGTH_SHORT).show();
-                    break;
-                }
-            }
-        });
-        XiaomiUpdateAgent.update(context);
-    }
-    
 
     @Override
     public void onResume() {
         super.onResume();
-        LogUtil.i(TAG, "onResume");
+        LogUtil.i("onResume");
         MobclickAgent.onPageStart(this.getClass().getName()); //统计页面
     }
-    
+
     @Override
     public void onPause() {
         super.onPause();
-        LogUtil.i(TAG, "onPause");
+        LogUtil.i("onPause");
         MobclickAgent.onPageEnd(this.getClass().getName());
     }
 

app/src/main/java/com/brian/csdnblog/datacenter/database/BlogInfoTable.java

@@ -163,6 +163,18 @@ public boolean deleteBlogsByType(int type) {
         return delete(TABLE_NAME, selection, selectionArgs);
     }
 
+    public boolean deleteHistoryBlogs() {
+        String selection = FAVO + " = ? ";
+        String[] selectionArgs = new String[]{String.valueOf(0)};
+        return delete(TABLE_NAME, selection, selectionArgs);
+    }
+
+    public boolean deleteFavoBlogs() {
+        String selection = FAVO + " = ? ";
+        String[] selectionArgs = new String[]{String.valueOf(1)};
+        return delete(TABLE_NAME, selection, selectionArgs);
+    }
+
     /**
      * 清空当前记录
      */