Skip to content

X
xxsq
Commit d2b93332 authored by 王雪伟's avatar 王雪伟
Browse files
Options

[提交人]：王雪伟 

[提交简述] ：1.1.9
[实现方案] ：话费充值滚动字幕提示，支付方式可选
parent 22623dfa
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 56 deletions
app/version.properties
View file @ d2b93332
PACKAGE_NAME=com.zxhl.shop PACKAGE_NAME=com.zxhl.shop
VERSION_CODE=19 VERSION_CODE=20
VERSION_NAME=1.1.8 VERSION_NAME=1.1.9
\ No newline at end of file \ No newline at end of file
cms/src/main/java/com/zxhl/cms/net/model/box/AppInEntity.kt
View file @ d2b93332
...@@ -18,6 +18,7 @@ class AppInEntity { ...@@ -18,6 +18,7 @@ class AppInEntity {
var risk_open: String = ""//1开启 0 关闭 var risk_open: String = ""//1开启 0 关闭
var kefu_url: String = ""//客服地址 var kefu_url: String = ""//客服地址
var card_desc: String = ""//权益说明 var card_desc: String = ""//权益说明
var recharge_desc: String? = ""//充值说明
var tabs: List<TabEntity>? = null//tab var tabs: List<TabEntity>? = null//tab
var pay_h5_url: String = ""//支付配置 var pay_h5_url: String = ""//支付配置
......
cms/src/main/java/com/zxhl/cms/pay/PaymentConfig.kt
View file @ d2b93332
...@@ -13,8 +13,8 @@ class PaymentConfig { ...@@ -13,8 +13,8 @@ class PaymentConfig {
const val MIN_PAY_PROGRAM = 13 //敏付 const val MIN_PAY_PROGRAM = 13 //敏付
const val H5_PAY = 21 //h5支付 const val H5_PAY = 21 //h5支付
const val SD_PAY = 15 //杉德支付 const val SD_PAY = 15 //杉德支付
const val ZFB_H5_PAY = 17 //支付宝H5 const val ZFB_H5_PAY = 17 //智付 支付宝H5
const val WX_H5_PAY = 19 //微信H5 const val WX_H5_PAY = 19 //智付 微信H5
const val HUI_FU_H5_PAY1 = 31 //汇付支付宝 const val HUI_FU_H5_PAY1 = 31 //汇付支付宝
const val HUI_FU_H5_PAY2 = 33 //汇付微信 const val HUI_FU_H5_PAY2 = 33 //汇付微信
} }
......
cms/src/main/res/layout/item_payment_fun_view.xml
View file @ d2b93332
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
<ImageView <ImageView
android:id="@+id/id_item_img_check" android:id="@+id/id_item_img_check"
android:layout_width="wrap_content" android:layout_width="20dp"
android:layout_height="wrap_content" android:layout_height="20dp"
android:src="@drawable/icon_xuanzhong_default" /> android:src="@drawable/icon_xuanzhong_default" />
</LinearLayout> </LinearLayout>
......
moduleMain/src/main/java/com/zxbw/modulemain/activity/RechargeActivity.kt
View file @ d2b93332
package com.zxbw.modulemain.activity package com.zxbw.modulemain.activity
import android.app.Dialog
import android.content.Intent import android.content.Intent
import android.graphics.Paint import android.graphics.Paint
import android.os.Handler import android.os.Handler
...@@ -30,6 +29,7 @@ import com.zxhl.cms.net.model.uc.PayResultEntity ...@@ -30,6 +29,7 @@ import com.zxhl.cms.net.model.uc.PayResultEntity
import com.zxhl.cms.net.model.video.MemberEntity import com.zxhl.cms.net.model.video.MemberEntity
import com.zxhl.cms.pay.H5PayUtil import com.zxhl.cms.pay.H5PayUtil
import com.zxhl.cms.pay.PaymentConfig import com.zxhl.cms.pay.PaymentConfig
import com.zxhl.cms.pay.PaymentFunAdapter
import com.zxhl.cms.pay.alipay.AlipayServer import com.zxhl.cms.pay.alipay.AlipayServer
import com.zxhl.cms.utils.* import com.zxhl.cms.utils.*
import com.zxhl.cms.widget.LoadingDialog import com.zxhl.cms.widget.LoadingDialog
...@@ -37,12 +37,14 @@ import io.reactivex.Observable ...@@ -37,12 +37,14 @@ import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.functions.Consumer import io.reactivex.functions.Consumer
import kotlinx.android.synthetic.main.activity_layout_recharge.* import kotlinx.android.synthetic.main.activity_layout_recharge.*
import kotlinx.android.synthetic.main.activity_layout_recharge.id_img_back
import kotlinx.android.synthetic.main.activity_layout_recharge.id_rights_pay_web_view import kotlinx.android.synthetic.main.activity_layout_recharge.id_rights_pay_web_view
import kotlinx.android.synthetic.main.activity_layout_recharge.id_rl_h5_pay_view import kotlinx.android.synthetic.main.activity_layout_recharge.id_rl_h5_pay_view
//话费充值页面 //话费充值页面
class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity.ProductDetail>, class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity.ProductDetail>,
RechargeContract.View { RechargeContract.View {
private var mPayFunAdapter: PaymentFunAdapter? = null;
private var mAdapter: RechargeAdapter? = null private var mAdapter: RechargeAdapter? = null
private var mOperatorAdapter: OperatorAdapter? = null private var mOperatorAdapter: OperatorAdapter? = null
private var mPresenter: RechargePresenter? = null private var mPresenter: RechargePresenter? = null
...@@ -155,16 +157,33 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity ...@@ -155,16 +157,33 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity
} }
}, Consumer<Throwable> { }) }, Consumer<Throwable> { })
mPayFunAdapter = PaymentFunAdapter(
this
) { view, position, data ->
pay_type = data.type
mPayFunAdapter?.setPosition(position)
}
id_rcl_payment_list.layoutManager = LinearLayoutManager(this)
id_rcl_payment_list.adapter = mPayFunAdapter
var result = SettingPreference.getConfig() var result = SettingPreference.getConfig()
if (result != null) { if (result != null) {
if (result != null && !result.pay_config_v2.isNullOrEmpty()) { if (!result.pay_config_v2.isNullOrEmpty()) {
mPayFunAdapter?.clear()
mPayFunAdapter?.appendToList(result.pay_config_v2)
for (i in result.pay_config_v2!!.indices) { for (i in result.pay_config_v2!!.indices) {
if (result?.pay_config_v2!![i].open == 1) { if (result?.pay_config_v2!![i].open == 1) {
pay_type = result?.pay_config_v2!![i].type pay_type = result?.pay_config_v2!![i].type
mPayFunAdapter?.setPosition(i)
break break
} }
} }
} }
if (result.recharge_desc.isNullOrEmpty()){
id_tv_recharge_desc.visibility = View.GONE
}else{
id_tv_recharge_desc.text = result.recharge_desc
id_tv_recharge_desc.visibility = View.VISIBLE
}
} }
} }
......
moduleMain/src/main/java/com/zxbw/modulemain/view/MarqueTextView.java 0 → 100644
View file @ d2b93332
package com.zxbw.modulemain.view;
import android.content.Context;
import android.util.AttributeSet;
import androidx.appcompat.widget.AppCompatTextView;
/**
* @author (wangXuewei)
* @datetime 2022-08-18 16:58 GMT+8
* @detail :
*/
public class MarqueTextView extends AppCompatTextView {
public MarqueTextView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
}
public MarqueTextView(Context context, AttributeSet attrs) {
super(context, attrs);
}
public MarqueTextView(Context context) {
super(context);
}
@Override
public boolean isFocused() {
//true表示获取焦点
return true;
}
}
\ No newline at end of file
moduleMain/src/main/res/layout/activity_layout_recharge.xml
View file @ d2b93332
...@@ -41,6 +41,20 @@ ...@@ -41,6 +41,20 @@
android:orientation="vertical" android:orientation="vertical"
android:padding="16dp"> android:padding="16dp">
<com.zxbw.modulemain.view.MarqueTextView
android:id="@+id/id_tv_recharge_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:visibility="gone"
android:layout_marginBottom="10dp"
android:textColor="#FF0000"
android:marqueeRepeatLimit="marquee_forever"
android:ellipsize="marquee"
android:text=""
android:textSize="20sp" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -164,8 +178,8 @@ ...@@ -164,8 +178,8 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/id_rl_recharge" android:id="@+id/id_rl_recharge"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginLeft="5dp" android:layout_height="wrap_content"
android:layout_height="wrap_content" /> android:layout_marginLeft="5dp" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -206,6 +220,11 @@ ...@@ -206,6 +220,11 @@
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/id_rcl_payment_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -265,8 +284,8 @@ ...@@ -265,8 +284,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:text="@string/huafei_desc2"
android:layout_marginBottom="82dp" android:layout_marginBottom="82dp"
android:text="@string/huafei_desc2"
android:textColor="@color/color_999999" android:textColor="@color/color_999999"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" /> android:textStyle="bold" />
......
moduleMain/src/main/res/layout/dialog_layout_if_hava_coups.xml
View file @ d2b93332
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<RelativeLayout <RelativeLayout
android:id="@+id/id_rl_have_coup" android:id="@+id/id_rl_have_coup"
android:layout_width="360dp" android:layout_width="wrap_content"
android:layout_height="404dp" android:layout_height="wrap_content"
android:background="@drawable/icon_youhuiquan_tanchuang"> android:background="@drawable/icon_youhuiquan_tanchuang">
<RelativeLayout <RelativeLayout
...@@ -19,30 +19,35 @@ ...@@ -19,30 +19,35 @@
android:layout_marginTop="189dp" android:layout_marginTop="189dp"
android:background="@drawable/icon_youhuiuan_1"> android:background="@drawable/icon_youhuiuan_1">
<TextView <LinearLayout
android:id="@+id/id_tv_ten_yuan" android:layout_width="wrap_content"
android:layout_width="34dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="9dp" android:orientation="horizontal">
android:includeFontPadding="false"
android:text="10" <TextView
android:textColor="#E23E1D" android:id="@+id/id_tv_ten_yuan"
android:textSize="29sp" android:layout_width="40dp"
android:textStyle="bold" /> android:layout_height="wrap_content"
android:layout_marginLeft="9dp"
android:includeFontPadding="false"
android:text="10"
android:gravity="center"
android:textColor="#E23E1D"
android:textSize="29sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:includeFontPadding="false"
android:text="元"
android:textColor="#E23E1D"
android:textSize="15sp"
android:textStyle="bold" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/id_tv_ten_yuan"
android:layout_marginLeft="4dp"
android:layout_marginBottom="4dp"
android:layout_toEndOf="@+id/id_tv_ten_yuan"
android:includeFontPadding="false"
android:text="元"
android:textColor="#E23E1D"
android:textSize="15sp"
android:textStyle="bold" />
<TextView <TextView
android:id="@+id/id_tv_ten_nums" android:id="@+id/id_tv_ten_nums"
...@@ -65,31 +70,37 @@ ...@@ -65,31 +70,37 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:background="@drawable/icon_youhuiquan_2"> android:background="@drawable/icon_youhuiquan_2">
<TextView <LinearLayout
android:id="@+id/id_tv_five_yuan" android:layout_width="wrap_content"
android:layout_width="34dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="9dp" android:orientation="horizontal">
android:gravity="center" <TextView
android:includeFontPadding="false" android:id="@+id/id_tv_five_yuan"
android:text="5" android:layout_width="40dp"
android:textColor="#E23E1D" android:layout_height="wrap_content"
android:textSize="29sp" android:layout_marginStart="9dp"
android:textStyle="bold" /> android:gravity="center"
android:includeFontPadding="false"
android:text="5"
android:textColor="#E23E1D"
android:textSize="29sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:includeFontPadding="false"
android:text="元"
android:textColor="#E23E1D"
android:textSize="15sp"
android:textStyle="bold" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/id_tv_five_yuan"
android:layout_marginStart="4dp"
android:layout_marginBottom="4dp"
android:layout_toEndOf="@+id/id_tv_five_yuan"
android:includeFontPadding="false"
android:text="元"
android:textColor="#E23E1D"
android:textSize="15sp"
android:textStyle="bold" />
<TextView <TextView
android:id="@+id/id_five_ten_nums" android:id="@+id/id_five_ten_nums"
......
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