Merge branch 'nvue-dev' of github.com:dcloudio/uni-app into nvue-dev

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 =
     `

lib/apis.js

@@ -52,7 +52,6 @@ const media = [
   'getImageInfo',
   'saveImageToPhotosAlbum',
   'compressImage',
-  'chooseMessageFile',
   'getRecorderManager',
   'getBackgroundAudioManager',
   'createInnerAudioContext',

lib/modules.js

+module.exports = {
+  base: {
+    title: '基础',
+    api: [
+      'upx2px',
+      'base64ToArrayBuffer',
+      'arrayBufferToBase64'
+    ]
+  },
+  network: {
+    title: '网络',
+    api: [
+      'request',
+      'connectSocket',
+      'sendSocketMessage',
+      'closeSocket',
+      'onSocketOpen',
+      'onSocketError',
+      'onSocketMessage',
+      'onSocketClose',
+      'downloadFile',
+      'uploadFile'
+    ]
+  },
+  route: {
+    title: '路由',
+    api: [
+      'navigateTo',
+      'redirectTo',
+      'reLaunch',
+      'switchTab',
+      'navigateBack'
+    ]
+  },
+  storage: {
+    title: '数据缓存',
+    api: [
+      'setStorage',
+      'setStorageSync',
+      'getStorage',
+      'getStorageSync',
+      'removeStorage',
+      'removeStorageSync',
+      'clearStorage',
+      'clearStorageSync',
+      'getStorageInfo',
+      'getStorageInfoSync',
+    ]
+  },
+  location: {
+    title: '位置',
+    api: [
+      'getLocation',
+      'openLocation',
+      'chooseLocation'
+    ]
+  },
+  media: {
+    title: '媒体',
+    api: [
+      'chooseImage',
+      'previewImage',
+      'getImageInfo',
+      'saveImageToPhotosAlbum',
+      'compressImage',
+      'getRecorderManager',
+      'getBackgroundAudioManager',
+      'createInnerAudioContext',
+      'chooseVideo',
+      'saveVideoToPhotosAlbum',
+      'createVideoContext',
+      'createCameraContext',
+      'createLivePlayerContext'
+    ]
+  },
+  device: {
+    title: '设备',
+    api: [
+      'getSystemInfo',
+      'getSystemInfoSync',
+      'canIUse',
+      'onMemoryWarning',
+      'getNetworkType',
+      'onNetworkStatusChange',
+      'onAccelerometerChange',
+      'startAccelerometer',
+      'stopAccelerometer',
+      'onCompassChange',
+      'startCompass',
+      'stopCompass',
+      'onGyroscopeChange',
+      'startGyroscope',
+      'stopGyroscope',
+      'makePhoneCall',
+      'scanCode',
+      'setClipboardData',
+      'getClipboardData',
+      'setScreenBrightness',
+      'getScreenBrightness',
+      'setKeepScreenOn',
+      'onUserCaptureScreen',
+      'vibrateLong',
+      'vibrateShort',
+      'addPhoneContact',
+      'openBluetoothAdapter',
+      'startBluetoothDevicesDiscovery',
+      'onBluetoothDeviceFound',
+      'stopBluetoothDevicesDiscovery',
+      'onBluetoothAdapterStateChange',
+      'getConnectedBluetoothDevices',
+      'getBluetoothDevices',
+      'getBluetoothAdapterState',
+      'closeBluetoothAdapter',
+      'writeBLECharacteristicValue',
+      'readBLECharacteristicValue',
+      'onBLEConnectionStateChange',
+      'onBLECharacteristicValueChange',
+      'notifyBLECharacteristicValueChange',
+      'getBLEDeviceServices',
+      'getBLEDeviceCharacteristics',
+      'createBLEConnection',
+      'closeBLEConnection',
+      'onBeaconServiceChange',
+      'onBeaconUpdate',
+      'getBeacons',
+      'startBeaconDiscovery',
+      'stopBeaconDiscovery'
+    ]
+  },
+  ui: {
+    title: '界面',
+    api: [
+      'showToast',
+      'hideToast',
+      'showLoading',
+      'hideLoading',
+      'showModal',
+      'showActionSheet',
+      'setNavigationBarTitle',
+      'setNavigationBarColor',
+      'showNavigationBarLoading',
+      'hideNavigationBarLoading',
+      'setTabBarItem',
+      'setTabBarStyle',
+      'hideTabBar',
+      'showTabBar',
+      'setTabBarBadge',
+      'removeTabBarBadge',
+      'showTabBarRedDot',
+      'hideTabBarRedDot',
+      'setBackgroundColor',
+      'setBackgroundTextStyle',
+      'createAnimation',
+      'pageScrollTo',
+      'onWindowResize',
+      'offWindowResize',
+      'loadFontFace',
+      'startPullDownRefresh',
+      'stopPullDownRefresh',
+      'createSelectorQuery',
+      'createIntersectionObserver',
+      'hideKeyboard'
+    ]
+  },
+  event: {
+    title: '页面通讯',
+    api: [
+      '$emit',
+      '$on',
+      '$once',
+      '$off'
+    ]
+  },
+  file: {
+    title: '文件',
+    api: [
+      'saveFile',
+      'getSavedFileList',
+      'getSavedFileInfo',
+      'removeSavedFile',
+      'getFileInfo',
+      'openDocument',
+      'getFileSystemManager'
+    ]
+  },
+  canvas: {
+    title: '绘画',
+    api: [
+      'createOffscreenCanvas',
+      'createCanvasContext',
+      'canvasToTempFilePath',
+      'canvasPutImageData',
+      'canvasGetImageData'
+    ]
+  },
+  third: {
+    title: '第三方服务',
+    api: [
+      'getProvider',
+      'login',
+      'checkSession',
+      'getUserInfo',
+      'share',
+      'showShareMenu',
+      'hideShareMenu',
+      'requestPayment',
+      'subscribePush',
+      'unsubscribePush',
+      'onPush',
+      'offPush',
+      'requireNativePlugin'
+    ]
+  }
+}

packages/uni-h5/manifest.json

@@ -406,6 +406,22 @@
         "/platforms/h5/service/api/device/vibrate.js",
         []
     ],
+    "onBluetoothDeviceFound": [
+        "/core/service/api/device/bluetooth.js",
+        []
+    ],
+    "onBluetoothAdapterStateChange": [
+        "/core/service/api/device/bluetooth.js",
+        []
+    ],
+    "onBLEConnectionStateChange": [
+        "/core/service/api/device/bluetooth.js",
+        []
+    ],
+    "onBLECharacteristicValueChange": [
+        "/core/service/api/device/bluetooth.js",
+        []
+    ],
     "hideKeyboard": [
         "/platforms/h5/service/api/device/hide-keyboard.js",
         []

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')
     }

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