yu jie před 3 roky
rodič
revize
2607931588

+ 5 - 1
RMA/app/src/main/java/cn/muchinfo/rma/global/data/AccountData.kt

@@ -234,7 +234,11 @@ open class AccountData(
 
                 val quoteDayData =
                     GlobalDataCollection.instance?.goodsInfoAndQuotesList?.find { data ->
-                        data.outgoodscode == goodsInfoData.goodscode.toUpperCase()
+                        if(data != null) {
+                            data.outgoodscode == goodsInfoData.goodscode.toUpperCase()
+                        }else{
+                            false
+                        }
                     }?.quoteDayData
                 if (it.tradeproperty == "2") {//交易模式为所有权时才在我的页面算市值
                     valueOfposition += quoteDayData?.getPrice()?.times(

+ 8 - 7
RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/HnstMainFragment.kt

@@ -748,13 +748,14 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
                                      */
                                     viewModel.usedAccountData.bindOptional(context) {
                                         if (isOpenEye.value == true) {
-//                                            if (it!!.valueOfposition_keep_watch_profit_and_loss!! != 0.0){
-//                                                if(it?.canUserValueOfPosition!!) {
-//                                                    text = NumberUtils.roundNum(
-//                                                        NumberUtils.doubleDistortion(it?.valueOfposition_keep_watch_profit_and_loss?.toString()),
-//                                                        2
-//                                                    )
-//                                                }
+                                            if (text.toString().trim() == "****" && it!!.valueOfposition_keep_watch_profit_and_loss!! != 0.0) {
+                                                if (it?.canUserValueOfPosition!!) {
+                                                    text = NumberUtils.roundNum(
+                                                        NumberUtils.doubleDistortion(it?.valueOfposition_keep_watch_profit_and_loss?.toString()),
+                                                        2
+                                                    )
+                                                }
+                                            }
 
                                                 var lastprice: Double? = 0.0