From acd099f97f136c2b518bea2247edb32cdccfe9d9 Mon Sep 17 00:00:00 2001 From: fengyuecanzhu <1021300691@qq.com> Date: Fri, 14 May 2021 22:43:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E4=B9=A6=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- app/src/main/assets/updatelog.fy | 1 + .../xyz/fycz/myreader/base/adapter/BaseListAdapter.java | 1 + .../xyz/fycz/myreader/ui/activity/BookDetailedActivity.java | 2 +- .../xyz/fycz/myreader/ui/activity/SearchBookActivity.java | 5 ++--- .../xyz/fycz/myreader/ui/fragment/DIYSourceFragment.java | 4 +--- app/src/main/java/xyz/fycz/myreader/util/utils/AdUtils.java | 6 +++--- app/src/main/res/layout/dialog_textview.xml | 3 +-- app/src/main/res/values/strings.xml | 1 + app/version_code.properties | 4 ++-- 10 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 871e746..4ba1860 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,7 +44,7 @@ def getVersionName(){ def hun = (version / 100).toInteger() def ten = (version / 10).toInteger() % 10 def one = version % 10 - return hun + "." + ten + "." + one + return hun + "." + ten + "." + one + "-beta" } def versionN = getVersionName() diff --git a/app/src/main/assets/updatelog.fy b/app/src/main/assets/updatelog.fy index 5a1674e..1482eab 100644 --- a/app/src/main/assets/updatelog.fy +++ b/app/src/main/assets/updatelog.fy @@ -1,6 +1,7 @@ 风月读书v1.9.6 更新内容： 1、适配英文书籍排版(建议使用等距排版) +2、兼容第三方书源(目前处于测试阶段，可能存在未知bug)，具体说明见书源管理-DIY书源-书源说明 2021.05.09 风月读书v1.9.5 diff --git a/app/src/main/java/xyz/fycz/myreader/base/adapter/BaseListAdapter.java b/app/src/main/java/xyz/fycz/myreader/base/adapter/BaseListAdapter.java index ac32ec0..2c03f78 100644 --- a/app/src/main/java/xyz/fycz/myreader/base/adapter/BaseListAdapter.java +++ b/app/src/main/java/xyz/fycz/myreader/base/adapter/BaseListAdapter.java @@ -141,6 +141,7 @@ public abstract class BaseListAdapter extends RecyclerView.Adapter { if (i == EditorInfo.IME_ACTION_UNSPECIFIED) { @@ -243,6 +242,7 @@ public class SearchBookActivity extends BaseActivity { mHandler.sendMessage(mHandler.obtainMessage(1)); }); initHistoryList(); + mHandler.postDelayed(() -> binding.etSearchKey.requestFocus(), 200); } @Override @@ -557,8 +557,7 @@ public class SearchBookActivity extends BaseActivity { getData(); mSearchHistoryService.addOrUpadteHistory(searchKey); //收起软键盘 - InputMethodManager imm = (InputMethodManager) App.getmContext().getSystemService(Context.INPUT_METHOD_SERVICE); - assert imm != null; + InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow(binding.etSearchKey.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS); } } diff --git a/app/src/main/java/xyz/fycz/myreader/ui/fragment/DIYSourceFragment.java b/app/src/main/java/xyz/fycz/myreader/ui/fragment/DIYSourceFragment.java index c2bb111..98f16d7 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/fragment/DIYSourceFragment.java +++ b/app/src/main/java/xyz/fycz/myreader/ui/fragment/DIYSourceFragment.java @@ -165,9 +165,7 @@ public class DIYSourceFragment extends BaseFragment { }); binding.tvSourceTip.setOnClickListener(v -> { - Intent intent = new Intent(Intent.ACTION_VIEW, - Uri.parse("https://blog.csdn.net/fengyuecanzhu/article/details/113826962")); - startActivity(intent); + MyAlertDialog.showTipDialogWithLink(getContext(), "书源说明",R.string.DIY_source_tip); }); binding.ivGroup.setOnClickListener(this::showSourceGroupMenu); diff --git a/app/src/main/java/xyz/fycz/myreader/util/utils/AdUtils.java b/app/src/main/java/xyz/fycz/myreader/util/utils/AdUtils.java index 456713e..427b4f8 100644 --- a/app/src/main/java/xyz/fycz/myreader/util/utils/AdUtils.java +++ b/app/src/main/java/xyz/fycz/myreader/util/utils/AdUtils.java @@ -123,9 +123,9 @@ public class AdUtils { public static void initAd() { if (!hasInitAd) { hasInitAd = true; - DdSdkHelper.init("1234", "216", "51716a16fbdf50905704b6575b1b3b60", - "142364", "35ce0efe5f3cc960b116db227498e238", - "8167", "85bd159309c3da1b", + DdSdkHelper.init("", "", "", + "", "", + "", "", App.getApplication(), App.isDebug()); } } diff --git a/app/src/main/res/layout/dialog_textview.xml b/app/src/main/res/layout/dialog_textview.xml index a35835c..0ccf6d3 100644 --- a/app/src/main/res/layout/dialog_textview.xml +++ b/app/src/main/res/layout/dialog_textview.xml @@ -7,8 +7,7 @@ android:textColor="@color/textPrimary" android:textSize="@dimen/text_normal_size" android:textIsSelectable="true" - android:paddingStart="25dp" - android:paddingEnd="25dp" + android:paddingHorizontal="25dp" android:paddingTop="10dp"> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8816731..26485c5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -353,6 +353,7 @@ 在“安全选项” 中找到“第三方应用管理”，并选择“添加应用”，输入名称如“风月读书”后，会生成密码， 选择完成；其中https://dav.jianguoyun.com/dav/就是填入“WebDAV 服务器地址”的内容，“使用情况”后面的邮箱地址就是你的“WebDAV 账号”，点击显示密码后得到的密码就是你的“WebDAV 密码”。） \n\n2、 无需操作，APP默认每天自动云备份一次。 + 1、风月读书支持用户自定义书源，编写书源可参考\"风月读书书源说明\"，同时软件内置了几个参考DIY书源供参考编写.\n\n2、风月读书兼容第三方书源，提供多种导入方式.您可点击\"第三方书源仓库\"，选择需要的书源，点"生成书源"，复制后再应用内点网络导入.\n\n3、第三方书源目前处于测试阶段，可能存在未知bug，理性使用. 基本 搜索 发现 diff --git a/app/version_code.properties b/app/version_code.properties index 9281fee..d773913 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Sun May 09 12:54:40 CST 2021 -VERSION_CODE=195 +#Fri May 14 22:41:02 CST 2021 +VERSION_CODE=196