This commit is contained in:
ocean 2024-08-16 18:32:24 +08:00
parent 2a95df9e9a
commit 90740b4ca9
4 changed files with 30 additions and 13 deletions

View File

@ -8,7 +8,7 @@ plugins {
id 'kotlin-kapt' id 'kotlin-kapt'
} }
String timestamp = new SimpleDateFormat("MM_dd_HH_mm").format(new Date()) String timestamp = new SimpleDateFormat("MMddHHmm").format(new Date())
android { android {
namespace 'com.keyboard.journey' namespace 'com.keyboard.journey'
@ -18,9 +18,9 @@ android {
applicationId "com.keyboards.journey" applicationId "com.keyboards.journey"
minSdk 23 minSdk 23
targetSdk 34 targetSdk 34
versionCode 8 versionCode 7
versionName "1.0.8" versionName "1.0.7"
setProperty("archivesBaseName", "Keyboard Journey_V" + versionName + "(${versionCode})_$timestamp") setProperty("archivesBaseName", "KeyboardJourney-V" + versionName + "C${versionCode}-$timestamp")
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

View File

@ -19,6 +19,7 @@ import com.keyboard.journey.util.NetworkCallback
import com.keyboard.journey.util.NetworkUtil import com.keyboard.journey.util.NetworkUtil
import com.keyboard.journey.util.getRandomInt import com.keyboard.journey.util.getRandomInt
import com.youth.banner.listener.OnPageChangeListener import com.youth.banner.listener.OnPageChangeListener
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
@ -136,10 +137,13 @@ class HomeFragment : Fragment() {
} }
override fun onFailure(errorMessage: String) { override fun onFailure(errorMessage: String) {
CoroutineScope(Dispatchers.Main).launch {
LogUtil.logMsgD(errorMessage) LogUtil.logMsgD(errorMessage)
binding.noDataLayout.visibility = View.VISIBLE binding.noDataLayout.visibility = View.VISIBLE
loadingClose() loadingClose()
} }
}
}) })
} }

View File

@ -16,8 +16,10 @@ import com.keyboard.journey.util.OnDownloadListener
import com.keyboard.journey.util.ResourceDownloadUtil import com.keyboard.journey.util.ResourceDownloadUtil
import com.keyboard.journey.util.fileIsDownload import com.keyboard.journey.util.fileIsDownload
import com.keyboard.journey.util.loadRoundedImage import com.keyboard.journey.util.loadRoundedImage
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.libpag.PAGFile import org.libpag.PAGFile
class JourneyDetailsActivity : AppCompatActivity(), OnDownloadListener { class JourneyDetailsActivity : AppCompatActivity(), OnDownloadListener {
@ -56,6 +58,7 @@ class JourneyDetailsActivity : AppCompatActivity(), OnDownloadListener {
private fun initView() { private fun initView() {
GlobalScope.launch { GlobalScope.launch {
val current = JourneyApp.databaseManager.getItemDataBeanFileByPath(bean?.key!!) val current = JourneyApp.databaseManager.getItemDataBeanFileByPath(bean?.key!!)
withContext(Dispatchers.Main){
if (current?.isLiked == true) { if (current?.isLiked == true) {
binding.likeImg.setImageResource(R.drawable.like_select_icon) binding.likeImg.setImageResource(R.drawable.like_select_icon)
} else { } else {
@ -64,6 +67,8 @@ class JourneyDetailsActivity : AppCompatActivity(), OnDownloadListener {
bean?.isLiked = current?.isLiked == true bean?.isLiked = current?.isLiked == true
} }
}
binding.likeBtn.setOnClickListener { binding.likeBtn.setOnClickListener {
bean?.isLiked = bean?.isLiked != true bean?.isLiked = bean?.isLiked != true
if (bean?.isLiked == true) { if (bean?.isLiked == true) {

View File

@ -110,6 +110,12 @@ class MainActivity : AppCompatActivity() {
} }
} }
override fun onResume() {
super.onResume()
updateSetMyInputMethod()
updateSetMyInputMethodHome()
}
private fun initBar() { private fun initBar() {
immersionBar { immersionBar {
statusBarDarkFont(true) statusBarDarkFont(true)
@ -324,7 +330,9 @@ class MainActivity : AppCompatActivity() {
val default = isMyInputMethodDefault(this@MainActivity) val default = isMyInputMethodDefault(this@MainActivity)
if (enabled && default) { if (enabled && default) {
binding.dialogHomeStepLayout.visibility = View.GONE binding.dialogHomeStepLayout.visibility = View.GONE
if (!isFinishing && !isDestroyed) {
showDialogRecommend() showDialogRecommend()
}
} else { } else {
binding.dialogHomeStepLayout.visibility = View.VISIBLE binding.dialogHomeStepLayout.visibility = View.VISIBLE
} }