From c506dea02b7bb250b81943f15295e1835f4bac2e Mon Sep 17 00:00:00 2001
From: qier222 <qier222@outlook.com>
Date: Tue, 8 Jun 2021 00:09:30 +0800
Subject: [PATCH] fix: bugs

---
 src/background.js                |  1 +
 src/components/CoverRow.vue      |  2 +-
 src/components/FMCard.vue        | 17 +++++++++++++++--
 src/components/Player.vue        |  6 +++---
 src/components/Scrollbar.vue     | 19 +++++++++++++++++++
 src/components/TrackListItem.vue | 11 ++++-------
 src/router/index.js              | 17 +++++++----------
 src/utils/Player.js              |  2 ++
 src/utils/db.js                  |  7 +++++++
 src/views/album.vue              |  5 +++++
 src/views/artist.vue             | 13 +++++++------
 src/views/dailyTracks.vue        |  3 ++-
 src/views/explore.vue            |  1 +
 src/views/home.vue               |  1 +
 src/views/library.vue            |  1 +
 src/views/loginAccount.vue       |  2 +-
 src/views/lyrics.vue             |  2 +-
 src/views/next.vue               |  1 +
 18 files changed, 79 insertions(+), 32 deletions(-)

diff --git a/src/background.js b/src/background.js
index bd90e18..1d0ca8a 100644
--- a/src/background.js
+++ b/src/background.js
@@ -231,6 +231,7 @@ class Background {
   }
 
   checkForUpdates() {
+    if (process.env.NODE_ENV === 'development') return;
     log('checkForUpdates');
     autoUpdater.checkForUpdatesAndNotify();
 
diff --git a/src/components/CoverRow.vue b/src/components/CoverRow.vue
index 3eeb398..d0e2163 100644
--- a/src/components/CoverRow.vue
+++ b/src/components/CoverRow.vue
@@ -111,7 +111,7 @@ export default {
         }
       }
       let img = item.img1v1Url || item.picUrl || item.coverImgUrl;
-      return `${img}?param=512y512`;
+      return `${img?.replace('http://', 'https://')}?param=512y512`;
     },
   },
 };
diff --git a/src/components/FMCard.vue b/src/components/FMCard.vue
index ba0cd59..377bbe7 100644
--- a/src/components/FMCard.vue
+++ b/src/components/FMCard.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="fm" :style="{ background }" data-theme="dark">
+    <img :src="nextTrackCover" style="display: none" />
     <img
       class="cover"
       :src="track.album && track.album.picUrl | resizeImage(512)"
