风险管理7月14日提交代码-liu.bolan-千海金

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

@@ -88,15 +88,15 @@ class AccountManager {
         loginID: String,
         password: String,
         byteArray: ByteArray,
-        callback: (isCompleted: Boolean, err: Error?) -> Unit
+        callback: (isCompleted: Boolean, err: Error?,rsp :SystemMI1.LoginRsp?) -> Unit
     ) {
 
         val app = MyApplication.getInstance().guard {
-            callback(false, Error("Application未初始化"))
+            callback(false, Error("Application未初始化"),null)
             return
         }
         val tradeSocketManager = app.tradeSocketManager.guard {
-            callback(false, Error("交易链路未初始化"))
+            callback(false, Error("交易链路未初始化"),null)
             return
         }
 
@@ -115,18 +115,18 @@ class AccountManager {
                                 // 登录成功
                                 thenLogined(rst.third!!)
                             }
-                            callback(rst.first, rst.second)
+                            callback(rst.first, rst.second,rst.third)
                         }
 
                         override fun onFail(err: java.lang.Error?) {
                             // 发送数据失败
-                            callback(false, err)
+                            callback(false, err,null)
                         }
                     })
             }
 
             override fun onFail(err: java.lang.Error?) {
-                callback(false, Error("连接交易服务失败"))
+                callback(false, Error("连接交易服务失败"),null)
             }
         })
     }

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

