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 a21b0a9b..e7d6c95b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "华润智慧电站", //中建四局
"appid" : "__UNI__4AA4101",
"description" : "",
- "versionName" : "3.1.1",
- "versionCode" : 311,
+ "versionName" : "3.1.3",
+ "versionCode" : 313,
"transformPx" : false,
"sassImplementationName" : "node-sass",
/* 5+App特有相关 */
diff --git a/pages/videoManage/playVideo.vue b/pages/videoManage/playVideo.vue
index ca1f552f..a959c027 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;
}
})