获取直播流前先清空

diff --git a/F/api.go b/F/api.go
index c1aad02cafdc0b290570aadfe48e86a51b74fb04..b606ee393b81fea0f6c4bd9813056c25eebea91a 100644 (file)
--- a/F/api.go
+++ b/F/api.go
@@ -271,6 +271,7 @@ func Html() (missKey []string) {
                                                                c.AcceptQn = tmp
                                                        }
                                                        //直播流链接
+                                                       c.Live = []string{}
                                                        for _,v1 := range v.URLInfo {
                                                                c.Live = append(c.Live, v1.Host+v.BaseURL+v1.Extra)
                                                        }
@@ -475,6 +476,7 @@ func getRoomPlayInfo() (missKey []string) {
                                                c.AcceptQn = tmp
                                        }
                                        //直播流链接
+                                       c.Live = []string{}
                                        for _,v1 := range v.URLInfo {
                                                c.Live = append(c.Live, v1.Host+v.BaseURL+v1.Extra)
                                        }
@@ -579,6 +581,7 @@ func getRoomPlayInfoByQn() (missKey []string) {
                                                c.AcceptQn = tmp
                                        }
                                        //直播流链接
+                                       c.Live = []string{}
                                        for _,v1 := range v.URLInfo {
                                                c.Live = append(c.Live, v1.Host+v.BaseURL+v1.Extra)
                                        }

diff --git a/Reply/F.go b/Reply/F.go
index 6811ee7012e421ccd4a83a5cb0067a54c289c41e..8f79fe1f8cad18de56095dca416fb729d12a2c4f 100644 (file)
--- a/Reply/F.go
+++ b/Reply/F.go
@@ -248,14 +248,6 @@ func Saveflvf(){
                        CookieM[k.(string)] = v.(string)
                        return true
                })
-               Cookie := p.Map_2_Cookies_String(CookieM)
-               if i := strings.Index(Cookie, "PVID="); i != -1 {
-                       if d := strings.Index(Cookie[i:], ";"); d == -1 {
-                               Cookie = Cookie[:i]
-                       } else {
-                               Cookie = Cookie[:i] + Cookie[i + d + 1:]
-                       }
-               }
 
                {//重试
                        l.L(`I: `,"尝试连接live")
@@ -264,7 +256,7 @@ func Saveflvf(){
                                Retry:10,
                                SleepTime:5,
                                Header:map[string]string{
-                                       `Cookie`:Cookie,
+                                       `Cookie`:p.Map_2_Cookies_String(CookieM),
                                },
                                Timeout:5,
                                JustResponseCode:true,
@@ -288,7 +280,7 @@ func Saveflvf(){
                        Retry:10,
                        SleepTime:5,
                        Header:map[string]string{
-                               `Cookie`:Cookie,
+                               `Cookie`:p.Map_2_Cookies_String(CookieM),
                        },
                        SaveToPath:saveflv.path + ".flv",
                        Timeout:-1,