Commit 5fb5b61d by 刘鹏

Merge branch 'feat/lp/lp_add_numtag' into 'release'

feat: 预约订单红点改数字

See merge request app_android_lib/YDL-Component!278
parents 6e4c998c 7639d1ff
...@@ -14,7 +14,7 @@ buildscript { ...@@ -14,7 +14,7 @@ buildscript {
ydlrouter_version = '1.2.3' ydlrouter_version = '1.2.3'
constrait_support_version = '1.0.2' constrait_support_version = '1.0.2'
componentVersion = "0.3.0.9" componentVersion = "0.3.0.11"
} }
repositories { repositories {
mavenCentral() mavenCentral()
......
...@@ -2,5 +2,6 @@ package com.yidianling.user.bean ...@@ -2,5 +2,6 @@ package com.yidianling.user.bean
data class EvaluateOrderBean( data class EvaluateOrderBean(
val consultOrder: Boolean? = null, val consultOrder: Boolean? = null,
val listenOrder: Boolean? = null val listenOrder: Boolean? = null,
val consultOrderNum: Int? = null
) )
...@@ -29,7 +29,6 @@ import com.ydl.ydlcommon.utils.YdlBuryPointUtil ...@@ -29,7 +29,6 @@ import com.ydl.ydlcommon.utils.YdlBuryPointUtil
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils.Companion.count import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils.Companion.count
import com.ydl.ydlcommon.view.dialog.YDLShareDialog import com.ydl.ydlcommon.view.dialog.YDLShareDialog
import com.ydl.ydlcommon.view.dialog.YDLShareDialog.Companion.style4 import com.ydl.ydlcommon.view.dialog.YDLShareDialog.Companion.style4
import com.yidianling.consultant.api.IConsultantService
import com.yidianling.dynamic.api.IDynamicService import com.yidianling.dynamic.api.IDynamicService
import com.yidianling.im.api.service.IImService import com.yidianling.im.api.service.IImService
import com.yidianling.im.message.param.MsgListParam import com.yidianling.im.message.param.MsgListParam
...@@ -55,7 +54,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers ...@@ -55,7 +54,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.functions.Consumer import io.reactivex.functions.Consumer
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.user_mine_fragment_mine.* import kotlinx.android.synthetic.main.user_mine_fragment_mine.*
import java.util.*
/** /**
* 我的Tab * 我的Tab
...@@ -211,9 +209,14 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View. ...@@ -211,9 +209,14 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
iv_confide_tip.visibility = View.GONE iv_confide_tip.visibility = View.GONE
getLocal().setConfide(false) getLocal().setConfide(false)
} }
val orderNum = response.data?.consultOrderNum ?: 0
if (response.data.consultOrder == true) { if (orderNum > 0) {
iv_order_tip.visibility = View.VISIBLE iv_order_tip.visibility = View.VISIBLE
if (orderNum > 99) {
iv_order_tip.text = "99+"
} else {
iv_order_tip.text = "$orderNum"
}
getLocal().setConsult(true) getLocal().setConsult(true)
} else { } else {
iv_order_tip.visibility = View.GONE iv_order_tip.visibility = View.GONE
......
...@@ -416,15 +416,19 @@ ...@@ -416,15 +416,19 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<ImageView <TextView
tools:text="11"
android:id="@+id/iv_order_tip" android:id="@+id/iv_order_tip"
android:layout_width="8dp" android:layout_width="12dp"
android:layout_height="8dp" android:layout_height="12dp"
android:src="@drawable/user_mine_background_red_point_new_coupon" android:gravity="center"
android:textSize="8dp"
android:textColor="@color/white"
android:background="@drawable/user_mine_background_red_point_new_coupon"
android:visibility="gone" android:visibility="gone"
app:layout_constraintCircle="@id/iv_trade_order" app:layout_constraintCircle="@id/iv_trade_order"
app:layout_constraintCircleAngle="45" app:layout_constraintCircleAngle="45"
app:layout_constraintCircleRadius="13dp" app:layout_constraintCircleRadius="10dp"
tools:visibility="visible" /> tools:visibility="visible" />
<TextView <TextView
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment