Fixed Bug.

RMA/.idea/gradle.xml

@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="1.8" />
@@ -16,7 +16,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
     <option name="offlineMode" value="true" />

RMA/app/build.gradle

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

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

@@ -40,20 +40,23 @@ class ChartViewModel : BaseViewModel() {
         outGoodsCode = intent.getStringExtra("outGoodsCode").toString()
         goodsCode = intent.getStringExtra("goodsCode").toString()
         goodsGroupId = intent.getIntExtra("goodsGroupId", 0)
-        marketId = intent.getIntExtra("marketId", 0)
+//        marketId = intent.getIntExtra("marketId", 0)
+        marketId = intent.getStringExtra("marketId")?.toInt() ?: 0
         goodsInfo.postValue(DataBase.getInstance().goodsInfoDao().getGoodsInfo(goodsId.toInt()))
         // FIXME: 2021/4/25  这里以后要根据市场id去判断交易模式 现在只有一种交易模式
         // autoId 关联 exchangeId
         if(GlobalDataCollection.instance?.loginQueryData?.market?.size != 0){
-            val markets: Markets =
-                GlobalDataCollection.instance?.loginQueryData?.market?.find { it.marketid == marketId }!!
-            marketName = if (markets.trademode == 15) {
-                GlobalDataCollection.instance?.loginQueryData?.externalExchanges?.find { externalExchanges ->
-                    externalExchanges.autoid ==
-                            GlobalDataCollection.instance?.loginQueryData?.goodsgroups?.find { it.goodsgroupid == goodsGroupId }?.exexchangeid
-                }?.exexchangename.toString()
-            } else {
-                markets.marketname
+            val markets: Markets? =
+                GlobalDataCollection.instance?.loginQueryData?.market?.find { it.marketid == marketId }
+            if (null != markets) {
+                marketName = if (markets.trademode == 15) {
+                    GlobalDataCollection.instance?.loginQueryData?.externalExchanges?.find { externalExchanges ->
+                        externalExchanges.autoid ==
+                                GlobalDataCollection.instance?.loginQueryData?.goodsgroups?.find { it.goodsgroupid == goodsGroupId }?.exexchangeid
+                    }?.exexchangename.toString()
+                } else {
+                    markets.marketname
+                }
             }
         }
         // 订阅当前商品行情

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/tjmd/TjmdHomeFragment.kt

@@ -29,7 +29,9 @@ import cn.muchinfo.rma.global.data.BannerData
 import cn.muchinfo.rma.global.data.NoticeData
 import cn.muchinfo.rma.global.data.WrGoodsPerformanceStepData
 import cn.muchinfo.rma.global.data.account.loginQeruy.GoodsInfo
+import cn.muchinfo.rma.global.toShowTime
 import cn.muchinfo.rma.global.toShowTime3
+import cn.muchinfo.rma.global.utils.TimeUtils
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.lifecycle.getAppCompatActivity
 import cn.muchinfo.rma.view.autoWidget.*
@@ -56,6 +58,9 @@ import com.github.aachartmodel.aainfographics.aaoptionsmodel.AAScrollablePlotAre
 import com.qmuiteam.qmui.util.QMUIDisplayHelper
 import com.qmuiteam.qmui.widget.tab.QMUITabIndicator
 import com.qmuiteam.qmui.widget.tab.QMUITabSegment
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import mtp.polymer.com.autowidget.adapter.BaseAdapter
 import mtp.polymer.com.information_management.hnstocks.message.MessageDetailsActivity
 import org.greenrobot.eventbus.EventBus
@@ -91,6 +96,9 @@ class TjmdHomeFragment : BaseFragment<TjmdHomeViewModel>(){
 
     lateinit var dataRecyclerview : RecyclerView
 
+    lateinit var chartView : AAChartView
+    lateinit var chartModel : AAChartModel
+
     val thisTag by lazy {
         "TjmdHomeFragment"
     }
@@ -183,7 +191,11 @@ class TjmdHomeFragment : BaseFragment<TjmdHomeViewModel>(){
             viewModel.getBanner()
 
             viewModel.setDataList(thisTag){isCompleted, err ->
-
+                GlobalScope.launch(Dispatchers.Main) {
+                    chartModel.yAxisMin(viewModel.wrAverageTradePriceMin)
+                    chartModel.yAxisMax(viewModel.wrAverageTradePriceMax)
+                    chartView.aa_drawChartWithChartModel(chartModel)
+                }
             }
 
             viewModel.queryNotice()
@@ -519,11 +531,13 @@ class TjmdHomeFragment : BaseFragment<TjmdHomeViewModel>(){
                             }
 
                             chartview {
+                                chartView = this
                                 visibility = View.GONE
                                 val aaChartModel = AAChartModel()
                                     .chartType(AAChartType.Areaspline)
                                     .title("")
                                     .yAxisTitle("")
+                                    .yAxisAllowDecimals(true)
                                     .legendEnabled(false)
                                     .dataLabelsEnabled(false)
                                     .yAxisGridLineWidth(0f)
@@ -547,12 +561,16 @@ class TjmdHomeFragment : BaseFragment<TjmdHomeViewModel>(){
                                     val list = it
                                     val totalexposureelement = AASeriesElement()
                                         .lineWidth(2f)
-                                        .name("成交均价")
+                                        .name("结算价")
                                         .step(true)
                                         .data(list?.map { it.s?.toDouble() ?: 0.0 }!!.toTypedArray())
-                                    aaChartModel.categories(list.map { it.getTime() }.toTypedArray())
+                                    aaChartModel.categories(list.map {
+                                        // 时间格式化
+                                        TimeUtils.covnDate3(it.getTime())
+                                    }.toTypedArray())
                                     aaChartModel.series(arrayOf(totalexposureelement))
-                                    aa_drawChartWithChartModel(aaChartModel)
+                                    chartModel = aaChartModel
+                                    // aa_drawChartWithChartModel(aaChartModel)
                                 }
 
                             }.lparams(matchParent, autoSize(380))
@@ -575,6 +593,4 @@ class TjmdHomeFragment : BaseFragment<TjmdHomeViewModel>(){
             }
         }.view
     }
-
-
 }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/tjmd/TjmdHomeViewModel.kt

@@ -159,7 +159,11 @@ class TjmdHomeViewModel : BaseViewModel(){
      * 历史走势图
      */
     val wrAverageTradePriceDataList : MutableLiveData<List<HistoryDatas>> = MutableLiveData()
-
+    /**
+     * 历史走势图Y轴最小值与最大值
+     */
+    var wrAverageTradePriceMin: Float = Float.MAX_VALUE
+    var wrAverageTradePriceMax: Float = 0f
 
     /**
      * 请求k线数据
@@ -174,7 +178,14 @@ class TjmdHomeViewModel : BaseViewModel(){
         MyApplication.getInstance()?.chartManager?.queryHistoryDatas(params = params) { isSuccess, respData, _ ->
             if (isSuccess) {
                 wrAverageTradePriceDataList.postValue(respData)
+                // 计算历史走势图Y轴最小值与最大值
+                respData?.forEach {
+                    val s = it.s?.toDouble() ?: 0.0
+                    if (s < wrAverageTradePriceMin) wrAverageTradePriceMin = s.toFloat()
+                    if (s > wrAverageTradePriceMax) wrAverageTradePriceMax = s.toFloat()
+                }
             }
+
         }
     }
 

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

@@ -376,7 +376,7 @@ class SeaKingMainFragment : BaseFragment<SeaKingMainViewModel>() {
                                     }
                                 }.lparams(0, autoSize(110), 1f)
 
-                            }.lparams(0, autoSize(110),1f) {
+                            }.lparams(matchParent, autoSize(110)) {
                                 topMargin = autoSize(20)
                             }
 
@@ -431,7 +431,7 @@ class SeaKingMainFragment : BaseFragment<SeaKingMainViewModel>() {
                                     marginEnd = autoSize(78)
                                     topMargin = autoSize(15)
                                 }
-                            }.lparams(0, autoSize(110),1f) {
+                            }.lparams(matchParent, autoSize(110)) {
                                 topMargin = autoSize(25)
                             }
 

RMA/app/src/main/res/drawable/qhj_main_blue_bg.xml

@@ -2,6 +2,6 @@
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/rma_blue_color"/>
-    <corners android:radius="5dp"
+    <corners android:radius="45dp"
        />
 </shape>