zhou.xiaoning vor 3 Jahren
Ursprung
Commit
e4bc5f6992

+ 2 - 2
RMA/app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "cn.muchinfo.rma"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 50055
-        versionName "5.0.55"
+        versionCode 50056
+        versionName "5.0.56"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //指定room.schemaLocation生成的文件路径

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

@@ -7,7 +7,7 @@ object Constant {
      * 获取基础url的接口
      */
 //    const val baseurl = "http://103.40.249.123:38280/cfg?key=mtp_20" // 天津麦顿模拟盘
-//    const val baseurl = "http://47.104.141.54:38280/cfg?key=mtp_20" // 天津麦顿实盘
+    const val baseurl = "http://47.104.141.54: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"
@@ -41,7 +41,7 @@ object Constant {
 //    const val baseurl = "http://218.17.158.45:21001/cfg?key=test_139"// 邓工139外网环境 2100000003/123456
 //    const val baseurl = "http://192.168.31.176:8080/cfg?key=test_176" // 邓工 新会陈皮
 //    const val baseurl = "http://192.168.31.139:8080/cfg?key=test_139" // 麦顿
-    const val baseurl = "http://218.17.158.45:15203/cfg?key=test_176" // 邓工 新会陈皮 176外网
+//    const val baseurl = "http://218.17.158.45:15203/cfg?key=test_176" // 邓工 新会陈皮 176外网
 
     /**
      * 用sp存储基础url的key

+ 5 - 2
RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/reference/ReferenceAdapter.java

@@ -122,8 +122,11 @@ public class ReferenceAdapter extends RecyclerView.Adapter<ReferenceAdapter.Item
 
         List<GoodsInfoAndQuotes> quotesList = GlobalDataCollection.Companion.getInstance().getGoodsInfoAndQuotesList();//获取盘面信息列表
         for (int j = 0;j < quotesList.size();j++){
-            if (data.getGoodscode().equals(quotesList.get(j).getOutgoodscode())){
-                quoteDayData = quotesList.get(j).getQuoteDayData();//赋值当前商品的盘面信息
+            if (quotesList.get(j) != null) {
+                if (data.getGoodscode().equals(quotesList.get(j).getOutgoodscode())){
+                    quoteDayData = quotesList.get(j).getQuoteDayData();//赋值当前商品的盘面信息
+                    break;
+                }
             }
         }