From 0ae35ac77fd3a9e55256afa298f795fa68519c36 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Wed, 31 Jul 2019 20:49:10 +0800
Subject: [PATCH] add setTimeout,setInterval

---
 build/rollup.config.app.js                                | 8 +++++---
 lib/apis.js                                               | 1 -
 .../app-plus-nvue/service/api/route/switch-tab.js         | 2 --
 src/platforms/app-plus/service/framework/plus-message.js  | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/build/rollup.config.app.js b/build/rollup.config.app.js
index cdb7e9d5b3..ca7bafbf56 100644
--- a/build/rollup.config.app.js
+++ b/build/rollup.config.app.js
@@ -23,10 +23,12 @@ if (process.env.UNI_SERVICE === 'legacy') {
   output.format = 'iife'
   output.name = 'serviceContext'
   output.banner =
-    `export function createServiceContext(Vue, weex, plus, __uniConfig, __uniRoutes, UniServiceJSBridge){
+    `export function createServiceContext(Vue, weex, plus, __uniConfig, __uniRoutes, UniServiceJSBridge,instanceContext){
 var localStorage = plus.storage
-var setTimeout = global.setTimeout
-var clearTimeout = global.clearTimeout
+var setTimeout = instanceContext.setTimeout
+var clearTimeout = instanceContext.clearTimeout
+var setInterval = instanceContext.setInterval
+var clearInterval = instanceContext.clearInterval
 `
   output.footer =
     `
diff --git a/lib/apis.js b/lib/apis.js
index 7cdec79109..4a40ae5fb0 100644
--- a/lib/apis.js
+++ b/lib/apis.js
@@ -52,7 +52,6 @@ const media = [
   'getImageInfo',
   'saveImageToPhotosAlbum',
   'compressImage',
-  'chooseMessageFile',
   'getRecorderManager',
   'getBackgroundAudioManager',
   'createInnerAudioContext',
diff --git a/src/platforms/app-plus-nvue/service/api/route/switch-tab.js b/src/platforms/app-plus-nvue/service/api/route/switch-tab.js
index b42b77aa0b..960edd4eeb 100644
--- a/src/platforms/app-plus-nvue/service/api/route/switch-tab.js
+++ b/src/platforms/app-plus-nvue/service/api/route/switch-tab.js
@@ -37,8 +37,6 @@ export function switchTab ({
         currentPage.$getAppWebview().close('auto')
       }
     } else {
-      // TODO 客户端 Bug
-      currentPage.$getAppWebview().hide('none')
       // 前一个 tabBar 触发 onHide
       currentPage.$vm.__call_hook('onHide')
     }
diff --git a/src/platforms/app-plus/service/framework/plus-message.js b/src/platforms/app-plus/service/framework/plus-message.js
index f3a4b0bdaf..4a3755ca2e 100644
--- a/src/platforms/app-plus/service/framework/plus-message.js
+++ b/src/platforms/app-plus/service/framework/plus-message.js
@@ -29,7 +29,7 @@ export function consumePlusMessage (type, args) {
  */
 export function registerPlusMessage (type, callback, keepAlive = true) {
   if (callbacks[type]) {
-    throw new Error(`${type} 已注册:` + (callbacks[type].toString()))
+    return console.warn(`${type} 已注册:` + (callbacks[type].toString()))
   }
   callback.keepAlive = !!keepAlive
   callbacks[type] = callback
-- 
GitLab