资金流水。解耦组件化

RMA/app/src/main/java/cn/muchinfo/rma/view/autoWidget/DetailItem.kt

@@ -18,7 +18,7 @@ class DetailItem @JvmOverloads constructor(
 ): ConstraintLayout(context, attrs, defStyleAttr) {
     private var leftText: String = "" // 左边的文字
     private var rightText: String = "" // 右边的文字
-    private var leftPadding: Int = 0 // 距离左边的padding
+    private var rightTextPadding: Int = 0 // 距离左边的padding
     private var showLine: Boolean = false // 是否显示下部的分割线
 
     init {
@@ -31,7 +31,7 @@ class DetailItem @JvmOverloads constructor(
         View.inflate(context, R.layout.detail_item, this)
         leftText = typedArray.getString(R.styleable.DetailItem_dt_LeftText).toString()
         rightText = typedArray.getString(R.styleable.DetailItem_dt_rightText).toString()
-        leftPadding = typedArray.getLayoutDimension(R.styleable.DetailItem_dt_leftPadding, 200)
+        rightTextPadding = typedArray.getLayoutDimension(R.styleable.DetailItem_dt_leftPadding, 200)
 
         showLine = typedArray.getBoolean(R.styleable.DetailItem_dt_showLine, false)
         showLine(showLine)
@@ -48,7 +48,7 @@ class DetailItem @JvmOverloads constructor(
         }
         id_title?.setTextAppearance(R.style.CostTitleTextStyle)
         id_value?.setTextAppearance(R.style.CostValueTextStyle)
-        id_value?.setPadding(leftPadding,
+        id_value?.setPadding(rightTextPadding,
             id_value?.paddingTop!!,
             id_value?.paddingRight!!,
             id_value?.paddingBottom!!)
@@ -71,6 +71,13 @@ class DetailItem @JvmOverloads constructor(
             id_value?.paddingBottom!!)
     }
 
+    fun setLeftValuePadding(leftValuePadding: Int) {
+        id_title?.setPadding(leftValuePadding,
+            id_title?.paddingTop!!,
+            id_title?.paddingRight!!,
+            id_title?.paddingBottom!!)
+    }
+
     fun showLine(show: Boolean) {
         if (show) id_line?.visibility = View.VISIBLE else id_line?.visibility = GONE
     }
@@ -93,13 +100,13 @@ class DetailItem @JvmOverloads constructor(
         this.setPadding(leftPadding!!, this.paddingTop, this.paddingRight, this.paddingBottom)
     }
     fun setPaddingTop(topPadding: Int) {
-        this.setPadding(this.leftPadding, topPadding, this.paddingRight, this.paddingBottom)
+        this.setPadding(this.paddingLeft, topPadding, this.paddingRight, this.paddingBottom)
     }
     fun setPaddingRight(rightPadding: Int) {
-        this.setPadding(this.leftPadding, this.paddingTop, rightPadding, this.paddingBottom)
+        this.setPadding(this.paddingLeft, this.paddingTop, rightPadding, this.paddingBottom)
     }
     fun setPaddingBottom(BottomPadding: Int) {
-        this.setPadding(this.leftPadding, this.paddingTop, this.paddingRight, BottomPadding)
+        this.setPadding(this.paddingLeft, this.paddingTop, this.paddingRight, BottomPadding)
     }
 //endregion
 }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/costs/CostFragment.kt

@@ -54,7 +54,7 @@ class CostFragment : BaseFragment<CostViewModel>() {
 
     private fun initViews() {
         idCostPager = _view?.findViewById(R.id.id_cost_pager)
-        idEntrustTab = _view?.findViewById(R.id.id_entrust_tab)
+        idEntrustTab = _view?.findViewById(R.id.id_cost_tab)
 
         // 设置
         val builder = BaseFutureModel().qmuiTabSegmentConfig(idEntrustTab, 15, context)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/costs/CostInfoData.kt

@@ -7,7 +7,8 @@ class CostInfoData : Serializable {
     private var rightText: String? = null
     private var leftStyle: Int = 0
     private var rightStyle: Int = 0
-    private var leftPadding: Int = 0
+    private var rightTextPadding: Int = 0
+    private var leftTextPadding: Int = 0
 
     fun getLeftText() : String {
         return leftText!!
@@ -21,8 +22,11 @@ class CostInfoData : Serializable {
     fun getRightStyle() : Int {
         return rightStyle
     }
-    fun getLeftPadding() : Int {
-        return leftPadding
+    fun getRightTextPadding() : Int {
+        return rightTextPadding
+    }
+    fun getLeftTextPadding() : Int {
+        return leftTextPadding
     }
 
     fun setLeftText(leftText: String?) {
@@ -37,7 +41,10 @@ class CostInfoData : Serializable {
     fun setRightStyle(rightStyle: Int) {
         this.rightStyle = rightStyle
     }
-    fun setLeftPadding(leftPadding: Int) {
-        this.leftPadding = leftPadding
+    fun setRightTextPadding(rightTextPadding: Int) {
+        this.rightTextPadding = rightTextPadding
+    }
+    fun setLeftTextPadding(leftTextPadding: Int) {
+        this.leftTextPadding = leftTextPadding
     }
 }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/costs/CostInfoFragment.kt

@@ -39,6 +39,6 @@ class CostInfoFragment(type: String?) : BaseFragment<CostViewModel>() {
         val layoutManager = LinearLayoutManager(context)
         idCostInfoList?.layoutManager = layoutManager
         viewModel.makeCostInfo()
-        idCostInfoList?.adapter = viewModel.getAdapter()
+        idCostInfoList?.adapter = viewModel.getCostInfoAdapter()
     }
 }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/costs/CostListData.kt

@@ -0,0 +1,33 @@
+package cn.muchinfo.rma.view.base.future.costs
+
+import java.io.Serializable
+
+/**
+ * 资金流水数据
+ */
+class CostListData : Serializable {
+    private var time: String = "" // 时间
+    private var operateType: String = "" // 操作类型
+    private var am: String = "" // 资金
+
+    fun getTime(): String {
+        return time
+    }
+    fun setTime(time: String) {
+        this.time = time
+    }
+
+    fun getOperateType(): String {
+        return operateType
+    }
+    fun setOperateType(operateType: String) {
+        this.operateType = operateType
+    }
+
+    fun getAm(): String {
+        return am
+    }
+    fun setAm(am: String) {
+        this.am = am
+    }
+}

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/costs/CostListFragment.kt

@@ -4,6 +4,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.view.base.BaseFragment
 
@@ -19,13 +21,31 @@ class CostListFragment(type: String?) : BaseFragment<CostViewModel>() {
     }
 
     private var _view: View? = null
+    private var idCostList: RecyclerView? = null
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        _view = inflater.inflate(R.layout.cost_fragment, container, false)
+        _view = inflater.inflate(R.layout.cost_list, container, false)
+        initViews()
         return _view
     }
+
+    private fun initViews() {
+        idCostList = _view?.findViewById(R.id.id_cost_list)
+        val costList: ArrayList<CostListData>? = ArrayList() // 资金流水
+        for (a in 1..10) {
+            val temp = CostListData()
+            temp.setTime("10:10:$a")
+            temp.setOperateType("结算盈亏")
+            temp.setAm("10$a")
+            costList?.add(temp)
+        }
+        val layoutManager = LinearLayoutManager(context)
+        idCostList?.layoutManager = layoutManager
+        viewModel.costList = costList
+        idCostList?.adapter = viewModel.getCostListAdapter()
+    }
 }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/costs/CostViewModel.kt

@@ -4,92 +4,106 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.view.autoWidget.DetailItem
 import cn.muchinfo.rma.view.base.BaseViewModel
 
 class CostViewModel : BaseViewModel() {
-
-    var list: ArrayList<CostInfoData>? = ArrayList()
+    private var costInfoList: ArrayList<CostInfoData>? = ArrayList() // 资金信息
+    var costList: ArrayList<CostListData>? = ArrayList() // 资金流水
     var type: String? = null
 
+//region cost info 资金信息
     /**
      * 组装数据
      */
     fun makeCostInfo() {
-        val paddingLeft = 100 // 右侧的文字，距离左侧的距离
+        costInfoList?.clear()
+        val paddingLeft = 250 // 右侧的文字，距离左侧的距离
+        val leftTextPadding = 0 // 左侧的文字，距离左侧的距离
 
         var m = CostInfoData()
         m.setLeftText(context?.getString(R.string.str_currency))
         m.setRightText("USD")
-        m.setLeftPadding(paddingLeft)
-        list?.add(m)
+        m.setRightTextPadding(paddingLeft)
+        m.setLeftTextPadding(leftTextPadding)
+        costInfoList?.add(m)
 
         m = CostInfoData()
         m.setLeftText(context?.getString(R.string.str_current_equity))
         m.setRightText("1000.01")
-        m.setLeftPadding(paddingLeft)
-        list?.add(m)
+        m.setRightTextPadding(paddingLeft)
+        m.setLeftTextPadding(leftTextPadding)
+        costInfoList?.add(m)
 
         m = CostInfoData()
         m.setLeftText(context?.getString(R.string.str_available_am))
         m.setRightText("55522.02")
-        m.setLeftPadding(paddingLeft)
-        list?.add(m)
+        m.setRightTextPadding(paddingLeft)
+        m.setLeftTextPadding(leftTextPadding)
+        costInfoList?.add(m)
 
         m = CostInfoData()
         m.setLeftText(context?.getString(R.string.str_occupation_amount))
         m.setRightText("5522.29")
-        m.setLeftPadding(paddingLeft)
-        list?.add(m)
+        m.setRightTextPadding(paddingLeft)
+        m.setLeftTextPadding(leftTextPadding)
+        costInfoList?.add(m)
 
         m = CostInfoData()
         m.setLeftText(context?.getString(R.string.str_freezing_of_funds))
         m.setRightText("599.45")
-        m.setLeftPadding(paddingLeft)
-        list?.add(m)
+        m.setRightTextPadding(paddingLeft)
+        m.setLeftTextPadding(leftTextPadding)
+        costInfoList?.add(m)
 
         m = CostInfoData()
         m.setLeftText(context?.getString(R.string.str_position_profit_loss))
         m.setRightText("955.66")
-        m.setLeftPadding(paddingLeft)
-        list?.add(m)
+        m.setRightTextPadding(paddingLeft)
+        m.setLeftTextPadding(leftTextPadding)
+        costInfoList?.add(m)
 
         m = CostInfoData()
         m.setLeftText(context?.getString(R.string.str_close_profit_loss))
         m.setRightText("1485.34")
-        m.setLeftPadding(paddingLeft)
-        list?.add(m)
+        m.setRightTextPadding(paddingLeft)
+        m.setLeftTextPadding(leftTextPadding)
+        costInfoList?.add(m)
 
         m = CostInfoData()
         m.setLeftText(context?.getString(R.string.str_in_am))
         m.setRightText("72222.1")
-        m.setLeftPadding(paddingLeft)
-        list?.add(m)
+        m.setRightTextPadding(paddingLeft)
+        m.setLeftTextPadding(leftTextPadding)
+        costInfoList?.add(m)
 
         m = CostInfoData()
         m.setLeftText(context?.getString(R.string.str_out_am))
         m.setRightText("985.25")
-        m.setLeftPadding(paddingLeft)
-        list?.add(m)
+        m.setRightTextPadding(paddingLeft)
+        m.setLeftTextPadding(leftTextPadding)
+        costInfoList?.add(m)
 
         m = CostInfoData()
         m.setLeftText(context?.getString(R.string.str_rate_of_use))
         m.setRightText("10.5%")
-        m.setLeftPadding(paddingLeft)
-        list?.add(m)
+        m.setRightTextPadding(paddingLeft)
+        m.setLeftTextPadding(leftTextPadding)
+        costInfoList?.add(m)
     }
 
     /**
      * 获取配置器。
      */
-    fun getAdapter(): RecyclerView.Adapter<CostInfoAdapter.CostInfoHolder> {
-        return CostInfoAdapter(context, list)
+    fun getCostInfoAdapter(): RecyclerView.Adapter<CostInfoAdapter.CostInfoHolder> {
+        return CostInfoAdapter(context, costInfoList)
     }
 
     /**
-     * 通用的适配器。
+     * 资金信息的适配器。
      */
     class CostInfoAdapter(context: Context?, list: ArrayList<CostInfoData>?) : RecyclerView.Adapter<CostInfoAdapter.CostInfoHolder>() {
         private var list: ArrayList<CostInfoData>? = null
@@ -112,7 +126,8 @@ class CostViewModel : BaseViewModel() {
         override fun onBindViewHolder(holder: CostInfoHolder, position: Int) {
             holder.detailItem?.setLeftText(list?.get(position)?.getLeftText().toString())
             holder.detailItem?.setRightText(list?.get(position)?.getRightText().toString())
-            list?.get(position)?.getLeftPadding()?.let { holder.detailItem?.setRightValuePadding(it) }
+            list?.get(position)?.getRightTextPadding()?.let { holder.detailItem?.setRightValuePadding(it) }
+            list?.get(position)?.getLeftTextPadding()?.let { holder.detailItem?.setLeftValuePadding(it) }
             holder.detailItem?.showLine(true)
         }
 
@@ -121,4 +136,53 @@ class CostViewModel : BaseViewModel() {
         }
 
     }
+//endregion
+
+//region cost list 资金流水
+
+    fun getCostListAdapter(): RecyclerView.Adapter<CostListAdapter.CostListHolder> {
+        return CostListAdapter(context, costList)
+    }
+
+    /**
+     * 资金流水适配器
+     */
+    class CostListAdapter(context: Context?, list: ArrayList<CostListData>?): RecyclerView.Adapter<CostListAdapter.CostListHolder>() {
+        private var list: ArrayList<CostListData>? = null
+        private var inflater: LayoutInflater? = null
+        private var context: Context? = null
+        init {
+            this.list = list
+            this.inflater = LayoutInflater.from(context)
+            this.context = context
+        }
+
+        // 创建句柄
+        override fun onCreateViewHolder(
+            parent: ViewGroup,
+            viewType: Int
+        ): CostListHolder {
+            return CostListHolder(inflater?.inflate(R.layout.cost_list_item, parent, false))
+        }
+
+        override fun getItemCount(): Int {
+            return list?.size ?: 0
+        }
+
+        override fun onBindViewHolder(holder: CostListHolder, position: Int) {
+            holder.idTime?.text = list?.get(position)?.getTime()
+            holder.idOperateType?.text = list?.get(position)?.getOperateType()
+            holder.idAm?.text = list?.get(position)?.getAm()
+        }
+
+        class CostListHolder(itemView: View?) : RecyclerView.ViewHolder(itemView!!) {
+            var idOperateType = itemView?.findViewById<TextView>(R.id.id_operate_type) // 操作类型
+            var idAm = itemView?.findViewById<TextView>(R.id.id_am) // 资金
+            var idTime = itemView?.findViewById<TextView>(R.id.id_time) // 时间
+        }
+
+    }
+
+
+//endregion
 }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/deals/DealData.kt

@@ -4,34 +4,9 @@ import java.io.Serializable
 
 class DealData : Serializable {
     var goodsName: String? = ""
-        get() = field
-        set(value) {
-            field = value
-        }
     var direction: Int? = 0
-        get() = field
-        set(value) {
-            field = value
-        }
     var dealNum: Double? = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
     var dealPrice: Double = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
     var dealTime: String? = ""
-        get() = field
-        set(value) {
-            field = value
-        }
     var goodsId: Int? = 0
-        get() = field
-        set(value) {
-            field = value
-        }
-
 }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/deals/DealFragment.kt

@@ -34,7 +34,7 @@ class DealFragment : BaseFragment<DealViewModel>() {
     }
 
     private fun initViews() {
-
+        idDealList = _view?.findViewById(R.id.id_deal_list)
         val list: ArrayList<DealData>? = ArrayList()
         for (a in 1..5) {
             val m = DealData()

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/deals/DealViewModel.kt

@@ -17,13 +17,13 @@ class DealViewModel : BaseViewModel() {
     /**
      * 获取配置器。
      */
-    fun getAdapter(): RecyclerView.Adapter<HoldAdapter.HoldHolder> {
+    fun getAdapter(): RecyclerView.Adapter<HoldAdapter.DealHolder> {
         return HoldAdapter(context, list)
     }
     /**
      * 通用的适配器。
      */
-    class HoldAdapter(context: Context?, list: ArrayList<DealData>?) : RecyclerView.Adapter<HoldAdapter.HoldHolder>() {
+    class HoldAdapter(context: Context?, list: ArrayList<DealData>?) : RecyclerView.Adapter<HoldAdapter.DealHolder>() {
         private var list: ArrayList<DealData>? = null
         private var inflater: LayoutInflater? = null
         private var context: Context? = null
@@ -46,7 +46,7 @@ class DealViewModel : BaseViewModel() {
             return list?.size ?: 0
         }
 
-        class HoldHolder(itemView: View?) : RecyclerView.ViewHolder(itemView!!) {
+        class DealHolder(itemView: View?) : RecyclerView.ViewHolder(itemView!!) {
             var idGoodsName = itemView?.findViewById<TextView>(R.id.id_goods_name)
             var idTransType = itemView?.findViewById<TextView>(R.id.id_trans_type)
             var idDealNum = itemView?.findViewById<TextView>(R.id.id_deal_num)
@@ -54,7 +54,7 @@ class DealViewModel : BaseViewModel() {
             var idDealTime = itemView?.findViewById<TextView>(R.id.id_deal_time)
         }
 
-        override fun onBindViewHolder(holder: HoldHolder, position: Int) {
+        override fun onBindViewHolder(holder: DealHolder, position: Int) {
             holder.idGoodsName?.text = list?.get(position)?.goodsName
             holder.idTransType?.text = list?.get(position)?.direction.toString()
             holder.idDealNum?.text = list?.get(position)?.dealNum.toString()
@@ -62,8 +62,8 @@ class DealViewModel : BaseViewModel() {
             holder.idDealTime?.text = list?.get(position)?.dealTime
         }
 
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): HoldHolder {
-            return HoldHolder(inflater?.inflate(R.layout.deal_item, parent, false))
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DealHolder {
+            return DealHolder(inflater?.inflate(R.layout.deal_item, parent, false))
         }
 
     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/entrusts/EntrustChildFragment.kt

@@ -33,18 +33,19 @@ class EntrustChildFragment(type: String) : BaseFragment<EntrustChildViewModel>()
     }
 
     private fun initViews() {
+        idEntrustList = _view?.findViewById(R.id.id_entrust_list)
         val list: ArrayList<EntrustData>? = ArrayList()
         for (a in 1..5) {
             val m = EntrustData()
             m.goodsName = "铁矿石" + (2105 + a)
             m.goodsCode = "I" + (2105 + a)
             m.lastPrice = 998.0 + a
-            m.available = 1.0 + a
-            m.totals = 5.0 + a
-            m.cost = 500.0 + a
-            m.pl = 100.0 + a
-            m.plp = (100 + a) * 0.003
-            m.holdPrice = 899.0 + a
+            m.entrustPrice = 1000.0 + a
+            m.entrustType = "买多"
+            m.entrustNum = 50.0 + a
+            m.time = "10:10:10"
+            m.pl = 1001.0
+            m.status = "已报"
             m.direction = a
             list?.add(m)
         }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/entrusts/EntrustChildViewModel.kt

@@ -20,13 +20,13 @@ class EntrustChildViewModel : BaseViewModel() {
     /**
      * 获取配置器。
      */
-    fun getAdapter(): RecyclerView.Adapter<HoldAdapter.HoldHolder> {
+    fun getAdapter(): RecyclerView.Adapter<HoldAdapter.EntrustHolder> {
         return HoldAdapter(context, list)
     }
     /**
      * 通用的适配器。
      */
-    class HoldAdapter(context: Context?, list: ArrayList<EntrustData>?) : RecyclerView.Adapter<HoldAdapter.HoldHolder>() {
+    class HoldAdapter(context: Context?, list: ArrayList<EntrustData>?) : RecyclerView.Adapter<HoldAdapter.EntrustHolder>() {
         private var list: ArrayList<EntrustData>? = null
         private var inflater: LayoutInflater? = null
         private var context: Context? = null
@@ -49,36 +49,28 @@ class EntrustChildViewModel : BaseViewModel() {
             return list?.size ?: 0
         }
 
-        class HoldHolder(itemView: View?) : RecyclerView.ViewHolder(itemView!!) {
+        class EntrustHolder(itemView: View?) : RecyclerView.ViewHolder(itemView!!) {
             var idGoodsName = itemView?.findViewById<TextView>(R.id.id_goods_name)
-            var idTransDirection = itemView?.findViewById<TextView>(R.id.id_trans_direction)
-            var idAvailable = itemView?.findViewById<TextView>(R.id.id_available)
-            var idHoldTotal = itemView?.findViewById<TextView>(R.id.id_hold_total)
-            var idLastPrice = itemView?.findViewById<TextView>(R.id.id_last_price)
-            var idCost = itemView?.findViewById<TextView>(R.id.id_cost)
-            var idPl = itemView?.findViewById<TextView>(R.id.id_pl)
-            var idPlp = itemView?.findViewById<TextView>(R.id.id_plp)
-
+            var idStatus = itemView?.findViewById<TextView>(R.id.id_status)
+            var idDate = itemView?.findViewById<TextView>(R.id.id_date)
+            var idEntrustType = itemView?.findViewById<TextView>(R.id.id_entrust_type)
+            var idEntrustNum = itemView?.findViewById<TextView>(R.id.id_entrust_num)
+            var idEntrustPrice = itemView?.findViewById<TextView>(R.id.id_entrust_price)
+            var idEntrustPl = itemView?.findViewById<TextView>(R.id.id_entrust_pl)
         }
 
-        override fun onBindViewHolder(holder: HoldHolder, position: Int) {
-            holder.idGoodsName?.text = list?.get(position)?.goodsName
-            holder.idAvailable?.text = list?.get(position)?.available.toString()
-            holder.idHoldTotal?.text = list?.get(position)?.totals.toString()
-            holder.idLastPrice?.text = list?.get(position)?.lastPrice.toString()
-            holder.idCost?.text = list?.get(position)?.cost.toString()
-            holder.idPl?.text = list?.get(position)?.pl.toString()
-            holder.idPlp?.text = list?.get(position)?.plp.toString()
-            if (list?.get(position)?.direction == 0) {
-                holder.idTransDirection?.text = context?.resources?.getString(R.string.str_buy)
-            } else {
-                holder.idTransDirection?.text = context?.resources?.getString(R.string.str_sell)
-            }
-
+        override fun onBindViewHolder(entrust: EntrustHolder, position: Int) {
+            entrust.idGoodsName?.text = list?.get(position)?.goodsName
+            entrust.idStatus?.text = list?.get(position)?.status
+            entrust.idEntrustType?.text = list?.get(position)?.entrustType
+            entrust.idDate?.text = list?.get(position)?.time
+            entrust.idEntrustPrice?.text = list?.get(position)?.entrustPrice.toString()
+            entrust.idEntrustNum?.text = list?.get(position)?.entrustNum.toString()
+            entrust.idEntrustPl?.text = list?.get(position)?.pl.toString()
         }
 
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): HoldHolder {
-            return HoldHolder(inflater?.inflate(R.layout.hold_item, parent, false))
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EntrustHolder {
+            return EntrustHolder(inflater?.inflate(R.layout.entrust_item, parent, false))
         }
 
     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/entrusts/EntrustData.kt

@@ -3,75 +3,29 @@ package cn.muchinfo.rma.view.base.future.entrusts
 import java.io.Serializable
 
 class EntrustData : Serializable {
-
     // 商品名称
     var goodsName = ""
-        get() = field
-        set(value) {
-            field = value
-        }
     // 商品代码
     var goodsCode = ""
-        get() = field
-        set(value) {
-            field = value
-        }
     // 商品id
     var goodsId: Int = 0
-        get() = field
-        set(value) {
-            field = value
-        }
     // 最新价格
     var lastPrice: Double = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
-    // 可用
-    var available: Double = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
-
-    // 持仓量
-    var totals: Double = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
-    // 成本
-    var cost: Double = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
-
-    // 持仓价格
-    var holdPrice: Double = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
-
-    // 盈亏率
-    var plp: Double = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
-
     // 盈亏
     var pl: Double = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
     // 方向
     var direction: Int = 0
-        get() = field
-        set(value) {
-            field = value
-        }
+    // 类型
+    var entrustType: String = ""
+    // 委托价格
+    var entrustPrice: Double = 0.0
+    // 时间
+    var time: String = ""
+    // 状态
+    var status: String = ""
+    // 委托数量
+    var entrustNum: Double = 0.0
+
+
+
 }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/holds/HoldData.kt

@@ -8,73 +8,28 @@ import java.io.Serializable
 class HoldData: Serializable {
     // 商品名称
     var goodsName = ""
-        get() = field
-        set(value) {
-            field = value
-        }
     // 商品代码
     var goodsCode = ""
-        get() = field
-        set(value) {
-            field = value
-        }
     // 商品id
     var goodsId: Int = 0
-        get() = field
-        set(value) {
-            field = value
-        }
     // 最新价格
     var lastPrice: Double = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
     // 可用
     var available: Double = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
-
     // 持仓量
     var totals: Double = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
     // 成本
     var cost: Double = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
 
     // 持仓价格
     var holdPrice: Double = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
 
     // 盈亏率
     var plp: Double = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
 
     // 盈亏
     var pl: Double = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
     // 方向
     var direction: Int = 0
-        get() = field
-        set(value) {
-            field = value
-        }
 
 }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/markets/MarketData.kt

@@ -8,44 +8,16 @@ import java.io.Serializable
 class MarketData: Serializable {
     // 商品名称
     var goodsName = ""
-        get() = field
-        set(value) {
-            field = value
-        }
     // 商品代码
     var goodsCode = ""
-        get() = field
-        set(value) {
-            field = value
-        }
     // 商品id
     var goodsId: Int = 0
-        get() = field
-        set(value) {
-            field = value
-        }
     // 最新价格
     var lastPrice: Double = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
     // 持仓量
     var totals: Double = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
     // 涨跌
     var upDown: Double = 0.0
-        get() = field
-        set(value) {
-            field = value
-        }
     // 是否是自选的
     var isChoose: Boolean = false
-        get() = field
-        set(value) {
-            field = value
-        }
 }

RMA/app/src/main/res/layout/cost_fragment.xml

@@ -14,7 +14,7 @@
     <androidx.viewpager.widget.ViewPager
         android:layout_width="match_parent"
         android:id="@+id/id_cost_pager"
-        app:layout_constraintTop_toBottomOf="@+id/id_cost_tab"
+        app:layout_constraintTop_toBottomOf="@+id/id_line"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_height="0dp"/>
 

RMA/app/src/main/res/layout/cost_info.xml

@@ -4,9 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:paddingTop="15dp"
     android:paddingStart="15dp"
-    android:paddingBottom="15dp"
     android:layout_height="match_parent"
     tools:ignore="RtlSymmetry">
     <androidx.recyclerview.widget.RecyclerView
@@ -14,276 +12,4 @@
         app:layout_constraintTop_toTopOf="parent"
         android:id="@+id/id_cost_info_list"
         android:layout_height="match_parent"/>
-<!--    <cn.muchinfo.rma.view.autoWidget.DetailItem-->
-<!--        android:layout_width="match_parent"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/line9"-->
-<!--        android:id="@+id/dddd"-->
-<!--        app:dt_rightText="asdasd"-->
-<!--        app:dt_leftPadding="88dp"-->
-<!--        android:layout_height="wrap_content"/>-->
-<!--&lt;!&ndash;币种&ndash;&gt;-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        app:layout_constraintStart_toStartOf="parent"-->
-<!--        android:id="@+id/id_currency_title"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        style="@style/CostTitleTextStyle"-->
-<!--        android:text="@string/str_currency"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/dddd"-->
-<!--        android:layout_height="wrap_content"/>-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:text="1000.0"-->
-<!--        android:layout_marginStart="20dp"-->
-<!--        app:layout_constraintTop_toTopOf="@+id/id_currency_title"-->
-<!--        app:layout_constraintStart_toEndOf="@+id/id_rate_of_use_title"-->
-<!--        style="@style/CostValueTextStyle"-->
-<!--        android:layout_height="wrap_content"/>-->
-
-<!--    <include-->
-<!--        layout="@layout/line_view"-->
-<!--        android:id="@+id/line0"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="0.1dp"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/id_currency_title"/>-->
-
-
-<!--    &lt;!&ndash;当前权益&ndash;&gt;-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        app:layout_constraintStart_toStartOf="parent"-->
-<!--        android:id="@+id/id_current_equity"-->
-<!--        style="@style/CostTitleTextStyle"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/line0"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        android:text="@string/str_current_equity"-->
-<!--        android:layout_height="wrap_content"/>-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:text="1000.0"-->
-<!--        android:layout_marginStart="20dp"-->
-<!--        app:layout_constraintTop_toTopOf="@+id/id_current_equity"-->
-<!--        app:layout_constraintStart_toEndOf="@+id/id_rate_of_use_title"-->
-<!--        style="@style/CostValueTextStyle"-->
-<!--        android:layout_height="wrap_content"/>-->
-
-<!--    <include-->
-<!--        layout="@layout/line_view"-->
-<!--        android:id="@+id/line1"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="0.1dp"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/id_current_equity"/>-->
-<!--&lt;!&ndash;可用金额&ndash;&gt;-->
-
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        app:layout_constraintStart_toStartOf="parent"-->
-<!--        android:id="@+id/id_available_am"-->
-<!--        style="@style/CostTitleTextStyle"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/line1"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        android:text="@string/str_available_am"-->
-<!--        android:layout_height="wrap_content"/>-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:text="1000.0"-->
-<!--        android:layout_marginStart="20dp"-->
-<!--        app:layout_constraintTop_toTopOf="@+id/id_available_am"-->
-<!--        app:layout_constraintStart_toEndOf="@+id/id_rate_of_use_title"-->
-<!--        style="@style/CostValueTextStyle"-->
-<!--        android:layout_height="wrap_content"/>-->
-
-<!--    <include-->
-<!--        layout="@layout/line_view"-->
-<!--        android:id="@+id/line2"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="0.1dp"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/id_available_am"/>-->
-
-<!--    &lt;!&ndash;占用资金&ndash;&gt;-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        app:layout_constraintStart_toStartOf="parent"-->
-<!--        android:id="@+id/id_occupation_amount"-->
-<!--        style="@style/CostTitleTextStyle"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/line2"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        android:text="@string/str_occupation_amount"-->
-<!--        android:layout_height="wrap_content"/>-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:text="1000.0"-->
-<!--        android:layout_marginStart="20dp"-->
-<!--        app:layout_constraintTop_toTopOf="@+id/id_occupation_amount"-->
-<!--        app:layout_constraintStart_toEndOf="@+id/id_rate_of_use_title"-->
-<!--        style="@style/CostValueTextStyle"-->
-<!--        android:layout_height="wrap_content"/>-->
-<!--    <include-->
-<!--        layout="@layout/line_view"-->
-<!--        android:id="@+id/line3"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="0.1dp"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/id_occupation_amount"/>-->
-
-<!--    &lt;!&ndash;冻结金额&ndash;&gt;-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        app:layout_constraintStart_toStartOf="parent"-->
-<!--        android:id="@+id/id_freezing_of_funds"-->
-<!--        style="@style/CostTitleTextStyle"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/line3"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        android:text="@string/str_freezing_of_funds"-->
-<!--        android:layout_height="wrap_content"/>-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:text="1000.0"-->
-<!--        android:layout_marginStart="20dp"-->
-<!--        app:layout_constraintTop_toTopOf="@+id/id_freezing_of_funds"-->
-<!--        app:layout_constraintStart_toEndOf="@+id/id_rate_of_use_title"-->
-<!--        style="@style/CostValueTextStyle"-->
-<!--        android:layout_height="wrap_content"/>-->
-<!--    <include-->
-<!--        layout="@layout/line_view"-->
-<!--        android:id="@+id/line4"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="0.1dp"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/id_freezing_of_funds"/>-->
-
-<!--    &lt;!&ndash;持仓盈亏&ndash;&gt;-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        app:layout_constraintStart_toStartOf="parent"-->
-<!--        android:id="@+id/id_position_profit_loss"-->
-<!--        style="@style/CostTitleTextStyle"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/line4"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        android:text="@string/str_position_profit_loss"-->
-<!--        android:layout_height="wrap_content"/>-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:text="1000.0"-->
-<!--        android:layout_marginStart="20dp"-->
-<!--        app:layout_constraintTop_toTopOf="@+id/id_position_profit_loss"-->
-<!--        app:layout_constraintStart_toEndOf="@+id/id_rate_of_use_title"-->
-<!--        style="@style/CostValueTextStyle"-->
-<!--        android:layout_height="wrap_content"/>-->
-<!--    <include-->
-<!--        layout="@layout/line_view"-->
-<!--        android:id="@+id/line5"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="0.1dp"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/id_position_profit_loss"/>-->
-
-<!--    &lt;!&ndash;平仓盈亏&ndash;&gt;-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        app:layout_constraintStart_toStartOf="parent"-->
-<!--        android:id="@+id/id_close_profit_loss"-->
-<!--        style="@style/CostTitleTextStyle"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/line5"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        android:text="@string/str_close_profit_loss"-->
-<!--        android:layout_height="wrap_content"/>-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:text="1000.0"-->
-<!--        android:layout_marginStart="20dp"-->
-<!--        app:layout_constraintTop_toTopOf="@+id/id_close_profit_loss"-->
-<!--        app:layout_constraintStart_toEndOf="@+id/id_rate_of_use_title"-->
-<!--        style="@style/CostValueTextStyle"-->
-<!--        android:layout_height="wrap_content"/>-->
-<!--    <include-->
-<!--        layout="@layout/line_view"-->
-<!--        android:id="@+id/line6"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="0.1dp"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/id_close_profit_loss"/>-->
-
-<!--    &lt;!&ndash;入金&ndash;&gt;-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        app:layout_constraintStart_toStartOf="parent"-->
-<!--        android:id="@+id/id_in_am"-->
-<!--        style="@style/CostTitleTextStyle"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/line6"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        android:text="@string/str_in_am"-->
-<!--        android:layout_height="wrap_content"/>-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:text="1000.0"-->
-<!--        android:layout_marginStart="20dp"-->
-<!--        app:layout_constraintTop_toTopOf="@+id/id_in_am"-->
-<!--        app:layout_constraintStart_toEndOf="@+id/id_rate_of_use_title"-->
-<!--        style="@style/CostValueTextStyle"-->
-<!--        android:layout_height="wrap_content"/>-->
-<!--    <include-->
-<!--        layout="@layout/line_view"-->
-<!--        android:id="@+id/line7"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="0.1dp"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/id_in_am"/>-->
-
-<!--    &lt;!&ndash;出金&ndash;&gt;-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        app:layout_constraintStart_toStartOf="parent"-->
-<!--        android:id="@+id/id_out_am"-->
-<!--        style="@style/CostTitleTextStyle"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/line7"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        android:text="@string/str_in_am"-->
-<!--        android:layout_height="wrap_content"/>-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:text="1000.0"-->
-<!--        android:layout_marginStart="20dp"-->
-<!--        app:layout_constraintTop_toTopOf="@+id/id_out_am"-->
-<!--        app:layout_constraintStart_toEndOf="@+id/id_rate_of_use_title"-->
-<!--        style="@style/CostValueTextStyle"-->
-<!--        android:layout_height="wrap_content"/>-->
-<!--    <include-->
-<!--        layout="@layout/line_view"-->
-<!--        android:id="@+id/line8"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="0.1dp"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/id_out_am"/>-->
-
-<!--    &lt;!&ndash;    资金使用率&ndash;&gt;-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        app:layout_constraintStart_toStartOf="parent"-->
-<!--        android:id="@+id/id_rate_of_use_title"-->
-<!--        style="@style/CostTitleTextStyle"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        android:text="@string/str_rate_of_use"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/line8"-->
-<!--        android:layout_height="wrap_content"/>-->
-<!--    <TextView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:text="1000.0"-->
-<!--        app:layout_constraintTop_toTopOf="@+id/id_rate_of_use_title"-->
-<!--        android:id="@+id/id_rate_of_use"-->
-<!--        android:layout_marginStart="20dp"-->
-<!--        app:layout_constraintStart_toEndOf="@+id/id_rate_of_use_title"-->
-<!--        style="@style/CostValueTextStyle"-->
-<!--        android:layout_height="wrap_content"/>-->
-<!--    <include-->
-<!--        layout="@layout/line_view"-->
-<!--        android:id="@+id/line9"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="0.1dp"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/id_rate_of_use_title"/>-->
-<!--    -->
 </androidx.constraintlayout.widget.ConstraintLayout>

RMA/app/src/main/res/layout/cost_list.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+<!--    时间-->
+    <TextView
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginStart="15dp"
+        style="@style/ListHeadTextStyle"
+        android:id="@+id/id_head_time"
+        android:text="@string/str_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+<!--    操作类型-->
+    <TextView
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        style="@style/ListHeadTextStyle"
+        android:text="@string/str_operate_type"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+    <!--    金额-->
+    <TextView
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginEnd="15dp"
+        style="@style/ListHeadTextStyle"
+        android:text="@string/str_am"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+    <include
+        layout="@layout/line_view"
+        android:id="@+id/id_line"
+        android:layout_width="match_parent"
+        android:layout_height="0.1dp"
+        app:layout_constraintTop_toBottomOf="@+id/id_head_time"/>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:id="@+id/id_cost_list"
+        app:layout_constraintTop_toBottomOf="@+id/id_head_time"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_height="0dp"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

RMA/app/src/main/res/layout/cost_list_item.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="15dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <!--    时间-->
+    <TextView
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        style="@style/ListHeadTextStyle"
+        android:id="@+id/id_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+    <!--    操作类型-->
+    <TextView
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        style="@style/ListHeadTextStyle"
+        android:id="@+id/id_operate_type"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+    <!--    金额-->
+    <TextView
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        style="@style/ListHeadTextStyle"
+        android:id="@+id/id_am"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+</androidx.constraintlayout.widget.ConstraintLayout>

RMA/app/src/main/res/layout/deal_fragment.xml

@@ -34,7 +34,8 @@
             app:layout_constraintTop_toTopOf="parent"
             android:id="@+id/id_deal_time"
             app:layout_constraintEnd_toEndOf="parent"
-            android:text="@string/str_deal_name_type"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:text="@string/str_deal_time"
             style="@style/HoldHeadTextStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>

RMA/app/src/main/res/layout/entrust_child.xml

@@ -8,5 +8,6 @@
         android:layout_width="match_parent"
         app:layout_constraintTop_toTopOf="parent"
         android:id="@+id/id_entrust_list"
-        android:layout_height="match_parent"/>
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_height="0dp"/>
 </androidx.constraintlayout.widget.ConstraintLayout>

RMA/app/src/main/res/layout/entrust_item.xml

@@ -3,33 +3,93 @@
     android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:padding="15dp"
-    android:layout_height="match_parent">
-
-<!--状态-->
-    <TextView
-        android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="0dp"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintDimensionRatio="w,4.7:1"
         app:layout_constraintStart_toStartOf="parent"
-        android:id="@+id/id_status"
-        android:text="已报"
+        android:id="@+id/id_head"
+        app:layout_constraintEnd_toStartOf="@+id/id_entrust_num"
+        android:layout_height="wrap_content">
+
+        <!--状态-->
+        <TextView
+            android:layout_width="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:layout_marginEnd="10dp"
+            android:id="@+id/id_status"
+            android:text="已报1"
+            app:layout_constraintEnd_toStartOf="@+id/id_goods_name"
+            style="@style/ListTextStyle"
+            android:layout_height="wrap_content"/>
+        <!--    时间-->
+        <TextView
+            app:layout_constraintTop_toBottomOf="@+id/id_status"
+            android:layout_width="wrap_content"
+            android:id="@+id/id_date"
+            android:text="10:10:10"
+            style="@style/ListSummaryTextStyle"
+            app:layout_constraintStart_toStartOf="parent"
+            android:layout_height="wrap_content"/>
+        <!--    名称\类型-->
+        <TextView
+            android:layout_width="0dp"
+            android:gravity="end"
+            android:paddingEnd="20dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/id_status"
+            style="@style/ListTextStyle"
+            android:text="名称"
+            android:lines="1"
+            android:ellipsize="end"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:id="@+id/id_goods_name"
+            android:layout_height="wrap_content"/>
+        <TextView
+            android:layout_width="wrap_content"
+            app:layout_constraintTop_toBottomOf="@+id/id_goods_name"
+            style="@style/ListSummaryTextStyle"
+            android:text="类型"
+            android:paddingEnd="20dp"
+            android:id="@+id/id_entrust_type"
+            app:layout_constraintEnd_toEndOf="@+id/id_goods_name"
+            android:layout_height="wrap_content"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+<!--    委托数量、价格-->
+    <TextView
+        android:layout_width="0dp"
+        android:gravity="end"
+        android:id="@+id/id_entrust_num"
         style="@style/ListTextStyle"
+        android:paddingEnd="15dp"
+        android:text="委托数量"
+        app:layout_constraintStart_toEndOf="@+id/id_head"
+        app:layout_constraintEnd_toStartOf="@+id/id_entrust_pl"
+        app:layout_constraintTop_toTopOf="parent"
         android:layout_height="wrap_content"/>
-<!--    时间-->
     <TextView
-        app:layout_constraintTop_toBottomOf="@+id/id_status"
         android:layout_width="wrap_content"
-        android:id="@+id/id_date"
-        android:text="10:10:10"
+        android:id="@+id/id_entrust_price"
         style="@style/ListSummaryTextStyle"
-        app:layout_constraintStart_toStartOf="parent"
+        android:text="价格"
+        android:paddingEnd="15dp"
+        app:layout_constraintTop_toBottomOf="@+id/id_entrust_num"
+        app:layout_constraintEnd_toEndOf="@+id/id_entrust_num"
         android:layout_height="wrap_content"/>
-
 <!--    盈亏-->
     <TextView
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:text="100.00"
         style="@style/ListTextStyle"
+        android:id="@+id/id_entrust_pl"
+        android:gravity="end"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/id_entrust_num"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         android:layout_height="wrap_content"/>
 </androidx.constraintlayout.widget.ConstraintLayout>

RMA/app/src/main/res/layout/hold_fragment.xml

@@ -62,6 +62,6 @@
         android:layout_height="0dp"
         android:id="@+id/id_hold_list"
         app:layout_constraintTop_toBottomOf="@+id/line"
-        app:layout_constraintBottom_toBottomOf="parent"
-        />
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
 </androidx.constraintlayout.widget.ConstraintLayout>

RMA/app/src/main/res/values/strings.xml

@@ -87,6 +87,7 @@
 
     <string name="str_deal_name_type">名称\n类型</string>
     <string name="str_deal_num_price">成交数量\n价格</string>
+    <string name="str_deal_time">成交时间</string>
     <string name="str_currency">币种</string>
     <string name="str_current_equity">当前权益</string>
     <string name="str_available_am">可用金额</string>
@@ -97,5 +98,8 @@
     <string name="str_in_am">入金</string>
     <string name="str_out_am">出金</string>
     <string name="str_rate_of_use">资金使用率</string>
+    <string name="str_time">时间</string>
+    <string name="str_operate_type">操作类型</string>
+    <string name="str_am">金额</string>
 
 </resources>