From d93bf67b4413041687dea509e4a7caef35edf7d0 Mon Sep 17 00:00:00 2001
From: qydysky <qydysky@foxmail.com>
Date: Sun, 15 Nov 2020 06:44:14 +0800
Subject: [PATCH] =?utf8?q?=E8=90=A5=E6=94=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/go.yml   |  6 ++++--
 .github/workflows/test.yml |  6 ++++--
 Reply/F.go                 | 23 +++++++++++++++++------
 Reply/Reply.go             |  1 +
 bili_danmu.go              |  3 ++-
 demo/go.mod                |  2 +-
 demo/go.sum                |  2 --
 7 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 0355ded..a8115c7 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -50,7 +50,8 @@ jobs:
     - name: Build
       run: |
         sudo apt-get install libgtk-3-dev libcairo2-dev libglib2.0-dev
-        go build -v -buildmode=exe -tags gtk_3_24 -o demo/demo.run -i demo/main.go
+        cd demo
+        go build -v -buildmode=exe -tags gtk_3_24 -o demo.run -i main.go
       
     - name: zip
       run: zip -q -r ubuntu_go${{ matrix.go }}.zip *
@@ -107,7 +108,8 @@ jobs:
         export CGO_LDFLAGS_ALLOW="-Wl.*"
         export CGO_CFLAGS_ALLOW="-Wl.*"
         export CGO_CXXFLAGS_ALLOW="-Wl.*"
-        go build -v -buildmode=exe -tags gtk_3_24 -o demo/demo.exe -i demo/main.go
+        cd demo
+        go build -v -buildmode=exe -tags gtk_3_24 -o demo.exe -i main.go
         
     - name: zip
       run: .\7za.exe a -r .\windows_go${{ matrix.go }}.zip ./
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 78f99ab..ea18c58 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,7 +25,8 @@ jobs:
     - name: Build
       run: |
         sudo apt-get install libgtk-3-dev libcairo2-dev libglib2.0-dev
-        go build -v -buildmode=exe -tags gtk_3_24 -o demo/demo.run -i demo/main.go
+        cd demo
+        go build -v -buildmode=exe -tags gtk_3_24 -o demo.run -i main.go
       
     - name: zip
       run: zip -q -r ubuntu_go${{ matrix.go }}.zip *
@@ -64,7 +65,8 @@ jobs:
         export CGO_LDFLAGS_ALLOW="-Wl.*"
         export CGO_CFLAGS_ALLOW="-Wl.*"
         export CGO_CXXFLAGS_ALLOW="-Wl.*"
-        go build -v -buildmode=exe -tags gtk_3_24 -o demo/demo.exe -i demo/main.go
+        cd demo
+        go build -v -buildmode=exe -tags gtk_3_24 -o demo.exe -i main.go
         
     - name: zip
       run: .\7za.exe a -r .\windows_go${{ matrix.go }}.zip ./
diff --git a/Reply/F.go b/Reply/F.go
index 92e8c97..55354ce 100644
--- a/Reply/F.go
+++ b/Reply/F.go
@@ -23,7 +23,7 @@ import (
 
 //功能开关
 var AllF = map[string]bool{
-	`ShowRec`:true,//显示本次营收
+	`ShowRev`:true,//显示本次营收
 	"Gtk":false,//Gtk弹幕窗口
 	"Saveflv":true,//保存直播流(默认高清，有cookie默认蓝光)
 	"Ass":true,//Ass弹幕生成，由于时间对应关系,仅开启流保存时生效
@@ -116,12 +116,23 @@ func selfcross2(a []string) (float32, string) {
 }
 
 //功能区
-//ShowRec 显示h营收
-func ShowRecf(){
-	if!IsOn("ShowRec") {return}
+//ShowRev 显示h营收
+var (
+	ShowRev_old float64
+	ShowRev_start bool
+)
+
+func ShowRevf(){
+	if!IsOn("ShowRev") {return}
+	if ShowRev_start {
+		p.Logf().New().Open("danmu.log").Base(1, "Rev").I("营收 ￥", ShowRev)
+		return
+	}
+	ShowRev_start = true
 	for {
-		p.Sys().Timeoutf(60)
-		p.Logf().New().Open("danmu.log").Base(1, "Rec").I("营收 ￥", c.Rev)
+		p.Logf().New().Open("danmu.log").Base(1, "Rev").I("营收 ￥", ShowRev)
+		for c.Rev == ShowRev {p.Sys().Timeoutf(60)}
+		ShowRev = c.Rev
 	}
 }
 
diff --git a/Reply/Reply.go b/Reply/Reply.go
index d3760ef..3edc063 100644
--- a/Reply/Reply.go
+++ b/Reply/Reply.go
@@ -359,6 +359,7 @@ func (replyF) preparing(s string) {
 			Obs_R(false)
 			Obsf(false)
 			Saveflv_wait()
+			go reply.ShowRecf()
 		}
 		if p.Sys().Type(roomid) == "float64" {
 			Gui_show(Itos([]interface{}{"房间", roomid, "下播了"}), "0room")
diff --git a/bili_danmu.go b/bili_danmu.go
index f2bc382..276b593 100644
--- a/bili_danmu.go
+++ b/bili_danmu.go
@@ -93,9 +93,10 @@ func Demo(roomid ...int) {
 						if p.Checkfile().IsExist("cookie.txt") {//附加功能 弹幕机
 							reply.Danmuji_auto(1)
 						}
-						{//附加功能 直播流保存 Gtk窗口
+						{//附加功能 直播流保存 Gtk窗口 营收
 							go reply.Saveflvf()
 							go reply.Gtkf()
+							go reply.ShowRecf()
 						}
 					}()
 				}
diff --git a/demo/go.mod b/demo/go.mod
index 707742b..3f38863 100644
--- a/demo/go.mod
+++ b/demo/go.mod
@@ -16,6 +16,6 @@ require (
 )
 
 replace (
-	github.com/qydysky/bili_danmu => ../
 	github.com/gotk3/gotk3 v0.5.0 => github.com/qydysky/gotk3 v0.5.1-0.20201114200959-3165c4dc990f
+	github.com/qydysky/bili_danmu => ../
 )
diff --git a/demo/go.sum b/demo/go.sum
index 61f935f..0e14ac2 100644
--- a/demo/go.sum
+++ b/demo/go.sum
@@ -14,8 +14,6 @@ github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e/go.mod h1:wJfORR
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gotk3/gotk3 v0.5.1-0.20201111061058-cdb396edc76f h1:pqE4gan8c1ZSjo32V9QD5P41pM5Tlas9gzI+rcYUaI8=
-github.com/gotk3/gotk3 v0.5.1-0.20201111061058-cdb396edc76f/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
 github.com/klauspost/compress v1.10.10/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.0 h1:wJbzvpYMVGG9iTI9VxpnNZfd4DzMPoCWze3GgSqz8yg=
 github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-- 
2.39.2