From 9d9b9ce7e28aa28146e042924c309917d6d22f96 Mon Sep 17 00:00:00 2001 From: Him188 Date: Tue, 6 Jul 2021 18:56:55 +0800 Subject: [PATCH] Change `AnnouncementImage`'s `width` and `height` to `Int` --- .../api/binary-compatibility-validator-android.api | 12 ++++++------ .../api/binary-compatibility-validator.api | 12 ++++++------ .../kotlin/contact/announcement/AnnouncementImage.kt | 8 ++++---- .../kotlin/contact/announcement/GroupAnnouncement.kt | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api b/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api index a450ef4c1..1a367898d 100644 --- a/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api +++ b/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api @@ -596,13 +596,13 @@ public final class net/mamoe/mirai/contact/announcement/Announcement$Companion { public final class net/mamoe/mirai/contact/announcement/AnnouncementImage { public static final field Companion Lnet/mamoe/mirai/contact/announcement/AnnouncementImage$Companion; public static final field SERIAL_NAME Ljava/lang/String; - public synthetic fun (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V - public synthetic fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V - public static final fun create (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lnet/mamoe/mirai/contact/announcement/AnnouncementImage; + public synthetic fun (ILjava/lang/String;IILkotlinx/serialization/internal/SerializationConstructorMarker;)V + public synthetic fun (Ljava/lang/String;IILkotlin/jvm/internal/DefaultConstructorMarker;)V + public static final fun create (Ljava/lang/String;II)Lnet/mamoe/mirai/contact/announcement/AnnouncementImage; public fun equals (Ljava/lang/Object;)Z - public final fun getHeight ()Ljava/lang/String; + public final fun getHeight ()I public final fun getId ()Ljava/lang/String; - public final fun getWidth ()Ljava/lang/String; + public final fun getWidth ()I public fun hashCode ()I public fun toString ()Ljava/lang/String; } @@ -620,7 +620,7 @@ public final class net/mamoe/mirai/contact/announcement/AnnouncementImage$$seria } public final class net/mamoe/mirai/contact/announcement/AnnouncementImage$Companion { - public final fun create (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lnet/mamoe/mirai/contact/announcement/AnnouncementImage; + public final fun create (Ljava/lang/String;II)Lnet/mamoe/mirai/contact/announcement/AnnouncementImage; public final fun serializer ()Lkotlinx/serialization/KSerializer; } diff --git a/binary-compatibility-validator/api/binary-compatibility-validator.api b/binary-compatibility-validator/api/binary-compatibility-validator.api index 73312bf41..a48dccc61 100644 --- a/binary-compatibility-validator/api/binary-compatibility-validator.api +++ b/binary-compatibility-validator/api/binary-compatibility-validator.api @@ -596,13 +596,13 @@ public final class net/mamoe/mirai/contact/announcement/Announcement$Companion { public final class net/mamoe/mirai/contact/announcement/AnnouncementImage { public static final field Companion Lnet/mamoe/mirai/contact/announcement/AnnouncementImage$Companion; public static final field SERIAL_NAME Ljava/lang/String; - public synthetic fun (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V - public synthetic fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V - public static final fun create (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lnet/mamoe/mirai/contact/announcement/AnnouncementImage; + public synthetic fun (ILjava/lang/String;IILkotlinx/serialization/internal/SerializationConstructorMarker;)V + public synthetic fun (Ljava/lang/String;IILkotlin/jvm/internal/DefaultConstructorMarker;)V + public static final fun create (Ljava/lang/String;II)Lnet/mamoe/mirai/contact/announcement/AnnouncementImage; public fun equals (Ljava/lang/Object;)Z - public final fun getHeight ()Ljava/lang/String; + public final fun getHeight ()I public final fun getId ()Ljava/lang/String; - public final fun getWidth ()Ljava/lang/String; + public final fun getWidth ()I public fun hashCode ()I public fun toString ()Ljava/lang/String; } @@ -620,7 +620,7 @@ public final class net/mamoe/mirai/contact/announcement/AnnouncementImage$$seria } public final class net/mamoe/mirai/contact/announcement/AnnouncementImage$Companion { - public final fun create (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lnet/mamoe/mirai/contact/announcement/AnnouncementImage; + public final fun create (Ljava/lang/String;II)Lnet/mamoe/mirai/contact/announcement/AnnouncementImage; public final fun serializer ()Lkotlinx/serialization/KSerializer; } diff --git a/mirai-core-api/src/commonMain/kotlin/contact/announcement/AnnouncementImage.kt b/mirai-core-api/src/commonMain/kotlin/contact/announcement/AnnouncementImage.kt index e031c6688..e0154c7aa 100644 --- a/mirai-core-api/src/commonMain/kotlin/contact/announcement/AnnouncementImage.kt +++ b/mirai-core-api/src/commonMain/kotlin/contact/announcement/AnnouncementImage.kt @@ -24,8 +24,8 @@ import kotlinx.serialization.Serializable @Serializable public class AnnouncementImage private constructor( public val id: String, - public val height: String, - public val width: String, + public val height: Int, + public val width: Int, ) { // For stability, do not make it `data class`. @@ -36,13 +36,13 @@ public class AnnouncementImage private constructor( * 创建 [AnnouncementImage] 实例. */ @JvmStatic - public fun create(id: String, height: String, width: String): AnnouncementImage { + public fun create(id: String, height: Int, width: Int): AnnouncementImage { return AnnouncementImage(id, height, width) } } override fun toString(): String { - return "AnnouncementImage(id='$id', height='$height', width='$width')" + return "AnnouncementImage(id='$id', height=$height, width=$width)" } override fun equals(other: Any?): Boolean { diff --git a/mirai-core/src/commonMain/kotlin/contact/announcement/GroupAnnouncement.kt b/mirai-core/src/commonMain/kotlin/contact/announcement/GroupAnnouncement.kt index 807dc70d6..6a6dad70f 100644 --- a/mirai-core/src/commonMain/kotlin/contact/announcement/GroupAnnouncement.kt +++ b/mirai-core/src/commonMain/kotlin/contact/announcement/GroupAnnouncement.kt @@ -52,8 +52,8 @@ internal data class GroupAnnouncement( @Serializable internal class GroupAnnouncementImage @MiraiInternalApi constructor( - @SerialName("h") val height: String, - @SerialName("w") val width: String, + @SerialName("h") val height: Int, + @SerialName("w") val width: Int, @SerialName("id") val id: String ) : JsonStruct { fun toPublic(): AnnouncementImage = AnnouncementImage.create(id, height, width)