From 78d9bde8b3539cf3a94589cb8f854316f8311364 Mon Sep 17 00:00:00 2001
From: qydysky <qydysky@foxmail.com>
Date: Sun, 7 Mar 2021 16:54:17 +0800
Subject: [PATCH] =?utf8?q?=E5=91=BD=E4=BB=A4=E8=A1=8C=E6=93=8D=E4=BD=9C-?=
 =?utf8?q?=E6=88=BF=E9=97=B4=E4=BF=A1=E6=81=AF&=E7=AE=80=E5=8C=96=E6=B5=81?=
 =?utf8?q?=E7=A8=8B=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 F/README.md   |  1 +
 F/cmd.go      | 32 +++++++++++++++++++++++++++++++-
 bili_danmu.go | 20 +++++++++++---------
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/F/README.md b/F/README.md
index 438fe73..a423dea 100644
--- 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 25a4e3b..37f2028 100644
--- 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 d5d7a2d..91f0c18 100644
--- 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()
 						}
 					}()
 				}
-- 
2.39.2