From 0aa012d9c7225e7d0765103d5b92b5a1b91ef0da Mon Sep 17 00:00:00 2001 From: liub Date: Fri, 6 Mar 2026 10:25:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=9A=90=E7=A7=81=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 5 +-- androidPrivacy.json | 2 +- manifest.json | 22 ++++++--- pages/6170/deviceControl/index.vue | 60 ++++++++++++++----------- pages/common/privacyAgreement/index.vue | 12 ++++- 5 files changed, 62 insertions(+), 39 deletions(-) diff --git a/App.vue b/App.vue index 02cee52..faaf989 100644 --- a/App.vue +++ b/App.vue @@ -212,8 +212,5 @@ font-family: "PingFangBold"; src: url("~@/static/fonts/PingFangBold.ttf") format("opentype"); } - @font-face { - font-family: "SongTi"; - src: url("~@/static/fonts/SongTi.ttf") format("opentype"); - } + \ No newline at end of file diff --git a/androidPrivacy.json b/androidPrivacy.json index 3e91c29..f0a3045 100644 --- a/androidPrivacy.json +++ b/androidPrivacy.json @@ -2,7 +2,7 @@ "version" : "1", "prompt" : "template", "title" : "服务协议和隐私政策", - "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", + "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", "buttonAccept" : "同意并接受", "buttonRefuse" : "暂不同意", "hrefLoader" : "system", diff --git a/manifest.json b/manifest.json index 92ca288..985c208 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "appid" : "__UNI__A21EF43", "description" : "设备管控", "versionName" : "1.0.18", - "versionCode" : "100", + "versionCode" : 101, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -44,7 +44,6 @@ "", "", "", - "", "", "", "", @@ -100,13 +99,22 @@ }, "push" : { "unipush" : { - "version" : "2", "offline" : true, - "honor" : {}, - "mi" : {}, - "vivo" : {}, + "hms" : {}, "oppo" : {}, - "hms" : {} + "vivo" : {}, + "mi" : {}, + "honor" : {}, + "version" : "2", + "icons" : { + "small" : { + "ldpi" : "unpackage/res/icons/18x18.png", + "mdpi" : "unpackage/res/icons/24x24.png", + "hdpi" : "unpackage/res/icons/36x36.png", + "xhdpi" : "unpackage/res/icons/48x48.png", + "xxhdpi" : "unpackage/res/icons/72x72.png" + } + } } } }, diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue index 5cc86e5..903511c 100644 --- a/pages/6170/deviceControl/index.vue +++ b/pages/6170/deviceControl/index.vue @@ -680,7 +680,7 @@ }) } - if (ble) { + if (ble && this.itemInfo.deviceMac) { let f = this.getDevice(); if (f) { let json = { @@ -738,7 +738,7 @@ } - if (ble) { + if (ble && this.itemInfo.deviceMac) { let f = this.getDevice(); if (f) { let json = { @@ -859,7 +859,7 @@ }); } - if (ble) { + if (ble && this.itemInfo.deviceMac) { let f = this.getDevice(); if (f) { let json = { @@ -929,7 +929,7 @@ }) } - if (ble) { + if (ble && this.itemInfo.deviceMac) { let f = this.getDevice(); if (f) { let json = { @@ -1129,12 +1129,12 @@ iconUrl: "/static/images/common/success.png", }, these); - setTimeout(()=>{ + setTimeout(() => { ble.sendString(f.deviceId, "transmit complete", f - .writeServiceId, f - .wirteCharactId); - },1000); - + .writeServiceId, f + .wirteCharactId); + }, 1000); + these.rgb565Data = null; resolve(); return; @@ -1253,7 +1253,7 @@ }); }, 0) } - if (ble) { + if (ble && this.itemInfo.deviceMac) { let f = this.getDevice(); if (f) { bleSend(); @@ -1499,7 +1499,7 @@ }, 0); } - if (ble) { + if (ble && this.itemInfo.deviceMac) { let f = this.getDevice(); if (f) { bleSend(); @@ -1796,8 +1796,7 @@ }, onLoad(options) { these = this; - rec = BleReceive.getBleReceive(); - ble = BleTool.getBleTool(); + const eventChannel = this.getOpenerEventChannel(); // 监听 'detailData' 事件，获取传过来的数据 @@ -1807,6 +1806,8 @@ eventChannel.on('detailData', (data) => { console.log(data, 'data'); this.itemInfo = data.data; + + this.deviceID = data.data.id; this.navTitle = data.data.deviceName; this.apiType = data.apiType @@ -1890,22 +1891,31 @@ this.fetchSharedDeviceDetail(data.data.id) } - let f = ble.data.LinkedList.find((v) => { - if (v.macAddress == this.itemInfo.deviceMac) { - console.log("找到设备了", v); - these.formData.deviceId = v.deviceId; - return true; - } - return false; - }); - if (f) { - these.formData.bleStatu = 'connecting'; - ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => { - these.formData.bleStatu = true; + if (this.itemInfo.deviceMac) { + rec = BleReceive.getBleReceive(); + ble = BleTool.getBleTool(); + + let f = ble.data.LinkedList.find((v) => { + if (v.macAddress == this.itemInfo.deviceMac) { + console.log("找到设备了", v); + these.formData.deviceId = v.deviceId; + return true; + } + return false; }); + + if (f) { + these.formData.bleStatu = 'connecting'; + ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then( + res => { + these.formData.bleStatu = true; + }); + } } + + }); eventChannel.emit('ack', { diff --git a/pages/common/privacyAgreement/index.vue b/pages/common/privacyAgreement/index.vue index 0cd534f..7c27108 100644 --- a/pages/common/privacyAgreement/index.vue +++ b/pages/common/privacyAgreement/index.vue @@ -2,7 +2,10 @@ 星汉物联App联隐私政策 - 更新日期：2025-09-23 + 编写日期：2025-09-23 + + + 更新日期：2026-03-05 生效日期：2025-10-08 @@ -38,7 +41,7 @@ (1).账号信息：手机号码、验证码,用于注册、登陆 (2).蓝牙,用于设备连接后的通信、控制 (3).相机/相册权限,拍摄的照片或视频用于上传给设备、扫码等 - (4).设备标识信息：IMEI、Android ID、MAC、OAID、软件安装列表,用于日志查询、统计分析、识别您的设备预防恶意程序及反作弊，提高服务安全性 + (4).设备标识信息：BSSID、Wi-Fi SSID、Wi-Fi BSSID、IMEI、Android ID、MAC、OAID、AAID、PushToken、APP ID、应用包名、软件安装列表,用于日志查询、统计分析、识别您的设备预防恶意程序及反作弊，提高服务安全性 (5).GPS或网络位置,用于基于位置的服务，如地图导航、位置偏移预警 (6).麦克风,我们的智能设备支持播放语音，需要录音以上传给设备 (7).根据SDK功能，可能收集设备信息、位置信息等。我们会对合作的第三方SDK进行严格评估，并要求其遵守相关法规。具体清单见下文。 @@ -51,6 +54,11 @@ (2).定位SDK(com.amap.api.location),所属公司:北京高德图强科技有限公司,隐私政策链接:https://lbs.amap.com/pages/privacy/ (3).移动智能终端补充设备标识体系统一调用SDK(com.bun.miitmdid),所属公司:中国信息通信研究院,隐私政策链接:https://www.msa-alliance.cn/col.jsp?id=122 (4).轻量版地图SDK(com.amap.api.maps.utils),所属公司:北京高德图强科技有限公司,隐私政策链接:https://lbs.amap.com/pages/privacy/ + + (5).个推消息推送(com.igexin.push),所属公司:浙江每日互动网络科技股份有限公司,隐私政策链接:http://docs.getui.com/download.html + (6).阿里云快速json(com.alibaba.fastjson),所属公司:杭州阿里巴巴广告有限公司,隐私政策链接:https://github.com/alibaba/fastjson + (7).vivo PUSH-SDK(com.vivo.push),所属公司:维沃移动通信有限公司,隐私政策链接:https://dev.vivo.com.cn/documentCenter/doc/180 + (8).OPPO PUSH 客户端SDK(com.heytap),所属公司:OPPO广东移动通信有限公司,隐私政策链接:https://open.oppomobile.com/new/introduction?page_name=oppopush 4. 信息的存储与安全