修改统一接口

RMA/app/src/main/java/cn/muchinfo/rma/business/account/AccountManager.kt

@@ -1,7 +1,7 @@
 package cn.muchinfo.rma.business.account
 
 import cn.muchinfo.rma.business.account.adapter.AccountAdapter
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.account.LoginQueryData
 import cn.muchinfo.rma.netManage.base.ResponseCallback
 import cn.muchinfo.rma.netManage.utils.MyOkHttpUtils
@@ -21,7 +21,6 @@ import com.blankj.utilcode.util.SPUtils
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import okhttp3.Call
 import java.lang.Exception
@@ -131,11 +130,11 @@ class AccountManager {
         val tradeSocketManager = app.tradeSocketManager.guard { return }
 
         // 记录服务端时间差值，由于服务端在登录后回传的系统时间已经加了时区，所以我们在转成Date对象之前要先把它减去8小时
-        GlobalDataCollention.getInstance().timeStamp =
+        GlobalDataCollection.getInstance().timeStamp =
             Date(loginRsp.systemTime - 60 * 60 * 8).time - Date().time
 
         // 记录相关登录信息
-        GlobalDataCollention.getInstance().loginRsp = loginRsp
+        GlobalDataCollection.getInstance().loginRsp = loginRsp
 
         // 成功后通知网络开始发送心跳
         tradeSocketManager.startBeatTime()
@@ -159,7 +158,7 @@ class AccountManager {
         }
 
         // 获取LoginID和Token
-        val loginRsp = GlobalDataCollention.getInstance().loginRsp
+        val loginRsp = GlobalDataCollection.getInstance().loginRsp
         val reqPacket = AccountAdapter.buildTokenCheckReqPacket(loginRsp.loginID, loginRsp.token)
         // 发送请求
         tradeSocketManager.send(
@@ -237,11 +236,11 @@ class AccountManager {
      */
     fun loginQuery(callBack: (isCompleted: Boolean, err: Error?) -> Unit) {
 
-        var loginInfo: SystemMI1.LoginRsp = GlobalDataCollention.getInstance().loginRsp
+        var loginInfo: SystemMI1.LoginRsp = GlobalDataCollection.getInstance().loginRsp
         val params = mutableMapOf<String, String>()
         params["loginID"] = loginInfo.loginID.toString()
         MyOkHttpUtils().queryGetForUrl(
-            URL = SPUtils.getInstance().getString(Constant.goCommonSearchUrl) + ServiceFunApi.LOGINQUERY,
+            URL = SPUtils.getInstance().getString(Constant.goCommonSearchUrl) + ServiceFunApi.LOGIN_QUERY,
             params = params,
             callback = object : ResponseCallback<BaseResult<LoginQueryData>>() {
                 override fun onError(call: Call?, e: Exception?, id: Int) {
@@ -249,7 +248,7 @@ class AccountManager {
                 }
 
                 override fun onResponse(response: BaseResult<LoginQueryData>?, id: Int) {
-                    GlobalDataCollention.getInstance().loginQueryData = response?.data
+                    GlobalDataCollection.getInstance().loginQueryData = response?.data
                     callBack(true, null)
                 }
             }

RMA/app/src/main/java/cn/muchinfo/rma/business/account/adapter/AccountAdapter.kt

@@ -1,12 +1,11 @@
 package cn.muchinfo.rma.business.account.adapter
 
 import cn.muchinfo.rma.business.global.MessageHeadModel
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.netcore.crypto.SHA256Encrypt
 import cn.muchinfo.rma.netcore.packet.Packet50
 import cn.muchinfo.rma.protobuf.funcode.FunCode
 import cn.muchinfo.rma.protobuf.protoclasses.SystemMI1
-import cn.muchinfo.rma.view.MyApplication
 import java.io.ByteArrayOutputStream
 import java.lang.Exception
 import java.util.*
@@ -77,9 +76,9 @@ class AccountAdapter {
             val builder = SystemMI1.TokenCheckReq.newBuilder()
             builder.loginID = loginID
             builder.token = token
-            builder.systemTime = Date().time + GlobalDataCollention.getInstance().timeStamp
+            builder.systemTime = Date().time + GlobalDataCollection.getInstance().timeStamp
 
-            val loginRsp = GlobalDataCollention.getInstance().loginRsp
+            val loginRsp = GlobalDataCollection.getInstance().loginRsp
             builder.setHeader(MessageHeadModel.getHead(funCode, loginRsp.userID, 0, 0, 0))
             val arrayOutputStream = ByteArrayOutputStream();
             builder.build().writeTo(arrayOutputStream)

RMA/app/src/main/java/cn/muchinfo/rma/business/commodity/adapter/CommodityAdapter.kt

@@ -2,7 +2,7 @@ package cn.muchinfo.rma.business.commodity.adapter
 
 import cn.muchinfo.rma.business.global.MessageHeadModel
 import cn.muchinfo.rma.global.ErrorMessageUtils
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.netcore.packet.Packet50
 import cn.muchinfo.rma.protobuf.funcode.FunCode
 import cn.muchinfo.rma.protobuf.protoclasses.ManageServiceMI2
@@ -45,13 +45,13 @@ object CommodityAdapter {
         builder.wrstandardid = wrstandardid
         builder.type = type
         builder.unitid = unitid
-        val loginInfo = GlobalDataCollention.getInstance().loginRsp
+        val loginInfo = GlobalDataCollection.getInstance().loginRsp
         // FIXME: - 250000000005
         builder.setHeader(
             MessageHeadModel.getHead(
                 FunCode.DeliveryGoodsApplyReq,
                 loginInfo.userID,
-                GlobalDataCollention.getInstance().accountId,
+                GlobalDataCollection.getInstance().accountId,
                 0,
                 18
             )
@@ -104,13 +104,13 @@ object CommodityAdapter {
         val builder = ManageServiceMI2.DeliveryGoodsCancelReq.newBuilder()
         builder.wrstandardid = wrstandardid
         builder.isvalid = isvalid
-        val loginInfo = GlobalDataCollention.getInstance().loginRsp
+        val loginInfo = GlobalDataCollection.getInstance().loginRsp
         // FIXME: - 250000000005
         builder.setHeader(
             MessageHeadModel.getHead(
                 FunCode.DeliveryGoodsCancelReq,
                 loginInfo.userID,
-                GlobalDataCollention.getInstance().accountId,
+                GlobalDataCollection.getInstance().accountId,
                 0,
                 18
             )
@@ -215,13 +215,13 @@ object CommodityAdapter {
         }
         builder.remark = remark
 
-        val loginInfo = GlobalDataCollention.getInstance().loginRsp
+        val loginInfo = GlobalDataCollection.getInstance().loginRsp
         // FIXME: - 250000000005
         builder.setHeader(
             MessageHeadModel.getHead(
                 FunCode.ErmsMiddelGoodsReq,
                 loginInfo.userID,
-                GlobalDataCollention.getInstance().accountId,
+                GlobalDataCollection.getInstance().accountId,
                 0,
                 18
             )
@@ -316,13 +316,13 @@ object CommodityAdapter {
             builder.goodsgroupid = goodsgroupid
         }
         builder.remark = remark
-        val loginInfo = GlobalDataCollention.getInstance().loginRsp
+        val loginInfo = GlobalDataCollection.getInstance().loginRsp
         // FIXME: - 250000000005
         builder.setHeader(
             MessageHeadModel.getHead(
                 FunCode.ErmsMiddelGoodsEditReq,
                 loginInfo.userID,
-                GlobalDataCollention.getInstance().accountId,
+                GlobalDataCollection.getInstance().accountId,
                 0,
                 18
             )
@@ -368,13 +368,13 @@ object CommodityAdapter {
         builder.middlegoodsid = middlegoodsid
         builder.isvalid = isvalid
         builder.modifierid = modifierid
-        val loginInfo = GlobalDataCollention.getInstance().loginRsp
+        val loginInfo = GlobalDataCollection.getInstance().loginRsp
         // FIXME: - 250000000005
         builder.setHeader(
             MessageHeadModel.getHead(
                 FunCode.ErmsMiddelGoodsStopReq,
                 loginInfo.userID,
-                GlobalDataCollention.getInstance().accountId,
+                GlobalDataCollection.getInstance().accountId,
                 0,
                 18
             )

RMA/app/src/main/java/cn/muchinfo/rma/business/contract/adapter/ContractAdapter.kt

@@ -3,7 +3,7 @@ package cn.muchinfo.rma.business.contract.adapter
 import cn.muchinfo.rma.business.contract.SpotContractInfo
 import cn.muchinfo.rma.business.global.MessageHeadModel
 import cn.muchinfo.rma.global.ErrorMessageUtils
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.netcore.packet.Packet50
 import cn.muchinfo.rma.protobuf.funcode.FunCode
 import cn.muchinfo.rma.protobuf.protoclasses.ErmcpMI1
@@ -121,13 +121,13 @@ object ContractAdapter {
 
         }
 
-        val loginInfo = GlobalDataCollention.getInstance().loginRsp
+        val loginInfo = GlobalDataCollection.getInstance().loginRsp
         // FIXME: - 250000000005
         builder.setHeader(
             MessageHeadModel.getHead(
                 FunCode.SpotContractOperateReq,
                 loginInfo.userID,
-                GlobalDataCollention.getInstance().accountId,
+                GlobalDataCollection.getInstance().accountId,
                 0,
                 18
             )
@@ -185,12 +185,12 @@ object ContractAdapter {
         operateApplyID: Long = 0
     ): Packet50 {
         val builder = ErmcpMI1.ContractOperateApplyReq.newBuilder()
-        val loginInfo = GlobalDataCollention.getInstance().loginRsp
+        val loginInfo = GlobalDataCollection.getInstance().loginRsp
         builder.setHeader(
             MessageHeadModel.getHead(
                 FunCode.ContractOperateApplyReq,
                 loginInfo.userID,
-                GlobalDataCollention.getInstance().accountId,
+                GlobalDataCollection.getInstance().accountId,
                 0,
                 18
             )

RMA/app/src/main/java/cn/muchinfo/rma/business/customer/CustomerManage.kt

@@ -2,7 +2,6 @@ package cn.muchinfo.rma.business.customer
 
 import cn.muchinfo.rma.business.contract.adapter.ContractAdapter
 import cn.muchinfo.rma.business.customer.adapter.CustomerAdapter
-import cn.muchinfo.rma.global.GlobalDataCollention
 import cn.muchinfo.rma.global.data.UserInfoData
 import cn.muchinfo.rma.netManage.base.ResponseCallback
 import cn.muchinfo.rma.netManage.utils.MyOkHttpUtils
@@ -16,7 +15,6 @@ import cn.muchinfo.rma.view.base.app.Constant
 import com.blankj.utilcode.util.SPUtils
 import okhttp3.Call
 import java.lang.Exception
-import java.net.CacheResponse
 
 /**
  * 客户资料管理类

RMA/app/src/main/java/cn/muchinfo/rma/business/customer/adapter/CustomerAdapter.kt

@@ -2,10 +2,9 @@ package cn.muchinfo.rma.business.customer.adapter
 
 import cn.muchinfo.rma.business.global.MessageHeadModel
 import cn.muchinfo.rma.global.ErrorMessageUtils
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.netcore.packet.Packet50
 import cn.muchinfo.rma.protobuf.funcode.FunCode
-import cn.muchinfo.rma.protobuf.protoclasses.ErmcpMI1
 import cn.muchinfo.rma.protobuf.protoclasses.ManageServiceMI2
 import java.io.ByteArrayOutputStream
 import java.lang.Exception
@@ -37,13 +36,13 @@ object CustomerAdapter {
             builder.remark = remark
         }
 
-        val loginInfo = GlobalDataCollention.getInstance().loginRsp
+        val loginInfo = GlobalDataCollection.getInstance().loginRsp
         // FIXME: - 250000000005
         builder.setHeader(
             MessageHeadModel.getHead(
                 FunCode.UserInfoCheckMangeReq,
                 loginInfo.userID,
-                GlobalDataCollention.getInstance().accountId,
+                GlobalDataCollection.getInstance().accountId,
                 0,
                 18
             )

RMA/app/src/main/java/cn/muchinfo/rma/business/hedge/adapter/HedgeAdapter.kt

@@ -3,8 +3,7 @@ package cn.muchinfo.rma.business.hedge.adapter
 import cn.muchinfo.rma.business.global.MessageHeadModel
 import cn.muchinfo.rma.business.hedge.HedgePlanInfo
 import cn.muchinfo.rma.global.ErrorMessageUtils
-import cn.muchinfo.rma.global.GlobalDataCollention
-import cn.muchinfo.rma.global.data.HedgePlanData
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.netcore.packet.Packet50
 import cn.muchinfo.rma.protobuf.funcode.FunCode
 import cn.muchinfo.rma.protobuf.protoclasses.ErmcpMI1
@@ -45,13 +44,13 @@ object HedgeAdapter {
             hedgePlanInfoOrBuilder.planTime = hedgePlanData.PlanTime
             hedgePlanInfoOrBuilder.planQty = hedgePlanData.PlanQty
         }
-        val loginInfo = GlobalDataCollention.getInstance().loginRsp
+        val loginInfo = GlobalDataCollection.getInstance().loginRsp
         // FIXME: - 250000000005
         builder.setHeader(
             MessageHeadModel.getHead(
                 FunCode.SpotContractOperateReq,
                 loginInfo.userID,
-                GlobalDataCollention.getInstance().accountId,
+                GlobalDataCollection.getInstance().accountId,
                 0,
                 18
             )

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

@@ -12,7 +12,7 @@ object ErrorMessageUtils {
      * @return
      */
     fun getErrorString(retCode: Int): String? {
-        val errorCodeString: String = GlobalDataCollention.getInstance().getErrorString(retCode.toString()) ?: ""
+        val errorCodeString: String = GlobalDataCollection.getInstance().getErrorString(retCode.toString()) ?: ""
             if ("" == errorCodeString) { // 如果没有，就这么提示
                 return "未知错误$retCode"
             }

RMA/app/src/main/java/cn/muchinfo/rma/global/GlobalDataCollention.java → RMA/app/src/main/java/cn/muchinfo/rma/global/GlobalDataCollection.java

@@ -13,16 +13,16 @@ import cn.muchinfo.rma.global.data.AccountData;
 import cn.muchinfo.rma.global.data.database.ErrorCodeEntity;
 import cn.muchinfo.rma.view.base.app.Constant;
 
-public class GlobalDataCollention extends BaseGlobalData {
+public class GlobalDataCollection extends BaseGlobalData {
 
-    private static Lock _lock = new ReentrantLock();
+    private static final Lock _lock = new ReentrantLock();
 
-    private static GlobalDataCollention instance = null;
+    private static GlobalDataCollection instance = null;
 
-    public static GlobalDataCollention getInstance() {
+    public static GlobalDataCollection getInstance() {
         if (instance == null) {
             _lock.lock();
-            instance = new GlobalDataCollention();
+            instance = new GlobalDataCollection();
             _lock.unlock();
         }
         return instance;
@@ -49,11 +49,11 @@ public class GlobalDataCollention extends BaseGlobalData {
      */
     public Long getAccountId(){
         long accountId;
-        if (GlobalDataCollention.getInstance().getAccountDataList() == null || GlobalDataCollention.getInstance().getAccountDataList().isEmpty()){
+        if (GlobalDataCollection.getInstance().getAccountDataList() == null || GlobalDataCollection.getInstance().getAccountDataList().isEmpty()){
             accountId = 0L;
         }else {
             if (SPUtils.getInstance().getLong(Constant.SELECT_ACCOUNT_ID,0) == 0){
-                accountId = GlobalDataCollention.getInstance().getAccountDataList().get(0).getAccountid();
+                accountId = GlobalDataCollection.getInstance().getAccountDataList().get(0).getAccountid();
             }else {
                 accountId = Long.parseLong(SPUtils.getInstance().getString(Constant.SELECT_ACCOUNT_ID));
             }
@@ -67,15 +67,15 @@ public class GlobalDataCollention extends BaseGlobalData {
      */
     public AccountData getAccountData(){
         AccountData accountData = null;
-        if (GlobalDataCollention.getInstance().getAccountDataList() == null || GlobalDataCollention.getInstance().getAccountDataList().isEmpty()){
+        if (GlobalDataCollection.getInstance().getAccountDataList() == null || GlobalDataCollection.getInstance().getAccountDataList().isEmpty()){
             accountData = new AccountData();
         }else {
             if (SPUtils.getInstance().getLong(Constant.SELECT_ACCOUNT_ID,0) == 0){
-                accountData = GlobalDataCollention.getInstance().getAccountDataList().get(0);
+                accountData = GlobalDataCollection.getInstance().getAccountDataList().get(0);
             }else {
-                for (int i = 0;i < GlobalDataCollention.getInstance().getAccountDataList().size();i++){
-                    if (GlobalDataCollention.getInstance().getAccountDataList().get(i).getAccountid() == Long.parseLong(SPUtils.getInstance().getString(Constant.SELECT_ACCOUNT_ID))){
-                        accountData = GlobalDataCollention.getInstance().getAccountDataList().get(i);
+                for (int i = 0; i < GlobalDataCollection.getInstance().getAccountDataList().size(); i++){
+                    if (GlobalDataCollection.getInstance().getAccountDataList().get(i).getAccountid() == Long.parseLong(SPUtils.getInstance().getString(Constant.SELECT_ACCOUNT_ID))){
+                        accountData = GlobalDataCollection.getInstance().getAccountDataList().get(i);
                     }
                 }
             }
@@ -107,4 +107,6 @@ public class GlobalDataCollention extends BaseGlobalData {
         return format.format(calendar.getTime());
     }
 
+
+
 }

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

@@ -0,0 +1,2 @@
+package cn.muchinfo.rma.global.data.account
+

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

@@ -4,11 +4,13 @@ package cn.muchinfo.rma.global.data.account
  * 还有个markets字段，似乎用不着，暂时不缓存
  */
 data class LoginQueryData(
-    val loginAccount: LoginAccount? = null,
-    val userAccount : UserAccount? = null,
-    val userInfo: UserInfo? = null,
-    val goodsGroups: Array<GoodsGroups>? = null,
-    val externalExchanges: Array<ExternalExchanges>? = null
+    val userName: String = "", // 用户姓名
+    val loginAccount: LoginAccount? = null, // 登录账号
+    val userAccount : UserAccount? = null, // 用户账号
+    val userInfo: UserInfo? = null, // 用户信息
+    val goodsGroups: Array<GoodsGroups>? = null, // 商品组
+    val externalExchanges: Array<ExternalExchanges>? = null, // 外部交易所
+    val systemParams: Array<SystemParams>? = null // 系统参数
 ) {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true

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

@@ -0,0 +1,5 @@
+package cn.muchinfo.rma.global.data.account
+
+data class SystemParams(
+    val ss: String = ""
+)

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

@@ -1,7 +1,6 @@
 package cn.muchinfo.rma.global.utils
 
-import cn.muchinfo.rma.global.GlobalDataCollention
-import cn.muchinfo.rma.global.MTPEnums
+import cn.muchinfo.rma.global.GlobalDataCollection
 import mtp.polymer.com.autowidget.dialog.SelectData
 
 object SelectIUtils {
@@ -13,7 +12,7 @@ object SelectIUtils {
      */
     fun getDocumentType() : List<SelectData>{
         val selectList = arrayListOf<SelectData>()
-        val enumDicEntityList = GlobalDataCollention.getInstance().enumDicEntityList
+        val enumDicEntityList = GlobalDataCollection.getInstance().enumDicEntityList
         enumDicEntityList.forEach {
             if (it.enumdiccode == "certificatetype"){
                 selectList.add(SelectData(id = it.enumitemname,value = it.enumdicname))

RMA/app/src/main/java/cn/muchinfo/rma/netManage/utils/MyOkHttpUtils.kt

@@ -1,6 +1,6 @@
 package cn.muchinfo.rma.netManage.utils
 
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.netManage.base.ResponseCallback
 import com.blankj.utilcode.util.LogUtils
 import com.zhy.http.okhttp.OkHttpUtils
@@ -81,7 +81,7 @@ class MyOkHttpUtils {
         OkHttpUtils.get()
             .url(URL)
             .params(params)
-            .addHeader("Authorization", GlobalDataCollention.getInstance().loginRsp.token)
+            .addHeader("Authorization", GlobalDataCollection.getInstance().loginRsp.token)
             .build()
             .execute(callback)
     }
@@ -118,7 +118,7 @@ class MyOkHttpUtils {
         OkHttpUtils.post()
             .url(URL)
             .params(params)
-            .addHeader("Authorization", GlobalDataCollention.getInstance().loginRsp.token)
+            .addHeader("Authorization", GlobalDataCollection.getInstance().loginRsp.token)
             .build()
             .execute(callback)
     }
@@ -147,7 +147,7 @@ class MyOkHttpUtils {
             .url(URL)
             .content(json.toString())
             .mediaType(MediaType.parse("application/json; charset=utf-8"))
-            .addHeader("Authorization", GlobalDataCollention.getInstance().loginRsp.token)
+            .addHeader("Authorization", GlobalDataCollection.getInstance().loginRsp.token)
             .build()
             .execute(callback)
     }

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

@@ -3,13 +3,7 @@ package cn.muchinfo.rma.view
 
 import android.graphics.Color
 import android.os.Bundle
-import android.view.Gravity
-import android.view.View
-import android.widget.ImageView
-import androidx.lifecycle.MutableLiveData
-import cn.bingoogolapple.bgabanner.BGABanner
 import cn.muchinfo.rma.R
-import cn.muchinfo.rma.global.GlobalDataCollention
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.base.BaseActivity
@@ -21,11 +15,7 @@ import cn.muchinfo.rma.view.base.sale.SaleFragment
 import cn.muchinfo.rma.view.eventbus.EventConstent
 import cn.muchinfo.rma.view.eventbus.MessageEvent
 import com.blankj.utilcode.util.AppUtils
-import com.blankj.utilcode.util.FragmentUtils
-import com.blankj.utilcode.util.LogUtils
 import com.facebook.drawee.backends.pipeline.Fresco
-import com.next.easynavigation.view.EasyNavigationBar
-import com.qmuiteam.qmui.util.QMUIStatusBarHelper
 import mtp.polymer.com.autowidget.dialog.createLoadingDialog
 import mtp.polymer.com.autowidget.dialog.createWarningDialog
 import mtp.polymer.com.autowidget.utils.bindTaskStatus

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

@@ -1,7 +1,7 @@
 package cn.muchinfo.rma.view
 
 import androidx.lifecycle.MutableLiveData
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.database.DataBase
 import cn.muchinfo.rma.view.base.BaseViewModel
 import kotlinx.coroutines.*
@@ -27,20 +27,20 @@ class MainViewModel : BaseViewModel() {
         // 获取资金账户
         runBlocking {
             val params = mutableMapOf<String, String>().apply {
-                put("loginID", GlobalDataCollention.getInstance().loginRsp.loginID.toString())
+                put("loginID", GlobalDataCollection.getInstance().loginRsp.loginID.toString())
             }
             MyApplication.getInstance()?.initializeManager?.getTaAccounts(params = params) { isSuccess, respData, error ->
                 isInitiaDataSuccess.postValue(isSuccess)
                 if (isSuccess) {
                     getUserAccount()
-                    GlobalDataCollention.getInstance().accountDataList = respData
+                    GlobalDataCollection.getInstance().accountDataList = respData
                 } else {
                     loadingDialogStatus.postValue(TaskUiModel.idel())
                 }
             }
         }
         try {
-            GlobalDataCollention.getInstance().errorCodeEntityList = DataBase.getInstance().errorCodeDao().getList()
+            GlobalDataCollection.getInstance().errorCodeEntityList = DataBase.getInstance().errorCodeDao().getList()
         }catch (e : Exception){
             e.printStackTrace()
         }
@@ -89,14 +89,14 @@ class MainViewModel : BaseViewModel() {
      */
     fun getUserAccount(){
         val params = mutableMapOf<String, String>().apply {
-            put("userID", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userID", GlobalDataCollection.getInstance().loginRsp.userID.toString())
         }
 
         MyApplication.getInstance()?.initializeManager?.getUserAccount(params = params){isSuccess, respData, error ->
             isInitiaDataSuccess.postValue(isSuccess)
             if (isSuccess) {
                 loadingDialogStatus.postValue(TaskUiModel.success(msg = "数据初始化成功"))
-                GlobalDataCollention.getInstance().userAccountData = respData
+                GlobalDataCollection.getInstance().userAccountData = respData
             } else {
                 loadingDialogStatus.postValue(TaskUiModel.idel())
             }

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

@@ -18,7 +18,7 @@ import cn.muchinfo.rma.business.initialize.InitializeManager
 import cn.muchinfo.rma.business.management.BusinessManager
 import cn.muchinfo.rma.business.report.ReportManager
 import cn.muchinfo.rma.business.tradingquery.TradingQueryManager
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.JsonUtils
 import cn.muchinfo.rma.global.data.database.EnumDicEntity
 import cn.muchinfo.rma.global.data.database.ErrorCodeEntity
@@ -165,8 +165,8 @@ class MyApplication : BaseApplication() {
             enumDao.insert(enumTabDatas)
             SPUtils.getInstance().put(Constant.FISTOPENAPP,false)
         }
-        GlobalDataCollention.getInstance().errorCodeEntityList = DataBase.getInstance().errorCodeDao().getList()
-        GlobalDataCollention.getInstance().enumDicEntityList = DataBase.getInstance().enumsDicDao().getList()
+        GlobalDataCollection.getInstance().errorCodeEntityList = DataBase.getInstance().errorCodeDao().getList()
+        GlobalDataCollection.getInstance().enumDicEntityList = DataBase.getInstance().enumsDicDao().getList()
     }
 
     private fun initManager() {

RMA/app/src/main/java/cn/muchinfo/rma/view/autoWidget/dialog/Dialog.kt

@@ -1,6 +1,5 @@
 package mtp.polymer.com.autowidget.dialog
 
-import android.annotation.SuppressLint
 import android.app.DatePickerDialog
 import android.app.Dialog
 import androidx.lifecycle.Lifecycle
@@ -11,14 +10,12 @@ import android.os.Build
 import android.view.Gravity
 import android.view.View
 import android.view.inputmethod.EditorInfo
-import android.widget.DatePicker
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import cn.muchinfo.rma.R
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.AccountData
 import cn.muchinfo.rma.global.data.AvaildGoodsGroupData
-import cn.muchinfo.rma.global.data.GGConvertConfigData
 import cn.muchinfo.rma.global.data.MiddleGoodsData
 
 import cn.muchinfo.rma.lifecycle.addObserver
@@ -26,10 +23,7 @@ import cn.muchinfo.rma.lifecycle.getAppCompatActivity
 import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.autoWidget.dialog.AccountViewHolder
 import cn.muchinfo.rma.view.base.app.Constant
-import cn.muchinfo.rma.view.base.home.commodity.viewholder.SpotInfoData
 import com.blankj.utilcode.util.SPUtils
-import com.blankj.utilcode.util.SnackbarUtils.dismiss
-import com.blankj.utilcode.util.ToastUtils
 import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet
 
 import com.qmuiteam.qmui.widget.dialog.QMUIDialog
@@ -40,7 +34,6 @@ import mtp.polymer.com.autowidget.adapter.BaseAdapter
 
 
 import org.jetbrains.anko.*
-import org.jetbrains.anko.sdk25.coroutines.onClick
 import java.util.*
 import java.util.concurrent.TimeUnit
 
@@ -303,16 +296,16 @@ fun AppCompatActivity.creatSelectAccountDialog(
                 }.lparams(matchParent, matchParent)
             }.lparams(matchParent, wrapContent)
 
-            accountAdapter.setNewData(GlobalDataCollention.getInstance().accountDataList)
+            accountAdapter.setNewData(GlobalDataCollection.getInstance().accountDataList)
             accountAdapter.setOnItemClickListener { adapter, view, position ->
                 selectAccount?.invoke(
-                    GlobalDataCollention.getInstance().accountDataList.get(
+                    GlobalDataCollection.getInstance().accountDataList.get(
                         position
                     )
                 )
                 SPUtils.getInstance().put(
                     Constant.SELECT_ACCOUNT_ID,
-                    GlobalDataCollention.getInstance().accountDataList.get(position).accountid
+                    GlobalDataCollection.getInstance().accountDataList.get(position).accountid
                 )
                 dialog.dismiss()
             }

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

@@ -2,5 +2,5 @@ package cn.muchinfo.rma.view.base.app
 
 object ServiceFunApi {
     // 统一登录
-    const val LOGINQUERY = "/User/LoginQuery"
+    const val LOGIN_QUERY = "/User/LoginQuery"
 }

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

@@ -1,14 +1,13 @@
 package cn.muchinfo.rma.view.base.exposure
 
 import androidx.lifecycle.MutableLiveData
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.*
 import cn.muchinfo.rma.global.toPercentage
 import cn.muchinfo.rma.view.MyApplication
 import cn.muchinfo.rma.view.autoWidget.toArrayList
 import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.base.BaseViewModel
-import cn.muchinfo.rma.view.base.app.Constant
 
 class ExposureViewModel : BaseViewModel(){
 
@@ -83,7 +82,7 @@ class ExposureViewModel : BaseViewModel(){
      */
     fun queryExposureDetail(middleGoodsId : String){
         val params = mutableMapOf<String, String>().apply {
-            put("areaUserId", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("areaUserId", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("middleGoodsId", middleGoodsId)
         }
 
@@ -99,7 +98,7 @@ class ExposureViewModel : BaseViewModel(){
      */
     fun queryRealtimeExposurePosition(middleGoodsId : String){
         val params = mutableMapOf<String, String>().apply {
-            put("areaUserId", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("areaUserId", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("middleGoodsId", middleGoodsId)
         }
 
@@ -176,7 +175,7 @@ class ExposureViewModel : BaseViewModel(){
      */
     fun queryRealtimeExposure(){
         val params = mutableMapOf<String, String>().apply {
-            put("AreaUserID", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("AreaUserID", GlobalDataCollection.getInstance().loginRsp.userID.toString())
         }
 
         MyApplication.getInstance()?.exposureManager?.queryRealtimeExposure(params = params){isSuccess, respData, error ->
@@ -212,7 +211,7 @@ class ExposureViewModel : BaseViewModel(){
      */
     fun queryExposureSpot(){
         val params = mutableMapOf<String, String>().apply {
-            put("areaUserId", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("areaUserId", GlobalDataCollection.getInstance().loginRsp.userID.toString())
         }
 
         MyApplication.getInstance()?.exposureManager?.queryExposureSpot(params = params){isSuccess, respData, error ->
@@ -227,7 +226,7 @@ class ExposureViewModel : BaseViewModel(){
      */
     fun queryExposureHedgePosition(){
         val params = mutableMapOf<String, String>().apply {
-            put("areaUserID", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("areaUserID", GlobalDataCollection.getInstance().loginRsp.userID.toString())
         }
 
         MyApplication.getInstance()?.exposureManager?.queryExposureHedgePosition(params = params){isSuccess, respData, error ->
@@ -242,7 +241,7 @@ class ExposureViewModel : BaseViewModel(){
      */
     fun queryHisExposure(){
         val params = mutableMapOf<String, String>().apply {
-            put("areaUserId", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("areaUserId", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("lastNum", "30")
         }
         MyApplication.getInstance()?.exposureManager?.queryHisExposure(params = params){isSuccess, respData, error ->
@@ -258,7 +257,7 @@ class ExposureViewModel : BaseViewModel(){
      */
     fun queryExposureSpotDetail(wrstandardId : String){
         val params = mutableMapOf<String, String>().apply {
-            put("areaUserId", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("areaUserId", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("wrstandardId", wrstandardId)
         }
         MyApplication.getInstance()?.exposureManager?.queryExposureSpotDetail(params = params){isSuccess, respData, error ->
@@ -274,7 +273,7 @@ class ExposureViewModel : BaseViewModel(){
      */
     fun queryExposureHedgePositionDetail(goodsId : String){
         val params = mutableMapOf<String, String>().apply {
-            put("areaUserId", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("areaUserId", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("goodsId", goodsId)
         }
         MyApplication.getInstance()?.exposureManager?.queryExposureHedgePositionDetail(params = params){isSuccess, respData, error ->

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

@@ -2,7 +2,6 @@ package cn.muchinfo.rma.view.base.home
 
 import android.annotation.SuppressLint
 import android.content.Intent
-import android.graphics.Color
 import android.graphics.Rect
 import android.net.Uri
 import android.os.Bundle
@@ -13,16 +12,14 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.cardview.widget.CardView
-import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
 import cn.bingoogolapple.bgabanner.BGABanner
 import cn.muchinfo.rma.R
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.lifecycle.bindOptional
-import cn.muchinfo.rma.view.MyApplication
 import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.base.BaseFragment
 import cn.muchinfo.rma.view.base.home.business.BusinessManagementActivity
@@ -31,10 +28,6 @@ import cn.muchinfo.rma.view.base.home.contract.ContractActivity
 import cn.muchinfo.rma.view.base.home.customerdata.CustomerDataActivity
 import cn.muchinfo.rma.view.base.home.financial.FinancialActivity
 import cn.muchinfo.rma.view.base.home.hedge.HedgePlanActivity
-import cn.muchinfo.rma.view.base.home.registration.InvoiceRegistrationActivity
-import cn.muchinfo.rma.view.base.home.registration.MidpointsRegistrationActivity
-import cn.muchinfo.rma.view.base.home.registration.PaymentRegistrationActivity
-import cn.muchinfo.rma.view.base.home.registration.SettlementRegistrationActivity
 import cn.muchinfo.rma.view.base.home.reportquery.ReportQueryActivity
 import cn.muchinfo.rma.view.base.home.tradingquery.TradingQueryActivity
 import cn.muchinfo.rma.view.eventbus.EventConstent
@@ -42,7 +35,6 @@ import cn.muchinfo.rma.view.eventbus.MessageEvent
 import com.blankj.utilcode.util.ActivityUtils
 import com.blankj.utilcode.util.ConvertUtils
 import com.blankj.utilcode.util.LogUtils
-import com.blankj.utilcode.util.ToastUtils
 import com.facebook.drawee.view.SimpleDraweeView
 import com.qmuiteam.qmui.util.QMUIDisplayHelper
 import com.qmuiteam.qmui.widget.tab.QMUITabIndicator
@@ -50,7 +42,6 @@ import com.qmuiteam.qmui.widget.tab.QMUITabSegment
 
 import mtp.polymer.com.autowidget.adapter.BaseAdapter
 import mtp.polymer.com.autowidget.dialog.creatSelectAccountDialog
-import mtp.polymer.com.autowidget.utils.bindTaskStatus
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -152,7 +143,7 @@ class HomeFragment : BaseFragment<HomeViewModel>() {
                             viewModel.usedAccountData.bindOptional(context){
                                 text = it?.accountname
                             }
-                            text = GlobalDataCollention.getInstance().loginRsp.userID.toString()
+                            text = GlobalDataCollection.getInstance().loginRsp.userID.toString()
                             textColorInt = R.color.white
                             textSizeAuto = 36
                         }.lparams(wrapContent, wrapContent) {

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

@@ -2,15 +2,12 @@ package cn.muchinfo.rma.view.base.home
 
 
 import androidx.lifecycle.MutableLiveData
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.AccountData
 import cn.muchinfo.rma.global.data.database.BannerEntity
 import cn.muchinfo.rma.global.database.DataBase
-import cn.muchinfo.rma.netManage.base.InteractiveException
 import cn.muchinfo.rma.netManage.base.ResponseCallback
 import cn.muchinfo.rma.netManage.utils.MyOkHttpUtils
-import cn.muchinfo.rma.view.MyApplication
-import cn.muchinfo.rma.view.autoWidget.guard
 import cn.muchinfo.rma.view.base.BaseViewModel
 import cn.muchinfo.rma.view.base.app.BaseResult
 import cn.muchinfo.rma.view.base.app.Constant
@@ -72,7 +69,7 @@ class HomeViewModel : BaseViewModel(){
      * 更新hoefragment的account
      */
     fun initAccountData(){
-        val accountDataList = GlobalDataCollention.getInstance().accountDataList
+        val accountDataList = GlobalDataCollection.getInstance().accountDataList
         if (accountDataList.isNullOrEmpty().not()){
             usedAccountData.postValue(accountDataList.get(0))
         }

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

@@ -1,7 +1,7 @@
 package cn.muchinfo.rma.view.base.home.business
 
 import androidx.lifecycle.MutableLiveData
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.BusinessData
 import cn.muchinfo.rma.netManage.base.InteractiveException
 import cn.muchinfo.rma.view.MyApplication
@@ -10,7 +10,6 @@ import cn.muchinfo.rma.view.base.BaseViewModel
 import com.blankj.utilcode.util.TimeUtils
 import com.blankj.utilcode.util.ToastUtils
 import mtp.polymer.com.autowidget.utils.TaskUiModel
-import java.text.SimpleDateFormat
 
 class BusinessManagementViewModel : BaseViewModel() {
 
@@ -85,7 +84,7 @@ class BusinessManagementViewModel : BaseViewModel() {
      */
     fun queryBusinessDJ() {
         val params = mutableMapOf<String, String>().apply {
-            put("UserId", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("UserId", GlobalDataCollection.getInstance().loginRsp.userID.toString())
         }
         MyApplication.getInstance()?.businessManager?.queryBusinessDJ(params) { isSuccess, respData, _ ->
             if (isSuccess){
@@ -103,7 +102,7 @@ class BusinessManagementViewModel : BaseViewModel() {
      */
     fun queryBusinessJS() {
         val params = mutableMapOf<String, String>().apply {
-            put("UserId", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("UserId", GlobalDataCollection.getInstance().loginRsp.userID.toString())
         }
 
         MyApplication.getInstance()?.businessManager?.queryBusinessJSEx(params) { isSuccess, respData, _ ->
@@ -122,7 +121,7 @@ class BusinessManagementViewModel : BaseViewModel() {
     fun queryBusinessDetails(relatedid : String){
         loadingDataDialogStatus.value = TaskUiModel.inFlight()
         val params = mutableMapOf<String, String>().apply {
-            put("UserId", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("UserId", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("relatedid",relatedid)
         }
         MyApplication.getInstance()?.businessManager?.queryBusinessJSDetail(params = params){ isSuccess, respData, err ->

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

@@ -1,6 +1,5 @@
 package cn.muchinfo.rma.view.base.home.commodity
 
-import android.content.Intent
 import android.os.Bundle
 import android.view.Gravity
 import android.view.View
@@ -8,7 +7,7 @@ import android.view.inputmethod.EditorInfo
 import android.widget.EditText
 import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.R
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.AvaildGoodsGroupData
 import cn.muchinfo.rma.global.data.GGConvertConfigData
 import cn.muchinfo.rma.global.data.MiddleGoodsData
@@ -299,7 +298,7 @@ class AddHedgeGoodsActivity : BaseActivity<CommodityInformationViewModel>() {
                                     goodsunitid = data1?.goodunitid?.toInt() ?: 0,
                                     goodsgroupid = data1?.goodsgroupid?.toLong() ?: 0,
                                     remark = remask_edittext.text.toString(),
-                                    areauserid = GlobalDataCollention.getInstance().loginRsp.userID.toLong(),
+                                    areauserid = GlobalDataCollection.getInstance().loginRsp.userID.toLong(),
                                     needhedgeratio = hedge_ratio_edtittext.text.toString()
                                         .toDouble()
                                 ) {
@@ -311,7 +310,7 @@ class AddHedgeGoodsActivity : BaseActivity<CommodityInformationViewModel>() {
                                     needhedgeratio = hedge_ratio_edtittext.text.toString()
                                         .toDouble() ?: 0.0,
                                     goodsgroupid = data.goodsgroupid?.toLong() ?: 0,
-                                    areauserid = GlobalDataCollention.getInstance().loginRsp.userID.toLong(),
+                                    areauserid = GlobalDataCollection.getInstance().loginRsp.userID.toLong(),
                                     remark = remask_edittext.text.toString()
                                 ) {
                                     finish()

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

@@ -1,19 +1,17 @@
 package cn.muchinfo.rma.view.base.home.commodity
 
 import androidx.lifecycle.MutableLiveData
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.*
 import cn.muchinfo.rma.netManage.base.InteractiveException
 import cn.muchinfo.rma.protobuf.protoclasses.ManageServiceMI2
 import cn.muchinfo.rma.view.MyApplication
-import cn.muchinfo.rma.view.autoWidget.remove
 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 kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import mtp.polymer.com.autowidget.utils.TaskUiModel
-import java.sql.RowId
 
 class CommodityInformationViewModel : BaseViewModel() {
 
@@ -83,7 +81,7 @@ class CommodityInformationViewModel : BaseViewModel() {
      */
     fun queryAvalidGoods() {
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userid", GlobalDataCollection.getInstance().loginRsp.userID.toString())
         }
         MyApplication.getInstance()?.commodityManager?.queryAvalidGoods(params = params) { isSuccess, respData, error ->
             if (isSuccess) {
@@ -100,7 +98,7 @@ class CommodityInformationViewModel : BaseViewModel() {
         select: (AvaildGoodsGroupData.() -> Unit)? = null
     ) {
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userid", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("middlegoodsid", middlegoodsid)
         }
         MyApplication.getInstance()?.commodityManager?.queryMiddleGoodsDetail(params = params) { isSuccess, respData, error ->
@@ -339,7 +337,7 @@ class CommodityInformationViewModel : BaseViewModel() {
         status: String
     ) {
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userid", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("status", status)
         }
         MyApplication.getInstance()?.commodityManager?.queryWrStandard(params = params) { isSuccess, respData, _ ->
@@ -359,7 +357,7 @@ class CommodityInformationViewModel : BaseViewModel() {
      */
     fun queryWrStandardDetails(wrstandardid: String) {
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userid", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("wrstandardid", wrstandardid)
         }
         MyApplication.getInstance()?.commodityManager?.queryWrStandardDetail(params = params) { isSuccess, respData, _ ->
@@ -415,7 +413,7 @@ class CommodityInformationViewModel : BaseViewModel() {
      */
     fun queryMiddleGoodsList(status: String) {
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userid", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("status", status)
         }
         MyApplication.getInstance()?.commodityManager?.queryMiddleGoods(params = params) { isSuccess, respData, _ ->
@@ -436,7 +434,7 @@ class CommodityInformationViewModel : BaseViewModel() {
      */
     fun queryMiddleGoodsDetails(middlegoodsid: String) {
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userid", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("middlegoodsid", middlegoodsid)
         }
         MyApplication.getInstance()?.commodityManager?.queryMiddleGoodsDetails(params = params) { isSuccess, respData, _ ->

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

@@ -9,7 +9,7 @@ import android.widget.TextView
 import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.business.contract.SpotContractInfo
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.MTPEnums
 import cn.muchinfo.rma.global.ViewEnumUtils
 import cn.muchinfo.rma.global.data.ContractData
@@ -302,7 +302,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                                 // FIXME 后期查询用户资料后需要填写用户名
                                 contractType.bindOptional(context) {
                                     text = if (it?.id == "1") {
-                                        GlobalDataCollention.getInstance().userAccountData.accountname
+                                        GlobalDataCollection.getInstance().userAccountData.accountname
                                     } else {
                                         "请选择客户"
                                     }
@@ -376,7 +376,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                                 // FIXME 后期查询用户资料后需要填写用户名
                                 contractType.bindOptional(context) {
                                     text = if (it?.id == "-1") {
-                                        GlobalDataCollention.getInstance().userAccountData.accountname
+                                        GlobalDataCollection.getInstance().userAccountData.accountname
                                     } else {
                                         "请选择客户"
                                     }
@@ -1341,7 +1341,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
 
     private fun getContractInfo() : SpotContractInfo{
         val contractInfo = SpotContractInfo()
-        val userid = GlobalDataCollention.getInstance().loginRsp.userID
+        val userid = GlobalDataCollection.getInstance().loginRsp.userID
         if (contractNo.text.toString().isNotEmpty()){
             contractInfo.ContractNo = contractNo.text.toString()
         }

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

@@ -4,7 +4,6 @@ import android.text.TextUtils
 import android.view.Gravity
 import android.view.View
 import cn.muchinfo.rma.R
-import cn.muchinfo.rma.global.GlobalDataCollention
 import cn.muchinfo.rma.global.ViewEnumUtils
 import cn.muchinfo.rma.global.data.ContractData
 import cn.muchinfo.rma.view.autoWidget.autoSize

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

@@ -2,7 +2,7 @@ package cn.muchinfo.rma.view.base.home.contract
 
 import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.business.contract.SpotContractInfo
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.ContractData
 import cn.muchinfo.rma.global.data.UserInfoData
 import cn.muchinfo.rma.global.data.WrStandardData
@@ -10,8 +10,6 @@ import cn.muchinfo.rma.global.data.WrStandardDetail
 import cn.muchinfo.rma.netManage.base.InteractiveException
 import cn.muchinfo.rma.view.MyApplication
 import cn.muchinfo.rma.view.base.BaseViewModel
-import cn.muchinfo.rma.view.base.home.customerdata.CustomerData
-import com.blankj.utilcode.util.ToastUtils
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import mtp.polymer.com.autowidget.dialog.SelectData
@@ -140,7 +138,7 @@ class ContractViewModel : BaseViewModel() {
     fun queryContract(QueryType: String) {
 
         val params = mutableMapOf<String, String>().apply {
-            put("userId", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userId", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("QueryType", QueryType)
         }
 
@@ -173,7 +171,7 @@ class ContractViewModel : BaseViewModel() {
      */
     fun queryUserInfo() {
         val params = mutableMapOf<String, String>().apply {
-            put("MemberUserID", GlobalDataCollention.getInstance().loginRsp.memberUserID.toString())
+            put("MemberUserID", GlobalDataCollection.getInstance().loginRsp.memberUserID.toString())
             put("queryType", "3")
         }
 
@@ -203,7 +201,7 @@ class ContractViewModel : BaseViewModel() {
      */
     fun queryWrStandardList() {
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userid", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("status", "1")
         }
         MyApplication.getInstance()?.commodityManager?.queryWrStandard(params) { isSuccess, respData, error ->
@@ -239,7 +237,7 @@ class ContractViewModel : BaseViewModel() {
      */
     fun queryWrStandardDetail(wrstandardid: String) {
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userid", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("wrstandardid", wrstandardid)
         }
 

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

@@ -1,6 +1,5 @@
 package cn.muchinfo.rma.view.base.home.customerdata
 
-import android.app.DatePickerDialog
 import android.app.Dialog
 import android.os.Bundle
 import android.os.Handler
@@ -13,15 +12,13 @@ import android.widget.EditText
 import android.widget.TextView
 import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.R
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.UserInfoData
 import cn.muchinfo.rma.global.utils.SelectIUtils
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.netManage.base.InteractiveException
 import cn.muchinfo.rma.netManage.utils.UpLoadUtils
 import cn.muchinfo.rma.view.autoWidget.*
-import cn.muchinfo.rma.view.autoWidget.PickerView.builder.TimePickerBuilder
-import cn.muchinfo.rma.view.autoWidget.PickerView.listener.OnTimeSelectListener
 import cn.muchinfo.rma.view.autoWidget.addressDialog.AddressDialog
 import cn.muchinfo.rma.view.autoWidget.addressDialog.AddressItemData
 import cn.muchinfo.rma.view.autoWidget.photopicter.PhotoUtils
@@ -669,7 +666,7 @@ class AddCustomerDataActivity : BaseActivity<CustomerDataViewModel>() {
                                 commit(true)
                             }else{//审核拒绝
                                 viewModel.requestUserInfoCheckMange(
-                                    auditflag = 2,userid = data.userid?.toLong() ?: 0,audituserid = GlobalDataCollention.getInstance().loginRsp.userID.toLong(),remark = remark.text.toString()
+                                    auditflag = 2,userid = data.userid?.toLong() ?: 0,audituserid = GlobalDataCollection.getInstance().loginRsp.userID.toLong(),remark = remark.text.toString()
                                 ){
                                     finish()
                                 }
@@ -699,7 +696,7 @@ class AddCustomerDataActivity : BaseActivity<CustomerDataViewModel>() {
                                 commit(false)
                             }else{//审核通过
                                 viewModel.requestUserInfoCheckMange(
-                                    auditflag = 1,userid = data.userid?.toLong() ?: 0,audituserid = GlobalDataCollention.getInstance().loginRsp.userID.toLong(),remark = remark.text.toString()
+                                    auditflag = 1,userid = data.userid?.toLong() ?: 0,audituserid = GlobalDataCollection.getInstance().loginRsp.userID.toLong(),remark = remark.text.toString()
                                 ){
                                     finish()
                                 }
@@ -878,7 +875,7 @@ class AddCustomerDataActivity : BaseActivity<CustomerDataViewModel>() {
         params["userstate"] = if (isDraft) 1 else 2
         // 所属机构
         // FIXME: - 这里应该判断一下UserID是否为0
-        params["memberareaid"] = GlobalDataCollention.getInstance().loginRsp.userID
+        params["memberareaid"] = GlobalDataCollection.getInstance().loginRsp.userID
 
         // 证件类型
         if (cardType.value?.id?.isNullOrEmpty() == false) {

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

@@ -1,7 +1,7 @@
 package cn.muchinfo.rma.view.base.home.customerdata
 
 import androidx.lifecycle.MutableLiveData
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.UserInfoData
 import cn.muchinfo.rma.netManage.base.InteractiveException
 import cn.muchinfo.rma.view.MyApplication
@@ -113,7 +113,7 @@ class CustomerDataViewModel : BaseViewModel() {
 //        unSubmitList.value = arrayListOf(UserInfoData(address = "1"),UserInfoData(address = "2"),UserInfoData(address = "3"))
         loadingDialogStatus.value = TaskUiModel.inFlight()
         val params = mutableMapOf<String, String>().apply {
-            put("MemberUserID", GlobalDataCollention.getInstance().loginRsp.memberUserID.toString())
+            put("MemberUserID", GlobalDataCollection.getInstance().loginRsp.memberUserID.toString())
             put("queryType", type)
         }
         MyApplication.getInstance()?.customerManage?.queryUserInfo(params) { isSuccess, respData, error ->

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

@@ -1,7 +1,7 @@
 package cn.muchinfo.rma.view.base.home.financial
 
 import androidx.lifecycle.MutableLiveData
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.FinancialManageData
 import cn.muchinfo.rma.netManage.base.InteractiveException
 import cn.muchinfo.rma.view.MyApplication
@@ -70,7 +70,7 @@ class FinancialViewModel : BaseViewModel(){
      */
     fun queryBusinessKx(){
         val params = mutableMapOf<String, String>().apply {
-            put("UserId", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("UserId", GlobalDataCollection.getInstance().loginRsp.userID.toString())
         }
 
         MyApplication.getInstance()?.financialManager?.queryBusinessKx(params = params){isSuccess, respData, error ->
@@ -85,7 +85,7 @@ class FinancialViewModel : BaseViewModel(){
      */
     fun queryBusinessFp(){
         val params = mutableMapOf<String, String>().apply {
-            put("UserId", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("UserId", GlobalDataCollection.getInstance().loginRsp.userID.toString())
         }
 
         MyApplication.getInstance()?.financialManager?.queryBusinessFp(params = params){isSuccess, respData, error ->

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

@@ -2,7 +2,7 @@ package cn.muchinfo.rma.view.base.home.hedge
 
 import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.business.hedge.HedgePlanInfo
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.HedgePlanData
 import cn.muchinfo.rma.global.data.WrStandardData
 import cn.muchinfo.rma.netManage.base.InteractiveException
@@ -104,7 +104,7 @@ class HedgePlanViewModel : BaseViewModel() {
      */
     fun queryHedegList(type: String) {
         val params = mutableMapOf<String, String>().apply {
-            put("userId", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userId", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             if (type == "1"){
                 put("HedgePlanStatus", "1,4,6")
             }else{
@@ -135,7 +135,7 @@ class HedgePlanViewModel : BaseViewModel() {
      */
     fun queryWrStandardList() {
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userid", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("status", "1")
         }
         MyApplication.getInstance()?.commodityManager?.queryWrStandard(params) { isSuccess, respData, error ->

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

@@ -1,8 +1,7 @@
 package cn.muchinfo.rma.view.base.home.reportquery
 
 import androidx.lifecycle.MutableLiveData
-import cn.muchinfo.rma.global.GlobalDataCollention
-import cn.muchinfo.rma.global.data.ContractData
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.ExposureReportData
 import cn.muchinfo.rma.global.data.FinancialReportData
 import cn.muchinfo.rma.global.data.SpotReportData
@@ -74,7 +73,7 @@ class ReportQueryViewModel : BaseViewModel(){
         }
 
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userid", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("tradedate", tradedate)
         }
 
@@ -95,7 +94,7 @@ class ReportQueryViewModel : BaseViewModel(){
      */
     fun qryReportDayFinanceKx(tradedate : String){
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userid", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("tradedate", tradedate)
         }
 
@@ -112,7 +111,7 @@ class ReportQueryViewModel : BaseViewModel(){
      */
     fun qryReportDayFinanceFp(tradedate : String){
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userid", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("tradedate", tradedate)
         }
 
@@ -129,7 +128,7 @@ class ReportQueryViewModel : BaseViewModel(){
      */
     fun qryReportMonthFinance(cycletime : String){
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userid", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("cycletime", cycletime)
         }
 
@@ -153,7 +152,7 @@ class ReportQueryViewModel : BaseViewModel(){
      */
     fun qryReportDayExposure(tradedate: String){
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userid", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("tradedate", tradedate)
         }
 
@@ -170,7 +169,7 @@ class ReportQueryViewModel : BaseViewModel(){
      */
     fun qryReportDaySpot(tradedate : String){
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userid", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("tradedate", tradedate)
         }
         MyApplication.getInstance()?.reportManager?.qryReportDaySpot(params = params){isSuccess, respData, error ->
@@ -186,7 +185,7 @@ class ReportQueryViewModel : BaseViewModel(){
      */
     fun qryReportMonthSpot(tradedate : String){
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userid", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("tradedate", tradedate)
         }
         MyApplication.getInstance()?.reportManager?.qryReportMonthSpot(params = params){isSuccess, respData, error ->
@@ -223,7 +222,7 @@ class ReportQueryViewModel : BaseViewModel(){
      */
     fun qryReportDaySpotDetail(wrstandardid : String,tradedate : String){
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userid", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("wrstandardid", wrstandardid)
             put("tradedate", tradedate)
         }
@@ -242,7 +241,7 @@ class ReportQueryViewModel : BaseViewModel(){
      */
     fun qryReportMonthSpotDetail(wrstandardid : String,cycletime : String){
         val params = mutableMapOf<String, String>().apply {
-            put("userid", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userid", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("wrstandardid", wrstandardid)
             put("cycletime", cycletime)
         }

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

@@ -11,7 +11,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
 import cn.muchinfo.rma.R
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.AmountLogData
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.*
@@ -454,7 +454,7 @@ class MoneyFlowingUI(
     private lateinit var swipeToLayout: SwipeToLoadLayout
     private lateinit var statusLayout: StatusLayout
 
-    var startTime: String = GlobalDataCollention.getInstance().oneMonth()//历史资金流水查询起始日期
+    var startTime: String = GlobalDataCollection.getInstance().oneMonth()//历史资金流水查询起始日期
     var endTime: String = TimeUtils.getNowString(SimpleDateFormat("yyyy-MM-dd"))//历史资金流水查询结束日期
 
 

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

@@ -1,7 +1,7 @@
 package cn.muchinfo.rma.view.base.home.tradingquery
 
 import androidx.lifecycle.MutableLiveData
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.AmountLogData
 import cn.muchinfo.rma.view.MyApplication
 import cn.muchinfo.rma.view.base.BaseViewModel
@@ -20,7 +20,7 @@ class TradingQueryViewModel : BaseViewModel(){
      */
     fun queryHisAmountLog(startDate : String = "",endDate : String = ""){
         val params = mutableMapOf<String, String>().apply {
-            put("accountID", GlobalDataCollention.getInstance().loginRsp.memberUserID.toString())
+            put("accountID", GlobalDataCollection.getInstance().loginRsp.memberUserID.toString())
             if (startDate.isNotEmpty()){
                 put("startDate", startDate)
             }

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

@@ -5,11 +5,9 @@ import android.os.Bundle
 import android.text.InputType.*
 import android.view.Gravity
 import android.widget.EditText
-import android.widget.Toast
 import cn.muchinfo.rma.R
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.netManage.base.InteractiveException
-import cn.muchinfo.rma.protobuf.protoclasses.SystemMI1
 import cn.muchinfo.rma.view.MainActivity
 import cn.muchinfo.rma.view.autoWidget.autoSize
 import cn.muchinfo.rma.view.autoWidget.textColorInt
@@ -189,7 +187,7 @@ class LoginActivity : BaseActivity<LoginViewModel>() {
             GlobalScope.launch(Dispatchers.Main) {
                 if (!isCompleted) {
                     viewModel.loadingDialogStatus.value =
-                        TaskUiModel.failed(InteractiveException(GlobalDataCollention.getInstance().getErrorString(err?.message ?: "")))
+                        TaskUiModel.failed(InteractiveException(GlobalDataCollection.getInstance().getErrorString(err?.message ?: "")))
 //                    ToastUtils.showLong(err?.message)
                     return@launch
                 }
@@ -199,7 +197,7 @@ class LoginActivity : BaseActivity<LoginViewModel>() {
                             viewModel.loadingDialogStatus.value =
                                 TaskUiModel.failed(
                                     InteractiveException(
-                                        GlobalDataCollention.getInstance()
+                                        GlobalDataCollection.getInstance()
                                             .getErrorString(err?.message ?: "")
                                     )
                                 )

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

@@ -1,23 +1,17 @@
 package cn.muchinfo.rma.view.base.procurement
 
 import androidx.lifecycle.MutableLiveData
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.ViewEnumUtils
 import cn.muchinfo.rma.global.data.ColumnsData
-import cn.muchinfo.rma.global.data.CommonTableData
 import cn.muchinfo.rma.global.data.ContractData
-import cn.muchinfo.rma.netManage.base.InteractiveException
-import cn.muchinfo.rma.protobuf.protoclasses.ErmcpMI1
 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.app.Constant
 
-import cn.muchinfo.rma.view.base.procurement.data.ProcurementData
-import com.blankj.utilcode.util.ToastUtils
 import mtp.polymer.com.autowidget.utils.TaskUiModel
 import java.util.*
-import kotlin.collections.ArrayList
 
 class ProcurementViewModel : BaseViewModel() {
 
@@ -106,7 +100,7 @@ class ProcurementViewModel : BaseViewModel() {
      */
     fun queryContract(type: String,contracttype : String) {
         val params = mutableMapOf<String, String>().apply {
-            put("userId", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userId", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("contracttype", contracttype)
             put("querytype", type)
         }

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

@@ -1,7 +1,7 @@
 package cn.muchinfo.rma.view.base.sale
 
 import androidx.lifecycle.MutableLiveData
-import cn.muchinfo.rma.global.GlobalDataCollention
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.ViewEnumUtils
 import cn.muchinfo.rma.global.data.ColumnsData
 import cn.muchinfo.rma.global.data.ContractData
@@ -98,7 +98,7 @@ class SaleViewModel : BaseViewModel(){
      */
     fun queryContract(type: String,contracttype : String) {
         val params = mutableMapOf<String, String>().apply {
-            put("userId", GlobalDataCollention.getInstance().loginRsp.userID.toString())
+            put("userId", GlobalDataCollection.getInstance().loginRsp.userID.toString())
             put("contracttype", contracttype)
             put("querytype", type)
         }