Merge branch 'feat/production-ready'

miniprogram/pages/index/index.js

@@ -14,11 +14,15 @@ Page({
     bleState: 'disconnected',
     hasDevice: false,
     deviceInfo: null,
-    devMode: false
+    devMode: false,
+    loading: true
+  },
+
+  onLoad: function () {
+    this.setData({ devMode: config.__DEV__ || false })
   },
 
   onShow: function () {
-    this.setData({ devMode: config.__DEV__ || false })
     this.checkState()
     this._onStatus = this.onBleStatus.bind(this)
     this._onBattery = this.onBleBattery.bind(this)
@@ -53,9 +57,10 @@ Page({
       return
     }
 
+    var isFirstLoad = self.data.loading
     self.setData({ connected: ble.isConnected() })
 
-    api.getDevices().then(function (data) {
+    var p1 = api.getDevices().then(function (data) {
       var devices = data.devices || []
       self.setData({ hasDevice: devices.length > 0 })
       if (devices.length > 0) {
@@ -65,14 +70,22 @@ Page({
           deviceInfo: devices[0]
         })
       }
-    }).catch(function () {})
+    }).catch(function (err) {
+      console.error('getDevices failed', err)
+    })
 
-    api.getSubscription().then(function (sub) {
+    var p2 = api.getSubscription().then(function (sub) {
       self.setData({
         subscription: sub,
         subRemaining: sub.remaining_days || 0
       })
-    }).catch(function () {})
+    }).catch(function (err) {
+      console.error('getSubscription failed', err)
+    })
+
+    Promise.all([p1, p2]).then(function () {
+      if (isFirstLoad) self.setData({ loading: false })
+    })
   },
 
   onBleStatus: function (status) {
@@ -98,7 +111,9 @@ Page({
       },
       onConnected: function () {
         self.setData({ connected: true, bleState: 'connected' })
-        ble.queryStatus().catch(function () {})
+        ble.queryStatus().catch(function (err) {
+          console.error('queryStatus failed', err)
+        })
       },
       onError: function (err) {
         self.setData({ connected: false, bleState: 'error' })
@@ -179,8 +194,6 @@ Page({
   },
 
   onViewSubscription: function () {
-    if (!this.data.subscription || this.data.subscription.status !== 'active') {
-      wx.navigateTo({ url: '/pages/subscribe-plans/subscribe-plans' })
-    }
+    wx.navigateTo({ url: '/pages/subscribe-plans/subscribe-plans' })
   }
 })