admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dunhuang-dev' of http://192.168.34.160:8023/admin/zhgdyunapp into dunhuang-cs

Browse Source
This commit is contained in:
Rain_ 2025-11-20 11:59:13 +08:00
commit 703966e090
4 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
androidPrivacy.json
View File

@ -1,38 +1,38 @@
{
"version": "1",
"prompt": "template",
"title": "服务协议和隐私政策",
"message": "　　感谢您信任并使用智慧安全!<br/>　　我们根据我们根据最新法律要求，更新了隐私政策，特地向您推送本提示。我们一直采取行业领先的安全防护措施来保护您的信息安全，我们会根据您使用服务的具体功能需要收集使用信息(可能涉及账户、交易、设备等相关信息)。我们不会向任何第三方提供您的信息，除非得到您的授权。若我们将信息用于您未授权用途或目的，我们会事先再次征求您的同意。<br/>　　您可以阅读完整版<a href=\"http://gszhdz.crpower.com.cn:9809/image/6.16%E4%BD%B3%E4%BF%A1%E6%8D%B7%E6%99%BA%E6%85%A7%E7%89%A9%E8%81%94%E6%9C%89%E9%99%90%E5%85%AC%E5%8F%B8%E7%94%A8%E6%88%B7%E5%8D%8F%E8%AE%AE.html\">用户服务协议</a>与<a href=\"http://gszhdz.crpower.com.cn:9809/image/6.16%E4%BD%B3%E4%BF%A1%E6%8D%B7%E6%99%BA%E6%85%A7%E7%89%A9%E8%81%94%E6%9C%89%E9%99%90%E5%85%AC%E5%8F%B8%E9%9A%90%E7%A7%81%E6%94%BF%E7%AD%96.html\">隐私政策</a>",
"buttonAccept": "同意",
"buttonRefuse": "暂不同意",
"hrefLoader": "system",
"backToExit": "false",
"second": {
"title": "确认提示",
"message": "　　进入应用前，您需先同意<a href=\"http://gszhdz.crpower.com.cn:9809/image/6.16%E4%BD%B3%E4%BF%A1%E6%8D%B7%E6%99%BA%E6%85%A7%E7%89%A9%E8%81%94%E6%9C%89%E9%99%90%E5%85%AC%E5%8F%B8%E7%94%A8%E6%88%B7%E5%8D%8F%E8%AE%AE.html\">用户服务协议</a>与<a href=\"http://gszhdz.crpower.com.cn:9809/image/6.16%E4%BD%B3%E4%BF%A1%E6%8D%B7%E6%99%BA%E6%85%A7%E7%89%A9%E8%81%94%E6%9C%89%E9%99%90%E5%85%AC%E5%8F%B8%E9%9A%90%E7%A7%81%E6%94%BF%E7%AD%96.html\">隐私政策</a>，否则将退出应用。",
"buttonAccept": "同意并继续",
"buttonRefuse": "退出应用"
"version" : "1",
"prompt" : "template",
"title" : "服务协议和隐私政策",
"message" : "　　感谢您信任并使用智慧安全!<br/>　　我们根据我们根据最新法律要求，更新了隐私政策，特地向您推送本提示。我们一直采取行业领先的安全防护措施来保护您的信息安全，我们会根据您使用服务的具体功能需要收集使用信息(可能涉及账户、交易、设备等相关信息)。我们不会向任何第三方提供您的信息，除非得到您的授权。若我们将信息用于您未授权用途或目的，我们会事先再次征求您的同意。<br/>　　您可以阅读完整版<a href=\"http://gszhdz.crpower.com.cn:9809/image/6.16%E4%BD%B3%E4%BF%A1%E6%8D%B7%E6%99%BA%E6%85%A7%E7%89%A9%E8%81%94%E6%9C%89%E9%99%90%E5%85%AC%E5%8F%B8%E7%94%A8%E6%88%B7%E5%8D%8F%E8%AE%AE.html\">用户服务协议</a>与<a href=\"http://gszhdz.crpower.com.cn:9809/image/6.16%E4%BD%B3%E4%BF%A1%E6%8D%B7%E6%99%BA%E6%85%A7%E7%89%A9%E8%81%94%E6%9C%89%E9%99%90%E5%85%AC%E5%8F%B8%E9%9A%90%E7%A7%81%E6%94%BF%E7%AD%96.html\">隐私政策</a>",
"buttonAccept" : "同意",
"buttonRefuse" : "暂不同意",
"hrefLoader" : "system",
"backToExit" : "false",
"second" : {
"title" : "确认提示",
"message" : "　　进入应用前，您需先同意<a href=\"http://gszhdz.crpower.com.cn:9809/image/6.16%E4%BD%B3%E4%BF%A1%E6%8D%B7%E6%99%BA%E6%85%A7%E7%89%A9%E8%81%94%E6%9C%89%E9%99%90%E5%85%AC%E5%8F%B8%E7%94%A8%E6%88%B7%E5%8D%8F%E8%AE%AE.html\">用户服务协议</a>与<a href=\"http://gszhdz.crpower.com.cn:9809/image/6.16%E4%BD%B3%E4%BF%A1%E6%8D%B7%E6%99%BA%E6%85%A7%E7%89%A9%E8%81%94%E6%9C%89%E9%99%90%E5%85%AC%E5%8F%B8%E9%9A%90%E7%A7%81%E6%94%BF%E7%AD%96.html\">隐私政策</a>，否则将退出应用。",
"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"
}
}
}
}

4
manifest.json
View File

@ -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特有相关 */

9
pages/videoManage/playVideo.vue
View File

@ -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

2
pages/videoManage/videoGroup.vue
View File

@ -63,7 +63,7 @@
url: "xmgl/videoGroup/tree/list",
data: requestData,
success(res) {
console.log('视频分组列表', res)
// console.log('视频分组列表', res)
that.treeData = res.result;
}
})