shy před 2 roky
rodič
revize
7c3d60f6c2

+ 2 - 0
app/build.gradle

@@ -127,6 +127,8 @@ dependencies {
 //    addComponent 'gaode'
    addComponent 'lookimg'
 
+    //首页导航图
+    implementation 'cn.bingoogolapple:bga-banner:2.2.6@aar'//首页导航图
 
     //微信sdk
     implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'

+ 20 - 0
app/src/main/java/com/quansu/creativity/adapter/RecommedAdapter.kt

@@ -0,0 +1,20 @@
+package com.quansu.creativity.adapter
+
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.quansu.creativity.R
+import com.quansu.creativity.databinding.ItemRecommedBinding
+import com.quansu.creativity.model.AmountList
+
+import com.ysnows.base.base.BAdapter
+
+class RecommedAdapter() : BAdapter<AmountList,
+        BaseDataBindingHolder<ItemRecommedBinding>>(R.layout.item_recommed) {
+
+
+    override fun convert(holder: BaseDataBindingHolder<ItemRecommedBinding>, item: AmountList) {
+
+        holder.dataBinding?.item = item
+
+
+    }
+}

+ 98 - 0
app/src/main/java/com/quansu/creativity/fragment/HomeFirstFragment.kt

@@ -1,8 +1,18 @@
 package com.quansu.creativity.fragment
 
+import android.graphics.Typeface
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.cardview.widget.CardView
+import androidx.fragment.app.Fragment
+import androidx.viewpager.widget.ViewPager
+import cn.bingoogolapple.bgabanner.BGABanner
+import coil.load
+import com.quansu.creativity.R
+import com.quansu.creativity.adapter.FragAdapter
 import com.quansu.creativity.base.MBFragment
 import com.quansu.creativity.databinding.FragmentHomeFirstBinding
 import com.quansu.creativity.databinding.FragmentHomeMyBinding
@@ -10,6 +20,7 @@ import com.quansu.creativity.databinding.FragmentOwnerimgBinding
 import com.quansu.creativity.vmodel.HomeFirstVModel
 import com.quansu.creativity.vmodel.HomeMyVModel
 import com.quansu.creativity.vmodel.OwnerImgVModel
+import java.util.ArrayList
 
 /**
  * 首页
@@ -18,13 +29,100 @@ import com.quansu.creativity.vmodel.OwnerImgVModel
  */
 class HomeFirstFragment : MBFragment<HomeFirstVModel, FragmentHomeFirstBinding>(){
 
+    var fragments = emptyArray<Fragment>()
+    private var adapter: FragAdapter? = null
+    var type=1//1精选 2预约
+
 
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
 
+        initViewPage()
+
+    }
+    fun initViewPage(){
+
+        val oneFragment = RecommendFragment()
+        val twoFragment = RecommendFragment()
+
+        fragments = arrayOf(
+                oneFragment,
+                twoFragment
+        )
+        adapter = FragAdapter(childFragmentManager, fragments.toMutableList())
+        binding.viewPager.offscreenPageLimit = 2
+        binding.viewPager.adapter = adapter
+        binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
+            override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
+            override fun onPageSelected(position: Int) {
+                choseType(position)
+            }
+
+            override fun onPageScrollStateChanged(state: Int) {}
+        })
+
+        binding.tvMyChose.setOnClickListener(View.OnClickListener { view: View? -> binding.viewPager.currentItem = 0 })
+        binding.tvMyAppointment.setOnClickListener(View.OnClickListener { view: View? -> binding.viewPager.currentItem = 1 })
+
+
+
+    }
+
+    private fun choseType(position: Int) {
+        when (position) {
+            0 -> {
+                type=1
+                binding.tvMyChose.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
+                binding.tvMyAppointment.typeface = Typeface.DEFAULT
+
+
+
+            }
+            1 -> {
+                type=2
+                binding.tvMyChose.typeface =  Typeface.DEFAULT
+                binding.tvMyAppointment.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
 
+            }
+            else -> {
+            }
+        }
     }
 
