From a4a029f31e76f3695d2fdfc9d65b2ff5af32dceb Mon Sep 17 00:00:00 2001
From: juntao <chenjuntao@ghzhushou.com>
Date: Tue, 2 Feb 2021 16:49:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=AF=E5=8A=A8=E5=9B=BE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=BA=E5=8C=96(=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=9F=8B=E7=82=B9)=20https://git.ghzs.com/pm/halo-app-issues/-?=
 =?UTF-8?q?/issues/1131?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gh/common/util/LogUtils.java     | 26 +++++++++++++++++++
 .../java/com/gh/gamecenter/MainActivity.java  |  8 +++++-
 .../gh/gamecenter/entity/StartupAdEntity.kt   |  4 +++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/gh/common/util/LogUtils.java b/app/src/main/java/com/gh/common/util/LogUtils.java
index 2ad83243c9..7f649ea6f7 100644
--- a/app/src/main/java/com/gh/common/util/LogUtils.java
+++ b/app/src/main/java/com/gh/common/util/LogUtils.java
@@ -19,6 +19,7 @@ import com.gh.gamecenter.entity.CommunityEntity;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.ShareResultEntity;
 import com.gh.gamecenter.entity.SpecialColumn;
+import com.gh.gamecenter.entity.StartupAdEntity;
 import com.gh.gamecenter.manager.UserManager;
 import com.gh.gamecenter.qa.entity.Questions;
 import com.gh.gamecenter.retrofit.EmptyResponse;
@@ -786,4 +787,29 @@ public class LogUtils {
         }
         LoghubUtils.log(object, "event", false);
     }
+
+    public static void logStartAd(String event, StartupAdEntity adEntity) {
+        JSONObject object = new JSONObject();
+        try {
+            object.put("event", event);
+            object.put("timestamp", System.currentTimeMillis() / 1000);
+            object.put("meta", getMetaObject());
+            if (adEntity != null) {
+                object.put("abs_id", adEntity.getId());
+                object.put("abs_text", adEntity.getDesc());
+                if (adEntity.getButton()) {
+                    object.put("abs_type", adEntity.getJump().getType());
+                    object.put("abs_link", adEntity.getJump().getLink());
+                    object.put("abs_link_title", adEntity.getJump().getText());
+                }
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+        LoghubUtils.log(object, "event", false);
+    }
+
 }
diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java
index 8ca8c6e35b..bc3f43c42a 100644
--- a/app/src/main/java/com/gh/gamecenter/MainActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java
@@ -359,8 +359,14 @@ public class MainActivity extends BaseActivity {
         adContentTv.setVisibility(View.VISIBLE);
         if (ad.getButton()) {
             View btn = findViewById(R.id.adBtn);
-            btn.setOnClickListener((v) -> DirectUtils.directToLinkPage(this, ad.getJump(), "(启动广告)", ""));
+            btn.setOnClickListener((v) -> {
+                DirectUtils.directToLinkPage(this, ad.getJump(), "(启动广告)", "");
+                LogUtils.logStartAd("click_watch_start_ads", ad);
+            });
             btn.setVisibility(View.VISIBLE);
+            LogUtils.logStartAd("watch_start_ads", ad);
+        } else {
+            LogUtils.logStartAd("start_ads", ad);
         }
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/entity/StartupAdEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/StartupAdEntity.kt
index f8f9da136b..0097e4281e 100644
--- a/app/src/main/java/com/gh/gamecenter/entity/StartupAdEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/entity/StartupAdEntity.kt
@@ -1,6 +1,10 @@
 package com.gh.gamecenter.entity
 
+import com.google.gson.annotations.SerializedName
+
 data class StartupAdEntity(
+        @SerializedName("_id")
+        val id: String,
         val desc: String,
         val button: Boolean,
         val jump: LinkEntity)
\ No newline at end of file