@@ -67,7 +67,7 @@ class AccountAdapter {
                     Triple(true, null, loginRsp)
                 } else {
                     // 登录失败
-                    Triple(false, Error(loginRsp.retCode.toString()), null)
+                    Triple(false, Error(loginRsp.retCode.toString()), loginRsp)
                 }
             } catch (e: Exception) {
                 // 登录失败

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

@@ -22,8 +22,8 @@ data class MyTeamData(
     val refernum : String? = "",//推荐码
     @SerializedName("userid")
     val userid : String? = "",//用户id
-    @SerializedName("subList")
-    val subList : List<MyTeamData>? = arrayListOf(),
+    @SerializedName("SubList")
+    var subList : List<MyTeamData>? = arrayListOf(),
     @SerializedName("userinfotype")
     val userinfotype : String? = "",//用户类型 1-个人 2-企业
     var isSelect : Int = 1 //是否展开

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

@@ -0,0 +1,36 @@
+package cn.muchinfo.rma.view.autoWidget.utils;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import static android.content.Context.CLIPBOARD_SERVICE;
+
+/**
+ * Created by elha on 3/19/2018.
+ */
+public class CopyButtonLibrary {
+
+    private ClipboardManager myClipboard;
+    private ClipData myClip;
+    private Context context;
+    private TextView textView;
+
+    public CopyButtonLibrary(Context context, TextView textView) {
+        this.context = context;
+        this.textView = textView;
+    }
+
+    public void init() {
+        myClipboard = (ClipboardManager) context.getSystemService(CLIPBOARD_SERVICE);
+        String text;
+        text = textView.getText().toString();
+
+        myClip = ClipData.newPlainText("text", text);
+        myClipboard.setPrimaryClip(myClip);
+
+        Toast.makeText(context, text + " 已复制", Toast.LENGTH_SHORT).show();
+    }
+
+}

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

@@ -7,12 +7,12 @@ object Constant {
      * 获取基础url的接口
      */
 //    const val baseurl = "http://103.40.249.123:8280/cfg?key=mtp_20"//千海金外盘
-    const val baseurl = "http://103.40.249.127:28280/cfg?key=mtp_20"
+//    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.30.125:8080/cfg?key=test_125"//李倩千海金 18611112222
 //    const val baseurl = "http://192.168.31.220:8080/cfg?key=test_220"//李倩千海金 18611112222
-//      const val baseurl = "http://192.168.30.211:8080/cfg?key=test_211"// 瑶姐
+      const val baseurl = "http://192.168.30.211:8080/cfg?key=test_211"// 瑶姐
 //          const val baseurl = "http://192.168.31.107:8080/cfg?key=test_107"// 瑶姐 千海金 13760119855
 //    const val baseurl = "http://192.168.31.175:8080/cfg?key=test_175" // 8888  123123
 //    const val baseurl = "http://192.168.31.223:8080/cfg?key=test_223"

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

@@ -445,17 +445,26 @@ class LoginActivity : BaseActivity<LoginViewModel>(), UserPopupWindow.OnClearAcc
             code = loginCodeEditText!!.text.toString().trim(),
             password = loginPwdEditText!!.text.toString(),
             byteArray = collectInfo ?: byteArrayOf()
-        ) { isCompleted, err ->
+        ) { isCompleted, err,rsp ->
             GlobalScope.launch(Dispatchers.Main) {
                 if (!isCompleted) {
-                    viewModel.loadingDialogStatus.value =
-                        TaskUiModel.failed(
-                            InteractiveException(
-                                GlobalDataCollection.instance?.getErrorString(
-                                    err?.message ?: "登陆失败"
-                                ) ?: "登陆失败"
+                    if (err?.message == "1003"){
+                        viewModel.loadingDialogStatus.value =
+                            TaskUiModel.failed(
+                                InteractiveException(
+                                   "还剩" + rsp?.pwdWrongLockCnt?.minus(rsp.pwdWrongCnt) + "次错误机会，账号或密码不匹配达到" + rsp?.pwdWrongLockCnt + "次，登录账号将锁定" + rsp?.loginLockHourNum + "小时。请联系管理员处理。"
+                                )
                             )
-                        )
+                    }else{
+                        viewModel.loadingDialogStatus.value =
+                            TaskUiModel.failed(
+                                InteractiveException(
+                                    GlobalDataCollection.instance?.getErrorString(
+                                        err?.message ?: "登陆失败"
+                                    ) ?: "登陆失败"
+                                )
+                            )
+                    }
                     return@launch
                 }
 

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

@@ -4,6 +4,7 @@ import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.UserNodeCfgAndStatusData
 import cn.muchinfo.rma.netManage.base.InteractiveException
+import cn.muchinfo.rma.protobuf.protoclasses.SystemMI1
 import cn.muchinfo.rma.view.MyApplication
 import cn.muchinfo.rma.view.autoWidget.guard
 import cn.muchinfo.rma.view.autoWidget.toArrayList
@@ -37,10 +38,10 @@ class LoginViewModel : BaseViewModel() {
         code: String,
         password: String,
         byteArray: ByteArray,
-        callback: (isCompleted: Boolean, err: Error?) -> Unit
+        callback: (isCompleted: Boolean, err: Error?,rsp : SystemMI1.LoginRsp?) -> Unit
     ) {
         val accountManager = MyApplication.getInstance()?.accountManager.guard {
-            callback(false, Error("对象未初始化"))
+            callback(false, Error("对象未初始化"),null)
             return
         }
 

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

@@ -148,7 +148,7 @@ class RegisterViewModel : BaseViewModel(){
             })
     }
 
-    //企业用户注册请求 isaudit 0-否，1-是 企业用户需要注册 userinfotype  1-个人，2-企业 sid 获取图形验证码时传的当前时间戳：
+    //个人用户注册请求 isaudit 0-否，1-是 企业用户需要注册 userinfotype  1-个人，2-企业 sid 获取图形验证码时传的当前时间戳：
     fun requestPersonalInfo(listAgreementID : List<Int>,vcode : String,refernum : String = "",loginpwd : String,mobilephone : String,
                               isSuccess: (isCompleted: Boolean) -> Unit){
         loadingDialogStatus.value = TaskUiModel.inFlight()
@@ -191,6 +191,7 @@ class RegisterViewModel : BaseViewModel(){
         }else{
             val json = JSONObject()
             json["vcode"] = vcode
+            json["listAgreementID"] = listAgreementID
             json["refernum"] = refernum
             json["loginpwd"] = EncodeUtils.base64Encode(loginpwd)
             json["mobilephone"] = mobilephone

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

@@ -173,21 +173,37 @@ class SeaKingMainFragment : BaseFragment<SeaKingMainViewModel>() {
                                         visibility = View.GONE
 
                                         onThrottleFirstClick {//新增
-                                            val intent = Intent()
-                                            intent.putExtra("type","1")
-                                            intent.putExtra("data",BrokerApplyData())
-                                            intent.setClass(context,ApplyPromotionCodeActivity::class.java)
-                                            ActivityUtils.startActivity(intent)
+                                            if (viewModel.brokerApplyData.value?.applystatus.isNullOrEmpty()){
+                                                val intent = Intent()
+                                                intent.putExtra("type","1")
+                                                intent.putExtra("data",BrokerApplyData())
+                                                intent.setClass(context,ApplyPromotionCodeActivity::class.java)
+                                                ActivityUtils.startActivity(intent)
+                                            }else{
+                                                if (viewModel.brokerApplyData.value?.applystatus == "1" || viewModel.brokerApplyData.value?.applystatus == "2"){//只展示
+                                                    val intent = Intent()
+                                                    intent.putExtra("type","3")
+                                                    intent.putExtra("data",viewModel.brokerApplyData.value)
+                                                    intent.setClass(context,ApplyPromotionCodeActivity::class.java)
+                                                    ActivityUtils.startActivity(intent)
+                                                }else if (viewModel.brokerApplyData.value?.applystatus == "3" || viewModel.brokerApplyData.value?.applystatus == "4"){//可修改
+                                                    val intent = Intent()
+                                                    intent.putExtra("type","2")
+                                                    intent.putExtra("data",viewModel.brokerApplyData.value)
+                                                    intent.setClass(context,ApplyPromotionCodeActivity::class.java)
+                                                    ActivityUtils.startActivity(intent)
+                                                }
+                                            }
                                         }
 
                                         viewModel.brokerApplyData.bindOptional(context){
                                             if (GlobalDataCollection.instance?.loginQueryData?.userInfo?.userinfotype == 2){
                                                 visibility = View.GONE
                                             }else{
-                                                if (it?.refernum.isNullOrEmpty()){
-                                                    visibility = View.VISIBLE
-                                                }else{
+                                                if (it?.applystatus == "2"){
                                                     visibility = View.GONE
+                                                }else{
+                                                    visibility = View.VISIBLE
                                                 }
                                             }
                                         }
@@ -230,10 +246,10 @@ class SeaKingMainFragment : BaseFragment<SeaKingMainViewModel>() {
                                             if (GlobalDataCollection.instance?.loginQueryData?.userInfo?.userinfotype == 2){
                                                 visibility = View.GONE
                                             }else{
-                                                if (it?.refernum.isNullOrEmpty()){
-                                                    visibility = View.GONE
-                                                }else{
+                                                if (it?.applystatus == "2"){
                                                     visibility = View.VISIBLE
+                                                }else{
+                                                    visibility = View.GONE
                                                 }
                                             }
                                         }
@@ -863,7 +879,7 @@ class SeaKingMainFragment : BaseFragment<SeaKingMainViewModel>() {
                             emptyView()
 
                             textView {
-                                text = "如有疑问请联系客服电话"
+                                text = "如有疑问请联系经纪人"
                                 textSizeAuto = 29
                                 textColorInt = R.color.rma_hint_text_color_ccc
                             }.lparams(wrapContent, wrapContent)

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

@@ -23,6 +23,7 @@ import cn.muchinfo.rma.view.autoWidget.photopicter.utils.ImageCaptureManager
 import cn.muchinfo.rma.view.base.BaseActivity
 import cn.muchinfo.rma.view.base.app.Constant
 import cn.muchinfo.rma.view.base.future.trade.itemView
+import cn.muchinfo.rma.view.base.home.contract.emptyView
 import cn.muchinfo.rma.view.base.home.contract.verticalEmptyView
 import com.alibaba.fastjson.JSON
 import com.blankj.utilcode.util.ActivityUtils
@@ -177,13 +178,85 @@ class ApplyPromotionCodeActivity : BaseActivity<MyPromotionCodeViewModel>() {
             itemView()
 
             linearLayout {
+                if (type == "1"){
+                    visibility = View.GONE
+                }else{
+                    visibility = View.VISIBLE
+                }
+                background = resources.getDrawable(R.color.white)
+                gravity = Gravity.CENTER_VERTICAL
+
+                linearLayout {
+                    gravity = Gravity.CENTER_VERTICAL
+                    textView {
+                        text = "审核状态"
+                        textSizeAuto = 31
+                        textColorInt = R.color.rma_black_33
+                    }.lparams(autoSize(260), wrapContent) {
+                        marginStart = autoSize(36)
+                    }
+                }.lparams(autoSize(260), autoSize(132))
+
+                verticalLayout {
+                    gravity = Gravity.CENTER_VERTICAL
+                    linearLayout {
+                        gravity = Gravity.CENTER_VERTICAL
+                        emptyView()
+                        if (data.applystatus == "3"){
+                            visibility = View.GONE
+
+                        }else{
+                            visibility = View.VISIBLE
+                        }
+                    }.lparams(matchParent, autoSize(45))
+                    linearLayout {
+                        gravity = Gravity.CENTER_VERTICAL
+                        emptyView()
+                        textView {
+                            if (data.applystatus == "1"){
+                                text = "待审核"
+                            }else if (data.applystatus == "2"){
+                                text = "审核通过"
+                            }else if (data.applystatus == "3"){
+                                text = "审核拒绝"
+                            }else if (data.applystatus == "2"){
+                                text = "处理失败"
+                            }
+                            textSizeAuto = 31
+                            textColorInt = R.color.rma_hint_text_color_ccc
+                        }.lparams(wrapContent, wrapContent){
+                            marginEnd = autoSize(36)
+                        }
+                    }.lparams(matchParent, autoSize(65))
+                    linearLayout {
+                        gravity = Gravity.CENTER_VERTICAL
+                        emptyView()
+                        textView {
+                            if (data.applystatus == "3"){
+                                visibility = View.VISIBLE
+                                text = data.auditremark
+                            }else{
+                                visibility = View.GONE
+                            }
+                            textSizeAuto = 31
+                            textColorInt = R.color.rma_red_color
+                        }.lparams(wrapContent, wrapContent){
+                            marginEnd = autoSize(36)
+                        }
+                    }.lparams(matchParent, autoSize(65))
+                }.lparams(matchParent, autoSize(132))
+            }.lparams(matchParent, autoSize(132))
+
+            itemView()
+
+            linearLayout {
                 background = resources.getDrawable(R.color.white)
                 gravity = Gravity.CENTER_VERTICAL
 
                 linearLayout {
                     gravity = Gravity.CENTER_VERTICAL
                     textView {
-                        text = "上传证件照"
+                        text = "身份证图片"
                         textSizeAuto = 31
                         textColorInt = R.color.rma_black_33
                     }.lparams(autoSize(260), wrapContent) {

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

@@ -5,7 +5,9 @@ import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.AreaFinanceConfigData
 import cn.muchinfo.rma.global.data.BrokerRewardLogData
 import cn.muchinfo.rma.view.MyApplication
+import cn.muchinfo.rma.view.autoWidget.toArrayList
 import cn.muchinfo.rma.view.base.BaseViewModel
+import com.blankj.utilcode.util.TimeUtils
 import mtp.polymer.com.autowidget.utils.TaskUiModel
 
 /**
@@ -44,6 +46,9 @@ class MyRewardViewModel : BaseViewModel(){
 
         MyApplication.getInstance()?.accountManager?.queryBrokerRewardLog(params = params){isSuccess, respData, error ->
             if (isSuccess){
+                respData?.toArrayList()?.sortWith(Comparator { t1, t2 ->
+                    (TimeUtils.string2Millis(t2.createtime) - TimeUtils.string2Millis(t1.createtime)).toInt()
+                })
                 rewardDataList.postValue(respData)
             }
         }

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

@@ -3,6 +3,7 @@ package cn.muchinfo.rma.view.base.main.reward
 import android.os.Bundle
 import android.view.Gravity
 import cn.muchinfo.rma.R
+import cn.muchinfo.rma.global.toPercentage
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.base.BaseActivity
@@ -135,11 +136,8 @@ class RewardRuleActivity : BaseActivity<MyRewardViewModel>(){
                 linearLayout {
                     gravity = Gravity.CENTER
                     textView {
-                        viewModel.areaFinanceConfigData.bindOptional(context){data ->
-                            val data = data?.find { it?.consumptionmodel == "1" }
-                            if (data?.consumptiondirectreward.isNullOrEmpty().not()){
-                                text = data?.consumptiondirectreward + "元"
-                            }
+                        viewModel.areaFinanceConfigData.bindOptional(context){
+                            text = it?.get(0)?.promotionvalue + "元"
                         }
 
                         textSizeAuto = 31
@@ -210,11 +208,8 @@ class RewardRuleActivity : BaseActivity<MyRewardViewModel>(){
                 linearLayout {
                     gravity = Gravity.CENTER
                     textView {
-                        viewModel.areaFinanceConfigData.bindOptional(context){data ->
-                            val data = data?.find { it?.consumptionmodel == "2" }
-                            if (data?.promotionvalue.isNullOrEmpty().not()){
-                                text = data?.consumptiondirectreward + "%"
-                            }
+                        viewModel.areaFinanceConfigData.bindOptional(context){
+                            text = it?.get(0)?.consumptiondirectreward?.toPercentage()
                         }
                         textSizeAuto = 31
                         textColorInt = R.color.rma_blue_color
@@ -228,11 +223,8 @@ class RewardRuleActivity : BaseActivity<MyRewardViewModel>(){
                 linearLayout {
                     gravity = Gravity.CENTER
                     textView {
-                         viewModel.areaFinanceConfigData.bindOptional(context){data ->
-                            val data = data?.find { it?.consumptionmodel == "1" }
-                            if (data?.consumptionindirectreward.isNullOrEmpty().not()){
-                                text = data?.consumptionindirectreward + "%"
-                            }
+                         viewModel.areaFinanceConfigData.bindOptional(context){
+                             text = it?.get(0)?.consumptionindirectreward?.toPercentage()
                         }
                         textSizeAuto = 31
                         textColorInt = R.color.rma_blue_color

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

@@ -57,9 +57,9 @@ class RewardViewHolder(private val activity : AppCompatActivity) : BaseViewHolde
                             if (it?.rewardtype == "1"){
                                 text = "推广"
                             }else if (it?.rewardtype == "2"){
-                                text = "消费1级"
+                                text = "消费"
                             }else if (it?.rewardtype == "3"){
-                                text = "消费2级"
+                                text = "消费"
                             }
                         }
                         textSizeAuto = 29

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

@@ -1,41 +1,39 @@
 package cn.muchinfo.rma.view.base.main.team
 
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
 import android.os.Bundle
 import android.text.InputType
 import android.text.TextUtils
 import android.view.Gravity
-import android.view.KeyEvent
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import android.widget.EditText
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat.getSystemService
 import androidx.lifecycle.MutableLiveData
 import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
 import cn.muchinfo.rma.R
-import cn.muchinfo.rma.global.GlobalDataCollection
-import cn.muchinfo.rma.global.data.AccMgrLoginUserData
 import cn.muchinfo.rma.global.data.MyTeamData
 import cn.muchinfo.rma.global.data.MyTeamOrderData
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.*
+import cn.muchinfo.rma.view.autoWidget.utils.CopyButtonLibrary
 import cn.muchinfo.rma.view.base.BaseActivity
-import cn.muchinfo.rma.view.base.app.Constant
-import cn.muchinfo.rma.view.base.home.accountmanager.accountviewholder.AccountManagerViewHolder
 import cn.muchinfo.rma.view.base.home.contract.emptyView
 import com.blankj.utilcode.util.ConvertUtils
 import com.qmuiteam.qmui.util.QMUIDisplayHelper
 import com.qmuiteam.qmui.widget.tab.QMUITabIndicator
 import com.qmuiteam.qmui.widget.tab.QMUITabSegment
 import mtp.polymer.com.autowidget.adapter.BaseAdapter
-import mtp.polymer.com.autowidget.utils.TaskUiModel
-import mtp.polymer.com.autowidget.utils.bindTaskStatus
 import org.jetbrains.anko.*
-import org.jetbrains.anko.sdk25.coroutines.textChangedListener
 import org.jetbrains.anko.support.v4.viewPager
 
+
 /**
  * 我的团队页面
  */
@@ -157,6 +155,7 @@ class TeamMemberUI(private val activity : AppCompatActivity,private val viewMode
     private lateinit var swipeToLayout: SwipeToLoadLayout
     private lateinit var statusLayout: StatusLayout
 
+    lateinit var refurem : TextView
     //登录账户是否可选择
     val isClickSelect: MutableLiveData<Int> = MutableLiveData<Int>().apply { value = 1 }
 
@@ -184,8 +183,15 @@ class TeamMemberUI(private val activity : AppCompatActivity,private val viewMode
                 }
 
                 textView {
-                    viewModel.loginQueryData.bindOptional(context) {
-                        text = "(" + it?.userInfo?.customername + ")"
+                    viewModel.myTeamMemberDataList.bindOptional(context) {
+                        var number = 0
+                        it?.get(0)?.subList?.forEach {
+                            number += 1
+                            it.subList?.forEach {
+                                number += 1
+                            }
+                        }
+                        text =  it?.get(0)?.mobile + "(" + number + ")"
                     }
                     textColorInt = R.color.rma_black_33
                     maxLines = 1
@@ -207,6 +213,10 @@ class TeamMemberUI(private val activity : AppCompatActivity,private val viewMode
 
                 linearLayout {
                     gravity = Gravity.CENTER_VERTICAL
+                    onThrottleFirstClick {
+                        val copyButtonLibrary = CopyButtonLibrary(context,refurem)
+                        copyButtonLibrary.init()
+                    }
                     backgroundDrawable =
                         createRoundRectDrawable("#DAEDFF", 45)
                     imageView {
@@ -224,13 +234,16 @@ class TeamMemberUI(private val activity : AppCompatActivity,private val viewMode
                     }
 
                     textView {
-                        text = "--"
+                        refurem = this
+                        viewModel.myTeamMemberDataList.bindOptional(context) {
+                            text = it?.get(0)?.refernum
+                        }
                         textSizeAuto = 29
                         textColorInt = R.color.rma_blue_color
                     }.lparams(wrapContent, wrapContent){
                         marginStart = autoSize(15)
                     }
-                }.lparams(autoSize(312), autoSize(60))
+                }.lparams(autoSize(350), autoSize(60))
 
             }.lparams(matchParent, autoSize(96))
 
@@ -270,7 +283,7 @@ class TeamMemberUI(private val activity : AppCompatActivity,private val viewMode
                         swipeToLayout.finishRefresh()
                     }
                     statusLayout.showSuccess()
-                    teamMemberAdapter.setNewData(it)
+                    teamMemberAdapter.setNewData(it?.get(0)?.subList)
                 }
             }
         }
@@ -281,6 +294,8 @@ class TeamMemberUI(private val activity : AppCompatActivity,private val viewMode
 
 class TeamOrderUI(private val activity : AppCompatActivity,private val viewModel: MyTeamViewModel){
 
+    var page : Int = 1
+
     lateinit var inputText : EditText
 
     private lateinit var swipeToLayout: SwipeToLoadLayout
@@ -292,7 +307,7 @@ class TeamOrderUI(private val activity : AppCompatActivity,private val viewModel
 
     val root = _FrameLayout(activity).apply {
         verticalLayout {
-            viewModel.queryMyTeamOrder()
+            viewModel.queryMyTeamOrder(page = page)
             linearLayout {
                 gravity = Gravity.CENTER_VERTICAL
                 linearLayout {
@@ -327,7 +342,7 @@ class TeamOrderUI(private val activity : AppCompatActivity,private val viewModel
 //                            }
 //
 //                        })
-                        setPadding(0,20,0,15)
+                        setPadding(0,10,0,15)
                         setInputType(InputType.TYPE_CLASS_TEXT)
                         setSingleLine(true)
                         setImeOptions(EditorInfo.IME_ACTION_SEND)
@@ -337,9 +352,9 @@ class TeamOrderUI(private val activity : AppCompatActivity,private val viewModel
                         hintColorStr = "#666666"
                         textSizeAuto = 28
                         textColorStr = "#000000"
-                    }.lparams(matchParent, autoSize(67))
+                    }.lparams(matchParent, autoSize(80))
 
-                }.lparams(0, autoSize(67), 1f) {
+                }.lparams(0, autoSize(80), 1f) {
                     marginStart = autoSize(36)
                 }
 
@@ -348,22 +363,22 @@ class TeamOrderUI(private val activity : AppCompatActivity,private val viewModel
                         if (inputText.text.isNullOrEmpty()){
                             return@onThrottleFirstClick
                         }
-                        viewModel.queryMyTeamOrder(inputText.text.toString())
+                        viewModel.queryMyTeamOrderByfiltername(inputText.text.toString())
                     }
                     gravity = Gravity.CENTER
                     text = "查询"
                     textColorInt = R.color.white
                     background = resources.getDrawable(R.color.rma_blue_color)
                     textSizeAuto = 32
-                }.lparams(autoSize(144), autoSize(67)) {
+                }.lparams(autoSize(144), autoSize(80)) {
                     marginEnd = autoSize(36)
                 }
 
             }.lparams(matchParent, autoSize(100))
 
-            verticalLayout {
+            linearLayout {
                 verticalLayout {
-                    gravity = Gravity.RIGHT
+                    gravity = Gravity.LEFT
                     textView {
                         text = "账号"
                         textSizeAuto = 28
@@ -438,7 +453,7 @@ class TeamOrderUI(private val activity : AppCompatActivity,private val viewModel
             statusLayout(contentBlock = {
                 statusLayout = this
                 setRetryAction {
-                    viewModel.queryMyTeamOrder()
+                    viewModel.queryMyTeamOrder(page = page)
                 }
 //                bindTaskStatus(viewModule.status)
                 swipeToLoadLayout {
@@ -446,10 +461,11 @@ class TeamOrderUI(private val activity : AppCompatActivity,private val viewModel
                     setEnableRefresh(true)
                     setEnableLoadMore(true)
                     setOnRefreshListener {
-                        viewModel.queryMyTeamOrder()
+                        page = 1
+                        viewModel.queryMyTeamOrder(page = page)
                     }
                     setOnLoadMoreListener {
-                        viewModel.queryMyTeamOrder()
+                        viewModel.queryMyTeamOrder(page = page)
                     }
                     setEnableScrollContentWhenLoaded(false)
                     setEnableLoadMoreWhenContentNotFull(false)
@@ -469,6 +485,7 @@ class TeamOrderUI(private val activity : AppCompatActivity,private val viewModel
                     if (swipeToLayout.getIsRefreshing()) {
                         swipeToLayout.finishRefresh()
                     }
+                    page = it?.size?.div(20) ?: 1
                     statusLayout.showSuccess()
                     teamOredrAdapter.setNewData(it)
                 }

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

@@ -2,6 +2,7 @@ package cn.muchinfo.rma.view.base.main.team
 
 import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.global.GlobalDataCollection
+import cn.muchinfo.rma.global.data.AccMgrLoginUserData
 import cn.muchinfo.rma.global.data.MyTeamData
 import cn.muchinfo.rma.global.data.MyTeamOrderData
 import cn.muchinfo.rma.global.data.account.LoginQueryData
@@ -52,9 +53,33 @@ class MyTeamViewModel : BaseViewModel(){
     }
 
     /**
+     * 账户管理-业务账户的item点击展开
+     * @param index Int
+     */
+    fun setOnTeamClick(mobile: String){
+        val datanewSonList = arrayListOf<MyTeamData>()
+        val datanewList = arrayListOf<MyTeamData>()
+        myTeamMemberDataList.value?.get(0)?.subList?.forEach {
+            if (mobile == it.mobile) {
+                if (it.isSelect == 0) {
+                    datanewSonList.add(it.copy(isSelect = 1))
+                } else {
+                    datanewSonList.add(it.copy(isSelect = 0))
+                }
+            } else {
+                datanewSonList.add(it)
+            }
+        }
+        val data = myTeamMemberDataList.value?.get(0)
+        data?.subList = datanewSonList
+        datanewList.add(data ?: MyTeamData())
+        myTeamMemberDataList.postValue(datanewList)
+    }
+
+    /**
      * 查询我的团队列表（通过页数查询）
      */
-    fun queryMyTeamOrder(){
+    fun queryMyTeamOrder(page : Int){
         var size: Int
         if (myTeamOrderDataList.value?.size == 0 || myTeamOrderDataList?.value?.size  ?: 0 < 20){
             size = 1
@@ -63,14 +88,19 @@ class MyTeamViewModel : BaseViewModel(){
         }
         val params = mutableMapOf<String,String>().apply {
             put("userid",GlobalDataCollection.instance?.loginRsp?.userID?.toString() ?: "")
-            put("page",size.toString())
+            put("page",page.toString())
             put("pagesize","20")
         }
         MyApplication.getInstance()?.accountManager?.queryMyTeamOrder(params = params){isSuccess, respData, error ->
             if (isSuccess){
-                val newDataList = myTeamOrderDataList.value?.toArrayList()
-                newDataList?.addAll(respData ?: arrayListOf())
-                myTeamOrderDataList.postValue(newDataList)
+                if (page == 1){
+                    myTeamOrderDataList.postValue(respData)
+                }else{
+                    val newDataList = arrayListOf<MyTeamOrderData>()
+                    newDataList.addAll(myTeamOrderDataList.value?.toArrayList() ?: arrayListOf())
+                    newDataList.addAll(respData ?: arrayListOf())
+                    myTeamOrderDataList.postValue(newDataList)
+                }
             }
         }
     }
@@ -78,10 +108,10 @@ class MyTeamViewModel : BaseViewModel(){
     /**
      * 查询我的团队列表（通过模糊查询）
      */
-    fun queryMyTeamOrder(filtername : String){
+    fun queryMyTeamOrderByfiltername(filtername : String = ""){
         val params = mutableMapOf<String,String>().apply {
             put("userid",GlobalDataCollection.instance?.loginRsp?.userID?.toString() ?: "")
-            put("filtername","filtername")
+            put("filtername",filtername)
         }
         MyApplication.getInstance()?.accountManager?.queryMyTeamOrder(params = params){isSuccess, respData, error ->
             if (isSuccess){

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

@@ -33,7 +33,7 @@ class TeamMemberViewHolder(private val activity : AppCompatActivity,private val
                 gravity = Gravity.CENTER_VERTICAL
                 imageView {
                     onThrottleFirstClick {
-//                        viewModel.setOnLoginAccountHedgeClick(dataIndex)
+                        viewModel.setOnTeamClick(data.value?.mobile ?: "")
                     }
                     data.bindOptional(context) {
                         if (it?.isSelect == 0) {

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

@@ -1,5 +1,6 @@
 package cn.muchinfo.rma.view.base.main.team
 
+import android.text.TextUtils
 import android.view.Gravity
 import androidx.appcompat.app.AppCompatActivity
 import cn.muchinfo.rma.R
@@ -22,9 +23,9 @@ class TeamOrderViewHolder(private val activity : AppCompatActivity,private val v
     override val itemSize: IntArray = intArrayOf(matchParent, wrapContent)
 
     override fun _FrameLayout.createContentView() {
-        verticalLayout {
+        linearLayout {
             verticalLayout {
-                gravity = Gravity.RIGHT
+                gravity = Gravity.LEFT
                 textView {
                     data.bindOptional(context){
                         text = it?.accountid//好像接口没有提供账号先显示这个吧
@@ -56,6 +57,8 @@ class TeamOrderViewHolder(private val activity : AppCompatActivity,private val v
                         text = it?.goodsname
                     }
                     textSizeAuto = 32
+                    singleLine = true
+                    ellipsize = TextUtils.TruncateAt.END
                     textColorInt = R.color.rma_black_33
                 }.lparams(wrapContent, wrapContent){
                     topMargin = autoSize(30)
@@ -74,7 +77,6 @@ class TeamOrderViewHolder(private val activity : AppCompatActivity,private val v
                     textSizeAuto = 32
                     textColorInt = R.color.rma_red_color
                 }.lparams(wrapContent, wrapContent){
-                    topMargin = autoSize(30)
                 }
             }.lparams(0, autoSize(130),2f)
 
@@ -97,9 +99,7 @@ class TeamOrderViewHolder(private val activity : AppCompatActivity,private val v
                     }
                     textSizeAuto = 32
                     textColorInt = R.color.rma_red_color
-                }.lparams(wrapContent, wrapContent){
-                    topMargin = autoSize(30)
-                }
+                }.lparams(wrapContent, wrapContent)
             }.lparams(0, autoSize(130),2f)
 
             verticalLayout {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/platinumtreasure/trade/PlatinumMoneyUI.kt

@@ -354,7 +354,7 @@ class MoneyFlowingUI(private val activity: AppCompatActivity,private val viewMod
                         topMargin = autoSize(30)
                         marginStart = autoSize(36)
                     }
-                }.lparams(0, autoSize(96),1f)
+                }.lparams(0, autoSize(96),2f)
 
                 verticalLayout {
                     gravity = Gravity.CENTER