+
+
+
+//    fun initBanner(bean : AdInfo){
+//
+//        var list= ArrayList<String>()
+//
+//        if(bean.ad_content.isNotEmpty()){
+//            for(item in bean.ad_content){
+//                list.add(item.img)
+//            }
+//        }
+//
+//        if (list.size > 1) {
+//            binding.banner.setAutoPlayAble(true)
+//        } else {
+//            binding.banner.setAutoPlayAble(false)
+//        }
+//
+//        binding.banner.setAdapter(BGABanner.Adapter<CardView, String?> { banner, itemView, model, position -> //图片布局
+//            val simpleDraweeView = itemView.findViewById<ImageView>(R.id.sdv_item_fresco_content)
+//            simpleDraweeView.load(model)
+//        })
+//        binding.banner.setData(R.layout.item_fresco, list, null)
+//        binding.banner.setAutoPlayInterval(6000)
+//        binding.banner.setDelegate { banner, itemView, model, position ->
+//
+//            //todo: var ad = beanlist[position]
+//
+//        }
+//
+//    }
+
+
     override fun vmClass(): Class<HomeFirstVModel> {
         return HomeFirstVModel::class.java
     }

+ 2 - 7
app/src/main/java/com/quansu/creativity/fragment/HomeMyFragment.kt

@@ -5,12 +5,10 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import com.quansu.creativity.base.MBFragment
 import com.quansu.creativity.databinding.FragmentHomeMyBinding
-import com.quansu.creativity.databinding.FragmentOwnerimgBinding
 import com.quansu.creativity.vmodel.HomeMyVModel
-import com.quansu.creativity.vmodel.OwnerImgVModel
 
 /**
- * 车辆图片
+ * 寄售
  *Created by shihuiyun
  *on 2020/9/11
  */
@@ -20,10 +18,7 @@ class HomeMyFragment : MBFragment<HomeMyVModel, FragmentHomeMyBinding>(){
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
 
-        vm.url.value=arguments?.getString("img")
-        vm.name.value=arguments?.getString("name")
-        vm.weight.value=arguments?.getString("weight")
-        vm.volume.value=arguments?.getString("volume")
+
 
 
     }

+ 91 - 0
app/src/main/java/com/quansu/creativity/fragment/RecommendFragment.kt

@@ -0,0 +1,91 @@
+package com.quansu.creativity.fragment
+
+import android.Manifest
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.quansu.creativity.adapter.RecommedAdapter
+import com.quansu.creativity.base.MBFragment
+import com.quansu.creativity.databinding.FragmentHomeMyBinding
+import com.quansu.creativity.databinding.FragmentOwnerimgBinding
+import com.quansu.creativity.databinding.FragmentRecommendBinding
+import com.quansu.creativity.vmodel.HomeMyVModel
+import com.quansu.creativity.vmodel.OwnerImgVModel
+import com.quansu.creativity.vmodel.RecommendVModel
+import com.tencent.mmkv.MMKV
+import kotlinx.coroutines.launch
+
+/**
+ * 精选推荐
+ *Created by shihuiyun
+ *on 2020/9/11
+ */
+class RecommendFragment : MBFragment<RecommendVModel, FragmentRecommendBinding>(){
+
+
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+        //禁止下拉刷新和下拉加载
+         binding.recyclerView.overScrollMode= View.OVER_SCROLL_NEVER
+        vm.list.observe(this, androidx.lifecycle.Observer {
+            if (null == it) {
+                return@Observer
+            }
+
+            setAdapter()
+
+        })
+
+
+    }
+
+    fun setAdapter(){
+
+        var adapter=RecommedAdapter()
+        binding.recyclerView.adapter=adapter
+        //todo:获得数据设置数据
+       // adapter.addData(list)
+
+        adapter.setOnItemClickListener { adapter, view, position ->
+            var isEnable= MMKV.defaultMMKV().getBoolean("Enable",false)
+            if(isEnable) {
+                //拨打电话
+//                launch {
+//                    val requestPermissions = PermissionManager.requestPermissions(
+//                            this@SpaceDetailActivity, 1000, Manifest.permission.CALL_PHONE
+//                    )
+//                    if (requestPermissions is PermissionResult.PermissionGranted) {
+//                        //拨打电话
+//                        vm.bean.value?.fishpond_tel?.let {
+//
+//                            PopuCallPhoneUtils.show(context(), it, binding.imgCallPhone)
+//
+//                        }
+//                    }
+//                }
+            }else{
+                //  toast("抱歉,您未同意用户隐私协议,无法获得相应权限,无法应用该功能")
+
+            }
+        }
+
+
+    }
+
+
+    override val isRxbus: Boolean
+        get() = true
+
+    override fun vmClass(): Class<RecommendVModel> {
+        return RecommendVModel::class.java
+    }
+
+    override fun binding(inflater: LayoutInflater, container: ViewGroup?): FragmentRecommendBinding {
+       return  FragmentRecommendBinding.inflate(layoutInflater)
+    }
+
+    override fun title(): String? {
+        return null
+    }
+}

