Update

RMA/.idea/misc.xml

@@ -8,6 +8,7 @@
         <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" />
+        <entry key="..\:/Repo/MyGogs/Muchinfo/MTP2.0_RMA/RMA/app/src/main/res/layout/exposure_report_layout_item_content.xml" value="0.4125" />
       </map>
     </option>
   </component>

RMA/app/build.gradle

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

RMA/app/src/main/java/cn/muchinfo/rma/business/future/FutureManager.kt

@@ -260,6 +260,11 @@ class FutureManager {
                         }
                     }
                 }
+
+//                val list = GlobalDataCollection.instance?.goodsInfoAndQuotesList
+//                list?.remove(goodsInfoAndQuote)
+//                list?.add(goodsInfoAndQuote)
+//                GlobalDataCollection.instance?.goodsInfoAndQuotesList = list
             } catch (e: Exception) {
                 LogUtils.eTag("RMA11", e.message)
                 return@continuing

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

@@ -418,6 +418,7 @@ class MainActivity : BaseActivity<MainViewModel>() {
 //                            if (position == 0){
 //                                homeFragment.refrashAccount()
 //                            }
+
                             return false
                         }
 

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

@@ -6,7 +6,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: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"
@@ -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/hnstmain/bookingwarehouse/BookingWarehouseViewModel.kt

@@ -280,7 +280,8 @@ class BookingWarehouseViewModel : BaseViewModel(){
             //成交价格
             newRightData.add(it.tradeprice ?: "-")
             //成交数量
-            newRightData.add(it.tradeqty+ it.enumdicname)
+//            newRightData.add(it.tradeqty+ it.enumdicname)
+            newRightData.add(it.tradeqty.toString())
             //金额
             newRightData.add(NumberUtils.roundNum(it.tradeprice?.toDouble()?.times(it.tradeqty?.toDouble() ?: 0.0).toString(),2) ?: "-")
             //手续费
@@ -412,15 +413,19 @@ class BookingWarehouseViewModel : BaseViewModel(){
             //仓库
             newRightData.add(it.warehousename?.isBlankString() ?: "-")
             //预售数量
-            newRightData.add( it.credittotalqty + it.enumdicname)
+//            newRightData.add( it.credittotalqty + it.enumdicname)
+            newRightData.add( it.credittotalqty.toString())
             //成交数量
-            newRightData.add(it.credittradeqty + it.enumdicname)
+//            newRightData.add(it.credittradeqty + it.enumdicname)
+            newRightData.add(it.credittradeqty.toString())
             //冻结数量
-            newRightData.add(it.creditfreezeqty + it.enumdicname)
+//            newRightData.add(it.creditfreezeqty + it.enumdicname)
+            newRightData.add(it.creditfreezeqty.toString())
 //            //质押数量
 //            newRightData.add(it.pledgeqty + it.enumdicname)
             //可用数量
-            newRightData.add(it.creditenableqty + it.enumdicname)
+//            newRightData.add(it.creditenableqty + it.enumdicname)
+            newRightData.add(it.creditenableqty.toString())
             val newData = it.copy(rightData = newRightData)
             newList.add(newData)
         }
@@ -494,9 +499,11 @@ class BookingWarehouseViewModel : BaseViewModel(){
             //挂牌价格
             newRightData.add(it.fixedprice ?: "-")
             //挂牌数量
-            newRightData.add(it.orderqty + it.enumdicname)
+//            newRightData.add(it.orderqty + it.enumdicname)
+            newRightData.add(it.orderqty.toString())
             //成交数量
-            newRightData.add(it.tradeqty + it.enumdicname)
+//            newRightData.add(it.tradeqty + it.enumdicname)
+            newRightData.add(it.tradeqty.toString())
             //挂牌时间
             newRightData.add(it.ordertime ?: "-")
             //挂牌单号

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/contractorders/ContractOrdersViewModel.kt

@@ -341,7 +341,8 @@ class ContractOrdersViewModel : BaseViewModel(){
             //成交价
             newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.tradeprice),2))
             //成交数量
-            newRightData.add(it.tradeqty + it.enumdicname)
+//            newRightData.add(it.tradeqty + it.enumdicname)
+            newRightData.add(it.tradeqty.toString())
             //成交金额
             newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.tradeamount),2))
             //手续费
