友盟埋点集成

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/AwardActivity.kt

 package com.mints.goodmoney.ui.activitys
 
 import android.os.Bundle
+import android.text.TextUtils
 import android.view.KeyEvent
 import android.view.View
 import com.mints.goodmoney.R
@@ -68,6 +69,14 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
         // 开启3秒倒计时
         startTime()
 
+        if (!TextUtils.isEmpty(carrierType) && curCoin > 0) {
+            // 埋点上送事件
+            val map = mutableMapOf<String, String>()
+            map["userId"] = UserManager.getInstance().userID
+            map["coin"] = "" + curCoin
+            MobclickAgent.onEvent(this, carrierType, map)
+        }
+
         when (carrierType) {
             Constant.CARRIER_GAME_ONLINE, Constant.CARRIER_EATMEAL -> {
                 val vo = HashMap<String, Any>()
@@ -102,12 +111,6 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
                 vo["carrierType"] = carrierType
                 awardPresenter.reportAddCoinMsg(vo)
 
-                val map = mutableMapOf<String, String>()
-                map["userId"] = UserManager.getInstance().userID
-                map["carrierType"] = carrierType
-                map["coin"] = "" + curCoin
-                MobclickAgent.onEvent(this, "award_share_friend", map)
-
                 tvAwardContent.setText(curCoin.toString() + "金币已到账")
                 tvAwardNext.setText("看视频再领${extraId}金币")
 
@@ -164,9 +167,6 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
                 tvAwardContent.setText("+" + curCoin + "金币")
                 tvAwardNext.setText("看视频领取")
             }
-            Constant.CARRIER_VERSUS_VIDEO ->{
-                tvAwardContent.setText(curCoin.toString() + "金币已到账")
-            }
             else -> {
                 tvAwardContent.setText(curCoin.toString() + "金币已到账")
             }

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/FriendsFragment.kt

@@ -120,21 +120,17 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
             }
 
             override fun onPageSelected(position: Int) {
-                when (position) {
+                when (view_pager_friends.currentItem) {
                     0 -> {
-                        if (allData.size <= 0) {
                         friendsPresenter.getContributionBigLeaders()
                     }
-                    }
                     1 -> {
-                        if (todayData.size <= 0) {
                         friendsPresenter.getFriendsGiveTodayList()
                     }
-                    }
                     2 -> {
-                        if (yesterdayData.size <= 0) {
                         friendsPresenter.getContributionLeaders()
                     }
+                    else -> {
                     }
                 }
             }
@@ -236,7 +232,11 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
 
         btn_get_bonus.text = data.button
         btn_get_bonus.isEnabled = data.status == 0 && data.cash > 0
-        if (btn_get_bonus.isEnabled) {
+
+        if (data.button == "戳我分红") {
+            btn_get_bonus.isEnabled = true
+            btn_get_bonus.setTextColor(resources.getColor(R.color.white))
+            btn_get_bonus.setBackgroundResource(R.drawable.shape_btn_friends_unenabled)
             showRedbox(btn_get_bonus)
         } else {
             stopRedbox()
@@ -363,10 +363,15 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
                     if (it.cash.toInt() > 0 && it.status == 0) {
                         // 去提现
                         friendsPresenter.getContributionOutToCash()
+                    } else {
+                        if (it.button == "戳我分红") {
+                            // 玩法规则
+                            ruleDialog()
                         } else {
                             showToast("您的贡献值未达到提现要求")
                         }
                     }
+                }
 
             }
         }

GoodMoney/app/src/main/res/layout/fragment_main_friends.xml

@@ -233,7 +233,6 @@
                                         android:layout_height="26dp"
                                         android:layout_alignParentEnd="true"
                                         android:layout_centerVertical="true"
-                                        android:layout_marginStart="20dp"
                                         android:layout_marginEnd="5dp"
                                         android:background="@drawable/btn_friends_selectored"
                                         android:text="结算中"