diff --git a/manifest.json b/manifest.json index a4ca526..f4b7d3c 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "星汉物联", "appid" : "__UNI__A21EF43", "description" : "设备管控", - "versionName" : "1.0.22", + "versionName" : "1.0.24", "versionCode" : 101, "transformPx" : false, /* 5+App特有相关 */ diff --git a/pages/100/HBY100.vue b/pages/100/HBY100.vue index d1c6fd3..6b11d7e 100644 --- a/pages/100/HBY100.vue +++ b/pages/100/HBY100.vue @@ -194,7 +194,7 @@ + @change="onBrightnessChanged" @changing="onBrightnessChanging" class="custom-slider" /> @@ -206,7 +206,7 @@ + @change="onFreqChanged" @changing="onFreqChanging" class="custom-slider" /> @@ -218,7 +218,7 @@ + @change="onVolumeChanged" @changing="onVolumeChanging" class="custom-slider" /> @@ -850,9 +850,11 @@ }); }, - +onFreqChanging(e){ + this.formData.sta_LightFreq = e.detail.value; +}, //频率 - onFreqChanging(e) { + onFreqChanged(e) { let f = this.getDevice(); // #ifdef APP-PLUS if (!f) { @@ -897,8 +899,11 @@ }, 100); }, + onVolumeChanging(e){ + this.formData.sta_VoiceVolume = e.detail.value; + }, //音量 - onVolumeChanging(e) { + onVolumeChanged(e) { let f = this.getDevice(); // #ifdef APP-PLUS if (!f) { @@ -938,8 +943,11 @@ }, 100); }, + onBrightnessChanging(e){ + this.formData.sta_LightDimmer = e.detail.value; + }, // 亮度调节 - onBrightnessChanging(e) { + onBrightnessChanged(e) { let f = this.getDevice(); // #ifdef APP-PLUS if (!f) { diff --git a/pages/6155/BJQ6155.vue b/pages/6155/BJQ6155.vue index bb4b850..eb8d161 100644 --- a/pages/6155/BJQ6155.vue +++ b/pages/6155/BJQ6155.vue @@ -74,7 +74,7 @@ @@ -1784,6 +1784,9 @@ }); }, + sliderChanging(evt){ + this.formData.liangDu = evt.detail.value; + }, sliderChange: function(evt) { if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') { @@ -1834,10 +1837,10 @@ dataView.setUint8(0, 0x55); // 帧头 dataView.setUint8(1, 0x07); // 帧类型:亮度调节 - dataView.setUint8(2, 0x01); // 包序号 - dataView.setUint8(3, 0x00); // 包序号 - dataView.setUint8(4, 0x01); // 数据长度 - dataView.setUint8(5, liangDu); // 数据长度 + dataView.setUint8(2, 0x01); + dataView.setUint8(3, 0x00); + dataView.setUint8(4, 0x01); // + dataView.setUint8(5, liangDu); // 数据 let f = this.getDevice(); if (f) { diff --git a/pages/7305/BJQ7305.vue b/pages/7305/BJQ7305.vue index 6c4481c..0fe2112 100644 --- a/pages/7305/BJQ7305.vue +++ b/pages/7305/BJQ7305.vue @@ -74,7 +74,7 @@ + @changing="sliderChanging" class="custom-slider" /> @@ -1394,6 +1394,10 @@ debugger; }); }, + sliderChanging(evt){ + this.formData.liangDu = evt.detail.value; + }, + sliderChange: function(evt) { this.formData.liangDu = evt.detail.value; clearTimeout(BrighInteval) diff --git a/pages/common/addBLE/addEquip.vue b/pages/common/addBLE/addEquip.vue index 37b2b8b..ac06bba 100644 --- a/pages/common/addBLE/addEquip.vue +++ b/pages/common/addBLE/addEquip.vue @@ -378,17 +378,11 @@ // hideLoading(these); - if (these.device) { - clearInterval(this.Status.intval); - showLoading(these, { - text: '蓝牙连接已恢复,正在验证设备' - }); - - setTimeout(() => { - these.DeviceVerdict(res.deviceId); - }, 0); - } else { + if (!these.device) { hideLoading(these); + }else{ + clearInterval(this.Status.intval); + these.DeviceVerdict(res.deviceId); } @@ -420,7 +414,7 @@ showLoading(these, { text: '正在验证设备' }); - + setTimeout(() => { these.DeviceVerdict(f.deviceId); }, 0); @@ -690,6 +684,7 @@ this.Status.intval = setInterval(() => { this.Status.time = this.Status.time - 1; if (this.Status.time < 0) { + hideLoading(these); console.log("停止倒计时", this.Status.time); clearInterval(this.Status.intval) this.Status.intval = null; @@ -708,7 +703,10 @@ return; } - hideLoading(these); + updateLoading(these, { + + text: "等待设备上报Mac地址," + these.Status.time + 's' + }); }, 1000); @@ -744,8 +742,7 @@ }); return; } - // console.log("验证设备") - these.DeviceVerdict(item.deviceId); + } let execLink = () => { return new Promise((resolve, reject) => { @@ -993,7 +990,7 @@ box-sizing: border-box; padding: 20rpx; border-radius: 8px; - background: #1a1a1a; + background: #1a1a1a9e; display: flex; flex-direction: row; flex-wrap: nowrap;