3月25日修改bug-liubolan

RMA/app/src/main/AndroidManifest.xml

@@ -177,6 +177,8 @@
         <activity android:name=".view.base.future.deals.DealDetailsActivity"/>
 
         <activity android:name=".view.base.future.orderDeatails.OrderDetail"/>
+
+        <activity android:name="mtp.polymer.com.information_management.hnstocks.message.MessageDetailsActivity"/>
     </application>
 
 </manifest>

RMA/app/src/main/java/cn/muchinfo/rma/global/StringUtils.kt

@@ -68,7 +68,8 @@ fun String.toShowTime(format : String = "yyyy-MM-dd HH:mm:ss") : String{
     val sdf = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss+08:00", Locale.CHINA)
     val sdf1 = SimpleDateFormat(format, Locale.CHINA)
     var timeString = sdf1.format(sdf.parse(this)!!)
-    if (TimeUtils.isToday(timeString)){
+    if (TimeUtils.getNowString(TimeUtils.getSafeDateFormat("yyyy-MM-dd")) == timeString.split(" ").get(0)){
+//    if (TimeUtils.isToday(timeString)){
         timeString = timeString.split(" ").get(1)
     }
     return timeString

RMA/app/src/main/java/cn/muchinfo/rma/global/data/AccountData.kt

@@ -150,7 +150,7 @@ open class AccountData(
             orderValue += data.opencost
         }
         /** 计算可用金额 **/
-        canUserAmount = currentbalance.minus(usedmargin).minus(freezecharge).minus(freezemargin).minus(otherfreezemargin).minus(orderValue)
+        canUserAmount = currentbalance.minus(usedmargin).minus(freezecharge).minus(freezemargin).minus(otherfreezemargin)
         /** 权益 **/
         rightsAndInterests = currentbalance.plus(keep_watch_profit_and_loss)
     }

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

@@ -151,6 +151,8 @@ class MainActivity : BaseActivity<MainViewModel>() {
                              // FIXME 后期在此处添加首页滑动到顶部处理
                             if (position == 4){
                                 exposureFragment.reFresh()
+                            }else if (position == 3){
+                                futureFragment.refrashAccount()
                             }
 
                             return false

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

@@ -41,8 +41,9 @@ class MainViewModel : BaseViewModel() {
             MyApplication.getInstance()?.initializeManager?.getTaAccounts(params = params) { isSuccess, respData, error ->
                 isInitiaDataSuccess.postValue(isSuccess)
                 if (isSuccess) {
-                    getUserAccount()//请求成功就继续请求用户账号信息
                     GlobalDataCollection.instance?.accountDataList = respData
+                    getUserAccount()//请求成功就继续请求用户账号信息
+
                 } else {
                     loadingDialogStatus.postValue(TaskUiModel.idel())
                 }

RMA/app/src/main/java/cn/muchinfo/rma/view/autoWidget/utils/NumberUtils.java

@@ -424,35 +424,35 @@ public class NumberUtils {
 //        return volume + (isFuture ? "" : PolApplication.getInstance().getString(R.string.mtp_g));
 //    }
 
-//    /**
-//     * 1、万以下的成交额直接显示（数值）；
-//     * 2、万以上~亿以下的成交额单位显示为万；
-//     * 3、亿以上~万亿以下的成交额单位显示为亿；
-//     * 4、万亿以上的交易额单位显示为万亿
-//     *
-//     * @param turnover
-//     * @return
-//     */
-//    public static String turnoverShort(String turnover) {
-//        if (turnover == null || "".equals(turnover) || !WordUtil.isNumber(turnover)) {
-//            return turnover;
-//        }
-//        long wy = 1000000000000L;
-//        long yy = 100000000L;
-//        long yw = 10000L;
-//        long mw = 1000L;
-//        double _volume = Double.parseDouble(turnover);
-//        if (_volume >= wy) {// 大于万亿
-//            return Utils.roundNum(_volume / wy, 2) + PolApplication.getInstance().getString(R.string.wy);
-//        } else if (_volume >= yy && _volume < wy) {// 大於 yy 小于 wy
-//            return Utils.roundNum(_volume / yy, 2) + PolApplication.getInstance().getString(R.string.yy);
-//        } else if (_volume >= yw && _volume < yy) {// 大于万 小于亿
-//            return Utils.roundNum(_volume / yw, 2) + PolApplication.getInstance().getString(R.string.w);
-//        } else if (_volume < yw && _volume >= mw) {
-//            return Utils.roundNum(_volume / yw, 2) + PolApplication.getInstance().getString(R.string.w);
-//        }
-//        return turnover;
-//    }
+    /**
+     * 1、万以下的成交额直接显示（数值）；
+     * 2、万以上~亿以下的成交额单位显示为万；
+     * 3、亿以上~万亿以下的成交额单位显示为亿；
+     * 4、万亿以上的交易额单位显示为万亿
+     *
+     * @param turnover
+     * @return
+     */
+    public static String turnoverShort(String turnover) {
+        if (turnover == null || "".equals(turnover) || !WordUtil.isNumber(turnover)) {
+            return turnover;
+        }
+        long wy = 1000000000000L;
+        long yy = 100000000L;
+        long yw = 10000L;
+        long mw = 1000L;
+        double _volume = Double.parseDouble(turnover);
+        if (_volume >= wy) {// 大于万亿
+            return NumberUtils.roundNum(_volume / wy, 2) + "万亿";
+        } else if (_volume >= yy && _volume < wy) {// 大於 yy 小于 wy
+            return NumberUtils.roundNum(_volume / yy, 2) + "亿";
+        } else if (_volume >= yw && _volume < yy) {// 大于万 小于亿
+            return NumberUtils.roundNum(_volume / yw, 2) + "万";
+        } else if (_volume < yw && _volume >= mw) {
+            return NumberUtils.roundNum(_volume / yw, 2) + "万";
+        }
+        return turnover;
+    }
 
     /**
      * 获取对应的currencyID的英文名称

RMA/app/src/main/java/cn/muchinfo/rma/view/autoWidget/utils/TaskUiModelBinder.kt

@@ -1,7 +1,6 @@
 package mtp.polymer.com.autowidget.utils
 
 import android.app.Dialog
-
 import android.content.Context
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.LiveData

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

@@ -451,7 +451,7 @@ class NumberSpotUI(
 }
 
 /**
- * 期货数量UI
+ * 期货头寸UI
  * @property baseFragment Fragment
  * @property viewModule ExposureViewModel
  * @property root _FrameLayout

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

@@ -33,7 +33,9 @@ class HistoryExposureViewholder(
                 }
 
                 textView {
-                    text = "标准铜（吨）"
+                    data.bindOptional(context){
+                        text = it?.middlegoodsname + "(" + it?.enumdicname + "）"
+                    }
                     textSizeAuto = 34
                     textColorInt = R.color.rma_blue_color
                 }.lparams(wrapContent, wrapContent)
@@ -58,8 +60,8 @@ class HistoryExposureViewholder(
                             .minWidth(3000)
                             .scrollPositionX(1f))
 
-                data.bindOptional(context){
-                    val list = it?.data
+                data.bindOptional(context){resp ->
+                    val list = resp?.data
                     val totalexposureelement = AASeriesElement()
                         .lineWidth(2f)
                         .name("总敞口")

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

@@ -28,6 +28,7 @@ import cn.muchinfo.rma.view.base.future.holds.HoldFragment
 import cn.muchinfo.rma.view.base.future.markets.FutureMarket
 import cn.muchinfo.rma.view.eventbus.EventConstent
 import cn.muchinfo.rma.view.eventbus.MessageEvent
+import com.blankj.utilcode.util.LogUtils
 import com.blankj.utilcode.util.ToastUtils
 import com.qmuiteam.qmui.widget.tab.QMUITabSegment
 import mtp.polymer.com.autowidget.dialog.creatSelectAccountDialog
@@ -78,10 +79,15 @@ class FutureFragment : BaseFragment<FutureViewModel>() {
         savedInstanceState: Bundle?
     ): View? {
         _view = inflater.inflate(R.layout.future_list, container, false)
+
         initViews()
         return _view
     }
 
+    fun refrashAccount(){
+        viewModel.initAccountData()//初始化页面时进行一次资金账号的拿取
+    }
+
     private fun initViews() {
 
         idTab = _view?.findViewById(R.id.id_tab)
@@ -146,7 +152,10 @@ class FutureFragment : BaseFragment<FutureViewModel>() {
             override fun onDoubleTap(index: Int) {}
         })
 
-        viewModel.initAccountData()//初始化页面时进行一次资金账号的拿取
+        viewModel.usedAccountData.bindOptional(context!!) {
+            idAccountInfo?.text = viewModel.getAccountInfo(it)
+            LogUtils.eTag("DAKJFAJSFLKA2",idAccountInfo?.text)
+        }
     }
 
     private fun setHeadView() {
@@ -168,10 +177,10 @@ class FutureFragment : BaseFragment<FutureViewModel>() {
                     .post(MessageEvent(EventConstent.USERACCOUNTCHANGE))
             }.show()
         }
-        viewModel.usedAccountData.bindOptional(context!!) {
-            idAccountInfo?.text = viewModel.getAccountInfo(it)
-        }
+
         idAccountInfo?.text = viewModel.getAccountInfo(GlobalDataCollection.instance?.accountData)
+        LogUtils.eTag("DAKJFAJSFLKA1",idAccountInfo?.text)
+
         return headView
     }
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/costs/CostInfoFragment.kt

@@ -18,6 +18,7 @@ import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.autoSize
 import cn.muchinfo.rma.view.autoWidget.textColorInt
 import cn.muchinfo.rma.view.autoWidget.textSizeAuto
+import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.base.BaseFragment
 import cn.muchinfo.rma.view.base.future.deals.DealData
 import cn.muchinfo.rma.view.base.future.trade.itemView
@@ -40,13 +41,14 @@ class CostInfoFragment(type: String?) : BaseFragment<CostViewModel>() {
     private var accountData : AccountData? = null
     var currencyName : TextView? = null
 
-    val userAccountData : MutableLiveData<AccountShowData> = MutableLiveData()
+    val userAccountData : MutableLiveData<AccountData> = MutableLiveData()
 
     fun initData(){
         accountData = GlobalDataCollection.instance?.accountData
+        accountData?.setNormalData()
         val showAccountData = AccountShowData()
 //        showAccountData.setNormalData()
-        userAccountData.postValue(showAccountData)
+        userAccountData.postValue(accountData)
         if (currencyName != null){
             //暂时写死人民币
 //            currencyName?.text = accountData?.currencyid.toString()
@@ -102,7 +104,7 @@ class CostInfoFragment(type: String?) : BaseFragment<CostViewModel>() {
 
                             textView {
                                 userAccountData.bindOptional(context){
-                                    text = accountData?.currentbalance?.plus(it?.keep_watch_profit_and_loss?.toDouble() ?: 0.0).toString()
+                                    text = NumberUtils.roundNum(it?.rightsAndInterests?.toString(),2)
                                 }
                                 textSizeAuto = 31
                                 textColorInt = R.color.rma_black_33
@@ -126,7 +128,7 @@ class CostInfoFragment(type: String?) : BaseFragment<CostViewModel>() {
 
                             textView {
                                 userAccountData.bindOptional(context){
-                                    text = accountData?.currentbalance?.minus(accountData?.usedmargin ?: 0.0)?.minus(accountData?.freezecharge ?: 0.0)?.minus(accountData?.freezemargin ?: 0.0)?.minus(accountData?.otherfreezemargin ?: 0.0)?.toString()
+                                    text = NumberUtils.roundNum(it?.canUserAmount?.toString(),2)
                                 }
                                 textSizeAuto = 31
                                 textColorInt = R.color.rma_black_33
@@ -151,7 +153,7 @@ class CostInfoFragment(type: String?) : BaseFragment<CostViewModel>() {
                             textView {
                                 /** 直接去占用保证金 **/
                                 userAccountData.bindOptional(context){
-                                    text = accountData?.usedmargin.toString()
+                                    text = NumberUtils.roundNum(it?.usedmargin.toString(),2)
                                 }
                                 textSizeAuto = 31
                                 textColorInt = R.color.rma_black_33
@@ -176,7 +178,7 @@ class CostInfoFragment(type: String?) : BaseFragment<CostViewModel>() {
 
                             textView {
                                 userAccountData.bindOptional(context){
-                                    text = accountData?.freezemargin?.plus(accountData?.freezecharge ?: 0.0).toString()
+                                    text = it?.freezemargin?.plus(it.freezecharge ?: 0.0)?.plus(it.outamountfreeze ?:0.0).toString()
                                 }
                                 textSizeAuto = 31
                                 textColorInt = R.color.rma_black_33
@@ -201,7 +203,7 @@ class CostInfoFragment(type: String?) : BaseFragment<CostViewModel>() {
 
                             textView {
                                  userAccountData.bindOptional(context){
-                                    text = it?.close_watch_profit_and_loss
+                                    text = it?.close_watch_profit_and_loss?.toString()
                                 }
                                 textSizeAuto = 31
                                 textColorInt = R.color.rma_black_33
@@ -225,7 +227,7 @@ class CostInfoFragment(type: String?) : BaseFragment<CostViewModel>() {
 
                             textView {
                                 userAccountData.bindOptional(context){
-                                    text = it?.keep_watch_profit_and_loss
+                                    text = it?.keep_watch_profit_and_loss?.toString()
                                 }
                                 textSizeAuto = 31
                                 textColorInt = R.color.rma_black_33
@@ -249,7 +251,7 @@ class CostInfoFragment(type: String?) : BaseFragment<CostViewModel>() {
 
                             textView {
                                 userAccountData.bindOptional(context){
-                                    text = accountData?.inamount.toString()
+                                    text = it?.inamount.toString()
                                 }
                                 textSizeAuto = 31
                                 textColorInt = R.color.rma_black_33
@@ -273,7 +275,7 @@ class CostInfoFragment(type: String?) : BaseFragment<CostViewModel>() {
 
                             textView {
                                 userAccountData.bindOptional(context){
-                                    text = accountData?.outamount.toString()
+                                    text = it?.outamount.toString()
                                 }
                                 textSizeAuto = 31
                                 textColorInt = R.color.rma_black_33
@@ -284,6 +286,7 @@ class CostInfoFragment(type: String?) : BaseFragment<CostViewModel>() {
                         itemView()
 
                         linearLayout {
+                            visibility = View.GONE
                             gravity = Gravity.CENTER_VERTICAL
                             textView {
                                 text = "资金使用率"

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/costs/CostViewModel.kt

@@ -84,7 +84,7 @@ class CostViewModel : BaseViewModel() {
         override fun onBindViewHolder(holder: CostListHolder, position: Int) {
             holder.idTime?.text = list?.get(position)?.createtime?.toShowTime()
             holder.idOperateType?.text = list?.get(position)?.OPERATETYPENAME
-            holder.idAm?.text = list?.get(position)?.currentbalance?.isBlankNumber()
+            holder.idAm?.text = list?.get(position)?.amount?.isBlankNumber()
             holder.all_view?.onThrottleFirstClick {
                 val intent = Intent()
                 intent.putExtra("data",list?.get(position))

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/deals/DealViewModel.kt

@@ -88,7 +88,7 @@ class DealViewModel : BaseViewModel() {
             holder.idTransType?.text = list?.get(position)?.channelbuildtype.toString().channelbuildtype()
             holder.idDealNum?.text = list?.get(position)?.tradeqty.toString().isBlankString()
             holder.idDealPrice?.text = NumberUtils.roundNum(list?.get(position)?.tradeprice.toString(),2)
-            holder.idDealTime?.text = list?.get(position)?.tradetime?.toShowTime()
+            holder.idDealTime?.text = list?.get(position)?.tradetime?.toShowTime("HH:mm:ss")
 
             // 下面三个按钮的点击事件
             holder.idChart?.tag = list?.get(position)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/entrusts/EntrustChildFragment.kt

@@ -63,7 +63,8 @@ class EntrustChildFragment(type: CustomerEnums.EntrustType) : BaseFragment<Entru
                         recyclerView {
                             idEntrustList = this
                             background = resources.getDrawable(R.color.white, context.theme)
-                            adapter = viewModel.getAdapter(this@EntrustChildFragment)
+                            adapter = viewModel.getAdapter(this@EntrustChildFragment,type!!)
+                            viewModel.setType(type!!)
                         }.lparams(matchParent, matchParent)
                     }
                 }, emptyBlock = {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/entrusts/EntrustChildViewModel.kt

@@ -21,6 +21,7 @@ import cn.muchinfo.rma.view.base.BaseViewModel
 import cn.muchinfo.rma.view.base.future.enums.CustomerEnums
 import cn.muchinfo.rma.view.base.future.holds.HoldFragment
 import cn.muchinfo.rma.view.base.future.interfaces.OnItemClickListener
+import com.blankj.utilcode.util.LogUtils
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import mtp.polymer.com.autowidget.dialog.createWarningDialog
@@ -47,25 +48,32 @@ class EntrustChildViewModel : BaseViewModel() {
     /**
      * 获取配置器。
      */
-    fun getAdapter(fragment : Fragment): RecyclerView.Adapter<EntrustAdapter.EntrustHolder> {
-        return EntrustAdapter(context,fragment)
+    fun getAdapter(fragment : Fragment,type : CustomerEnums.EntrustType): RecyclerView.Adapter<EntrustAdapter.EntrustHolder> {
+        return EntrustAdapter(context,fragment,type)
+    }
+
+    fun setType(type2 : CustomerEnums.EntrustType){
+        type = type2
+        LogUtils.eTag("dafhahsdkahskdja",type)
     }
 
     /**
      * 通用的适配器。
      */
-    inner class EntrustAdapter(context: Context?,fragment : Fragment) : RecyclerView.Adapter<EntrustAdapter.EntrustHolder>() {
+    inner class EntrustAdapter(context: Context?,fragment : Fragment,type : CustomerEnums.EntrustType) : RecyclerView.Adapter<EntrustAdapter.EntrustHolder>() {
         private var list: ArrayList<FutureEntrustData>? = null
         private var inflater: LayoutInflater? = null
         private var context: Context? = null
         private var fragment : Fragment? = null
         private var selectedColor: Int = 0
+        private var type1 : CustomerEnums.EntrustType? = CustomerEnums.EntrustType.TODAY_CANCEL_TYPE
 
         init {
             this.list = GlobalDataCollection.instance?.futureHisEntrustData
             this.inflater = LayoutInflater.from(context)
             this.context = context
             this.fragment = fragment
+            this.type1 = type
             selectedColor = context?.getColor(R.color.p_list_item_select_color)!!
         }
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/markets/MarketBaseModel.kt

@@ -17,6 +17,7 @@ import cn.muchinfo.rma.global.data.AvaildGoodsGroupData
 import cn.muchinfo.rma.global.data.account.loginQeruy.GoodsInfo
 import cn.muchinfo.rma.view.MyApplication
 import cn.muchinfo.rma.view.autoWidget.onThrottleFirstClick
+import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.base.BaseViewModel
 import cn.muchinfo.rma.view.base.future.trade.GoodsTradeActivity
 import com.blankj.utilcode.util.ActivityUtils
@@ -199,7 +200,7 @@ class MarketBaseModel : BaseViewModel() {
                     holder.idPrice?.background = green
                 }
 
-                holder.idHoldTotal?.text = quoteDayData.totalvolume
+                holder.idHoldTotal?.text = NumberUtils.turnoverShort(quoteDayData.totalvolume)
             }else{
                 holder.idHoldTotal?.text = "--"
                 holder.idUpDown?.text = "--"

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/markets/MarketFragment.kt

@@ -103,13 +103,27 @@ class MarketFragment(data: ExternalExchanges) : BaseFragment<MarketBaseModel>()
 
     private fun initViews() {
         idMarketList = _view?.findViewById(R.id.id_market_list)
+        val list = arrayListOf<GoodsInfo>()
+        /**
+         * 通过autoid和exexchangeid匹配找到交易所下的goodsgroup
+         */
+        val goodsGroupDataList = arrayListOf<GoodsGroups>()
+        GlobalDataCollection.instance?.loginQueryData?.goodsgroups?.forEach {
+            if (it.exexchangeid == data?.autoid){
+                goodsGroupDataList.add(it)
+            }
+        }
+
+        val allList = Builder.getDatabase<AppDatabase>().goodsInfoDao.all
 
-        val goodsGroupData = GlobalDataCollection.instance?.loginQueryData?.goodsgroups?.find {
-            it.exexchangeid == data?.autoid
+            goodsGroupDataList.forEach {
+                allList.forEach {data ->
+                if (it.goodsgroupid == data.goodsgroupid){
+                    list.add(data)
+                }
+            }
         }
-        val list = Builder.getDatabase<AppDatabase>().goodsInfoDao.getGoodsGroups(
-            goodsGroupData?.goodsgroupid ?: 0
-        )
+
         if (list.size > 10) {
             lastShow = 10
         } else {

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

@@ -1,5 +1,6 @@
 package cn.muchinfo.rma.view.base.home
 
+import android.content.Intent
 import android.graphics.Typeface
 import android.text.TextUtils
 import android.view.Gravity
@@ -10,9 +11,12 @@ import cn.muchinfo.rma.global.isShowTimeString
 import cn.muchinfo.rma.global.toShowTime
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.autoSize
+import cn.muchinfo.rma.view.autoWidget.onThrottleFirstClick
 import cn.muchinfo.rma.view.autoWidget.textColorInt
 import cn.muchinfo.rma.view.autoWidget.textSizeAuto
+import com.blankj.utilcode.util.ActivityUtils
 import mtp.polymer.com.autowidget.adapter.BaseViewHolder
+import mtp.polymer.com.information_management.hnstocks.message.MessageDetailsActivity
 import org.jetbrains.anko.*
 
 class AnnouncementViewHolder(
@@ -24,6 +28,13 @@ class AnnouncementViewHolder(
     override fun _FrameLayout.createContentView() {
         verticalLayout {
 
+            onThrottleFirstClick {
+                val intent = Intent()
+                intent.putExtra("data",data.value)
+                intent.setClass(context,MessageDetailsActivity::class.java)
+                ActivityUtils.startActivity(intent)
+            }
+
             linearLayout {
                 imageView {
                     data.bindOptional(context){

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

@@ -0,0 +1,81 @@
+package mtp.polymer.com.information_management.hnstocks.message
+
+import android.graphics.Typeface
+import android.os.Bundle
+import cn.muchinfo.rma.R
+import cn.muchinfo.rma.global.data.NoticeData
+import cn.muchinfo.rma.view.autoWidget.*
+import cn.muchinfo.rma.view.base.BaseActivity
+import cn.muchinfo.rma.view.base.home.HomeViewModel
+import com.blankj.utilcode.util.TimeUtils
+
+import org.jetbrains.anko.*
+
+class MessageDetailsActivity : BaseActivity<HomeViewModel>(){
+
+
+    val data by lazy {
+        intent.getParcelableExtra<NoticeData>("data") as NoticeData
+    }
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        verticalLayout {
+            val margerding = autoSize(32)
+            background = resources.getDrawable(R.color.segtabment_bg_color)
+            topBar {
+                commonLeftButton()
+                commonTitle {
+                    text = "详细内容"
+                }
+            }
+
+
+            scrollView {
+                verticalLayout {
+                    textView {
+                        text = data.title
+                        textSizeAuto = 44
+                        textColorInt = R.color.rma_black_33
+                        typeface = Typeface.defaultFromStyle(Typeface.BOLD)
+                    }.lparams(wrapContent, wrapContent){
+                        marginStart = margerding
+                        topMargin = autoSize(32)
+                    }
+
+                    textView {
+                        text = data.createtime?.split("+")?.get(0)?.replace("T"," ")
+                        textSizeAuto = 28
+                        textColorInt = R.color.rma_hint_text_color_ccc
+                    }.lparams(wrapContent, wrapContent){
+                        marginStart = margerding
+                        topMargin = autoSize(32)
+                    }
+
+                    view {
+                        background = resources.getDrawable(R.color.mtp_status_bg)
+                    }.lparams(matchParent, autoSize(1)){
+                        marginStart = margerding
+                        marginEnd = margerding
+                        topMargin = autoSize(20)
+                    }
+
+                    textView {
+//                        setLineSpacing(1f,1f)
+//                        letterSpacing = 0.4f
+                        text = data.content
+                        textSizeAuto = 34
+                        textColorInt = R.color.rma_black_33
+                    }.lparams(wrapContent, wrapContent){
+                        marginStart = margerding
+                        marginEnd = margerding
+                        topMargin = autoSize(32)
+                    }
+                }
+            }
+
+        }
+    }
+
+}

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/commodity/CommodityInformationViewModel.kt

@@ -184,10 +184,11 @@ class CommodityInformationViewModel : BaseViewModel() {
         MyApplication.getInstance()?.commodityManager?.queryGGConvertConfig(params = params) { isSuccess, respData, _ ->
             if (isSuccess) {
                 ggConvertConfigDataList.postValue(respData)
+                showGgConvertConfigDataList.postValue(respData)
 //                if (goodsgroupid.isNotEmpty()){
 //
 //                }else{
-//                    showGgConvertConfigDataList.postValue(respData)
+//
 //                }
 
             }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/reportquery/ReportQueryActivity.kt

@@ -10,6 +10,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
 import cn.muchinfo.rma.R
@@ -24,6 +25,7 @@ import cn.muchinfo.rma.view.base.BaseActivity
 import cn.muchinfo.rma.view.base.home.contract.emptyView
 import cn.muchinfo.rma.view.base.home.financial.FinancialViewholder
 import cn.muchinfo.rma.view.base.home.financial.InvoiceRegisterActivity
+import cn.muchinfo.rma.view.base.procurement.TopTabAdpater
 import com.blankj.utilcode.util.ActivityUtils
 import com.blankj.utilcode.util.ConvertUtils
 import com.blankj.utilcode.util.NumberUtils
@@ -403,7 +405,12 @@ class FinancialReportUI(
                         gravity = Gravity.START
                         textView {
                             viewModel.financialReportTitleData.bindOptional(context) {
-                                text = it?.collectmoneycount?.isBlankString() + "笔"
+                                if (it?.collectmoneycount.isNullOrEmpty()){
+                                    text = "--"
+                                }else{
+                                    text = it?.collectmoneycount?.isBlankString() + "笔"
+                                }
+
                             }
                             textColorInt = R.color.rma_black_33
                             textSizeAuto = 26
@@ -417,7 +424,12 @@ class FinancialReportUI(
                         gravity = Gravity.START
                         textView {
                             viewModel.financialReportTitleData.bindOptional(context) {
-                                text = it?.paymoneycount?.isBlankString() + "笔"
+                                if (it?.paymoneycount.isNullOrEmpty()){
+                                    text = "--"
+                                }else{
+                                    text = it?.paymoneycount?.isBlankString() + "笔"
+                                }
+
                             }
 
                             textColorInt = R.color.rma_black_33
@@ -432,7 +444,12 @@ class FinancialReportUI(
                         gravity = Gravity.START
                         textView {
                             viewModel.financialReportTitleData.bindOptional(context) {
-                                text = it?.collectinvoicecount?.isBlankString() + "笔"
+                                if (it?.collectinvoicecount.isNullOrEmpty()){
+                                    text = "--"
+                                }else{
+                                    text = it?.collectinvoicecount?.isBlankString() + "笔"
+                                }
+
                             }
                             textColorInt = R.color.rma_black_33
                             textSizeAuto = 26
@@ -446,7 +463,12 @@ class FinancialReportUI(
                         gravity = Gravity.START
                         textView {
                             viewModel.financialReportTitleData.bindOptional(context) {
-                                text = it?.payinvoicecount?.isBlankString() + "笔"
+                                if (it?.payinvoicecount.isNullOrEmpty()){
+                                    text = "--"
+                                }else{
+                                    text = it?.payinvoicecount?.isBlankString() + "笔"
+                                }
+
                             }
                             textColorInt = R.color.rma_black_33
                             textSizeAuto = 26
@@ -615,7 +637,16 @@ class ExposureReportUI(
     private lateinit var statusLayout: StatusLayout
     private val exposureReportAdapter: BaseAdapter<ExposureReportData, ExposureReportViewholder> =
         BaseAdapter { _, _ -> ExposureReportViewholder(activity, viewModel) }
-
+//
+//    private lateinit var swipeToLayout: SwipeToLoadLayout
+//    private lateinit var statusLayout: StatusLayout
+//    lateinit var horScrollview: CustomHorizontalScrollView
+//    lateinit var recyclerView: RecyclerView
+//
+//    val topAdapter by lazy {
+//        TopTabAdpater(baseFragment.context)
+//    }
+//
     /**
      * 查询所用的date 注意（页面显示时间规则yyyy-MM-dd,而接口请求规则yyyyMMdd，简直无fuck可说）
      */

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/reportquery/SpotReportDetailsViewHolder.kt

@@ -13,6 +13,9 @@ import cn.muchinfo.rma.view.autoWidget.textSizeAuto
 import mtp.polymer.com.autowidget.adapter.BaseViewHolder
 import org.jetbrains.anko.*
 
+/**
+ * type 是日报表或者月报表
+ */
 class SpotReportDetailsViewHolder(
     private val activity: AppCompatActivity, private val viewModel: ReportQueryViewModel,private val type : String
 ) : BaseViewHolder<SpotReportData>(activity){

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/reportquery/SpotReportViewHolder.kt

@@ -1,6 +1,7 @@
 package cn.muchinfo.rma.view.base.home.reportquery
 
 import android.annotation.SuppressLint
+import android.content.Intent
 import android.view.Gravity
 import androidx.appcompat.app.AppCompatActivity
 import cn.muchinfo.rma.R
@@ -11,6 +12,7 @@ import cn.muchinfo.rma.view.autoWidget.onThrottleFirstClick
 import cn.muchinfo.rma.view.autoWidget.textColorInt
 import cn.muchinfo.rma.view.autoWidget.textSizeAuto
 import cn.muchinfo.rma.view.base.home.contract.emptyView
+import com.blankj.utilcode.util.ActivityUtils
 import mtp.polymer.com.autowidget.adapter.BaseViewHolder
 import org.jetbrains.anko.*
 
@@ -119,7 +121,13 @@ class SpotReportViewHolder(
 
                 textView {
                     onThrottleFirstClick {
-
+                        val intent = Intent()
+                        intent.putExtra("wrstandardid",data.value?.wrstandardid)
+                        intent.putExtra("type",viewModel.isselectSpotMonthOrDay.value)
+                        intent.putExtra("tradedate",data.value?.reckondate)
+                        intent.putExtra("cycletime",data.value?.cycletime)
+                        intent.setClass(context,SpotReportDetailsActivity::class.java)
+                        ActivityUtils.startActivity(intent)
                     }
                     backgroundResource = R.drawable.rma_item_click_bg
                     gravity = Gravity.CENTER

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/tradingquery/TradingQueryActivity.kt

@@ -586,6 +586,9 @@ class MoneyFlowingUI(
                     backgroundResource = R.drawable.rma_time_click_bg
                     gravity = Gravity.CENTER_VERTICAL
                     textView {
+                        startTime.bindOptional(context){
+                            text = it
+                        }
                         text = "起始日期"
                         textColorInt = R.color.rma_hint_text_color_ccc
                         textSizeAuto = 31
@@ -613,6 +616,9 @@ class MoneyFlowingUI(
                     backgroundResource = R.drawable.rma_time_click_bg
                     gravity = Gravity.CENTER_VERTICAL
                     textView {
+                        endTime.bindOptional(context){
+                            text = it
+                        }
                         text = "结束日期"
                         textColorInt = R.color.rma_hint_text_color_ccc
                         textSizeAuto = 31