风险管理8月14日提交代码-liu.bolan-云融大宗

RMA/app/src/main/assets/errormessage.json

@@ -23,6 +23,14 @@
       "description": "委托账户没有交易权限",
       "rownumber": "AAI+HaABDAAABwDABZ"
     },
+   {
+     "errorid": 10038,
+     "errorcode": "10038",
+     "modulecode": "10",
+     "operatecode": "ERR_PERFORMANCE_ACTIVATEMONTH_NO_EXPIRE",
+     "description": "履约计划未到交收月不能激活",
+     "rownumber": "AAI+HaABDAAABxgAAE"
+   },
     {
       "errorid": 3016,
       "errorcode": "3016",

RMA/app/src/main/java/cn/muchinfo/rma/global/StringUtils.kt

@@ -98,6 +98,21 @@ fun String.toShowTime2(format : String = "yyyy-MM-dd HH:mm:ss") : String{
     return timeString
 }
 
+
+/**
+ * 和isShowTimeString的接收时间格式不同
+ * @receiver String
+ * @return String
+ */
+fun String.toShowTime3(format : String = "yyyy-MM-dd") : String{
+    if (this.isNullOrEmpty()){
+        return "--"
+    }
+    val sdf = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA)
+    val sdf1 = SimpleDateFormat(format, Locale.CHINA)
+    var timeString = sdf1.format(sdf.parse(this)!!)
+    return timeString
+}
 fun String.toTimeData(format: String = "yyyy-MM-dd HH:mm:ss"): Date{
     val sdf = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss+08:00", Locale.CHINA)
     return sdf.parse(this)!!

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

@@ -197,8 +197,8 @@ class MainActivity : BaseActivity<MainViewModel>() {
             //华南顺通 仓单预售
             newFragments.add(hnstcdysFragment)
             newTabText.add("仓单预售")
-            newNormalIcon.add(R.mipmap.warehous_recepit_normal)
-            newSelectIcon.add(R.mipmap.warehous_recepit_celect)
+            newNormalIcon.add(R.mipmap.yrdz_cdys_normal)
+            newSelectIcon.add(R.mipmap.yrdz_yscd_select)
         }
 
 //        if(GlobalDataCollection.instance?.getFirstLevelMenu("client_mobile_hnsthyjy") == true){

RMA/app/src/main/java/cn/muchinfo/rma/view/base/app/Constant.kt

@@ -17,12 +17,12 @@ object Constant {
 //     const val baseurl = "http://192.168.31.101:8080/cfg?key=test_101"//李倩千海金 18611112222
 
 //     const val baseurl = "http://192.168.31.107:8080/cfg?key=test_107"//李倩千海金 18611112222
-//      const val baseurl = "http://192.168.30.211:8080/cfg?key=test_211"// 瑶姐 130000000001 123456
+      const val baseurl = "http://192.168.30.211:8080/cfg?key=test_211"// 瑶姐 130000000001 123456
 //          const val baseurl = "http://192.168.31.107:8080/cfg?key=test_107"// 瑶姐 千海金 13760119855
 
 //    const val baseurl = "http://192.168.31.175:8080/cfg?key=test_175" // 8888  123123
 //    const val baseurl = "http://192.168.31.223:8080/cfg?key=test_223"
-    const val baseurl = "http://192.168.31.174:8080/cfg?key=test_174"// 邓工
+//    const val baseurl = "http://192.168.31.174:8080/cfg?key=test_174"// 邓工
 
 //     const val baseurl = "http://192.168.31.176:8080/cfg?key=test_176" // 9999  123123  黄老板千海金
 //    const val baseurl = "http://192.168.31.171:8080/cfg?key=test_171" // 邓工 签约解约环境

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstcdys/dialog/HnstFloatListedDialog.kt

@@ -843,7 +843,7 @@ class FloatBuyListedUI(
                         }
 
                         textView {
-                            text = "吨"
+                            text = data.WrFtWrstandard.enumdicname
                             textSizeAuto = 34
                             textColorInt = R.color.rma_hint_text_color_ccc
                         }.lparams(wrapContent, wrapContent) {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstcdys/dialog/HnstOneListedDialog.kt

@@ -352,7 +352,7 @@ class OneSellListedUI(
                         }
 
                         textView {
-                            text = "吨"
+                            text = data.WrFtWrstandard.enumdicname
                             textSizeAuto = 34
                             textColorInt = R.color.rma_hint_text_color_ccc
                         }.lparams(wrapContent, wrapContent) {
@@ -712,10 +712,6 @@ class OneBuyListedUI(
                                         ) ?: 0.0, 2
                                     ) + ")"
                                 }
-                                //这里计算最多购买数量 挂牌最大数量=可用资金/(买方履约保证金比例*挂牌价格)
-                                if (value.toDouble() != 0.0 && marginValue != 0.0){
-                                    maxlistedNumber.postValue(viewModel.usedAccountData.value?.canUserAmount?.div(marginValue)?.div(value.toDouble())?.toInt())
-                                }
                             }
                         }
                     }
