k
/
FYReader
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
pull/5/head
fengyuecanzhu 3 years ago
parent 35d7b1287a
commit c44ef8991f
8 changed files with 1228 additions and 83 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      app/build.gradle
  2. 4
      app/src/main/assets/updatelog.fy
  3. 186
      app/src/main/java/xyz/fycz/myreader/ui/activity/SearchBookActivity.java
  4. 3
      app/src/main/java/xyz/fycz/myreader/ui/adapter/SearchHistoryAdapter.java
  5. 1042
      app/src/main/java/xyz/fycz/myreader/widget/TagGroup.java
  6. 3
      app/src/main/res/layout/activity_search_book.xml
  7. 67
      app/src/main/res/values/styles.xml
  8. 4
      app/version_code.properties

2
app/build.gradle
Unescape View File

@ -154,8 +154,6 @@ dependencies {
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.3'
implementation 'me.gujun.android.taggroup:library:1.4@aar'
implementation 'uk.co.chrisjenx:calligraphy:2.3.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

4
app/src/main/assets/updatelog.fy
Unescape View File

@ -1,3 +1,7 @@
风月读书v2.1.4
更新内容：
1、搜索新增关键词推荐补全
2021.06.15
风月读书v2.1.3
更新内容：

186
app/src/main/java/xyz/fycz/myreader/ui/activity/SearchBookActivity.java
Unescape View File

@ -1,14 +1,15 @@
package xyz.fycz.myreader.ui.activity;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.text.Editable;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.TextWatcher;
import android.text.style.ForegroundColorSpan;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
@ -34,6 +35,7 @@ import java.util.Map;
import io.reactivex.Single;
import io.reactivex.SingleOnSubscribe;
import io.reactivex.disposables.Disposable;
import xyz.fycz.myreader.R;
import xyz.fycz.myreader.application.App;
import xyz.fycz.myreader.application.SysManager;
@ -56,8 +58,8 @@ import xyz.fycz.myreader.ui.adapter.SearchHistoryAdapter;
import xyz.fycz.myreader.ui.dialog.DialogCreator;
import xyz.fycz.myreader.ui.dialog.MultiChoiceDialog;
import xyz.fycz.myreader.util.SharedPreUtils;
import xyz.fycz.myreader.util.help.StringHelper;
import xyz.fycz.myreader.util.ToastUtils;
import xyz.fycz.myreader.util.help.StringHelper;
import xyz.fycz.myreader.util.utils.OkHttpUtils;
import xyz.fycz.myreader.util.utils.RxUtils;
import xyz.fycz.myreader.webapi.crawler.ReadCrawlerUtil;
@ -73,10 +75,11 @@ public class SearchBookActivity extends BaseActivity {
private SearchBookAdapter mSearchBookAdapter;
private String searchKey;//搜索关键字
private ArrayList<SearchBookBean> mBooksBean = new ArrayList<>();
private List<SearchBookBean> mBooksBean = new ArrayList<>();
private ConMVMap<SearchBookBean, Book> mBooks = new ConMVMap<>();
private ArrayList<SearchHistory> mSearchHistories = new ArrayList<>();
private ArrayList<String> mSuggestions = new ArrayList<>();
private List<SearchHistory> mSearchHistories = new ArrayList<>();
private List<CharSequence> mSuggestions = new ArrayList<>();
private List<CharSequence> mHotKeys = new ArrayList<>();
private SearchHistoryService mSearchHistoryService;
@ -92,32 +95,14 @@ public class SearchBookActivity extends BaseActivity {
private AlertDialog mDisableSourceDia;
private Disposable sugDis;
private static String[] suggestion = {"第一序列", "大道朝天", "伏天氏", "终极斗罗", "我师兄实在太稳健了", "烂柯棋缘", "诡秘之主"};
private static String[] suggestion2 = {"不朽凡人", "圣墟", "我是至尊", "龙王传说", "太古神王", "一念永恒", "雪鹰领主", "大主宰"};
private boolean showBooks;
private boolean showHot;
@SuppressLint("HandlerLeak")
private Handler mHandler = new Handler() {
@Override
public void handleMessage(Message msg) {
switch (msg.what) {
case 1:
search();
break;
case 2:
binding.srlSearchBookList.finishRefresh();
/*if (curThreadCount == 0 && !isStopSearch) {
rpb.setIsAutoLoading(false);
}*/
break;
case 3:
binding.fabSearchStop.setVisibility(View.GONE);
break;
}
}
};
private static String[] suggestion = {"第一序列", "大道朝天", "伏天氏", "终极斗罗", "我师兄实在太稳健了", "烂柯棋缘", "诡秘之主", "不朽凡人", "圣墟", "我是至尊", "龙王传说", "太古神王", "一念永恒", "雪鹰领主", "大主宰"};
private boolean showHot;
@Override
@ -151,7 +136,7 @@ public class SearchBookActivity extends BaseActivity {
public void loadMoreSearchBook(ConMVMap<SearchBookBean, Book> items) {
mBooks.addAll(items);
mSearchBookAdapter.addAll(new ArrayList<>(items.keySet()), searchKey);
mHandler.sendMessage(mHandler.obtainMessage(2));
binding.srlSearchBookList.finishRefresh();
}
@Override
@ -161,20 +146,20 @@ public class SearchBookActivity extends BaseActivity {
@Override
public void searchBookError(Throwable throwable) {
mHandler.sendMessage(mHandler.obtainMessage(2));
binding.srlSearchBookList.finishRefresh();
}
});
initHotKeys();
}
@Override
protected void initWidget() {
super.initWidget();
initSuggestionList();
//enter事件
binding.etSearchKey.setOnEditorActionListener((textView, i, keyEvent) -> {
if (i == EditorInfo.IME_ACTION_UNSPECIFIED) {
mHandler.sendMessage(mHandler.obtainMessage(1));
search();
return (keyEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER);
}
return false;
@ -228,9 +213,9 @@ public class SearchBookActivity extends BaseActivity {
public void afterTextChanged(final Editable editable) {
searchKey = editable.toString();
if (StringHelper.isEmpty(searchKey)) {
mHandler.sendMessage(mHandler.obtainMessage(1));
search();
}
initSuggestionList();
}
});
@ -240,10 +225,10 @@ public class SearchBookActivity extends BaseActivity {
//上拉刷新
binding.srlSearchBookList.setOnRefreshListener(refreshLayout -> {
stopSearch();
mHandler.sendMessage(mHandler.obtainMessage(1));
search();
});
initHistoryList();
mHandler.postDelayed(() -> {
App.getHandler().postDelayed(() -> {
binding.etSearchKey.requestFocus();
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.toggleSoftInput(0, InputMethodManager.SHOW_FORCED);
@ -258,18 +243,18 @@ public class SearchBookActivity extends BaseActivity {
binding.llRefreshSuggestBooks.setOnClickListener(new RenewSuggestionBook());
//搜索按钮点击事件
binding.tvSearchConform.setOnClickListener(view -> mHandler.sendMessage(mHandler.obtainMessage(1)));
binding.tvSearchConform.setOnClickListener(view -> search());
//suggestion搜索事件
binding.tgSuggestBook.setOnTagClickListener(tag -> {
binding.etSearchKey.setText(tag);
binding.etSearchKey.setSelection(tag.length());
mHandler.sendMessage(mHandler.obtainMessage(1));
search();
});
//历史记录搜索事件
binding.lvHistoryList.setOnItemClickListener((parent, view, position, id) -> {
binding.etSearchKey.setText(mSearchHistories.get(position).getContent());
binding.etSearchKey.setSelection(mSearchHistories.get(position).getContent().length());
mHandler.sendMessage(mHandler.obtainMessage(1));
search();
});
//清空历史记录
binding.llClearHistory.setOnClickListener(v -> {
@ -312,7 +297,7 @@ public class SearchBookActivity extends BaseActivity {
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == R.id.action_hot) {
showHot = !showHot;
initSuggestionList();
initHotKeys();
} else if (item.getItemId() == R.id.action_disable_source) {
showDisableSourceDia();
} else if (item.getItemId() == R.id.action_source_man) {
@ -407,15 +392,14 @@ public class SearchBookActivity extends BaseActivity {
});
}
/**
* 初始化建议书目
*/
private void initSuggestionList() {
private void initHotKeys() {
mHotKeys.clear();
if (!showHot) {
binding.tgSuggestBook.setTags(suggestion);
mHotKeys.addAll(Arrays.asList(suggestion));
initSuggestionList();
} else {
SharedPreUtils spu = SharedPreUtils.getInstance();
Single.create((SingleOnSubscribe<String>) emitter -> {
Single.create((SingleOnSubscribe<Boolean>) emitter -> {
String cookie = spu.getString(getString(R.string.qdCookie), "");
String url = "https://m.qidian.com/majax/search/auto?kw=&";
if (cookie.equals("")) {
@ -424,17 +408,55 @@ public class SearchBookActivity extends BaseActivity {
url += cookie.split(";")[0];
Map<String, String> headers = new HashMap<>();
headers.put("Cookie", cookie);
emitter.onSuccess(OkHttpUtils.getHtml(url, null,
"utf-8", headers));
}).compose(RxUtils::toSimpleSingle).subscribe(new MySingleObserver<String>() {
emitter.onSuccess(parseHotKeys(OkHttpUtils.getHtml(url, null, "utf-8", headers)));
}).compose(RxUtils::toSimpleSingle).subscribe(new MySingleObserver<Boolean>() {
@Override
public void onSuccess(@NotNull String s) {
parseSuggestionList(s);
if (mSuggestions.size() > 0) {
binding.tgSuggestBook.setTags(mSuggestions.subList(0, mSuggestions.size() / 2));
} else {
public void onSuccess(@NotNull Boolean b) {
initSuggestionList();
}
@Override
public void onError(Throwable e) {
mHotKeys.addAll(Arrays.asList(suggestion));
initSuggestionList();
}
});
;
}
}
/**
* 初始化建议书目
*/
private void initSuggestionList() {
if (showBooks) return;
if (sugDis != null) {
sugDis.dispose();
}
mSuggestions.clear();
if (StringHelper.isEmpty(searchKey)) {
if (mHotKeys.isEmpty()) {
binding.llSuggestBooksView.setVisibility(View.GONE);
} else {
binding.llSuggestBooksView.setVisibility(View.VISIBLE);
binding.llRefreshSuggestBooks.setVisibility(View.VISIBLE);
binding.tgSuggestBook.setTags2(mHotKeys.subList(0, mHotKeys.size() / 2));
}
} else {
String url = "https://newzxautocmp.reader.qq.com/BookSuggAll?key=" + searchKey;
Single.create((SingleOnSubscribe<String>) emitter -> {
emitter.onSuccess(OkHttpUtils.getHtml(url));
}).compose(RxUtils::toSimpleSingle).subscribe(new MySingleObserver<String>() {
@Override
public void onSubscribe(Disposable d) {
sugDis = d;
}
@Override
public void onSuccess(@NotNull String s) {
parseSuggListByKey(s);
binding.llRefreshSuggestBooks.setVisibility(View.GONE);
binding.tgSuggestBook.setTags2(mSuggestions);
}
@Override
@ -445,12 +467,35 @@ public class SearchBookActivity extends BaseActivity {
}
}
private void parseSuggestionList(String jsonStr) {
private boolean parseHotKeys(String jsonStr) {
try {
JSONObject json = new JSONObject(jsonStr);
JSONArray names = json.getJSONObject("data").getJSONArray("popWords");
for (int i = 0; i < names.length(); i++) {
mSuggestions.add(names.getJSONObject(i).getString("name"));
mHotKeys.add(names.getJSONObject(i).getString("name"));
}
return true;
} catch (JSONException e) {
e.printStackTrace();
}
return false;
}
private void parseSuggListByKey(String jsonStr) {
try {
JSONObject json = new JSONObject(jsonStr);
JSONArray names = json.getJSONArray("matchList");
for (int i = 0; i < names.length(); i++) {
String title = names.getJSONObject(i).getString("title");
int start = title.indexOf(searchKey);
if (start != -1) {
SpannableString spannableString = new SpannableString(title);
spannableString.setSpan(new ForegroundColorSpan(Color.RED),
start, start + searchKey.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
mSuggestions.add(spannableString);
} else {
mSuggestions.add(title);
}
}
} catch (JSONException e) {
e.printStackTrace();
@ -460,21 +505,12 @@ public class SearchBookActivity extends BaseActivity {
private class RenewSuggestionBook implements View.OnClickListener {
@Override
public void onClick(View v) {
if (!showHot) {
String[] s = binding.tgSuggestBook.getTags();
if (Arrays.equals(s, suggestion)) {
binding.tgSuggestBook.setTags(suggestion2);
} else {
binding.tgSuggestBook.setTags(suggestion);
}
} else {
if (mSuggestions.size() > 0) {
if (mHotKeys.size() > 0) {
String[] s = binding.tgSuggestBook.getTags();
if (s[0].equals(mSuggestions.get(0))) {
binding.tgSuggestBook.setTags(mSuggestions.subList(mSuggestions.size() / 2, mSuggestions.size()));
if (s[0].equals(mHotKeys.get(0))) {
binding.tgSuggestBook.setTags2(mHotKeys.subList(mHotKeys.size() / 2, mHotKeys.size()));
} else {
binding.tgSuggestBook.setTags(mSuggestions.subList(0, mSuggestions.size() / 2));
}
binding.tgSuggestBook.setTags2(mHotKeys.subList(0, mHotKeys.size() / 2));
}
}
}
@ -501,7 +537,6 @@ public class SearchBookActivity extends BaseActivity {
//initmBooksBean();
binding.rvSearchBooksList.setVisibility(View.VISIBLE);
binding.llSuggestBooksView.setVisibility(View.GONE);
binding.llSuggestBooksView.setVisibility(View.GONE);
}
@ -533,6 +568,7 @@ public class SearchBookActivity extends BaseActivity {
private void search() {
binding.rpb.setIsAutoLoading(true);
if (StringHelper.isEmpty(searchKey)) {
showBooks = false;
stopSearch();
binding.rpb.setIsAutoLoading(false);
binding.rvSearchBooksList.setVisibility(View.GONE);
@ -542,6 +578,7 @@ public class SearchBookActivity extends BaseActivity {
binding.rvSearchBooksList.setAdapter(null);
binding.srlSearchBookList.setEnableRefresh(false);
} else {
showBooks = true;
mSearchBookAdapter = new SearchBookAdapter(this, mBooks, searchEngine, searchKey);
binding.rvSearchBooksList.setAdapter(mSearchBookAdapter);
//进入书籍详情页
@ -569,7 +606,7 @@ public class SearchBookActivity extends BaseActivity {
private void stopSearch() {
searchEngine.stopSearch();
mHandler.sendEmptyMessage(3);
binding.fabSearchStop.setVisibility(View.GONE);
}
@Override
@ -584,9 +621,6 @@ public class SearchBookActivity extends BaseActivity {
@Override
protected void onDestroy() {
stopSearch();
for (int i = 0; i < 9; i++) {
mHandler.removeMessages(i + 1);
}
super.onDestroy();
}

3
app/src/main/java/xyz/fycz/myreader/ui/adapter/SearchHistoryAdapter.java
Unescape View File

@ -13,12 +13,13 @@ import xyz.fycz.myreader.R;
import xyz.fycz.myreader.greendao.entity.SearchHistory;
import java.util.ArrayList;
import java.util.List;
public class SearchHistoryAdapter extends ArrayAdapter<SearchHistory> {
private int mResourceId;
public SearchHistoryAdapter(Context context, int resourceId, ArrayList<SearchHistory> datas){
public SearchHistoryAdapter(Context context, int resourceId, List<SearchHistory> datas){
super(context,resourceId,datas);
mResourceId = resourceId;
}

1042
app/src/main/java/xyz/fycz/myreader/widget/TagGroup.java
View File

File diff suppressed because it is too large Load Diff

3
app/src/main/res/layout/activity_search_book.xml
Unescape View File

@ -96,7 +96,7 @@
android:orientation="vertical"
android:padding="5dp">
<me.gujun.android.taggroup.TagGroup
<xyz.fycz.myreader.widget.TagGroup
android:id="@+id/tg_suggest_book"
style="@style/TagGroup"
android:layout_marginTop="5dp"
@ -135,7 +135,6 @@
</LinearLayout>
</LinearLayout>
<LinearLayout

67
app/src/main/res/values/styles.xml
Unescape View File

@ -266,4 +266,71 @@
<attr name="sb_uncheckbutton_color" format="reference|color"/>
</declare-styleable>
<!-- TagGroup -->
<declare-styleable name="TagGroup"><attr format="boolean" name="atg_isAppendMode"/><attr format="string" name="atg_inputHint"/><attr format="color" name="atg_borderColor"/><attr format="color" name="atg_textColor"/><attr format="color" name="atg_backgroundColor"/><attr format="color" name="atg_dashBorderColor"/><attr format="color" name="atg_inputHintColor"/><attr format="color" name="atg_inputTextColor"/><attr format="color" name="atg_checkedBorderColor"/><attr format="color" name="atg_checkedTextColor"/><attr format="color" name="atg_checkedMarkerColor"/><attr format="color" name="atg_checkedBackgroundColor"/><attr format="color" name="atg_pressedBackgroundColor"/><attr format="dimension" name="atg_borderStrokeWidth"/><attr format="dimension" name="atg_textSize"/><attr format="dimension" name="atg_horizontalSpacing"/><attr format="dimension" name="atg_verticalSpacing"/><attr format="dimension" name="atg_horizontalPadding"/><attr format="dimension" name="atg_verticalPadding"/></declare-styleable>
<declare-styleable name="Themes"><attr format="reference" name="tagGroupStyle"/></declare-styleable>
<!-- From: file:/D:/WorkSpace/AndroidStudioProjects/AndroidTagGroup/library/src/main/res/values/strings.xml -->
<eat-comment/>
<string name="add_tag">Add Tag</string>
<!-- From: file:/D:/WorkSpace/AndroidStudioProjects/AndroidTagGroup/library/src/main/res/values/styles.xml -->
<eat-comment/>
<style name="TagGroup">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="atg_isAppendMode">false</item>
<item name="atg_inputHint">@string/add_tag</item>
<item name="atg_borderColor">#49C120</item>
<item name="atg_textColor">#49C120</item>
<item name="atg_backgroundColor">#FFFFFF</item>
<item name="atg_dashBorderColor">#AAAAAA</item>
<item name="atg_inputHintColor">#80000000</item>
<item name="atg_inputTextColor">#DE000000</item>
<item name="atg_checkedBorderColor">#49C120</item>
<item name="atg_checkedTextColor">#FFFFFF</item>
<item name="atg_checkedMarkerColor">#FFFFFF</item>
<item name="atg_checkedBackgroundColor">#49C120</item>
<item name="atg_pressedBackgroundColor">#EDEDED</item>
<item name="atg_borderStrokeWidth">0.5dp</item>
<item name="atg_textSize">13sp</item>
<item name="atg_horizontalSpacing">8dp</item>
<item name="atg_verticalSpacing">4dp</item>
<item name="atg_horizontalPadding">12dp</item>
<item name="atg_verticalPadding">3dp</item>
</style>
<style name="TagGroup.Beauty_Red" parent="TagGroup">
<item name="atg_borderColor">#FF3D7F</item>
<item name="atg_textColor">#FF3D7F</item>
<item name="atg_checkedBorderColor">#FF3D7F</item>
<item name="atg_checkedBackgroundColor">#FF3D7F</item>
</style>
<style name="TagGroup.Beauty_Red.Inverse" parent="TagGroup">
<item name="atg_borderColor">#FF3D7F</item>
<item name="atg_textColor">#FFFFFF</item>
<item name="atg_backgroundColor">#FF3D7F</item>
<item name="atg_inputHintColor">#80FFFFFF</item>
<item name="atg_inputTextColor">#DEFFFFFF</item>
<item name="atg_checkedBorderColor">#FF3D7F</item>
<item name="atg_checkedTextColor">#FF3D7F</item>
<item name="atg_checkedMarkerColor">#FF3D7F</item>
<item name="atg_checkedBackgroundColor">#FFFFFF</item>
<item name="atg_pressedBackgroundColor">#FF99B1</item>
</style>
<style name="TagGroup.Large" parent="TagGroup">
<item name="atg_borderStrokeWidth">0.7dp</item>
<item name="atg_textSize">15sp</item>
<item name="atg_horizontalSpacing">9dp</item>
<item name="atg_verticalSpacing">5dp</item>
<item name="atg_horizontalPadding">14dp</item>
<item name="atg_verticalPadding">4dp</item>
</style>
<style name="TagGroup.Small" parent="TagGroup">
<item name="atg_textSize">10sp</item>
<item name="atg_horizontalSpacing">6dp</item>
<item name="atg_verticalSpacing">3dp</item>
<item name="atg_horizontalPadding">8dp</item>
<item name="atg_verticalPadding">2dp</item>
</style>
</resources>

4
app/version_code.properties
Unescape View File

@ -1,2 +1,2 @@
#Tue Jun 15 19:45:01 CST 2021
VERSION_CODE=212
#Tue Jun 15 20:58:21 CST 2021
VERSION_CODE=213

Write Preview
Loading…
Cancel
Save