@@ -57,6 +58,12 @@ export default {
     artists() {
       return this.track.artists || this.track.ar || [];
     },
+    nextTrackCover() {
+      return `${this.player._personalFMNextTrack?.album?.picUrl.replace(
+        'http://',
+        'https://'
+      )}?param=512y512`;
+    },
   },
   created() {
     this.getColor();
@@ -76,9 +83,13 @@ export default {
     },
     moveToFMTrash() {
       this.player.moveToFMTrash();
+      this.getColor();
     },
     getColor() {
-      const cover = `${this.player.personalFMTrack.album.picUrl}?param=512y512`;
+      const cover = `${this.player.personalFMTrack.album.picUrl.replace(
+        'http://',
+        'https://'
+      )}?param=512y512`;
       Vibrant.from(cover, { colorCount: 1 })
         .getPalette()
         .then(palette => {
@@ -104,9 +115,11 @@ export default {
   background: var(--color-secondary-bg);
   border-radius: 1rem;
   display: flex;
+  height: 198px;
+  box-sizing: border-box;
 }
 .cover {
-  height: 164px;
+  height: 100%;
   clip-path: border-box;
   border-radius: 0.75rem;
   margin-right: 1.2rem;
diff --git a/src/components/Player.vue b/src/components/Player.vue
index 9fc16f7..4b553af 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -104,7 +104,7 @@
           <button-icon
             :title="$t('player.nextUp')"
             :class="{
-              active: this.$route.name === 'next',
+              active: $route.name === 'next',
               disabled: player.isPersonalFM,
             }"
             @click.native="goToNextTracksPage"
@@ -154,7 +154,7 @@
                 :interval="0.01"
                 :drag-on-click="true"
                 :duration="0"
-                :tooltip="`none`"
+                tooltip="none"
                 :dot-size="12"
               ></vue-slider>
             </div>
@@ -164,7 +164,7 @@
             class="lyrics-button"
             title="歌词"
             style="margin-left: 12px"
-            @click.native.stop="toggleLyrics"
+            @click.native="toggleLyrics"
             ><svg-icon icon-class="arrow-up"
           /></button-icon>
         </div>
diff --git a/src/components/Scrollbar.vue b/src/components/Scrollbar.vue
index dd77999..aefcddd 100644
--- a/src/components/Scrollbar.vue
+++ b/src/components/Scrollbar.vue
@@ -35,6 +35,9 @@ export default {
       hideTimer: null,
       isOnDrag: false,
       onDragClientY: 0,
+      positions: {
+        home: { scrollTop: 0, params: {} },
+      },
     };
   },
   computed: {
@@ -73,6 +76,11 @@ export default {
 
       if (!this.show && clintHeight !== thumbHeight) this.show = true;
       this.setScrollbarHideTimeout();
+
+      const route = this.$route;
+      if (route.meta.savePosition) {
+        this.positions[route.name] = { scrollTop, params: route.params };
+      }
     },
     handleMouseenter() {
       this.active = true;
@@ -121,6 +129,17 @@ export default {
         this.hideTimer = null;
       }, 4000);
     },
+    restorePosition() {
+      const route = this.$route;
+      if (
+        !route.meta.savePosition ||
+        this.positions[route.name] === undefined ||
+        this.main === undefined
+      ) {
+        return;
+      }
+      this.main.scrollTo({ top: this.positions[route.name].scrollTop });
+    },
   },
 };
 </script>
diff --git a/src/components/TrackListItem.vue b/src/components/TrackListItem.vue
index b019432..fb572d8 100644
--- a/src/components/TrackListItem.vue
+++ b/src/components/TrackListItem.vue
@@ -127,7 +127,6 @@ export default {
     translate() {
       let t;
       if (this.track?.tns?.length > 0) t = this.track.tns[0];
-      else if (this.track.al?.tns?.length > 0) t = this.track.al.tns[0];
       else t = this.track.alia[0];
       return t;
     },
@@ -138,11 +137,7 @@ export default {
       return this.type === 'album';
     },
     isTranslate() {
-      return (
-        this.track?.tns?.length > 0 ||
-        this.track.al?.tns?.length > 0 ||
-        this.track.alia?.length > 0
-      );
+      return this.track?.tns?.length > 0 || this.track.alia?.length > 0;
     },
     isPlaylist() {
       return this.type === 'playlist';
@@ -301,6 +296,7 @@ button {
       }
       .translate {
         color: #aeaeae;
+        margin-left: 4px;
       }
     }
     .artist {
@@ -401,7 +397,8 @@ button {
   color: var(--color-primary);
   .title,
   .album,
-  .time {
+  .time,
+  .title-and-artist .translate {
     color: var(--color-primary);
   }
   .title .featured,
diff --git a/src/router/index.js b/src/router/index.js
index 8aa3530..a73ec92 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,6 +14,7 @@ const routes = [
     component: () => import('@/views/home.vue'),
     meta: {
       keepAlive: true,
+      savePosition: true,
     },
   },
   {
@@ -47,6 +48,7 @@ const routes = [
     component: () => import('@/views/artist.vue'),
     meta: {
       keepAlive: true,
+      savePosition: true,
     },
   },
   {
@@ -68,6 +70,7 @@ const routes = [
     component: () => import('@/views/next.vue'),
     meta: {
       keepAlive: true,
+      savePosition: true,
     },
   },
   {
@@ -94,6 +97,7 @@ const routes = [
     component: () => import('@/views/explore.vue'),
     meta: {
       keepAlive: true,
+      savePosition: true,
     },
   },
   {
@@ -103,6 +107,7 @@ const routes = [
     meta: {
       requireLogin: true,
       keepAlive: true,
+      savePosition: true,
     },
   },
   {
@@ -132,16 +137,8 @@ const routes = [
     component: () => import('@/views/lastfmCallback.vue'),
   },
 ];
-const router = new VueRouter({
-  routes,
-  scrollBehavior(to, from, savedPosition) {
-    if (savedPosition) {
-      return savedPosition;
-    } else {
-      return { x: 0, y: 0 };
-    }
-  },
-});
+
+const router = new VueRouter({ routes });
 
 const originalPush = VueRouter.prototype.push;
 VueRouter.prototype.push = function push(location) {
diff --git a/src/utils/Player.js b/src/utils/Player.js
index 6109023..20ff303 100644
--- a/src/utils/Player.js
+++ b/src/utils/Player.js
@@ -322,6 +322,7 @@ export default class {
       ? this._personalFMNextTrack.id
       : this._getNextTrack()[0];
     if (!nextTrackID) return;
+    if (this._personalFMTrack.id == nextTrackID) return;
     getTrackDetail(nextTrackID).then(data => {
       let track = data.songs[0];
       this._getAudioSource(track);
@@ -406,6 +407,7 @@ export default class {
   _loadPersonalFMNextTrack() {
     return personalFM().then(result => {
       this._personalFMNextTrack = result.data[0];
+      this._cacheNextTrack(); // cache next track
       return this._personalFMNextTrack;
     });
   }
diff --git a/src/utils/db.js b/src/utils/db.js
index e3944e0..e966fa5 100644
--- a/src/utils/db.js
+++ b/src/utils/db.js
@@ -53,6 +53,13 @@ async function deleteExcessCache() {
 export function cacheTrackSource(trackInfo, url, bitRate, from = 'netease') {
   const name = trackInfo.name;
   const artist = trackInfo.ar[0]?.name || trackInfo.artists[0]?.name;
+  let cover = trackInfo.al.picUrl;
+  if (cover.slice(0, 5) !== 'https') {
+    cover = 'https' + cover.slice(4);
+  }
+  axios.get(`${cover}?param=512y512`);
+  axios.get(`${cover}?param=224y224`);
+  axios.get(`${cover}?param=1024y1024`);
   return axios
     .get(url, {
       responseType: 'arraybuffer',
diff --git a/src/views/album.vue b/src/views/album.vue
index 78a63b8..607be52 100644
--- a/src/views/album.vue
+++ b/src/views/album.vue
@@ -206,6 +206,11 @@ export default {
       }
     },
   },
+  watch: {
+    album: function () {
+      this.$parent.$refs.main.scrollTo({ top: 0 });
+    },
+  },
   created() {
     this.loadData(this.$route.params.id);
   },
diff --git a/src/views/artist.vue b/src/views/artist.vue
index 1c489f6..85e6bf7 100644
--- a/src/views/artist.vue
+++ b/src/views/artist.vue
@@ -261,18 +261,19 @@ export default {
     this.loadData(this.$route.params.id);
   },
   activated() {
-    if (this.show) {
-      if (this.artist.id.toString() !== this.$route.params.id) {
-        this.show = false;
-        NProgress.start();
-        this.loadData(this.$route.params.id);
-      }
+    if (this.artist?.id?.toString() !== this.$route.params.id) {
+      this.loadData(this.$route.params.id);
+    } else {
+      this.$parent.$refs.scrollbar.restorePosition();
     }
   },
   methods: {
     ...mapMutations(['appendTrackToPlayerList']),
     ...mapActions(['playFirstTrackOnList', 'playTrackOnListByID', 'showToast']),
     loadData(id, next = undefined) {
+      NProgress.start();
+      this.show = false;
+      this.$parent.$refs.main.scrollTo({ top: 0 });
       getArtist(id).then(data => {
         this.artist = data.artist;
         this.popularTracks = data.hotSongs;
diff --git a/src/views/dailyTracks.vue b/src/views/dailyTracks.vue
index fdd8d05..c27cb5b 100644
--- a/src/views/dailyTracks.vue
+++ b/src/views/dailyTracks.vue
@@ -21,7 +21,7 @@ import { dailyRecommendTracks } from '@/api/playlist';
 import TrackList from '@/components/TrackList.vue';
 
 export default {
-  name: 'dailyTracks',
+  name: 'DailyTracks',
   components: {
     TrackList,
   },
@@ -40,6 +40,7 @@ export default {
     } else {
       this.show = true;
     }
+    this.$parent.$refs.main.scrollTo(0, 0);
   },
   methods: {
     ...mapMutations(['updateDailyTracks']),
diff --git a/src/views/explore.vue b/src/views/explore.vue
index dd9c67d..bbfdd1b 100644
--- a/src/views/explore.vue
+++ b/src/views/explore.vue
@@ -117,6 +117,7 @@ export default {
   },
   activated() {
     this.loadData();
+    this.$parent.$refs.scrollbar.restorePosition();
   },
   methods: {
     ...mapMutations(['togglePlaylistCategory']),
diff --git a/src/views/home.vue b/src/views/home.vue
index 17f7c0b..872aa61 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -106,6 +106,7 @@ export default {
   },
   activated() {
     this.loadData();
+    this.$parent.$refs.scrollbar.restorePosition();
   },
   methods: {
     loadData() {
diff --git a/src/views/library.vue b/src/views/library.vue
index ebb301c..cb8e075 100644
--- a/src/views/library.vue
+++ b/src/views/library.vue
@@ -234,6 +234,7 @@ export default {
     this.loadData();
   },
   activated() {
+    this.$parent.$refs.scrollbar.restorePosition();
     this.loadData();
     dailyTask();
   },
diff --git a/src/views/loginAccount.vue b/src/views/loginAccount.vue
index b571176..4a22c53 100644
--- a/src/views/loginAccount.vue
+++ b/src/views/loginAccount.vue
@@ -267,7 +267,6 @@ export default {
             clearInterval(this.qrCodeCheckInterval);
             this.qrCodeInformation = '登录成功，请稍等...';
             result.code = 200;
-            console.log(result);
             this.handleLoginResponse(result);
           }
         });
@@ -463,6 +462,7 @@ button.loading {
   margin-bottom: 12px;
 }
 .qr-code-info {
+  color: var(--color-text);
   text-align: center;
   margin-bottom: 28px;
 }
diff --git a/src/views/lyrics.vue b/src/views/lyrics.vue
index e0d0551..bdbf15a 100644
--- a/src/views/lyrics.vue
+++ b/src/views/lyrics.vue
@@ -218,7 +218,7 @@ export default {
       return this.player.currentTrack?.al?.picUrl + '?param=1024y1024';
     },
     bgImageUrl() {
-      return this.player.currentTrack?.al?.picUrl + '?param=500y500';
+      return this.player.currentTrack?.al?.picUrl + '?param=512y512';
     },
     lyricWithTranslation() {
       let ret = [];
diff --git a/src/views/next.vue b/src/views/next.vue
index 7f19451..3dacf03 100644
--- a/src/views/next.vue
+++ b/src/views/next.vue
@@ -81,6 +81,7 @@ export default {
   },
   activated() {
     this.loadTracks();
+    this.$parent.$refs.scrollbar.restorePosition();
   },
   methods: {
     ...mapActions(['playTrackOnListByID']),