proto更新

Demo/Xigua.proto

@@ -1,13 +1,11 @@
 syntax = "proto2";
-import "XiguaCommon.proto";
-
 
 message XiguaLive {
 	message Data {
 		// WebcastChatMessage 聊天
 		// WebcastGiftMessage 礼物
 		required string method = 1;
-		required Message message = 2;
+		required bytes raw = 2;
 	}
 	repeated Data data = 1;
 	required string cursor = 2;

Demo/XiguaCommon.proto

@@ -1,42 +0,0 @@
-syntax = "proto2";
-import "XiguaUser.proto";
-import "XiguaGift.proto";
-message Message {
-	required CommonInfo commonInfo = 1;
-	required bytes content2 = 2;
-	required bytes content3 = 3;
-	required bytes content4 = 4;
-	optional bool isFinished = 9 [ default = false ];
-}
-// 样式
-message Style {
-	optional string color = 1;
-	optional int32 fontWeight = 4;
-}
-// 参数
-message Params {
-	// 1 字符串
-	// 11 用户
-	// 12 礼物
-	required int32 type = 1;
-	optional Style style = 2;
-	optional string string = 11;
-	optional UserPack users = 21;
-	optional GiftPack gifts = 22;
-}
-// 自定义显示信息
-message DisplayText {
-	// 参数
-	required string method = 1;
-	required string format = 2;
-	optional Style bgStyle = 3;
-	required Params params = 4;
-}
-// 通用定义
-message CommonInfo {
-	optional string method = 1;
-	optional int32 msg_id = 2;
-	optional int32 room_id = 3;
-	optional int32 create_time = 4;
-	optional DisplayText displayText = 8;
-}

Demo/XiguaMessage.proto

@@ -0,0 +1,79 @@
+syntax = "proto2";
+import "XiguaUser.proto";
+import "XiguaGift.proto";
+message Message {
+	required CommonInfo commonInfo = 1;
+	required bytes content2 = 2;
+	required bytes content3 = 3;
+	required bytes content4 = 4;
+}
+message FansClubMessage {
+	required CommonInfo commonInfo = 1;
+	required int32 someEnum = 2;
+	required int32 someInt3 = 3;
+	required User user = 4;
+}
+message UserSeqMessage {
+	required CommonInfo commonInfo = 1;
+	required string popularityText = 4;
+	required int32 popularity = 6;
+}
+message DailyRankMessage {
+	required CommonInfo commonInfo = 1;
+	required int32 ranking = 10;
+}
+message ChatMessage {
+	required CommonInfo commonInfo = 1;
+	required User user = 2;
+	required string content = 3;
+}
+message MemberMessage {
+	required CommonInfo commonInfo = 1;
+	required User user = 2;
+	required string popularityText = 14;
+}
+message GiftMessage {
+	required CommonInfo commonInfo = 1;
+	required int32 giftId = 2;
+	// 可能是GroupId之类的东西
+//	required int32 UNKNOWN_INT = 3;
+	required int32 content4 = 4;
+	// 5,6 顺序可能不对
+	required int32 repeated = 5;
+	required int32 combo = 6;
+	required User user = 7;
+	optional bool isFinished = 9 [ default = false ];
+}
+// 样式
+message Style {
+	optional string color = 1;
+	optional int32 fontWeight = 4;
+}
+// 参数
+message Params {
+	// 1 字符串
+	// 11 用户
+	// 12 礼物
+	required int32 type = 1;
+	optional Style style = 2;
+	optional string string = 11;
+	optional UserPack users = 21;
+	optional GiftPack gifts = 22;
+}
+// 自定义显示信息
+message DisplayText {
+	// 参数
+	required string method = 1;
+	required string format = 2;
+	optional Style bgStyle = 3;
+	required Params params = 4;
+}
+// 通用定义
+message CommonInfo {
+	required string method = 1;
+	required int32 msg_id = 2;
+	required int32 room_id = 3;
+	required int32 create_time = 4;
+	optional int32 someEnum = 6;
+	optional DisplayText displayText = 8;
+}

Demo/XiguaUser.proto

@@ -3,6 +3,36 @@ syntax = "proto2";
 message UserPack {
 	required User user = 1;
 }
+// 头衔
+message Badge {
+	message FanClubText {
+		required string text = 1;
+		optional string color = 2;
+		required int32 level = 3;
+	}
+	repeated string url = 1;
+	optional string localUrl = 2;
+	optional int32 height = 3;
+	optional int32 width = 4;
+	// 3 房管
+	// 6 贵族
+	// 7 粉丝团
+	optional int32 type = 6;
+	optional string clickTo = 7;
+	optional FanClubText fanClubText = 8;
+}
+message FansClubBadgePack {
+	required Badge badge = 1;
+	required string title = 2;
+}
+message FansClubPack {
+	message FansClub {
+		required string text = 1;
+		required int32 level = 2;
+		optional int32 someEnum = 3;
+		required FansClubBadgePack fansClubs = 4;
+	}
+}
 // 用户信息
 message User {
 	// 头像
@@ -10,24 +40,6 @@ message User {
 		required string url = 1;
 		optional string id = 2;
 	}
-	// 头衔
-	message Badge {
-		message FanClubText {
-			required string text = 1;
-			optional string color = 2;
-			required int32 level = 3;
-		}
-		repeated string url = 1;
-		optional string localUrl = 2;
-		optional int32 height = 3;
-		optional int32 width = 4;
-		// 3 房管
-		// 6 贵族
-		// 7 粉丝团
-		optional int32 type = 6;
-		optional string clickTo = 7;
-		optional FanClubText fanClubText = 8;
-	}
 	// 粉丝和粉
 	message Follow {
 		optional int32 following = 1 [default = 0];