Browse Source

feat: 通话界面调节

DoggyZhang 1 tháng trước cách đây
mục cha
commit
400f0d108a

+ 1 - 1
app/src/main/java/com/adealink/weparty/module/playmate/widget/PriceMarqueeView.kt

@@ -85,7 +85,7 @@ class PriceMarqueeView @JvmOverloads constructor(
         } else {
             "/$unit"
         }
-        val text = "$ICON_SPAN$priceStr$unitStr"
+        val text = "$ICON_SPAN $priceStr$unitStr"
 
         val priceUnitText = SpannableStringBuilder(text).apply {
             //金币图片

+ 1 - 1
module/im/src/main/java/com/adealink/weparty/im/session/comp/SessionTopComp.kt

@@ -186,7 +186,7 @@ class SessionTopComp(
         val uid = chatInfo?.id ?: return
 
         val topInfo = orderTopViewModel.topInfoLD.value
-        if (topInfo == null || topInfo.pendingOrder == null || topInfo.pendingOrder.isComplete()) {
+        if (topInfo == null || topInfo.pendingOrder == null || !topInfo.pendingOrder.isInService()) {
             Router.getRouterInstance<BottomDialogFragment>(Order.CreateFromCategory.PATH)?.let {
                 it.arguments = Bundle().apply {
                     putString(Order.CreateFromCategory.EXTRA_TITLE, getCompatString(R.string.im_create_order_title))

+ 2 - 0
module/order/src/main/java/com/adealink/weparty/order/dialog/CreateOrderFromCategoryDialog.kt

@@ -72,6 +72,7 @@ class CreateOrderFromCategoryDialog : BottomDialogFragment(R.layout.dialog_creat
         binding.btnOrder.onClick {
             createOrder()
         }
+        updateOrderInfo()
     }
 
     override fun loadData() {
@@ -123,6 +124,7 @@ class CreateOrderFromCategoryDialog : BottomDialogFragment(R.layout.dialog_creat
             .putExtra(Order.Create.EXTRA_PLAYMATE_ID, select.data.id)
             .putExtra(Order.Create.EXTRA_PLAYMATE_COUNT, orderCount)
             .start()
+        dismiss()
     }
 
 }

+ 1 - 1
module/order/src/main/res/layout/dialog_create_order_from_category.xml

@@ -95,7 +95,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:price_icon_size="12dp"
+                app:price_icon_size="16dp"
                 app:price_text_size="18sp"
                 app:unit_text_size="12sp" />