From adab4aee4856545cd194c8a9558d562902891b32 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Sat, 24 Aug 2024 00:37:53 +0900
Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=ED=9B=84?=
 =?UTF-8?q?=EC=9B=90=20-=20=EB=B9=84=EB=B0=80=20=ED=9B=84=EC=9B=90=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |  8 ++
 .idea/other.xml                               | 33 +++++++
 .../kr/co/vividnext/sodalive/agora/Agora.kt   |  5 +-
 .../detail/AudioContentDetailActivity.kt      |  2 +-
 .../vividnext/sodalive/live/LiveRepository.kt |  2 +
 .../sodalive/live/room/LiveRoomActivity.kt    | 95 ++++++++++++++++---
 .../sodalive/live/room/LiveRoomViewModel.kt   |  3 +-
 .../sodalive/live/room/chat/LiveRoomChat.kt   | 54 ++++++-----
 .../live/room/chat/LiveRoomChatRawMessage.kt  |  3 +
 .../room/donation/LiveRoomDonationDialog.kt   | 11 ++-
 .../room/donation/LiveRoomDonationRequest.kt  |  1 +
 .../drawable/bg_round_corner_6_7_cc333333.xml |  8 ++
 .../res/layout/dialog_live_room_donation.xml  | 20 ++++
 app/src/main/res/values/colors.xml            |  1 +
 14 files changed, 201 insertions(+), 45 deletions(-)
 create mode 100644 app/src/main/res/drawable/bg_round_corner_6_7_cc333333.xml

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index b268ef3..31986fb 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,6 +4,14 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2024-08-23T14:56:05.594981Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=2cec640c34017ece" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
       </SelectionState>
     </selectionStates>
   </component>
diff --git a/.idea/other.xml b/.idea/other.xml
index 4604c44..ffb43c5 100644
--- a/.idea/other.xml
+++ b/.idea/other.xml
@@ -69,6 +69,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="caiman" />
+          <option name="id" value="caiman" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="960" />
+          <option name="screenY" value="2142" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="29" />
           <option name="brand" value="samsung" />
@@ -146,6 +157,17 @@
           <option name="screenX" value="720" />
           <option name="screenY" value="1600" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="komodo" />
+          <option name="id" value="komodo" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro XL" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
@@ -235,6 +257,17 @@
           <option name="screenX" value="1600" />
           <option name="screenY" value="2560" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tokay" />
