Smartcraft-Media-Tech/TikTokLiveJava
1
0
Fork 0
mirror of https://github.com/jwdeveloper/TikTokLiveJava.git synced 2026-02-27 08:49:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Slight change of decoding for TikTokWebSocketEulerListener!

Browse Source
This commit is contained in:
kohlerpop1
2025-10-04 22:38:47 -04:00
parent 1e78fdda89
commit a0c445656c
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
API/src/main/proto/data.proto
View File

@@ -62,12 +62,11 @@ message Text {
int32 type = 1; int32 type = 1;
TextFormat format = 2; TextFormat format = 2;
string stringValue = 11; string stringValue = 11;
oneof textPieceType TextPieceUser userValue = 21;
{ TextPieceGift giftValue = 22;
TextPieceUser userValue = 21; TextPieceHeart heartValue = 23;
TextPieceGift giftValue = 22;
}
TextPiecePatternRef patternRefValue = 24; TextPiecePatternRef patternRefValue = 24;
TextPieceImage imageValue = 25;
} }
message TextFormat { message TextFormat {
@@ -83,7 +82,7 @@ message Text {
message TextPieceGift { message TextPieceGift {
int32 giftId = 1; int32 giftId = 1;
PatternRef nameRef = 2; TextPiecePatternRef nameRef = 2;
ShowType showType = 3; // Enum ShowType showType = 3; // Enum
int64 colorId = 4; int64 colorId = 4;
} }
@@ -98,16 +97,19 @@ message Text {
bool withColon = 2; bool withColon = 2;
} }
message PatternRef {
string key = 1;
string default_pattern = 2;
}
enum ShowType { enum ShowType {
SHOW_TYPE_NORMAL = 0; SHOW_TYPE_NORMAL = 0;
SHOW_TYPE_FADE_IN_OUT = 1; SHOW_TYPE_FADE_IN_OUT = 1;
} }
message TextPieceHeart {
string color = 1;
}
message TextPieceImage {
Image image_model = 1;
}
} }
// @Image // @Image
@@ -151,7 +153,7 @@ message BadgeStruct {
bool is_customized = 24; bool is_customized = 24;
message CombineBadge { message CombineBadge {
int32 badge_display_type = 1; BadgeDisplayType badge_display_type = 1;
Image icon = 2; Image icon = 2;
TextBadge text = 3; TextBadge text = 3;
string str = 4; string str = 4;

3
Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/euler/TikTokWebSocketEulerListener.java
View File

@@ -56,7 +56,7 @@ public class TikTokWebSocketEulerListener extends TikTokWebSocketListener
switch (oMsg.get("type").getAsString()) { // Should only receive these 2 types ever switch (oMsg.get("type").getAsString()) { // Should only receive these 2 types ever
case "workerInfo" -> liveClient.getLogger().info(oMsg.toString()); // Always 1st message case "workerInfo" -> liveClient.getLogger().info(oMsg.toString()); // Always 1st message
case "roomInfo" -> { // Always 2nd message case "roomInfo" -> { // Always 2nd message
LiveUserData.Response data = LiveUserDataMapper.map(oMsg.getAsJsonObject("data").getAsJsonObject("data").getAsJsonObject("raw").toString(), liveClient.getLogger()); LiveUserData.Response data = LiveUserDataMapper.map(oMsg.getAsJsonObject("data").getAsJsonObject("raw").toString(), liveClient.getLogger());
liveClient.getRoomInfo().copy(data.getRoomInfo()); liveClient.getRoomInfo().copy(data.getRoomInfo());
eventHandler.publish(liveClient, new TikTokRoomInfoEvent(liveClient.getRoomInfo())); eventHandler.publish(liveClient, new TikTokRoomInfoEvent(liveClient.getRoomInfo()));
} }
@@ -67,6 +67,7 @@ public class TikTokWebSocketEulerListener extends TikTokWebSocketListener
} else } else
throw new IllegalArgumentException("Invalid JsonObject: "+element); throw new IllegalArgumentException("Invalid JsonObject: "+element);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
eventHandler.publish(liveClient, new TikTokErrorEvent(e)); eventHandler.publish(liveClient, new TikTokErrorEvent(e));
} }
if (isOpen()) { if (isOpen()) {