Skip to content

Commit 2db5982

Browse files
committed
修复注解歧义
1 parent d30ddfb commit 2db5982

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

app/src/main/java/com/takwolf/android/demo/refreshandloadmore/model/cnode/Author.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import com.squareup.moshi.JsonClass
55

66
@JsonClass(generateAdapter = true)
77
data class Author(
8-
@Json(name = "loginname") val loginName: String?,
9-
@Json(name = "avatar_url") val avatarUrl: String?,
8+
@param:Json(name = "loginname") val loginName: String?,
9+
@param:Json(name = "avatar_url") val avatarUrl: String?,
1010
) {
1111
val avatarUrlCompat: String?
1212
get() {

app/src/main/java/com/takwolf/android/demo/refreshandloadmore/model/cnode/Result.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ import com.squareup.moshi.JsonClass
55

66
@JsonClass(generateAdapter = true)
77
data class DataResult<Data>(
8-
@Json(name = "success") val isSuccessful: Boolean,
8+
@param:Json(name = "success") val isSuccessful: Boolean,
99
val data: Data,
1010
)

app/src/main/java/com/takwolf/android/demo/refreshandloadmore/model/cnode/Topic.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ import java.time.OffsetDateTime
77
@JsonClass(generateAdapter = true)
88
data class Topic(
99
val id: String,
10-
@Json(name = "author_id") val authorId: String,
10+
@param:Json(name = "author_id") val authorId: String,
1111
val author: Author,
1212
val title: String,
1313
val tab: String?,
14-
@Json(name = "good") val isGood: Boolean,
15-
@Json(name = "top") val isTop: Boolean,
14+
@param:Json(name = "good") val isGood: Boolean,
15+
@param:Json(name = "top") val isTop: Boolean,
1616
val content: String,
17-
@Json(name = "visit_count") val visitCount: Int,
18-
@Json(name = "reply_count") val replyCount: Int,
19-
@Json(name = "create_at") val createAt: OffsetDateTime,
20-
@Json(name = "last_reply_at") val lastReplyAt: OffsetDateTime,
17+
@param:Json(name = "visit_count") val visitCount: Int,
18+
@param:Json(name = "reply_count") val replyCount: Int,
19+
@param:Json(name = "create_at") val createAt: OffsetDateTime,
20+
@param:Json(name = "last_reply_at") val lastReplyAt: OffsetDateTime,
2121
) {
2222
val tabDisplayString: String
2323
get() {

app/src/main/java/com/takwolf/android/demo/refreshandloadmore/model/zhihu/Story.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ data class Story(
1010
val hint: String,
1111
val type: Int,
1212
val images: List<String>?,
13-
@Json(name = "image_hue") val imageHue: String,
13+
@param:Json(name = "image_hue") val imageHue: String,
1414
val url: String,
15-
@Json(name = "ga_prefix") val gaPrefix: String,
15+
@param:Json(name = "ga_prefix") val gaPrefix: String,
1616
)

0 commit comments

Comments
 (0)