命令行操作-房间信息&简化流程操作

diff --git a/F/README.md b/F/README.md
index 438fe73c2fba4015f1bb3a4c6939b6191426439d..a423dea2cba3f2cc1a2f82b9c9a091e264713d19 100644 (file)
--- a/F/README.md
+++ b/F/README.md
@@ -6,6 +6,7 @@
 |./|项目小工具|
 |B_I.go|字节整数互转模块|
 |F.go|websocket消息生成与检查模块|
+|cmd.go|命令行操作|
 |api.go|b站api获取模块|
 |CookieCrypo.go|cookie保存获取|
 |xinxin.go|小心心加密模块(websocket<->js)

diff --git a/F/cmd.go b/F/cmd.go
index 25a4e3b5d6f2895ab546fcde0951b6a2f1c758ac..37f20280d8bf724282afd79bac84ab1cd6b89998 100644 (file)
--- a/F/cmd.go
+++ b/F/cmd.go
@@ -5,6 +5,8 @@ import (
        "bufio"
        "strings"
        "strconv"
+       "time"
+       "fmt"
 
        p "github.com/qydysky/part"
        send "github.com/qydysky/bili_danmu/Send"
@@ -23,12 +25,14 @@ func Cmd() {
                if inputs := scanner.Text();inputs == `` {//帮助
                        cmdlog.L(`I: `, "切换房间->输入数字回车")
                        cmdlog.L(`I: `, "发送弹幕->输入' 字符串'回车")
+                       cmdlog.L(`I: `, "房间信息->输入' room'回车")
                        cmdlog.L(`I: `, "查看直播中主播->输入' live'回车")
                        cmdlog.L(`I: `, "其他输出隔断不影响")
                } else if inputs[0] == 27 {//屏蔽功能键
                        cmdlog.L(`W: `, "不支持功能键")
                } else if inputs[0] == 32 {// 开头
-                       if strings.Contains(inputs, ` live`) {//直播间切换
+                       //直播间切换
+                       if strings.Contains(inputs, ` live`) {
                                if len(inputs) > 5 {
                                        if room,ok := liveList[inputs];ok{
                                                c.Roomid = room
@@ -46,6 +50,32 @@ func Cmd() {
                                cmdlog.L(`I: `, "回复' live(序号)'进入直播间")
                                continue
                        }
+                       //当前直播间信息
+                       if strings.Contains(inputs, ` room`) {
+                               cmdlog.L(`I: `, "当前直播间信息")
+                               {
+                                       living := `未在直播`
+                                       if c.Liveing {living = `直播中`}
+                                       cmdlog.L(`I: `, c.Uname, c.Title, living)
+                               }
+                               {
+                                       if c.Liveing {
+                                               d := time.Since(c.Live_Start_Time).Round(time.Second)
+                                               h := d / time.Hour
+                                               d -= h * time.Hour
+                                               m := d / time.Minute
+                                               d -= m * time.Minute
+                                               s := d / time.Second
+                                               cmdlog.L(`I: `, `已直播时长:`, fmt.Sprintf("%02d:%02d:%02d", h, m, s))
+                                       }
+                               }
+                               {
+                                       cmdlog.L(`I: `, `营收:`, fmt.Sprintf("￥%.2f",c.Rev))
+                               }
+                               cmdlog.L(`I: `, `舰长数:`, c.GuardNum)
+                               cmdlog.L(`I: `, `分区排行:`, c.Note, `人气：`, c.Renqi)
+                               continue
+                       }
                        {//弹幕发送
                                if len(inputs) < 2 {
                                        cmdlog.L(`W: `, "输入长度过短", inputs)

diff --git a/bili_danmu.go b/bili_danmu.go
index d5d7a2d34e18fc93694558fad3e167003e1c26df..91f0c182e97fc6662427bd1a419b9168d1336439 100644 (file)
--- a/bili_danmu.go
+++ b/bili_danmu.go
@@ -163,16 +163,20 @@ func Demo(roomid ...int) {
                        
                //命令行操作 切换房间 发送弹幕
                go F.Cmd()
-
+               //兑换硬币
+               F.Silver_2_coin()
+               //每日签到
+               F.Dosign()
+               //附加功能 保持牌子点亮
+               go reply.Keep_medal_light()
+               //附加功能 自动发送即将过期礼物
+               go reply.AutoSend_silver_gift()
+               
                for !exit_sign {
                        danmulog.L(`T: `,"准备")
                        //获取房间相关信息
                        api := F.New_api(c.Roomid).Get_host_Token().Get_live()
                        c.Roomid = api.Roomid
-                       //每日签到
-                       F.Dosign()
-                       //每日兑换硬币
-                       F.Silver_2_coin()
                        //获取用户版本
                        api.Get_Version()
                        //获取热门榜
@@ -260,6 +264,8 @@ func Demo(roomid ...int) {
                                                        `new day`:func(data interface{})(bool){//日期更换
                                                                //每日签到
                                                                F.Dosign()
+                                                               //获取用户版本
+                                                               go api.Get_Version()
                                                                //每日兑换硬币
                                                                go F.Silver_2_coin()
                                                                //小心心
@@ -288,10 +294,6 @@ func Demo(roomid ...int) {
                                                        go reply.Entry_danmu()
                                                        go reply.Saveflvf()
                                                        go reply.ShowRevf()
-                                                       //附加功能 保持牌子点亮
-                                                       go reply.Keep_medal_light()
-                                                       //附加功能 自动发送即将过期礼物
-                                                       go reply.AutoSend_silver_gift()
                                                }
                                        }()
                                }