营收优化

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 0355ded7e7c2c0f751f41aae5f6618d49c7c968b..a8115c7fb57ef7012cec074eb4a0914add0d6bea 100644 (file)
--- 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 78f99ab9139681903cb7773586c6b1dea3ffeef8..ea18c58dde6575276f4ce548e692ce840cf64cbb 100644 (file)
--- 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 92e8c97d33a3ce6a16cca9e4743ebfab774324db..55354cecb262d486608adcbf022d1f5e51f4ed9e 100644 (file)
--- 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 d3760ef3a9d27612c206894a1f788ec85ae69c59..3edc06335a0e30fdf8492f3010901729255d126a 100644 (file)
--- 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 f2bc3827c46e002976d5c47b25ab735b23f0f8e8..276b593dd45e26d0b6c5e53f0ad3e1489c53b4d1 100644 (file)
--- 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 707742bf3dca567409e350b35c418dc47d1d6e0f..3f388634d6c7b18109ba4694383baafd862f17b9 100644 (file)
--- 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 61f935fd1d332e6e9e205b1ecfaaf3026b6a6cda..0e14ac25e77281aa5b13a96fd2f0b46ec4948917 100644 (file)
--- 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=