Commit c8a25bd1 by 刘鹏

Merge branch 'fix/lp/lp_fix_message_num' into 'release'

feat: 系统消息底部加间距、我的咨询消息按接口返回数据展示,不做特殊处理

See merge request app_android_lib/YDL-Component!292
parents 801171a4 f10fa71f
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
...@@ -28,6 +27,7 @@ ...@@ -28,6 +27,7 @@
android:id="@+id/lv_content" android:id="@+id/lv_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="30dp"
android:background="#f3f3f3" android:background="#f3f3f3"
android:divider="@null" /> android:divider="@null" />
......
...@@ -214,12 +214,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View. ...@@ -214,12 +214,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
val orderNum = response.data?.consultOrderNum ?: 0 val orderNum = response.data?.consultOrderNum ?: 0
if (orderNum > 0) { if (orderNum > 0) {
iv_order_tip.visibility = View.VISIBLE iv_order_tip.visibility = View.VISIBLE
val numberStr = if (orderNum > 99) { iv_order_tip.text = orderNum.toString()
"99+"
} else {
"$orderNum"
}
iv_order_tip.text = numberStr
getLocal().setConsult(true) getLocal().setConsult(true)
getLocal().setConsultNum(orderNum) getLocal().setConsultNum(orderNum)
} else { } else {
......
...@@ -428,7 +428,7 @@ ...@@ -428,7 +428,7 @@
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="10dp" app:layout_constraintCircleRadius="10dp"
tools:text="9" tools:text="911"
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