Преглед на файлове

Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_RMA

zhou.xiaoning преди 3 години
родител
ревизия
6f3cbdf36a
променени са 1 файла, в които са добавени 6 реда и са изтрити 3 реда
  1. 6 3
      RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/account/RydzAccountActivity.kt

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

@@ -11,6 +11,7 @@ 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.global.toPercentage2
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
@@ -635,9 +636,11 @@ class MoneyInfoUI(
                         if (worth != 0.0) {
                             risk = it?.usedmargin?.div(worth) ?: 0.0
                         }
-                        text =
-                            NumberUtils.roundNum(NumberUtils.doubleDistortion(risk.toString()), 4)
-                                .toPercentage()
+//                        text =
+//                            NumberUtils.roundNum(NumberUtils.doubleDistortion(risk.toString()), 4)
+//                                .toPercentage()
+
+                        text = risk.toString().toPercentage2()
                     }
                     textSizeAuto = 36
                     textColorInt = R.color.rma_black_33