3月24日修改bug-liubolan

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

@@ -95,6 +95,7 @@ object FutureAdapter {
         builder.setAccountID(accountId)
         builder.setOldOrderId(orderId)
         builder.setClientType(3)
+        builder.clientSerialNo = UUID.randomUUID().toString().replace("-", "")//撤单时传的唯一标识
         builder.clientOrderTime = TimeUtils.getNowString()
         builder.setOrderSrc(1)
 

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

@@ -1,5 +1,7 @@
 package cn.muchinfo.rma.global
 
+import com.blankj.utilcode.util.TimeUtils
+
 object ViewEnumUtils {
 
     /**
@@ -184,4 +186,32 @@ object ViewEnumUtils {
         return str
     }
 
+
+    /**
+     * 期货交易的委托状态
+     */
+    fun getchannelinnerorderstatus(status : String) :String{
+        var str = "--"
+        if (status == "1"){
+            str = "委托请求"
+        }else if (status == "2"){
+            str = "冻结成功"
+        }else if (status == "3"){
+            str = "委托失败"
+        }else if (status == "4"){
+            str = "委托部成部失败"
+        }else if (status == "5"){
+            str = "委托成功"
+        }else if (status == "6"){
+            str = "全部撤销"
+        }else if (status == "7"){
+            str = "部成部撤"
+        }else if (status == "8"){
+            str = "部成部撤部失败"
+        }else if (status == "9"){
+            str = "全部成交"
+        }
+
+        return str
+    }
 }

RMA/app/src/main/java/cn/muchinfo/rma/global/utils/VIewUtils.java

@@ -0,0 +1,14 @@
+package cn.muchinfo.rma.global.utils;
+
+import java.text.SimpleDateFormat;
+import java.util.Locale;
+
+public class VIewUtils {
+
+
+    public static String getShowTime(String timeString,String format) {
+        SimpleDateFormat sdf = new SimpleDateFormat(format, Locale.CHINA);
+        return sdf.format(timeString);
+    }
+
+}

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

@@ -12,8 +12,8 @@ object Constant {
 //    const val baseurl = "http://103.40.249.127:28280/cfg?key=mtp_20"
 //    const val baseurl = "http://192.168.30.125:8080/cfg?key=test_125"
 //    const val baseurl = "http://192.168.31.114:8080/cfg?key=test_114" // shenzhen01  123123
-      const val baseurl = "http://192.168.31.220:8080/cfg?key=test_220"//李倩
-//      const val baseurl = "http://192.168.30.211:8080/cfg?key=test_211"// 瑶姐
+//      const val baseurl = "http://192.168.31.220:8080/cfg?key=test_220"//李倩
+      const val baseurl = "http://192.168.30.211:8080/cfg?key=test_211"// 瑶姐
 
     /**
      * 用sp存储基础url的key

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

@@ -14,14 +14,17 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.blankj.utilcode.util.TimeUtils;
 import com.blankj.utilcode.util.ToastUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import cn.muchinfo.rma.R;
+import cn.muchinfo.rma.global.ViewEnumUtils;
 import cn.muchinfo.rma.global.data.ExposureRealTimeDetailsData;
 import cn.muchinfo.rma.global.data.RealExposureData;
+import cn.muchinfo.rma.global.utils.VIewUtils;
 import cn.muchinfo.rma.view.autoWidget.CustomHorizontalScrollView;
 import cn.muchinfo.rma.view.base.procurement.RightScrollAdapter;
 
@@ -80,7 +83,7 @@ public class ExposureDetailsContentAdapter extends RecyclerView.Adapter<Exposure
     public void onBindViewHolder(@NonNull final ItemViewHolder itemViewHolder, int i) {
         this.index = i;
         if ("1".equals(type)){//现货头部左侧
-            itemViewHolder.exposure_tvLeftTitle.setText(datas.get(i).getCreatetime());
+            itemViewHolder.exposure_tvLeftTitle.setText(VIewUtils.getShowTime(datas.get(i).getCreatetime(),"MMdd HH:mm"));
             itemViewHolder.exposure_tv_left_bottom_title.setText(getType(datas.get(i).getContracttype(),datas.get(i).getLogtype()));
         }else if ("2".equals(type)){//期货头部左侧
             itemViewHolder.exposure_tvLeftTitle.setText(datas.get(i).getGoodsname());

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

@@ -5,6 +5,8 @@ import androidx.appcompat.app.AppCompatActivity
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.ViewEnumUtils
 import cn.muchinfo.rma.global.data.NumberSpotDetailsData
+import cn.muchinfo.rma.global.isBlankString
+import cn.muchinfo.rma.global.isShowTimeString
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.autoSize
 import cn.muchinfo.rma.view.autoWidget.textColorInt
@@ -33,20 +35,23 @@ class ExposurePositionDetailsViewholder(
                 textView {
                     data.bindOptional(context){
                         if (type == "1"){
-                            text = it?.strtime
+                            text = it?.createtime?.isShowTimeString("yyyy-MM-dd HH:mm")
                         }else{
-                            text = it?.tradetime
+                            text = it?.tradetime?.isShowTimeString("yyyy-MM-dd HH:mm")
                         }
                     }
                     textColorInt = R.color.rma_black_33
                     textSizeAuto = 24
-                }.lparams(wrapContent, wrapContent)
+                }.lparams(wrapContent, wrapContent){
+                    topMargin = autoSize(20)
+
+                }
                 textView {
                     data.bindOptional(context){
                         if (type == "1"){
-                            text = it?.relatedno
+                            text = it?.relatedno?.isBlankString()
                         }else{
-                            text = it?.goodscode
+                            text = it?.goodscode?.isBlankString()
                         }
                     }
                     textColorInt = R.color.rma_black_33

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

@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.data.RealExposureData
+import cn.muchinfo.rma.global.isShowTimeString
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.base.BaseActivity

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

@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.business.future.FutureManager
 import cn.muchinfo.rma.global.GlobalDataCollection
+import cn.muchinfo.rma.global.ViewEnumUtils
 import cn.muchinfo.rma.global.data.futureOrders.FutureEntrustData
 import cn.muchinfo.rma.global.isBlankString
 import cn.muchinfo.rma.netManage.base.InteractiveException
@@ -95,7 +96,7 @@ class EntrustChildViewModel : BaseViewModel() {
             entrust.itemView.tag = list?.get(position)
             val itemData = list?.get(position)
             entrust.idGoodsName?.text = itemData?.goodsname
-//            entrust.idStatus?.text = list?.get(position)?.status
+            entrust.idStatus?.text = ViewEnumUtils.getchannelinnerorderstatus(list?.get(position)?.channelinnerorderstatus?.toString() ?: "")
             entrust.idEntrustType?.text = getType(itemData!!)
             if (itemData.buyorsell == 0){
                 entrust.idEntrustType?.textColorInt = R.color.rma_red_color

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

@@ -501,7 +501,7 @@ class GoodsTradeActivity : BaseActivity<GoodsTradeViewModel>() {
                                 linearLayout {
                                     gravity = Gravity.CENTER_VERTICAL
                                     textView {
-                                        text = "数量"
+                                        text = "手数"
                                         textSizeAuto = 34
                                         textColorInt = R.color.text_hit_color
                                     }.lparams(wrapContent, wrapContent) {

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

@@ -101,9 +101,7 @@ class BusinessManagementViewholder(private val activity: AppCompatActivity, priv
                         }
                         textSizeAuto = 22
                         textColorInt = R.color.hint_text_color
-                    }.lparams(wrapContent, wrapContent){
-                        topMargin = autoSize(15)
-                    }
+                    }.lparams(wrapContent, wrapContent)
 
                 }.lparams(autoSize(150), autoSize(120))
 

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

@@ -334,7 +334,11 @@ class SettlementAuditActivity : BaseActivity<BusinessManagementViewModel>() {
                                             emptyView()
                                             textView {
                                                 viewModel.settlementDetails.bindOptional(context){
-                                                    text = it?.decmargin?.isBlankNumber()
+                                                    if (it?.addmargin.isNullOrEmpty()){
+                                                        text = it?.decmargin?.isBlankNumber()
+                                                    }else{
+                                                        text = it?.addmargin?.isBlankNumber()
+                                                    }
                                                 }
                                                 textSizeAuto = 29
                                                 textColorInt = R.color.rma_black_33

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

@@ -9,6 +9,7 @@ import cn.muchinfo.rma.view.MyApplication
 import cn.muchinfo.rma.view.autoWidget.toArrayList
 import cn.muchinfo.rma.view.base.BaseViewModel
 import cn.muchinfo.rma.view.base.home.commodity.viewholder.SpotInfoData
+import com.blankj.utilcode.util.TimeUtils
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import mtp.polymer.com.autowidget.utils.TaskUiModel
@@ -832,6 +833,9 @@ class CommodityInformationViewModel : BaseViewModel() {
 
         MyApplication.getInstance()?.commonManager?.queryMiddleGoodsChangeLog(params = params){isSuccess, respData, error ->
             if (isSuccess){
+                respData?.toArrayList()?.sortWith(Comparator { t1, t2 ->
+                    (TimeUtils.string2Millis(t2.updatetime) - TimeUtils.string2Millis(t1.updatetime)).toInt()
+                })
                 middleChangeLogDataList.postValue(respData)
             }
         }

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

@@ -27,6 +27,9 @@ import mtp.polymer.com.autowidget.adapter.BaseAdapter
 import org.jetbrains.anko.*
 import org.jetbrains.anko.support.v4.viewPager
 
+/**
+ * 套保品种详情
+ */
 class HedgeSpeciesDetailsActivity : BaseActivity<CommodityInformationViewModel>(){
 
     /**
@@ -206,7 +209,7 @@ class GoodsDetailsUI(
             }
             viewItemUI()
 
-//            contentItem(itemTile = "备注",itemContent = data.relatedgoodsid?.toPercentage() ?: "")
+            contentItem(itemTile = "备注",itemContent = "--")//TODO 需要加字段
 
         }
     }

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

@@ -98,34 +98,35 @@ class SpotVarietiesDetailsActivity : BaseActivity<CommodityInformationViewModel>
                             contentItem(itemTile = "套保品种" + viewModel.wrStandardDetails.value?.wrsList?.indexOf(it)?.plus(1),itemContent = it.middlegoodsname)
                             contentItem(itemTile = "套保系数" + viewModel.wrStandardDetails.value?.wrsList?.indexOf(it)?.plus(1),itemContent = it.convertratio)
                         }
-                    }
-
-                    if (data.remark?.isNotEmpty() == true){
-                        linearLayout {
-                            gravity = Gravity.CENTER_VERTICAL
-                            background = resources.getDrawable(R.color.white)
+                        if (data.remark?.isNotEmpty() == true){
                             linearLayout {
                                 gravity = Gravity.CENTER_VERTICAL
+                                background = resources.getDrawable(R.color.white)
+                                linearLayout {
+                                    gravity = Gravity.CENTER_VERTICAL
+                                    textView {
+                                        text = "备注"
+                                        textSizeAuto = 31
+                                        textColorInt = R.color.rma_gray_color
+                                    }.lparams(wrapContent, wrapContent){
+                                        marginStart = autoSize(35)
+                                    }
+                                }.lparams(autoSize(250), autoSize(120))
+
                                 textView {
-                                    text = "备注"
+                                    text = data.remark
                                     textSizeAuto = 31
-                                    textColorInt = R.color.rma_gray_color
+                                    textColorInt = R.color.rma_black_33
                                 }.lparams(wrapContent, wrapContent){
                                     marginStart = autoSize(35)
+                                    marginEnd = autoSize(35)
                                 }
-                            }.lparams(autoSize(250), autoSize(120))
-
-                            textView {
-                                text = data.remark
-                                textSizeAuto = 31
-                                textColorInt = R.color.rma_black_33
-                            }.lparams(wrapContent, wrapContent){
-                                marginStart = autoSize(35)
-                                marginEnd = autoSize(35)
-                            }
 
-                        }.lparams(matchParent, autoSize(240))
+                            }.lparams(matchParent, autoSize(240))
+                        }
                     }
+
+
                 }
             }
         }

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

@@ -1380,6 +1380,18 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                 }
 
                 linearLayout {
+                    onThrottleFirstClick {
+                        if (checkUpdate().not()) {
+                            return@onThrottleFirstClick
+                        }
+                        viewModel.orderContract(
+                            contractInfo = getContractInfo(),
+                            OperateType = "1",
+                            Remark = remask_edittext.text.toString()
+                        ) {
+                            finish()
+                        }
+                    }
                     background = resources.getDrawable(R.color.white)
                     gravity = Gravity.CENTER_VERTICAL
                     textView {

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

@@ -528,11 +528,11 @@ fun _LinearLayout.contractDetailFourView(data: ContractData) {
         viewItemUI()
 
         linearLayout {
-            if (data.remark.isNullOrEmpty()) {
-                visibility = View.GONE
-            } else {
-                visibility = View.VISIBLE
-            }
+//            if (data.remark.isNullOrEmpty()) {
+//                visibility = View.GONE
+//            } else {
+//                visibility = View.VISIBLE
+//            }
             gravity = Gravity.CENTER_VERTICAL
             textView {
                 text = "备        注"
@@ -543,7 +543,7 @@ fun _LinearLayout.contractDetailFourView(data: ContractData) {
             }
 
             textView {
-                text = data.remark
+                text = data.remark?.isBlankString()
                 textColorInt = R.color.rma_black_33
                 textSizeAuto = 31
                 maxLines = 2

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

@@ -18,6 +18,7 @@ import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.base.BaseActivity
 import cn.muchinfo.rma.view.base.home.contract.emptyView
 import cn.muchinfo.rma.view.base.home.contract.viewItemUI
+import com.blankj.utilcode.util.SPUtils
 import com.blankj.utilcode.util.ToastUtils
 import mtp.polymer.com.autowidget.dialog.SelectData
 import mtp.polymer.com.autowidget.dialog.creatBottomSheetDialog
@@ -425,6 +426,19 @@ class AddHedgePlanActivity : BaseActivity<HedgePlanViewModel>() {
                     background = resources.getDrawable(R.color.white)
                     gravity = Gravity.CENTER_VERTICAL
                     textView {
+                        onThrottleFirstClick {
+                            if (checkUpdate().not()) {
+                                return@onThrottleFirstClick
+                            }
+                            viewModel.orderHedge(
+                                hedgePlanData = getHedgeInfo(),
+                                operateType = 1,
+                                remark = ramask.text.toString()
+                            ) {
+                                SPUtils.getInstance().put("isSelect",0)
+                                finish()
+                            }
+                        }
                         gravity = Gravity.CENTER
                         backgroundResource = R.mipmap.rma_save_info_bg
                         text = "保存草稿"
@@ -444,6 +458,7 @@ class AddHedgePlanActivity : BaseActivity<HedgePlanViewModel>() {
                                 operateType = 2,
                                 remark = ramask.text.toString()
                             ) {
+                                SPUtils.getInstance().put("isSelect",1)
                                 finish()
                             }
                         }

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

@@ -50,7 +50,14 @@ class HedgeDetailsActivity : BaseActivity<HedgePlanViewModel>() {
             topBar {
                 commonLeftButton()
                 commonTitle {
-                    text = "审核"
+                    if (type == "1"){
+                        text = "详情"
+                    }else if (type == "2"){
+                        text = "审核"
+                    }else if (type == "3"){
+                        text = "撤回"
+                    }
+
                 }
             }
 
@@ -266,7 +273,7 @@ class HedgeDetailsActivity : BaseActivity<HedgePlanViewModel>() {
                         }
                         gravity = Gravity.CENTER
                         backgroundResource = R.mipmap.rma_submit_bg
-                        text = "撤销"
+                        text = "撤回"
                         textColorInt = R.color.white
                         textSizeAuto = 38
                     }.lparams(autoSize(780), autoSize(119)) {

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

@@ -6,6 +6,7 @@ import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.MutableLiveData
 import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
 import cn.muchinfo.rma.R
@@ -15,6 +16,7 @@ import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.base.BaseActivity
 import com.blankj.utilcode.util.ActivityUtils
 import com.blankj.utilcode.util.ConvertUtils
+import com.blankj.utilcode.util.SPUtils
 import com.blankj.utilcode.util.ToastUtils
 import com.qmuiteam.qmui.util.QMUIDisplayHelper
 import com.qmuiteam.qmui.widget.tab.QMUITabIndicator
@@ -36,6 +38,11 @@ class HedgePlanActivity : BaseActivity<HedgePlanViewModel>() {
         arrayListOf("未提交", "待审核", "执行中")
     }
 
+    //需要跳转的tab页的下标
+    val indexSelect : MutableLiveData<Int> = MutableLiveData()
+
+    var isFirstInThisUI = true
+
     private val unSubmitUI by lazy { UnSubmitUI(this, viewModel, "0") }
     private val toAuditUI by lazy { ToAuditUI(this, viewModel, "1") }
     private val executionUI by lazy { ExecutionUI(this, viewModel, "2") }
@@ -89,6 +96,12 @@ class HedgePlanActivity : BaseActivity<HedgePlanViewModel>() {
 
     override fun onResume() {
         super.onResume()
+        if (isFirstInThisUI.not()){
+            indexSelect.postValue(SPUtils.getInstance().getInt("isSelect"))
+            SPUtils.getInstance().put("isSelect",0)
+        }
+        isFirstInThisUI = false
+
         viewModel.queryHedegList("0")
         viewModel.queryHedegList("1")
         viewModel.queryHedegList("2")
@@ -178,6 +191,9 @@ class HedgePlanActivity : BaseActivity<HedgePlanViewModel>() {
                 adapter = pagerAdapter
             }.lparams(matchParent, autoSize(2000))
 
+            indexSelect.bindOptional(context){
+                segment.selectTab(it ?:0)
+            }
             segment.setupWithViewPager(viewPager)
             segment.selectTab(selectedTabIndex)
         }

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

@@ -418,6 +418,9 @@ class SettlementRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                                     marginStart = autoSize(34)
                                 }
                                 imageView {
+                                    onThrottleFirstClick {
+                                        showPopups(context = context,textString = "1暂定价合同：待确定量=合同量-已确定量\n2一口价/点价合同：待确定量=已定价量-已确定量\n3调整保证金：追加表示给销售方追加保证金；退还表示销售方退还保证金。\n4调整金额：增加表示多支付给销售方，减少表示少支付。",v = this)
+                                    }
                                     imageResource = R.mipmap.rma_zhushi
                                 }.lparams(autoSize(36), autoSize(36)) {
                                     marginStart = autoSize(29)

RMA/app/src/main/res/layout/entrust_item.xml

@@ -92,6 +92,30 @@
         app:layout_constraintTop_toTopOf="parent"
         android:layout_height="wrap_content"/>
 
+    <!--    委托人、撤单人-->
+    <TextView
+        android:visibility="gone"
+        android:layout_width="0dp"
+        android:gravity="end"
+        android:id="@+id/id_entrust_people"
+        style="@style/ListTextStyle"
+        android:paddingEnd="15dp"
+        android:text="委托人"
+        app:layout_constraintStart_toEndOf="@+id/id_entrust_pl"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_height="wrap_content"/>
+    <TextView
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:id="@+id/id_entrust_cancel_people"
+        style="@style/ListSummaryTextStyle"
+        android:text="撤单人"
+        android:paddingEnd="15dp"
+        app:layout_constraintBottom_toBottomOf="@+id/id_entrust_people"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="@+id/id_entrust_pl"
+        android:layout_height="wrap_content"/>
+
 <!--    隐藏的button-->
 <!--    图表-->
     <TextView