Moved from Google Analytics to Firebase Analytics

This commit is contained in:
seven332 committed 2018-11-02 20:54:55 +08:00
1 parent e07316f25a
commit 4582556f65
7 files changed
+16 -49

No files matched your search

+1
View File
@@ -7,3 +7,4 @@
.idea
/captures
release
app/google-services.json
+2
View File
@@ -1,4 +1,5 @@
apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'android-chinese-string'
android {
@@ -64,6 +65,7 @@ dependencies {
implementation "com.android.support:appcompat-v7:$supportLibrary"
implementation "com.android.support:cardview-v7:$supportLibrary"
implementation "com.android.support:design:$supportLibrary"
implementation 'com.google.firebase:firebase-core:16.0.4'
implementation 'com.github.amlcurran.showcaseview:library:5.4.3'
implementation 'com.github.seven332:android-recaptcha:2bbb3459a8'
implementation 'com.github.seven332:android-resource:0.1.0'
Binary file not shown.
@@ -17,8 +17,7 @@
package com.hippo.ehviewer;
import android.content.Context;
import com.google.analytics.tracking.android.EasyTracker;
import com.google.firebase.analytics.FirebaseAnalytics;
public final class Analytics {
@@ -26,6 +25,6 @@ public final class Analytics {
private Analytics() {}
public static void start(Context context) {
EasyTracker.getInstance(context).set("&uid", Settings.getUserID());
FirebaseAnalytics.getInstance(context).setUserId(Settings.getUserID());
}
}
@@ -22,7 +22,7 @@ import android.support.annotation.Nullable;
import android.support.annotation.StyleRes;
import android.support.v7.app.AppCompatActivity;
import android.view.WindowManager;
import com.google.analytics.tracking.android.EasyTracker;
import com.google.firebase.analytics.FirebaseAnalytics;
import com.hippo.content.ContextLocalWrapper;
import com.hippo.ehviewer.EhApplication;
import com.hippo.ehviewer.Settings;
@@ -30,8 +30,6 @@ import java.util.Locale;
public abstract class EhActivity extends AppCompatActivity {
private boolean mTrackStarted;
@StyleRes
protected abstract int getThemeResId(int theme);
@@ -42,6 +40,10 @@ public abstract class EhActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
((EhApplication) getApplication()).registerActivity(this);
if (Settings.getEnableAnalytics()) {
FirebaseAnalytics.getInstance(this);
}
}
@Override
@@ -51,26 +53,6 @@ public abstract class EhActivity extends AppCompatActivity {
((EhApplication) getApplication()).unregisterActivity(this);
}
@Override
public void onStart() {
super.onStart();
if (Settings.getEnableAnalytics()) {
EasyTracker.getInstance(this).activityStart(this);
mTrackStarted = true;
}
}
@Override
public void onStop() {
super.onStop();
if (mTrackStarted) {
EasyTracker.getInstance(this).activityStop(this);
mTrackStarted = false;
}
}
@Override
protected void onResume() {
super.onResume();
@@ -22,7 +22,7 @@ import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.annotation.StyleRes;
import android.view.WindowManager;
import com.google.analytics.tracking.android.EasyTracker;
import com.google.firebase.analytics.FirebaseAnalytics;
import com.hippo.app.PrettyPreferenceActivity;
import com.hippo.content.ContextLocalWrapper;
import com.hippo.ehviewer.EhApplication;
@@ -31,8 +31,6 @@ import java.util.Locale;
public abstract class EhPreferenceActivity extends PrettyPreferenceActivity {
private boolean mTrackStarted;
@StyleRes
protected abstract int getThemeResId(int theme);
@@ -43,6 +41,10 @@ public abstract class EhPreferenceActivity extends PrettyPreferenceActivity {
super.onCreate(savedInstanceState);
((EhApplication) getApplication()).registerActivity(this);
if (Settings.getEnableAnalytics()) {
FirebaseAnalytics.getInstance(this);
}
}
@Override
@@ -52,26 +54,6 @@ public abstract class EhPreferenceActivity extends PrettyPreferenceActivity {
((EhApplication) getApplication()).unregisterActivity(this);
}
@Override
public void onStart() {
super.onStart();
if (Settings.getEnableAnalytics()) {
EasyTracker.getInstance(this).activityStart(this);
mTrackStarted = true;
}
}
@Override
public void onStop() {
super.onStop();
if (mTrackStarted) {
EasyTracker.getInstance(this).activityStop(this);
mTrackStarted = false;
}
}
@Override
protected void onResume() {
super.onResume();
+1
View File
@@ -8,6 +8,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.google.gms:google-services:4.0.1'
classpath 'com.github.seven332:android-chinese-string-gradle-plugin:0.1.0'
// NOTE: Do not place your application dependencies here; they belong