Commit 9ff4156c authored by mengcuiguang2's avatar mengcuiguang2

代码优化

parent c337c476
...@@ -57,8 +57,8 @@ import java.net.URLEncoder ...@@ -57,8 +57,8 @@ import java.net.URLEncoder
* 时间:2022/12/22 14:48 * 时间:2022/12/22 14:48
*/ */
class VipActivity : BaseActivity(), VipView, View.OnClickListener, class VipActivity : BaseActivity(), VipView, View.OnClickListener,
VipAdapter.OnItemClickListener, VipAdapter.OnItemClickListener,
CompoundButton.OnCheckedChangeListener { CompoundButton.OnCheckedChangeListener {
companion object { companion object {
const val IS_DETAIL = "IS_DETAIL"//是否从剧集详情页进入 const val IS_DETAIL = "IS_DETAIL"//是否从剧集详情页进入
...@@ -216,12 +216,12 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -216,12 +216,12 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
if (!TextUtils.isEmpty(bean.buttonText)) { if (!TextUtils.isEmpty(bean.buttonText)) {
if (bean.isShowCycTips) { if (bean.isShowCycTips) {
tvVipPay.text = SpanUtils() tvVipPay.text = SpanUtils()
.append(bean.buttonText + "\n") .append(bean.buttonText + "\n")
.setFontSize(20, true) .setFontSize(20, true)
.append(bean.remarks) .append(bean.remarks)
.setFontSize(10, true) .setFontSize(10, true)
.setForegroundColor(Color.parseColor("#A24240")) .setForegroundColor(Color.parseColor("#A24240"))
.create() .create()
} else { } else {
tvVipPay.text = bean.buttonText tvVipPay.text = bean.buttonText
} }
...@@ -252,7 +252,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -252,7 +252,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
1 -> { 1 -> {
wxPay(paramsBean, payToModel) wxPay(paramsBean, payToModel)
} }
else ->{ else -> {
wxPay(paramsBean, payToModel) wxPay(paramsBean, payToModel)
} }
} }
...@@ -285,7 +285,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -285,7 +285,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
4 -> { 4 -> {
goAlipaySignExecute(paramsBean.params.params) goAlipaySignExecute(paramsBean.params.params)
} }
else ->{ else -> {
alipay(paramsBean) alipay(paramsBean)
} }
} }
...@@ -314,7 +314,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -314,7 +314,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
if (data.expireTime > 0) { if (data.expireTime > 0) {
readyGo(MainActivity::class.java) readyGo(MainActivity::class.java)
val activity = val activity =
ActivityPageManager.getInstance().getActivity(MainActivity::class.java) ActivityPageManager.getInstance().getActivity(MainActivity::class.java)
if (activity != null && activity is MainActivity) { if (activity != null && activity is MainActivity) {
activity.clickTab4Layout() activity.clickTab4Layout()
} }
...@@ -331,7 +331,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -331,7 +331,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
when (keyCode) { when (keyCode) {
KeyEvent.KEYCODE_BACK -> { KeyEvent.KEYCODE_BACK -> {
if (UserManager.getInstance().newFlag if (UserManager.getInstance().newFlag
&& vipList != null && vipList!!.size > 0 && vipList != null && vipList!!.size > 0
) { ) {
vipAdapter.setPosition(0) vipAdapter.setPosition(0)
vipAdapter.notifyDataSetChanged() vipAdapter.notifyDataSetChanged()
...@@ -353,7 +353,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -353,7 +353,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
when (v?.id) { when (v?.id) {
R.id.ic_vip_quit -> { R.id.ic_vip_quit -> {
if (UserManager.getInstance().newFlag && if (UserManager.getInstance().newFlag &&
vipList != null && vipList!!.size > 0 vipList != null && vipList!!.size > 0
) { ) {
vipAdapter.setPosition(0) vipAdapter.setPosition(0)
vipAdapter.notifyDataSetChanged() vipAdapter.notifyDataSetChanged()
...@@ -376,9 +376,9 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -376,9 +376,9 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
agreementPayDialog() agreementPayDialog()
} else { } else {
vipPresenter.getVipPayParams( vipPresenter.getVipPayParams(
payType, payType,
vipBean.pid, isAliPayInstalled(), vipBean.pid, isAliPayInstalled(),
ENTER_TYPE_ACTIVITY ENTER_TYPE_ACTIVITY
) )
} }
} else { } else {
...@@ -418,7 +418,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -418,7 +418,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
shimmer_text?.postDelayed({ shimmer_text?.postDelayed({
shimmer_text?.startShimmerAnimation() shimmer_text?.startShimmerAnimation()
breathAnim = breathAnim =
YoYo.with(Techniques.Pulse).duration(700).repeat(-1).playOn(shimmer_text) YoYo.with(Techniques.Pulse).duration(700).repeat(-1).playOn(shimmer_text)
}, 200) }, 200)
ic_vip_quit.setOnClickListener(this) ic_vip_quit.setOnClickListener(this)
...@@ -441,6 +441,10 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -441,6 +441,10 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
} }
fun wxPay(wxParanBean: WxPayParamBean, payToModel: Int) { fun wxPay(wxParanBean: WxPayParamBean, payToModel: Int) {
if (payToModel == 1) {
// 纯签约
AppConfig.enterAlipay = true
}
val data = wxParanBean.params val data = wxParanBean.params
//实例化微信支付策略 //实例化微信支付策略
val wxPay: WXPay = WXPay.getInstance() val wxPay: WXPay = WXPay.getInstance()
...@@ -554,9 +558,9 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -554,9 +558,9 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
if (vipList != null && vipList!!.size > 0) { if (vipList != null && vipList!!.size > 0) {
val vipBean = vipList!![vipAdapter.getPosition()] val vipBean = vipList!![vipAdapter.getPosition()]
vipPresenter.getVipPayParams( vipPresenter.getVipPayParams(
payType, payType,
vipBean.pid, isAliPayInstalled(), vipBean.pid, isAliPayInstalled(),
ENTER_TYPE_DIALOG ENTER_TYPE_DIALOG
) )
} else { } else {
...@@ -602,19 +606,19 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -602,19 +606,19 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
when (v.id) { when (v.id) {
R.id.tv_agreement_next -> { R.id.tv_agreement_next -> {
vipPresenter.getVipPayParams( vipPresenter.getVipPayParams(
payType, payType,
vipBean.pid, isAliPayInstalled(), vipBean.pid, isAliPayInstalled(),
ENTER_TYPE_ACTIVITY ENTER_TYPE_ACTIVITY
) )
} }
} }
} }
}) })
ruleAgreementDialog!!.setText( ruleAgreementDialog!!.setText(
vipBean.remarks, vipBean.remarks,
vipBean.trialFirstDay, vipBean.trialFirstDay,
vipBean.price, vipBean.price,
vipBean.title vipBean.title
) )
ruleAgreementDialog!!.show() ruleAgreementDialog!!.show()
} else { } else {
...@@ -644,9 +648,9 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -644,9 +648,9 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
agreementPayDialog() agreementPayDialog()
} else { } else {
vipPresenter.getVipPayParams( vipPresenter.getVipPayParams(
payType, payType,
vipBean.pid, isAliPayInstalled(), vipBean.pid, isAliPayInstalled(),
ENTER_TYPE_ACTIVITY ENTER_TYPE_ACTIVITY
) )
} }
} else { } else {
...@@ -668,7 +672,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -668,7 +672,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
private fun setBanner(data: List<VedioBean>) { private fun setBanner(data: List<VedioBean>) {
mainHandler.postDelayed({ mainHandler.postDelayed({
val scrollToBottomAnimator = val scrollToBottomAnimator =
ValueAnimator.ofInt(0, nsv.getChildAt(0).height - nsv.height) ValueAnimator.ofInt(0, nsv.getChildAt(0).height - nsv.height)
scrollToBottomAnimator.addUpdateListener { animator -> scrollToBottomAnimator.addUpdateListener { animator ->
val value = animator.animatedValue as Int val value = animator.animatedValue as Int
nsv.scrollTo(0, value) nsv.scrollTo(0, value)
...@@ -690,23 +694,23 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -690,23 +694,23 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
val adapter = VipBannerAdapter(data) val adapter = VipBannerAdapter(data)
// 绑定生命周期 // 绑定生命周期
vip_banner.addBannerLifecycleObserver(this) vip_banner.addBannerLifecycleObserver(this)
.setBannerGalleryEffect(80, 15, 0.8f) .setBannerGalleryEffect(80, 15, 0.8f)
.setAdapter(adapter) .setAdapter(adapter)
.addOnPageChangeListener(object : OnPageChangeListener { .addOnPageChangeListener(object : OnPageChangeListener {
override fun onPageScrolled( override fun onPageScrolled(
position: Int, position: Int,
positionOffset: Float, positionOffset: Float,
positionOffsetPixels: Int positionOffsetPixels: Int
) { ) {
} }
override fun onPageSelected(position: Int) { override fun onPageSelected(position: Int) {
GlideUtils.loadBlurImageView(mContext, data[position].coverImage, iv_blur) GlideUtils.loadBlurImageView(mContext, data[position].coverImage, iv_blur)
tv_banner_title.text = String.format("《%1s》", data[position].title) tv_banner_title.text = String.format("《%1s》", data[position].title)
} }
override fun onPageScrollStateChanged(state: Int) {} override fun onPageScrollStateChanged(state: Int) {}
}) })
GlideUtils.loadBlurImageView(mContext, data[0].coverImage, iv_blur) GlideUtils.loadBlurImageView(mContext, data[0].coverImage, iv_blur)
tv_banner_title.text = String.format("《%1s》", data[0].title) tv_banner_title.text = String.format("《%1s》", data[0].title)
} }
...@@ -744,11 +748,11 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -744,11 +748,11 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
try { try {
// val alipayAppId = "2021004157617228" // val alipayAppId = "2021004157617228"
val path = val path =
"app_uid=" + UserManager.getInstance().userID + "&package_app=" + Constant.MINTS_PKG_NAME//这里是传的参数 "app_uid=" + UserManager.getInstance().userID + "&package_app=" + Constant.MINTS_PKG_NAME//这里是传的参数
val link = URLEncoder.encode(path, "UTF-8")//这里是encode传的参数 val link = URLEncoder.encode(path, "UTF-8")//这里是encode传的参数
val url = val url =
// "alipays://platformapi/startapp?appId=2021004129666486&page=pages/loading&query=" + link // "alipays://platformapi/startapp?appId=2021004129666486&page=pages/loading&query=" + link
"alipays://platformapi/startapp?appId=" + alipayAppId + "&page=pages/loading&query=" + link "alipays://platformapi/startapp?appId=" + alipayAppId + "&page=pages/loading&query=" + link
val uri = Uri.parse(url) // url为你要链接的地址 val uri = Uri.parse(url) // url为你要链接的地址
val intent = Intent(Intent.ACTION_VIEW, uri) val intent = Intent(Intent.ACTION_VIEW, uri)
startActivity(intent) startActivity(intent)
...@@ -765,9 +769,9 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -765,9 +769,9 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
val req = WXLaunchMiniProgram.Req() val req = WXLaunchMiniProgram.Req()
req.userName = "gh_439c32026e1b" // 填小程序原始id req.userName = "gh_439c32026e1b" // 填小程序原始id
req.path = req.path =
"/pages/loading?testApp1=mcg1&testApp2=mcg2" ////拉起小程序页面的可带参路径,不填默认拉起小程序首页,对于小游戏,可以只传入 query 部分,来实现传参效果,如:传入 "?foo=bar"。 "/pages/loading?testApp1=mcg1&testApp2=mcg2" ////拉起小程序页面的可带参路径,不填默认拉起小程序首页,对于小游戏,可以只传入 query 部分,来实现传参效果,如:传入 "?foo=bar"。
req.miniprogramType = req.miniprogramType =
WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE // 可选打开 开发版,体验版和正式版 WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE // 可选打开 开发版,体验版和正式版
api.sendReq(req) api.sendReq(req)
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
...@@ -786,19 +790,19 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -786,19 +790,19 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
val map: MutableMap<String, String> = HashMap() val map: MutableMap<String, String> = HashMap()
map["sign_params"] = signParams map["sign_params"] = signParams
openAuthTask.execute( openAuthTask.execute(
"com.duben.infinitefunjia.ui.activitys.VipActivity", "com.duben.infinitefunjia.ui.activitys.VipActivity",
OpenAuthTask.BizType.Deduct, OpenAuthTask.BizType.Deduct,
map, map,
{ resultCode: Int, memo: String?, bundle: Bundle -> { resultCode: Int, memo: String?, bundle: Bundle ->
if (resultCode == OpenAuthTask.OK) { if (resultCode == OpenAuthTask.OK) {
// 对业务完成的结果做后续处理 // 对业务完成的结果做后续处理
} else { } else {
// 对业务失败的结果做后续处理 // 对业务失败的结果做后续处理
showToast("支付失败") showToast("支付失败")
} }
}, },
true true
) )
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
......
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