风险管理11月26日提交代码-liu.bolan-天津麦顿bug

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

@@ -266,6 +266,23 @@ data class QuoteDayData(
         }
         return colorType
     }
+
+    /**
+     * 根据不同价格和昨结价的对比获取字体颜色类型
+     * price 传入的价格
+     * @return Int
+     */
+    fun getPrecloseColor2(price : Double) : String{
+        var colorType = "1"//1 黑色 2绿色 3红色
+        if (price > presettle){
+            colorType = "3"
+        }else if (price < presettle){
+            colorType = "2"
+        }else{
+            colorType = "1"
+        }
+        return colorType
+    }
 }
 
 

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

@@ -6,7 +6,7 @@ object Constant {
     /**
      * 获取基础url的接口
      */
-    const val baseurl = "http://103.40.249.123:38280/cfg?key=mtp_20" // 天津麦顿
+//    const val baseurl = "http://103.40.249.123:38280/cfg?key=mtp_20" // 天津麦顿
 //    const val baseurl = "http://103.40.249.123:28280/cfg?key=mtp_20"//云融大宗
 //    const val baseurl = "http://103.40.249.123:8280/cfg?key=mtp_20"//千海金外盘
 //    const val baseurl = "http://103.40.249.127:28280/cfg?key=mtp_20"
@@ -19,7 +19,7 @@ object Constant {
 //
 //    const val baseurl = "http://192.168.31.204:8080/cfg?key=test_204"// 瑶姐 云融 190000000001 123456
 //    const val baseurl = "http://192.168.31.202:8080/cfg?key=test_202"// 瑶姐 云融 190000000001 123456
-//    const val baseurl = "http://192.168.31.205:8080/cfg?key=test_205"// 瑶姐 云融 190000000001 123456
+    const val baseurl = "http://192.168.31.205:8080/cfg?key=test_205"// 瑶姐 云融 190000000001 123456
 //    const val baseurl = "http://192.168.31.201:8080/cfg?key=test_201"// 邓工 千海金
 
 //    const val baseurl = "http://192.168.31.175:8080/cfg?key=test_175" // 8888  123123

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

@@ -448,7 +448,7 @@ class HoldViewModel : BaseViewModel() {
                 }
             }
             datas.orderPrice = tradePrice
-            datas.orderQty = itemData.enableqty?.toLong() ?: 0
+            datas.orderQty = itemData.enableqty.toLong()
 
             if (isClose) {
                 // 平仓

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/trade/GoodsTradeActivity.kt

@@ -1001,7 +1001,6 @@ class GoodsTradeActivity : BaseActivity<GoodsTradeViewModel>() {
                                                 } else {
                                                     if (viewModel.priceOrderType.value == FutureConstent.eOrderPriceSelectType_Last) {//最新价
                                                         setText(NumberUtils.roundNum(NumberUtils.doubleDistortion(it?.last.toString()),2))
-
                                                     } else if (viewModel.priceOrderType.value == FutureConstent.eOrderPriceSelectType_Opposite) {//对手价/卖多取买一价
                                                         setText(NumberUtils.roundNum(NumberUtils.doubleDistortion(it?.ask.toString()),2))
                                                     } else if (viewModel.priceOrderType.value == FutureConstent.eOrderPriceSelectType_OppositeOne) {//超价1/卖多取买一价(参照ios)

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

@@ -1,9 +1,8 @@
 package cn.muchinfo.rma.view.base.hnstmain
 
-import android.Manifest
+
 import android.annotation.SuppressLint
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.os.Bundle
 import android.os.CountDownTimer
 import android.text.TextUtils
@@ -13,18 +12,13 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.app.ActivityCompat
 import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.BankAccountSignData
-import cn.muchinfo.rma.global.data.BrokerApplyData
-import cn.muchinfo.rma.global.data.ContractTradePositionData
-import cn.muchinfo.rma.global.data.OrderQuoteData
 import cn.muchinfo.rma.global.toPercentage
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.*
-import cn.muchinfo.rma.view.autoWidget.utils.CopyButtonLibrary
 import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.base.BaseFragment
 import cn.muchinfo.rma.view.base.app.Constant
@@ -32,7 +26,6 @@ import cn.muchinfo.rma.view.base.future.trade.itemView
 import cn.muchinfo.rma.view.base.hnstmain.account.RydzAccountActivity
 import cn.muchinfo.rma.view.base.hnstmain.bookingwarehouse.BookingWarehouseActivity
 import cn.muchinfo.rma.view.base.hnstmain.contractorders.ContractOrdersActivity
-import cn.muchinfo.rma.view.base.hnstmain.contractorders.delivery.DeliveryActivity
 import cn.muchinfo.rma.view.base.hnstmain.finance.FinanceManagementActivity
 import cn.muchinfo.rma.view.base.hnstmain.friend.MainFriendActivity
 import cn.muchinfo.rma.view.base.hnstmain.performance.PerformanceInformationActivity
@@ -42,18 +35,10 @@ import cn.muchinfo.rma.view.base.home.contract.emptyView
 import cn.muchinfo.rma.view.base.home.set.ChangePasswordActivity
 import cn.muchinfo.rma.view.base.main.about.AboutActivity
 import cn.muchinfo.rma.view.base.main.addressmanagement.MyAddressManagementActivity
-import cn.muchinfo.rma.view.base.main.castsurely.MyCastSurelyActivity
-import cn.muchinfo.rma.view.base.main.integral.MyIntegralActivity
 import cn.muchinfo.rma.view.base.main.invoice.InvoiceInformationActivity
 import cn.muchinfo.rma.view.base.main.phonebinding.PhoneBindingActivity
-import cn.muchinfo.rma.view.base.main.pickup.PickUpGoodsSearchActivity
-import cn.muchinfo.rma.view.base.main.promotioncode.ApplyPromotionCodeActivity
-import cn.muchinfo.rma.view.base.main.reward.MyRewardActivity
-import cn.muchinfo.rma.view.base.main.team.MyTeamActivity
 import cn.muchinfo.rma.view.base.main.withdrawmanagement.WithDrawManagementActivity
 import cn.muchinfo.rma.view.base.main.withdrawmanagement.WithdrawalActivity
-import cn.muchinfo.rma.view.base.platinumtreasure.trade.PlatinumTradeActivity
-import cn.muchinfo.rma.view.base.warehousereceipt.BusinessHallActivity
 import cn.muchinfo.rma.view.eventbus.EventConstent
 import cn.muchinfo.rma.view.eventbus.MessageEvent
 import cn.muchinfo.rma.view.eventbus.QuoteMessageEvent
@@ -70,6 +55,7 @@ import org.jetbrains.anko.support.v4.UI
 /**
  * 华南顺通 - 我的页面fragment
  */
+@Suppress("DEPRECATION")
 class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
 
     lateinit var phone_num: TextView
@@ -116,7 +102,7 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
         }
     }
 
-    @SuppressLint("MissingPermission")
+    @SuppressLint("MissingPermission", "RtlHardcoded", "SetTextI18n")
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -203,27 +189,35 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
                                         textView {
                                             //////交易状态 - 1:正常 2:受限 3:冻结 4:禁止建仓(人工受限) 5:禁止交易(人工冻结) 6:待激活 7:已注销
                                             viewModel.usedAccountData.bindOptional(context) {
-                                                if (it?.tradestatus?.toInt() == 1) {
-                                                    text = "正常"
-                                                    textColorInt = R.color.rma_green_color
-                                                } else if (it?.tradestatus?.toInt() == 2) {
-                                                    text = "受限"
-                                                    textColorInt = R.color.rma_red_color
-                                                } else if (it?.tradestatus?.toInt() == 3) {
-                                                    text = "冻结"
-                                                    textColorInt = R.color.rma_red_color
-                                                } else if (it?.tradestatus?.toInt() == 4) {
-                                                    text = "禁止建仓"
-                                                    textColorInt = R.color.rma_red_color
-                                                } else if (it?.tradestatus?.toInt() == 5) {
-                                                    text = "禁止交易"
-                                                    textColorInt = R.color.rma_red_color
-                                                } else if (it?.tradestatus?.toInt() == 6) {
-                                                    text = "待激活"
-                                                    textColorInt = R.color.rma_red_color
-                                                } else if (it?.tradestatus?.toInt() == 7) {
-                                                    text = "已注销"
-                                                    textColorInt = R.color.rma_red_color
+                                                when {
+                                                    it?.tradestatus?.toInt() == 1 -> {
+                                                        text = "正常"
+                                                        textColorInt = R.color.rma_green_color
+                                                    }
+                                                    it?.tradestatus?.toInt() == 2 -> {
+                                                        text = "受限"
+                                                        textColorInt = R.color.rma_red_color
+                                                    }
+                                                    it?.tradestatus?.toInt() == 3 -> {
+                                                        text = "冻结"
+                                                        textColorInt = R.color.rma_red_color
+                                                    }
+                                                    it?.tradestatus?.toInt() == 4 -> {
+                                                        text = "禁止建仓"
+                                                        textColorInt = R.color.rma_red_color
+                                                    }
+                                                    it?.tradestatus?.toInt() == 5 -> {
+                                                        text = "禁止交易"
+                                                        textColorInt = R.color.rma_red_color
+                                                    }
+                                                    it?.tradestatus?.toInt() == 6 -> {
+                                                        text = "待激活"
+                                                        textColorInt = R.color.rma_red_color
+                                                    }
+                                                    it?.tradestatus?.toInt() == 7 -> {
+                                                        text = "已注销"
+                                                        textColorInt = R.color.rma_red_color
+                                                    }
                                                 }
                                             }
                                             textSizeAuto = 27
@@ -239,10 +233,10 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
                                                 viewModel.resetAccountData()
                                             }
                                             isOpenEye.bindOptional(context) {
-                                                if (it == true) {
-                                                    imageResource = R.mipmap.yrdz_open_eye
+                                                imageResource = if (it == true) {
+                                                    R.mipmap.yrdz_open_eye
                                                 } else {
-                                                    imageResource = R.mipmap.yrdz_close_eye
+                                                    R.mipmap.yrdz_close_eye
                                                 }
                                             }
                                             imageResource = R.mipmap.yrdz_close_eye
@@ -282,10 +276,10 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
                         }.lparams(matchParent, autoSize(360))
 
                         linearLayout {
-                            if (SPUtils.getInstance().getString(Constant.oem) == "tjmd") {
-                                visibility = View.GONE
+                            visibility = if (SPUtils.getInstance().getString(Constant.oem) == "tjmd") {
+                                View.GONE
                             } else {
-                                visibility = View.VISIBLE
+                                View.VISIBLE
                             }
                             verticalLayout {
                                 onThrottleFirstClick {
@@ -308,13 +302,13 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
                                      * 金额=总市值-融资额+余额；
                                      */
                                     viewModel.usedAccountData.bindOptional(context) {
-                                        if (isOpenEye.value == true) {
-                                            text = NumberUtils.roundNum(
+                                        text = if (isOpenEye.value == true) {
+                                            NumberUtils.roundNum(
                                                 it?.currentbalance?.toString(),
                                                 2
                                             )
                                         } else {
-                                            text = "****"
+                                            "****"
                                         }
 
                                     }
@@ -387,10 +381,10 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
                             verticalLayout {
                                 gravity = Gravity.LEFT
                                 textView {
-                                    if (SPUtils.getInstance().getString(Constant.oem) == "tjmd") {
-                                        text = "净值"
+                                    text = if (SPUtils.getInstance().getString(Constant.oem) == "tjmd") {
+                                        "净值"
                                     } else {
-                                        text = "总市值"
+                                        "总市值"
                                     }
                                     textSizeAuto = 29
                                     textColorStr = "#A1B1C5"
@@ -456,19 +450,19 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
 
                         //狗屎一样的设计，，，，，fuck
                         linearLayout {
-                            if (SPUtils.getInstance().getString(Constant.oem) == "tjmd") {
-                                visibility = View.VISIBLE
+                            visibility = if (SPUtils.getInstance().getString(Constant.oem) == "tjmd") {
+                                View.VISIBLE
                             } else {
-                                visibility = View.GONE
+                                View.GONE
                             }
 
                             verticalLayout {
                                 gravity = Gravity.LEFT
                                 textView {
-                                    if (SPUtils.getInstance().getString(Constant.oem) == "tjmd") {
-                                        text = "净值"
+                                    text = if (SPUtils.getInstance().getString(Constant.oem) == "tjmd") {
+                                        "净值"
                                     } else {
-                                        text = "总市值"
+                                        "总市值"
                                     }
                                     textSizeAuto = 29
                                     textColorStr = "#A1B1C5"
@@ -554,13 +548,13 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
                                      * 金额=总市值-融资额+余额；
                                      */
                                     viewModel.usedAccountData.bindOptional(context) {
-                                        if (isOpenEye.value == true) {
-                                            text = NumberUtils.roundNum(
+                                        text = if (isOpenEye.value == true) {
+                                            NumberUtils.roundNum(
                                                 it?.currentbalance?.toString(),
                                                 2
                                             )
                                         } else {
-                                            text = "****"
+                                            "****"
                                         }
 
                                     }
@@ -634,10 +628,10 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
                         }.lparams(matchParent, autoSize(200))
 
                         linearLayout {
-                            if (SPUtils.getInstance().getString(Constant.oem) == "tjmd") {
-                                visibility = View.VISIBLE
+                            visibility = if (SPUtils.getInstance().getString(Constant.oem) == "tjmd") {
+                                View.VISIBLE
                             } else {
-                                visibility = View.GONE
+                                View.GONE
                             }
                             verticalLayout {
                                 onThrottleFirstClick {
@@ -660,14 +654,14 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
                                      * 占用-usedmargin
                                      */
                                     viewModel.usedAccountData.bindOptional(context) {
-                                        if (isOpenEye.value == true) {
-                                            text = NumberUtils.roundNum(
+                                        text = if (isOpenEye.value == true) {
+                                            NumberUtils.roundNum(
                                                 NumberUtils.doubleDistortion(
                                                     it?.usedmargin.toString()
                                                 ), 2
                                             )
                                         } else {
-                                            text = "****"
+                                            "****"
                                         }
                                     }
                                     textSizeAuto = 34
@@ -698,15 +692,15 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
                                                 NumberUtils.doubleDistortion(it?.valueOfposition_keep_watch_profit_and_loss?.toString()),
                                                 2
                                             )
-                                            when {
+                                            textColorInt = when {
                                                 it?.valueOfposition_keep_watch_profit_and_loss ?: 0.0 > 0.0 -> {
-                                                    textColorInt = R.color.rma_red_color
+                                                    R.color.rma_red_color
                                                 }
-                                                it?.valueOfposition_keep_watch_profit_and_loss ?: 0.0 > 0.0 -> {
-                                                    textColorInt = R.color.rma_green_color
+                                                it?.valueOfposition_keep_watch_profit_and_loss ?: 0.0 < 0.0 -> {
+                                                    R.color.rma_green_color
                                                 }
                                                 else -> {
-                                                    textColorInt = R.color.rma_black_33
+                                                    R.color.rma_black_33
                                                 }
                                             }
                                         } else {
@@ -741,36 +735,25 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
                                                 GlobalDataCollection.instance?.getSystemParamsValue(
                                                     "087"
                                                 )
-                                            var worth = 0.0
-                                            if (parmasvalue == "1") {//1.风险净值=期末余额+市值+浮动盈亏(收益权)-其他冻结-出金冻结
-                                                worth = it?.currentbalance?.plus(
-                                                            it.valueOfposition
-                                                        )?.plus(it.valueOfposition_keep_watch_profit_and_loss)
-                                                            ?.minus(it.otherfreezemargin)
-                                                            ?.minus(it.outamountfreeze) ?: 0.0
+                                            val worth: Double
+                                            worth = if (parmasvalue == "1") {//1.风险净值=期末余额+市值+浮动盈亏(收益权)-其他冻结-出金冻结
+                                                it?.currentbalance?.plus(
+                                                    it.valueOfposition
+                                                )?.plus(it.valueOfposition_keep_watch_profit_and_loss)
+                                                    ?.minus(it.otherfreezemargin)
+                                                    ?.minus(it.outamountfreeze) ?: 0.0
 
 
                                             } else {//0.净值=期末余额+浮动盈亏(收益权)-其他冻结-出金冻结
-                                                worth = it?.currentbalance?.plus(it.valueOfposition_keep_watch_profit_and_loss)
-                                                    ?.minus(it.otherfreezemargin ?: 0.0)
-                                                    ?.minus(it.outamountfreeze ?: 0.0) ?: 1.0
+                                                it?.currentbalance?.plus(it.valueOfposition_keep_watch_profit_and_loss)
+                                                    ?.minus(it.otherfreezemargin)
+                                                    ?.minus(it.outamountfreeze) ?: 1.0
                                             }
 
                                             var risk = 0.0
                                             if (it?.valueOfposition != 0.0) {
                                                 risk = it?.usedmargin?.div(worth) ?: 0.0
                                             }
-//                                            if (parmasvalue == "0"){
-//
-//
-//                                            }else if (parmasvalue == "1"){
-//                                                if (it?.usedmargin != 0.0){
-//                                                    risk = (it?.currentbalance?.plus(
-//                                                        it.valueOfposition_keep_watch_profit_and_loss
-//                                                    )?.minus(it.otherfreezemargin)?.minus(it.outamountfreeze))?.div(it.usedmargin) ?: 0.0
-//                                                }
-//                                            }
-
                                             text = NumberUtils.roundNum(
                                                 NumberUtils.doubleDistortion(risk.toString()), 4
                                             ).toPercentage()
@@ -1279,10 +1262,10 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
                          itemView()
 
                         linearLayout {
-                            if (SPUtils.getInstance().getString(Constant.oem) == "tjmd"){
-                                visibility = View.VISIBLE
+                            visibility = if (SPUtils.getInstance().getString(Constant.oem) == "tjmd"){
+                                View.VISIBLE
                             }else{
-                                visibility = View.GONE
+                                View.GONE
                             }
                             gravity = Gravity.CENTER_VERTICAL
                             onThrottleFirstClick {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/contractorders/adapter/ContractPositionContentAdapter.java

@@ -192,8 +192,10 @@ public class ContractPositionContentAdapter extends RecyclerView.Adapter<Contrac
             QHjRightData nowPriceData = new QHjRightData();
             if (quoteDayData.getPrice() == 0.0) {
                 nowPriceData.setValue("--");
+                nowPriceData.setColorType("1");
             } else {
                 nowPriceData.setValue(NumberUtils.roundNum(String.valueOf(quoteDayData.getPrice()), 2));
+                nowPriceData.setColorType(quoteDayData.getPrecloseColor2(quoteDayData.getPrice()));
             }
             //持仓金额
             QHjRightData curholderamountData = new QHjRightData();
@@ -239,13 +241,13 @@ public class ContractPositionContentAdapter extends RecyclerView.Adapter<Contrac
 
             String textUpDown = NumberUtils.roundNum(NumberUtils.doubleDistortion(String.valueOf((quoteDayData.getPrice() - quoteDayData.getPresettle()))), 2);//涨跌
             if (Double.valueOf(textUpDown) > 0) {
-                nowPriceData.setColorType("3");
+
                 profitData.setColorType("3");
             } else if (Double.valueOf(textUpDown) < 0) {
-                nowPriceData.setColorType("2");
+
                 profitData.setColorType("2");
             } else {
-                nowPriceData.setColorType("1");
+
                 profitData.setColorType("1");
             }
             rightData.add(directionData);

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

@@ -19,10 +19,8 @@ import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.base.BaseActivity
 import cn.muchinfo.rma.view.base.app.Constant
 import cn.muchinfo.rma.view.base.hnstmain.performance.adapter.PerformanceInformationContentAdapter
-import cn.muchinfo.rma.view.base.hnstmain.spotwarehouse.adapter.SpotWarehouseContentAdapter
 import cn.muchinfo.rma.view.base.procurement.TopTabAdpater
 import com.blankj.utilcode.util.ConvertUtils
-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
@@ -35,6 +33,7 @@ import org.jetbrains.anko.support.v4.viewPager
 /**
  * 履约信息页面
  */
+@Suppress("DEPRECATION")
 class PerformanceInformationActivity : BaseActivity<PerformanceInformationViewModel>(){
 
     lateinit var segment: QMUITabSegment

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/tjmd/TjmdHomeFragment.kt

@@ -329,12 +329,13 @@ class TjmdHomeFragment : BaseFragment<TjmdHomeViewModel>(){
 
                             linearLayout {
                                 val tjmdMarketList = GlobalDataCollection.instance?.getTjmdShowMarketSectionList()
-                                tjmdMarketList?.forEach {data ->
+                                tjmdMarketList?.forEach { data ->
                                     relativeLayout {
                                         verticalLayout {
                                             onThrottleFirstClick {
                                                 EventBus.getDefault().post(MainTabSelectMessageEvent(tjmdMarketList.indexOf(data).plus(1)))// 黄老板说的要跳去仓单贸易
                                             }
+
                                             imageView {
                                                 showImage(SPUtils.getInstance().getString(Constant.uploadUrl).replace("/upload","") + data.pictureurl?.substring(1))
                                             }.lparams(autoSize(72), autoSize(72)) {

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

@@ -22,6 +22,7 @@ import org.jetbrains.anko.support.v4.UI
 /**
  * 天津麦顿的参考行情页面,copy自tjmd首页的参考行情avtivity
  */
+@Suppress("DEPRECATION")
 class ReferenceFragment : BaseFragment<ReferenceViewModel>() , ReferenceAdapter.OnContentScrollListener{
 
     val titlename by lazy {
@@ -79,7 +80,7 @@ class ReferenceFragment : BaseFragment<ReferenceViewModel>() , ReferenceAdapter.
         savedInstanceState: Bundle?
     ): View? {
         return UI {
-            viewModel.initData(tag = thisTag ?: ""){isCompleted, err ->
+            viewModel.initData(tag = thisTag){ isCompleted, _ ->
                 if (isCompleted){
                     referenceAdapter.notifyDataSetChanged()
                 }
@@ -114,7 +115,7 @@ class ReferenceFragment : BaseFragment<ReferenceViewModel>() , ReferenceAdapter.
                     referenceAdapter.setOnContentScrollListener(this@ReferenceFragment)
                     inflateLayout<CustomHorizontalScrollView>(R.layout.scrollview) {
                         horScrollview = this
-                        setOnCustomScrollChangeListener { listener, scrollX, scrollY, oldScrollX, oldScrollY -> //代码重复,可以抽取/////
+                        setOnCustomScrollChangeListener { _, scrollX, _, _, _ -> //代码重复,可以抽取/////
                             referenceAdapter.offestX = scrollX
                             val viewHolderCacheList: List<ReferenceAdapter.ItemViewHolder> =
                                 referenceAdapter.viewHolderCacheList
@@ -143,7 +144,7 @@ class ReferenceFragment : BaseFragment<ReferenceViewModel>() , ReferenceAdapter.
 //                                }
 //                                topAdapter.setDatas(titleStringList)
 //                            }
-                            topAdapter.setDatas(arrayListOf("卖价","卖量","买价","买量","最新价","涨跌","幅度","今开","昨收","最低","最高","振幅","总量","现量","持仓量","日增","金额"))
+                            topAdapter.setDatas(arrayListOf("卖价","卖量","买价","买量","最新价","涨跌","幅度","今开","昨结","最低","最高","振幅","总量","现量","持仓量","日增","金额"))
                         }
                     }.lparams(matchParent, matchParent)
                 }.lparams(matchParent, autoSize(100))
@@ -160,11 +161,11 @@ class ReferenceFragment : BaseFragment<ReferenceViewModel>() , ReferenceAdapter.
                         setEnableLoadMore(false)
                         setOnRefreshListener {
                             viewModel.queryQuoteDay(
-                                tag = thisTag ?: "",
+                                tag = thisTag,
                                 first = fistShow,
                                 last = lastShow,
                                 list = viewModel.transferDataList.value ?: arrayListOf()
-                            ) { isCompleted, err ->
+                            ) { isCompleted, _ ->
                                 if (isCompleted) {
                                     if (swipeToLayout.getIsRefreshing()) {
                                         swipeToLayout.finishRefresh()
@@ -201,7 +202,7 @@ class ReferenceFragment : BaseFragment<ReferenceViewModel>() , ReferenceAdapter.
                                 override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
                                     super.onScrollStateChanged(recyclerView, newState)
                                     // DES: 找出当前可视Item位置
-                                    val linearLayoutManager = dataRecyclerview!!.layoutManager as LinearLayoutManager
+                                    val linearLayoutManager = dataRecyclerview.layoutManager as LinearLayoutManager
                                     if (newState == RecyclerView.SCROLL_STATE_IDLE) {// 这个判断是当recyclerview不滚动时
                                         fistShow = linearLayoutManager.findFirstVisibleItemPosition()//获取第一个显示条目
                                         lastShow = linearLayoutManager.findLastVisibleItemPosition()//获取最后一个显示条目
@@ -211,7 +212,7 @@ class ReferenceFragment : BaseFragment<ReferenceViewModel>() , ReferenceAdapter.
                                                 first = fistShow,
                                                 last = lastShow,
                                                 list = viewModel.transferDataList.value ?: arrayListOf()
-                                            ) { isCompleted, err ->
+                                            ) { isCompleted, _ ->
                                                 if (isCompleted) {
                                                     dataRecyclerview.adapter?.notifyItemRangeChanged(fistShow, lastShow)
                                                 }

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

@@ -658,6 +658,7 @@ class OneSellListedUI(
                         }.lparams(wrapContent, wrapContent) {
                             topMargin = autoSize(20)
                             marginStart = autoSize(250)
+                            bottomMargin = autoSize(160)
                         }
                     }
                 }
@@ -842,6 +843,12 @@ class OneBuyListedUI(
             selectAccountData.postValue(GlobalDataCollection.instance?.accountData)
             backgroundDrawable = createRoundRectDrawable("#ffffff", 24)
 
+            viewModel.usedAccountData.bindOptional(context){
+                maxlistedNumber.postValue(
+                    it?.canUserAmount?.div(1)?.div(marginValue)?.toInt()
+                )
+            }
+
             frameLayout {
                 scrollView {
                     verticalLayout {
@@ -926,7 +933,6 @@ class OneBuyListedUI(
 
                         itemView()
 
-
                         linearLayout {
                             gravity = Gravity.CENTER_VERTICAL
                             onThrottleFirstClick {
@@ -1022,7 +1028,7 @@ class OneBuyListedUI(
                                 text = "1"
                                 onePriceInputEdittext = this
                                 setOnTextChangeListener { _, value ->
-                                    if (value.isNullOrEmpty().not()) {
+                                    if (value.isNullOrEmpty().not() && (value.toString() != "null")) {
                                         if (value.toDouble() != 0.0 && marginValue != 0.0) {
                                             maxlistedNumber.postValue(
                                                 viewModel.usedAccountData.value?.canUserAmount?.div(
@@ -1251,6 +1257,7 @@ class OneBuyListedUI(
                         }.lparams(wrapContent, wrapContent) {
                             topMargin = autoSize(20)
                             marginStart = autoSize(250)
+                            bottomMargin = autoSize(160)
                         }
 
                     }

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

@@ -12,7 +12,9 @@ import cn.muchinfo.rma.view.autoWidget.onThrottleFirstClick
 import cn.muchinfo.rma.view.autoWidget.textColorInt
 import cn.muchinfo.rma.view.autoWidget.textSizeAuto
 import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
+import cn.muchinfo.rma.view.base.app.Constant
 import cn.muchinfo.rma.view.base.home.contract.emptyView
+import com.blankj.utilcode.util.SPUtils
 import mtp.polymer.com.autowidget.adapter.BaseViewHolder
 import org.jetbrains.anko.*
 
@@ -118,13 +120,17 @@ class BusinessBuyHallViewHolder(private val activity : AppCompatActivity, privat
 
                 textView {
                     visibility = View.GONE
-//                    data.bindOptional(context){
-//                        if (it?.buyorsell == "1"){
-//                            visibility = View.VISIBLE
-//                        }else{
-//                            visibility = View.GONE
-//                        }
-//                    }
+                    data.bindOptional(context){
+                        if (it?.buyorsell == "1"){
+                            if (SPUtils.getInstance().getString(Constant.oem) == "tjmd"){
+                                visibility = View.GONE
+                            }else{
+                                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/BusinessSellHallViewHolder.kt

@@ -13,10 +13,12 @@ import cn.muchinfo.rma.view.autoWidget.onThrottleFirstClick
 import cn.muchinfo.rma.view.autoWidget.textColorInt
 import cn.muchinfo.rma.view.autoWidget.textSizeAuto
 import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
+import cn.muchinfo.rma.view.base.app.Constant
 import cn.muchinfo.rma.view.base.home.contract.emptyView
 import cn.muchinfo.rma.view.base.home.spotmarket.AddSpotMarketPriceActivity
 import cn.muchinfo.rma.view.base.home.spotmarket.SpotMarketDetailsActivity
 import com.blankj.utilcode.util.ActivityUtils
+import com.blankj.utilcode.util.SPUtils
 import mtp.polymer.com.autowidget.adapter.BaseViewHolder
 import mtp.polymer.com.autowidget.dialog.createWarningDialog
 import org.jetbrains.anko.*
@@ -123,13 +125,19 @@ class BusinessSellHallViewHolder(private val activity : AppCompatActivity,privat
 
                  textView {
                      visibility = View.GONE
-//                     viewModel.financingSelectDataList.bindOptional(context){
-//                         if (it?.size ?: 0 > 0){
-//                             visibility = View.VISIBLE
-//                         }else{
-//                             visibility = View.GONE
-//                         }
-//                     }
+
+                     viewModel.financingSelectDataList.bindOptional(context){
+                         if (it?.size ?: 0 > 0){
+                             if (SPUtils.getInstance().getString(Constant.oem) == "tjmd"){
+                                 visibility = View.GONE
+                             }else{
+                                 visibility = View.VISIBLE
+                             }
+
+                         }else{
+                             visibility = View.GONE
+                         }
+                     }
                      onThrottleFirstClick {
                          onThrottleFirstClick {
                              viewModel.selectData.postValue(data.value)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/swaps/TransferSwapsAdapter.java

@@ -154,6 +154,7 @@ public class TransferSwapsAdapter extends RecyclerView.Adapter<TransferSwapsAdap
 //            bidData.setColorType("3");
 //            rightData.add(bidData);
         }
+        // 重要提醒， 这里所有的字体颜色都是2595bug中提出的，全部关联昨结价
 
         if (quoteDayData != null) {
 
@@ -164,7 +165,7 @@ public class TransferSwapsAdapter extends RecyclerView.Adapter<TransferSwapsAdap
                 newPriceData.setColorType("1");
             }else {
                 newPriceData.setValue(NumberUtils.roundNum(NumberUtils.doubleDistortion(String.valueOf(quoteDayData.getPrice())), 2));
-                newPriceData.setColorType(quoteDayData.getColor());
+                newPriceData.setColorType(quoteDayData.getPrecloseColor2(quoteDayData.getPrice()));
             }
 
             // 卖量取卖一量
@@ -196,16 +197,17 @@ public class TransferSwapsAdapter extends RecyclerView.Adapter<TransferSwapsAdap
                 openPriceData.setValue("--");
             }else {
                 openPriceData.setValue(NumberUtils.roundNum(quoteDayData.getOpened(),2));
+                openPriceData.setColorType(quoteDayData.getPrecloseColor2(quoteDayData.getOpened()));
             }
 
 
-
             //最高价
             QHjRightData highPriceData = new QHjRightData();
             if (quoteDayData.getHighest() == 0){
                 highPriceData.setValue("--");
             }else {
                 highPriceData.setValue(NumberUtils.roundNum(quoteDayData.getHighest(),2));
+                highPriceData.setColorType(quoteDayData.getPrecloseColor2(quoteDayData.getHighest()));
             }
 
 
@@ -215,6 +217,7 @@ public class TransferSwapsAdapter extends RecyclerView.Adapter<TransferSwapsAdap
                 lowesPriceData.setValue("--");
             }else {
                 lowesPriceData.setValue(NumberUtils.roundNum(quoteDayData.getLowest(),2));
+                lowesPriceData.setColorType(quoteDayData.getPrecloseColor2(quoteDayData.getLowest()));
             }
 
 
@@ -223,6 +226,7 @@ public class TransferSwapsAdapter extends RecyclerView.Adapter<TransferSwapsAdap
 
             if (quoteDayData.getSettle() != 0){
                 settlementData.setValue(NumberUtils.roundNum(quoteDayData.getSettle(),2));
+                settlementData.setColorType(quoteDayData.getPrecloseColor2(quoteDayData.getSettle()));
             }else {
                 settlementData.setValue("--");
             }
@@ -235,6 +239,7 @@ public class TransferSwapsAdapter extends RecyclerView.Adapter<TransferSwapsAdap
             }else {
                 preSettlementData.setValue("--");
             }
+            preSettlementData.setColorType("1");
 
             if (quoteDayData.getPrice() != 0 && quoteDayData.getPresettle() != 0) {
                 String textApplies = "";
@@ -249,27 +254,12 @@ public class TransferSwapsAdapter extends RecyclerView.Adapter<TransferSwapsAdap
                 if (Double.valueOf(textUpDown) > 0) {
                     riseFallData.setColorType("3");
                     appliesData.setColorType("3");
-                    openPriceData.setColorType("3");
-                    highPriceData.setColorType("3");
-                    lowesPriceData.setColorType("3");
-                    settlementData.setColorType("3");
-                    preSettlementData.setColorType("3");
                 } else if (Double.valueOf(textUpDown) < 0) {
                     riseFallData.setColorType("2");
                     appliesData.setColorType("2");
-                    openPriceData.setColorType("2");
-                    highPriceData.setColorType("2");
-                    lowesPriceData.setColorType("2");
-                    settlementData.setColorType("2");
-                    preSettlementData.setColorType("2");
                 } else {
                     riseFallData.setColorType("1");
                     appliesData.setColorType("1");
-                    openPriceData.setColorType("1");
-                    highPriceData.setColorType("1");
-                    lowesPriceData.setColorType("1");
-                    settlementData.setColorType("1");
-                    preSettlementData.setColorType("1");
                 }
             } else {
                 appliesData.setValue("--");

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/swaps/business/SwapsBusinessBuyHallViewHolder.kt

@@ -56,7 +56,7 @@ class SwapsBusinessBuyHallViewHolder(private val activity : AppCompatActivity, p
                         data.bindOptional(context){
                             if (it?.pricemode == "3"){
                                 if (viewModel.quoteDayData.value?.getPrice() == 0.0){
-                                    text = NumberUtils.roundNum(it?.orderprice?.toDouble()?.plus(it.marketmaxsub?.toDouble() ?: 0.0) ?: 0.0,2)
+                                    text = NumberUtils.roundNum(it.orderprice?.toDouble()?.plus(it.marketmaxsub?.toDouble() ?: 0.0) ?: 0.0,2)
                                 }else{
                                     text = NumberUtils.roundNum(viewModel.quoteDayData.value?.getPrice()?.plus(it?.marketmaxsub?.toDouble() ?: 0.0) ?: 0.0,2)
                                 }
@@ -67,14 +67,18 @@ class SwapsBusinessBuyHallViewHolder(private val activity : AppCompatActivity, p
 
                         }
                         viewModel.quoteDayData.bindOptional(context){
-                            if (data.value?.goodsid.isNullOrEmpty().not()){
-                                if (data.value?.pricemode == "3"){
-                                    text = NumberUtils.roundNum(it?.getPrice()?.plus(data.value?.marketmaxsub?.toDouble() ?: 0.0) ?: 0.0,2)
-                                }
+                            val accordingText = it?.getPrice()?.plus(data.value?.marketmaxsub?.toDouble() ?: 0.0) ?: 0.0
+                            text = NumberUtils.roundNum(accordingText,2)
+                            if (accordingText.minus(it?.presettle ?: 0.0) > 0.0){
+                                textColorInt = R.color.rma_red_color
+                            }else if (accordingText.minus(it?.presettle ?: 0.0) < 0.0){
+                                textColorInt = R.color.rma_green_color
+                            }else{
+                                textColorInt = R.color.rma_black_33
                             }
                         }
                         textSizeAuto = 34
-                        textColorInt = R.color.rma_black_33
+
                     }.lparams(wrapContent, wrapContent){
                         marginStart = autoSize(36)
                     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/swaps/business/SwapsBusinessHallActivity.kt

@@ -70,6 +70,9 @@ class SwapsBusinessHallActivity : BaseActivity<SwapsBusinessHallViewModel>() {
     //涨跌幅
     lateinit var applies_text : TextView
 
+    //现价
+    lateinit var now_price : TextView
+
     /** 用于订阅行情的唯一标识 */
     val thisTag by lazy {
         "swapsbusinesshallactivity"
@@ -272,6 +275,7 @@ class SwapsBusinessHallActivity : BaseActivity<SwapsBusinessHallViewModel>() {
                     }
 
                     textView {
+                        now_price = this
                         viewModel.quoteDayData.bindOptional(context){
                             if (it?.getPrice() == 0.0){
                                 text = "--"
@@ -280,7 +284,7 @@ class SwapsBusinessHallActivity : BaseActivity<SwapsBusinessHallViewModel>() {
                             }
                         }
                         textSizeAuto = 44
-                        textColorInt = R.color.rma_red_color
+                        textColorInt = R.color.rma_gray_color
                     }.lparams(wrapContent, wrapContent){
                         marginStart = autoSize(36)
                     }
@@ -293,22 +297,25 @@ class SwapsBusinessHallActivity : BaseActivity<SwapsBusinessHallViewModel>() {
                             }else{
                                 val gainsAmount = it?.getPrice()?.minus(it.presettle)
                                 text = NumberUtils.roundNum(gainsAmount.toString(),2)
-                                applies_text.text = NumberUtils.roundNum(gainsAmount?.div(it?.presettle)?.times(100) ?: 0.0,2) + "%"
+                                applies_text.text = NumberUtils.roundNum(gainsAmount?.div(it.presettle)?.times(100) ?: 0.0,2) + "%"
                                 if (gainsAmount ?: 0.0 > 0.0){
                                     textColorInt = R.color.rma_red_color
                                     applies_text.textColorInt = R.color.rma_red_color
+                                    now_price.textColorInt = R.color.rma_red_color
                                 }else if (gainsAmount ?: 0.0 < 0.0){
-                                    textColorInt = R.color.rma_gray_color
-                                    applies_text.textColorInt =  R.color.rma_gray_color
+                                    textColorInt = R.color.rma_green_color
+                                    applies_text.textColorInt =  R.color.rma_green_color
+                                    now_price.textColorInt = R.color.rma_green_color
                                 }else{
                                     textColorInt = R.color.rma_gray_color
                                     applies_text.textColorInt = R.color.rma_gray_color
+                                    now_price.textColorInt = R.color.rma_gray_color
                                 }
                             }
                         }
 
                         textSizeAuto = 27
-                        textColorInt = R.color.rma_red_color
+                        textColorInt = R.color.rma_gray_color
                     }.lparams(wrapContent, wrapContent){
                         marginStart = autoSize(25)
                     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/swaps/business/SwapsBusinessHallViewModel.kt

@@ -86,6 +86,7 @@ class SwapsBusinessHallViewModel : BaseViewModel(){
 
                 })
                 businessSellHallDataList.postValue(respData)
+                quoteDayData.postValue(quoteDayData.value)
             }
         }
     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/swaps/business/SwapsBusinessSellHallViewHolder.kt

@@ -1,5 +1,6 @@
 package cn.muchinfo.rma.view.base.yrdzpurchase.swaps.business
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.view.Gravity
 import android.view.View
@@ -33,116 +34,131 @@ import org.jetbrains.anko.*
  * @property itemSize IntArray
  * @constructor
  */
-class SwapsBusinessSellHallViewHolder(private val activity : AppCompatActivity, private val viewModel: SwapsBusinessHallViewModel, private val goodsCode : String,
-                                      private val quoteGoodsListData : QuoteGoodsListData
-) : BaseViewHolder<TjmdTradeOrderDetailData>(activity){
+@Suppress("DEPRECATION")
+class SwapsBusinessSellHallViewHolder(
+    private val activity: AppCompatActivity,
+    private val viewModel: SwapsBusinessHallViewModel,
+    private val goodsCode: String,
+    private val quoteGoodsListData: QuoteGoodsListData
+) : BaseViewHolder<TjmdTradeOrderDetailData>(activity) {
     override val itemSize: IntArray = intArrayOf(matchParent, wrapContent)
 
+    @SuppressLint("SetTextI18n")
     override fun _FrameLayout.createContentView() {
-         verticalLayout {
-             background = resources.getDrawable(R.color.sell_color_bg)
-             data.bindOptional(context) {
-                 if (it?.isClick == 0) {
-                     background = resources.getDrawable(R.color.sell_color_bg)
-                 } else if (it?.isClick == 1) {
-                     background = resources.getDrawable(R.color.white)
-                 }
-             }
-             onThrottleFirstClick {
-                 viewModel.setOnSellItemClick(data.value?.orderid ?: "")
-             }
+        verticalLayout {
+            background = resources.getDrawable(R.color.sell_color_bg)
+            data.bindOptional(context) {
+                if (it?.isClick == 0) {
+                    background = resources.getDrawable(R.color.sell_color_bg)
+                } else if (it?.isClick == 1) {
+                    background = resources.getDrawable(R.color.white)
+                }
+            }
+            onThrottleFirstClick {
+                viewModel.setOnSellItemClick(data.value?.orderid ?: "")
+            }
 
-             linearLayout {
+            linearLayout {
 
-                 linearLayout {
-                     gravity = Gravity.CENTER_VERTICAL or Gravity.LEFT
-                     textView {
-                         data.bindOptional(context){
-                             if (it?.pricemode == "3"){
-                                 if (viewModel.quoteDayData.value?.getPrice() == 0.0){
-                                     text = NumberUtils.roundNum(it.orderprice?.toDouble()?.plus(it.marketmaxsub?.toDouble() ?: 0.0) ?: 0.0,2)
-                                 }else{
-                                     text = NumberUtils.roundNum(viewModel.quoteDayData.value?.getPrice()?.plus(it.marketmaxsub?.toDouble() ?: 0.0) ?: 0.0,2)
-                                 }
-                             }else{
-                                 text = NumberUtils.roundNum(it?.orderprice,2)
-                             }
+                linearLayout {
+                    gravity = Gravity.CENTER_VERTICAL or Gravity.LEFT
+                    textView {
+                        data.bindOptional(context) {
+                            if (it?.pricemode == "3") {
+                                if (viewModel.quoteDayData.value?.getPrice() == 0.0) {
+                                    text = NumberUtils.roundNum(
+                                        it.orderprice?.toDouble()
+                                            ?.plus(it.marketmaxsub?.toDouble() ?: 0.0) ?: 0.0, 2
+                                    )
+                                } else {
+                                    text = NumberUtils.roundNum(
+                                        viewModel.quoteDayData.value?.getPrice()
+                                            ?.plus(it.marketmaxsub?.toDouble() ?: 0.0) ?: 0.0, 2
+                                    )
+                                }
+                            } else {
+                                text = NumberUtils.roundNum(it?.orderprice, 2)
+                            }
+                        }
+                        viewModel.quoteDayData.bindOptional(context) {
+                            val accordingText =
+                                it?.getPrice()?.plus(data.value?.marketmaxsub?.toDouble() ?: 0.0)
+                                    ?: 0.0
+                            text = NumberUtils.roundNum(accordingText, 2)
+                            if (accordingText.minus(it?.presettle ?: 0.0) > 0.0) {
+                                textColorInt = R.color.rma_red_color
+                            } else if (accordingText.minus(it?.presettle ?: 0.0) < 0.0) {
+                                textColorInt = R.color.rma_green_color
+                            } else {
+                                textColorInt = R.color.rma_black_33
+                            }
+                        }
+                        textSizeAuto = 34
+                        textColorInt = R.color.rma_black_33
+                    }.lparams(wrapContent, wrapContent) {
+                        marginStart = autoSize(36)
+                    }
+                }.lparams(0, autoSize(90), 1f)
 
-
-                         }
-                         viewModel.quoteDayData.bindOptional(context){
-                             if (data.value?.goodsid.isNullOrEmpty().not()){
-                                 if (data.value?.pricemode == "3"){
-                                     text = NumberUtils.roundNum(it?.getPrice()?.plus(data.value?.marketmaxsub?.toDouble() ?: 0.0) ?: 0.0,2)
-                                 }
-                             }
-                         }
-                         textSizeAuto = 34
-                         textColorInt = R.color.rma_black_33
-                     }.lparams(wrapContent, wrapContent){
-                         marginStart = autoSize(36)
-                     }
-                 }.lparams(0, autoSize(90),1f)
-
-                 linearLayout {
+                linearLayout {
                     gravity = Gravity.CENTER
-                     textView {
-                         data.bindOptional(context){
-                             text = it?.orderqty
-                         }
-                         textSizeAuto = 34
-                         textColorInt = R.color.rma_black_33
-                     }.lparams(wrapContent, wrapContent)
-                 }.lparams(0, autoSize(90),1f)
+                    textView {
+                        data.bindOptional(context) {
+                            text = it?.orderqty
+                        }
+                        textSizeAuto = 34
+                        textColorInt = R.color.rma_black_33
+                    }.lparams(wrapContent, wrapContent)
+                }.lparams(0, autoSize(90), 1f)
 
-                 linearLayout {
-                     gravity = Gravity.CENTER_VERTICAL or Gravity.RIGHT
-                     textView {
-                         data.bindOptional(context){
-                             text = it?.userid + "  "  + it?.username
-                         }
-                         textSizeAuto = 34
-                         textColorInt = R.color.rma_black_33
-                     }.lparams(wrapContent, wrapContent){
-                         marginEnd = autoSize(36)
-                     }
-                 }.lparams(0, autoSize(90),1f)
-             }.lparams(matchParent, autoSize(90))
+                linearLayout {
+                    gravity = Gravity.CENTER_VERTICAL or Gravity.RIGHT
+                    textView {
+                        data.bindOptional(context) {
+                            text = it?.userid + "  " + it?.username
+                        }
+                        textSizeAuto = 34
+                        textColorInt = R.color.rma_black_33
+                    }.lparams(wrapContent, wrapContent) {
+                        marginEnd = autoSize(36)
+                    }
+                }.lparams(0, autoSize(90), 1f)
+            }.lparams(matchParent, autoSize(90))
 
-             // 控制区
-             linearLayout {
-                 data.bindOptional(context) {
-                     if (it?.isClick == 0) {
-                         visibility = View.GONE
-                     } else if (it?.isClick == 1) {
-                         visibility = View.VISIBLE
-                     }
-                 }
-                 gravity = Gravity.CENTER_VERTICAL
+            // 控制区
+            linearLayout {
+                data.bindOptional(context) {
+                    if (it?.isClick == 0) {
+                        visibility = View.GONE
+                    } else if (it?.isClick == 1) {
+                        visibility = View.VISIBLE
+                    }
+                }
+                gravity = Gravity.CENTER_VERTICAL
 
-                 emptyView()
+                emptyView()
 
-                 textView {
-                     onThrottleFirstClick {
-                         val intent = Intent()
-                         intent.putExtra("data",data.value)
-                         intent.putExtra("goodsId",data.value?.goodsid)
-                         intent.putExtra("goodsCode",goodsCode)
-                         intent.putExtra("type","1")
-                         intent.putExtra("quoteGoodsListData",quoteGoodsListData)
-                         intent.setClass(context, SwapsDelistingActivity::class.java)
-                         ActivityUtils.startActivity(intent)
-                     }
-                     backgroundResource = R.drawable.rma_item_click_bg
-                     gravity = Gravity.CENTER
-                     text = "摘牌"
-                     textColorInt = R.color.rma_item_click_color
-                     textSizeAuto = 26
-                 }.lparams(autoSize(120), autoSize(48)) {
-                     marginEnd = autoSize(24)
-                 }
-             }.lparams(matchParent, autoSize(72))
-         }.lparams(matchParent, wrapContent)
+                textView {
+                    onThrottleFirstClick {
+                        val intent = Intent()
+                        intent.putExtra("data", data.value)
+                        intent.putExtra("goodsId", data.value?.goodsid)
+                        intent.putExtra("goodsCode", goodsCode)
+                        intent.putExtra("type", "1")
+                        intent.putExtra("quoteGoodsListData", quoteGoodsListData)
+                        intent.setClass(context, SwapsDelistingActivity::class.java)
+                        ActivityUtils.startActivity(intent)
+                    }
+                    backgroundResource = R.drawable.rma_item_click_bg
+                    gravity = Gravity.CENTER
+                    text = "摘牌"
+                    textColorInt = R.color.rma_item_click_color
+                    textSizeAuto = 26
+                }.lparams(autoSize(120), autoSize(48)) {
+                    marginEnd = autoSize(24)
+                }
+            }.lparams(matchParent, autoSize(72))
+        }.lparams(matchParent, wrapContent)
     }
 
 }