风险管理10月8日提交代码-liu.bolan-天津麦顿

RMA/.idea/gradle.xml

@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="1.8" />
@@ -16,6 +16,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
     <option name="offlineMode" value="true" />

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

@@ -3200,6 +3200,14 @@
     "rownumber": "AAI+HaABDAAABwHACe"
   },
   {
+    "errorid": 3821,
+    "errorcode": "3821",
+    "modulecode": "3",
+    "operatecode": "ERR_ORDERREQUEST_PRICE_NOT_MATCH_QUOTE",
+    "description": "委托价格不匹配",
+    "rownumber": "AAAjMHAAcAAABmnABO"
+  },
+  {
     "errorid": 4001,
     "errorcode": "4001",
     "modulecode": "4",

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

@@ -3,7 +3,6 @@ package cn.muchinfo.rma.global.data
 import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.database.DataBase
 import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
-import cn.muchinfo.rma.view.base.app.Constant
 import com.google.gson.annotations.SerializedName
 
 /**
@@ -172,7 +171,8 @@ open class AccountData(
     var orderValue: Double = 0.0,//建仓市值
 
     var raisedAmount: Double = 0.0,//合约市场融资额
-    var valueOfposition: Double = 0.0//合约市场总市值
+    var valueOfposition: Double = 0.0,//合约市场总市值
+    var valueOfposition_keep_watch_profit_and_loss : Double = 0.0//合约市场浮动总盈亏
 ) {
 
     /**
@@ -195,6 +195,21 @@ open class AccountData(
             valueOfposition += quoteDayData?.getPrice()?.times(
                 it?.curpositionqty?.toDouble() ?: 0.0
             )?.times(goodsInfoData.agreeunit) ?: 0.0
+
+            var Profit: Double? = 0.0
+            if (quoteDayData!!.getPrice() == 0.0) {
+                Profit = 0.0
+            } else {
+                if (it?.averageprice == "") {
+                    Profit = 0.0
+                } else {
+                    Profit = NumberUtils.roundNum(
+                        (quoteDayData.getPrice().minus(it?.averageprice?.toDouble() ?: 0.0)).times(it?.curpositionqty?.toDouble() ?: 0.0).times(goodsInfoData.agreeunit).toString(),
+                        2
+                    ).toDouble()
+                }
+            }
+            valueOfposition_keep_watch_profit_and_loss += Profit
         }
         /** 计算融资额 **/
         val qhjContractDetailsDataArrayList =
@@ -235,6 +250,7 @@ open class AccountData(
         orderValue = 0.0
         raisedAmount = 0.0
         valueOfposition = 0.0
+        valueOfposition_keep_watch_profit_and_loss = 0.0
     }
 
 

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

@@ -1,8 +1,10 @@
 package cn.muchinfo.rma.global.data.chart
 
+import android.annotation.SuppressLint
 import cn.muchinfo.rma.global.toShowTime
 import cn.muchinfo.rma.global.toShowTime2
 import cn.muchinfo.rma.view.autoWidget.toArrayList
+import com.blankj.utilcode.util.TimeUtils
 import kotlinx.coroutines.selects.select
 import java.text.SimpleDateFormat
 import java.util.*
@@ -47,13 +49,20 @@ data class ChartTSData(
         return returnTime
     }
 
+    @SuppressLint("SimpleDateFormat")
     fun String.toShowTime2(format : String = "yyyy-MM-dd HH:mm:ss") : String{
         if (this.isNullOrEmpty()){
             return "--"
         }
-        val sdf = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss+08:00", Locale.CHINA)
-        val sdf1 = SimpleDateFormat(format, Locale.CHINA)
-        var timeString = sdf1.format(sdf.parse(this)!!)
+        var timeString = ""
+//        if (TimeUtils.isPm(this,SimpleDateFormat("yyyy-MM-dd HH:mm:ss"))){
+//            timeString = this
+//        }else{
+            val sdf = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss+08:00", Locale.CHINA)
+            val sdf1 = SimpleDateFormat(format, Locale.CHINA)
+            timeString = sdf1.format(sdf.parse(this)!!)
+//        }
+
         return timeString
     }
 

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

@@ -2,6 +2,7 @@ package cn.muchinfo.rma.view
 
 import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.global.GlobalDataCollection
+import cn.muchinfo.rma.global.data.BankAccountSignData
 import cn.muchinfo.rma.global.data.ContractTradePositionData
 import cn.muchinfo.rma.global.database.DataBase
 import cn.muchinfo.rma.netManage.base.InteractiveException
@@ -55,6 +56,8 @@ class MainViewModel : BaseViewModel() {
             if (isSuccess){
                 if (respData?.size ?: 0 > 0){
                     GlobalDataCollection.instance?.bankAccountSignData = respData?.find { it.signstatus == "4" }
+                }else{
+                    GlobalDataCollection.instance?.bankAccountSignData = BankAccountSignData()
                 }
             }
         }

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

@@ -9,12 +9,12 @@ object Constant {
 //    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"
+//    const val baseurl = "http://103.40.249.127:28280/cfg?key=mtp_20"
 
 
 
 //    const val baseurl = "http://192.168.31.93:8080/cfg?key=test_93"//李倩企业风管 18611112222
-//    const val baseurl = "http://192.168.31.104:8080/cfg?key=test_104"//李倩云融 18611112222
+    const val baseurl = "http://192.168.31.104:8080/cfg?key=test_104"//李倩云融 18611112222
 //
 //    const val baseurl = "http://192.168.31.135:8080/cfg?key=test_135"// 瑶姐 云融 190000000001 123456
 

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

@@ -195,6 +195,37 @@ 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
+                                                }
+                                            }
+                                            textSizeAuto = 27
+                                        }.lparams(wrapContent, wrapContent){
+                                            marginStart = autoSize(20)
+                                        }
+
                                         emptyView()
 
                                         imageView {
@@ -268,12 +299,7 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
                                      */
                                     viewModel.usedAccountData.bindOptional(context) {
                                         if (isOpenEye.value == true){
-                                            text = NumberUtils.roundNum(
-                                                NumberUtils.doubleDistortion(
-                                                    it?.valueOfposition?.minus(it.raisedAmount)
-                                                        ?.plus(it.currentbalance).toString()
-                                                ), 2
-                                            )
+                                            text = NumberUtils.roundNum(it?.currentbalance?.toString(),2)
                                         }else{
                                             text = "****"
                                         }
@@ -299,14 +325,23 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
 
                                 textView {
                                     /**
-                                     * 可用取期末余额
+                                     * 当总盈亏为负时
+                                     * 可用=期末余额+总浮动盈亏-占用-冻结-其他冻结-手续费冻结-出金冻结
+                                     * 当总盈亏为正时
+                                     * 可用=期末余额-占用-冻结-其他冻结-手续费冻结-出金冻结
                                      */
                                     viewModel.usedAccountData.bindOptional(context) {
                                         if (isOpenEye.value == true){
-                                            text = NumberUtils.roundNum(
-                                                NumberUtils.doubleDistortion(it?.canUserAmount?.toString()),
-                                                2
-                                            )
+                                            if (it?.valueOfposition_keep_watch_profit_and_loss ?: 0.0 > 0){
+                                                val parmasvalue = GlobalDataCollection.instance?.getSystemParamsValue("143")
+                                                if (parmasvalue == "1"){
+                                                    text = NumberUtils.roundNum(NumberUtils.doubleDistortion(it?.canUserAmount?.plus(it.valueOfposition_keep_watch_profit_and_loss)?.toString()),2)
+                                                }else if (parmasvalue == "0"){
+                                                    text = NumberUtils.roundNum(NumberUtils.doubleDistortion(it?.canUserAmount?.toString()),2)
+                                                }
+                                            }else{
+                                                text = NumberUtils.roundNum(NumberUtils.doubleDistortion(it?.canUserAmount?.plus(it.valueOfposition_keep_watch_profit_and_loss)?.toString()),2)
+                                            }
                                         }else{
                                             text = "****"
                                         }
@@ -339,8 +374,10 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
                                     viewModel.usedAccountData.bindOptional(context) {
                                         if (isOpenEye.value == true){
                                             text = NumberUtils.roundNum(
-                                                NumberUtils.doubleDistortion(it?.valueOfposition?.toString()),
-                                                2
+                                                NumberUtils.doubleDistortion(
+                                                    it?.valueOfposition?.minus(it.raisedAmount)
+                                                        ?.plus(it.currentbalance).toString()
+                                                ), 2
                                             )
                                         }else{
                                             text = "****"
@@ -416,7 +453,7 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
                                     viewModel.usedAccountData.bindOptional(context) {
                                         if (isOpenEye.value == true){
                                             text = NumberUtils.roundNum(
-                                                NumberUtils.doubleDistortion(it?.keep_watch_profit_and_loss?.toString()),
+                                                NumberUtils.doubleDistortion(it?.valueOfposition_keep_watch_profit_and_loss?.toString()),
                                                 2
                                             )
                                         }else{
@@ -449,18 +486,23 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
                                             ///// 0 - 占用/净值  1 - 净值/占用
                                             val parmasvalue = GlobalDataCollection.instance?.getSystemParamsValue("143")
                                             var risk = 0.0
-                                            if (parmasvalue == "0"){
-                                                if (it?.valueOfposition != 0.0){
-                                                    risk = it?.usedmargin?.div(it.valueOfposition) ?: 0.0
-                                                }
-
-                                            }else if (parmasvalue == "1"){
-                                                if (it?.valueOfposition != 0.0){
-                                                    risk = it?.valueOfposition?.div(it.usedmargin) ?: 0.0
-                                                }
+                                            if (it?.valueOfposition != 0.0){
+                                                risk = it?.usedmargin?.div((it.currentbalance.plus(
+                                                    it.valueOfposition_keep_watch_profit_and_loss
+                                                ).minus(it.otherfreezemargin).minus(it.outamountfreeze))) ?: 0.0
                                             }
-
-                                            text = risk.toString().toPercentage()
+//                                            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()
                                         }else{
                                             text = "****"
                                         }

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

@@ -10,6 +10,7 @@ import androidx.viewpager.widget.ViewPager
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.AmountLogData
+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.NumberUtils
@@ -342,6 +343,103 @@ class MoneyInfoUI(private val activity: AppCompatActivity, private val viewModel
             }.lparams(matchParent, autoSize(100))
 
             itemView()
+
+            linearLayout {
+                gravity = Gravity.CENTER_VERTICAL
+                textView {
+                    gravity = Gravity.LEFT
+                    text = "占用保证金"
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_gray_color
+                }.lparams(autoSize(220), wrapContent){
+                    marginStart = autoSize(36)
+                }
+
+                textView {
+                    /**
+                     * 占用-usedmargin
+                     */
+                    viewModel.usedAccountData.bindOptional(context) {
+                        text = NumberUtils.roundNum(
+                            NumberUtils.doubleDistortion(
+                                it?.usedmargin.toString()
+                            ), 2
+                        )
+                    }
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent)
+
+            }.lparams(matchParent, autoSize(100))
+
+            itemView()
+
+            linearLayout {
+                gravity = Gravity.CENTER_VERTICAL
+                textView {
+                    gravity = Gravity.LEFT
+                    text = "浮动盈亏"
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_gray_color
+                }.lparams(autoSize(220), wrapContent){
+                    marginStart = autoSize(36)
+                }
+
+                textView {
+                    /**
+                     * 占用-usedmargin
+                     */
+                    viewModel.usedAccountData.bindOptional(context) {
+                        text = NumberUtils.roundNum(
+                            NumberUtils.doubleDistortion(it?.keep_watch_profit_and_loss?.toString()),
+                            2
+                        )
+                    }
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent)
+
+            }.lparams(matchParent, autoSize(100))
+
+            itemView()
+
+            linearLayout {
+                gravity = Gravity.CENTER_VERTICAL
+                textView {
+                    gravity = Gravity.LEFT
+                    text = "风险率"
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_gray_color
+                }.lparams(autoSize(220), wrapContent){
+                    marginStart = autoSize(36)
+                }
+
+                textView {
+                    /**
+                     * 风险率
+                     */
+                    viewModel.usedAccountData.bindOptional(context) {
+                        ///// 0 - 占用/净值  1 - 净值/占用
+                        val parmasvalue = GlobalDataCollection.instance?.getSystemParamsValue("143")
+                        var risk = 0.0
+                        if (parmasvalue == "0"){
+                            if (it?.valueOfposition != 0.0){
+                                risk = it?.usedmargin?.div(it.valueOfposition) ?: 0.0
+                            }
+
+                        }else if (parmasvalue == "1"){
+                            if (it?.valueOfposition != 0.0){
+                                risk = it?.valueOfposition?.div(it.usedmargin) ?: 0.0
+                            }
+                        }
+
+                        text = risk.toString().toPercentage()
+                    }
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent)
+
+            }.lparams(matchParent, autoSize(100))
         }
     }
 

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

@@ -155,7 +155,12 @@ public class ContractPositionContentAdapter extends RecyclerView.Adapter<Contrac
                 if (closePrice == 0.0){
                     Profit = "--";
                 }else {
-                    Profit = NumberUtils.roundNum(differencePrice * Double.parseDouble(data.getCurpositionqty()),2) ;
+                    if (data.getBuyorsell().equals("1")){//卖方向
+                        Profit = NumberUtils.roundNum(differencePrice * Double.parseDouble(data.getCurpositionqty()) * goodsInfo.getAgreeunit() * -1,2) ;
+                    }else {
+                        Profit = NumberUtils.roundNum(differencePrice * Double.parseDouble(data.getCurpositionqty()) * goodsInfo.getAgreeunit(),2) ;
+                    }
+
                 }
             }
             //浮动盈亏

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/spotwarehouse/pickup/PickUpGoodsActivity.kt

@@ -112,7 +112,7 @@ class PickUpGoodsActivity : BaseActivity<PickUpGoodsViewModel>(){
                             }.lparams(autoSize(250), wrapContent)
 
                             textView {
-                                text = data.wrstandardname
+                                text = data.wrtypename
 
                                 textSizeAuto = 34
                                 textColorInt = R.color.rma_black_33
@@ -377,10 +377,10 @@ class PickUpGoodsActivity : BaseActivity<PickUpGoodsViewModel>(){
                             }
                         }
                         gravity = Gravity.CENTER
-                        backgroundResource = R.mipmap.rma_save_info_bg
+                        backgroundResource = R.mipmap.rma_submit_bg
                         text = "提货"
                         textSizeAuto = 38
-                        textColorInt = R.color.rma_star_color
+                        textColorInt = R.color.white
                     }.lparams(0, autoSize(119), 1f) {
                         marginStart = autoSize(59)
                         marginEnd = autoSize(59)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/hedge/HedgePlanViewHolder.kt

@@ -258,7 +258,6 @@ class HedgePlanViewHolder(private val activity: AppCompatActivity,private val vi
                            }else{
                                visibility = View.GONE
                            }
-
                         } else {
                            visibility = View.GONE
                         }

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

@@ -570,7 +570,9 @@ class TjmdHomeFragment : BaseFragment<TjmdHomeViewModel>(){
                                     }.toTypedArray())
                                     aaChartModel.series(arrayOf(totalexposureelement))
                                     chartModel = aaChartModel
-                                    // aa_drawChartWithChartModel(aaChartModel)
+                                    chartModel.yAxisMin(viewModel.wrAverageTradePriceMin)
+                                    chartModel.yAxisMax(viewModel.wrAverageTradePriceMax)
+                                    aa_drawChartWithChartModel(chartModel)
                                 }
 
                             }.lparams(matchParent, autoSize(380))

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

@@ -8,6 +8,7 @@ import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.QuoteDayData
 import cn.muchinfo.rma.global.data.account.loginQeruy.GoodsInfo
+import cn.muchinfo.rma.global.toPercentage
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.autoSize
 import cn.muchinfo.rma.view.autoWidget.onThrottleFirstClick
@@ -35,6 +36,7 @@ class TjmdHomeMarketViewHolder(private val activity : AppCompatActivity,private
             gravity = Gravity.CENTER_VERTICAL
             onThrottleFirstClick {
                 viewModel.setOnItemClick(goodsid = data.value?.goodsid ?: "")
+                viewModel.queryKChartData(data.value?.goodsInfo?.goodscode ?: "","11")
             }
 
             data.bindOptional(context){
@@ -70,7 +72,7 @@ class TjmdHomeMarketViewHolder(private val activity : AppCompatActivity,private
                         }
 
                         if (quoteDayData != null){
-                            text = quoteDayData?.getPrice().toString()
+                            text = NumberUtils.roundNum(quoteDayData?.getPrice().toString(),2)
                             textColorInt = quoteDayData?.getColorReturnInt() ?: R.color.rma_black_33
                             if (quoteDayData?.presettle == 0.0){
                                 rise_and_fall_the_forehead.textColorInt = R.color.rma_black_33
@@ -90,10 +92,8 @@ class TjmdHomeMarketViewHolder(private val activity : AppCompatActivity,private
                                     applies_textview.textColorInt = R.color.rma_black_33
                                 }
 
-                                rise_and_fall_the_forehead.textColorInt = quoteDayData?.getColorReturnInt() ?: R.color.rma_black_33
-
-                                rise_and_fall_the_forehead.text = NumberUtils.roundNum( upDownValue,2) + "%"
-                                applies_textview.text = NumberUtils.roundNum(quoteDayData?.getPrice()?.minus(quoteDayData?.presettle ?: 0.0)?.div(quoteDayData?.presettle ?: 1.0) ?: 0.0,2)
+                                rise_and_fall_the_forehead.text = NumberUtils.roundNum( upDownValue,2)
+                                applies_textview.text = NumberUtils.roundNum(quoteDayData?.getPrice()?.minus(quoteDayData?.presettle ?: 0.0)?.div(quoteDayData?.presettle ?: 1.0) ?: 0.0,4).toString().toPercentage()
                             }
                         }else{
                             text = "--"
@@ -106,7 +106,7 @@ class TjmdHomeMarketViewHolder(private val activity : AppCompatActivity,private
 
                     }
                     textSizeAuto = 34
-                    textColorInt = R.color.rma_red_color
+                    textColorInt = R.color.rma_black_33
                 }.lparams(wrapContent, wrapContent){
                     topMargin = autoSize(15)
                 }
@@ -118,7 +118,7 @@ class TjmdHomeMarketViewHolder(private val activity : AppCompatActivity,private
                     textView {
                         rise_and_fall_the_forehead = this
                         textSizeAuto = 27
-                        textColorInt = R.color.rma_red_color
+
                     }.lparams(wrapContent, wrapContent){
                         marginEnd = autoSize(10)
                     }
@@ -127,7 +127,7 @@ class TjmdHomeMarketViewHolder(private val activity : AppCompatActivity,private
                     textView {
                         applies_textview = this
                         textSizeAuto = 27
-                        textColorInt = R.color.rma_red_color
+
                     }.lparams(wrapContent, wrapContent){
                         marginStart = autoSize(10)
                     }

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

@@ -177,13 +177,16 @@ class TjmdHomeViewModel : BaseViewModel(){
         }
         MyApplication.getInstance()?.chartManager?.queryHistoryDatas(params = params) { isSuccess, respData, _ ->
             if (isSuccess) {
-                wrAverageTradePriceDataList.postValue(respData)
+                wrAverageTradePriceMin = Float.MAX_VALUE
+                wrAverageTradePriceMax = 0f
                 // 计算历史走势图Y轴最小值与最大值
                 respData?.forEach {
                     val s = it.s?.toDouble() ?: 0.0
                     if (s < wrAverageTradePriceMin) wrAverageTradePriceMin = s.toFloat()
                     if (s > wrAverageTradePriceMax) wrAverageTradePriceMax = s.toFloat()
                 }
+                wrAverageTradePriceDataList.postValue(respData)
+
             }
 
         }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/chart/YrdzChartActivity.kt

@@ -261,7 +261,7 @@ class YrdzChartActivity : BaseActivity<YrdzChartViewModel>() , View.OnClickListe
                     findViewById<TextView>(R.id.up_down_present).text = "--"
                 }else{
                     findViewById<TextView>(R.id.up_down_value).text = NumberUtils.roundNum(NumberUtils.doubleDistortion(it?.getPrice()?.minus(it.presettle).toString()),2)//涨额
-                    findViewById<TextView>(R.id.up_down_present).text = it?.getPrice()?.minus(it.presettle)?.div(it.getPrice())//涨幅
+                    findViewById<TextView>(R.id.up_down_present).text = it?.getPrice()?.minus(it.presettle)?.div(it.presettle)//涨幅
                         .toString().toPercentage()
                 }
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/chart/YrdzChartViewModel.kt

@@ -61,8 +61,8 @@ class YrdzChartViewModel : BaseViewModel() {
         }
         // 订阅当前商品行情
         MyApplication.getInstance()?.quoteManager?.addSubscriptQuote(
-            "11112",
-            setOf(outGoodsCode)
+            "22222",
+            setOf(goodsCode)
         ) { isCompleted, err ->
             System.out.println(isCompleted)
         }
@@ -70,7 +70,7 @@ class YrdzChartViewModel : BaseViewModel() {
 
     fun initRequest() {
         queryTsData(goodsCode)
-        queryQuoteDay(outGoodsCode)
+        queryQuoteDay(goodsCode)
     }
 
 
@@ -85,7 +85,7 @@ class YrdzChartViewModel : BaseViewModel() {
      * 请求当前商品k线
      */
     fun queryKChart(type: String){
-        queryKChartData(outGoodsCode, type)
+        queryKChartData(goodsCode, type)
     }
 
     /**

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/swaps/delisting/SwapsDelistingActivity.kt

@@ -597,7 +597,7 @@ class SwapsDelistingActivity : BaseActivity<SwapsDelistingViewModel>(){
 
                     }
                     gravity = Gravity.CENTER
-                    backgroundResource = R.drawable.qhj_main_blue_bg
+                    backgroundResource = R.drawable.qhj_main_blue_five_bg
                     text = if (type == "0") { "卖出" } else { "买入" }
                     textSizeAuto = 38
                     textColorInt = R.color.white

RMA/app/src/main/res/drawable/qhj_main_blue_five_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/rma_blue_color"/>
+    <corners android:radius="5dp"
+       />
+</shape>