From e16c1b16c154a2685cad884b1e057b4c82df6013 Mon Sep 17 00:00:00 2001
From: qydysky <qydysky@foxmail.com>
Date: Mon, 9 May 2022 17:11:11 +0800
Subject: [PATCH] =?utf8?q?=E4=B8=8B=E6=92=AD=E5=81=9C=E6=AD=A2=E6=B5=81?=
 =?utf8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Reply/Reply.go            | 18 +++++++-----------
 Reply/ws_msg/PREPARING.go | 10 ++++++++++
 2 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 Reply/ws_msg/PREPARING.go

diff --git a/Reply/Reply.go b/Reply/Reply.go
index a7479e9..84b80dd 100644
--- a/Reply/Reply.go
+++ b/Reply/Reply.go
@@ -662,8 +662,9 @@ func (replyF) room_block_msg(s string) {
 func (replyF) preparing(s string) {
 	msglog := msglog.Base_add("房")
 
-	if roomid := p.Json().GetValFromS(s, "roomid"); roomid == nil {
-		msglog.L(`E: `, "roomid", roomid)
+	var type_item ws_msg.PREPARING
+	if err := json.Unmarshal([]byte(s), &type_item); err != nil {
+		msglog.L(`E: `, err)
 		return
 	} else {
 		{ //附加功能 obs结束 `savestream`结束
@@ -671,17 +672,12 @@ func (replyF) preparing(s string) {
 			Obsf(false)
 			go ShowRevf()
 			c.C.Liveing = false
-		}
-		if p.Sys().Type(roomid) == "float64" {
 			// 停止此房间录制
-			StreamOStop(int(roomid.(float64)))
-
-			Gui_show(Itos([]interface{}{"房间", roomid, "下播了"}), "0room")
-			msglog.L(`I: `, "房间", int(roomid.(float64)), "下播了")
-			return
+			var roomId, _ = strconv.Atoi(type_item.Roomid)
+			StreamOStop(roomId)
 		}
-		Gui_show(Itos([]interface{}{"房间", roomid, "下播了"}), "0room")
-		msglog.L(`I: `, "房间", roomid, "下播了")
+		Gui_show("房间", type_item.Roomid, "下播了", "0room")
+		msglog.L(`I: `, "房间", type_item.Roomid, "下播了")
 	}
 }
 
diff --git a/Reply/ws_msg/PREPARING.go b/Reply/ws_msg/PREPARING.go
new file mode 100644
index 0000000..0f8d786
--- /dev/null
+++ b/Reply/ws_msg/PREPARING.go
@@ -0,0 +1,10 @@
+package part
+
+type PREPARING struct {
+	Cmd    string `json:"cmd"`
+	Roomid string `json:"roomid"`
+}
+
+/*
+{"cmd":"PREPARING","roomid":"394988"}
+*/
-- 
2.39.2