From 8da97b5d0418973e74f7f58c2967a4e13926f27a Mon Sep 17 00:00:00 2001 From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com> Date: Sun, 23 Jul 2023 20:39:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=80=E4=BA=9B=E9=97=AA=E9=80=80?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/retrofit/interfaces/MiniTiebaApi.kt | 4 +-- .../retrofit/interfaces/OfficialTiebaApi.kt | 4 +-- .../tieba/post/models/PhotoViewBean.kt | 35 ++----------------- .../tieba/post/ui/page/thread/ThreadPage.kt | 2 +- .../tieba/post/utils/EmoticonManager.kt | 5 ++- .../tieba/post/utils/PermissionUtils.kt | 2 +- 6 files changed, 13 insertions(+), 39 deletions(-) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/MiniTiebaApi.kt b/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/MiniTiebaApi.kt index b168747e..0c1e3e84 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/MiniTiebaApi.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/MiniTiebaApi.kt @@ -103,8 +103,8 @@ interface MiniTiebaApi { @Field("agree_type") agree_type: Int = 2, @Field("obj_type") obj_type: Int = 3, @Field("op_type") op_type: Int = 0, - @Field("tbs") tbs: String = AccountUtil.getLoginInfo()!!.tbs, - @Field("stoken") stoken: String = AccountUtil.getSToken()!! + @Field("tbs") tbs: String? = AccountUtil.getLoginInfo()?.tbs, + @Field("stoken") stoken: String? = AccountUtil.getSToken() ): Call @Headers("${Header.FORCE_LOGIN}: ${Header.FORCE_LOGIN_TRUE}") diff --git a/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/OfficialTiebaApi.kt b/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/OfficialTiebaApi.kt index 893971df..d501f53f 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/OfficialTiebaApi.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/OfficialTiebaApi.kt @@ -433,8 +433,8 @@ interface OfficialTiebaApi { ) fun addStoreAsync( @Field("data") data: String, - @Field("stoken") stoken: String = AccountUtil.getSToken()!!, - @retrofit2.http.Header("client_user_token") client_user_token: String? = AccountUtil.getUid(), + @Field("stoken") stoken: String? = AccountUtil.getSToken(), + @retrofit2.http.Header("client_user_token") clientUserToken: String? = AccountUtil.getUid(), ): Deferred> @POST("/c/c/post/addstore") diff --git a/app/src/main/java/com/huanchengfly/tieba/post/models/PhotoViewBean.kt b/app/src/main/java/com/huanchengfly/tieba/post/models/PhotoViewBean.kt index 6c708f11..53068582 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/models/PhotoViewBean.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/models/PhotoViewBean.kt @@ -1,42 +1,13 @@ package com.huanchengfly.tieba.post.models -import android.os.Parcel import android.os.Parcelable +import kotlinx.parcelize.Parcelize +@Parcelize data class PhotoViewBean @JvmOverloads constructor( var url: String?, var originUrl: String?, var isLongPic: Boolean = false, var index: String? = null, var isGif: Boolean = false -) : Parcelable { - constructor(parcel: Parcel) : this( - parcel.readString(), - parcel.readString(), - parcel.readByte() != 0.toByte(), - parcel.readString(), - parcel.readByte() != 0.toByte() - ) - - override fun writeToParcel(parcel: Parcel, flags: Int) { - parcel.writeString(url) - parcel.writeString(originUrl) - parcel.writeByte(if (isLongPic) 1 else 0) - parcel.writeString(index) - parcel.writeByte(if (isGif) 1 else 0) - } - - override fun describeContents(): Int { - return 0 - } - - companion object CREATOR : Parcelable.Creator { - override fun createFromParcel(parcel: Parcel): PhotoViewBean { - return PhotoViewBean(parcel) - } - - override fun newArray(size: Int): Array { - return arrayOfNulls(size) - } - } -} \ No newline at end of file +) : Parcelable \ No newline at end of file diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/thread/ThreadPage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/thread/ThreadPage.kt index a8507d7f..ce604deb 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/thread/ThreadPage.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/thread/ThreadPage.kt @@ -399,7 +399,7 @@ fun ThreadPage( seeLz: Boolean = false, sortType: Int = 0, from: String = "", - extra: ThreadPageExtra = ThreadPageNoExtra, + extra: ThreadPageExtra? = null, threadInfo: ThreadInfo? = null, scrollToReply: Boolean = false, viewModel: ThreadViewModel = pageViewModel() diff --git a/app/src/main/java/com/huanchengfly/tieba/post/utils/EmoticonManager.kt b/app/src/main/java/com/huanchengfly/tieba/post/utils/EmoticonManager.kt index 18914c73..a41ee4cb 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/utils/EmoticonManager.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/utils/EmoticonManager.kt @@ -38,6 +38,7 @@ import com.huanchengfly.tieba.post.toJson import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext import java.io.File import java.lang.ref.WeakReference @@ -173,7 +174,9 @@ object EmoticonManager { } updateCache() coroutineScope.launch { - fetchEmoticons(context) + withContext(Dispatchers.IO) { + runCatching { fetchEmoticons(context) } + } } } diff --git a/app/src/main/java/com/huanchengfly/tieba/post/utils/PermissionUtils.kt b/app/src/main/java/com/huanchengfly/tieba/post/utils/PermissionUtils.kt index 9450289c..60579c07 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/utils/PermissionUtils.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/utils/PermissionUtils.kt @@ -413,7 +413,7 @@ class ShowPermissionTipInterceptor(val permissions: List, val descriptio callback: OnPermissionCallback? ) { mRequestFlag = false - tipDialog?.dismiss() + runCatching { tipDialog?.dismiss() } } }