zhou.xiaoning před 3 roky
rodič
revize
d1ee82ef72

+ 2 - 2
RMA/app/build.gradle

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

+ 2 - 1
RMA/app/src/main/java/cn/muchinfo/rma/business/quote/adapter/QuoteAdapter.kt

@@ -147,6 +147,7 @@ class QuoteAdapter {
                     getQuoteTikField(goodsQuoteTik, key, value)
                 }
 
+                //LogUtils.e("bbbb", "goodscode:" + goodsQuoteTik["goodscode"] + " last:" + goodsQuoteTik["last"] + " time:" + goodsQuoteTik["date"] + goodsQuoteTik["time"] )
                 goodsQuoteTiks.add(goodsQuoteTik)
             }
 
@@ -264,7 +265,7 @@ class QuoteAdapter {
                 '@'.toInt() -> {
                     goodsQuoteTik["date"] = value
                 }
-                'a'.toInt() -> {
+                'A'.toInt() -> {
                     goodsQuoteTik["time"] = value
                 }
                 '+'.toInt() -> {

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

@@ -336,7 +336,6 @@ public class ReferenceAdapter extends RecyclerView.Adapter<ReferenceAdapter.Item
                 rightData.add(lowestRightData);//最低
                 rightData.add(highRightData);//最高
                 rightData.add(amplitude);//振幅
-                rightData.add(money);//金额
             }
         }
         ContractTradePositionData positionData = null;

+ 1 - 1
RMA/app/src/main/java/cn/muchinfo/rma/view/base/reference/ReferenceFragment.kt

@@ -155,7 +155,7 @@ class ReferenceFragment : BaseFragment<ReferenceViewModel>() , ReferenceAdapter.
                             if (SPUtils.getInstance().getString(Constant.oem) != "tjmd") {
                                 topAdapter.setDatas(arrayListOf("卖价","卖量","买价","买量","最新价","涨跌","幅度","今开","昨结","最低","最高","振幅","总量","现量","持仓量","日增","金额"))
                             } else {
-                                topAdapter.setDatas(arrayListOf("卖价","买价","最新价","涨跌","幅度","今开","昨结","最低","最高","振幅","金额"))
+                                topAdapter.setDatas(arrayListOf("卖价","买价","最新价","涨跌","幅度","今开","昨结","最低","最高","振幅"))
                             }
                         }
                     }.lparams(matchParent, matchParent)

+ 1 - 0
RMA/app/src/main/java/cn/muchinfo/rma/view/base/tjmd/GoodsSwapsUI.kt

@@ -176,6 +176,7 @@ class GoodsSwapsUI(private val fragment: Fragment, private val viewModel: TjmdMa
 
             statusLayout(contentBlock = {
                 statusLayout = this
+
                 setRetryAction {
 
                 }