Ver.1.4.1-alpha Update

BFVStatus-vue/src/components/ChartsView.vue

@@ -6,12 +6,13 @@
     <el-page-header class="pageHeader" @back="goBack">
       <template slot="content">{{playerId}}的数据统计</template>
     </el-page-header>
+    <el-alert type="error" title="官方数据接口出错，请晚些时候重试" :closable="false" v-if="!isGetDataSuccessfully" show-icon></el-alert>
     <el-row class="updateTimeRow" type="flex" justify="center">
       <el-col :span="16" class="updateTimeCol">
         <el-tag size="mini" type="warning">更新于{{lastUpdateTime}}</el-tag>
       </el-col>
     </el-row>
-    <van-tabs v-model="activeTab" class="vanTabs">
+    <van-tabs v-model="activeTab" class="vanTabs" v-if="isGetDataSuccessfully">
       <van-tab title="K/D折线图" class="vanTab">
         <el-row type="flex" justify="center">
           <el-col :span="20">
@@ -76,6 +77,7 @@ export default {
       maxKillsLen: 30,
       selectedSpmDays: 30,
       maxSpmLen: 30,
+      isGetDataSuccessfully: true,
       kdLineOption: {
         itemStyle: {
           color: '#409EFF'
@@ -260,12 +262,18 @@ export default {
         thisView.playerHistory = JSON.parse(res)
         thisView.$store.commit('setHistory', res)
         thisView.historyLoading = false
-        thisView.setMaxLen()
-        thisView.setInitSelectedValue()
-        thisView.kdDataInit()
-        thisView.killsDataInit()
-        thisView.spmDataInit()
-        thisView.drawKDLineChart()
+        if (JSON.stringify(thisView.playerHistory.data.series) !== '{}') {
+          thisView.isGetDataSuccessfully = true
+          thisView.setMaxLen()
+          thisView.setInitSelectedValue()
+          thisView.kdDataInit()
+          thisView.killsDataInit()
+          thisView.spmDataInit()
+          thisView.drawKDLineChart()
+        } else {
+          thisView.isGetDataSuccessfully = false
+          console.log('error')
+        }
       }
       var onError = function (res) {
         thisView.historyLoading = false

BFVStatus-vue/src/components/Loading.vue

@@ -1,6 +1,9 @@
 <template>
     <div class="load-ani">
         <svg height="91" width="65">
+            <!-- <polyline class="load-logoBG" fill="none" :stroke="logoColorBG" stroke-width="2"
+            points="1,1 21,1 33,44 44,1 64,1 33,90 1,1"
+            stroke-linecap="round" stroke-linejoin="round"></polyline> -->
             <polyline class="load-logo" fill="none" :stroke="logoColor" stroke-width="2"
             points="1,1 21,1 33,44 44,1 64,1 33,90 1,1"
             stroke-linecap="round" stroke-linejoin="round"></polyline>
@@ -14,7 +17,8 @@ export default {
   name: 'Loading',
   data () {
     return {
-      logoColor: '#409EFF'
+      logoColor: '#409EFF',
+      logoColorBG: '#909399'
     }
   }
 }
@@ -36,22 +40,32 @@ export default {
         font-family Helvetica
         font-size 14px
         margin-top 10px
-        color #409EFF
+        animation load-text 2s infinite alternate
+        -webkit-animation load-text 2s infinite alternate
     }
     .load-logo {
-        animation load-logo 2s infinite
-        --webkit-animation load-logo 2s infinite
-        stroke-dasharray 500
-        stroke-dashoffset 500
+        animation load-logo 2s infinite alternate
+        -webkit-animation load-logo 2s infinite alternate
+        stroke-dasharray 325
+        stroke-dashoffset 325
     }
 
     @keyframes load-logo {
         from {
-            stroke-dashoffset 500
+            stroke-dashoffset 325
         }
         to {
             stroke-dashoffset 0
         }
     }
+
+    @keyframes load-text {
+        from {
+            color rgba(64, 158, 255, 0.2)
+        }
+        to {
+            color rgba(64, 158, 255, 1)
+        }
+    }
 }
 </style>

BFVStatus-vue/src/components/UserSearchView.vue

@@ -8,6 +8,7 @@
         <el-col :span="18" class="formCol">
           <div class="inCol">
             <div class="appName">战地V战绩查询助手</div>
+            <el-alert type="warning" title="当前版本为测试版" :closable="false" show-icon v-if="isTestVer"></el-alert>
             <el-form ref="form" :model="formInfo" :rules="rules" class="form" label-position="top" size="mini">
               <el-form-item label="平台" prop="userPlatform">
                 <el-select v-model="formInfo.userPlatform" placeholder="请选择平台" filterable clearable>
@@ -103,7 +104,8 @@ export default {
     return {
       versionCheckLoading: true,
       isLatestVer: 1,
-      tagName: 'Ver.1.4.0',
+      tagName: 'Ver.1.4.1-alpha',
+      isTestVer: false,
       githubReleaseUrl: 'https://api.github.com/repos/dzxrly/BFVStatus/releases/latest',
       githubLink: 'https://github.com/dzxrly/BFVStatus',
       trnLink: 'https://tracker.gg/',
@@ -144,8 +146,14 @@ export default {
   },
   mounted () {
     this.getPlayerIdHistory()
+    this.checkIsTestVersion()
   },
   methods: {
+    checkIsTestVersion () {
+      if (this.tagName.indexOf('alpha') !== -1 || this.tagName.indexOf('beta') !== -1) {
+        this.isTestVer = true
+      } else this.isTestVer = false
+    },
     getPlayerIdHistory () {
       this.playerIdHistory = this.$store.getters.getPlayerIdHistory
     },

platforms/android/app/app.iml

@@ -95,5 +95,6 @@
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.61@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0@jar" level="project" />
     <orderEntry type="module" module-name="CordovaLib" />
+    <orderEntry type="module" module-name="CordovaLib" />
   </component>
 </module>

platforms/android/app/src/main/assets/www/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>bfv-status-vue</title><link href=./static/css/app.5252907261468dc6e330543c71f3a36d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e703a875003833347b12.js></script><script type=text/javascript src=./static/js/app.d5b6d5b20b251ec7cffe.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>bfv-status-vue</title><link href=./static/css/app.0b33bf3772a26319a21736c1ffb24f35.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e703a875003833347b12.js></script><script type=text/javascript src=./static/js/app.100a5f3c3622b7193cef.js></script></body></html>

www/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>bfv-status-vue</title><link href=./static/css/app.5252907261468dc6e330543c71f3a36d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e703a875003833347b12.js></script><script type=text/javascript src=./static/js/app.d5b6d5b20b251ec7cffe.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>bfv-status-vue</title><link href=./static/css/app.0b33bf3772a26319a21736c1ffb24f35.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e703a875003833347b12.js></script><script type=text/javascript src=./static/js/app.100a5f3c3622b7193cef.js></script></body></html>