Merge branch 'dev_wangzhuan_meirixiaoduanju_0927' of...

Merge branch 'dev_wangzhuan_meirixiaoduanju_0927' of http://gitlab.mints-id.com/android/android_vedio into dev_wangzhuan_meirixiaoduanju_0927

video/app/src/main/java/com/duben/dayplaylet/ui/activitys/NineActivity.kt

@@ -32,7 +32,6 @@ import com.duben.dayplaylet.utils.rxutil.RxjavaUtil
 import com.duben.library.net.neterror.BaseSubscriber
 import com.duben.library.net.neterror.Throwable
 import com.duben.library.utils.nodoubleclick.AntiShake
-import kotlinx.android.synthetic.main.activity_hint.*
 import kotlinx.android.synthetic.main.activity_nine.*
 
 /**
@@ -94,10 +93,10 @@ class NineActivity : BaseActivity(), View.OnClickListener {
 
         when (v.id) {
             R.id.iv_nine_back -> {
-                AppConfig.mainMusicRefresh=true
+                AppConfig.mainMusicRefresh = true
                 refreshTaskCount()
                 Handler(Looper.getMainLooper()).postDelayed({
-                    if(isFinishing) return@postDelayed
+                    if (isFinishing) return@postDelayed
 
                     finish()
                 }, 500)
@@ -116,7 +115,7 @@ class NineActivity : BaseActivity(), View.OnClickListener {
                             }
 
                             override fun authFail(resultStatus: String) {
-                                showToast("支付宝授权失败 " + resultStatus)
+                                showToast("支付宝授权失败 $resultStatus")
                             }
                         })
                     return
@@ -174,14 +173,14 @@ class NineActivity : BaseActivity(), View.OnClickListener {
      */
     private fun adCloseNext(carrierType: String) {
         Handler(Looper.getMainLooper()).postDelayed({
-            if(isFinishing) return@postDelayed
+            if (isFinishing) return@postDelayed
 
             startNine()
         }, 500)
     }
 
 
-    fun startNine() {
+    private fun startNine() {
         if (!lucky_panel2.isGameRunning) {
             lucky_panel2.startGame()
 
@@ -198,19 +197,21 @@ class NineActivity : BaseActivity(), View.OnClickListener {
                     lucky_panel2.tryToStop(5)
 
                     Handler(Looper.getMainLooper()).postDelayed({
-                        if(isFinishing) return@postDelayed
+                        if (isFinishing) return@postDelayed
 
-                        showWithdrawSucDialog(0.0)
+                        showWithdrawSucDialog(cash)
                     }, 2000)
                 }
             })
         }
     }
 
-    private fun showWithdrawSucDialog(cash: Double) {
+    private fun showWithdrawSucDialog(cash: String) {
+        if (mWithDrawSucDialog != null && mWithDrawSucDialog!!.isShowing) return
+
         TrackManager.getInstance().addCashoutReq(drawId)
         mWithDrawSucDialog =
-            WithDrawSucDialog(context, cash.toString(), object : DialogListener() {
+            WithDrawSucDialog(context, cash, object : DialogListener() {
                 override fun onClick(dialog: Dialog?, v: View?) {
                     super.onClick(dialog, v)
                     dialog?.dismiss()
@@ -282,7 +283,7 @@ class NineActivity : BaseActivity(), View.OnClickListener {
                                     }
 
                                     override fun authFail(resultStatus: String) {
-                                        showToast("支付宝授权失败 " + resultStatus)
+                                        showToast("支付宝授权失败 $resultStatus")
                                     }
                                 })
                             return

video/app/src/main/java/com/duben/dayplaylet/utils/RxBus.java

@@ -93,10 +93,14 @@ public class RxBus {
     }
 
     public static class MsgEvent {
+
+        private int position;
+
         private String msg;
 
-        public MsgEvent(String msg) {
+        public MsgEvent(String msg, int position) {
             this.msg = msg;
+            this.position = position;
         }
 
         public String getMsg() {
@@ -106,5 +110,13 @@ public class RxBus {
         public void setMsg(String msg) {
             this.msg = msg;
         }
+
+        public int getPosition() {
+            return position;
+        }
+
+        public void setPosition(int position) {
+            this.position = position;
+        }
     }
 }
\ No newline at end of file