Merge branch 'dev_track' into dev_ad

GoodMoney/app/src/main/java/com/mints/goodmoney/InitAppService.kt

@@ -17,6 +17,7 @@ import com.orhanobut.logger.FormatStrategy
 import com.orhanobut.logger.Logger
 import com.orhanobut.logger.PrettyFormatStrategy
 import com.tendcloud.tenddata.TCAgent
+import com.umeng.analytics.MobclickAgent
 import com.umeng.commonsdk.UMConfigure
 
 /**
@@ -110,6 +111,7 @@ class InitAppService : IntentService("InitializeService") {
          */
         UMConfigure.init(context, CommonUtils.getAppMetaData(MintsApplication.getContext(), "UMENG_KEY"), CommonUtils.getAppMetaData(context, "CHANNEL_NAME"), UMConfigure.DEVICE_TYPE_PHONE, "")
         UMConfigure.setLogEnabled(true)
+        MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.LEGACY_MANUAL)
     }
 
     /**

GoodMoney/app/src/main/java/com/mints/goodmoney/common/Constant.kt

@@ -98,7 +98,7 @@ object Constant {
     const val CARRIER_EATMEAL_SUBSIDY_NOT = "EATMEAL_SUBSIDY_NOT" //未到时间饭补
     const val CARRIER_WALK_BUBBLE = "WALK_BUBBLE" //走路汽泡
     const val CARRIER_NEW_USER = "CARRIER_NEW_USER" //新用户红包
-    const val CARRIER_NEW_VISITOR = "CARRIER_NEW_VISITOR" //游戏首次登录
+    const val CARRIER_NEW_VISITOR = "CARRIER_NEW_VISITOR" //游客首次登录
     const val CARRIER_GAME_ONLINE = "GAME_ONLINE" //跳转猎豹
     const val CARRIER_ZHANGYUE = "ZHANGYUE" //阅读书城
     const val CARRIER_CHALLENGE_SHAREFRIEND_DOUBLE = "CHALLENGE_SHAREFRIEND_DOUBLE" //邀请好友翻倍

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

@@ -7,6 +7,7 @@ import com.mints.goodmoney.R
 import com.mints.goodmoney.ad.video.VedioAdingManager
 import com.mints.goodmoney.common.Constant
 import com.mints.goodmoney.manager.TTPreLoadExpressManager
+import com.mints.goodmoney.manager.UserManager
 import com.mints.goodmoney.mvp.model.VedioAdingBean
 import com.mints.goodmoney.mvp.presenters.AwardPresenter
 import com.mints.goodmoney.mvp.views.AwardView
@@ -16,10 +17,12 @@ import com.mints.goodmoney.ui.widgets.countdowntimer.OnCountDownTimerListener
 import com.mints.goodmoney.utils.SoundPoolUtil
 import com.mints.goodmoney.utils.SpanUtils
 import com.mints.goodmoney.utils.Utils
+import com.umeng.analytics.MobclickAgent
 import kotlinx.android.synthetic.main.activity_award.*
 import java.math.BigDecimal
 import java.util.*
 
+
 /**
  * 描述：奖励界面
  * 作者：孟崔广
@@ -99,6 +102,12 @@ 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}金币")
 
@@ -146,6 +155,9 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
                 tvAwardNext.visibility = View.GONE
                 tvAwardHint.visibility = View.GONE
             }
+            Constant.CARRIER_VERSUS_VIDEO -> {
+                tvAwardContent.setText(curCoin.toString() + "金币已到账")
+            }
             Constant.CARRIER_CHALLENGE_TURN, Constant.CARRIER_CHALLENGE_CARD,
             Constant.CARRIER_WALK_BUBBLE, Constant.CARRIER_EATMEAL_SUBSIDY,
             Constant.CARRIER_WALK, Constant.CARRIER_HOMEWATER -> {
@@ -179,9 +191,19 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
     override fun onResume() {
         super.onResume()
 
+        MobclickAgent.onPageStart(this::class.java.simpleName)
+        MobclickAgent.onResume(this)
+
         awardPresenter.getCoinMsg()
     }
 
+    override fun onPause() {
+        super.onPause()
+
+        MobclickAgent.onPageEnd(this::class.java.simpleName)
+        MobclickAgent.onPause(this)
+    }
+
     override fun onDestroy() {
         super.onDestroy()
 
@@ -194,7 +216,7 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
             e.printStackTrace()
         }
 
-        vedioAdingManager?.setVedioAdingListener(null)
+        vedioAdingManager.setVedioAdingListener(null)
         vedioAdingManager.onDestory()
 
         awardPresenter.detachView()