File tree Expand file tree Collapse file tree
app/src/main/java/com/skyd/imomoe Expand file tree Collapse file tree Original file line number Diff line number Diff line change 77 <img src="https://codebeat.co/badges/63fb5d12-bece-4d8f-913e-5bcde2f01242" alt="codebeat badge" />
88 </a>
99 <a href="https://github.com/SkyD666/Imomoe/releases/latest" style="text-decoration:none">
10- <img src="https://img.shields.io/github/v/release/SkyD666/Imomoe" alt="GitHub release (latest by date)"/>
10+ <img src="https://img.shields.io/github/v/release/SkyD666/Imomoe?display_name=release " alt="GitHub release (latest by date)"/>
1111 </a>
1212 <a href="https://github.com/SkyD666/Imomoe/releases/latest" style="text-decoration:none" >
1313 <img src="https://img.shields.io/github/downloads/SkyD666/Imomoe/total" alt="GitHub all downloads"/>
2525</div >
2626
2727
28+
2829----
2930
3031## [ >>必看使用说明(自定义数据源)<<] ( doc/customdatasource/README.md )
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ import com.skyd.imomoe.App
66import com.skyd.imomoe.bean.UpdateBean
77import com.skyd.imomoe.net.RetrofitManager
88import com.skyd.imomoe.net.service.UpdateService
9- import com.skyd.imomoe.util.Util.isNewVersion
9+ import com.skyd.imomoe.util.Util.isNewVersionByVersionCode
1010import com.skyd.imomoe.util.editor
1111import com.skyd.imomoe.util.sharedPreferences
1212import com.skyd.imomoe.util.update.AppUpdateHelper
@@ -59,7 +59,8 @@ object AppUpdateModel {
5959 updateBean = response.body()
6060 updateBean?.let {
6161 status.postValue(
62- if (isNewVersion(updateBean?.tagName ? : " 0" )) AppUpdateStatus .DATED
62+ if (isNewVersionByVersionCode(updateBean?.tagName ? : " 0" ))
63+ AppUpdateStatus .DATED
6364 else AppUpdateStatus .VALID
6465 )
6566 return
Original file line number Diff line number Diff line change @@ -288,6 +288,17 @@ object Util {
288288 }
289289 }
290290
291+ fun isNewVersionByVersionCode (version : String ): Boolean {
292+ val currentVersion = getAppVersionCode().toString()
293+ return try {
294+ version != currentVersion
295+ } catch (e: Exception ) {
296+ e.printStackTrace()
297+ " 检查版本号失败,建议手动到Github查看是否有更新\n 当前版本代码:$currentVersion " .showToast(Toast .LENGTH_LONG )
298+ false
299+ }
300+ }
301+
291302 fun isNewVersion (version : String ): Boolean {
292303 val currentVersion = getAppVersionName()
293304 return try {
Original file line number Diff line number Diff line change @@ -38,7 +38,7 @@ class AppUpdateHelper private constructor() {
3838 listOf<Function <Unit >> { checkUpdate() }
3939 val updateBean = AppUpdateModel .updateBean ? : return
4040 MaterialDialog (activity).show {
41- title(text = " 发现新版本:${updateBean.name} " )
41+ title(text = " 发现新版本\n 版本名 :${updateBean.name} \n 版本代号: ${updateBean.tagName }" )
4242 StringBuffer ().apply {
4343 val size = updateBean.assets[0 ].size
4444 if (size > 0 ) {
Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ import com.skyd.imomoe.config.Const
1111import com.skyd.imomoe.databinding.ActivityAboutBinding
1212import com.skyd.imomoe.model.DataSourceManager
1313import com.skyd.imomoe.util.Util
14+ import com.skyd.imomoe.util.Util.getAppVersionCode
1415import com.skyd.imomoe.util.Util.getAppVersionName
1516import com.skyd.imomoe.util.Util.openBrowser
1617import com.skyd.imomoe.util.visible
@@ -41,7 +42,7 @@ class AboutActivity : BaseActivity<ActivityAboutBinding>() {
4142 ivAboutActivityIconEgg.setImageResource(R .drawable.ic_christmas_hat)
4243 }
4344
44- tvAboutActivityVersion.text = getAppVersionName()
45+ tvAboutActivityVersion.text = " 版本名: ${ getAppVersionName()} \n 版本代号: ${getAppVersionCode()} "
4546
4647 rlAboutActivityImomoe.setOnClickListener {
4748 var warningString: String = getString(R .string.jump_to_data_source_website_warning)
Original file line number Diff line number Diff line change 1- ext. version_code = 18
1+ ext. version_code = 19
22ext. version_name = " 1.2.5_Akarin"
33
44def build_versions = [:]
You can’t perform that action at this time.
0 commit comments