add search history

Author: brian512

app/src/main/java/com/brian/codeblog/activity/SearchActivity.java

@@ -15,42 +15,54 @@
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.view.inputmethod.EditorInfo;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.brian.codeblog.Env;
+import com.brian.codeblog.datacenter.preference.SearchPreference;
 import com.brian.codeblog.manager.UsageStatsManager;
 import com.brian.codeblog.model.Bloger;
 import com.brian.codeblog.model.SearchResult;
 import com.brian.codeblog.parser.CSDNHtmlParser;
 import com.brian.codeblog.proctocol.HttpGetSearchBlogRequest;
 import com.brian.codeblog.proctocol.base.IResponseCallback;
 import com.brian.common.tools.CommonAdapter;
+import com.brian.common.tools.GsonHelper;
 import com.brian.common.utils.LogUtil;
 import com.brian.common.utils.ResourceUtil;
+import com.brian.common.utils.SDKUtil;
 import com.brian.common.utils.ToastUtil;
 import com.brian.common.utils.UIUtil;
 import com.brian.common.view.RefreshLayout;
 import com.brian.common.view.TitleBar;
 import com.brian.csdnblog.R;
 
+import java.util.List;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class SearchActivity extends BaseActivity {
  private static final String TAG = SearchActivity.class.getSimpleName();
 
+ private static final int MAX_HISTORY_COUNT = 8;
+
  @BindView(R.id.title_bar) TitleBar mTitleBar;
- @BindView(R.id.et_search) EditText mSearchInput = null;
- @BindView(R.id.bt_search) TextView mSearchBtn = null;
- @BindView(R.id.lv_result) ListView mResultListView = null;
+ @BindView(R.id.et_search) EditText mSearchInput;
+ @BindView(R.id.bt_search) Button mSearchBtn;
+ @BindView(R.id.lv_result) ListView mResultListView;
  @BindView(R.id.swipe_container) RefreshLayout mRefreshLayout;
- @BindView(R.id.progressbar) ProgressBar mProgressBar = null;
+ @BindView(R.id.progressbar) ProgressBar mProgressBar;
+ @BindView(R.id.search_history_ll) View mHistoryLy;
+ @BindView(R.id.search_history_lv) ListView mHistoryList;
+ @BindView(R.id.clear_history_btn) Button mClearHistoryBtn;
  private View mFooterLayout;
 
- private CommonAdapter<SearchResult> mAdapter = null;
+ private CommonAdapter<SearchResult> mSearchResultAdapter = null;
+ private CommonAdapter<String> mHistoryAdapter = null;
 
  private int mCurrentPage = 1;
  private String mInputText = "";
@@ -77,10 +89,27 @@ private void initUI() {
  mResultListView.addFooterView(mFooterLayout);
  mRefreshLayout.setChildView(mResultListView);
 
+ SDKUtil.showSoftInputOnfocus(mSearchInput, true);
+
  mTitleBar.setTitle("CSDN搜索");
  mTitleBar.setRightImageVisible(View.INVISIBLE);
 
- mAdapter = new CommonAdapter<SearchResult>(Env.getContext(), null, R.layout.item_list_search) {
+ mHistoryAdapter = new CommonAdapter<String>(Env.getContext(), getSearchHistory(), R.layout.item_search_history) {
+ @Override
+ public void convert(ViewHolder holder, final String item) {
+ holder.setText(R.id.contentTextView, item);
+ holder.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ mSearchInput.setText(item);
+ doSearch();
+ }
+ });
+ }
+ };
+ mHistoryList.setAdapter(mHistoryAdapter);
+
+ mSearchResultAdapter = new CommonAdapter<SearchResult>(Env.getContext(), null, R.layout.item_list_search) {
  private ForegroundColorSpan mColorSpanName = new ForegroundColorSpan(ResourceUtil.getColor(R.color.light_blue));
  @Override
  public void convert(ViewHolder holder, final SearchResult item) {
@@ -131,7 +160,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
  return view;
  }
  };
- mResultListView.setAdapter(mAdapter);
+ mResultListView.setAdapter(mSearchResultAdapter);
 
  mResultListView.setVisibility(View.INVISIBLE);
  }
@@ -148,18 +177,25 @@ public void onClick(View v) {
  @Override
  public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
  if (actionId == EditorInfo.IME_ACTION_SEARCH || (event!=null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
- onSendMsg();
+ doSearch();
  return true;
  }
  return false;
  }
  });
 
