Readme更新

先签到再兑换瓜子
小心心获取完毕后主动关闭浏览器加密连接
浏览器加密页面显示连接状态

diff --git a/F/api.go b/F/api.go
index 8d90dac487245f308bd6db3f286b0507c3c48a51..ce108774b05fb8bd7a550ff40cfe50ee75b94abe 100644 (file)
--- a/F/api.go
+++ b/F/api.go
@@ -1230,6 +1230,7 @@ func (i *api) F_x25Kn() (o *api) {
                        }
                }
                if num == 24 {
+                       Close(0)//关闭全部（0）浏览器websocket连接
                        apilog.L(`I: `,`今天小心心已满！`);return
                } else {
                        apilog.L(`I: `,`今天已有`,num,`个小心心，开始获取`)
@@ -1328,6 +1329,7 @@ func (i *api) F_x25Kn() (o *api) {
                                                }
                                        }
                                        if num == 24 {
+                                               Close(0)//关闭全部（0）浏览器websocket连接
                                                apilog.L(`I: `,`今天小心心已满！`);return
                                        } else {
                                                apilog.L(`I: `,`获取了今天的第`,num,`个小心心`)

diff --git a/F/xinxin.go b/F/xinxin.go
index 95320907e636b2a77a480ce3ed625b973ba280ca..c5e15319926e37131b08640248493551289e91d8 100644 (file)
--- a/F/xinxin.go
+++ b/F/xinxin.go
@@ -150,6 +150,14 @@ func Wasm(maxloop int, uid uintptr,s RT) (o string) {//maxloop 超时重试
        }
 }
 
