代码优化

video/app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.duben.happyplayletu"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 722
-        versionName "7.2.2"
+        versionCode 724
+        versionName "7.2.4"
         flavorDimensions "default"
 
         // dex突破65535的限制

video/app/src/main/java/com/duben/happyplayletu/manager/GravityEngineManager.kt

 package com.duben.happyplayletu.manager
 
 import android.app.Application
+import android.text.TextUtils
 import cn.gravity.android.GEConfig
 import cn.gravity.android.GravityEngineSDK
+import cn.gravity.android.GravityEngineSDK.AutoTrackEventType
 import cn.gravity.android.InitializeCallback
+import com.bytedance.hume.readapk.HumeSDK
 import com.duben.happyplayletu.MintsApplication
 import com.duben.happyplayletu.utils.DeviceUuidFactory
 import com.duben.happyplayletu.utils.LogUtil
@@ -36,12 +39,11 @@ object GravityEngineManager {
             val config: GEConfig = GEConfig.getInstance(application, ACCESS_TOKEN)
             // 保存此实例，后续调用方法均需要用到
             val gravityEngineSDKInstance = GravityEngineSDK.setupAndStart(config)
-            val channel = getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME")
             gravityEngineSDKInstance.initialize(
                 ACCESS_TOKEN,
                 DeviceUuidFactory().deviceUuid.toString(),
                 DeviceUuidFactory().deviceUuid.toString(),
-                channel,
+                createChannel(),
                 object : InitializeCallback {
                     override fun onFailed(errorMsg: String, initializeBody: JSONObject?) {
                         LogUtil.d("mcg --> gravityEngineSDKInstance onFailed=" + errorMsg)
@@ -54,6 +56,8 @@ object GravityEngineManager {
                                 responseJson
                             )
                         )
+
+                        enableAutoTrack(gravityEngineSDKInstance)
                     }
                 },
                 ENABLE_SYNC_ATTRIBUTION
@@ -63,4 +67,32 @@ object GravityEngineManager {
             e.printStackTrace()
         }
     }
+
+    /**
+     * 开启自动采集
+     */
+    fun enableAutoTrack(gravityEngineSDKInstance: GravityEngineSDK) {
+        val typeList: MutableList<AutoTrackEventType> = ArrayList()
+        typeList.add(AutoTrackEventType.APP_INSTALL)
+        typeList.add(AutoTrackEventType.APP_END)
+        typeList.add(AutoTrackEventType.APP_CRASH)
+        typeList.add(AutoTrackEventType.APP_VIEW_SCREEN)
+        typeList.add(AutoTrackEventType.APP_CLICK)
+        gravityEngineSDKInstance.enableAutoTrack(typeList)
+    }
+
+    fun createChannel(): String {
+        var channel = getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME")
+        try {
+            // 穿山甲分包渠道
+            val ttChannel = HumeSDK.getChannel(MintsApplication.getContext())
+            if (!TextUtils.isEmpty(ttChannel)) {
+                // 此处方式不能修改，已和后端约定
+                channel = channel + "_" + ttChannel
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+        return channel
+    }
 }
\ No newline at end of file

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

@@ -3,6 +3,7 @@ package com.duben.happyplayletu.ui.activitys
 import android.animation.ValueAnimator
 import android.app.Dialog
 import android.content.Intent
+import android.graphics.Color
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
@@ -32,6 +33,7 @@ import com.duben.happyplayletu.ui.adapter.VipBannerAdapter
 import com.duben.happyplayletu.ui.widgets.*
 import com.duben.happyplayletu.ui.widgets.countdowntimer.CountDownTimerSupport
 import com.duben.happyplayletu.ui.widgets.countdowntimer.OnCountDownTimerListener
+import com.duben.happyplayletu.utils.SpanUtils
 import com.duben.library.utils.GlideUtils
 import com.duben.library.utils.nodoubleclick.AntiShake
 import com.jobo.alipay.AliPay
@@ -207,12 +209,30 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
         if (!TextUtils.isEmpty(bean.remarks)) {
             tv_vip_hint.text = bean.remarks
             tv_vip_hint.visibility = View.VISIBLE
+            if (bean.isShowCycTips) {
+                tv_vip_hint.setTextColor(Color.parseColor("#FFAC5E"))
+                tv_vip_hint.textSize = 12f
+            } else {
+                tv_vip_hint.setTextColor(Color.parseColor("#97ffffff"))
+                tv_vip_hint.textSize = 10f
+            }
         } else {
             tv_vip_hint.visibility = View.INVISIBLE
         }
 
         if (!TextUtils.isEmpty(bean.buttonText)) {
-            tvVipPay.text = bean.buttonText
+            if (bean.isShowCycTips) {
+                tvVipPay.text = SpanUtils()
+                    .append(bean.buttonText + "\n")
+                    .setFontSize(20, true)
+                    .append(bean.remarks)
+                    .setFontSize(10, true)
+                    .setForegroundColor(Color.parseColor("#A24240"))
+                    .create()
+            } else {
+                tvVipPay.text = bean.buttonText
+            }
+
             tvVipAgreement.text = "点击购买即表示您同意《自动续费协议》"
         } else {
             tvVipPay.text = "立即开通"