feat: 禅道问题

app/src/main/java/com/adealink/weparty/util/UIUtil.kt

@@ -17,17 +17,38 @@ fun formatNumberStr(number: Int, omitted: Boolean = true): String {
 
         number < 1000_000 -> {
             val number = (number.toFloat() / 1000)
-            "%.2fK".format(App.instance.languageManager.getLanguage().locale, number * 100f / 100)
+            if (number % 1f == 0f) {
+                "%.0fK".format(App.instance.languageManager.getLanguage().locale, number)
+            } else {
+                "%.2fK".format(
+                    App.instance.languageManager.getLanguage().locale,
+                    number * 100f / 100
+                )
+            }
         }
 
         number < 1000_000_000 -> {
             val number = (number.toFloat() / 1000_000)
-            "%.2fM".format(App.instance.languageManager.getLanguage().locale, number * 100f / 100)
+            if (number % 1f == 0f) {
+                "%.0fM".format(App.instance.languageManager.getLanguage().locale, number)
+            } else {
+                "%.2fM".format(
+                    App.instance.languageManager.getLanguage().locale,
+                    number * 100f / 100
+                )
+            }
         }
 
         else -> {
             val number = (number.toFloat() / 1000_000_000)
-            "%.2fB".format(App.instance.languageManager.getLanguage().locale, number * 100f / 100)
+            if (number % 1f == 0f) {
+                "%.0fB".format(App.instance.languageManager.getLanguage().locale, number)
+            } else {
+                "%.2fB".format(
+                    App.instance.languageManager.getLanguage().locale,
+                    number * 100f / 100
+                )
+            }
         }
     }
 }
@@ -42,18 +63,39 @@ fun formatNumberStr(number: Long, omitted: Boolean = true): String {
         }
 
         number < 1000_000 -> {
-            val number = (number.toFloat() / 1000)
-            "%.2fK".format(App.instance.languageManager.getLanguage().locale, number * 100f / 100)
+            val number = (number.toDouble() / 1000)
+            if (number % 1.0 == 0.0) {
+                "%.0fK".format(App.instance.languageManager.getLanguage().locale, number)
+            } else {
+                "%.2fK".format(
+                    App.instance.languageManager.getLanguage().locale,
+                    number * 100f / 100
+                )
+            }
         }
 
         number < 1000_000_000 -> {
-            val number = (number.toFloat() / 1000_000)
-            "%.2fM".format(App.instance.languageManager.getLanguage().locale, number * 100f / 100)
+            val number = (number.toDouble() / 1000_000)
+            if (number % 1.0 == 0.0) {
+                "%.0fM".format(App.instance.languageManager.getLanguage().locale, number)
+            } else {
+                "%.2fM".format(
+                    App.instance.languageManager.getLanguage().locale,
+                    number * 100f / 100
+                )
+            }
         }
 
         else -> {
-            val number = (number.toFloat() / 1000_000_000)
-            "%.2fB".format(App.instance.languageManager.getLanguage().locale, number * 100f / 100)
+            val number = (number.toDouble() / 1000_000_000)
+            if (number % 1.0 == 0.0) {
+                "%.0fB".format(App.instance.languageManager.getLanguage().locale, number)
+            } else {
+                "%.2fB".format(
+                    App.instance.languageManager.getLanguage().locale,
+                    number * 100f / 100
+                )
+            }
         }
     }
 }