@@ -743,7 +739,7 @@ class OneBuyListedUI(
                     linearLayout {
                         gravity = Gravity.CENTER_VERTICAL
                         numberEditText {
-                            text = "1"
+                            text = data.WrFtWrstandard.minivalue
                             oneNumberInputEdittext = this
                             setOnTextChangeListener { view, value ->
                                 if (value.isNullOrEmpty().not()) {
@@ -775,7 +771,7 @@ class OneBuyListedUI(
                         }
 
                         textView {
-                            text = "吨"
+                            text = data.WrFtWrstandard.enumdicname
                             textSizeAuto = 34
                             textColorInt = R.color.rma_hint_text_color_ccc
                         }.lparams(wrapContent, wrapContent) {
@@ -784,7 +780,7 @@ class OneBuyListedUI(
                     }.lparams(matchParent, autoSize(143))
 
                     inflateLayout<SeekBar>(R.layout.main_seekbar) {
-                        min = 10
+                        min = 1
                         max = 100
                         seekBar = this
                         isIndeterminate = false
@@ -822,7 +818,6 @@ class OneBuyListedUI(
                         textView {
                             maxlistedNumber.bindOptional(context){
                                 //最大可交易数量变更后，输入的值要根据seekbar进度来进行更新
-                                oneNumberInputEdittext.text = NumberUtils.roundNum(it?.times(seekBar.progress.div(100.0)).toString(),0)
                                 text = it.toString() + data.WrFtWrstandard.enumdicname
                             }
                             textSizeAuto = 29

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/bookingwarehouse/BookingWarehouseViewModel.kt

@@ -322,7 +322,7 @@ class BookingWarehouseViewModel : BaseViewModel(){
             //挂牌类型
             newRightData.add(if (it.buyorsell == "0"){"买入"}else{"卖出"})
             //期货合约/基差
-            newRightData.add(it.goodscode  + "\n" + NumberUtils.roundNum(it.pricemove,2))
+            newRightData.add(if (it.goodscode.isNullOrEmpty()){ "--"}else{ it.goodscode  + "\n" + NumberUtils.roundNum(it.pricemove,2)})
             //挂牌价格
             newRightData.add(it.fixedprice ?: "-")
             //挂牌数量

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/finance/FinanceContractDetailsActivity.kt

@@ -5,6 +5,7 @@ import android.view.Gravity
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.data.WrFactorTypeInfoExData
 import cn.muchinfo.rma.global.data.WrScfContractData
+import cn.muchinfo.rma.global.isBlankString
 import cn.muchinfo.rma.global.scfcontractstatus
 import cn.muchinfo.rma.global.toPercentage
 import cn.muchinfo.rma.global.toWanPercentage
@@ -53,7 +54,7 @@ class FinanceContractDetailsActivity : BaseActivity<FinanceManagementViewModel>(
                     itemView()
                     contractItem(itemTile = "保证金",itemContent = data.initmargin ?: "-")
                     itemView()
-                    contractItem(itemTile = "交收月",itemContent = data.initmargin ?: "-") // TODO 缺少交收月
+                    contractItem(itemTile = "交收月",itemContent = "-") // TODO 缺少交收月
                     itemView()
                     contractItem(itemTile = "数量",itemContent = data.wrqty + data.enumdicname)
                     itemView()
@@ -67,7 +68,7 @@ class FinanceContractDetailsActivity : BaseActivity<FinanceManagementViewModel>(
                     itemView()
                     contractItem(itemTile = "开始计费日期",itemContent = data.startinterestday ?: "-")
                     itemView()
-                    contractItem(itemTile = "最近结息日",itemContent = data.lastcloseinterestday ?: "-")
+                    contractItem(itemTile = "最近结息日",itemContent = data.lastcloseinterestday?.isBlankString() ?: "-")
                     itemView()
                     contractItem(itemTile = "借款到期时间",itemContent = data.deadline ?: "-")
                     itemView()

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/finance/FinanceManagementActivity.kt

@@ -406,10 +406,10 @@ class ContractUI(private val activity : AppCompatActivity, private val viewModel
                 }
                 swipeToLoadLayout {
                     swipeToLayout = this
-                    setEnableRefresh(false)
+                    setEnableRefresh(true)
                     setEnableLoadMore(true)
                     setOnRefreshListener {
-
+                        viewModel.queryWrScfContract()
                     }
                     setEnableScrollContentWhenLoaded(false)
                     setEnableLoadMoreWhenContentNotFull(false)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/finance/FinancePayalanceActivity.kt

@@ -58,7 +58,6 @@ class FinancePayalanceActivity : BaseActivity<FinanceManagementViewModel>(){
                         contractItem(itemTile = "费用欠款", itemContent = data.interestdebt ?: "-")
 
                         linearLayout {
-                            visibility = View.GONE
                             gravity = Gravity.CENTER_VERTICAL
                             textView {
                                 text = "回购明细"

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/finance/FinancePayalanceViewHolder.kt

@@ -24,7 +24,7 @@ class FinancePayalanceViewHolder(private val activity : AppCompatActivity,privat
                     gravity = Gravity.CENTER
                     textView {
                         data.bindOptional(context){
-                            text = it?.updatetime
+                            text = it?.interestday
                         }
                         textSizeAuto = 29
                         textColorInt = R.color.rma_black_33

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/finance/FinanceRepoActivity.kt

@@ -70,7 +70,7 @@ class FinanceRepoActivity : BaseActivity<FinanceManagementViewModel>() {
                         )
                         itemView()
                         contractItem(
-                            itemTile = "剩余数量",
+                            itemTile = "待回购数量",
                             itemContent = data.remainwrpositionqty + data.enumdicname
                         )
                         itemView()
@@ -92,7 +92,7 @@ class FinanceRepoActivity : BaseActivity<FinanceManagementViewModel>() {
                                 textChangedListener {
                                     afterTextChanged {
                                         if (it.toString().isNotEmpty()) {
-                                            amount_text.text = NumberUtils.roundNum(it?.toString()?.toDouble()?.div(data.remainwrpositionqty?.toDouble() ?: 1.0)?.times(data.interestamount?.toDouble() ?: 0.0).toString(),2)
+                                            amount_text.text = NumberUtils.roundNum(it?.toString()?.toDouble()?.div(data.remainwrpositionqty?.toDouble() ?: 1.0)?.times(data.remainamount?.toDouble() ?: 0.0).toString(),2)
                                         }
                                     }
                                 }
@@ -100,12 +100,12 @@ class FinanceRepoActivity : BaseActivity<FinanceManagementViewModel>() {
                                 hint = "请输入回购数量"
                                 background = null
                                 inputType = EditorInfo.TYPE_CLASS_NUMBER
-                                setDecimalInputType()
+//                                setDecimalInputType()
                                 hintColorStr = "#CCCCCC"
                                 textSizeAuto = 31
                                 textColorStr = "#333333"
-                            }.lparams(0, autoSize(132), 1f) {
-                                marginStart = autoSize(80)
+                            }.lparams(0, autoSize(132), 1f){
+                                marginStart = autoSize(20)
                             }
 
                             textView {
@@ -117,6 +117,13 @@ class FinanceRepoActivity : BaseActivity<FinanceManagementViewModel>() {
                             }
                         }.lparams(matchParent, autoSize(132))
 
+                        // TODO 接口缺少-资金方对应仓单头寸可用数量
+                        itemView()
+                        contractItem(
+                            itemTile = "",
+                            itemContent = "本次可回购数量" +  data.remainwrpositionqty + data.enumdicname
+                        )
+
                         itemView()
 
                         linearLayout {
@@ -143,6 +150,13 @@ class FinanceRepoActivity : BaseActivity<FinanceManagementViewModel>() {
 
                         }.lparams(matchParent, autoSize(120))
 
+                         itemView()
+
+                        contractItem(
+                            itemTile = "剩余保证金",
+                            itemContent = data.initmargin ?: "-"
+                        )
+
                         linearLayout {
                             visibility = View.GONE
                             gravity = Gravity.CENTER_VERTICAL
@@ -197,12 +211,13 @@ class FinanceRepoActivity : BaseActivity<FinanceManagementViewModel>() {
                             background = resources.getDrawable(R.color.white)
                             adapter = financeRepoAdapter
                             isNestedScrollingEnabled = false
-                        }.lparams(matchParent, matchParent)
+                        }.lparams(matchParent, matchParent){
+                            bottomMargin = autoSize(200)
+                        }
 
                         viewModel.wrBuybackDetailDataList.bindOptional(context){
                             financeRepoAdapter.setNewData(it)
                         }
-
                     }
 
                 }.lparams(matchParent, matchParent)
@@ -221,7 +236,7 @@ class FinanceRepoActivity : BaseActivity<FinanceManagementViewModel>() {
                                 marketid = data.marketid?.toInt() ?: 0,
                                 SCFContractID = data.scfcontractid?.toLong() ?: 0,
                                 SCFContractType = data.scfcontracttype?.toInt() ?: 0,
-                                WRPositionQty = data.remainwrpositionqty?.toLong() ?: 0
+                                WRPositionQty = number_Edittext.text.toString()?.toLong() ?: 0
                             ){
                                 finish()
                             }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/finance/FinanceRepoViewHolder.kt

@@ -4,6 +4,8 @@ import android.view.Gravity
 import androidx.appcompat.app.AppCompatActivity
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.data.WrBuybackDetailData
+import cn.muchinfo.rma.global.toShowTime2
+import cn.muchinfo.rma.global.toShowTime3
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.autoSize
 import cn.muchinfo.rma.view.autoWidget.textColorInt
@@ -24,7 +26,7 @@ class FinanceRepoViewHolder(private val activity : AppCompatActivity,private val
                     gravity = Gravity.CENTER
                     textView {
                         data.bindOptional(context){
-                            text = it?.buybacktime
+                            text = it?.buybacktime?.toShowTime3("yyyy-MM-dd")
                         }
                         textSizeAuto = 29
                         textColorInt = R.color.rma_blue_color

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/finance/adapter/FinanceContractContentAdapter.java

@@ -87,9 +87,36 @@ public class FinanceContractContentAdapter extends RecyclerView.Adapter<FinanceC
         this.index = i;
         WrScfContractData data = datas.get(i);
 
-        itemViewHolder.tvLeftTitle.setText(data.getDeliverygoodsname());
+        //类型 暂时只有一个状态叫融资回购
+        itemViewHolder.tvLeftTitle.setText("融资回购");
+
+        //状态  1:待确认 2:已确认 3:确认拒绝 4:已支付保证金 5:已激活 6:已违约 7:到期结束 8:延期结束 9:违约结束 10:已注销 11:已关闭 99:未提交
+        if (data.getScfcontractstatus().equals("1")){
+            itemViewHolder.tv_left_bottom_title.setText("待确认");
+        }else if (data.getScfcontractstatus().equals("2")){
+            itemViewHolder.tv_left_bottom_title.setText("已确认");
+        }else if (data.getScfcontractstatus().equals("3")){
+            itemViewHolder.tv_left_bottom_title.setText("确认拒绝");
+        }else if (data.getScfcontractstatus().equals("4")){
+            itemViewHolder.tv_left_bottom_title.setText("已支付保证金");
+        }else if (data.getScfcontractstatus().equals("5")){
+            itemViewHolder.tv_left_bottom_title.setText("已激活");
+        }else if (data.getScfcontractstatus().equals("6")){
+            itemViewHolder.tv_left_bottom_title.setText("已违约");
+        }else if (data.getScfcontractstatus().equals("7")){
+            itemViewHolder.tv_left_bottom_title.setText("到期结束");
+        }else if (data.getScfcontractstatus().equals("8")){
+            itemViewHolder.tv_left_bottom_title.setText("延期结束");
+        }else if (data.getScfcontractstatus().equals("9")){
+            itemViewHolder.tv_left_bottom_title.setText("违约结束");
+        }else if (data.getScfcontractstatus().equals("10")){
+            itemViewHolder.tv_left_bottom_title.setText("已注销");
+        }else if (data.getScfcontractstatus().equals("11")){
+            itemViewHolder.tv_left_bottom_title.setText("已关闭");
+        }else if (data.getScfcontractstatus().equals("99")){
+            itemViewHolder.tv_left_bottom_title.setText("未提交");
+        }
 
-        itemViewHolder.tv_left_bottom_title.setText(data.getWrtypename());
         //右边滑动部分
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(context);
         linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
@@ -127,7 +154,11 @@ public class FinanceContractContentAdapter extends RecyclerView.Adapter<FinanceC
 
         itemViewHolder.details.setVisibility(View.VISIBLE);
 
-        itemViewHolder.warehouse_register.setVisibility(View.VISIBLE);
+        if (Double.parseDouble(data.getRemainwrpositionqty()) > 0 && data.getScfcontractstatus().equals("5")){
+            itemViewHolder.warehouse_register.setVisibility(View.VISIBLE);
+        }else {
+            itemViewHolder.warehouse_register.setVisibility(View.GONE);
+        }
 
         //回购仓单
         itemViewHolder.warehouse_register.setOnClickListener(view -> {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/performance/PerformanceDefaultActivity.kt

@@ -13,6 +13,7 @@ import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.base.BaseActivity
 import cn.muchinfo.rma.view.base.future.trade.itemView
 import cn.muchinfo.rma.view.base.home.contract.viewItemUI
+import com.blankj.utilcode.util.ToastUtils
 import mtp.polymer.com.autowidget.dialog.createLoadingDialog
 import mtp.polymer.com.autowidget.utils.bindTaskStatus
 import org.jetbrains.anko.*
@@ -208,6 +209,7 @@ class PerformanceDefaultActivity : BaseActivity<PerformanceInformationViewModel>
                                         ?: 0,
                                     ApplyRemark = remask_edittext.text.toString()
                                 ) {
+                                    ToastUtils.showLong("请求成功")
                                     finish()
                                 }
                             } else {
@@ -218,6 +220,7 @@ class PerformanceDefaultActivity : BaseActivity<PerformanceInformationViewModel>
                                     Applicant = GlobalDataCollection.instance?.loginRsp?.userID?.toLong() ?: 0,
                                     ApplyRemark = remask_edittext.text.toString()
                                 ){
+                                    ToastUtils.showLong("请求成功")
                                     finish()
                                 }
                             }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/performance/PerformanceInformationActivity.kt

@@ -26,7 +26,9 @@ import com.blankj.utilcode.util.SizeUtils
 import com.qmuiteam.qmui.util.QMUIDisplayHelper
 import com.qmuiteam.qmui.widget.tab.QMUITabIndicator
 import com.qmuiteam.qmui.widget.tab.QMUITabSegment
+import mtp.polymer.com.autowidget.dialog.createLoadingDialog
 import mtp.polymer.com.autowidget.dialog.createWarningDialog
+import mtp.polymer.com.autowidget.utils.bindTaskStatus
 import org.jetbrains.anko.*
 import org.jetbrains.anko.support.v4.viewPager
 
@@ -98,6 +100,7 @@ class PerformanceInformationActivity : BaseActivity<PerformanceInformationViewMo
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         verticalLayout {
+            createLoadingDialog(hintStr = "").bindTaskStatus(context, viewModel.loadingDialogStatus)
             initMenuData()
             topBar {
                 commonLeftButton()

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/performance/PerformanceInformationViewModel.kt

@@ -126,6 +126,8 @@ class PerformanceInformationViewModel : BaseViewModel(){
             newRightData.add(it.warehousename ?: "-")
             //类型
             newRightData.add(if (it.haswr == "0"){"仓单预售"}else{"仓单贸易"})
+            //交收月
+            newRightData.add("-") // 接口缺少
             //关联单号
             newRightData.add(it.relatedorderid ?: "-")
             //付款方式
@@ -202,6 +204,8 @@ class PerformanceInformationViewModel : BaseViewModel(){
             newRightData.add(it.warehousename ?: "-")
             //类型
             newRightData.add(if (it.haswr == "0"){"仓单预售"}else{"仓单贸易"})
+            //交收月
+            newRightData.add("-") // 接口缺少
             //关联单号
             newRightData.add(it.relatedorderid ?: "-")
             //付款方式
@@ -209,7 +213,7 @@ class PerformanceInformationViewModel : BaseViewModel(){
             //履约前冻结
             newRightData.add(it.sellerfreezeamount ?: "-")
             //履约冻结剩余
-            newRightData.add(if (it.buyorsell == "0"){it.buyerfreezeamountremain ?: "-"}else{it.sellerfreezeamountremain ?: "-"})
+            newRightData.add(it.sellerfreezeamountremain ?: "-")
             //总金额
             newRightData.add(it.amount ?: "-")
             //已付金额

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/performance/adapter/PerformanceInformationContentAdapter.java

@@ -133,7 +133,7 @@ public class PerformanceInformationContentAdapter extends RecyclerView.Adapter<P
 
         if (data.getPerformancestatus().equals("2")){
             if (type.equals("1")){//买履约
-                if (data.getSteptypeid().equals("1") || data.getPerformancestatus().equals("6") || data.getSteptypeid().equals("10")){//步骤为买方支付，货款溢短，卖方发票时，延期,违约，详情按钮才显示
+                if (data.getSteptypeid().equals("1") || data.getSteptypeid().equals("6") || data.getSteptypeid().equals("10")){//步骤为买方支付，货款溢短，卖方发票时，延期,违约，详情按钮才显示
                     itemViewHolder.spot_details.setText("延期");
                     itemViewHolder.spot_details.setVisibility(View.VISIBLE);
                     itemViewHolder.future_details.setText("违约");
@@ -151,14 +151,6 @@ public class PerformanceInformationContentAdapter extends RecyclerView.Adapter<P
                 }else {
                     itemViewHolder.warehouse_register.setVisibility(View.GONE);
                 }
-                 if (data.getPerformancestatus().equals("1")){//待激活
-                     itemViewHolder.payment_registration.setVisibility(View.VISIBLE);
-                     itemViewHolder.details.setText("详情");
-                     itemViewHolder.details.setVisibility(View.VISIBLE);
-                 }else {
-                     itemViewHolder.payment_registration.setVisibility(View.GONE);
-                     itemViewHolder.details.setVisibility(View.GONE);
-                 }
             }else if (type.equals("2")){//卖履约
                 itemViewHolder.warehouse_register.setVisibility(View.GONE);
                 if (data.getSteptypeid().equals("1") || data.getSteptypeid().equals("4") || data.getSteptypeid().equals("6") || data.getSteptypeid().equals("8")){//步骤为买方支付，卖方发货，卖方发票，仓单转移时，延期,违约，详情按钮才显示
@@ -181,6 +173,17 @@ public class PerformanceInformationContentAdapter extends RecyclerView.Adapter<P
             itemViewHolder.details.setVisibility(View.GONE);
         }
 
+        if (data.getPerformancestatus().equals("1")){//待激活
+            itemViewHolder.future_details.setText("违约");
+            itemViewHolder.future_details.setVisibility(View.VISIBLE);
+            itemViewHolder.payment_registration.setVisibility(View.VISIBLE);
+            itemViewHolder.details.setText("详情");
+            itemViewHolder.details.setVisibility(View.VISIBLE);
+        }else {
+            itemViewHolder.payment_registration.setVisibility(View.GONE);
+            itemViewHolder.details.setVisibility(View.GONE);
+        }
+
         //付款
         itemViewHolder.warehouse_register.setOnClickListener(view -> {
             Intent intent = new Intent();

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/spotwarehouse/adapter/SpotWarehouseContentAdapter.java

@@ -122,19 +122,22 @@ public class SpotWarehouseContentAdapter extends RecyclerView.Adapter<SpotWareho
         itemViewHolder.all_click_View.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (type.equals("3") && (Double.valueOf(data.getEnalbeqty()) > 0)){//仓库汇总和订单汇总可以点击展开
+                if (type.equals("3")){//仓库汇总和订单汇总可以点击展开
                     setPosition(i);
                 }
             }
         });
 
-
-        itemViewHolder.warehouse_register.setVisibility(View.VISIBLE);
-
 //        if (type.equals("2")){//仓库汇总可以提货
 //            itemViewHolder.fanacel_register.setVisibility(View.VISIBLE);
 //        }
 
+        if (Double.parseDouble(data.getCreditenableqty()) > 0){
+            itemViewHolder.warehouse_register.setVisibility(View.VISIBLE);
+        }else {
+            itemViewHolder.warehouse_register.setVisibility(View.GONE);
+        }
+
         //挂牌
         itemViewHolder.warehouse_register.setOnClickListener(view -> {
             Intent intent = new Intent();

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/spotwarehouse/listed/ListedActivity.kt

@@ -428,6 +428,7 @@ class ListedActivity : BaseActivity<ListedViewModel>() {
                             numberEditText {
                                 onePriceInputEdittext = this
                                 text = "0"
+                                decimal = 2
                                 setOnTextChangeListener { view, value ->
                                     one_delisting_amount.text = NumberUtils.roundNum(
                                         value.toDouble()
@@ -464,7 +465,7 @@ class ListedActivity : BaseActivity<ListedViewModel>() {
 
                             numberEditText3 {
                                 basisInputEdittext = this
-                                text = "1"
+                                text = "0"
                                 setOnTextChangeListener { view, value ->
                                     if (value.isNullOrEmpty().not()) {
                                         if (type == "1") {
@@ -508,7 +509,12 @@ class ListedActivity : BaseActivity<ListedViewModel>() {
                                     gravity = Gravity.CENTER_VERTICAL
                                     numberEditText {
                                         listednumberEdittext = this
-                                        text = "1"
+                                        if (type == "1"){
+                                            text = data.minivalue
+                                        }else{
+                                            text = data1.minivalue
+                                        }
+
                                         setOnTextChangeListener { view, value ->
                                             if (value.isNullOrEmpty().not()) {
                                                 if (listedType.value?.id == "1") {//一口价
@@ -804,6 +810,9 @@ class ListedActivity : BaseActivity<ListedViewModel>() {
                     gravity = Gravity.CENTER_VERTICAL
                     textView {
                         onThrottleFirstClick {
+                            if (check().not()){
+                                return@onThrottleFirstClick
+                            }
                             if (type == "1") {//现货仓单挂单
                                 if (listedType.value?.id == "1") {//一口价
                                     viewModel.requeryWRListingOrderReq(
@@ -972,7 +981,7 @@ class ListedActivity : BaseActivity<ListedViewModel>() {
      */
     fun check(): Boolean {
         if (listedType.value?.id == "1") {//一口价校验
-            if (onePriceInputEdittext.text.toString().isNotEmpty()) {
+            if (onePriceInputEdittext.text.toString().isNullOrEmpty()) {
                 ToastUtils.showLong("请输入挂牌价格")
                 return false
             }
@@ -980,7 +989,7 @@ class ListedActivity : BaseActivity<ListedViewModel>() {
                 ToastUtils.showLong("挂牌价格不能为0")
                 return false
             }
-            if (listednumberEdittext.text.toString().isNotEmpty()) {
+            if (listednumberEdittext.text.toString().isNullOrEmpty()) {
                 ToastUtils.showLong("请输入挂牌数量")
                 return false
             }
@@ -988,7 +997,7 @@ class ListedActivity : BaseActivity<ListedViewModel>() {
                 ToastUtils.showLong("挂牌数量不能为0")
                 return false
             }
-            if (startInputNumber.text.toString().isNotEmpty()) {
+            if (startInputNumber.text.toString().isNullOrEmpty()) {
                 ToastUtils.showLong("请输入起摘数量")
                 return false
             }
@@ -1008,7 +1017,7 @@ class ListedActivity : BaseActivity<ListedViewModel>() {
                 ToastUtils.showLong("请选择行情商品")
                 return false
             }
-            if (basisInputEdittext.text.toString().isNotEmpty()) {
+            if (basisInputEdittext.text.toString().isNullOrEmpty()) {
                 ToastUtils.showLong("请输入基差")
                 return false
             }
@@ -1016,7 +1025,7 @@ class ListedActivity : BaseActivity<ListedViewModel>() {
                 ToastUtils.showLong("基差不能为0")
                 return false
             }
-            if (listednumberEdittext.text.toString().isNotEmpty()) {
+            if (listednumberEdittext.text.toString().isNullOrEmpty()) {
                 ToastUtils.showLong("请输入挂牌数量")
                 return false
             }
@@ -1024,7 +1033,7 @@ class ListedActivity : BaseActivity<ListedViewModel>() {
                 ToastUtils.showLong("挂牌数量不能为0")
                 return false
             }
-            if (startInputNumber.text.toString().isNotEmpty()) {
+            if (startInputNumber.text.toString().isNullOrEmpty()) {
                 ToastUtils.showLong("请输入起摘数量")
                 return false
             }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/BusinessHallActivity.kt

@@ -742,7 +742,7 @@ class BusinessHallActivity : BaseActivity<BusinessHallViewModel>() {
             }
         }
 
-        createCustomDialog(cancelable = false) { dialog ->
+        createCustomDialog(cancelable = true) { dialog ->
             setMarginValue()
             backgroundColor = Color.parseColor("#5f000000")
             selectAccountData.postValue(GlobalDataCollection.instance?.accountData)
@@ -1024,7 +1024,11 @@ class BusinessHallActivity : BaseActivity<BusinessHallViewModel>() {
 
                     textView {
                         one_delisting_amount = this
-                        text = buySelldata.fixedprice
+                        text = buySelldata.fixedprice + "(需履约保证金" + NumberUtils.roundNum(
+                            buySelldata.fixedprice?.toDouble()?.times(
+                                marginValue
+                            ) ?: 0.0, 2
+                        ) + ")"
                         textSizeAuto = 29
                         textColorInt = R.color.rma_black_33
                     }.lparams(wrapContent, wrapContent)
@@ -1246,7 +1250,7 @@ class BusinessHallActivity : BaseActivity<BusinessHallViewModel>() {
 
         }
 
-        createCustomDialog(cancelable = false) { dialog ->
+        createCustomDialog(cancelable = true) { dialog ->
             setMarginValue()
             selectAccountData.postValue(GlobalDataCollection.instance?.accountData)
             backgroundColor = Color.parseColor("#5f000000")
@@ -1759,7 +1763,7 @@ class BusinessHallActivity : BaseActivity<BusinessHallViewModel>() {
 
         lateinit var one_seekbar: SeekBar
 
-        createCustomDialog(cancelable = false) { dialog ->
+        createCustomDialog(cancelable = true) { dialog ->
             selectAccountData.postValue(GlobalDataCollection.instance?.accountData)
             backgroundColor = Color.parseColor("#5f000000")
             maxpickNumber.postValue(buyOrSelldata.orderqty?.toDouble())

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/BusinessSellHallViewHolder.kt

@@ -122,6 +122,13 @@ class BusinessSellHallViewHolder(private val activity : AppCompatActivity,privat
                  }
 
                  textView {
+                     viewModel.financingSelectDataList.bindOptional(context){
+                         if (it?.size ?: 0 > 0){
+                             visibility = View.VISIBLE
+                         }else{
+                             visibility = View.GONE
+                         }
+                     }
                      onThrottleFirstClick {
                          onThrottleFirstClick {
                              viewModel.selectData.postValue(data.value)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/FloatListedDialog.kt

@@ -116,7 +116,7 @@ fun AppCompatActivity.FloatListedDialog(
 
     }
 
-    return createCustomDialog(cancelable = false) { dialog ->
+    return createCustomDialog(cancelable = true) { dialog ->
         backgroundColor = Color.parseColor("#5f000000")
         initMenuData()
         if (type == "2") {
@@ -385,13 +385,13 @@ class FloatSellListedUI(
                                     }
                                 }
                             }
-
+                            setTextColor(R.color.buy_hall_color)
                         }.lparams(0, autoSize(72),1f){
                             marginEnd = autoSize(36)
                         }
 
                         textView {
-                            text = "吨"
+                            text = data.enumdicname
                             textSizeAuto = 34
                             textColorInt = R.color.rma_hint_text_color_ccc
                         }.lparams(wrapContent, wrapContent){
@@ -437,8 +437,16 @@ class FloatSellListedUI(
 
                         textView {
                             max_number = this
+                            viewModel.summaryWrPositionDataByDialog.bindOptional(context){
+                                if (type == "2"){
+                                    text = it?.creditenableqty + data.enumdicname
+                                }
+                            }
                             selectSpotDetailsData.bindOptional(context){
-                                text = it?.enableqty
+                                if (type == "1"){
+                                    text = it?.enableqty + data.enumdicname
+                                }
+
                             }
                             text = "1"
                             textSizeAuto = 29
@@ -481,7 +489,7 @@ class FloatSellListedUI(
                         }.lparams(0, autoSize(132),1f)
 
                         textView {
-                            text = "吨"
+                            text = data.enumdicname
                             textSizeAuto = 31
                             textColorInt = R.color.rma_black_33
                         }.lparams(wrapContent, wrapContent)
@@ -857,13 +865,13 @@ class FloatBuyListedUI(
                             setOnTextChangeListener { view, value ->
 
                             }
-
+                            setTextColor(R.color.buy_hall_color)
                         }.lparams(0, autoSize(72),1f){
                             marginEnd = autoSize(36)
                         }
 
                         textView {
-                            text = "吨"
+                            text = data.enumdicname
                             textSizeAuto = 34
                             textColorInt = R.color.rma_hint_text_color_ccc
                         }.lparams(wrapContent, wrapContent){
@@ -911,7 +919,7 @@ class FloatBuyListedUI(
                         textView {
                             maxlistedNumber.bindOptional(context){
                                 oneNumberInputEdittext.text = NumberUtils.roundNum(it?.times(seekBar.progress.div(100.0)).toString(),0)
-                                text = it.toString() + "吨"
+                                text = it.toString() + data.enumdicname
                             }
                             textSizeAuto = 29
                             textColorInt = R.color.rma_gray_color
@@ -953,7 +961,7 @@ class FloatBuyListedUI(
                         }.lparams(0, autoSize(132),1f)
 
                         textView {
-                            text = "吨"
+                            text = data.enumdicname
                             textSizeAuto = 31
                             textColorInt = R.color.rma_black_33
                         }.lparams(wrapContent, wrapContent)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/OneListedDialog.kt

@@ -112,7 +112,7 @@ fun AppCompatActivity.OneListedDialog(
 
     }
 
-    return createCustomDialog(cancelable = false) { dialog ->
+    return createCustomDialog(cancelable = true) { dialog ->
         backgroundColor = Color.parseColor("#5f000000")
         initMenuData()
         if (type == "2") {
@@ -295,7 +295,7 @@ class OneSellListedUI(
                             }
                         }
                     }
-
+                    setTextColor(R.color.buy_hall_color)
                 }.lparams(0, autoSize(72), 1f) {
                     marginEnd = autoSize(110)
                 }
@@ -367,7 +367,7 @@ class OneSellListedUI(
                             viewModel.summaryWrPositionDataByDialog.bindOptional(context){
                                 max = it?.enalbeqty?.toDouble() ?: 1.0
                             }
-                            text = "1"
+                            text = data.minivalue
                             oneNumberInputEdittext = this
                             setOnTextChangeListener { view, value ->
                                 if (value.isNullOrEmpty().not()) {
@@ -396,7 +396,7 @@ class OneSellListedUI(
                                     }
                                 }
                             }
-
+                            setTextColor(R.color.buy_hall_color)
                         }.lparams(0, autoSize(72), 1f) {
                             marginEnd = autoSize(36)
                         }
@@ -411,7 +411,7 @@ class OneSellListedUI(
                     }.lparams(matchParent, autoSize(143))
 
                     inflateLayout<SeekBar>(R.layout.main_seekbar) {
-                        min = 10
+                        min = 1
                         max = 100
                         isIndeterminate = false
                         splitTrack = false
@@ -452,7 +452,14 @@ class OneSellListedUI(
 
                         textView {
                             viewModel.summaryWrPositionDataByDialog.bindOptional(context){
-                                text = it?.enalbeqty + it?.enumdicname
+                                if (type == "2"){
+                                    text = it?.creditenableqty + it?.enumdicname
+                                }
+                            }
+                            selectSpotDetailsData.bindOptional(context){
+                                if (type == "1"){
+                                    text = it?.enableqty + data.enumdicname
+                                }
                             }
                             textSizeAuto = 29
                             textColorInt = R.color.rma_gray_color
@@ -730,6 +737,7 @@ class OneBuyListedUI(
         verticalLayout {
             setMarginValue()
             selectAccountData.postValue(GlobalDataCollection.instance?.accountData)
+            maxlistedNumber.postValue(1)
             backgroundDrawable = createRoundRectDrawable("#ffffff", 24)
             linearLayout {
                 gravity = Gravity.CENTER_VERTICAL
@@ -809,14 +817,14 @@ class OneBuyListedUI(
                                 if (value.toDouble() != 0.0 && marginamount != 0.0) {
                                     maxlistedNumber.postValue(
                                         viewModel.usedAccountData.value?.canUserAmount?.div(
-                                            marginamount
+                                            value.toString().toDouble()
                                         )?.div(value.toDouble())?.toInt()
                                     )
                                 }
                             }
                         }
                     }
-
+                    setTextColor(R.color.buy_hall_color)
                 }.lparams(0, autoSize(72), 1f) {
                     marginEnd = autoSize(110)
                 }
@@ -840,10 +848,11 @@ class OneBuyListedUI(
                     linearLayout {
                         gravity = Gravity.CENTER_VERTICAL
                         numberEditText {
-                            text = "1"
+                            text = data.minivalue
                             oneNumberInputEdittext = this
                             setOnTextChangeListener { view, value ->
                                 if (value.isNullOrEmpty().not()) {
+
                                     if (onePriceInputEdittext.text.toString().isNullOrEmpty()
                                             .not()
                                     ) {
@@ -869,6 +878,7 @@ class OneBuyListedUI(
                                     }
                                 }
                             }
+                            setTextColor(R.color.buy_hall_color)
                         }.lparams(0, autoSize(72), 1f) {
                             marginEnd = autoSize(36)
                         }
@@ -883,7 +893,7 @@ class OneBuyListedUI(
                     }.lparams(matchParent, autoSize(143))
 
                     inflateLayout<SeekBar>(R.layout.main_seekbar) {
-                        min = 10
+                        min = 1
                         max = 100
                         seekBar = this
                         isIndeterminate = false
@@ -923,10 +933,8 @@ class OneBuyListedUI(
                         textView {
                             maxlistedNumber.bindOptional(context) {
                                 //最大可交易数量变更后，输入的值要根据seekbar进度来进行更新
-                                oneNumberInputEdittext.text = NumberUtils.roundNum(
-                                    it?.times(seekBar.progress.div(100.0)).toString(), 0
-                                )
-                                text = it.toString() + "吨"
+
+                                text = it.toString() + data.enumdicname
                             }
                             textSizeAuto = 29
                             textColorInt = R.color.rma_gray_color
@@ -970,7 +978,7 @@ class OneBuyListedUI(
                         }
 
                         textView {
-                            text = "吨"
+                            text = data.enumdicname
                             textSizeAuto = 31
                             textColorInt = R.color.rma_gray_color
                         }.lparams(wrapContent, wrapContent) {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/dialog/WarehouseFloatListedDialog.kt

@@ -825,7 +825,7 @@ class FloatBuyListedUI(
                         }
 
                         textView {
-                            text = "吨"
+                            text = data.WrFtWrstandard.enumdicname
                             textSizeAuto = 34
                             textColorInt = R.color.rma_hint_text_color_ccc
                         }.lparams(wrapContent, wrapContent){

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/dialog/WarehouseOneListedDialog.kt

@@ -389,7 +389,7 @@ class OneSellListedUI(
                         }
 
                         textView {
-                            text = "吨"
+                            text = data.WrFtWrstandard.enumdicname
                             textSizeAuto = 34
                             textColorInt = R.color.rma_hint_text_color_ccc
                         }.lparams(wrapContent, wrapContent) {
@@ -435,7 +435,7 @@ class OneSellListedUI(
                         emptyView()
 
                         textView {
-                            text = "80吨"
+                            text = "1" + data.WrFtWrstandard.enumdicname
                             textSizeAuto = 29
                             textColorInt = R.color.rma_gray_color
                         }.lparams(wrapContent, wrapContent)
@@ -772,10 +772,7 @@ class OneBuyListedUI(
                                         ) ?: 0.0, 2
                                     ) + ")"
                                 }
-                                //这里计算最多购买数量 挂牌最大数量=可用资金/(买方履约保证金比例*挂牌价格)
-                                if (value.toDouble() != 0.0 && marginValue != 0.0){
-                                    maxlistedNumber.postValue(viewModel.usedAccountData.value?.canUserAmount?.div(marginValue)?.div(value.toDouble())?.toInt())
-                                }
+
                             }
                         }
                     }
@@ -803,7 +800,7 @@ class OneBuyListedUI(
                     linearLayout {
                         gravity = Gravity.CENTER_VERTICAL
                         numberEditText {
-                            text = "1"
+                            text = data.WrFtWrstandard.minivalue
                             oneNumberInputEdittext = this
                             setOnTextChangeListener { view, value ->
                                 if (value.isNullOrEmpty().not()) {
@@ -835,7 +832,7 @@ class OneBuyListedUI(
                         }
 
                         textView {
-                            text = "吨"
+                            text = data.WrFtWrstandard.enumdicname
                             textSizeAuto = 34
                             textColorInt = R.color.rma_hint_text_color_ccc
                         }.lparams(wrapContent, wrapContent) {
@@ -844,7 +841,7 @@ class OneBuyListedUI(
                     }.lparams(matchParent, autoSize(143))
 
                     inflateLayout<SeekBar>(R.layout.main_seekbar) {
-                        min = 10
+                        min = 1
                         max = 100
                         seekBar = this
                         isIndeterminate = false
@@ -881,8 +878,6 @@ class OneBuyListedUI(
 
                         textView {
                             maxlistedNumber.bindOptional(context){
-                                //最大可交易数量变更后，输入的值要根据seekbar进度来进行更新
-                                oneNumberInputEdittext.text = NumberUtils.roundNum(it?.times(seekBar.progress.div(100.0)).toString(),0)
                                 text = it.toString() + data.WrFtWrstandard.enumdicname
                             }
                             textSizeAuto = 29

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/floata/FloatPriceAdapter.java

@@ -96,7 +96,8 @@ public class FloatPriceAdapter extends RecyclerView.Adapter<FloatPriceAdapter.It
     public void onBindViewHolder(@NonNull final ItemViewHolder itemViewHolder, int i) {
         this.index = i;
         OrderQuoteData data = datas.get(i);
-        itemViewHolder.tvLeftTitle.setText(data.getDeliverygoodsname() + "\n" + data.getWrgoodsname());
+        itemViewHolder.tvLeftTitle.setText(data.getDeliverygoodsname());
+        itemViewHolder.tv_left_bottom_title.setText(data.getWrgoodsname());
         //右边滑动部分
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(context);
         linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
@@ -239,6 +240,7 @@ public class FloatPriceAdapter extends RecyclerView.Adapter<FloatPriceAdapter.It
         LinearLayout all_click_View;//item左侧点击控件
         TextView tvLeftTitle;//左边销售方字段
         RecyclerView rvItemRight;//右方的列表
+        TextView tv_left_bottom_title;//左侧底部字段
         ImageView click_icon;//图标
         public CustomHorizontalScrollView horItemScrollview;//右方的滑动控件
         private boolean isLayoutFinish;//自定义字段,用于标记layout
@@ -253,6 +255,7 @@ public class FloatPriceAdapter extends RecyclerView.Adapter<FloatPriceAdapter.It
 
         public ItemViewHolder(@NonNull View itemView) {
             super(itemView);
+            tv_left_bottom_title = itemView.findViewById(R.id.tv_left_bottom_title);
             click_icon = itemView.findViewById(R.id.click_icon);
             platnum_buy = itemView.findViewById(R.id.platnum_buy);
             platnum_sell = itemView.findViewById(R.id.platnum_sell);

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/one/OnePriceAdapter.java

@@ -97,8 +97,8 @@ public class OnePriceAdapter extends RecyclerView.Adapter<OnePriceAdapter.ItemVi
     public void onBindViewHolder(@NonNull final ItemViewHolder itemViewHolder, int i) {
         this.index = i;
         OrderQuoteData data = datas.get(i);
-        itemViewHolder.tvLeftTitle.setText(data.getDeliverygoodsname() + "\n" + data.getWrgoodsname());
-
+        itemViewHolder.tvLeftTitle.setText(data.getDeliverygoodsname());
+        itemViewHolder.tv_left_bottom_title.setText(data.getWrgoodsname());
         //右边滑动部分
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(context);
         linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
@@ -242,6 +242,7 @@ public class OnePriceAdapter extends RecyclerView.Adapter<OnePriceAdapter.ItemVi
         TextView platnum_sell;//卖出
         TextView platnum_chart;//图表
         TextView platnum_details;//详情
+        TextView tv_left_bottom_title;//左侧底部字段
         LinearLayout allView;//隐藏的底部操作空间
         LinearLayout all_click_View;//item左侧点击控件
         TextView tvLeftTitle;//左边销售方字段
@@ -260,6 +261,7 @@ public class OnePriceAdapter extends RecyclerView.Adapter<OnePriceAdapter.ItemVi
 
         public ItemViewHolder(@NonNull View itemView) {
             super(itemView);
+            tv_left_bottom_title = itemView.findViewById(R.id.tv_left_bottom_title);
             click_icon = itemView.findViewById(R.id.click_icon);
             platnum_buy = itemView.findViewById(R.id.platnum_buy);
             platnum_sell = itemView.findViewById(R.id.platnum_sell);

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

@@ -10,7 +10,7 @@
         android:id="@+id/all_click_View"
         android:layout_width="match_parent"
         android:orientation="horizontal"
-        android:layout_height="35dp">
+        android:layout_height="45dp">
 
         <LinearLayout
             android:layout_width="120dp"
@@ -19,17 +19,23 @@
             <LinearLayout
                 android:gravity="center_vertical"
                 android:orientation="vertical"
-                android:layout_width="90dp"
+                android:layout_width="95dp"
                 android:layout_height="match_parent">
 
                 <TextView
-                    android:layout_marginStart="5dp"
-                    android:layout_gravity="center"
+                    android:layout_marginStart="7dp"
                     android:id="@+id/tv_left_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="13sp"
                     android:textColor="#333333" />
+                <TextView
+                    android:layout_marginStart="7dp"
+                    android:id="@+id/tv_left_bottom_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="10sp"
+                    android:textColor="#333333" />
 
             </LinearLayout>
             <ImageView