代码优化

video/app/src/main/java/com/duben/speedplaylet/ui/activitys/VipActivity.kt

@@ -12,6 +12,7 @@ import android.view.KeyEvent
 import android.view.View
 import android.widget.CompoundButton
 import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.daimajia.androidanimations.library.Techniques
 import com.daimajia.androidanimations.library.YoYo
 import com.duben.speedplaylet.BuildConfig
@@ -19,10 +20,6 @@ import com.duben.speedplaylet.R
 import com.duben.speedplaylet.common.AppConfig
 import com.duben.speedplaylet.common.Constant
 import com.duben.speedplaylet.manager.UserManager
-import com.duben.speedplaylet.mvp.model.BannerList
-import com.duben.speedplaylet.mvp.model.VedioBean
-import com.duben.speedplaylet.mvp.model.VipBean
-import com.duben.speedplaylet.mvp.model.WxPayParamBean
 import com.duben.speedplaylet.mvp.presenters.VipPresenter
 import com.duben.speedplaylet.mvp.views.VipView
 import com.duben.speedplaylet.ui.activitys.base.BaseActivity
@@ -31,6 +28,15 @@ import com.duben.speedplaylet.ui.adapter.VipBannerAdapter
 import com.duben.speedplaylet.ui.widgets.*
 import com.duben.library.utils.GlideUtils
 import com.duben.library.utils.nodoubleclick.AntiShake
+import com.duben.speedplaylet.ad.splash.SplashManager
+import com.duben.speedplaylet.manager.ActivityPageManager
+import com.duben.speedplaylet.mvp.model.*
+import com.duben.speedplaylet.ui.widgets.countdowntimer.CountDownTimerSupport
+import com.duben.speedplaylet.ui.widgets.countdowntimer.OnCountDownTimerListener
+import com.duben.speedplaylet.utils.AppPreferencesManager
+import com.duben.speedplaylet.utils.LogUtil
+import com.duben.speedplaylet.utils.rxutil.CommonRxTask
+import com.duben.speedplaylet.utils.rxutil.RxjavaUtil
 import com.jobo.alipay.AliPay
 import com.jobo.alipay.AlipayInfoImpl
 import com.jobo.rxpay.RxPay
@@ -39,6 +45,8 @@ import com.jobo.wxpay.WXPay
 import com.jobo.wxpay.WXPayInfoImpl
 import com.youth.banner.listener.OnPageChangeListener
 import kotlinx.android.synthetic.main.activity_new_vip.*
+import kotlinx.android.synthetic.main.activity_nine.*
+import kotlinx.android.synthetic.main.fragment_main.*
 
 
 /**
@@ -60,6 +68,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
         const val THIRD_ID = "THIRD_ID"
         const val VEDIO_ID = "VEDIO_ID"
     }
+    var timer: CountDownTimerSupport? = null
 
     private var breathAnim: YoYo.YoYoString? = null
     private var payAgreementDialog: PayAgreementDialog? = null
@@ -119,6 +128,14 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
         overridePendingTransition(0, R.anim.push_bottom_out)
     }
 
+    override fun onResume() {
+        super.onResume()
+        if (AppConfig.enterAlipay) {
+            AppConfig.enterAlipay = false
+            showLoading("查询支付结果...")
+            startTimer()
+        }
+    }
 
     override fun onDestroy() {
         super.onDestroy()
@@ -126,6 +143,12 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
             AppConfig.enterVipAct = false
         }
         breathAnim?.stop()
+
+        if (timer != null) { //防止计时器重复
+            timer!!.stop()
+            timer = null
+        }
+
         vipPresenter.detachView()
     }
 
@@ -170,7 +193,12 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
 
 
         if (!TextUtils.isEmpty(bean.remarks)) {
-            tv_vip_hint.text = bean.remarks
+            if (bean.remarks.contains(";")) {
+                val tempRemarks = bean.remarks.split(";")
+                tv_vip_hint.text = tempRemarks[1]
+            } else {
+                tv_vip_hint.text = ""
+            }
             tv_vip_hint.visibility = View.VISIBLE
         } else {
             tv_vip_hint.visibility = View.INVISIBLE
@@ -232,6 +260,17 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
         }
     }
 
+    override fun getUserSuc(data: UserBean) {
+        if (data.expireTime > 0) {
+            readyGo(MainActivity::class.java)
+            val activity =
+                    ActivityPageManager.getInstance().getActivity(MainActivity::class.java)
+            if (activity != null && activity is MainActivity) {
+                activity.clickTab3Layout()
+            }
+        }
+    }
+
     override fun ordersSuc(data: BannerList?) {
         data?.let {
             setBanner(it.list)
@@ -345,8 +384,9 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
 
     private fun initRvView() {
         if (vipList != null && vipList!!.size > 0) {
-            val gridLayoutManager = GridLayoutManager(this, 3)
-            rvVip.layoutManager = gridLayoutManager
+            val ma = LinearLayoutManager(this)
+            ma.orientation = LinearLayoutManager.VERTICAL
+            rvVip.layoutManager = ma
             vipAdapter = VipAdapter(vipList!!)
             rvVip.adapter = vipAdapter
             vipAdapter.setOnItemClickListener(this)
@@ -415,6 +455,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
         try {
             // 自动签约付费
             if (wxParanBean.params.isSign) {
+                AppConfig.enterAlipay = true
                 openAutoAlipay(wxParanBean.params.params)
                 return
             }
@@ -696,7 +737,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
 
     private fun showPayCancelDialog() {
         val vipBean = vipList!![0]
-        VipPayCancelDialog(this,vipBean.price, object : DialogListener() {
+        VipPayCancelDialog(this, vipBean.price, object : DialogListener() {
             override fun onClick(dialog: Dialog?, v: View?) {
                 super.onClick(dialog, v)
                 dialog?.dismiss()
@@ -710,4 +751,29 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
         })
                 .show()
     }
+
+    fun startTimer() {
+        if (timer != null) { //防止计时器重复
+            timer!!.stop()
+            timer = null
+        }
+        timer = CountDownTimerSupport(9000, 1000)
+        timer!!.setOnCountDownTimerListener(object : OnCountDownTimerListener {
+            override fun onTick(millisUntilFinished: Long) {
+                if (!isFinishing) {
+                    if(millisUntilFinished==4000L){
+                        vipPresenter.getMyInfo()
+                    }
+                }
+            }
+
+            override fun onFinish() {
+                if (!isFinishing) {
+                    hideLoading()
+                    vipPresenter.getMyInfo()
+                }
+            }
+        })
+        timer!!.start()
+    }
 }
\ No newline at end of file