掉期订单闪退 以及图表页面闪退

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

@@ -27,7 +27,11 @@ class ChartDataAdapter {
      */
     fun getGoodsInfoMarket(goodsCode : String) : GoodsInfoAndQuotes? {
         return GlobalDataCollection.instance?.goodsInfoAndQuotesList?.find {
-            it.outgoodscode == goodsCode
+            if(it != null) {
+                it.outgoodscode == goodsCode
+            }else{
+                false
+            }
         }
     }
 

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

@@ -132,15 +132,17 @@ public class ContractPositionContentAdapter extends RecyclerView.Adapter<Contrac
 
         List<GoodsInfoAndQuotes> quotesList = GlobalDataCollection.Companion.getInstance().getGoodsInfoAndQuotesList();//获取盘面信息列表
         for (int j = 0; j < quotesList.size(); j++) {
-            if (data.getMarketid().startsWith("16")) {
-                //日了狗，16市场的用本身的goodscode
-                if (data.getGoodscode().equals(quotesList.get(j).getOutgoodscode())) {
-                    quoteDayData = quotesList.get(j).getQuoteDayData();//赋值当前商品的盘面信息
-                }
-            } else {
-                //掉期市场用46市场的 fuck
-                if (data.getRefgoodsCode().equals(quotesList.get(j).getOutgoodscode())) {
-                    quoteDayData = quotesList.get(j).getQuoteDayData();//赋值当前商品的盘面信息
+            if(quotesList.get(j) != null) {
+                if (data.getMarketid().startsWith("16")) {
+                    //日了狗，16市场的用本身的goodscode
+                    if (data.getGoodscode().equals(quotesList.get(j).getOutgoodscode())) {
+                        quoteDayData = quotesList.get(j).getQuoteDayData();//赋值当前商品的盘面信息
+                    }
+                } else {
+                    //掉期市场用46市场的 fuck
+                    if (data.getRefgoodsCode().equals(quotesList.get(j).getOutgoodscode())) {
+                        quoteDayData = quotesList.get(j).getQuoteDayData();//赋值当前商品的盘面信息
+                    }
                 }
             }
         }