Skip to content

Commit

Permalink
fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@gdlbo
gdlbo committed Mar 24, 2024
1 parent eb4f0be commit 93ff69e
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 119 deletions.
103 changes: 25 additions & 78 deletions app/src/main/java/com/vk/music/stats/VKMusicStatsTracker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import androidx.annotation.VisibleForTesting;
import androidx.core.app.NotificationCompat;
import com.vk.core.extensions.StringExt;
import com.vk.core.util.DeviceIdProvider;
import com.vk.music.common.MusicPlaybackLaunchContext;
import com.vk.music.logger.MusicLogger;
import com.vk.music.stats.i.MusicPlaybackParams;
Expand All @@ -17,7 +16,6 @@
import org.json.JSONObject;
import ru.vtosters.hooks.other.Preferences;
import ru.vtosters.lite.music.Metrics;
import ru.vtosters.lite.utils.AndroidUtils;

import java.util.Objects;
import java.util.UUID;
Expand Down Expand Up @@ -163,85 +161,34 @@ public void a(String str) {
}

private void makeMetricsRequest(MusicPlaybackParams musicPlaybackParams, String str) throws JSONException {
MusicPlaybackLaunchContext h = musicPlaybackParams.h();

JSONArray eventsArray = new JSONArray();

JSONObject event1 = new JSONObject();
event1.put("e", "audio_player");
event1.put("state", "app");
event1.put("prev_state", "background");

if (!Objects.equals("music_start_playback", str)) {
event1.put("duration", musicPlaybackParams.a());
}

eventsArray.put(event1);

JSONObject event2 = new JSONObject();
event2.put("e", "audio_ad");
event2.put("event", "requested");
event2.put("section", h.v1());
eventsArray.put(event2);

JSONObject event3 = new JSONObject();
event3.put("e", str);
event2.put("audio_id", musicPlaybackParams.c());
event3.put("uuid", UUID.randomUUID().hashCode());
event3.put("shuffle", musicPlaybackParams.l());
event3.put("reason", e(musicPlaybackParams));
event3.put("start_time", musicPlaybackParams.i());
event3.put("playback_started_at", musicPlaybackParams.d());
event3.put("streaming_type", "online");
event3.put("state", musicPlaybackParams.m());
event3.put("track_code", musicPlaybackParams.j());

if (!Objects.equals("music_start_playback", str)) {
event3.put("duration", musicPlaybackParams.a());
}

int repeatType = com.vk.music.stats.h.$EnumSwitchMapping$0[musicPlaybackParams.b().ordinal()];
switch (repeatType) {
case 1 -> event3.put("repeat", "one");
case 2 -> event3.put("repeat", "all");
}

event3.put("source", h.v0());

if (h.v1()) {
event3.put("playlist_id", h.u1());
}

if (h.i(4) || h.i(8)) {
event3.put("expanded", h.i(4));
}

if (StringExt.a((CharSequence) musicPlaybackParams.e())) {
event3.put("prev_audio_id", musicPlaybackParams.e());
}
JSONArray events = new JSONArray();
JSONObject event = new JSONObject();

if (str.equals("music_stop_playback")) {
event.put("e", str);
event.put("audio_id", musicPlaybackParams.c());
event.put("start_time", "0");
event.put("shuffle", "false");
event.put("reason", "new");
event.put("state", "app");
event.put("duration", musicPlaybackParams.a());
events.put(event);
} else {
event.put("e", str);
event.put("audio_id", musicPlaybackParams.c());
event.put("start_time", "0");
event.put("shuffle", "false");
event.put("reason", "auto");
event.put("state", "app");

if (StringExt.a((CharSequence) musicPlaybackParams.e())) {
event.put("prev_audio_id", musicPlaybackParams.e());
}

if (StringExt.a((CharSequence) musicPlaybackParams.f())) {
event3.put("prev_playlist_id", musicPlaybackParams.f());
events.put(event);
}

eventsArray.put(event3);

JSONObject event4 = new JSONObject();
event4.put("e", "audio_ad");
event4.put("event", "not_received");
event4.put("section", h.v1());
eventsArray.put(event4);

JSONObject event5 = new JSONObject();
event5.put("e", "audio_player");
event5.put("state", "fullscreen");
event5.put("prev_state", "app");
eventsArray.put(event5);

String builder = String.format("API.stats.trackEvents(%s);", new JSONObject().put("events", eventsArray));

Metrics.trackEvents(builder);
// Metrics.sendStartEvent(musicPlaybackParams.c(), DeviceIdProvider.d(AndroidUtils.getGlobalContext()));
Metrics.trackEvents(events.toString());
}

private Analytics.l a(MusicPlaybackParams musicPlaybackParams, String str) {
Expand Down
49 changes: 8 additions & 41 deletions app/src/main/java/ru/vtosters/lite/music/Metrics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,25 @@

import android.util.Log;
import com.vk.core.network.Network;
import com.vk.core.util.DeviceIdProvider;
import okhttp3.*;
import ru.vtosters.lite.utils.AndroidUtils;
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.Request;
import okhttp3.Response;

import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;

import static com.vk.core.network.Network.ClientType.CLIENT_API;
import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;

public class Metrics {
public static void trackEvents(String event) {
try {
trackEventsRequest(event);
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
public static void trackEvents(String object) {
trackEventsRequest(object);
}

public static void sendStartEvent(String audio, String uuid) {
sendStartEventRequest(audio, uuid);
}

private static void sendStartEventRequest(String audio, String uuid) {
Request req = new Request.a()
.b("https://" + getApi() + "/method/audio.sendStartEvent?audio_id=" + audio +
"&uuid=" + uuid +
"&device_id=" + uuid +
"&sak_version=1.115" +
"&gaid=00000000-0000-0000-0000-000000000000" +
"&v=5.186&access_token=" + getUserToken())
.a();

Network.b(CLIENT_API).a(req).a(new Callback() {
@Override
public void a(Call call, IOException e) {
e.fillInStackTrace();
}

@Override
public void a(Call call, Response response) throws IOException {
Log.d("MusicMetrics", response.a().g());
}
});
}

private static void trackEventsRequest(String event) throws UnsupportedEncodingException {
private static void trackEventsRequest(String object) {
Request req = new Request.a()
.b("https://" + getApi() + "/method/execute?v=5.186&access_token=" + getUserToken() + "&device_id=" + DeviceIdProvider.d(AndroidUtils.getGlobalContext()))
.a(RequestBody.a(MediaType.a("application/x-www-form-urlencoded"), URLEncoder.encode(event, "UTF-8")))
.b("https://" + getApi() + "/method/stats.trackEvents?events=" + object + "&v=5.119&access_token=" + getUserToken())
.a();

Network.b(CLIENT_API).a(req).a(new Callback() {
Expand Down

0 comments on commit 93ff69e

Please sign in to comment.