Skip to content

Y
YDL-Component-Medical
Commit 752ca100 by 刘鹏
Options

Merge branch 'feat/lp/lp_addaccount' into 'release' 

删除银行卡提现方式

See merge request app_android_lib/YDL-Component!249
parents 446506b0 e587cb7a
Showing with 237 additions and 308 deletions
m-user/build.gradle
...@@ -35,7 +35,9 @@ android { ...@@ -35,7 +35,9 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
dataBinding {
enabled true
}
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
......
m-user/src/main/AndroidManifest.xml
...@@ -157,10 +157,10 @@ ...@@ -157,10 +157,10 @@
android:name=".mine.EditAccountActivity" android:name=".mine.EditAccountActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme" /> android:theme="@style/platform_NoTitleTheme" />
<!--添加提现账号-->
<activity <activity
android:name=".mine.AddAccountActivity" android:name=".mine.AddAccountActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/platform_NoTitleTheme" />
<activity <activity
android:name=".mine.RechargeResultActivity" android:name=".mine.RechargeResultActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
......
m-user/src/main/java/com/yidianling/user/mine/AddAccountActivity.kt
package com.yidianling.user.mine package com.yidianling.user.mine
import android.annotation.SuppressLint
import android.app.Activity import android.app.Activity
import android.content.Intent import android.content.Intent
import androidx.fragment.app.Fragment import android.os.Bundle
import androidx.viewpager.widget.ViewPager import android.text.TextUtils
import android.view.View import androidx.appcompat.app.AppCompatActivity
import com.ydl.ydlcommon.adapter.FragmentWithTabPagerAdapter import androidx.databinding.DataBindingUtil
import com.ydl.ydlcommon.base.BaseActivity import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.bean.StatusBarOptions import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.ydl.ydlcommon.view.widgets.TopTabSelectLayout import com.yidianling.common.tools.ToastUtil
import com.yidianling.user.R import com.yidianling.user.R
import com.yidianling.user.mine.fragment.AddAliAccountFragment import com.yidianling.user.databinding.UserMineActivityAddAccountBinding
import com.yidianling.user.mine.fragment.AddBankAccountFragment import com.yidianling.user.mine.bean.AddAccountCmd
import com.yidianling.user.mine.data.AppDataManager
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.functions.Consumer
import kotlinx.android.synthetic.main.user_mine_activity_add_account.* import kotlinx.android.synthetic.main.user_mine_activity_add_account.*
/** /**
* 添加提现帐号 * @author liupeng
*/ * 添加提现账号
class AddAccountActivity : BaseActivity() { * */
class AddAccountActivity : AppCompatActivity() {
private lateinit var binding: UserMineActivityAddAccountBinding
companion object { companion object {
fun startForResult(activity: Activity, request: Int) { fun startForResult(activity: Activity, request: Int) {
...@@ -26,47 +33,48 @@ class AddAccountActivity : BaseActivity() { ...@@ -26,47 +33,48 @@ class AddAccountActivity : BaseActivity() {
} }
} }
override fun getStatusViewOptions(): StatusBarOptions { override fun onCreate(savedInstanceState: Bundle?) {
return StatusBarOptions(true, true) super.onCreate(savedInstanceState)
} binding = DataBindingUtil.setContentView(this, R.layout.user_mine_activity_add_account)
btn_ensure.setOnClickListener {
override fun layoutResId(): Int { saveAccount()
return R.layout.user_mine_activity_add_account }
} }
override fun initDataAndEvent() { /**
var titles = mutableListOf<String>() * 保存支付宝帐号
titles.add("支付宝") */
titles.add("银行卡") @SuppressLint("CheckResult")
var fragments = mutableListOf<Fragment>() private fun saveAccount() {
fragments.add(AddAliAccountFragment()) var account = et_account.text.trim().toString()
fragments.add(AddBankAccountFragment()) if (TextUtils.isEmpty(account)) {
var adapter = FragmentWithTabPagerAdapter(supportFragmentManager, titles, fragments) ToastUtil.toastShort("支付宝帐号不能为空")
top_layout.setButtonTitle("支付宝", "银行卡") return
top_layout.setSelectIndex(0) }
top_layout.setLineViewVisible(View.GONE) var name = et_name.text.trim().toString()
top_layout.setOnSelectTabClickListener(object : TopTabSelectLayout.OnSelectTabClickListener { if (TextUtils.isEmpty(name)) {
override fun selectTabClickListener(index: Int) { ToastUtil.toastShort("姓名不能为空")
viewpager.currentItem = index return
} }
override fun onReturnClickListener() {
}
})
viewpager.currentItem = 0
viewpager.adapter = adapter
viewpager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
}
override fun onPageSelected(position: Int) {
top_layout.setSelectIndex(position)
}
override fun onPageScrollStateChanged(state: Int) {
} var param = AddAccountCmd(name, account, "1")
}) AppDataManager.getHttp().addAccount(param)
.compose(RxUtils.resultData())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(Consumer {bean ->
if (bean == null) {
ToastUtil.toastShort("返回数据错误")
} else {
ToastUtil.toastShort("添加帐号成功")
var intent = Intent()
intent.putExtra(ChooseAccountActivity.ADD_ACCOUNT_REQUEST_KEY, bean)
setResult(Activity.RESULT_OK, intent)
finish()
}
}, object : ThrowableConsumer() {
override fun accept(msg: String) {
ToastUtil.toastShort(msg)
}
})
} }
} }
\ No newline at end of file
m-user/src/main/java/com/yidianling/user/mine/ChooseAccountActivity.kt
...@@ -138,18 +138,25 @@ class ChooseAccountActivity : BaseActivity() { ...@@ -138,18 +138,25 @@ class ChooseAccountActivity : BaseActivity() {
TransferCacheUtils.removeTransferData(INTENT_DATA) TransferCacheUtils.removeTransferData(INTENT_DATA)
} }
if (requestCode == ADD_ACCOUNT_REQUEST_CODE) {//添加帐号页面返回 try {//添加帐号页面返回
val bean: AccountBean = TransferCacheUtils.getTransferData(ADD_ACCOUNT_REQUEST_CODE) as AccountBean val bean = data?.getParcelableExtra<AccountBean>(ADD_ACCOUNT_REQUEST_KEY)
dataLists!!.add(1, bean) bean?.let {
adapter!!.notifyDataSetChanged() dataLists?.add(1, bean)
adapter?.notifyDataSetChanged()
}
} catch (e: Exception) {
e.printStackTrace()
} }
} }
companion object { companion object {
const val INTENT_LIST = "intent_list" const val INTENT_LIST = "intent_list"
const val INTENT_DATA = "intent_data" const val INTENT_DATA = "intent_data"
const val INTENT_DATA_REQUEST_CODE = 1024 const val INTENT_DATA_REQUEST_CODE = 1024
//添加帐号
const val ADD_ACCOUNT_REQUEST_CODE = 1025 const val ADD_ACCOUNT_REQUEST_CODE = 1025
const val ADD_ACCOUNT_REQUEST_KEY = "add_key"
fun startForResult(activity: Activity, list: MutableList<AccountBean>, code: Int) { fun startForResult(activity: Activity, list: MutableList<AccountBean>, code: Int) {
val intent = Intent(activity, ChooseAccountActivity::class.java) val intent = Intent(activity, ChooseAccountActivity::class.java)
TransferCacheUtils.putTransferData(INTENT_LIST, list) TransferCacheUtils.putTransferData(INTENT_LIST, list)
......
m-user/src/main/java/com/yidianling/user/mine/bean/AccountBean.kt
package com.yidianling.user.mine.bean package com.yidianling.user.mine.bean
import android.os.Parcel
import android.os.Parcelable
/** /**
* Created by jiucheng on 2018/7/13. * Created by jiucheng on 2018/7/13.
* 功能： * 功能：
*/ */
class AccountBean { class AccountBean() :Parcelable{
var id: String? = null//id var id: String? = null//id
var uid: String? = null//id var uid: String? = null//id
var type: Int? = -1//1,//账号类型：1、支付宝；2、微信；3、银行卡 var type: Int? = -1//1,//账号类型：1、支付宝；2、微信；3、银行卡
...@@ -17,4 +20,48 @@ class AccountBean { ...@@ -17,4 +20,48 @@ class AccountBean {
var remark: String? = null//工作日9-18点，到账时间：2小时内；休息日顺延至下一个工作日 var remark: String? = null//工作日9-18点，到账时间：2小时内；休息日顺延至下一个工作日
var isDefault: Int = -1//默认账户 1默认2非默认 var isDefault: Int = -1//默认账户 1默认2非默认
var status: Int = -1//1' => "未审核", '2' => "审核中",'3' => "审核成功",'4' => "审核失败"5、 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
m-user/src/main/java/com/yidianling/user/mine/fragment/AddAliAccountFragment.kt deleted 100644 → 0
package com.yidianling.user.mine.fragment
import android.annotation.SuppressLint
import android.app.Activity
import android.content.Intent
import android.text.TextUtils
import com.yidianling.user.mine.ChooseAccountActivity
import com.ydl.ydlcommon.base.BaseFragment
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.mine.bean.AddAccountCmd
import com.yidianling.user.mine.data.AppDataManager
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.functions.Consumer
import kotlinx.android.synthetic.main.user_mine_fragment_add_ali_account.*
/**
* 添加支付宝帐号
*/
class AddAliAccountFragment : BaseFragment() {
override fun layoutResId(): Int {
return R.layout.user_mine_fragment_add_ali_account
}
override fun initDataAndEvent() {
btn_ensure.setOnClickListener {
saveAccount()
}
}
/**
* 保存支付宝帐号
*/
@SuppressLint("CheckResult")
private fun saveAccount() {
var account = et_account.text.trim().toString()
if (TextUtils.isEmpty(account)) {
ToastUtil.toastShort("支付宝帐号不能为空")
return
}
var name = et_name.text.trim().toString()
if (TextUtils.isEmpty(name)) {
ToastUtil.toastShort("姓名不能为空")
return
}
var param = AddAccountCmd(name, account, "1")
// showProgressDialog("")
AppDataManager.getHttp().addAccount(param)
.compose(RxUtils.resultData())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(Consumer {
// dismissProgressDialog()
if (it == null) {
ToastUtil.toastShort("返回数据错误")
} else {
ToastUtil.toastShort("添加帐号成功")
var intent = Intent()
TransferCacheUtils.putTransferData(ChooseAccountActivity.ADD_ACCOUNT_REQUEST_CODE, it)
activity!!.setResult(Activity.RESULT_OK, intent)
activity!!.finish()
}
}, object : ThrowableConsumer() {
override fun accept(msg: String) {
// dismissProgressDialog()
ToastUtil.toastShort(msg)
}
})
}
override fun initDataAndEventLazy() {
}
}
m-user/src/main/java/com/yidianling/user/mine/fragment/AddBankAccountFragment.kt deleted 100644 → 0
package com.yidianling.user.mine.fragment
import com.ydl.ydlcommon.base.BaseFragment
import com.yidianling.user.R
/**
* 添加银行卡（后续会增加添加银行卡功能，做成独立页面）
*/
class AddBankAccountFragment : BaseFragment() {
override fun layoutResId(): Int {
return R.layout.user_mine_fragment_add_bank_account
}
override fun initDataAndEvent() {
}
override fun initDataAndEventLazy() {
}
}
m-user/src/main/res/layout/user_mine_activity_add_account.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.yidianling.user.mine.AddAccountActivity">
<com.ydl.ydlcommon.view.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/title_bar_height"
app:pa_left_start_icon="@drawable/platform_common_back"
android:background="@color/platform_white"
app:pa_title_text="添加提现帐号" />
<View <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="match_parent"
android:background="#e5e5e5" /> android:orientation="vertical">
<com.ydl.ydlcommon.view.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/title_bar_height"
app:pa_left_start_icon="@drawable/platform_common_back"
android:background="@color/platform_white"
app:pa_title_text="添加提现帐号" />
<com.ydl.ydlcommon.view.widgets.TopTabSelectLayout <View
android:id="@+id/top_layout" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="1dp"
android:layout_height="wrap_content" android:background="#e5e5e5" />
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewpager" <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent"
</LinearLayout> android:orientation="vertical">
<View style="@style/platform_viewline" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:background="@color/white"
android:orientation="horizontal">
<TextView
android:layout_width="111dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="支付宝帐号"
android:textColor="@color/black"
android:textSize="17sp" />
<EditText
android:id="@+id/et_account"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@null"
android:inputType="textEmailAddress"
android:hint="请输入您的支付宝帐号"
android:textColor="@color/black"
android:textColorHint="@color/platform_color_999999"
android:textSize="17sp" />
</LinearLayout>
<View
style="@style/platform_viewline"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:background="@color/white"
android:orientation="horizontal">
<TextView
android:layout_width="111dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="姓名"
android:textColor="@color/black"
android:textSize="17sp" />
<EditText
android:id="@+id/et_name"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@null"
android:hint="请输入您的姓名"
android:textColor="@color/black"
android:textColorHint="@color/platform_color_999999"
android:textSize="17sp" />
</LinearLayout>
<View style="@style/platform_viewline" />
<View
android:layout_width="1dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<com.ydl.ydlcommon.view.RoundCornerButton
android:id="@+id/btn_ensure"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginBottom="28dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:text="保存"
android:textColor="@color/white"
android:textSize="16sp"
app:pa_round_btn_bg="@color/platform_main_theme"
app:pa_round_btn_radio_size="4dp" />
</LinearLayout>
</LinearLayout>
</layout>
m-user/src/main/res/layout/user_mine_fragment_add_ali_account.xml deleted 100644 → 0
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.yidianling.user.mine.fragment.AddAliAccountFragment">
<View style="@style/platform_viewline" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:background="@color/white"
android:orientation="horizontal">
<TextView
android:layout_width="111dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="支付宝帐号"
android:textColor="@color/black"
android:textSize="17sp" />
<EditText
android:id="@+id/et_account"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@null"
android:inputType="textEmailAddress"
android:hint="请输入您的支付宝帐号"
android:textColor="@color/black"
android:textColorHint="@color/platform_color_999999"
android:textSize="17sp" />
</LinearLayout>
<View
style="@style/platform_viewline"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:background="@color/white"
android:orientation="horizontal">
<TextView
android:layout_width="111dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="姓名"
android:textColor="@color/black"
android:textSize="17sp" />
<EditText
android:id="@+id/et_name"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@null"
android:hint="请输入您的姓名"
android:textColor="@color/black"
android:textColorHint="@color/platform_color_999999"
android:textSize="17sp" />
</LinearLayout>
<View style="@style/platform_viewline" />
<View
android:layout_width="1dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<com.ydl.ydlcommon.view.RoundCornerButton
android:id="@+id/btn_ensure"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginBottom="28dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:text="保存"
android:textColor="@color/white"
android:textSize="16sp"
app:pa_round_btn_bg="@color/platform_main_theme"
app:pa_round_btn_radio_size="4dp" />
</LinearLayout>
m-user/src/main/res/layout/user_mine_fragment_add_bank_account.xml deleted 100644 → 0
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical"
tools:context="com.yidianling.user.mine.fragment.AddBankAccountFragment">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:src="@drawable/user_mine_img_yhk" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="26dp"
android:text="近期会持续开通提现到银行卡，敬请期待......"
android:textColor="@color/platform_color_999999"
android:textSize="15sp" />
</LinearLayout>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment