feat: 加入早安歌曲，调整UI

Author: 0neSe7en

fm.go

@@ -188,7 +188,7 @@ func main() {
 	defer fm.player.close()
 
 	UI.app.SetInputCapture(fm.handle)
-	UI.footerTopic.SetText("| " + strings.Join(s, " | ") + " |")
+	UI.footerTopic.SetText("|" + strings.Join(s, "|") + "|")
 
 	fm.switchTopic()
 	fm.play()

jike/session.go

@@ -110,15 +110,15 @@ func WaitLogin(uuid string) bool {
 	req.URL.RawQuery = q.Encode()
 	resp, err := client().Do(req)
 	if err != nil {
-		log.Println(err, "wait login fail")
+		//log.Println(err, "wait login fail")
 		return false
 	}
 	body, _ := ioutil.ReadAll(resp.Body)
 	var data struct {
 		LoggedIn bool `json:"logged_in"`
 	}
 	if err := json.Unmarshal(body, &data); err != nil {
-		log.Println(err, "wait login fail")
+		//log.Println(err, "wait login fail")
 		return false
 	}
 	return data.LoggedIn

topic.go

@@ -19,6 +19,7 @@ type TopicList map[string]*Topic
 
 var topicOrder = []string{
 	"55483ddee4b03ccbae843925",
+	"5899dc1063ed1a0015bade08",
 	"5a1ccf936e6e7c0011037480",
 }
 
@@ -28,6 +29,11 @@ var topics = TopicList{
 		name: "晚安电台",
 		playing: -1,
 	},
+	"5899dc1063ed1a0015bade08": {
+		id: "5899dc1063ed1a0015bade08",
+		name: "早安歌曲",
+		playing: -1,
+	},
 	"5a1ccf936e6e7c0011037480": {
 		id: "5a1ccf936e6e7c0011037480",
 		name: "即友在听什么歌",

ui.go

@@ -32,7 +32,7 @@ var headerTpl = `
 
 `
 
-var footerTpl = `ENTER [green]播放[white]  SPACE [green]暂停[white] CTRL-N/CTRL-P [green]下一首/上一首[white]  `
+var footerTpl = `TAB [green]切换圈子 ENTER [green]播放[white] SPACE [green]暂停[white] CTRL-N/CTRL-P [green]下/上一首[white]  `
 var normalTpl = "[yellow]% 3d) \t[-:-:-]%s"
 var playingTpl = "[purple]% 3d) \t->[::b] %s"
 
@@ -48,11 +48,11 @@ func init() {
 			SetDynamicColors(true).SetRegions(true).SetWrap(false).SetTextAlign(tview.AlignRight).
 			SetText(footerTpl),
 	}
-	UI.root.SetRect(0, 0, 100, 40)
+	UI.root.SetRect(0, 0, 110, 40)
 	UI.header.SetBorder(true).SetTitle("即刻电台 " + version)
 
 	footerContainer := tview.NewFlex().SetDirection(tview.FlexColumn).
-		AddItem(UI.footerTopic, 40, 1, false).
+		AddItem(UI.footerTopic, 44, 1, false).
 		AddItem(UI.footerHelp, 0, 1, false)
 
 	footerContainer.SetBackgroundColor(tcell.ColorGrey)
@@ -80,7 +80,7 @@ func addTopic(topicId string) *TopicUI {
 	mainContainer.SetBorder(true).SetBorderPadding(1, 0, 2, 2)
 
 	topicUI.root.
-		AddItem(topicUI.side, 40, 1, true).
+		AddItem(topicUI.side, 44, 1, true).
 		AddItem(mainContainer, 0, 1, false)
 
 	UI.topics = append(UI.topics, topicUI)