From 2b518859b94b4accb37785ce388762e780707fd8 Mon Sep 17 00:00:00 2001
From: why <why_wanghy@qq.com>
Date: Sat, 30 Mar 2024 13:17:27 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8Drelease=E5=8C=85?=
=?UTF-8?q?=E4=B8=8B=E8=BF=9B=E5=85=A5=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AA=E9=80=80?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mredrock/cyxbs/mine/Bean/PersonData.kt | 30 ----------
.../mredrock/cyxbs/mine/bean/PersonData.kt | 56 +++++++++++++++++++
.../mredrock/cyxbs/mine/network/ApiService.kt | 2 +-
.../cyxbs/mine/page/edit/EditViewModel.kt | 2 +-
4 files changed, 58 insertions(+), 32 deletions(-)
delete mode 100644 module_mine/src/main/java/com/mredrock/cyxbs/mine/Bean/PersonData.kt
create mode 100644 module_mine/src/main/java/com/mredrock/cyxbs/mine/bean/PersonData.kt
diff --git a/module_mine/src/main/java/com/mredrock/cyxbs/mine/Bean/PersonData.kt b/module_mine/src/main/java/com/mredrock/cyxbs/mine/Bean/PersonData.kt
deleted file mode 100644
index 7c744cc117..0000000000
--- a/module_mine/src/main/java/com/mredrock/cyxbs/mine/Bean/PersonData.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.mredrock.cyxbs.mine.Bean
-
-data class PersonData(
- val `data`: Data,
- val info: String,
- val status: Int
-) {
- data class Data(
- val background_url: String,
- val birthday: String,
- val college: String,
- val constellation: String,
- val gender: String,
- val grade: String,
- val identityies: Any,
- val introduction: String,
- val isBefocused: Boolean,
- val isFocus: Boolean,
- val is_self: Boolean,
- val nickname: String,
- val phone: String,
- val photo_src: String,
- val photo_thumbnail_src: String,
- val qq: String,
- val redid: String,
- val stunum: String,
- val uid: Int,
- val username: String
- )
-}
\ No newline at end of file
diff --git a/module_mine/src/main/java/com/mredrock/cyxbs/mine/bean/PersonData.kt b/module_mine/src/main/java/com/mredrock/cyxbs/mine/bean/PersonData.kt
new file mode 100644
index 0000000000..2eaf13a640
--- /dev/null
+++ b/module_mine/src/main/java/com/mredrock/cyxbs/mine/bean/PersonData.kt
@@ -0,0 +1,56 @@
+package com.mredrock.cyxbs.mine.bean
+
+
+import com.google.gson.annotations.SerializedName
+
+data class PersonData(
+ @SerializedName("data")
+ val `data`: Data,
+ @SerializedName("info")
+ val info: String,
+ @SerializedName("status")
+ val status: Int
+) {
+ data class Data(
+ @SerializedName("background_url")
+ val backgroundUrl: String,
+ @SerializedName("birthday")
+ val birthday: String,
+ @SerializedName("college")
+ val college: String,
+ @SerializedName("constellation")
+ val constellation: String,
+ @SerializedName("gender")
+ val gender: String,
+ @SerializedName("grade")
+ val grade: String,
+ @SerializedName("identityies")
+ val identityies: Any,
+ @SerializedName("introduction")
+ val introduction: String,
+ @SerializedName("isBefocused")
+ val isBefocused: Boolean,
+ @SerializedName("isFocus")
+ val isFocus: Boolean,
+ @SerializedName("is_self")
+ val isSelf: Boolean,
+ @SerializedName("nickname")
+ val nickname: String,
+ @SerializedName("phone")
+ val phone: String,
+ @SerializedName("photo_src")
+ val photoSrc: String,
+ @SerializedName("photo_thumbnail_src")
+ val photoThumbnailSrc: String,
+ @SerializedName("qq")
+ val qq: String,
+ @SerializedName("redid")
+ val redid: String,
+ @SerializedName("stunum")
+ val stunum: String,
+ @SerializedName("uid")
+ val uid: Int,
+ @SerializedName("username")
+ val username: String
+ )
+}
\ No newline at end of file
diff --git a/module_mine/src/main/java/com/mredrock/cyxbs/mine/network/ApiService.kt b/module_mine/src/main/java/com/mredrock/cyxbs/mine/network/ApiService.kt
index fe39502ce9..54342629b3 100644
--- a/module_mine/src/main/java/com/mredrock/cyxbs/mine/network/ApiService.kt
+++ b/module_mine/src/main/java/com/mredrock/cyxbs/mine/network/ApiService.kt
@@ -5,7 +5,7 @@ import com.mredrock.cyxbs.common.bean.RedrockApiWrapper
import com.mredrock.cyxbs.lib.utils.network.ApiStatus
import com.mredrock.cyxbs.lib.utils.network.ApiWrapper
import com.mredrock.cyxbs.lib.utils.network.IApi
-import com.mredrock.cyxbs.mine.Bean.PersonData
+import com.mredrock.cyxbs.mine.bean.PersonData
import com.mredrock.cyxbs.mine.network.model.*
import io.reactivex.rxjava3.core.Observable
import io.reactivex.rxjava3.core.Single
diff --git a/module_mine/src/main/java/com/mredrock/cyxbs/mine/page/edit/EditViewModel.kt b/module_mine/src/main/java/com/mredrock/cyxbs/mine/page/edit/EditViewModel.kt
index 7c24b97e94..c4ad9804b4 100644
--- a/module_mine/src/main/java/com/mredrock/cyxbs/mine/page/edit/EditViewModel.kt
+++ b/module_mine/src/main/java/com/mredrock/cyxbs/mine/page/edit/EditViewModel.kt
@@ -9,7 +9,7 @@ import com.mredrock.cyxbs.common.utils.down.params.DownMessageParams
import com.mredrock.cyxbs.common.utils.extensions.errorHandler
import com.mredrock.cyxbs.common.utils.extensions.setSchedulers
import com.mredrock.cyxbs.lib.utils.network.api
-import com.mredrock.cyxbs.mine.Bean.PersonData
+import com.mredrock.cyxbs.mine.bean.PersonData
import com.mredrock.cyxbs.mine.network.ApiService
import com.mredrock.cyxbs.mine.util.apiService
import com.mredrock.cyxbs.mine.util.widget.ExecuteOnceObserver