Update

RMA/.idea/misc.xml

@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="..\:/Repo/MyGogs/Muchinfo/MTP2.0_RMA/RMA/app/src/main/res/layout/activity_chart.xml" value="0.4466666666666667" />
+        <entry key="..\:/Repo/MyGogs/Muchinfo/MTP2.0_RMA/RMA/app/src/main/res/layout/activity_tjmd_chart.xml" value="0.4466666666666667" />
+        <entry key="..\:/Repo/MyGogs/Muchinfo/MTP2.0_RMA/RMA/app/src/main/res/layout/activity_yrdz_chart.xml" value="0.39010416666666664" />
+        <entry key="..\:/Repo/MyGogs/Muchinfo/MTP2.0_RMA/RMA/app/src/main/res/layout/chart_info_layout.xml" value="0.39010416666666664" />
+        <entry key="..\:/Repo/MyGogs/Muchinfo/MTP2.0_RMA/RMA/app/src/main/res/layout/chart_info_layout_tjmd.xml" value="0.39010416666666664" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>

RMA/app/src/main/java/cn/muchinfo/rma/business/quote/adapter/QuoteAdapter.kt

@@ -4,6 +4,7 @@ import cn.muchinfo.rma.business.quote.models.MoQuotaSubscriptReq
 import cn.muchinfo.rma.business.quote.models.MoQuoteSubscriptGoodsInfo
 import cn.muchinfo.rma.netcore.packet.Packet40
 import cn.muchinfo.rma.protobuf.classNumber.ClassNumber
+import com.desfate.chart.util.LogUtils
 import java.lang.Exception
 import java.nio.ByteBuffer
 import java.nio.ByteOrder

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://103.40.249.123:28280/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"
 