@@ -68,7 +110,7 @@ fun formatNumberStr(number: Double, omitted: Boolean = true): String {
     }
     return when {
         number < 1000 -> {
-            if (number % 1 == 0.0) {
+            if (number % 1.0 == 0.0) {
                 "%.0f".format(
                     App.instance.languageManager.getLanguage().locale,
                     number * 100.0 / 100
@@ -83,17 +125,38 @@ fun formatNumberStr(number: Double, omitted: Boolean = true): String {
 
         number < 1000_000 -> {
             val number = (number / 1000)
-            "%.2fK".format(App.instance.languageManager.getLanguage().locale, number * 100.0 / 100)
+            if (number % 1.0 == 0.0) {
+                "%.0fK".format(App.instance.languageManager.getLanguage().locale, number)
+            } else {
+                "%.2fK".format(
+                    App.instance.languageManager.getLanguage().locale,
+                    number * 100.0 / 100
+                )
+            }
         }
 
         number < 1000_000_000 -> {
             val number = (number / 1000_000)
-            "%.2fM".format(App.instance.languageManager.getLanguage().locale, number * 100.0 / 100)
+            if (number % 1.0 == 0.0) {
+                "%.0fM".format(App.instance.languageManager.getLanguage().locale, number)
+            } else {
+                "%.2fM".format(
+                    App.instance.languageManager.getLanguage().locale,
+                    number * 100.0 / 100
+                )
+            }
         }
 
         else -> {
             val number = (number / 1000_000_000)
-            "%.2fB".format(App.instance.languageManager.getLanguage().locale, number * 100.0 / 100)
+            if (number % 1.0 == 0.0) {
+                "%.0fB".format(App.instance.languageManager.getLanguage().locale, number)
+            } else {
+                "%.2fB".format(
+                    App.instance.languageManager.getLanguage().locale,
+                    number * 100.0 / 100
+                )
+            }
         }
     }
 }
@@ -119,18 +182,39 @@ fun formatNumberStr(number: Float, omitted: Boolean = true): String {
         }
 
         number < 1000_000 -> {
-            val number = (number / 1000_000_000)
-            "%.2fK".format(App.instance.languageManager.getLanguage().locale, number * 100f / 100)
+            val number = (number / 1000)
+            if (number % 1f == 0f) {
+                "%.0fK".format(App.instance.languageManager.getLanguage().locale, number)
+            } else {
+                "%.2fK".format(
+                    App.instance.languageManager.getLanguage().locale,
+                    number * 100f / 100
+                )
+            }
         }
 
         number < 1000_000_000 -> {
-            val number = (number / 1000_000_000)
-            "%.2fM".format(App.instance.languageManager.getLanguage().locale, number * 100f / 100)
+            val number = (number / 1000_000)
+            if (number % 1f == 0f) {
+                "%.0fM".format(App.instance.languageManager.getLanguage().locale, number)
+            } else {
+                "%.2fM".format(
+                    App.instance.languageManager.getLanguage().locale,
+                    number * 100f / 100
+                )
+            }
         }
 
         else -> {
             val number = (number / 1000_000_000)
-            "%.2fB".format(App.instance.languageManager.getLanguage().locale, number * 100f / 100)
+            if (number % 1f == 0f) {
+                "%.0fB".format(App.instance.languageManager.getLanguage().locale, number)
+            } else {
+                "%.2fB".format(
+                    App.instance.languageManager.getLanguage().locale,
+                    number * 100f / 100
+                )
+            }
         }
     }
 }
@@ -143,7 +227,10 @@ fun formatDistanceStr(distance: Float, omitted: Boolean = true): String {
         return if (distance % 1f == 0f) {
             "%.0fKm".format(App.instance.languageManager.getLanguage().locale, distance)
         } else {
-            "%.2fKm".format(App.instance.languageManager.getLanguage().locale, distance)
+            "%.2fKm".format(
+                App.instance.languageManager.getLanguage().locale,
+                distance * 100f / 100
+            )
         }
     }
     return when {
@@ -151,12 +238,19 @@ fun formatDistanceStr(distance: Float, omitted: Boolean = true): String {
             if (distance % 1f == 0f) {
                 "%.0fKm".format(App.instance.languageManager.getLanguage().locale, distance)
             } else {
-                "%.2fKm".format(App.instance.languageManager.getLanguage().locale, distance)
+                "%.2fKm".format(
+                    App.instance.languageManager.getLanguage().locale,
+                    distance * 100f / 100
+                )
             }
         }
 
         distance < 1000_000 -> {
-            "%.2fMm".format(App.instance.languageManager.getLanguage().locale, (distance / 1000))
+            val number = distance / 1000
+            "%.2fMm".format(
+                App.instance.languageManager.getLanguage().locale,
+                (number * 100f / 100)
+            )
         }
 
 //        distance < 1000_000_000 -> {
@@ -164,9 +258,10 @@ fun formatDistanceStr(distance: Float, omitted: Boolean = true): String {
 //        }
 
         else -> {
+            val number = distance / 1000_000_000
             "%.2fBm".format(
                 App.instance.languageManager.getLanguage().locale,
-                (distance / 1000_000_000)
+                (number * 100f / 100)
             )
         }
     }
@@ -180,7 +275,7 @@ fun formatStar(star: Float?, default: String = "-"): String {
         if (star % 1f == 0f) {
             "%.0f".format(App.instance.languageManager.getLanguage().locale, star)
         } else {
-            "%.1f".format(App.instance.languageManager.getLanguage().locale, star)
+            "%.1f".format(App.instance.languageManager.getLanguage().locale, star * 10f / 10)
         }
     }
 }

module/joinus/src/main/java/com/adealink/weparty/joinus/data/FieldData.kt

@@ -39,7 +39,7 @@ sealed class StepField<T>(
         return Rlt.Success(Unit)
     }
 
-    fun isPriceField(): Boolean{
+    fun isPriceField(): Boolean {
         return fieldCode == FIELD_CODE_PRICE
     }
 }
@@ -400,9 +400,14 @@ enum class ExampleType(val type: Int) {
 @Parcelize
 data class StepFieldExample(
     @SerializedName("type") val type: Int, //0:图片，1:声音，2:视频，3:url
-    @SerializedName("value") val value: String, //数值
     @GsonNullable
     @SerializedName("title") val title: String?, //标题
     @GsonNullable
     @SerializedName("desc") val desc: String?, //描述
-) : Parcelable
+    @GsonNullable
+    @SerializedName("value") val value: String?, //数值
+) : Parcelable {
+    fun isValid(): Boolean {
+        return !title.isNullOrEmpty() || !desc.isNullOrEmpty() || !value.isNullOrEmpty()
+    }
+}

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/multiplechoice/MultipleChoiceWidgetView.kt

@@ -79,10 +79,14 @@ class MultipleChooseWidgetView(
             binding.tvDesc.show()
             binding.tvDesc.text = widget.fieldData.fieldDesc
         }
-        binding.btnExample.background = commonSelectedDrawable()
-        binding.btnExample.show(widget.fieldData.example != null)
-        binding.btnExample.onClick {
-            showExampleDialog()
+        if (widget.fieldData.example?.isValid() == true) {
+            binding.btnExample.background = commonSelectedDrawable()
+            binding.btnExample.show()
+            binding.btnExample.onClick {
+                showExampleDialog()
+            }
+        } else {
+            binding.btnExample.gone()
         }
 
         when (widgetData?.fieldData) {

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/multipletext/MultipleTextWidgetView.kt

@@ -105,10 +105,14 @@ class MultipleTextWidgetView(
             binding.tvDesc.show()
             binding.tvDesc.text = widget.fieldData.fieldDesc
         }
-        binding.btnExample.background = commonSelectedDrawable()
-        binding.btnExample.show(widget.fieldData.example != null)
-        binding.btnExample.onClick {
-            showExampleDialog()
+        if (widget.fieldData.example?.isValid() == true) {
+            binding.btnExample.background = commonSelectedDrawable()
+            binding.btnExample.show()
+            binding.btnExample.onClick {
+                showExampleDialog()
+            }
+        } else {
+            binding.btnExample.gone()
         }
 
         if (widget.fieldData.validate?.size == null) {

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/number/NumberWidgetView.kt

@@ -149,10 +149,14 @@ class NumberWidgetView(
             }
         }
 
-        binding.btnExample.background = commonSelectedDrawable()
-        binding.btnExample.show(widget.fieldData.example != null)
-        binding.btnExample.onClick {
-            showExampleDialog()
+        if (widget.fieldData.example?.isValid() == true) {
+            binding.btnExample.background = commonSelectedDrawable()
+            binding.btnExample.show()
+            binding.btnExample.onClick {
+                showExampleDialog()
+            }
+        } else {
+            binding.btnExample.gone()
         }
     }
 

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/picture/PictureWidgetView.kt

@@ -87,10 +87,14 @@ class PictureWidgetView(
             binding.tvDesc.show()
             binding.tvDesc.text = widget.fieldData.fieldDesc
         }
-        binding.btnExample.background = commonSelectedDrawable()
-        binding.btnExample.show(widget.fieldData.example != null)
-        binding.btnExample.onClick {
-            showExampleDialog()
+        if (widget.fieldData.example?.isValid() == true) {
+            binding.btnExample.background = commonSelectedDrawable()
+            binding.btnExample.show()
+            binding.btnExample.onClick {
+                showExampleDialog()
+            }
+        } else {
+            binding.btnExample.gone()
         }
 
         //图片

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/singlechoice/SingleChoiceWidgetView.kt

@@ -79,10 +79,14 @@ class SingleChoiceWidgetView(
             binding.tvDesc.show()
             binding.tvDesc.text = widget.fieldData.fieldDesc
         }
-        binding.btnExample.background = commonSelectedDrawable()
-        binding.btnExample.show(widget.fieldData.example != null)
-        binding.btnExample.onClick {
-            showExampleDialog()
+        if (widget.fieldData.example?.isValid() == true) {
+            binding.btnExample.background = commonSelectedDrawable()
+            binding.btnExample.show()
+            binding.btnExample.onClick {
+                showExampleDialog()
+            }
+        } else {
+            binding.btnExample.gone()
         }
 
         when (widgetData?.fieldData) {

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/singletext/SingleTextWidgetView.kt

@@ -105,10 +105,14 @@ class SingleTextWidgetView(
             binding.tvDesc.show()
             binding.tvDesc.text = widget.fieldData.fieldDesc
         }
-        binding.btnExample.background = commonSelectedDrawable()
-        binding.btnExample.show(widget.fieldData.example != null)
-        binding.btnExample.onClick {
-            showExampleDialog()
+        if (widget.fieldData.example?.isValid() == true) {
+            binding.btnExample.background = commonSelectedDrawable()
+            binding.btnExample.show()
+            binding.btnExample.onClick {
+                showExampleDialog()
+            }
+        } else {
+            binding.btnExample.gone()
         }
 
         if (widget.fieldData.validate?.size == null) {

module/joinus/src/main/java/com/adealink/weparty/widget/form/field/voice/VoiceWidgetView.kt

@@ -84,10 +84,14 @@ class VoiceWidgetView(
             binding.tvDesc.text = widget.fieldData.fieldDesc
         }
 
-        binding.btnExample.background = commonSelectedDrawable()
-        binding.btnExample.show(widget.fieldData.example != null)
-        binding.btnExample.onClick {
-            showExampleDialog()
+        if (widget.fieldData.example?.isValid() == true) {
+            binding.btnExample.background = commonSelectedDrawable()
+            binding.btnExample.show()
+            binding.btnExample.onClick {
+                showExampleDialog()
+            }
+        } else {
+            binding.btnExample.gone()
         }
 
         //录音部分

module/joinus/src/main/res/layout/activity_playmate_setting.xml

@@ -13,7 +13,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:top_bar_title="@string/join_us_title" />
+        app:top_bar_title="@string/join_us_playmate_skill_setting" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fl_content"

module/joinus/src/main/res/values/strings.xml

@@ -42,4 +42,5 @@
     <string name="join_us_step2_language_is_empty">请选择语言</string>
     <string name="join_us_step2_intro_is_empty">请输入介绍</string>
     <string name="join_us_category_form_is_emtpy">该品类暂不支持申请</string>
+    <string name="join_us_playmate_skill_setting">技能信息</string>
 </resources>

module/order/src/main/java/com/adealink/weparty/order/center/OrderCenterActivity.kt

@@ -49,7 +49,9 @@ class OrderCenterActivity : BaseActivity() {
 
     override fun initComponents() {
         super.initComponents()
-        OrderCenterDashboardComp(this, binding.vDashboard).attach()
+        OrderCenterDashboardComp(this, binding.vDashboard) {
+            loadData()
+        }.attach()
         OrderCenterSkillComp(this, binding.vSkills).attach()
         OrderCenterRecordComp(this, binding.vRecord).attach()
     }

module/order/src/main/java/com/adealink/weparty/order/center/comp/OrderCenterDashboardComp.kt

@@ -11,6 +11,7 @@ import com.adealink.weparty.commonui.BaseViewComponent
 import com.adealink.weparty.commonui.toast.util.showFailedToast
 import com.adealink.weparty.commonui.widget.CommonButton
 import com.adealink.weparty.module.playmate.PlaymateModule
+import com.adealink.weparty.module.playmate.data.PlaymateBusinessData
 import com.adealink.weparty.module.profile.Profile
 import com.adealink.weparty.module.wallet.Wallet
 import com.adealink.weparty.module.wallet.data.Currency
@@ -22,11 +23,13 @@ import com.adealink.weparty.R as APP_R
 
 class OrderCenterDashboardComp(
     lifecycleOwner: LifecycleOwner,
-    val binding: LayoutOrderCenterDashboardBinding
+    val binding: LayoutOrderCenterDashboardBinding,
+    val onLoadData: () -> Unit
 ) : BaseViewComponent(lifecycleOwner) {
 
     private val playmateViewModel by fastLazy { PlaymateModule.getPlaymateViewModel(requireActivity()) }
     private val orderCenterViewModel by activityViewModels<OrderCenterViewModel> { OrderViewModelFactory() }
+
     override fun initViews() {
         super.initViews()
         binding.clIncome.onClick {
@@ -40,36 +43,40 @@ class OrderCenterDashboardComp(
     override fun observeViewModel() {
         super.observeViewModel()
         orderCenterViewModel.businessDataLD.observe(viewLifecycleOwner) { business ->
-            binding.tvIncome.text = formatNumberStr(business?.weekIncome ?: 0f, false)
-            binding.tvExposure.text = formatNumberStr(business?.todayExposure ?: 0, false)
-            binding.tvVisitor.text = formatNumberStr(business?.visitor ?: 0, false)
-            if (business == null) {
-                binding.btnService.buttonType = CommonButton.BUTTON_NORMAL_1
-                binding.btnService.isEnabled = false
-                binding.tvService.text =
-                    getCompatString(APP_R.string.common_accept_order_open_service)
-                binding.tvServiceTips.text =
-                    getCompatString(APP_R.string.common_accept_order_open_service_tips)
-            } else if (business.businessOpen) {
-                binding.btnService.buttonType = CommonButton.BUSINESS_OPEN
-                binding.btnService.isEnabled = true
-                binding.tvService.text =
-                    getCompatString(APP_R.string.common_accept_order_opening_service)
-                binding.tvServiceTips.text =
-                    getCompatString(APP_R.string.common_accept_order_opening_service_tips)
-                binding.btnService.onClick {
-                    switchBusinessOpen(false)
-                }
-            } else {
-                binding.btnService.buttonType = CommonButton.BUTTON_NORMAL_1
-                binding.btnService.isEnabled = true
-                binding.tvService.text =
-                    getCompatString(APP_R.string.common_accept_order_open_service)
-                binding.tvServiceTips.text =
-                    getCompatString(APP_R.string.common_accept_order_open_service_tips)
-                binding.btnService.onClick {
-                    switchBusinessOpen(true)
-                }
+            updateBusiness(business)
+        }
+    }
+
+    private fun updateBusiness(business: PlaymateBusinessData?) {
+        binding.tvIncome.text = formatNumberStr(business?.weekIncome ?: 0f, false)
+        binding.tvExposure.text = formatNumberStr(business?.todayExposure ?: 0, false)
+        binding.tvVisitor.text = formatNumberStr(business?.visitor ?: 0, false)
+        if (business == null) {
+            binding.btnService.buttonType = CommonButton.BUTTON_NORMAL_1
+            binding.btnService.isEnabled = false
+            binding.tvService.text =
+                getCompatString(APP_R.string.common_accept_order_open_service)
+            binding.tvServiceTips.text =
+                getCompatString(APP_R.string.common_accept_order_open_service_tips)
+        } else if (business.businessOpen) {
+            binding.btnService.buttonType = CommonButton.BUSINESS_OPEN
+            binding.btnService.isEnabled = true
+            binding.tvService.text =
+                getCompatString(APP_R.string.common_accept_order_opening_service)
+            binding.tvServiceTips.text =
+                getCompatString(APP_R.string.common_accept_order_opening_service_tips)
+            binding.btnService.onClick {
+                switchBusinessOpen(false)
+            }
+        } else {
+            binding.btnService.buttonType = CommonButton.BUTTON_NORMAL_1
+            binding.btnService.isEnabled = true
+            binding.tvService.text =
+                getCompatString(APP_R.string.common_accept_order_open_service)
+            binding.tvServiceTips.text =
+                getCompatString(APP_R.string.common_accept_order_open_service_tips)
+            binding.btnService.onClick {
+                switchBusinessOpen(true)
             }
         }
     }
@@ -84,7 +91,7 @@ class OrderCenterDashboardComp(
                 }
 
                 is Rlt.Success -> {
-                    loadData()
+                    onLoadData.invoke()
                 }
             }
         }

module/order/src/main/res/layout/layout_playmate_order_list_item.xml

@@ -34,11 +34,16 @@
             android:id="@+id/tv_order_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
             android:fontFamily="@font/poppins_semibold"
+            android:gravity="end|center_vertical"
             android:includeFontPadding="false"
             android:textSize="12sp"
+            app:layout_constrainedWidth="true"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintStart_toEndOf="@id/tv_time"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="进行中"
             tools:textColor="@color/color_FFFFB836" />

module/playmate/src/main/java/com/adealink/weparty/playmate/setting/comp/OrderTimeRangeComp.kt

@@ -29,7 +29,10 @@ class OrderTimeRangeComp(
         viewModel.timeRangeLD.observe(viewLifecycleOwner) {
             val fromTime = it.first
             val toTime = it.second
-            binding.tvDesc.text = if (fromTime.ordinal < toTime.ordinal) {
+            binding.tvDesc.text = if (fromTime.ordinal == toTime.ordinal) {
+                //岂止时间相同,显示"全天"
+                getCompatString(R.string.playmate_order_setting_time_all_day_desc)
+            } else if (fromTime.ordinal < toTime.ordinal) {
                 getCompatString(
                     R.string.playmate_order_setting_time_today_desc,
                     fromTime.time,

module/playmate/src/main/res/values/strings.xml

@@ -26,6 +26,7 @@
     <string name="playmate_skill_order_status">Order Status</string>
     <string name="playmate_order_setting">接单设置</string>
     <string name="playmate_order_setting_time_range">接单时段</string>
+    <string name="playmate_order_setting_time_all_day_desc">全天</string>
     <string name="playmate_order_setting_time_today_desc">%1$s~%2$s</string>
     <string name="playmate_order_setting_time_tomorrow_desc">%1$s~次日%2$s</string>
     <string name="playmate_order_setting_time_title">选择接单时段</string>