feat: 老的传递数据方式更改

m-user/src/main/java/com/yidianling/user/mine/AddAccountActivity.kt

@@ -9,7 +9,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
 import com.ydl.ydlcommon.data.http.RxUtils
 import com.ydl.ydlcommon.data.http.ThrowableConsumer
-import com.ydl.ydlcommon.utils.TransferCacheUtils
 import com.yidianling.common.tools.ToastUtil
 import com.yidianling.user.R
 import com.yidianling.user.databinding.UserMineActivityAddAccountBinding
@@ -62,16 +61,13 @@ class AddAccountActivity : AppCompatActivity() {
         AppDataManager.getHttp().addAccount(param)
             .compose(RxUtils.resultData())
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(Consumer {
-                if (it == null) {
+            .subscribe(Consumer {bean ->
+                if (bean == null) {
                     ToastUtil.toastShort("返回数据错误")
                 } else {
                     ToastUtil.toastShort("添加帐号成功")
                     var intent = Intent()
-                    TransferCacheUtils.putTransferData(
-                        ChooseAccountActivity.ADD_ACCOUNT_REQUEST_CODE,
-                        it
-                    )
+                    intent.putExtra(ChooseAccountActivity.ADD_ACCOUNT_REQUEST_KEY, bean)
                     setResult(Activity.RESULT_OK, intent)
                     finish()
                 }

m-user/src/main/java/com/yidianling/user/mine/ChooseAccountActivity.kt

@@ -138,18 +138,25 @@ class ChooseAccountActivity : BaseActivity() {
             TransferCacheUtils.removeTransferData(INTENT_DATA)
         }
 
-        if (requestCode == ADD_ACCOUNT_REQUEST_CODE) {//添加帐号页面返回
-            val bean: AccountBean = TransferCacheUtils.getTransferData(ADD_ACCOUNT_REQUEST_CODE) as AccountBean
-            dataLists!!.add(1, bean)
-            adapter!!.notifyDataSetChanged()
+        try {//添加帐号页面返回
+            val bean = data?.getParcelableExtra<AccountBean>(ADD_ACCOUNT_REQUEST_KEY)
+            bean?.let {
+                dataLists?.add(1, bean)
+                adapter?.notifyDataSetChanged()
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
         }
+
     }
 
     companion object {
         const val INTENT_LIST = "intent_list"
         const val INTENT_DATA = "intent_data"
         const val INTENT_DATA_REQUEST_CODE = 1024
+        //添加帐号
         const val ADD_ACCOUNT_REQUEST_CODE = 1025
+        const val ADD_ACCOUNT_REQUEST_KEY = "add_key"
         fun startForResult(activity: Activity, list: MutableList<AccountBean>, code: Int) {
             val intent = Intent(activity, ChooseAccountActivity::class.java)
             TransferCacheUtils.putTransferData(INTENT_LIST, list)

m-user/src/main/java/com/yidianling/user/mine/bean/AccountBean.kt

 package com.yidianling.user.mine.bean
 
+import android.os.Parcel
+import android.os.Parcelable
+
 /**
  * Created by jiucheng on 2018/7/13.
  * 功能：
  */
-class AccountBean {
+class AccountBean() :Parcelable{
     var id: String? = null//id
     var uid: String? = null//id
     var type: Int? = -1//1,//账号类型：1、支付宝；2、微信；3、银行卡
@@ -17,4 +20,48 @@ class AccountBean {
     var remark: String? = null//工作日9-18点，到账时间：2小时内；休息日顺延至下一个工作日
     var isDefault: Int = -1//默认账户 1默认2非默认
     var status: Int = -1//1' => "未审核", '2' => "审核中",'3' => "审核成功",'4' => "审核失败"5、
+
+    constructor(parcel: Parcel) : this() {
+        id = parcel.readString()
+        uid = parcel.readString()
+        type = parcel.readValue(Int::class.java.classLoader) as? Int
+        cashName = parcel.readString()
+        bankRealName = parcel.readString()
+        bankName = parcel.readString()
+        bankAddress = parcel.readString()
+        account = parcel.readString()
+        bankIcon = parcel.readString()
+        remark = parcel.readString()
+        isDefault = parcel.readInt()
+        status = parcel.readInt()
+    }
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeString(id)
+        parcel.writeString(uid)
+        parcel.writeValue(type)
+        parcel.writeString(cashName)
+        parcel.writeString(bankRealName)
+        parcel.writeString(bankName)
+        parcel.writeString(bankAddress)
+        parcel.writeString(account)
+        parcel.writeString(bankIcon)
+        parcel.writeString(remark)
+        parcel.writeInt(isDefault)
+        parcel.writeInt(status)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<AccountBean> {
+        override fun createFromParcel(parcel: Parcel): AccountBean {
+            return AccountBean(parcel)
+        }
+
+        override fun newArray(size: Int): Array<AccountBean?> {
+            return arrayOfNulls(size)
+        }
+    }
 }
\ No newline at end of file