diff --git a/src/components/feeds-manager.js b/src/components/feeds-manager.js index 082fc8f..e36ba01 100644 --- a/src/components/feeds-manager.js +++ b/src/components/feeds-manager.js @@ -88,16 +88,13 @@ function load (page, url, para) { page.setData({feeds_arr: [result]}, () => { if (isTimeline(url)) { + vibrate() let withTimelineAudio = false try { const [latestRawId] = result.map(item => item.rawid) withTimelineAudio = latestRawId > lastRawId } catch (_) {} - if (withTimelineAudio) { - vibrate() - } - if (getSettings().timelineAudio && withTimelineAudio) { audio.bubble() } @@ -117,8 +114,11 @@ function load (page, url, para) { } function isTimeline (url) { + console.log(url) switch (url || '/statuses/home_timeline') { case '/statuses/home_timeline': + case '/statuses/user_timeline': + case '/photos/user_timeline': case '/statuses/public_timeline': case '/statuses/mentions': case '/search/public_timeline': @@ -126,6 +126,10 @@ function isTimeline (url) { case '/statuses/replies': case '/search/user_timeline': case '/favorites': + case '/users/friends': + case '/users/followers': + case '/direct_messages/conversation_list': + case '/direct_messages/conversation': return true default: return false @@ -199,12 +203,11 @@ function favoriteChange (page) { for (const [feedIndex, feed] of feeds.entries()) { if (feed.id === page.data.feed.id) { pagePre.setData({[`feeds_arr[${feedsIndex}][${feedIndex}].favorited`]: false}) + vibrate() return } } } - - vibrate() }) .catch(err => showModal(err.errMsg)) } else { @@ -221,12 +224,11 @@ function favoriteChange (page) { for (const [feedIndex, feed] of feeds.entries()) { if (feed.id === page.data.feed.id) { pagePre.setData({[`feeds_arr[${feedsIndex}][${feedIndex}].favorited`]: true}) + vibrate() return } } } - - vibrate() }) .catch(err => showModal(err.errMsg)) } @@ -250,12 +252,11 @@ function destroy (id) { page.setData({ [`feeds_arr[${feedsIndex}]`]: page.data.feeds_arr[feedsIndex] }) + vibrate() return } } } - - vibrate() } }) }) @@ -273,12 +274,11 @@ function destroyForTest (id) { page.setData({ [`feeds_arr[${feedsIndex}]`]: page.data.feeds_arr[feedsIndex] }) + vibrate() return } } } - - vibrate() }) .catch(err => showModal(err.errMsg)) } @@ -298,12 +298,11 @@ function destroyMessage (page, id) { page.setData({ [`feeds_arr[${feedsIndex}]`]: page.data.feeds_arr[feedsIndex] }) + vibrate() return } } } - - vibrate() }) .catch(err => showModal(err.errMsg)) } diff --git a/src/mixins/post.js b/src/mixins/post.js index a7a47df..c76d61f 100644 --- a/src/mixins/post.js +++ b/src/mixins/post.js @@ -1,6 +1,7 @@ const fm = require('../components/feeds-manager') const i18n = require('../i18n/index') const animations = require('../utils/animations') +const vibrate = require('../utils/vibrate') module.exports = { data: { @@ -28,6 +29,7 @@ module.exports = { this.setData({ resetPop: animations.pop().export() }, () => { + vibrate() setTimeout(() => { this.setData({ param: null, @@ -42,6 +44,7 @@ module.exports = { this.setData({ addPhotoPop: animations.pop().export() }, () => { + vibrate() setTimeout(() => { const page = this wx.chooseImage({ @@ -57,6 +60,7 @@ module.exports = { }) }, addGif () { + vibrate() const page = this wx.chooseImage({ count: 1, diff --git a/src/pages/feed/feed.js b/src/pages/feed/feed.js index 981b1e2..3263789 100644 --- a/src/pages/feed/feed.js +++ b/src/pages/feed/feed.js @@ -6,6 +6,7 @@ const post = require('../../mixins/post') const tap = require('../../mixins/tap') const i18n = require('../../i18n/index') const util = require('../../utils/util') +const vibrate = require('../../utils/vibrate') Page(extend({}, tap, post, { data: { @@ -37,6 +38,7 @@ Page(extend({}, tap, post, { sendPop: null }, () => { setTimeout(() => { + vibrate() this.setData({ param: { status, @@ -57,6 +59,7 @@ Page(extend({}, tap, post, { sendPop: null }, () => { setTimeout(() => { + vibrate() this.setData({ param: { status, diff --git a/src/pages/message/message.js b/src/pages/message/message.js index 6e35146..a754c2d 100644 --- a/src/pages/message/message.js +++ b/src/pages/message/message.js @@ -4,6 +4,7 @@ const animations = require('../../utils/animations') const post = require('../../mixins/post') const i18n = require('../../i18n/index') const util = require('../../utils/util') +const vibrate = require('../../vibrate') const url = '/direct_messages/conversation' @@ -32,6 +33,7 @@ Page(extend({}, post, { sendPop: null }, () => { setTimeout(() => { + vibrate() if (!this.data.relationship.followed_by) { wx.showModal({ confirmColor: '#33a5ff',