DoggyZhang 3 месяцев назад
Родитель
Сommit
c00cee45ce

+ 8 - 0
module/wallet/src/main/java/com/adealink/weparty/wallet/comp/MyIncomeComp.kt

@@ -5,6 +5,9 @@ import com.adealink.frame.mvvm.view.ViewComponent
 import com.adealink.frame.mvvm.viewmodel.activityViewModels
 import com.adealink.frame.router.Router
 import com.adealink.frame.util.onClick
+import com.adealink.weparty.commonui.ext.gone
+import com.adealink.weparty.commonui.ext.show
+import com.adealink.weparty.module.profile.ProfileModule
 import com.adealink.weparty.module.wallet.Wallet
 import com.adealink.weparty.module.wallet.data.Currency
 import com.adealink.weparty.util.formatNumberStr
@@ -26,6 +29,11 @@ class MyIncomeComp(
     }
 
     private fun initView() {
+        if (ProfileModule.getMyUserInfo()?.isPlaymate() == true) {
+            binding.root.show()
+        } else {
+            binding.root.gone()
+        }
         binding.btnTopUpCoin.onClick {
             goBeanDetail()
         }

+ 4 - 1
module/wallet/src/main/java/com/adealink/weparty/wallet/data/WalletData.kt

@@ -10,7 +10,10 @@ data class WalletRes(
     @SerializedName("diamond") val diamond: Double,
     @SerializedName("totalDiamondConsume") val totalDiamondConsume: Double,
 
-    @SerializedName("bean") val bean: Double,
+    @SerializedName("availableBean") val bean: Double,
+
+    @SerializedName("beanTotal") val beanTotal: Double,
+    @SerializedName("unsettledBean") val unsettledBean: Double,
 )
 
 enum class PayChannel(val value: String) {

+ 0 - 8
module/wallet/src/main/java/com/adealink/weparty/wallet/recharge/fragment/BeanExchangedFragment.kt

@@ -19,11 +19,6 @@ class BeanExchangedFragment : BaseFragment(R.layout.fragment_recharge_bean) {
     override fun initViews() {
         super.initViews()
 
-        // TODO: 需要判断提审版本
-        binding.vBeanCard.btnWithdraw.onClick {
-            withDraw()
-        }
-
         binding.btnConvertCoin.onClick {
             convertToCoin()
         }
@@ -53,7 +48,4 @@ class BeanExchangedFragment : BaseFragment(R.layout.fragment_recharge_bean) {
         }.show(childFragmentManager, "ConvertCurrencyDialog")
     }
 
-    private fun withDraw() {
-
-    }
 }

+ 0 - 25
module/wallet/src/main/res/layout/layout_recharge_header_bean.xml

@@ -73,31 +73,6 @@
             app:layout_constraintTop_toTopOf="@id/iv_bean"
             app:layout_constraintVertical_chainStyle="packed" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/btn_withdraw"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="2dp"
-            android:ellipsize="end"
-            android:fontFamily="@font/poppins_semibold"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:singleLine="true"
-            android:text="@string/wallet_withdraw_cash"
-            android:textColor="@color/white"
-            android:textSize="14sp"
-            android:visibility="gone"
-            app:autoSizeMaxTextSize="14sp"
-            app:autoSizeMinTextSize="10sp"
-            app:autoSizeTextType="uniform"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="180:36"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_percent="0.18"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0"
-            tools:visibility="visible" />
-
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/cl_unavailable"
             android:layout_width="0dp"

+ 1 - 0
module/wallet/src/main/res/layout/layout_wallet_income.xml

@@ -77,6 +77,7 @@
             android:layout_width="wrap_content"
             android:layout_height="24dp"
             android:paddingHorizontal="8dp"
+            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"