diff --git a/app/src/main/assets/web/rssSource/index.js b/app/src/main/assets/web/rssSource/index.js index 71e294837..0be9448a1 100644 --- a/app/src/main/assets/web/rssSource/index.js +++ b/app/src/main/assets/web/rssSource/index.js @@ -78,13 +78,13 @@ function rule2json() { Object.keys(RuleJSON).forEach(key => { RuleJSON[key] = $('#' + key).value; }); - RuleJSON.lastUpdateTime = new Date().getTime(); RuleJSON.customOrder = RuleJSON.customOrder == '' ? 0 : parseInt(RuleJSON.customOrder); + RuleJSON.articleStyle = RuleJSON.articleStyle == '' ? 0 : parseInt(RuleJSON.articleStyle); RuleJSON.enabled = RuleJSON.enabled == '' || String(RuleJSON.enabled).toLocaleLowerCase().replace(/^\s*|\s*$/g, '') == 'true'; RuleJSON.enableJs = RuleJSON.enableJs == '' || String(RuleJSON.enableJs).toLocaleLowerCase().replace(/^\s*|\s*$/g, '') == 'true'; RuleJSON.loadWithBaseUrl = RuleJSON.loadWithBaseUrl == '' || String(RuleJSON.loadWithBaseUrl).toLocaleLowerCase().replace(/^\s*|\s*$/g, '') == 'true'; - RuleJSON.singleUrl = RuleJSON.singleUrl == '' || String(RuleJSON.singleUrl).toLocaleLowerCase().replace(/^\s*|\s*$/g, '') == 'true'; + RuleJSON.singleUrl = String(RuleJSON.singleUrl).toLocaleLowerCase().replace(/^\s*|\s*$/g, '') == 'true'; return RuleJSON; } // 将源对象填充到源表单 diff --git a/app/src/main/java/io/legado/app/help/AppUpdate.kt b/app/src/main/java/io/legado/app/help/AppUpdate.kt index c19713d6c..66aa2983a 100644 --- a/app/src/main/java/io/legado/app/help/AppUpdate.kt +++ b/app/src/main/java/io/legado/app/help/AppUpdate.kt @@ -1,5 +1,6 @@ package io.legado.app.help +import io.legado.app.R import io.legado.app.constant.AppConst import io.legado.app.help.coroutine.Coroutine import io.legado.app.help.http.newCallStrResponse @@ -19,7 +20,7 @@ object AppUpdate { callback: (newVersion: String, updateBody: String, url: String, fileName: String) -> Unit ) { Coroutine.async(scope) { - val lastReleaseUrl = "https://api.github.com/repos/gedoor/legado/releases/latest" + val lastReleaseUrl = appCtx.getString(R.string.latest_release_api) val body = okHttpClient.newCallStrResponse { url(lastReleaseUrl) }.body diff --git a/app/src/main/java/io/legado/app/ui/about/AboutFragment.kt b/app/src/main/java/io/legado/app/ui/about/AboutFragment.kt index a88986385..bcd91439f 100644 --- a/app/src/main/java/io/legado/app/ui/about/AboutFragment.kt +++ b/app/src/main/java/io/legado/app/ui/about/AboutFragment.kt @@ -19,8 +19,6 @@ import io.legado.app.utils.* class AboutFragment : PreferenceFragmentCompat() { - private val licenseUrl = "https://github.com/gedoor/legado/blob/master/LICENSE" - private val disclaimerUrl = "https://gedoor.github.io/MyBookshelf/disclaimer.html" private val qqGroups = linkedMapOf( Pair("(QQ群1)805192012", "6GlFKjLeIk5RhQnR3PNVDaKB6j10royo"), Pair("(QQ群2)773736122", "5Bm5w6OgLupXnICbYvbgzpPUgf0UlsJF"), @@ -51,14 +49,14 @@ class AboutFragment : PreferenceFragmentCompat() { override fun onPreferenceTreeClick(preference: Preference?): Boolean { when (preference?.key) { "contributors" -> openUrl(R.string.contributors_url) - "update_log" -> showUpdateLog() + "update_log" -> show("updateLog.md") "check_update" -> checkUpdate() - "mail" -> requireContext().sendMail("kunfei.ge@gmail.com") + "mail" -> requireContext().sendMail(getString(R.string.email)) "sourceRuleSummary" -> openUrl(R.string.source_rule_url) "git" -> openUrl(R.string.this_github_url) "home_page" -> openUrl(R.string.home_page_url) - "license" -> requireContext().openUrl(licenseUrl) - "disclaimer" -> requireContext().openUrl(disclaimerUrl) + "license" -> openUrl(R.string.license_url) + "disclaimer" -> show("disclaimer.md") "qq" -> showQqGroups() "gzGzh" -> requireContext().sendToClip(getString(R.string.legado_gzh)) "crashLog" -> showCrashLogs() @@ -73,9 +71,9 @@ class AboutFragment : PreferenceFragmentCompat() { requireContext().openUrl(getString(addressID)) } - private fun showUpdateLog() { - val log = String(requireContext().assets.open("updateLog.md").readBytes()) - showDialogFragment(TextDialog(log, TextDialog.Mode.MD)) + private fun show(FileName: String) { + val mdText = String(requireContext().assets.open(FileName).readBytes()) + showDialogFragment(TextDialog(mdText, TextDialog.Mode.MD)) } private fun checkUpdate() { diff --git a/app/src/main/res/values/non_translat.xml b/app/src/main/res/values/non_translat.xml index a60fa193b..fc0439271 100644 --- a/app/src/main/res/values/non_translat.xml +++ b/app/src/main/res/values/non_translat.xml @@ -2,12 +2,13 @@ bookshelf_px 开源阅读 + kunfei.ge@gmail.com https://alanskycn.gitee.io/teachme/ https://github.com/gedoor/legado https://github.com/gedoor/legado/graphs/contributors - https://gedoor.github.io/MyBookshelf/disclaimer.html https://gedoor.github.io/MyBookshelf/ + https://github.com/gedoor/legado/blob/master/LICENSE https://github.com/gedoor/legado/releases/latest https://api.github.com/repos/gedoor/legado/releases/latest https://t.me/legado_channels diff --git a/app/src/main/res/xml/about.xml b/app/src/main/res/xml/about.xml index e961053bd..50df45820 100644 --- a/app/src/main/res/xml/about.xml +++ b/app/src/main/res/xml/about.xml @@ -43,7 +43,7 @@