浇花器
This commit is contained in:
parent
e4fdabce18
commit
87aa307761
|
|
@ -1511,7 +1511,14 @@ setTimeout(() => {
|
|||
if (uuid == self.data.characteristic_write_uuid) {
|
||||
self.data.serviceId = serviceId;
|
||||
self.data.uuid = uuid;
|
||||
console.log("uuid", uuid)
|
||||
console.log("uuid", uuid)
|
||||
let obj = {
|
||||
'type': mDeviceEvent.XBLUFI_TYPE.TYPE_INIT_ESP32_RESULT,
|
||||
'result': true,
|
||||
'data': res
|
||||
};
|
||||
mDeviceEvent.notifyDeviceMsgEvent(obj);
|
||||
console.log('服务发现1111111');
|
||||
uni.notifyBLECharacteristicValueChange({
|
||||
state: true,
|
||||
// 启用 notify 功能
|
||||
|
|
@ -1543,6 +1550,7 @@ setTimeout(() => {
|
|||
});
|
||||
}, 1000);
|
||||
|
||||
console.log("fail getBLEDeviceServices:" + JSON.stringify(res));
|
||||
uni.onBLECharacteristicValueChange(function(res) {
|
||||
var my_str = Utf8ArrayToStr(res.value)
|
||||
if(my_str.indexOf("wifi_ok") != -1)
|
||||
|
|
@ -1637,7 +1645,7 @@ setTimeout(() => {
|
|||
}
|
||||
});
|
||||
|
||||
},2000);
|
||||
},700);
|
||||
});
|
||||
mDeviceEvent.listenSendRouterSsidAndPassword(true, function(options) {
|
||||
self.data.password = options.password;
|
||||
|
|
|
|||
|
|
@ -360,6 +360,7 @@
|
|||
icon: 'success',
|
||||
duration: 2000
|
||||
})
|
||||
this.ver = this.version
|
||||
setTimeout(()=>{
|
||||
this.shengjiflag = false
|
||||
uni.reLaunch({
|
||||
|
|
|
|||
|
|
@ -17,28 +17,26 @@
|
|||
<view class="bang" @click="btnaddsb">
|
||||
绑定
|
||||
</view>
|
||||
<!-- <view class="selectnames" @click="btnluru" v-if="userobj.userType == 00">
|
||||
录入设备
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="" v-else>
|
||||
<!-- 选择设备 -->
|
||||
<view class="selectbox">
|
||||
<!-- <view class="selectbox">
|
||||
<view class="selectname" @click="btnksxz">
|
||||
切换设备 <image v-if="!xuanzeflag" src="https://api.ccttiot.com/smartmeter/img/static/uwHOBxvbJjkhx1uDiQHI" mode=""></image>
|
||||
<image v-else class="rotated-image" src="https://api.ccttiot.com/smartmeter/img/static/uwHOBxvbJjkhx1uDiQHI" mode=""></image>
|
||||
</view>
|
||||
|
||||
<view class="selectshezhi" style="display: flex;">
|
||||
<!-- <view class="selectnames" @click="btnluru" v-if="userobj.userType == 00">
|
||||
录入设备
|
||||
</view> -->
|
||||
<image @click="btnsz" src="https://api.ccttiot.com/smartmeter/img/static/uvCJ8ro0MpfGZd53vypJ" mode=""></image>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="selectbox">
|
||||
<view class="shebeiname">
|
||||
{{user.deviceName == undefined ? '--' : user.deviceName}} <text style="background-color: red;box-shadow: 0rpx 0rpx 10rpx 0rpx red, 0rpx 0rpx 30rpx 0rpx red" v-if="vardataflag == 1 || vardataflag == 2"></text> <text v-else></text>
|
||||
<view class="shebeiname" >
|
||||
<view class="" @click="btnksxz">
|
||||
{{user.deviceName == undefined ? '--' : user.deviceName}}
|
||||
<image style="width: 32rpx;height: 26rpx;margin-left: 14rpx;" v-if="!xuanzeflag" src="https://api.ccttiot.com/smartmeter/img/static/uwHOBxvbJjkhx1uDiQHI" mode=""></image>
|
||||
<image style="width: 32rpx;height: 26rpx;margin-left: 14rpx;" v-else class="rotated-image" src="https://api.ccttiot.com/smartmeter/img/static/uwHOBxvbJjkhx1uDiQHI" mode=""></image>
|
||||
</view> <text style="background-color: red;box-shadow: 0rpx 0rpx 10rpx 0rpx red, 0rpx 0rpx 30rpx 0rpx red" v-if="vardataflag == 1 || vardataflag == 2"></text> <text v-else></text>
|
||||
<view class="lj" @click="btnlj" v-if="vardataflag == 1">
|
||||
点击连接
|
||||
</view>
|
||||
|
|
@ -52,11 +50,14 @@
|
|||
<!-- <view class="shebeiadd" @click="btnaddsb">
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/udlX67UXzuRUZCuEtWDH" mode=""></image>
|
||||
</view> -->
|
||||
<view class="selectshezhi" style="display: flex;">
|
||||
<image @click="btnsz" src="https://api.ccttiot.com/smartmeter/img/static/uvCJ8ro0MpfGZd53vypJ" mode=""></image>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 设备信息 -->
|
||||
<view class="devicebox">
|
||||
<view class="devicetop">
|
||||
<view class="devicelt">
|
||||
<view class="devicelt" @click="btnsz">
|
||||
<image :src="imgpic" mode="aspectFit"></image>
|
||||
<view class="xinghao">
|
||||
<view class="one">型号：{{user.model == undefined ? '--' : user.model}}</view>
|
||||
|
|
@ -77,26 +78,44 @@
|
|||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="deviceweek" v-if="pre == 'WATER'">
|
||||
<view class="deviceweek" v-if="pre == 'WATER'" @click="btntime">
|
||||
<view class="weeklist">
|
||||
<view class="kg" v-if="!ver_data.p_set1 || ver_data.p_set1[3] == 0">
|
||||
OFF
|
||||
<view class="" v-if="!ver_data.p_set1 || ver_data.p_set1[3] == 0">
|
||||
<view class="kg" style="color: rgba(0, 0, 0, .3);" v-if="!ver_data.p_set1 || ver_data.p_set1[3] == 0">
|
||||
OFF
|
||||
</view>
|
||||
<view class="weekday" style="color: rgba(0,0,0,.3);">
|
||||
P1
|
||||
</view>
|
||||
<view class="time" style="color: rgba(0,0,0,.3);">
|
||||
{{ver_data.p_set1 && ver_data.p_set1[0] !== undefined ? ver_data.p_set1[0].toString().padStart(2, '0') + ':' + ver_data.p_set1[1].toString().padStart(2, '0') : '--:--'}}
|
||||
</view>
|
||||
<view class="interval" style="color: rgba(0,0,0,.3);" v-if="ver_data.p_set1 && ver_data.p_set1[4] > 1">
|
||||
每{{ver_data.p_set1[4]}}天
|
||||
</view>
|
||||
<view style="color: rgba(0,0,0,.3);" class="interval" v-else>
|
||||
每天
|
||||
</view>
|
||||
</view>
|
||||
<view class="kg" style="color: #48893B;" v-else>
|
||||
ON
|
||||
</view>
|
||||
<view class="weekday">
|
||||
P1
|
||||
</view>
|
||||
<view class="time">
|
||||
{{ver_data.p_set1 && ver_data.p_set1[0] !== undefined ? ver_data.p_set1[0].toString().padStart(2, '0') + ':' + ver_data.p_set1[1].toString().padStart(2, '0') : '--:--'}}
|
||||
</view>
|
||||
<view class="interval" v-if="ver_data.p_set1 && ver_data.p_set1[4] > 1">
|
||||
每{{ver_data.p_set1[4]}}天
|
||||
</view>
|
||||
<view class="interval" v-else>
|
||||
每天
|
||||
<view class="" v-else>
|
||||
<view class="kg" style="color: #48893B;">
|
||||
ON
|
||||
</view>
|
||||
<view class="weekday">
|
||||
P1
|
||||
</view>
|
||||
<view class="time">
|
||||
{{ver_data.p_set1 && ver_data.p_set1[0] !== undefined ? ver_data.p_set1[0].toString().padStart(2, '0') + ':' + ver_data.p_set1[1].toString().padStart(2, '0') : '--:--'}}
|
||||
</view>
|
||||
<view class="interval" v-if="ver_data.p_set1 && ver_data.p_set1[4] > 1">
|
||||
每{{ver_data.p_set1[4]}}天
|
||||
</view>
|
||||
<view class="interval" v-else>
|
||||
每天
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view class="img">
|
||||
<image v-if="ver_data.p_set1 && ver_data.p_set1[0] == xctimesj.slice(0,2) && ver_data.p_set1[1] == xctimesj.slice(-2)"
|
||||
src="https://api.ccttiot.com/smartmeter/img/static/u9iZpd6bW6bUsUay4uvH" mode="">
|
||||
|
|
@ -104,23 +123,39 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="weeklist">
|
||||
<view class="kg" v-if="!ver_data.p_set2 || ver_data.p_set2[3] == 0">
|
||||
OFF
|
||||
<view class="" v-if="!ver_data.p_set2 || ver_data.p_set2[3] == 0">
|
||||
<view class="kg" style="color: rgba(0, 0, 0, .3);" v-if="!ver_data.p_set2 || ver_data.p_set2[3] == 0">
|
||||
OFF
|
||||
</view>
|
||||
<view class="weekday" style="color: rgba(0,0,0,.3);">
|
||||
P2
|
||||
</view>
|
||||
<view class="time" style="color: rgba(0,0,0,.3);">
|
||||
{{ver_data.p_set2 && ver_data.p_set2[0] !== undefined ? ver_data.p_set2[0].toString().padStart(2, '0') + ':' + ver_data.p_set2[1].toString().padStart(2, '0') : '--:--'}}
|
||||
</view>
|
||||
<view class="interval" style="color: rgba(0,0,0,.3);" v-if="ver_data.p_set2 && ver_data.p_set2[4] > 1">
|
||||
每{{ver_data.p_set2[4]}}天
|
||||
</view>
|
||||
<view style="color: rgba(0,0,0,.3);" class="interval" v-else>
|
||||
每天
|
||||
</view>
|
||||
</view>
|
||||
<view class="kg" style="color: #48893B;" v-else>
|
||||
ON
|
||||
</view>
|
||||
<view class="weekday">
|
||||
P2
|
||||
</view>
|
||||
<view class="time">
|
||||
{{ver_data.p_set2 && ver_data.p_set2[0] !== undefined ? ver_data.p_set2[0].toString().padStart(2, '0') + ':' + ver_data.p_set2[1].toString().padStart(2, '0') : '--:--'}}
|
||||
</view>
|
||||
<view class="interval" v-if="ver_data.p_set2 && ver_data.p_set2[4] > 1">
|
||||
每{{ver_data.p_set2[4]}}天
|
||||
</view>
|
||||
<view class="interval" v-else>
|
||||
每天
|
||||
<view class="" v-else>
|
||||
<view class="kg" style="color: #48893B;">
|
||||
ON
|
||||
</view>
|
||||
<view class="weekday">
|
||||
P2
|
||||
</view>
|
||||
<view class="time">
|
||||
{{ver_data.p_set2 && ver_data.p_set2[0] !== undefined ? ver_data.p_set2[0].toString().padStart(2, '0') + ':' + ver_data.p_set2[1].toString().padStart(2, '0') : '--:--'}}
|
||||
</view>
|
||||
<view class="interval" v-if="ver_data.p_set2 && ver_data.p_set2[4] > 1">
|
||||
每{{ver_data.p_set2[4]}}天
|
||||
</view>
|
||||
<view class="interval" v-else>
|
||||
每天
|
||||
</view>
|
||||
</view>
|
||||
<view class="img">
|
||||
<image v-if="ver_data.p_set2 && ver_data.p_set2[0] == xctimesj.slice(0,2) && ver_data.p_set2[1] == xctimesj.slice(-2)"
|
||||
|
|
@ -129,23 +164,39 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="weeklist">
|
||||
<view class="kg" v-if="!ver_data.p_set3 || ver_data.p_set3[3] == 0">
|
||||
OFF
|
||||
<view class="" v-if="!ver_data.p_set3 || ver_data.p_set3[3] == 0">
|
||||
<view class="kg" style="color: rgba(0, 0, 0, .3);" v-if="!ver_data.p_set3 || ver_data.p_set3[3] == 0">
|
||||
OFF
|
||||
</view>
|
||||
<view class="weekday" style="color: rgba(0,0,0,.3);">
|
||||
P3
|
||||
</view>
|
||||
<view class="time" style="color: rgba(0,0,0,.3);">
|
||||
{{ver_data.p_set3 && ver_data.p_set3[0] !== undefined ? ver_data.p_set3[0].toString().padStart(2, '0') + ':' + ver_data.p_set3[1].toString().padStart(2, '0') : '--:--'}}
|
||||
</view>
|
||||
<view class="interval" style="color: rgba(0,0,0,.3);" v-if="ver_data.p_set3 && ver_data.p_set3[4] > 1">
|
||||
每{{ver_data.p_set3[4]}}天
|
||||
</view>
|
||||
<view style="color: rgba(0,0,0,.3);" class="interval" v-else>
|
||||
每天
|
||||
</view>
|
||||
</view>
|
||||
<view class="kg" style="color: #48893B;" v-else>
|
||||
ON
|
||||
</view>
|
||||
<view class="weekday">
|
||||
P3
|
||||
</view>
|
||||
<view class="time">
|
||||
{{ver_data.p_set3 && ver_data.p_set3[0] !== undefined ? ver_data.p_set3[0].toString().padStart(2, '0') + ':' + ver_data.p_set3[1].toString().padStart(2, '0') : '--:--'}}
|
||||
</view>
|
||||
<view class="interval" v-if="ver_data.p_set3 && ver_data.p_set3[4] > 1">
|
||||
每{{ver_data.p_set3[4]}}天
|
||||
</view>
|
||||
<view class="interval" v-else>
|
||||
每天
|
||||
<view class="" v-else>
|
||||
<view class="kg" style="color: #48893B;">
|
||||
ON
|
||||
</view>
|
||||
<view class="weekday">
|
||||
P3
|
||||
</view>
|
||||
<view class="time">
|
||||
{{ver_data.p_set3 && ver_data.p_set3[0] !== undefined ? ver_data.p_set3[0].toString().padStart(2, '0') + ':' + ver_data.p_set3[1].toString().padStart(2, '0') : '--:--'}}
|
||||
</view>
|
||||
<view class="interval" v-if="ver_data.p_set3 && ver_data.p_set3[4] > 1">
|
||||
每{{ver_data.p_set3[4]}}天
|
||||
</view>
|
||||
<view class="interval" v-else>
|
||||
每天
|
||||
</view>
|
||||
</view>
|
||||
<view class="img">
|
||||
<image v-if="ver_data.p_set3 && ver_data.p_set3[0] == xctimesj.slice(0,2) && ver_data.p_set3[1] == xctimesj.slice(-2)"
|
||||
|
|
@ -154,23 +205,39 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="weeklist">
|
||||
<view class="kg" v-if="!ver_data.p_set4 || ver_data.p_set4[3] == 0">
|
||||
OFF
|
||||
<view class="" v-if="!ver_data.p_set4 || ver_data.p_set4[3] == 0">
|
||||
<view class="kg" style="color: rgba(0, 0, 0, .3);" v-if="!ver_data.p_set4 || ver_data.p_set4[3] == 0">
|
||||
OFF
|
||||
</view>
|
||||
<view class="weekday" style="color: rgba(0,0,0,.3);">
|
||||
P4
|
||||
</view>
|
||||
<view class="time" style="color: rgba(0,0,0,.3);">
|
||||
{{ver_data.p_set4 && ver_data.p_set4[0] !== undefined ? ver_data.p_set4[0].toString().padStart(2, '0') + ':' + ver_data.p_set4[1].toString().padStart(2, '0') : '--:--'}}
|
||||
</view>
|
||||
<view class="interval" style="color: rgba(0,0,0,.3);" v-if="ver_data.p_set4 && ver_data.p_set4[4] > 1">
|
||||
每{{ver_data.p_set4[4]}}天
|
||||
</view>
|
||||
<view style="color: rgba(0,0,0,.3);" class="interval" v-else>
|
||||
每天
|
||||
</view>
|
||||
</view>
|
||||
<view class="kg" style="color: #48893B;" v-else>
|
||||
ON
|
||||
</view>
|
||||
<view class="weekday">
|
||||
P4
|
||||
</view>
|
||||
<view class="time">
|
||||
{{ver_data.p_set4 && ver_data.p_set4[0] !== undefined ? ver_data.p_set4[0].toString().padStart(2, '0') + ':' + ver_data.p_set4[1].toString().padStart(2, '0') : '--:--'}}
|
||||
</view>
|
||||
<view class="interval" v-if="ver_data.p_set4 && ver_data.p_set4[4] > 1">
|
||||
每{{ver_data.p_set4[4]}}天
|
||||
</view>
|
||||
<view class="interval" v-else>
|
||||
每天
|
||||
<view class="" v-else>
|
||||
<view class="kg" style="color: #48893B;">
|
||||
ON
|
||||
</view>
|
||||
<view class="weekday">
|
||||
P4
|
||||
</view>
|
||||
<view class="time">
|
||||
{{ver_data.p_set4 && ver_data.p_set4[0] !== undefined ? ver_data.p_set4[0].toString().padStart(2, '0') + ':' + ver_data.p_set4[1].toString().padStart(2, '0') : '--:--'}}
|
||||
</view>
|
||||
<view class="interval" v-if="ver_data.p_set4 && ver_data.p_set4[4] > 1">
|
||||
每{{ver_data.p_set4[4]}}天
|
||||
</view>
|
||||
<view class="interval" v-else>
|
||||
每天
|
||||
</view>
|
||||
</view>
|
||||
<view class="img">
|
||||
<image v-if="ver_data.p_set4 && ver_data.p_set4[0] == xctimesj.slice(0,2) && ver_data.p_set4[1] == xctimesj.slice(-2)"
|
||||
|
|
@ -179,23 +246,39 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="weeklist">
|
||||
<view class="kg" v-if="!ver_data.p_set5 || ver_data.p_set5[3] == 0">
|
||||
OFF
|
||||
<view class="" v-if="!ver_data.p_set5 || ver_data.p_set5[3] == 0">
|
||||
<view class="kg" style="color: rgba(0, 0, 0, .3);" v-if="!ver_data.p_set5 || ver_data.p_set5[3] == 0">
|
||||
OFF
|
||||
</view>
|
||||
<view class="weekday" style="color: rgba(0,0,0,.3);">
|
||||
P5
|
||||
</view>
|
||||
<view class="time" style="color: rgba(0,0,0,.3);">
|
||||
{{ver_data.p_set5 && ver_data.p_set5[0] !== undefined ? ver_data.p_set5[0].toString().padStart(2, '0') + ':' + ver_data.p_set5[1].toString().padStart(2, '0') : '--:--'}}
|
||||
</view>
|
||||
<view class="interval" style="color: rgba(0,0,0,.3);" v-if="ver_data.p_set5 && ver_data.p_set5[4] > 1">
|
||||
每{{ver_data.p_set5[4]}}天
|
||||
</view>
|
||||
<view style="color: rgba(0,0,0,.3);" class="interval" v-else>
|
||||
每天
|
||||
</view>
|
||||
</view>
|
||||
<view class="kg" style="color: #48893B;" v-else>
|
||||
ON
|
||||
</view>
|
||||
<view class="weekday">
|
||||
P5
|
||||
</view>
|
||||
<view class="time">
|
||||
{{ver_data.p_set5 && ver_data.p_set5[0] !== undefined ? ver_data.p_set5[0].toString().padStart(2, '0') + ':' + ver_data.p_set5[1].toString().padStart(2, '0') : '--:--'}}
|
||||
</view>
|
||||
<view class="interval" v-if="ver_data.p_set5 && ver_data.p_set5[4] > 1">
|
||||
每{{ver_data.p_set5[4]}}天
|
||||
</view>
|
||||
<view class="interval" v-else>
|
||||
每天
|
||||
<view class="" v-else>
|
||||
<view class="kg" style="color: #48893B;">
|
||||
ON
|
||||
</view>
|
||||
<view class="weekday">
|
||||
P5
|
||||
</view>
|
||||
<view class="time">
|
||||
{{ver_data.p_set5 && ver_data.p_set5[0] !== undefined ? ver_data.p_set5[0].toString().padStart(2, '0') + ':' + ver_data.p_set5[1].toString().padStart(2, '0') : '--:--'}}
|
||||
</view>
|
||||
<view class="interval" v-if="ver_data.p_set5 && ver_data.p_set5[4] > 1">
|
||||
每{{ver_data.p_set5[4]}}天
|
||||
</view>
|
||||
<view class="interval" v-else>
|
||||
每天
|
||||
</view>
|
||||
</view>
|
||||
<view class="img">
|
||||
<image v-if="ver_data.p_set5 && ver_data.p_set5[0] == xctimesj.slice(0,2) && ver_data.p_set5[1] == xctimesj.slice(-2)"
|
||||
|
|
@ -204,23 +287,39 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="weeklist">
|
||||
<view class="kg" v-if="!ver_data.p_set6 || ver_data.p_set6[3] == 0">
|
||||
OFF
|
||||
<view class="" v-if="!ver_data.p_set6 || ver_data.p_set6[3] == 0">
|
||||
<view class="kg" style="color: rgba(0, 0, 0, .3);" v-if="!ver_data.p_set6 || ver_data.p_set6[3] == 0">
|
||||
OFF
|
||||
</view>
|
||||
<view class="weekday" style="color: rgba(0,0,0,.3);">
|
||||
P6
|
||||
</view>
|
||||
<view class="time" style="color: rgba(0,0,0,.3);">
|
||||
{{ver_data.p_set6 && ver_data.p_set6[0] !== undefined ? ver_data.p_set6[0].toString().padStart(2, '0') + ':' + ver_data.p_set6[1].toString().padStart(2, '0') : '--:--'}}
|
||||
</view>
|
||||
<view class="interval" style="color: rgba(0,0,0,.3);" v-if="ver_data.p_set6 && ver_data.p_set6[4] > 1">
|
||||
每{{ver_data.p_set6[4]}}天
|
||||
</view>
|
||||
<view style="color: rgba(0,0,0,.3);" class="interval" v-else>
|
||||
每天
|
||||
</view>
|
||||
</view>
|
||||
<view class="kg" style="color: #48893B;" v-else>
|
||||
ON
|
||||
</view>
|
||||
<view class="weekday">
|
||||
P6
|
||||
</view>
|
||||
<view class="time">
|
||||
{{ver_data.p_set6 && ver_data.p_set6[0] !== undefined ? ver_data.p_set6[0].toString().padStart(2, '0') + ':' + ver_data.p_set6[1].toString().padStart(2, '0') : '--:--'}}
|
||||
</view>
|
||||
<view class="interval" v-if="ver_data.p_set6 && ver_data.p_set6[4] > 1">
|
||||
每{{ver_data.p_set6[4]}}天
|
||||
</view>
|
||||
<view class="interval" v-else>
|
||||
每天
|
||||
<view class="" v-else>
|
||||
<view class="kg" style="color: #48893B;">
|
||||
ON
|
||||
</view>
|
||||
<view class="weekday">
|
||||
P6
|
||||
</view>
|
||||
<view class="time">
|
||||
{{ver_data.p_set6 && ver_data.p_set6[0] !== undefined ? ver_data.p_set6[0].toString().padStart(2, '0') + ':' + ver_data.p_set6[1].toString().padStart(2, '0') : '--:--'}}
|
||||
</view>
|
||||
<view class="interval" v-if="ver_data.p_set6 && ver_data.p_set6[4] > 1">
|
||||
每{{ver_data.p_set6[4]}}天
|
||||
</view>
|
||||
<view class="interval" v-else>
|
||||
每天
|
||||
</view>
|
||||
</view>
|
||||
<view class="img">
|
||||
<image v-if="ver_data.p_set6 && ver_data.p_set6[0] == xctimesj.slice(0,2) && ver_data.p_set6[1] == xctimesj.slice(-2)"
|
||||
|
|
@ -236,19 +335,20 @@
|
|||
</view>
|
||||
</view>
|
||||
<!-- 开关选择 -->
|
||||
|
||||
<view class="dangqian" @click="btnsztime">
|
||||
<image src="https://lxnapi.ccttiot.com/smartmeter/img/static/ufHmxq7KI9PJhv8ey4ds" mode=""></image>
|
||||
<view class="cen">
|
||||
<view class="shen">
|
||||
当前时间
|
||||
</view>
|
||||
<view class="">
|
||||
点击可再次设置当前时间
|
||||
<view class="dangqian">
|
||||
<view class="" style="display: flex;">
|
||||
<image src="https://lxnapi.ccttiot.com/smartmeter/img/static/ufHmxq7KI9PJhv8ey4ds" mode=""></image>
|
||||
<view class="cen" @click="btntb">
|
||||
<view class="shen">
|
||||
当前时间 <text>同步</text>
|
||||
</view>
|
||||
<view class="">
|
||||
点击可同步当前时间
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="rt">
|
||||
{{devicetime == '' ? '--' : devicetime}}
|
||||
<view class="rt" style="display: flex;align-items: center;" @click="btnsztime">
|
||||
{{devicetime == '' ? '--' : devicetime.slice(0,5)}} <u-icon name="arrow-right" color="#7FAD76" size="32"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
|
@ -318,12 +418,17 @@
|
|||
|
||||
<!-- 切换设备 -->
|
||||
<view class="tabsb" v-if="xuanzeflag">
|
||||
<view class="selectbox">
|
||||
<view class="selectname" @click="btnksxz">
|
||||
切换设备 <image v-if="!xuanzeflag" src="https://api.ccttiot.com/smartmeter/img/static/uwHOBxvbJjkhx1uDiQHI" mode=""></image>
|
||||
<image v-else class="rotated-image" src="https://api.ccttiot.com/smartmeter/img/static/uwHOBxvbJjkhx1uDiQHI" mode=""></image>
|
||||
</view>
|
||||
</view>
|
||||
<view class="sblist">
|
||||
<view class="sbist_val" v-for="(item,index) in devicelist" :key="index" @click="btnactive(item.deviceId,index)">
|
||||
<view class="lt">
|
||||
<view class="">{{item.deviceName}}</view>
|
||||
<!-- <view class="" style="margin-top: 14rpx;">型号:{{item.model}}</view> -->
|
||||
<view class="" style="margin-top: 14rpx;">MAC:{{item.mac}}</view>
|
||||
<view class="" style="margin-top: 14rpx;color: ccc;font-size: 20rpx;font-weight: 400;">MAC:{{item.mac}}</view>
|
||||
</view>
|
||||
<view class="rt">
|
||||
<image :src="item.modelPicture" mode="aspectFit"></image>
|
||||
|
|
@ -334,7 +439,7 @@
|
|||
添加新设备
|
||||
</view>
|
||||
</view>
|
||||
<view class="mask" v-if="xuanzeflag"></view>
|
||||
<view class="mask" v-if="xuanzeflag" @click="xuanzeflag = !xuanzeflag"></view>
|
||||
<!-- 手动浇水 -->
|
||||
<view class="manualjs" v-if="sdjsflag">
|
||||
<view class="toptit">
|
||||
|
|
@ -650,6 +755,37 @@
|
|||
// }, 1500)
|
||||
}
|
||||
},
|
||||
// 点击同步时间
|
||||
btntb(){
|
||||
this.handleUserAction()
|
||||
if(this.vardataflag != 3){
|
||||
uni.showToast({
|
||||
title: '设备未连接',
|
||||
icon: 'none',
|
||||
duration:2000
|
||||
})
|
||||
}else{
|
||||
this.devicetime = this.getCurrentTime();
|
||||
console.log(this.devicetime);
|
||||
if(this.pre == 'WATER'){ //单阀
|
||||
uni.showLoading({
|
||||
title: '设置中...'
|
||||
})
|
||||
xBlufi.notifySendCustomData({
|
||||
customData: '11date' + this.devicetime + ';'
|
||||
})
|
||||
uni.hideLoading()
|
||||
}else{ //抽水泵
|
||||
uni.showLoading({
|
||||
title: '设置中...'
|
||||
})
|
||||
xBlufi.notifySendCustomData({
|
||||
customData: '11hour' + this.devicetime + '@',
|
||||
})
|
||||
uni.hideLoading()
|
||||
}
|
||||
}
|
||||
},
|
||||
// 点击显示设置时间
|
||||
btnsztime(){
|
||||
this.handleUserAction()
|
||||
|
|
@ -663,6 +799,14 @@
|
|||
this.timeflag = true
|
||||
}
|
||||
},
|
||||
getCurrentTime() {
|
||||
const now = new Date();
|
||||
const padZero = num => num.toString().padStart(2, '0');
|
||||
const hours = padZero(now.getHours()); // 时 (00-23)
|
||||
const minutes = padZero(now.getMinutes()); // 分 (00-59)
|
||||
const seconds = padZero(now.getSeconds()); // 秒 (00-59)
|
||||
return `${hours}:${minutes}:${seconds}`;
|
||||
},
|
||||
// 点击设置当前时间
|
||||
confirmtime(e){
|
||||
if(this.pre == 'WATER'){ //单阀
|
||||
|
|
@ -1002,21 +1146,23 @@
|
|||
break;
|
||||
case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED:
|
||||
console.log("连接回调：" + JSON.stringify(options))
|
||||
xBlufi.notifyInitBleEsp32({
|
||||
deviceId: this.deviceId
|
||||
})
|
||||
break
|
||||
case xBlufi.XBLUFI_TYPE.TYPE_INIT_ESP32_RESULT:
|
||||
if (options.result == true){
|
||||
console.log('服务发现成功:', options);
|
||||
this.datalist = '1'
|
||||
this.vardataflag = 3
|
||||
this.initDisconnectTimer()
|
||||
xBlufi.notifyInitBleEsp32({
|
||||
deviceId: this.deviceId
|
||||
})
|
||||
// 连接成功后立即发送一次获取数据命令
|
||||
setTimeout(() => {
|
||||
console.log("连接成功后发送获取数据命令")
|
||||
xBlufi.notifySendCustomData({
|
||||
customData: "11get"
|
||||
})
|
||||
}, 2000)
|
||||
console.log("连接成功后发送获取数据命令")
|
||||
xBlufi.notifySendCustomData({
|
||||
customData: "11get"
|
||||
})
|
||||
}else{
|
||||
console.log('服务发现失败:', options.data);
|
||||
this.vardataflag = 1
|
||||
this.clearDisconnectTimer()
|
||||
}
|
||||
|
|
@ -1092,7 +1238,7 @@
|
|||
customData: "11get"
|
||||
})
|
||||
}
|
||||
}, 10000)
|
||||
}, 5000)
|
||||
},
|
||||
// 清除定时器
|
||||
clearTimer() {
|
||||
|
|
@ -1198,8 +1344,7 @@
|
|||
}
|
||||
pSetObjects[key] = values;
|
||||
}
|
||||
});
|
||||
|
||||
})
|
||||
this.ver_data = pSetObjects;
|
||||
this.jstimeobj = pSetObjects;
|
||||
this.showobj = showObject;
|
||||
|
|
@ -1289,7 +1434,6 @@
|
|||
this.clearDisconnectTimer()
|
||||
this.disconnectTimer = setTimeout(() => {
|
||||
if(this.vardataflag === 3) {
|
||||
console.log('一分钟无操作，断开蓝牙连接')
|
||||
this.disconnectBluetooth()
|
||||
}
|
||||
}, 600000)
|
||||
|
|
@ -1338,6 +1482,21 @@
|
|||
this.resetDisconnectTimer()
|
||||
}
|
||||
},
|
||||
|
||||
// 获取时间显示
|
||||
getTimeDisplay(setKey) {
|
||||
const set = this.ver_data[setKey];
|
||||
if (set && set[0] !== undefined) {
|
||||
return `${set[0].toString().padStart(2, '0')}:${set[1].toString().padStart(2, '0')}`;
|
||||
}
|
||||
return '--:--';
|
||||
},
|
||||
|
||||
// 判断是否是当前时间
|
||||
isCurrentTime(setKey) {
|
||||
const set = this.ver_data[setKey];
|
||||
return set && set[0] == this.xctimesj.slice(0,2) && set[1] == this.xctimesj.slice(-2);
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
@ -1361,11 +1520,23 @@
|
|||
height: 78rpx;
|
||||
}
|
||||
.cen{
|
||||
margin-left: 30rpx;
|
||||
.shen{
|
||||
font-weight: 600;
|
||||
font-size: 28rpx;
|
||||
color: #3D3D3D;
|
||||
margin-bottom: 8rpx;
|
||||
display: flex;
|
||||
text{
|
||||
width: 80rpx;
|
||||
height: 40rpx;
|
||||
background-color: #7FAD76;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
line-height: 40rpx;
|
||||
border-radius: 10rpx;
|
||||
margin-left: 20rpx;
|
||||
}
|
||||
}
|
||||
view{
|
||||
font-size: 24rpx;
|
||||
|
|
@ -1456,7 +1627,7 @@
|
|||
background: #3D3D3D;
|
||||
opacity: 0.2;
|
||||
position: fixed;
|
||||
top: 20%;
|
||||
top: 0;
|
||||
left: 0;
|
||||
z-index: 1;
|
||||
}
|
||||
|
|
@ -1500,14 +1671,14 @@
|
|||
max-height: 90vh;
|
||||
background: #FFFFFF;
|
||||
position: fixed;
|
||||
top: 270rpx;
|
||||
top: 0;
|
||||
left: 0;
|
||||
padding: 0 40rpx;
|
||||
padding-bottom: 60rpx !important;
|
||||
box-sizing: border-box;
|
||||
border-radius: 0rpx 0rpx 50rpx 50rpx;
|
||||
z-index: 2;
|
||||
padding-top: 48rpx;
|
||||
padding-top: 110rpx;
|
||||
box-sizing: border-box;
|
||||
animation: fadeInDown .5s ease-out forwards;
|
||||
.qdan {
|
||||
|
|
@ -1526,6 +1697,7 @@
|
|||
width: 100%;
|
||||
max-height: 68vh;
|
||||
overflow: scroll;
|
||||
margin-top: 50rpx;
|
||||
.sbist_val {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
|
@ -1778,7 +1950,7 @@
|
|||
align-items: center;
|
||||
.shebeiname {
|
||||
font-size: 36rpx;
|
||||
color: #73787B;
|
||||
color: #333;
|
||||
font-weight: 600;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user