Skip to content

A
android_goodmoney
Commit aada2af8 authored by jyx's avatar jyx
Browse files
Options

更换闪电盒子sdk，提现页面添加奖励提示

parent 880276c6
Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 47 deletions
GoodMoney/app/build.gradle
View file @ aada2af8
......@@ -237,7 +237,7 @@ dependencies {
// 变现猫
implementation(name: 'bxmsdk-release-3.0.0-csj3300', ext: 'aar')
// 闪电盒子
implementation(name: 'wannuosili_ad_2.0.0', ext: 'aar')
implementation(name: 'wannuosili_ad_2.2.0', ext: 'aar')
// 瑞狮新闻
implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
implementation(name: 'xrsdk-release_tbs', ext: 'aar')
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/DrawcashActivity.kt
View file @ aada2af8
......@@ -3,7 +3,7 @@ package com.mints.goodmoney.ui.activitys
import android.os.Bundle
import android.text.TextUtils
import android.view.View
import android.widget.RadioGroup
import android.widget.CompoundButton
import androidx.recyclerview.widget.GridLayoutManager
import cn.sharesdk.framework.ShareSDK
import cn.sharesdk.wechat.friends.Wechat
......@@ -39,7 +39,7 @@ import java.util.*
* 时间：2020/10/12 14:37
*/
class DrawcashActivity : BaseActivity(),
DrawcashView, View.OnClickListener, OnItemClickListener, OnLoginListener, RadioGroup.OnCheckedChangeListener {
DrawcashView, View.OnClickListener, OnItemClickListener, OnLoginListener, CompoundButton.OnCheckedChangeListener {
private val TAG = DrawcashActivity::class.java.simpleName
......@@ -56,8 +56,8 @@ class DrawcashActivity : BaseActivity(),
private var userConfig: DrawcashBean? = null
private var isLoadRvItem: Boolean = true //是否首次加载rv item
private var isJDNewUser = false
private var jumpJdUrl: String? = null
// private var isJDNewUser = false
// private var jumpJdUrl: String? = null
private var jdTintDialog: JDTintDialog? = null
override fun getContentViewLayoutID() = R.layout.activity_drawcash
......@@ -71,7 +71,7 @@ class DrawcashActivity : BaseActivity(),
tv_right_subtitle.visibility = View.VISIBLE
tv_right_subtitle.text = "提现记录"
tvDrawWechat.isChecked = true
rl_drawcash.setOnCheckedChangeListener(this)
tvDrawJd.setOnCheckedChangeListener(this)
view_title.text = "提现规则"
vedioAdingManager = VedioAdingManager.getInstance(this)
......@@ -335,6 +335,7 @@ class DrawcashActivity : BaseActivity(),
override fun checkJDNewUsersSuc(isJdNewUser: Boolean, JDUrl: String?) {
jdTintDialog?.dismiss()
if (isJdNewUser) {
JDUrl?.let {
val bundle = Bundle()
......@@ -345,20 +346,25 @@ class DrawcashActivity : BaseActivity(),
}
}
showLoading("手机号已注册京东金融")
showToast("手机号已注册京东金融")
}
override fun checkJDNewUsersFail() {
jdTintDialog?.dismiss()
showToast("手机号已注册京东金融")
}
override fun onCheckedChanged(group: RadioGroup?, checkedId: Int) {
if (group?.checkedRadioButtonId == R.id.tvDrawJd) {
override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) {
if (buttonView.isChecked) {
tvDrawWechat.isChecked = false
jdTintDialog = JDTintDialog(this, object : DialogListener() {
override fun onClick(v: View?) {
when (v?.id) {
R.id.ivClose -> {
jdTintDialog?.dismiss()
tvDrawJd.isChecked = false
tvDrawWechat.isChecked = true
}
R.id.btnBindMobile -> {
......@@ -368,6 +374,7 @@ class DrawcashActivity : BaseActivity(),
}
val mobileNum = jdTintDialog?.getMobileNum()!!.replace(" ".toRegex(), "")
jdTintDialog?.dismiss()
tvDrawJd.isChecked = false
tvDrawWechat.isChecked = true
drawcashPresenter.checkJDNewUsers(mobileNum)
......@@ -378,14 +385,6 @@ class DrawcashActivity : BaseActivity(),
})
jdTintDialog?.show()
// if (::drawcashAdapter.isInitialized) {
// drawcashAdapter.setIsAllUnEnable(true)
// }
} else {
// if (::drawcashAdapter.isInitialized) {
// drawcashAdapter.setIsAllUnEnable(false)
// }
}
}
}
\ No newline at end of file
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/JDTintDialog.kt
View file @ aada2af8
......@@ -8,6 +8,7 @@ import android.view.WindowManager
import android.widget.Button
import android.widget.ImageView
import com.mints.goodmoney.R
import kotlinx.android.synthetic.main.activity_feekback.*
/**
* 提示弹框
......
GoodMoney/app/src/main/res/drawable/shape_jd_selected.xml
View file @ aada2af8
......@@ -3,7 +3,7 @@
android:shape="rectangle">
<stroke
android:width="1dp"
android:color="@color/color_ccc" />
<solid android:color="@color/color_FF9837" />
android:color="@color/color_FF9837" />
<solid android:color="@color/white" />
<corners android:radius="10dp" />
</shape>
\ No newline at end of file
GoodMoney/app/src/main/res/drawable/shape_jd_unselected.xml
View file @ aada2af8
......@@ -3,7 +3,7 @@
android:shape="rectangle">
<stroke
android:width="1dp"
android:color="@color/color_ccc" />
android:color="@color/color_E6E6E6" />
<solid android:color="@color/white" />
<corners android:radius="10dp" />
</shape>
\ No newline at end of file
GoodMoney/app/src/main/res/drawable/shape_tint.xml 0 → 100644
View file @ aada2af8
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<rotate
android:fromDegrees="45"
android:pivotX="135%"
android:pivotY="15%">
<shape android:shape="rectangle">
<size
android:width="16dp"
android:height="16dp" />
<solid android:color="#fffd9a2a" />
</shape>
</rotate>
</item>
</layer-list>
\ No newline at end of file
GoodMoney/app/src/main/res/drawable/shape_tv_gold.xml
View file @ aada2af8
......@@ -7,7 +7,7 @@
<!-- 渐变色 -->
<gradient
android:centerColor="#fffd9a2a"
android:endColor="#fffd8d26"
android:startColor="#fffece38" />
android:endColor="#fffece38"
android:startColor="#fffd8d26" />
</shape>
\ No newline at end of file
GoodMoney/app/src/main/res/layout/activity_drawcash.xml
View file @ aada2af8
......@@ -101,22 +101,50 @@
android:textSize="14sp" />
</RelativeLayout>
<RadioGroup
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/rl_drawcash"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="20dp"
android:orientation="horizontal">
android:layout_marginBottom="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="提现方式"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/textView4"
app:layout_constraintStart_toStartOf="@+id/tvDrawWechat" />
<TextView
android:id="@+id/textView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_tv_gold"
android:paddingStart="10dp"
android:paddingTop="6dp"
android:paddingEnd="10dp"
android:paddingBottom="6dp"
android:text="新用户奖励5元现金"
android:textColor="@color/white"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="@+id/tvDrawJd"
app:layout_constraintStart_toStartOf="@+id/tvDrawJd"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/img_reg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/shape_tint"
app:layout_constraintEnd_toEndOf="@id/textView4"
app:layout_constraintStart_toStartOf="@id/textView4"
app:layout_constraintTop_toBottomOf="@id/textView4" />
<RadioButton
android:id="@+id/tvDrawWechat"
android:layout_width="0dp"
android:layout_width="150dp"
android:layout_height="50dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:background="@drawable/shape_jd_selector"
android:button="@null"
android:drawableStart="@mipmap/ic_draw_wx"
......@@ -124,16 +152,16 @@
android:gravity="center"
android:paddingStart="30dp"
android:text="微信"
android:textColor="@drawable/text_color_jd_selector"
android:textSize="14sp" />
android:textColor="@color/black"
android:textSize="14sp"
app:layout_constraintEnd_toStartOf="@id/tvDrawJd"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/img_reg" />
<RadioButton
android:id="@+id/tvDrawJd"
android:layout_width="0dp"
android:layout_width="150dp"
android:layout_height="50dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:background="@drawable/shape_jd_selector"
android:button="@null"
android:drawableStart="@mipmap/ic_draw_jd"
......@@ -141,10 +169,14 @@
android:gravity="center"
android:paddingStart="30dp"
android:text="京东金融"
android:textColor="@drawable/text_color_jd_selector"
android:textSize="14sp" />
android:textColor="@color/black"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/tvDrawWechat"
app:layout_constraintTop_toBottomOf="@id/img_reg" />
</androidx.constraintlayout.widget.ConstraintLayout>
</RadioGroup>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvCash"
......
GoodMoney/app/src/main/res/layout/dialog_jd_bind_mobile.xml
View file @ aada2af8
......@@ -33,21 +33,21 @@
</RelativeLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:layout_marginBottom="30dp"
android:text="请提交您的手机号码"
android:textColor="@color/gray" />
<com.mints.goodmoney.ui.widgets.ClearEditText
android:id="@+id/etLoginMobile"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="20dp"
android:layout_height="40dp"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:layout_marginBottom="30dp"
android:background="@drawable/shape_vip_adapter"
android:gravity="center"
android:hint="请输入手机号"
......@@ -64,7 +64,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="仅限未注册过京东金融的用户"
android:textColor="@color/gray" />
android:textColor="@color/gray"
android:textSize="12sp" />
<Button
android:id="@+id/btnBindMobile"
......
GoodMoney/app/src/main/res/layout/layout_bubble_tint.xml 0 → 100644
View file @ aada2af8
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_tv_gold"
android:paddingStart="10dp"
android:paddingTop="6dp"
android:paddingEnd="10dp"
android:paddingBottom="6dp"
android:text="新用户奖励5元现金"
android:textColor="@color/white" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/shape_tint" />
</LinearLayout>
\ No newline at end of file
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