github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-12 14:00:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change AnnouncementImage's width and height to Int

Browse Source
This commit is contained in:
Him188 2021-07-06 18:56:55 +08:00
parent 51d354c5e9
commit 9d9b9ce7e2
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
binary-compatibility-validator/android/api/binary-compatibility-validator-android.api
View File

@ -596,13 +596,13 @@ public final class net/mamoe/mirai/contact/announcement/Announcement$Companion {
public final class net/mamoe/mirai/contact/announcement/AnnouncementImage { 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 Companion Lnet/mamoe/mirai/contact/announcement/AnnouncementImage$Companion;
public static final field SERIAL_NAME Ljava/lang/String; public static final field SERIAL_NAME Ljava/lang/String;
public synthetic fun <init> (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V public synthetic fun <init> (ILjava/lang/String;IILkotlinx/serialization/internal/SerializationConstructorMarker;)V
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun <init> (Ljava/lang/String;IILkotlin/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 static final fun create (Ljava/lang/String;II)Lnet/mamoe/mirai/contact/announcement/AnnouncementImage;
public fun equals (Ljava/lang/Object;)Z 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 getId ()Ljava/lang/String;
public final fun getWidth ()Ljava/lang/String; public final fun getWidth ()I
public fun hashCode ()I public fun hashCode ()I
public fun toString ()Ljava/lang/String; 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 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; public final fun serializer ()Lkotlinx/serialization/KSerializer;
} }

12
binary-compatibility-validator/api/binary-compatibility-validator.api
View File

@ -596,13 +596,13 @@ public final class net/mamoe/mirai/contact/announcement/Announcement$Companion {
public final class net/mamoe/mirai/contact/announcement/AnnouncementImage { 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 Companion Lnet/mamoe/mirai/contact/announcement/AnnouncementImage$Companion;
public static final field SERIAL_NAME Ljava/lang/String; public static final field SERIAL_NAME Ljava/lang/String;
public synthetic fun <init> (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V public synthetic fun <init> (ILjava/lang/String;IILkotlinx/serialization/internal/SerializationConstructorMarker;)V
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun <init> (Ljava/lang/String;IILkotlin/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 static final fun create (Ljava/lang/String;II)Lnet/mamoe/mirai/contact/announcement/AnnouncementImage;
public fun equals (Ljava/lang/Object;)Z 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 getId ()Ljava/lang/String;
public final fun getWidth ()Ljava/lang/String; public final fun getWidth ()I
public fun hashCode ()I public fun hashCode ()I
public fun toString ()Ljava/lang/String; 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 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; public final fun serializer ()Lkotlinx/serialization/KSerializer;
} }

8
mirai-core-api/src/commonMain/kotlin/contact/announcement/AnnouncementImage.kt
View File

@ -24,8 +24,8 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
public class AnnouncementImage private constructor( public class AnnouncementImage private constructor(
public val id: String, public val id: String,
public val height: String, public val height: Int,
public val width: String, public val width: Int,
) { ) {
// For stability, do not make it `data class`. // For stability, do not make it `data class`.
@ -36,13 +36,13 @@ public class AnnouncementImage private constructor(
* 创建 [AnnouncementImage] 实例. * 创建 [AnnouncementImage] 实例.
*/ */
@JvmStatic @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) return AnnouncementImage(id, height, width)
} }
} }
override fun toString(): String { 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 { override fun equals(other: Any?): Boolean {

4
mirai-core/src/commonMain/kotlin/contact/announcement/GroupAnnouncement.kt
View File

@ -52,8 +52,8 @@ internal data class GroupAnnouncement(
@Serializable @Serializable
internal class GroupAnnouncementImage @MiraiInternalApi constructor( internal class GroupAnnouncementImage @MiraiInternalApi constructor(
@SerialName("h") val height: String, @SerialName("h") val height: Int,
@SerialName("w") val width: String, @SerialName("w") val width: Int,
@SerialName("id") val id: String @SerialName("id") val id: String
) : JsonStruct { ) : JsonStruct {
fun toPublic(): AnnouncementImage = AnnouncementImage.create(id, height, width) fun toPublic(): AnnouncementImage = AnnouncementImage.create(id, height, width)