Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊

This commit is contained in:
hch
2023-10-23 15:57:47 +08:00
7 changed files with 136 additions and 21 deletions

View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/background_my_arnings"
@@ -63,8 +64,12 @@
android:gravity="center_vertical">
<TextView
android:id="@+id/withdrawal_sum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxWidth="100dp"
android:singleLine="true"
android:text="1000"
android:textColor="@color/white"
android:textSize="18sp" />
@@ -89,9 +94,13 @@
android:textSize="14sp" />
<TextView
android:id="@+id/withdrawal_money"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:ellipsize="end"
android:maxWidth="100dp"
android:singleLine="true"
android:text="$ 10"
android:textColor="@color/white"
android:textSize="14sp" />
@@ -200,10 +209,20 @@
app:cardCornerRadius="14dp"
app:cardElevation="0dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/my_arn_list"
<io.rong.imkit.widget.refresh.SmartRefreshLayout
android:id="@+id/swipeRefreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent">
<com.yanzhenjie.recyclerview.SwipeRecyclerView
android:id="@+id/my_arn_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/view_my_arn_item_holder" />
</io.rong.imkit.widget.refresh.SmartRefreshLayout>
</androidx.cardview.widget.CardView>
<FrameLayout