diff --git a/androidPrivacy.json b/androidPrivacy.json index 6e900af..3e91c29 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/pages/common/addBLE/addEquip.vue b/pages/common/addBLE/addEquip.vue index 9d89df0..8a8c8f6 100644 --- a/pages/common/addBLE/addEquip.vue +++ b/pages/common/addBLE/addEquip.vue @@ -481,7 +481,10 @@ } plus.android.requestPermissions( - ['android.permission.BLUETOOTH','android.permission.BLUETOOTH_ADMIN','android.permission.ACCESS_FINE_LOCATION','android.permission.ACCESS_COARSE_LOCATION'], + ['android.permission.BLUETOOTH', 'android.permission.BLUETOOTH_ADMIN', + 'android.permission.ACCESS_FINE_LOCATION', + 'android.permission.ACCESS_COARSE_LOCATION' + ], (result) => { if (result.granted && result.granted.length > 0) { console.log('定位权限已授予'); @@ -533,22 +536,24 @@ return; } } - showLoading(these,{text:'正在刷新'}) + showLoading(these, { + text: '正在刷新' + }) let time = null; let startSearch = () => { - - if(time!==null){ - clearTimeout(time); + + if (time !== null) { + clearTimeout(time); } - + time = setTimeout(() => { these.EquipMents = []; these.PairEquip = []; ble.StartSearch().then(result => { - console.log("开始搜索成功",result); - - }).catch(err => { + console.log("开始搜索成功", result); + + }).catch(err => { console.error("开始搜索失败:", err); if (err.code === 10001) { these.showOpenSetting(); @@ -557,9 +562,9 @@ title: '提示', content: '出现错误:' + err.msg }); - + } - }).finally(()=>{ + }).finally(() => { hideLoading(these); }); }, 200); @@ -905,11 +910,11 @@ position: absolute; border-radius: 50%; background-color: #bbe60033; - animation: expand 4s infinite ease-out; + display: inline-block; transform: translate(-50%, -50%); border: 1rpx solid #bbe6003d; - animation: expand 5s infinite ease-in-out; + animation: expand 4s infinite ease-in-out; } .circle:nth-child(2) { @@ -922,23 +927,18 @@ @keyframes expand { 0% { - width: 0; - height: 0; - opacity: 0.8; - } - - 80% { - width: 18.75rem; - height: 18.75rem; - opacity: 0.2; - } - - 100% { - - width: 0.5rem; - height: 0.5rem; - opacity: 0.5; - } + width: 0; + height: 0; + opacity: 0.9; + } + + + + 100% { + width: 18rem; + height: 18rem; + opacity: 0; + } } .mainContent {