mirror of
https://github.com/jwdeveloper/TikTokLiveJava.git
synced 2026-02-28 09:19:40 -05:00
Compare commits
2 Commits
1.11.3-Rel
...
1.11.4-Rel
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a0c445656c | ||
|
|
1e78fdda89 |
@@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>TikTokLiveJava</artifactId>
|
<artifactId>TikTokLiveJava</artifactId>
|
||||||
<groupId>io.github.jwdeveloper.tiktok</groupId>
|
<groupId>io.github.jwdeveloper.tiktok</groupId>
|
||||||
<version>1.11.2-Release</version>
|
<version>1.11.3-Release</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>API</artifactId>
|
<artifactId>API</artifactId>
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>TikTokLiveJava</artifactId>
|
<artifactId>TikTokLiveJava</artifactId>
|
||||||
<groupId>io.github.jwdeveloper.tiktok</groupId>
|
<groupId>io.github.jwdeveloper.tiktok</groupId>
|
||||||
<version>1.11.2-Release</version>
|
<version>1.11.3-Release</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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()) {
|
||||||
|
|||||||
@@ -41,7 +41,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>TikTokLiveJava</artifactId>
|
<artifactId>TikTokLiveJava</artifactId>
|
||||||
<groupId>io.github.jwdeveloper.tiktok</groupId>
|
<groupId>io.github.jwdeveloper.tiktok</groupId>
|
||||||
<version>1.11.2-Release</version>
|
<version>1.11.3-Release</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.github.jwdeveloper.tiktok</groupId>
|
<groupId>io.github.jwdeveloper.tiktok</groupId>
|
||||||
<artifactId>TikTokLiveJava</artifactId>
|
<artifactId>TikTokLiveJava</artifactId>
|
||||||
<version>1.11.2-Release</version>
|
<version>1.11.3-Release</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>TikTokLiveJava</artifactId>
|
<artifactId>TikTokLiveJava</artifactId>
|
||||||
<groupId>io.github.jwdeveloper.tiktok</groupId>
|
<groupId>io.github.jwdeveloper.tiktok</groupId>
|
||||||
<version>1.11.2-Release</version>
|
<version>1.11.3-Release</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>extension-recorder</artifactId>
|
<artifactId>extension-recorder</artifactId>
|
||||||
|
|||||||
2
pom.xml
2
pom.xml
@@ -7,7 +7,7 @@
|
|||||||
<groupId>io.github.jwdeveloper.tiktok</groupId>
|
<groupId>io.github.jwdeveloper.tiktok</groupId>
|
||||||
<artifactId>TikTokLiveJava</artifactId>
|
<artifactId>TikTokLiveJava</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<version>1.11.2-Release</version>
|
<version>1.11.3-Release</version>
|
||||||
<modules>
|
<modules>
|
||||||
<module>API</module>
|
<module>API</module>
|
||||||
<module>Client</module>
|
<module>Client</module>
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>TikTokLiveJava</artifactId>
|
<artifactId>TikTokLiveJava</artifactId>
|
||||||
<groupId>io.github.jwdeveloper.tiktok</groupId>
|
<groupId>io.github.jwdeveloper.tiktok</groupId>
|
||||||
<version>1.11.2-Release</version>
|
<version>1.11.3-Release</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user