diff --git a/androidPrivacy.json b/androidPrivacy.json
index b5dfe705..f5a8e541 100644
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@@ -1,38 +1,38 @@
{
- "version": "1",
- "prompt": "template",
- "title": "服务协议和隐私政策",
- "message": " 感谢您信任并使用智慧安全!
我们根据我们根据最新法律要求，更新了隐私政策，特地向您推送本提示。我们一直采取行业领先的安全防护措施来保护您的信息安全，我们会根据您使用服务的具体功能需要收集使用信息(可能涉及账户、交易、设备等相关信息)。我们不会向任何第三方提供您的信息，除非得到您的授权。若我们将信息用于您未授权用途或目的，我们会事先再次征求您的同意。
您可以阅读完整版用户服务协议与隐私政策",
- "buttonAccept": "同意",
- "buttonRefuse": "暂不同意",
- "hrefLoader": "system",
- "backToExit": "false",
- "second": {
- "title": "确认提示",
- "message": " 进入应用前，您需先同意用户服务协议与隐私政策，否则将退出应用。",
- "buttonAccept": "同意并继续",
- "buttonRefuse": "退出应用"
+ "version" : "1",
+ "prompt" : "template",
+ "title" : "服务协议和隐私政策",
+ "message" : " 感谢您信任并使用智慧安全!
我们根据我们根据最新法律要求，更新了隐私政策，特地向您推送本提示。我们一直采取行业领先的安全防护措施来保护您的信息安全，我们会根据您使用服务的具体功能需要收集使用信息(可能涉及账户、交易、设备等相关信息)。我们不会向任何第三方提供您的信息，除非得到您的授权。若我们将信息用于您未授权用途或目的，我们会事先再次征求您的同意。
您可以阅读完整版用户服务协议与隐私政策",
+ "buttonAccept" : "同意",
+ "buttonRefuse" : "暂不同意",
+ "hrefLoader" : "system",
+ "backToExit" : "false",
+ "second" : {
+ "title" : "确认提示",
+ "message" : " 进入应用前，您需先同意用户服务协议与隐私政策，否则将退出应用。",
+ "buttonAccept" : "同意并继续",
+ "buttonRefuse" : "退出应用"
},
- "disagreeMode": {
- "support": false,
- "loadNativePlugins": false,
- "visitorEntry": false,
- "showAlways": false
+ "disagreeMode" : {
+ "support" : false,
+ "loadNativePlugins" : false,
+ "visitorEntry" : false,
+ "showAlways" : false
},
- "styles": {
- "backgroundColor": "#ffffff",
- "borderRadius": "5px",
- "title": {
- "color": "#000000"
+ "styles" : {
+ "backgroundColor" : "#ffffff",
+ "borderRadius" : "5px",
+ "title" : {
+ "color" : "#000000"
},
- "buttonAccept": {
- "color": "#42b983"
+ "buttonAccept" : {
+ "color" : "#42b983"
},
- "buttonRefuse": {
- "color": "#f65352"
+ "buttonRefuse" : {
+ "color" : "#f65352"
},
- "buttonVisitor": {
- "color": "#f65352"
+ "buttonVisitor" : {
+ "color" : "#f65352"
}
}
-}
\ No newline at end of file
+}
diff --git a/manifest.json b/manifest.json
index fdfeafb9..67d1c44a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,58 +1,58 @@
{
- "name" : "智慧安全", //中建四局
- "appid" : "__UNI__4AA4101",
- "description" : "",
- "versionName" : "1.8.1",
- "versionCode" : 181,
- "transformPx" : false,
- "sassImplementationName" : "node-sass",
+ "name": "智慧安全", //中建四局
+ "appid": "__UNI__4AA4101",
+ "description": "",
+ "versionName": "1.8.1",
+ "versionCode": 181,
+ "transformPx": false,
+ "sassImplementationName": "node-sass",
/* 5+App特有相关 */
- "app-plus" : {
- "plugins" : {
- "Webview" : {
- "allowFileAccess" : true,
- "allowUniversalAccessFromFileURLs" : true,
- "allowFileAccessFromFileURLs" : true // 新增此配置
+ "app-plus": {
+ "plugins": {
+ "Webview": {
+ "allowFileAccess": true,
+ "allowUniversalAccessFromFileURLs": true,
+ "allowFileAccessFromFileURLs": true // 新增此配置
}
},
- "usingComponents" : true,
- "nvueCompiler" : "uni-app",
- "compilerVersion" : 3,
- "compression" : {
- "enable" : true,
- "type" : "br" // 使用 Brotli 压缩
+ "usingComponents": true,
+ "nvueCompiler": "uni-app",
+ "compilerVersion": 3,
+ "compression": {
+ "enable": true,
+ "type": "br" // 使用 Brotli 压缩
},
- "compatible" : {
- "ignoreVersion" : true
+ "compatible": {
+ "ignoreVersion": true
},
- "splashscreen" : {
- "alwaysShowBeforeRender" : true,
- "waiting" : true,
- "autoclose" : true,
- "delay" : 0
+ "splashscreen": {
+ "alwaysShowBeforeRender": true,
+ "waiting": true,
+ "autoclose": true,
+ "delay": 0
},
- "nvue" : {
+ "nvue": {
//可选，JSON对象，nvue页面相关配置
- "flex-direction" : "row" //可选，字符串类型，nvue页面的flex-direction默认值，可取值row、row-reverse、column、column-reverse
+ "flex-direction": "row" //可选，字符串类型，nvue页面的flex-direction默认值，可取值row、row-reverse、column、column-reverse
},
/* 模块配置 */
- "modules" : {
- "Maps" : {},
- "VideoPlayer" : {},
- "Bluetooth" : {},
- "SQLite" : {},
- "Fingerprint" : {},
- "Speech" : {},
- "Record" : {},
- "Camera" : {},
- "Geolocation" : {},
- "LivePusher" : {}
+ "modules": {
+ "Maps": {},
+ "VideoPlayer": {},
+ "Bluetooth": {},
+ "SQLite": {},
+ "Fingerprint": {},
+ "Speech": {},
+ "Record": {},
+ "Camera": {},
+ "Geolocation": {},
+ "LivePusher": {}
},
/* 应用发布信息 */
- "distribute" : {
+ "distribute": {
/* android打包配置 */
- "android" : {
- "permissions" : [
+ "android": {
+ "permissions": [
"",
"",
"",
@@ -82,214 +82,214 @@
"",
""
],
- "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
- "targetSdkVersion" : 30,
- "permissionExternalStorage" : {
- "request" : "none",
- "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+ "abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
+ "targetSdkVersion": 30,
+ "permissionExternalStorage": {
+ "request": "none",
+ "prompt": "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
},
- "permissionPhoneState" : {
- "request" : "none"
+ "permissionPhoneState": {
+ "request": "none"
}
},
/* ios打包配置 */
- "ios" : {
- "idfa" : false,
- "dSYMs" : false,
- "privacyDescription" : {
- "NSPhotoLibraryUsageDescription" : "允许照片访问以修改您的头像；在您使用智慧安全进行办公时添加照片到您所提交的表单。",
- "NSCameraUsageDescription" : "允许相机访问用于您在使用智慧安全工作期间拍摄照片、拍摄视频、扫描二维码。",
- "NSLocationWhenInUseUsageDescription" : "您的位置信息将用于您在使用智慧安全期间显示当地天气；新增巡检点、一键报警功能中获取您当前位置信息。",
- "NSMicrophoneUsageDescription" : "允许麦克风访问用于您在使用智慧安全期间进行语音对讲、语音记录、语音识别等功能。",
+ "ios": {
+ "idfa": false,
+ "dSYMs": false,
+ "privacyDescription": {
+ "NSPhotoLibraryUsageDescription": "允许照片访问以修改您的头像；在您使用智慧安全进行办公时添加照片到您所提交的表单。",
+ "NSCameraUsageDescription": "允许相机访问用于您在使用智慧安全工作期间拍摄照片、拍摄视频、扫描二维码。",
+ "NSLocationWhenInUseUsageDescription": "您的位置信息将用于您在使用智慧安全期间显示当地天气；新增巡检点、一键报警功能中获取您当前位置信息。",
+ "NSMicrophoneUsageDescription": "允许麦克风访问用于您在使用智慧安全期间进行语音对讲、语音记录、语音识别等功能。",
// 添加文件访问权限描述
- "NSDocumentsFolderUsageDescription" : "需要访问应用文档目录以加载资源文件",
- "NSDownloadsFolderUsageDescription" : "需要访问下载目录",
+ "NSDocumentsFolderUsageDescription": "需要访问应用文档目录以加载资源文件",
+ "NSDownloadsFolderUsageDescription": "需要访问下载目录",
// 新增以下权限描述
- "NSFileProviderDomainUsageDescription" : "需要访问文件系统以加载解码器资源",
- "NSFileProviderPresentedItemUbiquityAttributesDescription" : "需要访问文件系统资源"
+ "NSFileProviderDomainUsageDescription": "需要访问文件系统以加载解码器资源",
+ "NSFileProviderPresentedItemUbiquityAttributesDescription": "需要访问文件系统资源"
},
// 启用文件共享
- "UIFileSharingEnabled" : true,
- "LSSupportsOpeningDocumentsInPlace" : true,
+ "UIFileSharingEnabled": true,
+ "LSSupportsOpeningDocumentsInPlace": true,
// 新增以下配置
- "WKPreferences" : {
- "allowFileAccessFromFileURLs" : true,
- "allowUniversalAccessFromFileURLs" : true
+ "WKPreferences": {
+ "allowFileAccessFromFileURLs": true,
+ "allowUniversalAccessFromFileURLs": true
},
// 新增沙盒扩展权限
- "com.apple.security.app-sandbox" : true,
- "com.apple.security.files.user-selected.read-write" : true,
- "com.apple.security.files.downloads.read-write" : true
+ "com.apple.security.app-sandbox": true,
+ "com.apple.security.files.user-selected.read-write": true,
+ "com.apple.security.files.downloads.read-write": true
},
/* SDK配置 */
- "sdkConfigs" : {
- "maps" : {
- "amap" : {
- "appkey_ios" : "9510eb01b56e6428646b256cc379f695",
- "appkey_android" : "3b060f3a0ce4bafebeba1621dcd99c31"
+ "sdkConfigs": {
+ "maps": {
+ "amap": {
+ "appkey_ios": "9510eb01b56e6428646b256cc379f695",
+ "appkey_android": "3b060f3a0ce4bafebeba1621dcd99c31"
}
},
- "ad" : {},
- "geolocation" : {
- "amap" : {
- "__platform__" : [ "ios", "android" ],
- "appkey_ios" : "9510eb01b56e6428646b256cc379f695",
- "appkey_android" : "3b060f3a0ce4bafebeba1621dcd99c31"
+ "ad": {},
+ "geolocation": {
+ "amap": {
+ "__platform__": ["ios", "android"],
+ "appkey_ios": "9510eb01b56e6428646b256cc379f695",
+ "appkey_android": "3b060f3a0ce4bafebeba1621dcd99c31"
}
}
},
- "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"
+ "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"
+ "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"
+ "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"
}
}
},
- "splashscreen" : {
- "android" : {
- "hdpi" : "C:/Users/86173/Desktop/6d9e3eaea01d7138ad9cffaf4739cf0.png",
- "xhdpi" : "C:/Users/86173/Desktop/6d9e3eaea01d7138ad9cffaf4739cf0.png",
- "xxhdpi" : "C:/Users/86173/Desktop/6d9e3eaea01d7138ad9cffaf4739cf0.png"
+ "splashscreen": {
+ "android": {
+ "hdpi": "C:/Users/86173/Desktop/6d9e3eaea01d7138ad9cffaf4739cf0.png",
+ "xhdpi": "C:/Users/86173/Desktop/6d9e3eaea01d7138ad9cffaf4739cf0.png",
+ "xxhdpi": "C:/Users/86173/Desktop/6d9e3eaea01d7138ad9cffaf4739cf0.png"
},
- "iosStyle" : "common",
- "ios" : {
- "storyboard" : "D:/work/JXJ2/unpackage/CustomStoryboard.zip",
- "iphone" : {
- "portrait-896h@3x" : "C:/Users/86173/Desktop/6d9e3eaea01d7138ad9cffaf4739cf0.png"
+ "iosStyle": "common",
+ "ios": {
+ "storyboard": "D:/work/JXJ2/unpackage/CustomStoryboard.zip",
+ "iphone": {
+ "portrait-896h@3x": "C:/Users/86173/Desktop/6d9e3eaea01d7138ad9cffaf4739cf0.png"
}
},
- "useOriginalMsgbox" : true,
- "androidStyle" : "common"
+ "useOriginalMsgbox": true,
+ "androidStyle": "common"
}
},
- "nativePlugins" : {
- "DCTestUniPlugin" : {
- "__plugin_info__" : {
- "name" : "DCTestUniPlugin",
- "description" : "uni海康对讲插件",
- "platforms" : "iOS",
- "url" : "",
- "android_package_name" : "",
- "ios_bundle_id" : "",
- "isCloud" : false,
- "bought" : -1,
- "pid" : "",
- "parameters" : {}
+ "nativePlugins": {
+ "DCTestUniPlugin": {
+ "__plugin_info__": {
+ "name": "DCTestUniPlugin",
+ "description": "uni海康对讲插件",
+ "platforms": "iOS",
+ "url": "",
+ "android_package_name": "",
+ "ios_bundle_id": "",
+ "isCloud": false,
+ "bought": -1,
+ "pid": "",
+ "parameters": {}
}
}
}
},
/* 快应用特有相关 */
- "quickapp" : {},
+ "quickapp": {},
/* 小程序特有相关 */
- "mp-weixin" : {
- "appid" : "wx130c0959e6234df0",
- "setting" : {
- "urlCheck" : false,
- "es6" : true,
- "postcss" : true,
- "minified" : true
+ "mp-weixin": {
+ "appid": "wx130c0959e6234df0",
+ "setting": {
+ "urlCheck": false,
+ "es6": true,
+ "postcss": true,
+ "minified": true
},
- "usingComponents" : true,
- "permission" : {
- "scope.record" : {
- "desc" : "您的位置信息将用于您在使用智慧安全期间进行语音对讲、语音记录、语音识别等功能"
+ "usingComponents": true,
+ "permission": {
+ "scope.record": {
+ "desc": "您的位置信息将用于您在使用智慧安全期间进行语音对讲、语音记录、语音识别等功能"
}
},
- "requiredPrivateInfos" : [ "getRecorderManager" ]
+ "requiredPrivateInfos": ["getRecorderManager"]
},
- "mp-alipay" : {
- "usingComponents" : true,
- "permission" : {
- "scope.record" : {
- "desc" : "您的位置信息将用于您在使用智慧安全期间进行语音对讲、语音记录、语音识别等功能"
+ "mp-alipay": {
+ "usingComponents": true,
+ "permission": {
+ "scope.record": {
+ "desc": "您的位置信息将用于您在使用智慧安全期间进行语音对讲、语音记录、语音识别等功能"
}
}
},
- "mp-baidu" : {
- "usingComponents" : true,
- "permission" : {
- "scope.record" : {
- "desc" : "您的位置信息将用于您在使用智慧安全期间进行语音对讲、语音记录、语音识别等功能"
+ "mp-baidu": {
+ "usingComponents": true,
+ "permission": {
+ "scope.record": {
+ "desc": "您的位置信息将用于您在使用智慧安全期间进行语音对讲、语音记录、语音识别等功能"
}
}
},
- "mp-toutiao" : {
- "usingComponents" : true,
- "permission" : {
- "scope.record" : {
- "desc" : "您的位置信息将用于您在使用智慧安全期间进行语音对讲、语音记录、语音识别等功能"
+ "mp-toutiao": {
+ "usingComponents": true,
+ "permission": {
+ "scope.record": {
+ "desc": "您的位置信息将用于您在使用智慧安全期间进行语音对讲、语音记录、语音识别等功能"
}
}
},
- "uniStatistics" : {
- "enable" : false
+ "uniStatistics": {
+ "enable": false
},
- "h5" : {
- "permissions" : {
- "scope.record" : {
- "desc" : "您的位置信息将用于您在使用智慧安全期间进行语音对讲、语音记录、语音识别等功能"
+ "h5": {
+ "permissions": {
+ "scope.record": {
+ "desc": "您的位置信息将用于您在使用智慧安全期间进行语音对讲、语音记录、语音识别等功能"
}
},
- "devServer" : {
- "port" : 8088,
- "disableHostCheck" : true,
- "proxy" : {
- "/" : {
- "target" : "http://192.168.0.129",
- "changeOrigin" : true,
- "secure" : false,
- "pathRewrite" : {
- "^/" : ""
+ "devServer": {
+ "port": 8088,
+ "disableHostCheck": true,
+ "proxy": {
+ "/": {
+ "target": "http://192.168.0.129",
+ "changeOrigin": true,
+ "secure": false,
+ "pathRewrite": {
+ "^/": ""
}
}
}
},
- "sdkConfigs" : {
- "maps" : {
- "amap" : {
- "key" : "",
- "securityJsCode" : "",
- "serviceHost" : ""
+ "sdkConfigs": {
+ "maps": {
+ "amap": {
+ "key": "",
+ "securityJsCode": "",
+ "serviceHost": ""
}
}
},
- "router" : {
- "mode" : "hash",
- "base" : "/app/"
+ "router": {
+ "mode": "hash",
+ "base": "/app/"
},
- "optimization" : {
- "treeShaking" : {
- "enable" : false
+ "optimization": {
+ "treeShaking": {
+ "enable": false
}
},
- "title" : "智慧工地云",
- "template" : ""
+ "title": "智慧工地云",
+ "template": ""
},
- "vueVersion" : "2"
-}
+ "vueVersion": "2"
+}
\ No newline at end of file
diff --git a/pages/videoManage/playVideo.vue b/pages/videoManage/playVideo.vue
index 464a64be..7c1a33b7 100644
--- a/pages/videoManage/playVideo.vue
+++ b/pages/videoManage/playVideo.vue
@@ -158,7 +158,6 @@
import playbackIcon from '@/static/videoControlIcon/playbackIcon.png'
import playbackActiveIcon from '@/static/videoControlIcon/playbackIcon-active.png';
import permission from "@/common/permission";
- const testModule = uni.requireNativePlugin("DCTestUniPlugin-TestModule")
export default {
components: {
headers,
@@ -222,6 +221,7 @@
H5Player: null,
seconds: 0,
secondsTime: null,
+ testModule: null,
};
},
onLoad(options) {
@@ -229,6 +229,7 @@
this.H5Player = require('@/static/monitor/h5player.min.js');
// console.log(888888, this.H5Player)
// #endif
+ this.testModule = uni.requireNativePlugin("DCTestUniPlugin-TestModule");
//videoType 1萤石云，2乐橙，3ISC，4大华，5宇视，6国标
// this.url = options.url
@@ -392,7 +393,7 @@
},
method: "POST",
success(res) {
- console.log("我进来了", testModule)
+ console.log("我进来了", that.testModule)
const res2 = JSON.parse(res.result);
if (!res2.data) {
uni.showToast({
@@ -402,7 +403,7 @@
return
}
const url = res2.data.url;
- testModule.startTalk({
+ that.testModule.startTalk({
talkUrl: url
},
(res) => {
@@ -493,7 +494,7 @@
const that = this;
const systemInfo = uni.getSystemInfoSync();
if (systemInfo.platform === 'ios') {
- testModule.stopTalk();
+ this.testModule.stopTalk();
clearInterval(this.secondsTime);
this.voiceShow = false;
return
diff --git a/pages/videoManage/videoGroup.vue b/pages/videoManage/videoGroup.vue
index 72306e9d..4f011a6f 100644
--- a/pages/videoManage/videoGroup.vue
+++ b/pages/videoManage/videoGroup.vue
@@ -63,7 +63,7 @@
url: "xmgl/videoGroup/tree/list",
data: requestData,
success(res) {
- console.log('视频分组列表', res)
+ // console.log('视频分组列表', res)
that.treeData = res.result;
}
})