diff --git a/jsconfig.json b/jsconfig.json index eb0cdc9..8a31a45 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -2,9 +2,7 @@ "compilerOptions": { "baseUrl": ".", "paths": { - "@/*": [ - "./*" - ] + "@/*": ["./*"] }, "target": "es2020", "module": "esnext", @@ -15,14 +13,6 @@ "strict": true, "skipLibCheck": true }, - "include": [ - "**/*.js", - "**/*.jsx", - "**/*.vue" - ], - "exclude": [ - "node_modules", - "unpackage", - "dist" - ] -} \ No newline at end of file + "include": ["**/*.js", "**/*.jsx", "**/*.vue", "pages/p2p/p2pPlayer.nvue"], + "exclude": ["node_modules", "unpackage", "dist"] +} diff --git a/manifest.json b/manifest.json index 3d45751..4d30de7 100644 --- a/manifest.json +++ b/manifest.json @@ -1,111 +1,110 @@ { - "name" : "星星锁Lite", - "appid" : "__UNI__933D519", - "description" : "", - "versionName" : "1.3.0", - "versionCode" : "37", - "mp-weixin" : { - "appid" : "wx9829a39e65550757", - "setting" : { - "urlCheck" : true, - "minified" : true - }, - "permission" : { - "scope.bluetooth" : { - "desc" : "蓝牙将用于控制和管理您的智能门锁" - } - }, - "requiredPrivateInfos" : [ "getLocation" ], - "usingComponents" : true, - "lazyCodeLoading" : "requiredComponents", - "optimization" : { - "subPackages" : true - }, - "plugins" : { - "wmpf-voip" : { - "version" : "latest", - "provider" : "wxf830863afde621eb", - "genericsImplementation" : { - "call-page-plugin" : { - "custombox" : "pages/main/customBox" - } - } - } - } + "name": "星星锁Lite", + "appid": "__UNI__933D519", + "description": "", + "versionName": "1.3.0", + "versionCode": "37", + "mp-weixin": { + "appid": "wx9829a39e65550757", + "setting": { + "urlCheck": true, + "minified": true }, - "vueVersion" : "3", - "app-plus" : { - "distribute" : { - "icons" : { - "android" : { - "hdpi" : "unpackage/res/icons/72x72.png", - "xhdpi" : "unpackage/res/icons/96x96.png", - "xxhdpi" : "unpackage/res/icons/144x144.png", - "xxxhdpi" : "unpackage/res/icons/192x192.png" - }, - "ios" : { - "appstore" : "unpackage/res/icons/1024x1024.png", - "ipad" : { - "app" : "unpackage/res/icons/76x76.png", - "app@2x" : "unpackage/res/icons/152x152.png", - "notification" : "unpackage/res/icons/20x20.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "proapp@2x" : "unpackage/res/icons/167x167.png", - "settings" : "unpackage/res/icons/29x29.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "spotlight" : "unpackage/res/icons/40x40.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png" - }, - "iphone" : { - "app@2x" : "unpackage/res/icons/120x120.png", - "app@3x" : "unpackage/res/icons/180x180.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "notification@3x" : "unpackage/res/icons/60x60.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "settings@3x" : "unpackage/res/icons/87x87.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png", - "spotlight@3x" : "unpackage/res/icons/120x120.png" - } - } - }, - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "ios" : { - "dSYMs" : false - } - }, - "modules" : { - "Bluetooth" : {}, - "VideoPlayer" : {}, - "LivePusher" : {}, - "Camera" : {}, - "Record" : {} - }, - "splashscreen" : { - "waiting" : false + "permission": { + "scope.bluetooth": { + "desc": "蓝牙将用于控制和管理您的智能门锁" + } + }, + "usingComponents": true, + "lazyCodeLoading": "requiredComponents", + "optimization": { + "subPackages": true + }, + "plugins": { + "wmpf-voip": { + "version": "latest", + "provider": "wxf830863afde621eb", + "genericsImplementation": { + "call-page-plugin": { + "custombox": "pages/main/customBox" + } } + } } + }, + "vueVersion": "3", + "app-plus": { + "distribute": { + "icons": { + "android": { + "hdpi": "unpackage/res/icons/72x72.png", + "xhdpi": "unpackage/res/icons/96x96.png", + "xxhdpi": "unpackage/res/icons/144x144.png", + "xxxhdpi": "unpackage/res/icons/192x192.png" + }, + "ios": { + "appstore": "unpackage/res/icons/1024x1024.png", + "ipad": { + "app": "unpackage/res/icons/76x76.png", + "app@2x": "unpackage/res/icons/152x152.png", + "notification": "unpackage/res/icons/20x20.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "proapp@2x": "unpackage/res/icons/167x167.png", + "settings": "unpackage/res/icons/29x29.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "spotlight": "unpackage/res/icons/40x40.png", + "spotlight@2x": "unpackage/res/icons/80x80.png" + }, + "iphone": { + "app@2x": "unpackage/res/icons/120x120.png", + "app@3x": "unpackage/res/icons/180x180.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "notification@3x": "unpackage/res/icons/60x60.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "settings@3x": "unpackage/res/icons/87x87.png", + "spotlight@2x": "unpackage/res/icons/80x80.png", + "spotlight@3x": "unpackage/res/icons/120x120.png" + } + } + }, + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + "ios": { + "dSYMs": false + } + }, + "modules": { + "Bluetooth": {}, + "VideoPlayer": {}, + "LivePusher": {}, + "Camera": {}, + "Record": {} + }, + "splashscreen": { + "waiting": false + } + } } diff --git a/pages.json b/pages.json index 90331cf..fbf61bb 100644 --- a/pages.json +++ b/pages.json @@ -38,13 +38,6 @@ "navigationBarTitleText": "门锁记录", "disableScroll": true } - }, - { - "path": "appPlayer", - "style": { - "navigationBarTitleText": "监控", - "disableScroll": true - } } ], "plugins": { diff --git a/pages/main/lockDetail.vue b/pages/main/lockDetail.vue index 34406bb..bd4ee91 100644 --- a/pages/main/lockDetail.vue +++ b/pages/main/lockDetail.vue @@ -310,12 +310,7 @@ }) const jumpToPlayer = () => { - // #ifdef MP $basic.routeJump({ name: 'p2pPlayer' }) - // #endif - // #ifdef APP-PLUS - $basic.routeJump({ name: 'appPlayer' }) - // #endif } const openDoorOperate = async type => { diff --git a/pages/p2p/appPlayer.vue b/pages/p2p/appPlayer.vue deleted file mode 100644 index f6a4efc..0000000 --- a/pages/p2p/appPlayer.vue +++ /dev/null @@ -1,67 +0,0 @@ - - - diff --git a/pages/p2p/p2pPlayer.vue b/pages/p2p/p2pPlayer.vue index 12f1afb..44a4fba 100644 --- a/pages/p2p/p2pPlayer.vue +++ b/pages/p2p/p2pPlayer.vue @@ -1,48 +1,67 @@