+func Close(uid uintptr){
+       //获取websocket操作对象 关闭
+       ws.Interface().Push_tag(`close`,websocket.Uinterface{
+               Id:uid,
+               Data:[]byte(`获取结束、关闭连接`),
+       })
+}
+
 func test(uid uintptr) bool {
        time.Sleep(time.Second*time.Duration(3))
        if s := Wasm(3, uid, RT{

diff --git a/README.md b/README.md
index a5af3cc5abc57ba8078406c551695b78854591de..eeb8dc16e48d2e3cdfe86c15ba2faa228c059a21 100644 (file)
--- a/README.md
+++ b/README.md
@@ -291,18 +291,19 @@ I: 2021/02/18 14:40:54 Msg 礼 [SC:  加拉入我心 ￥ 30 关注了乙女音
 I: 2021/02/18 21:48:49 Msg 房 [欢迎舰长 Mana_单推... 进入直播间]
 ```
 
-- 流保存以及弹幕ass
+#### 流保存以及弹幕ass
 ```
 结束后会保存为
 房间号_时间.mkv
 房间号_时间.ass
 ```
-结束后的文件播放效果(显于左上)
+
+#### 结束后的文件播放效果(显于左上)
 ![](_Screenshot/Screenshot_20200926_173834.png)
 
 [截图地址](//zdir.ntsdtt.bid/ALL/Admin/pack/file/Screenshot_20200926_173834.png)
 
-- Gtk弹幕窗(Linux Only)
+#### Gtk弹幕窗(Linux Only)
 
 ![](_Screenshot/2020-12-12_16-43-09.gif)
 

diff --git a/bili_danmu.go b/bili_danmu.go
index f6e5455fe67bef55df8e35dda0d5b5e486ca48b8..748691c3fa1cc82520960f23ce8c3930934971bb 100644 (file)
--- a/bili_danmu.go
+++ b/bili_danmu.go
@@ -155,11 +155,10 @@ func Demo(roomid ...int) {
                        //获取房间相关信息
                        api := F.New_api(c.Roomid).Get_host_Token().Get_live()
                        c.Roomid = api.Roomid
-                       
-                       //每日兑换硬币
-                       F.Silver_2_coin()
                        //每日签到
                        F.Dosign()
+                       //每日兑换硬币
+                       F.Silver_2_coin()
                        //获取用户版本
                        api.Get_Version()
                        //获取热门榜
@@ -245,12 +244,12 @@ func Demo(roomid ...int) {
                                                                return true
                                                        },
                                                        `new day`:func(data interface{})(bool){//日期更换
+                                                               //每日签到
+                                                               F.Dosign()
                                                                //每日兑换硬币
                                                                go F.Silver_2_coin()
                                                                //小心心
                                                                go api.F_x25Kn()
-                                                               //每日签到
-                                                               F.Dosign()
                                                                //附加功能 每日发送弹幕
                                                                go reply.Entry_danmu()
                                                                return false

diff --git a/demo/config/README.md b/demo/config/README.md
index 3f2bcaebb3596a88f057a6ff011f9aa738e45675..5e37ca27a20c95032905aa1668c0da218221cbf3 100644 (file)
--- a/demo/config/README.md
+++ b/demo/config/README.md
@@ -7,6 +7,7 @@
 |config_F.json|额外功能开关|
 |config_disable_msg.json|禁用消息开关|
 |config_gtk_keep_key.json|gtk醒目提示时长|
+|config_auto_reply.json|反射弹幕机配置|
 |config_tts.json|语音提示模板|
 |config_K_v.json|Key-value键值设置|
 ---
\ No newline at end of file

diff --git a/demo/go.mod b/demo/go.mod
index 2b84bc2d5c56f4d9676da35f1e826d691ddccb84..241d8fcef0c5a348c6c3261cd59ff2e962d9a87d 100644 (file)
--- a/demo/go.mod
+++ b/demo/go.mod
@@ -11,13 +11,13 @@ require (
        github.com/miekg/dns v1.1.38 // indirect
        github.com/mitchellh/mapstructure v1.4.1 // indirect
        github.com/qydysky/bili_danmu v0.5.7
-       github.com/qydysky/part v0.4.3 // indirect
+       github.com/qydysky/part v0.4.4 // indirect
        github.com/shirou/gopsutil v3.21.1+incompatible // indirect
        github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
        github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
-       golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
+       golang.org/x/crypto v0.0.0-20210218145215-b8e89b74b9df // indirect
        golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
-       golang.org/x/sys v0.0.0-20210217105451-b926d437f341 // indirect
+       golang.org/x/sys v0.0.0-20210218155724-8ebf48af031b // indirect
 )
 
 replace (

diff --git a/demo/go.sum b/demo/go.sum
index 6d58b37882d3e8a4c74b44329686885ef9108d7f..f7b1ee8a23244f1312280a1046eaf79ad6c652a2 100644 (file)
--- a/demo/go.sum
+++ b/demo/go.sum
@@ -145,6 +145,8 @@ github.com/qydysky/part v0.4.2 h1:8guI/1YEwVsjTWuIPJ1euiSQbHYejWft4Tuhp8CVjAE=
 github.com/qydysky/part v0.4.2/go.mod h1:43opuciW71sZvOR67kye50jgMDSDrn/t6+LefNdlXPg=
 github.com/qydysky/part v0.4.3 h1:ckgSo+MefqrRgWdCjnHbJiS/Qy52VnzBj7YbFXPHNJU=
 github.com/qydysky/part v0.4.3/go.mod h1:43opuciW71sZvOR67kye50jgMDSDrn/t6+LefNdlXPg=
+github.com/qydysky/part v0.4.4 h1:RtUcO6LhfO8CKk+fOhtSiLu9/IOa5aOe0IjIjpU2Bbk=
+github.com/qydysky/part v0.4.4/go.mod h1:43opuciW71sZvOR67kye50jgMDSDrn/t6+LefNdlXPg=
 github.com/qydysky/part/msgq v0.0.0-20201213031129-ca3253dc72ad h1:Jtzf509lQrkUMGTV0Sc6IDCAiR1VrBcHrIban7hpye4=
 github.com/qydysky/part/msgq v0.0.0-20201213031129-ca3253dc72ad/go.mod h1:w32TkJNVtTJd4LOS09cq+4uYG6itcN2vsqw+slp44Rg=
 github.com/qydysky/part/msgq v0.0.0-20201213120821-f36e49c32bba h1:1ew9dRpc0Rux0WkWeT/4AE15ynYWmL2D7onJEJIFOB8=
@@ -193,6 +195,8 @@ golang.org/x/crypto v0.0.0-20201217014255-9d1352758620 h1:3wPMTskHO3+O6jqTEXyFcs
 golang.org/x/crypto v0.0.0-20201217014255-9d1352758620/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY=
 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20210218145215-b8e89b74b9df h1:y7QZzfUiTwWam+xBn29Ulb8CBwVN5UdzmMDavl9Whlw=
+golang.org/x/crypto v0.0.0-20210218145215-b8e89b74b9df/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -245,6 +249,8 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbq
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210217105451-b926d437f341 h1:2/QtM1mL37YmcsT8HaDNHDgTqqFVw+zr8UzMiBVLzYU=
 golang.org/x/sys v0.0.0-20210217105451-b926d437f341/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210218155724-8ebf48af031b h1:lAZ0/chPUDWwjqosYR0X4M490zQhMsiJ4K3DbA7o+3g=
+golang.org/x/sys v0.0.0-20210218155724-8ebf48af031b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

diff --git a/demo/html/bili.js b/demo/html/bili.js
index e795db8ec039446544dc0e7404dc8924e3bb8416..3530c9c1c92f15077343eefeb2eabda987b476ea 100644 (file)
--- a/demo/html/bili.js
+++ b/demo/html/bili.js
@@ -162,8 +162,17 @@ wasm.test = () => {
 (() => {
   if (window["WebSocket"]) {
     conn = new WebSocket("ws://" + document.location.host + "/ws");
+    conn.onopen = function () {
+      let e = document.getElementById(`status`);
+      e.innerHTML = "(使用中)";
+      e.style.color = "green";
+    }
     conn.onclose = function () {
-      location.reload();
+      console.log(`关闭`)
+      let e = document.getElementById(`status`);
+      e.innerHTML = "(已断开)";
+      e.style.color = "red";
+      // location.reload();
     };
     conn.onmessage = function (evt) {
       deal(evt.data)
@@ -185,6 +194,8 @@ wasm.test = () => {
         id:rt.r.id,
         s:s
       }));
+
+      console.log(rt.r.id, s)
     }
   }
 })();

diff --git a/demo/html/index.html b/demo/html/index.html
index d4f98136e44f6407ebe6ec35d070acf9a0010433..871f6899c36768798dba237044804e53dce307d1 100644 (file)
--- a/demo/html/index.html
+++ b/demo/html/index.html
@@ -20,7 +20,7 @@
     </style>
   </head>
   <body>
-    <h3>小心心加密页面</h3>
+    <h3>小心心加密页面 <span id="status"></span></h3>
     <h4>介绍</h4>
     <p>
       本页面用于在获取小心心过程中的加密问题。大致原理：加载wasm文件并处理golang-websocket发来的数据再返回加密字符串<br />