+          <option name="id" value="tokay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="29" />
           <option name="brand" value="samsung" />
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/agora/Agora.kt b/app/src/main/java/kr/co/vividnext/sodalive/agora/Agora.kt
index c877a00..bed1213 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/agora/Agora.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/agora/Agora.kt
@@ -172,13 +172,14 @@ class Agora(
 
     fun sendRawMessageToPeer(
         receiverUid: String,
-        requestType: LiveRoomRequestType,
+        requestType: LiveRoomRequestType? = null,
+        rawMessage: ByteArray? = null,
         onSuccess: () -> Unit
     ) {
         val option = SendMessageOptions()
 
         val message = rtmClient!!.createMessage()
-        message.rawMessage = requestType.toString().toByteArray()
+        message.rawMessage = rawMessage ?: requestType.toString().toByteArray()
 
         rtmClient!!.sendMessageToPeer(
             receiverUid,
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt
index d308f48..305e71b 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt
@@ -271,7 +271,7 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
             val dialog = LiveRoomDonationDialog(
                 this,
                 LayoutInflater.from(this)
-            ) { can, message ->
+            ) { can, message, _ ->
                 if (can <= 0) {
                     showToast("1캔 이상 후원하실 수 있습니다.")
                 } else if (message.isBlank()) {
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveRepository.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveRepository.kt
index 2987c8c..e032c60 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveRepository.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveRepository.kt
@@ -163,12 +163,14 @@ class LiveRepository(
         roomId: Long,
         can: Int,
         message: String,
+        isSecret: Boolean,
         token: String
     ): Single<ApiResponse<LiveRoomDonationResponse>> {
         return api.donation(
             request = LiveRoomDonationRequest(
                 roomId = roomId,
                 can = can,
+                isSecret = isSecret,
                 message = message,
                 container = "aos"
             ),
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt
index 306a894..1bf62a3 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt
@@ -464,10 +464,11 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
         binding.flDonation.setOnClickListener {
             val dialog = LiveRoomDonationDialog(
                 this,
-                LayoutInflater.from(this)
-            ) { can, message ->
+                LayoutInflater.from(this),
+                isLiveDonation = true
+            ) { can, message, isSecret ->
                 if (can > 0) {
-                    donation(can, message)
+                    donation(can, message, isSecret)
                 } else {
                     showToast("1캔 이상 후원하실 수 있습니다.")
                 }
@@ -1305,13 +1306,21 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
         }
     }
 
-    private fun donation(can: Int, message: String) {
-        val rawMessage = "${can}캔을 후원하셨습니다.\uD83D\uDCB0\uD83E\uDE99"
+    private fun donation(can: Int, message: String, isSecret: Boolean) {
+        val rawMessage = if (isSecret) {
+            "${can}캔을 비밀후원하셨습니다.\uD83D\uDCB0\uD83E\uDE99"
+        } else {
+            "${can}캔을 후원하셨습니다.\uD83D\uDCB0\uD83E\uDE99"
+        }
 
-        viewModel.donation(roomId, can, message) { signature ->
+        viewModel.donation(roomId, can, message, isSecret) { signature ->
             val donationRawMessage = Gson().toJson(
                 LiveRoomChatRawMessage(
-                    type = LiveRoomChatRawMessageType.DONATION,
+                    type = if (isSecret) {
+                        LiveRoomChatRawMessageType.SECRET_DONATION
+                    } else {
+                        LiveRoomChatRawMessageType.DONATION
+                    },
                     message = rawMessage,
                     can = can,
                     signature = signature,
@@ -1320,9 +1329,11 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
                 )
             )
 
-            agora.sendRawMessageToGroup(
-                rawMessage = donationRawMessage.toByteArray(),
-                onSuccess = {
+            if (isSecret) {
+                agora.sendRawMessageToPeer(
+                    receiverUid = viewModel.roomInfoResponse.creatorId.toString(),
+                    rawMessage = donationRawMessage.toByteArray()
+                ) {
                     handler.post {
                         val nickname =
                             viewModel.getUserNickname(SharedPreferenceManager.userId.toInt())
@@ -1338,14 +1349,37 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
                             )
                         )
                         invalidateChat()
-                        viewModel.addDonationCan(can)
                         addSignature(signature)
                     }
-                },
-                onFailure = {
-                    viewModel.refundDonation(roomId)
                 }
-            )
+            } else {
+                agora.sendRawMessageToGroup(
+                    rawMessage = donationRawMessage.toByteArray(),
+                    onSuccess = {
+                        handler.post {
+                            val nickname =
+                                viewModel.getUserNickname(SharedPreferenceManager.userId.toInt())
+                            val profileUrl =
+                                viewModel.getUserProfileUrl(SharedPreferenceManager.userId.toInt())
+                            chatAdapter.items.add(
+                                LiveRoomDonationChat(
+                                    profileUrl,
+                                    nickname,
+                                    rawMessage,
+                                    can,
+                                    donationMessage = message
+                                )
+                            )
+                            invalidateChat()
+                            viewModel.addDonationCan(can)
+                            addSignature(signature)
+                        }
+                    },
+                    onFailure = {
+                        viewModel.refundDonation(roomId)
+                    }
+                )
+            }
         }
     }
 
@@ -1491,6 +1525,8 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
                                     viewModel.addDonationCan(rawMessage.can)
                                 }
                             }
+
+                            else -> {}
                         }
                     } else {
                         val chat = message.text
@@ -1789,6 +1825,35 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
                     }
                     return
                 }
+
+                val message = Gson().fromJson(
+                    rawMessage,
+                    LiveRoomChatRawMessage::class.java
+                )
+
+                if (message.type == LiveRoomChatRawMessageType.SECRET_DONATION) {
+                    val nickname = viewModel.getUserNickname(peerId.toInt())
+                    val profileUrl = viewModel.getUserProfileUrl(peerId.toInt())
+
+                    handler.post {
+                        chatAdapter.items.add(
+                            LiveRoomDonationChat(
+                                profileUrl,
+                                nickname,
+                                message.message,
+                                message.can,
+                                message.donationMessage ?: ""
+                            )
+                        )
+                        invalidateChat()
+
+                        if (message.signature != null) {
+                            addSignature(message.signature)
+                        } else if (message.signatureImageUrl != null) {
+                            addSignatureImage(message.signatureImageUrl)
+                        }
+                    }
+                }
             }
         }
     }
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomViewModel.kt
index 6579b56..44b2c60 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomViewModel.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomViewModel.kt
@@ -521,11 +521,12 @@ class LiveRoomViewModel(
         roomId: Long,
         can: Int,
         message: String,
+        isSecret: Boolean,
         onSuccess: (LiveRoomDonationResponse?) -> Unit
     ) {
         _isLoading.postValue(true)
         compositeDisposable.add(
-            repository.donation(roomId, can, message, "Bearer ${SharedPreferenceManager.token}")
+            repository.donation(roomId, can, message, isSecret, "Bearer ${SharedPreferenceManager.token}")
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt
index 020495e..9f51087 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt
@@ -304,37 +304,43 @@ data class LiveRoomDonationChat(
         itemBinding.llMessageBg.setPadding(0)
         itemBinding.llMessageBg.background = null
 
-        itemBinding.root.setBackgroundResource(
-            when {
-                can >= 10000 -> {
-                    R.drawable.bg_round_corner_6_7_ccc25264
-                }
+        if (spChat.contains("비밀")) {
+            itemBinding.root.setBackgroundResource(
+                R.drawable.bg_round_corner_6_7_cc333333
+            )
+        } else {
+            itemBinding.root.setBackgroundResource(
+                when {
+                    can >= 10000 -> {
+                        R.drawable.bg_round_corner_6_7_ccc25264
+                    }
 
-                can >= 5000 -> {
-                    R.drawable.bg_round_corner_6_7_ccd85e37
-                }
+                    can >= 5000 -> {
+                        R.drawable.bg_round_corner_6_7_ccd85e37
+                    }
 
-                can >= 1000 -> {
-                    R.drawable.bg_round_corner_6_7_ccd38c38
-                }
+                    can >= 1000 -> {
+                        R.drawable.bg_round_corner_6_7_ccd38c38
+                    }
 
-                can >= 500 -> {
-                    R.drawable.bg_round_corner_6_7_cc59548f
-                }
+                    can >= 500 -> {
+                        R.drawable.bg_round_corner_6_7_cc59548f
+                    }
 
-                can >= 100 -> {
-                    R.drawable.bg_round_corner_6_7_cc4d6aa4
-                }
+                    can >= 100 -> {
+                        R.drawable.bg_round_corner_6_7_cc4d6aa4
+                    }
 
-                can >= 50 -> {
-                    R.drawable.bg_round_corner_6_7_cc2d7390
-                }
+                    can >= 50 -> {
+                        R.drawable.bg_round_corner_6_7_cc2d7390
+                    }
 
-                else -> {
-                    R.drawable.bg_round_corner_6_7_cc548f7d
+                    else -> {
+                        R.drawable.bg_round_corner_6_7_cc548f7d
+                    }
                 }
-            }
-        )
+            )
+        }
         itemBinding.root.setPadding(33)
     }
 }
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChatRawMessage.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChatRawMessage.kt
index 77c5d10..03659e7 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChatRawMessage.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChatRawMessage.kt
@@ -19,6 +19,9 @@ enum class LiveRoomChatRawMessageType {
     @SerializedName("DONATION")
     DONATION,
 
+    @SerializedName("SECRET_DONATION")
+    SECRET_DONATION,
+
     @SerializedName("SET_MANAGER")
     SET_MANAGER,
 
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationDialog.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationDialog.kt
index bd2b518..8cb4e5c 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationDialog.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationDialog.kt
@@ -24,7 +24,8 @@ import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity
 class LiveRoomDonationDialog(
     private val activity: AppCompatActivity,
     layoutInflater: LayoutInflater,
-    onClickDonation: (Int, String) -> Unit
+    isLiveDonation: Boolean = false,
+    onClickDonation: (Int, String, Boolean) -> Unit
 ) {
 
     private val bottomSheetDialog: BottomSheetDialog = BottomSheetDialog(activity)
@@ -53,7 +54,7 @@ class LiveRoomDonationDialog(
 
                 if (can > 0) {
                     bottomSheetDialog.dismiss()
-                    onClickDonation(can, message)
+                    onClickDonation(can, message, dialogView.chkSecret.isChecked)
                 } else {
                     Toast.makeText(
                         activity,
@@ -70,6 +71,12 @@ class LiveRoomDonationDialog(
             }
         }
 
+        dialogView.rlSecret.visibility = if (isLiveDonation) {
+            View.VISIBLE
+        } else {
+            View.GONE
+        }
+
         setupView()
     }
 
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRequest.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRequest.kt
index 37f83cf..b1896fe 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRequest.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRequest.kt
@@ -7,6 +7,7 @@ import com.google.gson.annotations.SerializedName
 data class LiveRoomDonationRequest(
     @SerializedName("roomId") val roomId: Long,
     @SerializedName("can") val can: Int,
+    @SerializedName("isSecret") val isSecret: Boolean,
     @SerializedName("message") val message: String,
     @SerializedName("container") val container: String
 )
diff --git a/app/src/main/res/drawable/bg_round_corner_6_7_cc333333.xml b/app/src/main/res/drawable/bg_round_corner_6_7_cc333333.xml
new file mode 100644
index 0000000..ac1ea9a
--- /dev/null
+++ b/app/src/main/res/drawable/bg_round_corner_6_7_cc333333.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/color_cc333333" />
+    <corners android:radius="6.7dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/color_cc333333" />
+</shape>
diff --git a/app/src/main/res/layout/dialog_live_room_donation.xml b/app/src/main/res/layout/dialog_live_room_donation.xml
index 2788ab4..94459db 100644
--- a/app/src/main/res/layout/dialog_live_room_donation.xml
+++ b/app/src/main/res/layout/dialog_live_room_donation.xml
@@ -70,6 +70,26 @@
             android:layout_marginVertical="16dp"
             android:background="@color/color_909090" />
 
+        <RelativeLayout
+            android:id="@+id/rl_secret"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="20dp"
+            android:layout_marginBottom="13.3dp"
+            android:visibility="gone">
+
+            <CheckBox
+                android:id="@+id/chk_secret"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:button="@drawable/ic_select"
+                android:fontFamily="@font/gmarket_sans_medium"
+                android:paddingHorizontal="8dp"
+                android:text="비밀후원"
+                android:textColor="@color/color_eeeeee" />
+        </RelativeLayout>
+
         <EditText
             android:id="@+id/et_donation_can"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5c1b58a..383cbb1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -55,6 +55,7 @@
     <color name="color_cc59548f">#CC59548F</color>
     <color name="color_ccd38c38">#CCD38C38</color>
     <color name="color_ccd85e37">#CCD85E37</color>
+    <color name="color_cc333333">#CC333333</color>
     <color name="color_33ffffff">#33FFFFFF</color>
     <color name="color_303030">#303030</color>
     <color name="color_555555">#555555</color>