Update

RMA/app/build.gradle

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

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

@@ -129,11 +129,11 @@ class ChartViewModel : BaseViewModel() {
             put("goodsCode", goodsCode)
             put("cycleType", type)
             put("count", "600")
-            put("isAsc", "true")
+//            put("isAsc", "true")
         }
         MyApplication.getInstance()?.chartManager?.queryHistoryDatas(params = params) { isSuccess, respData, _ ->
             if (isSuccess) {
-                kData.postValue(respData)
+                kData.postValue(respData?.sortedBy { it.getTime() })
             }
         }
     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/BusinessHallActivity.kt

@@ -1026,7 +1026,7 @@ class BusinessHallActivity : BaseActivity<BusinessHallViewModel>() {
                 linearLayout {
                     verticalLayout {
                         textView {
-                            text = "摘牌数量"
+                            text = "摘牌数量2"
                             textSizeAuto = 34
                             textColorInt = R.color.rma_hint_text_color_ccc
                         }.lparams(wrapContent, wrapContent) {
@@ -1601,7 +1601,7 @@ class BusinessHallActivity : BaseActivity<BusinessHallViewModel>() {
                     linearLayout {
                         verticalLayout {
                             textView {
-                                text = "摘牌数量"
+                                text = "摘牌数量3"
                                 textSizeAuto = 34
                                 textColorInt = R.color.rma_hint_text_color_ccc
                             }.lparams(wrapContent, wrapContent) {
@@ -2194,7 +2194,7 @@ class BusinessHallActivity : BaseActivity<BusinessHallViewModel>() {
                             linearLayout {
                                 verticalLayout {
                                     textView {
-                                        text = "摘牌数量"
+                                        text = "摘牌数量4"
                                         textSizeAuto = 34
                                         textColorInt = R.color.rma_hint_text_color_ccc
                                     }.lparams(wrapContent, wrapContent) {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/tradecircle/TradeCircleDelistedActivity.kt

@@ -478,7 +478,7 @@ class TradeCircleDelistedActivity : BaseActivity<TradeCircleDelistedViewModel>()
                             gravity = Gravity.CENTER_VERTICAL
                             linearLayout {
                                 textView {
-                                    text = "摘牌数量"
+                                    text = "摘牌数量5"
                                     textSizeAuto = 34
                                     textColorInt = R.color.rma_hint_text_color_ccc
                                 }.lparams(wrapContent, wrapContent) {
@@ -503,7 +503,7 @@ class TradeCircleDelistedActivity : BaseActivity<TradeCircleDelistedViewModel>()
                             }
                             verticalLayout {
                                 textView {
-                                    text = "摘牌数量"
+                                    text = "摘牌数量6"
                                     textSizeAuto = 34
                                     textColorInt = R.color.rma_hint_text_color_ccc
                                 }.lparams(wrapContent, wrapContent) {

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

@@ -160,11 +160,11 @@ class YrdzChartViewModel : BaseViewModel() {
             put("goodsCode", goodsCode)
             put("cycleType", type)
             put("count", "600")
-            put("isAsc", "true")
+//            put("isAsc", "true")
         }
         MyApplication.getInstance()?.chartManager?.queryHistoryDatas(params = params) { isSuccess, respData, _ ->
             if (isSuccess) {
-                kData.postValue(respData)
+                kData.postValue(respData?.sortedBy { it.getTime() })
             }
         }
     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/delisting/PurchaseDelistingActivity.kt

@@ -202,7 +202,7 @@ class PurchaseDelistingActivity : BaseActivity<PurchaseDelistingViewModel>(){
                 background = resources.getDrawable(R.color.white)
                 verticalLayout {
                     textView {
-                        text = "摘牌数量"
+                        text = "摘牌数量1"
                         textSizeAuto = 34
                         textColorInt = R.color.rma_hint_text_color_ccc
                     }.lparams(wrapContent, wrapContent) {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/swaps/delisting/SwapsDelistingActivity.kt

@@ -377,7 +377,7 @@ class SwapsDelistingActivity : BaseActivity<SwapsDelistingViewModel>(){
                 gravity = Gravity.CENTER_VERTICAL
                 linearLayout {
                     textView {
-                        text = "摘牌数量"
+                        text = "摘牌数量7"
                         textSizeAuto = 34
                         textColorInt = R.color.rma_hint_text_color_ccc
                     }.lparams(wrapContent, wrapContent) {
@@ -403,7 +403,7 @@ class SwapsDelistingActivity : BaseActivity<SwapsDelistingViewModel>(){
                 background = resources.getDrawable(R.color.white)
                 verticalLayout {
                     textView {
-                        text = "摘牌数量"
+                        text = "摘牌数量8"
                         textSizeAuto = 34
                         textColorInt = R.color.rma_hint_text_color_ccc
                     }.lparams(wrapContent, wrapContent) {