瀏覽代碼

1.游客状态

shihuiyun 2 年之前
父節點
當前提交
0578f06f06

+ 3 - 0
app/src/main/java/com/zswc/creativity/activity/CollectDetailsActivity.kt

@@ -162,6 +162,9 @@ class CollectDetailsActivity : MBActivity<CollectDetailsVModel, ActivityCollectD
             vm.toShowCertificate()
 
         }
+        binding.llCertificateTo.onClick {
+            vm.toShowCertificate()
+        }
 
         binding.scroll.setOnScrollChangeListener { v, x, y, oldX, oldY ->
 

+ 1 - 1
app/src/main/java/com/zswc/creativity/adapter/ImagesAdapter.kt

@@ -22,7 +22,7 @@ class ImagesAdapter() : BAdapter<String, BaseDataBindingHolder<ItemImagesBinding
 
     override fun convert(holder: BaseDataBindingHolder<ItemImagesBinding>, item: String) {
         holder.dataBinding?.item = item
-        GlideUtils.lImg(context, item, 16, holder.dataBinding?.imgDeatils)
+        GlideUtils.lImg(context, item, holder.dataBinding?.imgDeatils)
 
 
     }

+ 65 - 12
app/src/main/java/com/zswc/creativity/fragment/HomeSaleFragmet.kt

@@ -1,34 +1,37 @@
 package com.zswc.creativity.fragment
 
 import android.graphics.Color
+import android.graphics.Typeface
 import android.os.Bundle
 import android.text.TextUtils
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.GridView
 import android.widget.LinearLayout
-import androidx.fragment.app.Fragment
 import com.hwangjr.rxbus.annotation.Subscribe
 import com.hwangjr.rxbus.annotation.Tag
 import com.qmuiteam.qmui.kotlin.onClick
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+import com.qmuiteam.qmui.util.QMUIResHelper
 import com.qmuiteam.qmui.widget.tab.QMUITab
 import com.qmuiteam.qmui.widget.tab.QMUITabBuilder
+import com.qmuiteam.qmui.widget.tab.QMUITabIndicator
+import com.qmuiteam.qmui.widget.tab.QMUITabSegment
 import com.tencent.mmkv.MMKV
-import com.ysnows.base.utils.B
 import com.ysnows.base.utils.UiUtils
 import com.zswc.creativity.App
 import com.zswc.creativity.R
 import com.zswc.creativity.adapter.HomeSaleAdapter
-import com.zswc.creativity.adapter.MallListAdapter
 import com.zswc.creativity.adapter.TabsAdapter
 import com.zswc.creativity.base.MBRFragment
-import com.zswc.creativity.base.MBTabFragment
 import com.zswc.creativity.config.ConfigRx
 import com.zswc.creativity.databinding.FragmentHomeSaleBinding
 import com.zswc.creativity.model.SellSuessBean
 import com.zswc.creativity.vmodel.HomeSaleVModel
 
+
 /**
  * 寄售
  *on 2022/8/5
@@ -49,15 +52,16 @@ class HomeSaleFragmet : MBRFragment<HomeSaleVModel, HomeSaleAdapter, FragmentHom
             adapter().clearList()
             onRefresh()
         }
-        var token= MMKV.defaultMMKV().decodeString("token", "")
-         if(token.equals("")){
-             vm.isLogin.value=false
-        }else{
-             //登录之后访问的接口
-             vm.getLable()
+        var token = MMKV.defaultMMKV().decodeString("token", "")
+        if (token.equals("")) {
+            vm.isLogin.value = false
+        } else {
+            //登录之后访问的接口
+            vm.getLable()
         }
 
         vm.list.observe(this) {
+
             initGridView()
         }
         vm.isRefresh.observe(this) {
@@ -147,12 +151,61 @@ class HomeSaleFragmet : MBRFragment<HomeSaleVModel, HomeSaleAdapter, FragmentHom
 
     }
 
+
+//    fun initTab() {//测试
+//        var mTabSegment = binding.tabSegment
+//        val tabBuilder: QMUITabBuilder = mTabSegment.tabBuilder()
+//        tabBuilder
+//                .skinChangeWithTintColor(false)
+//                .setSelectColor(Color.parseColor("#38D3D3"))
+//                .setNormalColor(Color.parseColor("#333333"))
+//                .setTypeface(Typeface.DEFAULT_BOLD, Typeface.DEFAULT)
+//                .setDynamicChangeIconColor(false)
+//        mTabSegment.setIndicator(QMUITabIndicator(QMUIDisplayHelper.dp2px(context(), 3), false, true))
+//
+//        val tabs = ArrayList<QMUITab>()
+//        for (cat in vm.list.value!!) {
+//            val item = tabBuilder
+//                    .setText(cat.name)
+//                    .build(context)
+//
+//            tabs.add(item)
+//        }
+//        tabs.forEach {
+//            mTabSegment.addTab(it)
+//        }
+//
+////        for (item in vm.list.value!!) {
+////            Log.e("-shy-", "tem.name=: "+item.name )
+////            mTabSegment.addTab(tabBuilder.setText(item.name).build(context))
+////        }
+//
+//        val space = QMUIDisplayHelper.dp2px(context, 16)
+//        mTabSegment.mode = QMUITabSegment.MODE_SCROLLABLE
+//        mTabSegment.setItemSpaceInScrollMode(space)
+//        mTabSegment.setPadding(space, 0, space, 0)
+//        mTabSegment.addOnTabSelectedListener(object : QMUITabSegment.OnTabSelectedListener {
+//            override fun onTabSelected(index: Int) {
+//            }
+//
+//            override fun onTabUnselected(index: Int) {
+//            }
+//
+//            override fun onTabReselected(index: Int) {
+//            }
+//
+//            override fun onDoubleTap(index: Int) {
+//            }
+//        })
+//
+//    }
+
     fun initGridView() {
 
         // item宽度
-        val itemWidth = UiUtils.dp2Px(context, 65f)
+        val itemWidth = UiUtils.dp2Px(context, 70f)
         // item之间的间隔
-        val itemPaddingH = UiUtils.dp2Px(context, 10f)
+        val itemPaddingH = UiUtils.dp2Px(context, 2f)
         val size: Int = vm.list.value!!.size
         // 计算GridView宽度
 

+ 1 - 1
app/src/main/java/com/zswc/creativity/model/SecondListTo.kt

@@ -12,7 +12,7 @@ data class SecondListTo(var id: String,
                         var cancelAt:String, var createAt:String, var orderNo:String,
                         var payAt:String, var payPrice:String, var payType:String, var proInfo:String,
                         var   memberHeadimg:String, var   memberName:String,
-                        var resaleTime:String,
+                        var resaleTime:String,var  sellingTime:String,
                         var resalePrice:String,
                         var proInfoObj:ProInfo, var cancelAutoAt:String, var resaleStatus:Int, ):IModel{
 

+ 1 - 1
app/src/main/java/com/zswc/creativity/utils/PopuCerticUtils.kt

@@ -44,7 +44,7 @@ object PopuCerticUtils {
         tvName.text = bean.name
         tvAuther.text="创持文化"
         tvSendOver.text="蚂蚁链"
-        tvAddress.text=bean.contractAddress
+        tvAddress.text=bean.collectorsHash
         tvContent.text=bean.proInfoObj?.instructions
 
         imgClose.onClick {

+ 2 - 0
app/src/main/res/layout/activity_all_collect_details.xml

@@ -331,6 +331,8 @@
                             android:layout_width="match_parent"
                             android:orientation="vertical"
                             android:layout_marginTop="14dp"
+                            android:layout_marginStart="15dp"
+                            android:layout_marginEnd="15dp"
                             android:layout_height="wrap_content">
 
 

+ 2 - 0
app/src/main/res/layout/activity_collect_details.xml

@@ -321,6 +321,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="14dp"
+                            android:layout_marginStart="15dp"
+                            android:layout_marginEnd="15dp"
                             android:orientation="vertical">
 
 

+ 33 - 17
app/src/main/res/layout/activity_market_details.xml

@@ -7,7 +7,8 @@
         <variable
             name="vm"
             type="com.zswc.creativity.vmodel.MarketDetailsVModel" />
-        <import type="android.view.View"/>
+
+        <import type="android.view.View" />
 
     </data>
 
@@ -193,11 +194,9 @@
 
             <View
                 android:layout_width="match_parent"
-                android:background="#ECECEC"
+                android:layout_height="@dimen/dp_1"
                 android:layout_marginTop="8dp"
-                android:layout_height="@dimen/dp_1"/>
-
-
+                android:background="#ECECEC" />
 
 
             <LinearLayout
@@ -211,15 +210,12 @@
                     android:layout_height="wrap_content"
                     android:text="订单信息"
                     android:textColor="#222222"
-                    android:textSize="14sp"
-                   />
+                    android:textSize="14sp" />
 
 
             </LinearLayout>
 
 
-
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -273,19 +269,42 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="14dp"
+                android:visibility="@{vm.bean.resaleStatus==3?View.VISIBLE:View.GONE}"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="付款时间"
+                    android:textColor="#222222"
+                    android:textSize="13sp" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="right"
+                    android:text="@{vm.bean.sellingTime}"
+                    android:textColor="#888888"
+                    android:textSize="13sp" />
+
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginStart="25dp"
                 android:layout_marginTop="30dp"
                 android:layout_marginEnd="25dp"
                 android:visibility="@{vm.bean.resaleStatus==2?View.VISIBLE:View.GONE}">
 
 
-
-
-
                 <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
                     android:layout_width="0dp"
-                    android:layout_weight="1"
                     android:layout_height="40dp"
+                    android:layout_weight="1"
                     android:text="寄售中"
                     android:textColor="@color/white"
                     android:textSize="16sp"
@@ -303,17 +322,14 @@
                     android:text="取消寄售"
                     android:textColor="@color/white"
                     android:textSize="16sp"
-                    app:qmui_borderColor="#56D7EA"
                     app:qmui_backgroundColor="#56D7EA"
+                    app:qmui_borderColor="#56D7EA"
                     app:qmui_borderWidth="1dp"
                     app:qmui_radius="4dp" />
 
             </LinearLayout>
 
 
-
-
-
         </LinearLayout>
 
     </LinearLayout>

+ 30 - 26
app/src/main/res/layout/activity_my_info.xml

@@ -42,10 +42,10 @@
                 android:layout_width="38dp"
                 android:layout_height="38dp"
                 android:layout_marginEnd="8dp"
-                 app:url="@{vm.imagUrl}"
-                app:qmui_border_color="@color/translucent"
                 android:background="@drawable/ic_default_avatar"
-                app:qmui_is_oval="true" />
+                app:qmui_border_color="@color/translucent"
+                app:qmui_is_oval="true"
+                app:url="@{vm.imagUrl}" />
 
 
             <ImageView
@@ -74,23 +74,22 @@
 
 
             <TextView
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:text="昵称"
                 android:textColor="@color/text_title"
                 android:textSize="15sp" />
 
             <com.ysnows.base.widget.DelEditText
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:text="@={vm.name}"
+                android:layout_weight="1"
                 android:background="@null"
-                android:hint="请输入"
                 android:gravity="right|center_vertical"
+                android:hint="请输入"
                 android:paddingStart="12dp"
                 android:paddingEnd="8dp"
+                android:text="@={vm.name}"
                 android:textColor="@color/text_title"
                 android:textColorHint="#999999"
                 android:textSize="15sp" />
@@ -121,25 +120,25 @@
 
 
             <TextView
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:text="手机号"
                 android:textColor="@color/text_title"
                 android:textSize="15sp" />
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="6dp"
+                android:layout_weight="1"
+                android:gravity="right"
                 android:text="@{vm.user.phone}"
                 android:textColor="#999999"
-                android:layout_marginEnd="6dp"
                 android:textSize="15sp" />
 
 
-
-
         </LinearLayout>
+
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_1"
@@ -158,23 +157,28 @@
 
 
             <TextView
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:text="区域块地址"
                 android:textColor="@color/text_title"
                 android:textSize="15sp" />
 
-            <TextView
-                android:layout_width="wrap_content"
+            <HorizontalScrollView
+                android:layout_width="0dp"
+                android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:text="@{vm.user.walletAddress}"
-                android:singleLine="true"
-                android:ellipsize="middle"
-                android:textColor="#999999"
-                android:layout_marginEnd="6dp"
-                android:layout_marginStart="6dp"
-                android:textSize="15sp" />
+                android:scrollbars="none">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="6dp"
+                    android:layout_marginEnd="6dp"
+                    android:layout_gravity="right"
+                    android:text="@{vm.user.walletAddress}"
+                    android:textColor="#999999"
+                    android:textSize="15sp" />
+
+            </HorizontalScrollView>
 
         </LinearLayout>
 
@@ -184,10 +188,10 @@
             android:layout_height="46dp"
             android:layout_marginStart="30dp"
             android:layout_marginTop="30dp"
-            android:onClick="@{v->vm.toSave()}"
             android:layout_marginEnd="30dp"
             android:background="@drawable/bg_logo_but"
             android:gravity="center"
+            android:onClick="@{v->vm.toSave()}"
             android:text="保存"
             android:textColor="@color/white"
             android:textSize="20sp" />

+ 1 - 1
app/src/main/res/layout/activity_sell_suess.xml

@@ -49,7 +49,7 @@
                 android:onClick="@{v->vm.toGoHome()}"
                 app:qmui_borderColor="#DCDCDC"
                 app:qmui_borderWidth="@dimen/dp_1"
-                android:text="返首页"
+                android:text="返首页"
                 android:textColor="@color/text_title"
                 android:textSize="16sp"
                 android:layout_height="40dp"/>

+ 3 - 0
app/src/main/res/layout/activity_tibetan_details.xml

@@ -231,6 +231,9 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="14dp"
+                            android:layout_marginStart="15dp"
+                            android:layout_marginEnd="15dp"
+
                             >
 
 

+ 24 - 9
app/src/main/res/layout/fragment_home_sale.xml

@@ -124,13 +124,20 @@
             android:background="@drawable/bg_sell_top"
             android:orientation="vertical">
 
+
+<!--            <com.qmuiteam.qmui.widget.tab.QMUITabSegment-->
+            <!--                android:id="@+id/tab_Segment"-->
+            <!--                android:layout_width="match_parent"-->
+            <!--                android:background="@color/white"-->
+            <!--                android:layout_height="40dp"/>-->
+
             <HorizontalScrollView
                 android:id="@+id/srcollview"
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
-                android:layout_marginStart="8dp"
+                android:layout_marginStart="4dp"
                 android:layout_marginTop="5dp"
-                android:layout_marginEnd="8dp"
+                android:layout_marginEnd="4dp"
                 android:background="@color/white"
                 android:fillViewport="true"
                 android:scrollbars="none"
@@ -226,16 +233,24 @@
                 android:id="@+id/refresh_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginStart="15dp">
+              >
 
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/recycler_view"
+                <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-                    app:spanCount="2"
-                    tools:listitem="@layout/item_home_sale" />
+                    android:paddingStart="13dp"
+                    android:layout_height="match_parent">
+
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/recycler_view"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                        app:spanCount="2"
+                        tools:listitem="@layout/item_home_sale" />
+
+                </RelativeLayout>
             </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         </LinearLayout>

+ 1 - 2
app/src/main/res/layout/item_certic.xml

@@ -244,9 +244,9 @@
                 android:orientation="horizontal"
                 android:layout_marginTop="12dp"
                 android:layout_marginStart="42dp"
-                android:layout_marginEnd="15dp"
                 android:visibility="gone"
                 tools:visibility="visible"
+                android:layout_marginEnd="15dp"
                 android:layout_height="wrap_content">
 
                 <TextView
@@ -259,7 +259,6 @@
 
                 <TextView
                     android:id="@+id/tv_has"
-                    android:text="月光碎落一地"
                     android:textSize="14sp"
                     android:textColor="#666666"
                     android:layout_width="match_parent"

+ 96 - 95
app/src/main/res/layout/item_home_sale.xml

@@ -23,125 +23,126 @@
         android:id="@+id/ll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="15dp"
+        android:layout_marginEnd="13dp"
         android:layout_marginBottom="@dimen/dp_10"
         android:orientation="vertical">
 
 
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+        <!--        <androidx.cardview.widget.CardView-->
+        <!--            android:layout_width="match_parent"-->
+        <!--            app:cardBackgroundColor="#EDffffff"-->
+        <!--            app:cardCornerRadius="16dp"-->
+        <!--            app:cardElevation="1dp"-->
+        <!--            app:contentPadding="2dp"-->
+        <!--            android:layout_height="wrap_content">-->
+
+        <!--        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout-->
+        <!--            android:id="@+id/ll_center"-->
+        <!--            android:layout_width="match_parent"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:background="@color/white"-->
+        <!--            android:orientation="vertical"-->
+        <!--            app:qmui_backgroundColor="@color/white"-->
+        <!--            app:qmui_borderWidth="@dimen/dp_1"-->
+        <!--            app:qmui_borderColor="#0F000000"-->
+        <!--            app:qmui_radius="16dp">-->
+
+        <com.qmuiteam.qmui.layout.QMUILinearLayout
             android:id="@+id/ll_center"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_margin="@dimen/dp_2"
             android:background="@color/white"
             android:orientation="vertical"
-            app:qmui_borderColor="@null"
-            app:qmui_backgroundColor="@color/white"
             app:qmui_radius="16dp"
-           >
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+            app:qmui_shadowAlpha="0.2"
+            app:qmui_shadowElevation="3dp">
 
 
-            <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="139dp"
-                android:src="@drawable/bg_need_error"
-                app:url="@{item.cover}"
-                app:qmui_border_color="@color/translucent"
-                app:qmui_corner_radius="12dp" />
-
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                    android:layout_width="wrap_content"
-                    app:qmui_radius="12dp"
-                    app:qmui_borderColor="#333333"
-                    app:qmui_backgroundColor="#333333"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginTop="10dp"
-                    android:visibility="@{item.proInfoObj.syState==2?View.VISIBLE:View.GONE}"
-                    android:paddingStart="12dp"
-                    android:paddingEnd="12dp"
-                    android:paddingTop="2dp"
-                    android:paddingBottom="2dp"
-                    android:layout_height="wrap_content">
-                    <TextView
-                        android:text="寄售中"
-                        android:textColor="@color/white"
-                        android:textSize="12sp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
-
-                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:orientation="vertical">
 
-            </FrameLayout>
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginEnd="10dp"
-                android:text="@{item.name}"
-                android:textColor="@color/text_title"
-                android:textSize="14sp" />
+                <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="139dp"
+                    android:src="@drawable/bg_need_error"
+                    app:qmui_border_color="@color/translucent"
+                    app:qmui_corner_radius="12dp"
+                    app:url="@{item.cover}" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="2dp"
-                android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="¥"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginEnd="10dp"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:text="@{item.name}"
                     android:textColor="@color/text_title"
-                    android:textSize="10sp" />
+                    android:textSize="14sp" />
 
-                <TextView
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@{item.resalePrice}"
-                    android:textColor="@color/text_title"
-                    android:textSize="20sp" />
+                    android:layout_marginStart="10dp"
+                    android:layout_marginTop="2dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="¥"
+                        android:textColor="@color/text_title"
+                        android:textSize="10sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{item.resalePrice}"
+                        android:textColor="@color/text_title"
+                        android:textSize="20sp" />
+
+                </LinearLayout>
 
+                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="16dp"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginTop="7dp"
+                    android:layout_marginEnd="20dp"
+                    android:layout_marginBottom="14dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingStart="4dp"
+                    android:paddingEnd="10dp"
+                    app:qmui_backgroundColor="#33D8D8D8"
+                    app:qmui_borderColor="@color/translucent"
+                    app:qmui_radius="4dp">
+
+                    <ImageView
+                        android:layout_width="10dp"
+                        android:layout_height="10dp"
+                        android:src="@drawable/ct_sale" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:singleLine="true"
+                        android:text="@{`订单编号·`+item.orderNo}"
+                        android:textColor="#333333"
+                        android:textSize="8sp" />
+
+                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
             </LinearLayout>
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                android:layout_width="match_parent"
-                android:orientation="horizontal"
-                android:layout_marginStart="10dp"
-                android:layout_marginEnd="20dp"
-                android:layout_marginBottom="14dp"
-                android:layout_marginTop="7dp"
-                app:qmui_radius="4dp"
-                app:qmui_borderColor="@color/translucent"
-                app:qmui_backgroundColor="#D8D8D8"
-                android:paddingStart="4dp"
-                android:gravity="center_vertical"
-                android:paddingEnd="10dp"
-                android:layout_height="16dp">
-                <ImageView
-                    android:src="@drawable/ct_sale"
-                    android:layout_width="10dp"
-                    android:layout_height="10dp"/>
-                  <TextView
-                      android:text="@{`订单编号·`+item.orderNo}"
-                      android:textColor="#333333"
-                      android:textSize="8sp"
-                      android:singleLine="true"
-                      android:ellipsize="end"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"/>
-
-            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
-
-
-
-
-
-        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+        </com.qmuiteam.qmui.layout.QMUILinearLayout>
 
 
     </LinearLayout>

+ 2 - 0
app/src/main/res/layout/item_tabs_img.xml

@@ -25,6 +25,8 @@
         android:textSize="14sp"
         android:textColor="#222222"
         android:text="全部"
+        android:singleLine="true"
+        android:ellipsize="middle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>