From: qydysky <qydysky@foxmail.com>
Date: Sun, 20 Dec 2020 04:33:26 +0000 (+0800)
Subject: 进入时显示主播id
X-Git-Tag: v0.5.5~1^2~8
X-Git-Url: http://127.0.0.1:8081/?a=commitdiff_plain;h=57acc6b0394bcf4de498f0e5132453684fadc0b6;p=bili_danmu%2F.git

进入时显示主播id
---

diff --git a/CV/Var.go b/CV/Var.go
index 71b2422..db50668 100644
--- a/CV/Var.go
+++ b/CV/Var.go
@@ -11,7 +11,8 @@ var (
 	Live_qn string
 	Roomid int
 	Cookie string
-	Title string
+	Title string//直播标题
+	Uname string//主播id
 	Rev float64//营收
 	Renqi int//人气
 	GuardNum int//舰长数
diff --git a/F/api.go b/F/api.go
index a4be0f7..b2de625 100644
--- a/F/api.go
+++ b/F/api.go
@@ -60,6 +60,10 @@ func (i *api) Get_info() (o *api) {
 	if e := r.S(`"title":"`, `",`, 0, 0).Err;e == nil {
 		c.Title = r.RS[0]
 	}
+	//主播id
+	if e := r.S(`"base_info":{"uname":"`, `",`, 0, 0).Err;e == nil {
+		c.Uname = r.RS[0]
+	}
 	//排行
 	if e := r.S(`"rank_desc":"`, `",`, 0, 0).Err;e == nil {
 		c.Note = r.RS[0]
@@ -94,8 +98,12 @@ func (i *api) Get_info() (o *api) {
 			apilog.E("code", code, p.Json().GetValFrom(res, "message"))
 			return
 		}
+		//主播id
+		if Uname,ok := p.Json().GetValFrom(res, "data.anchor_info.base_info.uname").(string);ok && c.Uname == `` {
+			c.Uname = Uname
+		}
 		//排行
-		if rank_desc,ok := p.Json().GetValFrom(res, "data.rankdb_info.rank_desc").(string);ok {
+		if rank_desc,ok := p.Json().GetValFrom(res, "data.rankdb_info.rank_desc").(string);ok && c.Note == `` {//有时会返回`小时总榜`
 			c.Note = rank_desc
 		}
 		if Uid := p.Json().GetValFrom(res, "data.room_info.uid");Uid == nil {
diff --git a/bili_danmu.go b/bili_danmu.go
index 2335b47..dc4bcea 100644
--- a/bili_danmu.go
+++ b/bili_danmu.go
@@ -72,6 +72,7 @@ func Demo(roomid ...int) {
 						c.Renqi = 1//人气置1
 						c.GuardNum = 0//舰长数
 						c.Note = ``//分区排行
+						c.Uname = ``//主播id
 						c.Title = ``
 						reply.Saveflv_wait()//停止保存直播流
 						change_room_chan <- true
@@ -124,8 +125,8 @@ func Demo(roomid ...int) {
 				danmulog.I("连接", v)
 				ws.SendChan <- F.HelloGen(api.Roomid, api.Token)
 				if F.HelloChe(<- ws.RecvChan) {
-					danmulog.I("已连接到房间", c.Roomid)
-					reply.Gui_show(`进入直播间: `+strconv.Itoa(c.Roomid), `0room`)
+					danmulog.I("已连接到房间", c.Uname, `(`, c.Roomid, `)`)
+					reply.Gui_show(`进入直播间: `+c.Uname+` (`+strconv.Itoa(c.Roomid)+`)`, `0room`)
 					if c.Title != `` {
 						danmulog.I(c.Title)
 						reply.Gui_show(`房间标题: `+c.Title, `0room`)
@@ -165,7 +166,7 @@ func Demo(roomid ...int) {
 							}
 						}()
 
-						if p.Checkfile().IsExist("cookie.txt") {//附加功能 弹幕机
+						if c.Cookie != `` {//附加功能 弹幕机 无cookie无法发送弹幕
 							reply.Danmuji_auto(1)
 						}
 						{//附加功能 直播流保存 营收