diff --git a/app/build.gradle b/app/build.gradle index 093ed3d..396b123 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ plugins { id 'kotlin-kapt' } -String timestamp = new SimpleDateFormat("MM_dd_HH_mm").format(new Date()) +String timestamp = new SimpleDateFormat("MMddHHmm").format(new Date()) android { namespace 'com.keyboard.journey' @@ -18,9 +18,9 @@ android { applicationId "com.keyboards.journey" minSdk 23 targetSdk 34 - versionCode 8 - versionName "1.0.8" - setProperty("archivesBaseName", "Keyboard Journey_V" + versionName + "(${versionCode})_$timestamp") + versionCode 7 + versionName "1.0.7" + setProperty("archivesBaseName", "KeyboardJourney-V" + versionName + "C${versionCode}-$timestamp") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/keyboard/journey/HomeFragment.kt b/app/src/main/java/com/keyboard/journey/HomeFragment.kt index be60bb1..1c0b8bc 100644 --- a/app/src/main/java/com/keyboard/journey/HomeFragment.kt +++ b/app/src/main/java/com/keyboard/journey/HomeFragment.kt @@ -19,6 +19,7 @@ import com.keyboard.journey.util.NetworkCallback import com.keyboard.journey.util.NetworkUtil import com.keyboard.journey.util.getRandomInt import com.youth.banner.listener.OnPageChangeListener +import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope @@ -136,9 +137,12 @@ class HomeFragment : Fragment() { } override fun onFailure(errorMessage: String) { - LogUtil.logMsgD(errorMessage) - binding.noDataLayout.visibility = View.VISIBLE - loadingClose() + CoroutineScope(Dispatchers.Main).launch { + LogUtil.logMsgD(errorMessage) + binding.noDataLayout.visibility = View.VISIBLE + loadingClose() + } + } }) } diff --git a/app/src/main/java/com/keyboard/journey/JourneyDetailsActivity.kt b/app/src/main/java/com/keyboard/journey/JourneyDetailsActivity.kt index 8f3ec38..5a9bbae 100644 --- a/app/src/main/java/com/keyboard/journey/JourneyDetailsActivity.kt +++ b/app/src/main/java/com/keyboard/journey/JourneyDetailsActivity.kt @@ -16,8 +16,10 @@ import com.keyboard.journey.util.OnDownloadListener import com.keyboard.journey.util.ResourceDownloadUtil import com.keyboard.journey.util.fileIsDownload import com.keyboard.journey.util.loadRoundedImage +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext import org.libpag.PAGFile class JourneyDetailsActivity : AppCompatActivity(), OnDownloadListener { @@ -56,12 +58,15 @@ class JourneyDetailsActivity : AppCompatActivity(), OnDownloadListener { private fun initView() { GlobalScope.launch { val current = JourneyApp.databaseManager.getItemDataBeanFileByPath(bean?.key!!) - if (current?.isLiked == true) { - binding.likeImg.setImageResource(R.drawable.like_select_icon) - } else { - binding.likeImg.setImageResource(R.drawable.like_unselect_icon) + withContext(Dispatchers.Main){ + if (current?.isLiked == true) { + binding.likeImg.setImageResource(R.drawable.like_select_icon) + } else { + binding.likeImg.setImageResource(R.drawable.like_unselect_icon) + } + bean?.isLiked = current?.isLiked == true } - bean?.isLiked = current?.isLiked == true + } binding.likeBtn.setOnClickListener { diff --git a/app/src/main/java/com/keyboard/journey/MainActivity.kt b/app/src/main/java/com/keyboard/journey/MainActivity.kt index c976327..520c7d5 100644 --- a/app/src/main/java/com/keyboard/journey/MainActivity.kt +++ b/app/src/main/java/com/keyboard/journey/MainActivity.kt @@ -110,6 +110,12 @@ class MainActivity : AppCompatActivity() { } } + override fun onResume() { + super.onResume() + updateSetMyInputMethod() + updateSetMyInputMethodHome() + } + private fun initBar() { immersionBar { statusBarDarkFont(true) @@ -324,7 +330,9 @@ class MainActivity : AppCompatActivity() { val default = isMyInputMethodDefault(this@MainActivity) if (enabled && default) { binding.dialogHomeStepLayout.visibility = View.GONE - showDialogRecommend() + if (!isFinishing && !isDestroyed) { + showDialogRecommend() + } } else { binding.dialogHomeStepLayout.visibility = View.VISIBLE }