+ 35 - 0
app/src/main/java/com/quansu/creativity/view/MarqueeTextView.java

@@ -0,0 +1,35 @@
+package com.quansu.creativity.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.appcompat.widget.AppCompatTextView;
+
+/**
+ * on 2022/7/21
+ */
+public class MarqueeTextView extends AppCompatTextView {
+
+    public MarqueeTextView(Context context) {
+        this(context, null);
+
+    }
+
+    public MarqueeTextView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+
+
+    }
+
+    public MarqueeTextView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+
+    }
+
+    public boolean isFocused() {//必须重写,且返回值是true,表示始终获取焦点
+        return true;
+    }
+
+
+}

+ 1 - 4
app/src/main/java/com/quansu/creativity/vmodel/HomeMyVModel.kt

@@ -11,10 +11,7 @@ import com.ysnows.base.base.BViewModel
  */
 open class HomeMyVModel(application: Application) : BViewModel<BRepository>(application) {
 
-    var url: MutableLiveData<String> = MutableLiveData()
-    var name: MutableLiveData<String> = MutableLiveData()
-    var weight: MutableLiveData<String> = MutableLiveData()
-    var volume: MutableLiveData<String> = MutableLiveData()
+
 
 
 

+ 36 - 0
app/src/main/java/com/quansu/creativity/vmodel/RecommendVModel.kt

@@ -0,0 +1,36 @@
+package com.quansu.creativity.vmodel
+
+import android.app.Application
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.quansu.creativity.model.AmountList
+import com.quansu.creativity.utils.net.NetEngine
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+import kotlinx.coroutines.launch
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/23
+ */
+open class RecommendVModel(application: Application) : BViewModel<BRepository>(application) {
+
+    var list = MutableLiveData<ArrayList<AmountList>>()//钓位配置
+
+
+    fun getSeatInfo() {//获取数据
+//        viewModelScope.launch {
+//            var it = repository().lreq { NetEngine.service.activityseat(k_id) }
+//            if (it.ok()) {
+//                if (null != it.datas) {
+//                    list.value = (it.datas as java.util.ArrayList<FishpondSeat>?)!!
+//                }
+//
+//            }
+//        }
+    }
+
+
+
+
+}

binární
app/src/main/res/drawable-xxhdpi/ct_time.png


binární
app/src/main/res/drawable-xxhdpi/ic_indicator_normal.webp


binární
app/src/main/res/drawable-xxhdpi/ic_indicator_select.webp


+ 5 - 0
app/src/main/res/drawable/banner_home_point.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_selected="false" android:drawable="@drawable/ic_indicator_normal"/>
+    <item android:state_selected="true" android:drawable="@drawable/ic_indicator_select"/>
+</selector >

+ 142 - 40
app/src/main/res/layout/fragment_home_first.xml

@@ -1,52 +1,154 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto" >
+<layout 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">
+
+    <data>
 
-    <data >
         <variable
             name="vm"
             type="com.quansu.creativity.vmodel.HomeFirstVModel" />
 
-    </data >
+    </data>
+
 
-    <LinearLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/refresh_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:gravity="center"
         android:background="@drawable/bg_home_bg"
-        android:orientation="horizontal" >
+        android:paddingBottom="@dimen/dp_20">
 
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="38dp"
-            android:layout_marginStart="15dp"
-            android:layout_marginTop="14dp"
-            android:layout_marginEnd="15dp"
-            android:orientation="horizontal"
-            app:qmui_backgroundColor="@color/white"
-            app:qmui_borderColor="@color/white"
-            app:qmui_radius="4dp">
-
-            <TextView
-                android:text="最新公告"
-                android:textSize="12sp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="16dp"
-                android:textColor="#62E0F8"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-              <View
-                  android:background="#E5EFEF"
-                  android:layout_marginEnd="10dp"
-                  android:layout_marginStart="10dp"
-                  android:layout_width="1dp"
-                  android:layout_gravity="center"
-                  android:layout_height="10dp"/>
-
-        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
-
-
-    </LinearLayout >
-</layout >
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+
+            <androidx.core.widget.NestedScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scrollbars="none">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
+
+                    <cn.bingoogolapple.bgabanner.BGABanner
+                        android:id="@+id/banner"
+                        android:layout_width="match_parent"
+                        android:layout_height="180dp"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginTop="56dp"
+                        android:layout_marginEnd="15dp"
+                        app:banner_placeholderDrawable="@drawable/bg_need_error"
+                        app:banner_pointAutoPlayInterval="6000"
+                        app:banner_pointContainerBackground="@android:color/transparent"
+                        app:banner_pointDrawable="@drawable/banner_home_point"
+                        app:banner_pointLeftRightMargin="3dp"
+                        app:banner_pointTopBottomMargin="15dp"
+                        app:banner_transitionEffect="alpha" />
+
+
+                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="38dp"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginTop="14dp"
+                        android:layout_marginEnd="15dp"
+                        android:orientation="horizontal"
+                        app:qmui_backgroundColor="@color/white"
+                        app:qmui_borderColor="@color/white"
+                        app:qmui_radius="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginStart="16dp"
+                            android:text="最新公告"
+                            android:textColor="#62E0F8"
+                            android:textSize="12sp" />
+
+                        <View
+                            android:layout_width="1dp"
+                            android:layout_height="10dp"
+                            android:layout_gravity="center"
+                            android:layout_marginStart="10dp"
+                            android:layout_marginEnd="10dp"
+                            android:background="#E5EFEF" />
+
+                        <com.quansu.creativity.view.MarqueeTextView
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:ellipsize="marquee"
+                            android:focusable="true"
+                            android:focusableInTouchMode="true"
+                            android:marqueeRepeatLimit="marquee_forever"
+                            android:scrollHorizontally="true"
+                            android:singleLine="true"
+                            android:text="@string/test_tips"
+                            android:gravity="center_vertical"
+                            android:paddingEnd="@dimen/dp_14"
+                            android:textColor="@color/text_title"
+                            android:textSize="13dp" />
+
+
+                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="14dp"
+                        android:layout_marginTop="18dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/tv_my_chose"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="精选推荐"
+                            android:textColor="#222222"
+                            android:textSize="18sp"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/tv_my_appointment"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="54dp"
+                            android:text="我的预约"
+                            android:textColor="#888888"
+                            android:textSize="18sp"
+                            android:textStyle="bold" />
+
+                    </LinearLayout>
+
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginTop="18dp"
+                        android:layout_marginEnd="15dp"
+                        android:orientation="vertical">
+
+
+                        <androidx.viewpager.widget.ViewPager
+                            android:id="@+id/view_pager"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent">
+                        </androidx.viewpager.widget.ViewPager>
+
+
+                    </LinearLayout>
+                </LinearLayout>
+            </androidx.core.widget.NestedScrollView>
+        </LinearLayout>
+
+
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+
+</layout>

+ 27 - 0
app/src/main/res/layout/fragment_recommend.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
+
+    <data >
+        <variable
+            name="vm"
+            type="com.quansu.creativity.vmodel.RecommendVModel" />
+
+    </data >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:orientation="horizontal" >
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/item_recommed" />
+
+    </LinearLayout >
+</layout >

+ 22 - 0
app/src/main/res/layout/item_fresco.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    app:cardBackgroundColor="@android:color/transparent"
+    app:cardElevation="0dp"
+    app:cardCornerRadius="4dp"
+    android:layout_height="match_parent">
+
+
+
+    <ImageView
+        android:id="@+id/sdv_item_fresco_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        />
+
+
+
+</androidx.cardview.widget.CardView>

+ 243 - 0
app/src/main/res/layout/item_recommed.xml

@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <variable
+            name="item"
+            type="com.quansu.creativity.model.AmountList" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="345dp">
+
+            <!--       app:url="@{item.images[0]}" 给值-->
+            <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@drawable/bg_need_error"
+                app:qmui_border_color="@color/translucent"
+                app:qmui_corner_radius="20dp" />
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                android:layout_width="wrap_content"
+                app:qmui_radius="12dp"
+                app:qmui_borderColor="@color/translucent"
+                app:qmui_backgroundColor="#33000000"
+                android:layout_marginTop="22dp"
+                android:gravity="center_vertical"
+                android:layout_marginStart="12dp"
+                android:paddingStart="12dp"
+                android:paddingEnd="11dp"
+                android:layout_height="24dp">
+
+                <ImageView
+                    android:src="@drawable/ct_time"
+                    android:layout_marginEnd="6dp"
+                    android:layout_width="12dp"
+                    android:layout_height="12dp"/>
+
+                <TextView
+                    android:text="即将开售 10:23:23"
+                    android:textSize="10sp"
+                    android:textColor="#62FFF0"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                android:layout_width="match_parent"
+                android:orientation="vertical"
+                app:qmui_borderColor="@color/translucent"
+                app:qmui_radius="14dp"
+                android:paddingTop="12dp"
+                android:paddingBottom="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
+                android:layout_gravity="bottom"
+                android:layout_marginBottom="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginStart="10dp"
+                app:qmui_backgroundColor="#66000000"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:hint="潮玩设计 | 闹仔NOWKNOW"
+                    android:textSize="18sp"
+                    android:textColor="#FFFFFF"
+                    android:textStyle="bold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+                    
+                    <TextView
+                        android:background="#38D3D3"
+                        android:hint="限量"
+                       android:padding="9dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
+
+                </LinearLayout>
+
+
+
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+
+
+
+
+
+        </FrameLayout>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:paddingTop="16dp"
+            android:paddingBottom="15dp">
+
+            <ImageView
+                android:id="@+id/img_icon"
+                android:layout_width="44dp"
+                android:layout_height="44dp"
+                android:src="@{item.set==1?@drawable/ic_account_enter:@drawable/ic_account_out}"
+                tools:src="@drawable/ic_account_enter"
+
+                />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingStart="12dp">
+
+                <LinearLayout
+                    android:id="@+id/ll_top"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
+                    android:layout_toEndOf="@id/img_icon"
+                    android:orientation="horizontal"
+                    android:visibility="@{item.info_info!=null||item.order_info!=null?View.VISIBLE:View.GONE}">
+
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="运单号:"
+                        android:textColor="#979899"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/tv_sn"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{item.order_info!=null?item.order_info.order_sn:item.info_info.info_sn}"
+                        android:textColor="#4E9FF8"
+                        android:textSize="15sp"
+                        tools:text="1234556699999999999999999999" />
+
+
+                </LinearLayout>
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/tv_name"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:ellipsize="end"
+                            android:maxLines="1"
+                            android:text="@{item.data}"
+                            android:textColor="#333333"
+                            android:textSize="@dimen/sp_14"
+                            tools:text="提现-提现到微信" />
+
+                        <TextView
+                            android:id="@+id/tv_desc"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="5dp"
+                            android:text="@{item.create_time}"
+                            android:textColor="#979899"
+                            android:textSize="14sp"
+                            tools:text="今天 11:46" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/tv_balance"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:ellipsize="end"
+                            android:maxLines="1"
+                            android:text="@{item.set==1?@string/plus+item.money:@string/reduce+item.money}"
+                            android:textColor="@{item.set==1?@color/pay_on:@color/pay_off}"
+                            android:textSize="12sp"
+                            tools:text="-500.00" />
+
+                        <TextView
+                            android:id="@+id/tv_available_balance"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="5dp"
+                            android:text="@{@string/yu+item.total}"
+                            android:textColor="#979899"
+                            android:textSize="13sp"
+                            tools:text="当前余额:20000" />
+
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </LinearLayout>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_alignParentBottom="true"
+            android:layout_marginStart="68dp"
+            android:background="#E5E5E5" />
+
+
+    </LinearLayout>
+</layout>

+ 2 - 0
app/src/main/res/values/strings.xml

@@ -520,6 +520,8 @@ Api 已达到使用限制
     <string name="buy_insure_off">购买保险</string>
     <string name="buy_insure_on">已购买保险</string>
     <string name="slash">/</string>
+    <string name="test_tips">前创持文化发售了山水画《秋山瑞松图》赢得了广大藏家的关注,今天将公布第二波《如画江山多锦绣》限量发售,欢迎大家踊跃参与。\r\n\r\n发售详情:\r\n发售时间:7月20日\r\n发售数量:1600份\r\n优先购时间:12:15-12:15\r\n普通购时间:12:30\r\n发售价格:49.9元/份\r\n\r\n备注:拥有《秋山瑞松图》可参与优先购</string>
+
 
 
 </resources >