进入时显示主播id

diff --git a/CV/Var.go b/CV/Var.go
index 71b2422af2c8a6469009bba83cc90e25628fd1ea..db5066840bf3cbc41653ffc3f223996a71a90754 100644 (file)
--- 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 a4be0f73e02736a722e4666a1cb119e37c748731..b2de625594b0367f8a18f46aafcfaa8383489687 100644 (file)
--- 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 2335b47cab9043929667e7f776290932a8dfdc68..dc4bcea1860dfd39c1077fd037e4a0e07967b2fc 100644 (file)
--- 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)
                                                }
                                                {//附加功能 直播流保存 营收