@@ -25,7 +25,7 @@ object Constant {
 
 //    const val baseurl = "http://192.168.31.175:8080/cfg?key=test_175" // 8888  123123
 //    const val baseurl = "http://192.168.31.223:8080/cfg?key=test_223"
-//    const val baseurl = "http://192.168.31.139:8080/cfg?key=test_139"// 邓工
+    const val baseurl = "http://192.168.31.139:8080/cfg?key=test_139"// 邓工
 //
 //    const val baseurl = "http://192.168.31.176:8080/cfg?key=test_176" // 9999  123123  黄老板千海金
 //    const val baseurl = "http://192.168.31.171:8080/cfg?key=test_171" // 邓工 签约解约环境

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

@@ -18,12 +18,14 @@ import cn.muchinfo.rma.global.isBlankString
 import cn.muchinfo.rma.global.toPercentage
 import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.base.BaseActivity
+import cn.muchinfo.rma.view.base.app.Constant
 import cn.muchinfo.rma.view.base.chart.KChartTools.Companion.debounceOnMainThread
 import cn.muchinfo.rma.view.base.chart.old.timeCharts.KChartView
 import cn.muchinfo.rma.view.base.chart.old.timeCharts.TimeChartView
 import cn.muchinfo.rma.view.base.future.trade.GoodsTradeActivity
 import cn.muchinfo.rma.view.eventbus.QuoteMessageEvent
 import com.blankj.utilcode.util.ActivityUtils
+import com.blankj.utilcode.util.SPUtils
 import com.blankj.utilcode.util.TimeUtils
 import com.desfate.chart.GridChart
 import com.desfate.chart.event.ITouchEventNotify

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

@@ -119,7 +119,6 @@ class TjmdHomeFragment : BaseFragment<TjmdHomeViewModel>(){
     fun onQuoteMessageEvent(quoteMessageEvent: QuoteMessageEvent) {
         /** 行情推送过来的goodsid **/
         quoteMessageEvent.goodsid.forEach { goodid ->
-            LogUtils.eTag("dadafafsjhdkjahkjdhak",goodid)
             //找到相应商品信息
             val goodsInfo = viewModel.dataList.value?.find { it.goodsInfo?.goodsid == goodid }
             viewModel.dataList.value?.indexOf(goodsInfo)?.let {
@@ -311,7 +310,9 @@ class TjmdHomeFragment : BaseFragment<TjmdHomeViewModel>(){
                                             }
 
                                             imageView {
-                                                showImage(SPUtils.getInstance().getString(Constant.uploadUrl).replace("/upload","") + data.pictureurl?.substring(1))
+                                                if (data.pictureurl != null && data.pictureurl.isNotEmpty()) {
+                                                    showImage(SPUtils.getInstance().getString(Constant.uploadUrl).replace("/upload","") + data.pictureurl.substring(1))
+                                                }
                                             }.lparams(autoSize(72), autoSize(72)) {
                                                 gravity = Gravity.CENTER_HORIZONTAL
                                             }

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

@@ -306,19 +306,21 @@ class LoginActivity : BaseActivity<LoginViewModel>(), UserPopupWindow.OnClearAcc
 
                 emptyView()
 
-                textView {
-                    onThrottleFirstClick {
-                        val intent = Intent()
-                        intent.setClass(context, ResetPasswordActivity::class.java)
-                        ActivityUtils.startActivity(intent)
+                val oem = SPUtils.getInstance().getString(Constant.oem)
+                if (oem.isNotEmpty() && oem != "tjmd") {
+                    textView {
+                        onThrottleFirstClick {
+                            val intent = Intent()
+                            intent.setClass(context, ResetPasswordActivity::class.java)
+                            ActivityUtils.startActivity(intent)
+                        }
+                        text = "忘记密码？"
+                        textColorInt = R.color.white
+                        textSizeAuto = 34
+                    }.lparams(wrapContent, wrapContent) {
+                        marginEnd = autoSize(20)
                     }
-                    text = "忘记密码？"
-                    textColorInt = R.color.white
-                    textSizeAuto = 34
-                }.lparams(wrapContent, wrapContent) {
-                    marginEnd = autoSize(20)
                 }
-
             }.lparams(matchParent, autoSize(120))
 
             button {

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

@@ -82,7 +82,6 @@ class GoodsSwapsUI(private val fragment: Fragment, private val viewModel: TjmdMa
     fun refreshQuoteMessageEvent(quoteMessageEvent: QuoteMessageEvent) {
         /** 行情推送过来的goodsid **/
         quoteMessageEvent.goodsid.forEach { goodid ->
-            LogUtils.eTag("dadafafsjhdkjahkjdhak", goodid)
             //找到相应商品信息
             val goodsInfo = viewModel.swapsDataList.value?.find { it.goodsid == goodid }
             viewModel.swapsDataList.value?.indexOf(goodsInfo)?.let {
@@ -108,7 +107,7 @@ class GoodsSwapsUI(private val fragment: Fragment, private val viewModel: TjmdMa
 //                            viewModel.titleList.bindOptional(context) {
 //                                text = it?.get(0)?.columntitle?.replace("\\n", "\n") ?: ""
 //                            }
-                        text = "商品/标的"
+                        text = "商品/标的1"
                         textColorStr = "#AAAAAA"
                         textSizeAuto = 31
                     }.lparams(wrapContent, wrapContent)

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

@@ -306,6 +306,7 @@ class OneSellListedUI(
                 }.lparams(autoSize(250), wrapContent)
 
                 numberEditText {
+                    decimal = 2
                     text = "0"
                     onePriceInputEdittext = this
                     setOnTextChangeListener { view, value ->
@@ -750,6 +751,7 @@ class OneBuyListedUI(
                 }.lparams(autoSize(250), wrapContent)
 
                 numberEditText {
+                    decimal = 2
                     text = "1"
                     onePriceInputEdittext = this
                     setOnTextChangeListener { view, value ->

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

@@ -28,6 +28,7 @@ import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.base.BaseActivity
+import cn.muchinfo.rma.view.base.app.Constant
 import cn.muchinfo.rma.view.base.chart.ChartDataAdapter
 import cn.muchinfo.rma.view.base.chart.old.timeCharts.KChartView
 import cn.muchinfo.rma.view.base.chart.old.timeCharts.TimeChartView
@@ -36,10 +37,7 @@ import cn.muchinfo.rma.view.base.future.trade.GoodsTradeActivity
 import cn.muchinfo.rma.view.base.yrdzpurchase.dealdetails.YrdzDealDetailsActivity
 import cn.muchinfo.rma.view.base.yrdzpurchase.listed.PurchaseListedActivity
 import cn.muchinfo.rma.view.eventbus.QuoteMessageEvent
-import com.blankj.utilcode.util.ActivityUtils
-import com.blankj.utilcode.util.ConvertUtils
-import com.blankj.utilcode.util.LogUtils
-import com.blankj.utilcode.util.TimeUtils
+import com.blankj.utilcode.util.*
 import com.qmuiteam.qmui.util.QMUIDisplayHelper
 import com.qmuiteam.qmui.widget.tab.QMUITabIndicator
 import com.qmuiteam.qmui.widget.tab.QMUITabSegment
@@ -150,7 +148,12 @@ class YrdzChartActivity : BaseActivity<YrdzChartViewModel>() , View.OnClickListe
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         EventBus.getDefault().register(this)
-        setContentView(R.layout.activity_yrdz_chart)
+        if (SPUtils.getInstance().getString(Constant.oem) == "tjmd") {
+            setContentView(R.layout.activity_tjmd_chart)
+        } else {
+            setContentView(R.layout.activity_yrdz_chart)
+        }
+
         initMenuData()
         initView()
         viewModel.initData(intent)

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

@@ -96,7 +96,7 @@ class GoodsSwapsFragment : BaseFragment<GoodsSwapsViewModel>() , TransferSwapsAd
 //                            viewModel.titleList.bindOptional(context) {
 //                                text = it?.get(0)?.columntitle?.replace("\\n", "\n") ?: ""
 //                            }
-                            text = "商品/标的"
+                            text = "商品/标的2"
                             textColorStr = "#AAAAAA"
                             textSizeAuto = 31
                         }.lparams(wrapContent, wrapContent)