@@ -403,9 +404,11 @@ class ContractOrdersViewModel : BaseViewModel(){
             //委托价
             newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.orderprice),2))
             //委托数量
-            newRightData.add(it.orderqty + it.enumdicname)
+//            newRightData.add(it.orderqty + it.enumdicname)
+            newRightData.add(it.orderqty.toString())
             //成交数量
-            newRightData.add(it.tradeqty + it.enumdicname)
+//            newRightData.add(it.tradeqty + it.enumdicname)
+            newRightData.add(it.tradeqty.toString())
             //委托单号
             newRightData.add(it.orderid ?: "-")
             //委托时间

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/spotwarehouse/SpotWareHouseViewModel.kt

@@ -316,7 +316,8 @@ class SpotWareHouseViewModel : BaseViewModel(){
             //仓库
             newRightData.add(it.warehousename ?: "-")
             //数量
-            newRightData.add(it.qty + it.enumdicname)
+//            newRightData.add(it.qty + it.enumdicname)
+            newRightData.add(it.qty.toString())
             //时间
             newRightData.add(it.applytime ?: "-")
             //物流信息
@@ -547,7 +548,8 @@ class SpotWareHouseViewModel : BaseViewModel(){
             //成交价格
             newRightData.add(it.tradeprice ?: "-")
             //成交数量
-            newRightData.add(it.tradeqty + it.enumdicname)
+//            newRightData.add(it.tradeqty + it.enumdicname)
+            newRightData.add(it.tradeqty.toString())
             //成交金额
             newRightData.add(NumberUtils.roundNum(it.tradeprice?.toDouble()?.times(it?.tradeqty?.toDouble() ?: 0.0) ?: 0.0,2) ?: "-")
             //手续费
@@ -646,9 +648,11 @@ class SpotWareHouseViewModel : BaseViewModel(){
             }
 
             //挂牌数量
-            newRightData.add(it.orderqty + it.enumdicname)
+//            newRightData.add(it.orderqty + it.enumdicname)
+            newRightData.add(it.orderqty.toString())
             //成交数量
-            newRightData.add(it.tradeqty + it.enumdicname)
+//            newRightData.add(it.tradeqty + it.enumdicname)
+            newRightData.add(it.tradeqty.toString())
             //挂牌时间
             newRightData.add(it.ordertime ?: "-")
             //挂牌单号
@@ -837,13 +841,14 @@ class SpotWareHouseViewModel : BaseViewModel(){
             //仓库
             newRightData.add(it.warehousename ?: "-")
             //库存数量
-            newRightData.add(it.qty+ it.enumdicname)
+            newRightData.add(it.qty.toString())
             //冻结数量
-            newRightData.add(it.freezerqty + it.enumdicname)
+            newRightData.add(it.freezerqty.toString())
             //质押数量
-            newRightData.add("0" + it.enumdicname)//目前需求：质押数量为0
+            newRightData.add("0")//目前需求：质押数量为0
             //可用数量
-            newRightData.add(it.enableqty + it.enumdicname)
+            newRightData.add(it.enableqty.toString())
+//            newRightData.add(it.enableqty + it.enumdicname)
             //仓单编号
             newRightData.add(it.wrholdeno ?: "-")
             //过户时间

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

@@ -53,6 +53,10 @@ class ReferenceFragment : BaseFragment<ReferenceViewModel>() , ReferenceAdapter.
         ReferenceAdapter(this.activity)
     }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        EventBus.getDefault().register(this)
+    }
 
     override fun onDestroy() {
         super.onDestroy()
@@ -162,6 +166,7 @@ class ReferenceFragment : BaseFragment<ReferenceViewModel>() , ReferenceAdapter.
                         setEnableRefresh(true)
                         setEnableLoadMore(false)
                         setOnRefreshListener {
+                            // 查盘面，订阅行情
                             viewModel.queryQuoteDay(
                                 tag = thisTag,
                                 first = fistShow,

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

@@ -83,7 +83,7 @@ class GoodsSwapsUI(private val fragment: Fragment, private val viewModel: TjmdMa
         /** 行情推送过来的goodsid **/
         quoteMessageEvent.goodsid.forEach { goodid ->
             //找到相应商品信息
-            val goodsInfo = viewModel.swapsDataList.value?.find { it.goodsid == goodid }
+            val goodsInfo = viewModel.swapsDataList.value?.find { it.relatedgoodsid == goodid }
             viewModel.swapsDataList.value?.indexOf(goodsInfo)?.let {
                 if (it != -1) {//刷新相应item
                     dataRecyclerview.adapter?.notifyItemChanged(it)
@@ -97,6 +97,19 @@ class GoodsSwapsUI(private val fragment: Fragment, private val viewModel: TjmdMa
             viewModel.initswapsData(tag = thisTag) { isCompleted, _ ->
                 if (isCompleted) {
                     transferSwapsAdapter.notifyDataSetChanged()
+                    viewModel.queryQuoteDay(
+                        tag = thisTag,
+                        first = fistShow,
+                        last = lastShow,
+                        list = viewModel.swapsDataList.value ?: arrayListOf()
+                    ) { isCompleted, _ ->
+                        if (isCompleted) {
+                            if (swipeToLayout.getIsRefreshing()) {
+                                swipeToLayout.finishRefresh()
+                            }
+                            dataRecyclerview.adapter?.notifyItemRangeChanged(fistShow, lastShow)
+                        }
+                    }
                 }
             }
 

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

@@ -33,6 +33,7 @@ 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.qmuiteam.qmui.util.QMUIDisplayHelper
 import com.qmuiteam.qmui.widget.tab.QMUITabIndicator
 import com.qmuiteam.qmui.widget.tab.QMUITabSegment
@@ -43,6 +44,9 @@ import org.greenrobot.eventbus.ThreadMode
 import org.jetbrains.anko.*
 import org.jetbrains.anko.support.v4.UI
 import org.jetbrains.anko.support.v4.viewPager
+import java.util.*
+import kotlin.collections.ArrayList
+import kotlin.concurrent.schedule
 
 /**
  * 天津麦顿的市场板块页面
@@ -121,6 +125,11 @@ class TjmdMarketFragment : BaseFragment<TjmdMarketViewModel>(){
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         EventBus.getDefault().register(this)
+
+        Timer().schedule(4000) {
+            goodsSwapsUI.startSubscriptQuote()
+            purchaseOrderUI.endSubscriptQuote()
+        }
     }
 
     override fun onDestroy() {

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

@@ -3,6 +3,7 @@ package cn.muchinfo.rma.view.base.tjmd
 import android.annotation.SuppressLint
 import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.global.GlobalDataCollection
+import cn.muchinfo.rma.global.GlobalDataCollection.Companion.instance
 import cn.muchinfo.rma.global.data.*
 import cn.muchinfo.rma.global.data.account.loginQeruy.GoodsInfo
 import cn.muchinfo.rma.global.database.DataBase
@@ -19,6 +20,7 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import mtp.polymer.com.autowidget.dialog.SelectData
 import mtp.polymer.com.autowidget.utils.TaskUiModel
+import java.util.*
 
 /**
  * 天津麦顿的市场fragmentviewmodel
@@ -1094,10 +1096,12 @@ class TjmdMarketViewModel : BaseViewModel(){
     fun getgoodsCodes(first: Int, last: Int,list : List<GoodsInfo>): String {
         var goodsCodes = ""
         val newList = list.subList(first, last)
-        newList.forEach {
-            goodsCodes = goodsCodes + it.goodscode.toUpperCase() + ","
-        }
-        return goodsCodes
+//        newList.forEach {
+//            goodsCodes = goodsCodes + it.goodscode.toUpperCase() + ","
+//        }
+        val goodsCodeSet = getRefGoodsCodeSet(newList)
+
+        return goodsCodeSet.joinToString(",")
     }
 
     /**
@@ -1109,13 +1113,31 @@ class TjmdMarketViewModel : BaseViewModel(){
     fun addSubscriptQuote(tag: String, goodsInfoList: List<GoodsInfo>) {
         GlobalScope.launch {
             MyApplication.getInstance()?.quoteManager?.addSubscriptQuote(
-                tag = tag, goodsCodeSet = goodsInfoList.map { it.goodscode.toUpperCase() }.toSet()
+                 tag = tag, goodsCodeSet = getRefGoodsCodeSet(goodsInfoList)
             ) { _, _ ->
 
             }
         }
     }
 
+    fun getRefGoodsCodeSet(goodsInfoList: List<GoodsInfo>): Set<String> {
+        val quoteGoodsListDataList = GlobalDataCollection.instance?.quoteGoodsListDataArrayList
+
+        val array = arrayListOf<String>()
+        if (quoteGoodsListDataList != null) {
+            goodsInfoList.forEach {
+                quoteGoodsListDataList.forEach { data ->
+                    if (data.goodsid == it.goodsid.toString()) {
+                        if (data.refgoodscode != null)
+                            array.add(data.refgoodscode)
+                    }
+                }
+            }
+        }
+
+        return array.toSet()
+    }
+
 
     /**
      * 请求盘面信息

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

@@ -7,7 +7,6 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -16,10 +15,11 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.blankj.utilcode.util.ActivityUtils;
-import com.blankj.utilcode.util.ToastUtils;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
 
 import cn.muchinfo.rma.R;
 import cn.muchinfo.rma.global.GlobalDataCollection;
@@ -29,7 +29,6 @@ import cn.muchinfo.rma.global.data.OrderQuoteData;
 import cn.muchinfo.rma.global.data.QuoteDayData;
 import cn.muchinfo.rma.global.data.QuoteGoodsListData;
 import cn.muchinfo.rma.global.data.account.loginQeruy.GoodsInfo;
-import cn.muchinfo.rma.global.database.DataBase;
 import cn.muchinfo.rma.view.autoWidget.CustomHorizontalScrollView;
 import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils;
 import cn.muchinfo.rma.view.base.platinumtreasure.adapter.QHjRightData;
@@ -102,10 +101,11 @@ public class TransferSwapsAdapter extends RecyclerView.Adapter<TransferSwapsAdap
     public void onBindViewHolder(@NonNull final ItemViewHolder itemViewHolder, int i) {
         GoodsInfo data = datas.get(i);
 
-        ArrayList<QuoteGoodsListData> quoteGoodsListDataList = Objects.requireNonNull(GlobalDataCollection.Companion.getInstance()).getQuoteGoodsListDataArrayList();
-        for (int k = 0;k < quoteGoodsListDataList.size();k++){
-            if (Objects.equals(quoteGoodsListDataList.get(k).getGoodsid(), String.valueOf(data.getGoodsid()))){
-                quoteGoodsListData = quoteGoodsListDataList.get(k);
+        AtomicReference<ArrayList<QuoteGoodsListData>> quoteGoodsListDataList = new AtomicReference<>(Objects.requireNonNull(GlobalDataCollection.Companion.getInstance()).getQuoteGoodsListDataArrayList());
+        for (int k = 0; k < quoteGoodsListDataList.get().size(); k++){
+            if (Objects.equals(quoteGoodsListDataList.get().get(k).getGoodsid(), String.valueOf(data.getGoodsid()))){
+                quoteGoodsListData = quoteGoodsListDataList.get().get(k);
+                break;
             }
         }
 
@@ -288,6 +288,15 @@ public class TransferSwapsAdapter extends RecyclerView.Adapter<TransferSwapsAdap
             Intent intent = new Intent();
             intent.putExtra("goodsId", String.valueOf(data.getGoodsid()));
             intent.putExtra("goodsCode", data.getGoodscode());
+            // 这里是错误的，quoteGoodsListData值已经被后面的数据修改了，要重新找对应的参数行情商品
+            // intent.putExtra("quoteGoodsListData",quoteGoodsListData);
+            quoteGoodsListDataList.set(Objects.requireNonNull(GlobalDataCollection.Companion.getInstance()).getQuoteGoodsListDataArrayList());
+            for (int k = 0; k < quoteGoodsListDataList.get().size(); k++){
+                if (Objects.equals(quoteGoodsListDataList.get().get(k).getGoodsid(), String.valueOf(data.getGoodsid()))){
+                    quoteGoodsListData = quoteGoodsListDataList.get().get(k);
+                    break;
+                }
+            }
             intent.putExtra("quoteGoodsListData",quoteGoodsListData);
             intent.setClass(context, SwapsBusinessHallActivity.class);
             ActivityUtils.startActivity(intent);

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

@@ -141,21 +141,22 @@ class SwapsBusinessHallActivity : BaseActivity<SwapsBusinessHallViewModel>() {
     fun onQuoteMessageEvent(quoteMessageEvent: QuoteMessageEvent) {
         val goodsids = quoteMessageEvent.goodsid
         //如果推送的goodsid包含当前页面的goodsid，则进行页面刷新
-        if (goodsids.contains(goodsId?.toInt())) {
-            LogUtils.eTag("SwapsBusinessHallActivity", "行情推送" + goodsId)
+        //if (goodsids.contains(goodsId?.toInt())) {
+            //LogUtils.eTag("SwapsBusinessHallActivity", "行情推送" + goodsId)
             val quote =
                 GlobalDataCollection.instance?.goodsInfoAndQuotesList?.find { quoteGoodsListData.refgoodscode == it.outgoodscode }?.quoteDayData
             if (quote != null) {
                 //赋值盘面信息
                 viewModel.quoteDayData.postValue(quote)
             }
-        }
+        //}
     }
 
     override fun onDestroy() {
         super.onDestroy()
         viewModel.removeSubscriptQuote(thisTag)
         EventBus.getDefault().unregister(this)
+
     }
 
     //初始化商品信息

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

@@ -93,7 +93,9 @@ class SwapsDelistingActivity : BaseActivity<SwapsDelistingViewModel>(){
         selectAccountData.postValue(GlobalDataCollection.instance?.accountData)
         viewModel.goodsInfo.postValue(DataBase.getInstance().goodsInfoDao().getGoodsInfo(goodsId?.toInt() ?: 0))
         if (type == "0"){//摘卖 摘卖操作时需要查找相应accountid的持仓单
-            viewModel.queryContractTradePosition(accountid = GlobalDataCollection.instance?.accountId.toString(),goodsId = goodsId ?: "")
+            // 掉期交易不应通过持仓去判断可摘买数量
+            // viewModel.queryContractTradePosition(accountid = GlobalDataCollection.instance?.accountId.toString(),goodsId = goodsId ?: "")
+            viewModel.maxDelistedingNumber.postValue(data.orderqty)
         }else{
             viewModel.maxDelistedingNumber.postValue(data.orderqty)//摘买时直接取值挂牌数量
         }
@@ -411,6 +413,7 @@ class SwapsDelistingActivity : BaseActivity<SwapsDelistingViewModel>(){
                         gravity = Gravity.CENTER_VERTICAL
                         numberEditText {
                             text = "1"
+                            max = data.orderqty?.toDouble() ?: 1.0
                             onePriceInputNumberEdittext = this
                             setOnTextChangeListener { view, value ->
                                 if (value.isNullOrEmpty().not()) {

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

@@ -1067,6 +1067,9 @@ class BuyListedUI(
                         gravity = Gravity.CENTER_VERTICAL
                         numberEditText {
                             text = "1"
+                            viewModel.maxBuyListedingNumber.bindOptional(context) {
+                                max = it?.toDouble() ?: 0.0
+                            }
                             onePriceInputNumberEdittext = this
                             setOnTextChangeListener { view, value ->
                                 if (value.isNullOrEmpty().not()) {