diff --git a/app/src/main/java/com/nnbc123/app/base/BaseViewModel.kt b/app/src/main/java/com/nnbc123/app/base/BaseViewModel.kt index 5e993130d..fda6cac0d 100644 --- a/app/src/main/java/com/nnbc123/app/base/BaseViewModel.kt +++ b/app/src/main/java/com/nnbc123/app/base/BaseViewModel.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.nnbc123.core.utils.toast +import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch @@ -15,7 +16,11 @@ open class BaseViewModel : ViewModel() { fun safeLaunch( needLoading: Boolean = false, - onError: (e: Throwable) -> Unit = { it.message.toast() }, + onError: (e: Throwable) -> Unit = { + if (it !is CancellationException) { + it.message.toast() + } + }, onComplete: (() -> Unit)? = null, block: suspend CoroutineScope.() -> Unit ) { diff --git a/app/src/main/java/com/nnbc123/app/relation/cp/viewmodel/CpViewModel.kt b/app/src/main/java/com/nnbc123/app/relation/cp/viewmodel/CpViewModel.kt index c5bd559d0..bc317ed45 100644 --- a/app/src/main/java/com/nnbc123/app/relation/cp/viewmodel/CpViewModel.kt +++ b/app/src/main/java/com/nnbc123/app/relation/cp/viewmodel/CpViewModel.kt @@ -87,7 +87,7 @@ class CpViewModel : BaseViewModel() { fun getCpRelation(uid: Long) { safeLaunch( - true, + false, block = { CpModel.userCpRelation(uid)?.let { _cpRelation.value = it diff --git a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml index 2b1f1e890..916a67f4c 100644 --- a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml +++ b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml @@ -41,8 +41,7 @@ android:layout_marginStart="15dp" android:background="@drawable/shape_white_alpha_10_radius_100" android:drawableStart="@drawable/ic_notice_board" - android:drawablePadding="3dp" - android:gravity="center_vertical" + android:gravity="center" android:includeFontPadding="false" android:onClick="@{click}" android:paddingStart="6dp" diff --git a/gradle.properties b/gradle.properties index 1fb57e140..99a951ab1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,5 +25,5 @@ only_arm64=false channel_file=channel.txt -version_name=1.0.1 -version_code=101 \ No newline at end of file +version_name=1.1.0 +version_code=110 \ No newline at end of file