+ mSearchInput.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+ @Override
+ public void onFocusChange(View v, boolean hasFocus) {
+ mHistoryLy.setVisibility(hasFocus ? View.VISIBLE : View.GONE);
+ }
+ });
+
  mSearchBtn.setOnClickListener(new OnClickListener() {
 
  @Override
  public void onClick(View v) {
- onSendMsg();
+ doSearch();
  }
  });
 
@@ -171,9 +207,17 @@ public void onLoad() {
  }
  }
  });
+
+ mClearHistoryBtn.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ clearHistoryList();
+ mClearHistoryBtn.setVisibility(View.GONE);
+ }
+ });
  }
 
- private void onSendMsg() {
+ private void doSearch() {
  UIUtil.hideKeyboard(mSearchInput);
  mInputText = mSearchInput.getText().toString()
  .replaceAll(
@@ -184,6 +228,8 @@ private void onSendMsg() {
  String url = getSearchUrl(mInputText, 1);
  mCurrentPage = 1;
  loadListData(url);
+
+ addSearchHistory(mInputText);
  UsageStatsManager.sendUsageData(UsageStatsManager.USAGE_SEARCH, mInputText);
  } else {
  ToastUtil.showMsg("请输入适当关键字");
@@ -197,7 +243,7 @@ private String getSearchUrl(String keyWord, int page) {
  }
 
  private void loadListData(String loadUrl) {
- if (mAdapter.isEmpty()) {
+ if (mSearchResultAdapter.isEmpty()) {
  mProgressBar.setVisibility(View.VISIBLE);
  } else {
  mFooterLayout.setVisibility(View.VISIBLE);
@@ -209,20 +255,21 @@ private void loadListData(String loadUrl) {
  @Override
  public void onSuccess(HttpGetSearchBlogRequest.ResultData resultData) {
  mRefreshLayout.setLoading(false);
+ mHistoryLy.setVisibility(View.GONE);
 
  if (resultData.blogInfoList == null || resultData.blogInfoList.isEmpty()) {
- if (mAdapter.isEmpty()) {
+ if (mSearchResultAdapter.isEmpty()) {
  // 没有搜索到结果的提示
  UsageStatsManager.sendUsageData(UsageStatsManager.EXP_EMPTY_SEARCH, mInputText);
  }
  } else {
  if (mCurrentPage <= 1) {
- mAdapter.removeAllDatas();
+ mSearchResultAdapter.removeAllDatas();
  }
  mResultListView.setVisibility(View.VISIBLE);
  mProgressBar.setVisibility(View.INVISIBLE);
  mCurrentPage++;
- mAdapter.addDatas(resultData.blogInfoList);
+ mSearchResultAdapter.addDatas(resultData.blogInfoList);
  }
  }
 
@@ -237,4 +284,33 @@ public void onFailure(int errorCode, String msg) {
  }
  });
  }
+
+ private List<String> getSearchHistory() {
+ List historyList = new GsonHelper<String>().fromJson(SearchPreference.getInstance().getHistoryListJson());
+ if (historyList == null || historyList.size() <= 0) {
+ mClearHistoryBtn.setVisibility(View.GONE);
+ } else {
+ mClearHistoryBtn.setVisibility(View.VISIBLE);
+ }
+ return historyList;
+ }
+
+ private void addSearchHistory(String keyWord) {
+ if (mHistoryAdapter.containData(keyWord)) {
+ return;
+ }
+ if (mHistoryAdapter.getCount() >= MAX_HISTORY_COUNT) {
+ mHistoryAdapter.removeDataAt(mHistoryAdapter.getCount()-1);
+ }
+ mHistoryAdapter.addData(0, keyWord);
+ SearchPreference.getInstance().setHistoryListJson(new GsonHelper<String>().convert2String(mHistoryAdapter.getDatas()));
+ if (!mHistoryAdapter.isEmpty()) {
+ mClearHistoryBtn.setVisibility(View.VISIBLE);
+ }
+ }
+
+ private void clearHistoryList() {
+ mHistoryAdapter.removeAllDatas();
+ SearchPreference.getInstance().setHistoryListJson(new GsonHelper<String>().convert2String(mHistoryAdapter.getDatas()));
+ }
 }

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

@@ -2,7 +2,6 @@
 package com.brian.codeblog.activity;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
@@ -11,15 +10,16 @@
 import android.widget.TextView;
 
 import com.brian.codeblog.Env;
-import com.brian.codeblog.datacenter.preference.SettingPreference;
 import com.brian.codeblog.datacenter.DataManager;
+import com.brian.codeblog.datacenter.preference.SettingPreference;
 import com.brian.codeblog.manager.ShareManager;
-import com.brian.codeblog.update.UpdateManager;
 import com.brian.codeblog.manager.UsageStatsManager;
+import com.brian.codeblog.update.UpdateManager;
 import com.brian.common.tools.DayNightHelper;
 import com.brian.common.utils.FileUtil;
 import com.brian.common.utils.MarketUtils;
 import com.brian.common.utils.ToastUtil;
+import com.brian.common.view.CommonDialogFragment;
 import com.brian.common.view.TitleBar;
 import com.brian.csdnblog.R;
 import com.umeng.analytics.MobclickAgent;
@@ -179,27 +179,24 @@ public void onClick(View v) {
  }
 
  private void showAdConfirmDialog() {
- new AlertDialog.Builder(this).setTitle("真的不让作者赚这点广告费吗？T_T") 
- .setIcon(android.R.drawable.ic_dialog_info) 
- .setPositiveButton("残忍拒绝", new DialogInterface.OnClickListener() { 
- 
- @Override 
- public void onClick(DialogInterface dialog, int which) { 
- UsageStatsManager.sendUsageData(UsageStatsManager.SETTING_AD);
- boolean selected = mSwitchAdText.isSelected();
- selected = !selected;
- mSwitchAdText.setSelected(selected);
-
- // 保存preference
- SettingPreference.getInstance().setAdsEnable(selected);
- } 
- }) 
- .setNegativeButton("支持作者", new DialogInterface.OnClickListener() { 
- 
- @Override 
- public void onClick(DialogInterface dialog, int which) { 
- } 
- }).show(); 
+ CommonDialogFragment.create(getSupportFragmentManager())
+ .setNegativeBtnText("支持作者")
+ .setPositiveBtnText("残忍拒绝")
+ .setTitleText("关闭广告")
+ .setContentText("真的不让作者赚这点广告费吗？T_T")
+ .setPositiveBtnListener(new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ UsageStatsManager.sendUsageData(UsageStatsManager.SETTING_AD);
+ boolean selected = mSwitchAdText.isSelected();
+ selected = !selected;
+ mSwitchAdText.setSelected(selected);
+
+ // 保存preference
+ SettingPreference.getInstance().setAdsEnable(selected);
+ }
+ })
+ .show();
  }
 
  @Override

app/src/main/java/com/brian/codeblog/datacenter/DataManager.java

@@ -3,6 +3,7 @@
 
 import com.brian.codeblog.Env;
 import com.brian.codeblog.datacenter.dataupdate.V76;
+import com.brian.codeblog.datacenter.dataupdate.V80;
 import com.brian.codeblog.datacenter.preference.CommonPreference;
 import com.brian.common.utils.FileUtil;
 import com.brian.common.utils.LogUtil;
@@ -46,6 +47,8 @@ public void onVersionCodeUpgrade() {
  } else if (oldVersion <= 75) { // 防止跳过了这个版本，所以需要在往后的每个版本中进行如此的数据处理
  // 并且每次有数据更改都得增加else分支处理数据
  V76.updateData();
+ } else if (oldVersion <= 80) { // 将默认的preference拆分了，主要是将settingpreference独立出去了
+ V80.updateData();
  } else {
  // do nothing
  }

app/src/main/java/com/brian/codeblog/datacenter/dataupdate/V80.java

@@ -0,0 +1,27 @@
+package com.brian.codeblog.datacenter.dataupdate;
+
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+import com.brian.codeblog.Env;
+import com.brian.codeblog.datacenter.preference.SettingPreference;
+
+/**
+ * 将设置的preference独立出去
+ * Created by huamm on 2016/11/1 0001.
+ */
+public class V80 {
+
+ private static final String KEY_LOAD_IMAGE_WIFI = "setting_load_Img";
+ private static final String KEY_RUN_IN_BACK = "setting_run_in_back";
+ private static final String KEY_SHOW_ADS = "setting_show_ads";
+
+ public static void updateData() {
+ SharedPreferences preference = PreferenceManager.getDefaultSharedPreferences(Env.getContext());
+ SettingPreference settingPreference = SettingPreference.getInstance();
+
+ settingPreference.setAdsEnable(preference.getBoolean(KEY_SHOW_ADS, true));
+ settingPreference.setLoadImgOnlyInWifiEnable(preference.getBoolean(KEY_LOAD_IMAGE_WIFI, false));
+ settingPreference.setRunInBackEnable(preference.getBoolean(KEY_RUN_IN_BACK, true));
+ }
+}