From ffc8fc4f94e9e1c23a232d571e42bb7690c5b944 Mon Sep 17 00:00:00 2001
From: yitao_hello <2714330342@qq.com>
Date: Fri, 25 Feb 2022 19:36:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=BF=94=E5=9B=9E=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=A7=92=E6=95=B0=E6=A0=BC=E5=BC=8F=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9=E5=BC=95=E8=B5=B7=E6=9F=A5=E7=9C=8BCP=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7=E6=97=B6=E5=80=99=E7=9A=84=E9=97=AA=E9=80=80=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/yizhuan/erban/relation/cp/CpDataParser.kt | 6 +++---
 .../yizhuan/erban/relation/cp/dialog/CpInviteReplyDialog.kt | 5 ++---
 .../xchat_android_core/relation/cp/UserCpListEntity.kt      | 6 ++++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/CpDataParser.kt b/app/src/main/java/com/yizhuan/erban/relation/cp/CpDataParser.kt
index 76cf0339b..126220726 100644
--- a/app/src/main/java/com/yizhuan/erban/relation/cp/CpDataParser.kt
+++ b/app/src/main/java/com/yizhuan/erban/relation/cp/CpDataParser.kt
@@ -6,10 +6,10 @@ import com.yizhuan.xchat_android_core.relation.cp.UserCpListEntity
 object CpDataParser {
     fun inviteMsg2cpListEntity(msgEntity: CpInviteInfo) = UserCpListEntity(
         msgEntity.acceptUid, msgEntity.acceptAvatar, msgEntity.acceptNick,
-        msgEntity.acceptGender, msgEntity.replyExpireTime.toString(), msgEntity.declaration,
-        msgEntity.cpId, msgEntity.inviteUid, msgEntity.inviteAvatar, msgEntity.inviteNick,
+        msgEntity.acceptGender, msgEntity.replyExpireTime.toLong(), msgEntity.declaration,
+        msgEntity.cpId,msgEntity.replyExpireTime,0, msgEntity.inviteUid, msgEntity.inviteAvatar, msgEntity.inviteNick,
         msgEntity.inviteGender, 0, msgEntity.propsId, msgEntity.propsImg,
-        msgEntity.propsName, msgEntity.propsPrice, 0, 0, msgEntity.replyExpireTime.toString()
+        msgEntity.propsName, msgEntity.propsPrice, 0, 0, msgEntity.replyExpireTime.toLong()
     )
 
     /**
diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyDialog.kt b/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyDialog.kt
index 37b40c188..2f1c6e1a6 100644
--- a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyDialog.kt
@@ -47,7 +47,6 @@ class CpInviteReplyDialog(context: Context) :
             0,
             data.inviteUserNick.length
         )
-        CpViewHelper.setInviteTimeRemain(data.updateTime, binding.tvTime)
         CpViewHelper.setInviteGiftPriceStyle(context, data.propsPrice, binding.tvPrice)
         binding.tvDeclaration.text = data.declaration
         ImageLoadUtilsV2.loadImage(binding.ivGift, cpInviteData?.propsImg)
@@ -70,8 +69,8 @@ class CpInviteReplyDialog(context: Context) :
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-        cpInviteData?.updateTime?.let {
-            countDown(it.toInt())
+        cpInviteData?.replyExpireTime?.let {
+            countDown(it)
         }
     }
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpListEntity.kt b/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpListEntity.kt
index 2665c4fe7..1c2bf1e79 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpListEntity.kt
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpListEntity.kt
@@ -5,9 +5,11 @@ data class UserCpListEntity(
     val acceptUserAvatar: String = "",
     val acceptUserNick: String = "",
     val acceptUserSex: Int = 0,//1-男 2女
-    val createTime: String = "",
+    val createTime: Long=0,
     val declaration: String = "",//关系誓言
     val cpId: Int = 0,//邀请记录id
+    val replyExpireTime: Int = 0,
+    val acceptTime:Long=0,
     val inviteUid: Long = 0,//邀请人uid
     val inviteUserAvatar: String = "",//邀请方头像
     val inviteUserNick: String = "",
@@ -19,5 +21,5 @@ data class UserCpListEntity(
     val propsPrice: String = "",
     val state: Int = 0,//状态：1-邀请中，2-CP中，3-拒绝，4-解绑中，5-解绑完成
     val unboundUid: Int = 0,//解绑人
-    val updateTime: String = ""
+    val updateTime: Long = 0
 )
\ No newline at end of file