diff --git a/api/p2p.js b/api/p2p.js index 7f6d4a4..fb0d2a0 100644 --- a/api/p2p.js +++ b/api/p2p.js @@ -5,7 +5,7 @@ import request from '../utils/request' // 获取p2pInfo export function getP2pInfo(data) { return request({ - url: '/v1/tencentYun/getDeviceDetail', + url: '/passthrough', method: 'POST', data }) diff --git a/manifest.json b/manifest.json index 715ce32..ae4600e 100644 --- a/manifest.json +++ b/manifest.json @@ -29,15 +29,6 @@ "version": "latest", "provider": "wx1319af22356934bf", "export": "exportForXp2pPlugin.js" - }, - "wechat-p2p-player": { - "version": "latest", - "provider": "wx9e8fbc98ceac2628", - "export": "exportForPlayerPlugin.js" - }, - "wmpf-voip": { - "version": "latest", - "provider": "wxf830863afde621eb" } } }, diff --git a/pages.json b/pages.json index b85c5ba..be1321e 100644 --- a/pages.json +++ b/pages.json @@ -16,6 +16,7 @@ "style": { "navigationStyle": "custom", "navigationBarTitleText": "监控", + "disableScroll": true, "mp-weixin": { "usingComponents": { "iot-p2p-player-with-mjpg": "plugin://xp2p/iot-p2p-player-with-mjpg", @@ -23,8 +24,26 @@ } } } + }, + { + "path": "authorizeWechat", + "style": { + "navigationBarTitleText": "微信授权", + "disableScroll": true + } } - ] + ], + "plugins": { + "wechat-p2p-player": { + "version": "latest", + "provider": "wx9e8fbc98ceac2628", + "export": "exportForPlayerPlugin.js" + }, + "wmpf-voip": { + "version": "latest", + "provider": "wxf830863afde621eb" + } + } }, { "root": "pages/addDevice", diff --git a/pages/main/lockDetail.vue b/pages/main/lockDetail.vue index b4de880..018f1be 100644 --- a/pages/main/lockDetail.vue +++ b/pages/main/lockDetail.vue @@ -221,6 +221,16 @@ > 消息提醒 + + + 微信呼叫 + diff --git a/pages/p2p/p2pPlayer.vue b/pages/p2p/p2pPlayer.vue index 6afe085..16e9963 100644 --- a/pages/p2p/p2pPlayer.vue +++ b/pages/p2p/p2pPlayer.vue @@ -1,20 +1,31 @@ diff --git a/pages/p2p/utils.js b/pages/p2p/utils.js deleted file mode 100644 index 6d7d0c3..0000000 --- a/pages/p2p/utils.js +++ /dev/null @@ -1,29 +0,0 @@ -export const getUserId = () => { - return 1 -} - -export function compareVersion(ver1, ver2) { - const v1 = ver1.split('.') - const v2 = ver2.split('.') - const len = Math.max(v1.length, v2.length) - - while (v1.length < len) { - v1.push('0') - } - while (v2.length < len) { - v2.push('0') - } - - for (let i = 0; i < len; i++) { - const num1 = parseInt(v1[i]) - const num2 = parseInt(v2[i]) - - if (num1 > num2) { - return 1 - } else if (num1 < num2) { - return -1 - } - } - - return 0 -} diff --git a/pages/p2p/xp2pManager.js b/pages/p2p/xp2pManager.js deleted file mode 100644 index 6eefc30..0000000 --- a/pages/p2p/xp2pManager.js +++ /dev/null @@ -1,118 +0,0 @@ -import { getUserId, compareVersion } from './utils' - -let xp2pManager = null -export const getXp2pManager = () => { - if (!xp2pManager) { - let xp2pPlugin = requirePlugin('xp2p') - - console.log(11111, xp2pPlugin) - - const iotExports = xp2pPlugin.iot - const app = getApp() - - // 用户id，微信用户在此小程序中的唯一标识 - iotExports?.setUserId?.(getUserId() || 'demo') - - // 开发版才打插件log - if (app.pluginLogger && uni.getAccountInfoSync().miniProgram.envVersion === 'develop') { - iotExports?.setPluginLogger?.(app.pluginLogger) - } - - // 设置优先使用的打洞协议 - if ( - compareVersion(uni.getSystemInfoSync().SDKVersion, '3.4.1') >= 0 && - xp2pPlugin.p2p.setTcpFirst - ) { - const tcpFirstKey = 'tcpFirst' - const tcpFirstTime = parseInt(uni.getStorageSync(tcpFirstKey), 10) - const tcpFirst = !!(tcpFirstTime && Date.now() - tcpFirstTime < 3600000 * 24) // 24小时内有效 - console.log('tcpFirst', tcpFirst) - xp2pPlugin.p2p.setTcpFirst(tcpFirst) - - // 给index页用，方便测试时调整tcpFirst - app.tcpFirst = tcpFirst - app.toggleTcpFirst = async () => { - const modalRes = await uni.showModal({ - title: '确定切换 tcpFirst 吗？', - content: '切换后需要重新进入小程序' - }) - if (!modalRes || !modalRes.confirm) { - return - } - uni.setStorageSync(tcpFirstKey, tcpFirst ? '' : Date.now()) - app.restart() - } - } - - // 设置是否连接对端stun - if (xp2pPlugin.p2p.setCrossStunTurn) { - const crossStunTurnKey = 'crossStunTurn' - const crossStunTurnTime = parseInt(uni.getStorageSync(crossStunTurnKey), 10) - const crossStunTurn = !!(crossStunTurnTime && Date.now() - crossStunTurnTime < 3600000 * 24) // 24小时内有效 - xp2pPlugin.p2p.setCrossStunTurn(crossStunTurn) - // 给index页用，方便测试时调整crossStunTurn - app.crossStunTurn = crossStunTurn - app.toggleCrossStunTurn = async () => { - const modalRes = await uni.showModal({ - title: '确定切换 crossStunTurn 吗？', - content: '切换后需要重新进入小程序' - }) - if (!modalRes || !modalRes.confirm) { - return - } - uni.setStorageSync(crossStunTurnKey, crossStunTurn ? '' : Date.now()) - app.restart() - } - } - - // 设置切换端口 - if (xp2pPlugin.p2p.updateStunPort) { - const portKey = 'STUN_PORT' - const stunPort = uni.getStorageSync(portKey) || 20002 - xp2pPlugin.p2p.updateStunPort(stunPort) - app.stunPort = stunPort - app.togglePort = async port => { - const modalRes = await uni.showModal({ - title: '确定切换 stunPort 吗？', - content: '切换后需要重新进入小程序' - }) - if (!modalRes || !modalRes.confirm) { - return - } - uni.setStorageSync(portKey, port) - app.restart() - } - } - - // 设置切换配置跟随 - if (xp2pPlugin.p2p.setUseDeliveryConfig) { - const useDeliveryConfigKey = 'useDeliveryConfig' - const useDeliveryConfigTime = parseInt(uni.getStorageSync(useDeliveryConfigKey), 10) - const useDeliveryConfig = !!( - useDeliveryConfigTime && Date.now() - useDeliveryConfigTime < 3600000 * 24 - ) // 24小时内有效 - xp2pPlugin.p2p.setUseDeliveryConfig(useDeliveryConfig) - app.useDeliveryConfig = useDeliveryConfig - app.toggleUseDeliveryConfig = async () => { - const modalRes = await uni.showModal({ - title: '确定切换 使用设备跟随 吗？', - content: '切换后需要重新进入小程序' - }) - if (!modalRes || !modalRes.confirm) { - return - } - uni.setStorageSync(useDeliveryConfigKey, useDeliveryConfig ? '' : Date.now()) - app.restart() - } - } - - xp2pManager = iotExports.getXp2pManager() - app.logger?.log('xp2pManager', { - P2PPlayerVersion: xp2pManager.P2PPlayerVersion, - XP2PVersion: xp2pManager.XP2PVersion, - // uuid，插件随机生成的id，存储在小程序本地，删除小程序后会重新生成 - uuid: xp2pManager.uuid - }) - } - return xp2pManager -} diff --git a/stores/basic.js b/stores/basic.js index f62d83e..f74cac8 100644 --- a/stores/basic.js +++ b/stores/basic.js @@ -391,6 +391,11 @@ const pages = [ name: 'p2pPlayer', path: '/pages/p2p/p2pPlayer', tabBar: false + }, + { + name: 'authorizeWechat', + path: '/pages/p2p/authorizeWechat', + tabBar: false } ] diff --git a/utils/request.js b/utils/request.js index a1a0a1d..dabfeba 100644 --- a/utils/request.js +++ b/utils/request.js @@ -29,13 +29,13 @@ const request = config => { const timestamp = new Date().getTime() timer = setTimeout(() => { resolve({ code: -1, message: '网络访问失败，请检查网络是否正常' }) - }, 7200) + }, 30200) uni.request({ url: URL, method, header, data, - timeout: 7000, + timeout: 30000, async success(res) { const { statusCode, data } = res if (timer) {