xinyi/kaiguan-zfb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
3321822538@qq.com 2024-05-20 18:02:24 +08:00
parent 22013aeb5c
commit f8ab309fe7
6 changed files with 113 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
page_fenbao/device/index.vue
View File

@ -40,13 +40,13 @@
<text>...</text> <text>...</text>
<button @click="btnyc">好的</button> <button @click="btnyc">好的</button>
</view> </view>
<!-- 加载状态 -->
<view class="containers" v-show="statusflag"> <view class="containers" v-show="statusflag">
<uni-section> <uni-section>
<uni-load-more :status="status" /> <uni-load-more :status="status" />
</uni-section> </uni-section>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
@ -76,9 +76,11 @@
gps: {}, gps: {},
mac: '', mac: '',
status: false, status: false,
storeId:''
} }
}, },
onLoad() { onLoad(option) {
this.storeId = option.storeId
xBlufi.initXBlufi(1); xBlufi.initXBlufi(1);
console.log("xBlufi", xBlufi.XMQTT_SYSTEM); console.log("xBlufi", xBlufi.XMQTT_SYSTEM);
xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent); xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
@ -86,7 +88,7 @@
'isStart': true 'isStart': true
}); });
// 两秒后停止蓝牙搜索 // 两秒后停止蓝牙搜索
setTimeout(() => { setTimeout(() => {
xBlufi.notifyStartDiscoverBle({ xBlufi.notifyStartDiscoverBle({
'isStart': false 'isStart': false
@ -94,7 +96,7 @@
// 判断是否存在浇花器设备 // 判断是否存在浇花器设备
if (this.devicesList.length == 0) { if (this.devicesList.length == 0) {
this.tishiflag = true this.tishiflag = true
this.texts = '扫描完毕，暂无发现浇花器设备' this.texts = '扫描完毕，暂无发现设备'
} else { } else {
this.texts = '扫描到以下设备，请点击连接！' this.texts = '扫描到以下设备，请点击连接！'
} }
@ -103,20 +105,23 @@
}, },
onShow: function() { onShow: function() {
// this.openBluetoothAdapter() // this.openBluetoothAdapter()
// xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
// xBlufi.notifyStartDiscoverBle({
// 'isStart': false
// });
}, },
onUnload: function() { onUnload: function() {
xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent); xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
xBlufi.notifyStartDiscoverBle({ xBlufi.notifyStartDiscoverBle({
'isStart': false 'isStart': false
}); });
},
onHide(){
xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
xBlufi.notifyStartDiscoverBle({
'isStart': false
});
}, },
// onHide(){
// xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
// xBlufi.notifyStartDiscoverBle({
// 'isStart': false
// });
// },
onBeforeUnmount(){ onBeforeUnmount(){
xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent); xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
xBlufi.notifyStartDiscoverBle({ xBlufi.notifyStartDiscoverBle({
@ -139,7 +144,7 @@
devicesarr.forEach(device => { devicesarr.forEach(device => {
const mac = device.name.substring(6); const mac = device.name.substring(6);
if (device.name.substring(0, 5) === "CTPOW") { if (device.name.substring(0, 4) == "CTKG") {
// this.$u.get(`/app/device/${mac}/isBind`, data).then((res) => { // this.$u.get(`/app/device/${mac}/isBind`, data).then((res) => {
// if (res.data == false) { // if (res.data == false) {
this.devicesList.push(device); this.devicesList.push(device);
@ -161,27 +166,49 @@
console.log("连接回调：" + JSON.stringify(options)); console.log("连接回调：" + JSON.stringify(options));
if (options.result) { if (options.result) {
uni.hideLoading(); uni.hideLoading();
uni.showToast({ // uni.showToast({
title: '连接成功', // title: '连接成功',
icon: 'none' // icon: 'none'
}); { // });
{
console.log("连接回调options.data.deviceId：" + options.data.deviceId, console.log("连接回调options.data.deviceId：" + options.data.deviceId,
"连接回调options.data.name：" + options.data.name); "连接回调options.data.name：" + options.data.name);
let systemInfo = uni.getSystemInfoSync(); let data = {
if (systemInfo.platform === 'android') { storeId:this.storeId,
// 当前设备是 Android mac:this.mac
uni.navigateTo({ }
url: '/page_components/wifilist/index?deviceId=' + options this.$u.put('/app/device/bind', data).then((res) => {
.data.deviceId + '&name=' + options.data.name if (res.code == 200) {
uni.showToast({
title: '绑定成功',
icon: 'none',
duration: 2000
});
uni.removeStorageSync('mac');
let systemInfo = uni.getSystemInfoSync();
if (systemInfo.platform === 'android') {
// 当前设备是 Android
uni.navigateTo({
url: '/page_components/wifilist/index?deviceId=' + options
.data.deviceId + '&name=' + options.data.name
})
} else if (systemInfo.platform === 'ios') {
// 当前设备是 iOS
uni.navigateTo({
url: '/page_fenbao/device/wifivideo?deviceId=' + options
.data.deviceId + '&name=' + options.data.name
})
}
} else {
uni.showToast({
title: '该设备已被绑定',
icon: 'none',
duration: 2000
});
}
}) })
} else if (systemInfo.platform === 'ios') {
// 当前设备是 iOS
uni.navigateTo({
url: '/page_components/wifilist/index?deviceId=' + options
.data.deviceId + '&name=' + options.data.name
})
}
} }
} }
@ -250,7 +277,7 @@
xBlufi.notifyStartDiscoverBle({ xBlufi.notifyStartDiscoverBle({
'isStart': false 'isStart': false
}); });
console.log(e, '蓝牙信息') console.log(e, '蓝牙信息101010')
const deviceId = e.deviceId const deviceId = e.deviceId
this.Bluetoothmac = e.localName.substring(6) //从第七位开始截取 只取后面的mac号 this.Bluetoothmac = e.localName.substring(6) //从第七位开始截取 只取后面的mac号
this.mac = e.localName.substring(6) this.mac = e.localName.substring(6)
@ -259,72 +286,47 @@
xBlufi.notifyConnectBle({ xBlufi.notifyConnectBle({
isStart: true, isStart: true,
deviceId: e.deviceId, deviceId: e.deviceId,
name name:e.name
}); });
let that = this let that = this
uni.getLocation({ uni.getLocation({
type: 'wgs84', type: 'wgs84',
success: function(lb) { success: function(lb) {
console.log('位置信息', lb); console.log('位置信息', lb);
console.log('当前位置的经度：' + lb.longitude);
console.log('当前位置的纬度：' + lb.latitude);
that.gps.lat = lb.latitude; that.gps.lat = lb.latitude;
that.gps.lon = lb.longitude; that.gps.lon = lb.longitude;
that.$u.put(`/app/device/bind/${that.mac}`, that.gps).then((res) => {
if (res.code == 200) {
uni.showToast({
title: '绑定成功',
icon: 'none',
duration: 2000
});
uni.removeStorageSync('mac');
// setTimeout(()=>{
// uni.switchTab({
// url:'/pages/index/index'
// })
// },)
} else {
// setTimeout(()=>{
// uni.switchTab({
// url:'/pages/index/index'
// })
// },)
}
})
}, },
fail: function(error) { fail: function(error) {
console.error('获取位置信息失败：', error); console.error('获取位置信息失败：', error);
that.gps.lat = 0; that.gps.lat = 0;
that.gps.lon = 0; that.gps.lon = 0;
that.$u.put(`/app/device/bind/${that.mac}`, that.gps).then((res) => { // that.$u.put(`/app/device/bind/${that.mac}`, that.gps).then((res) => {
if (res.code == 200) { // if (res.code == 200) {
uni.showToast({ // uni.showToast({
title: '绑定成功', // title: '绑定成功',
icon: 'none', // icon: 'none',
duration: 2000 // duration: 2000
}); // });
uni.removeStorageSync('mac'); // uni.removeStorageSync('mac');
// setTimeout(()=>{ // // setTimeout(()=>{
// uni.switchTab({ // // uni.switchTab({
// url:'/pages/index/index' // // url:'/pages/index/index'
// }) // // })
// },) // // },)
} else { // } else {
// setTimeout(()=>{ // // setTimeout(()=>{
// uni.switchTab({ // // uni.switchTab({
// url:'/pages/index/index' // // url:'/pages/index/index'
// }) // // })
// },) // // },)
} // }
}) // })
// 在这里处理获取位置信息失败的情况 // 在这里处理获取位置信息失败的情况
} }
}) })
}, },
// 点击重新搜索 // 点击重新搜索
Search() { Search() {
@ -345,10 +347,10 @@
xBlufi.notifyStartDiscoverBle({ xBlufi.notifyStartDiscoverBle({
'isStart': false 'isStart': false
}); });
// 判断是否存在浇花器设备 // 判断是否存在设备
if (this.devicesList.length == 0) { if (this.devicesList.length == 0) {
this.tishiflag = true this.tishiflag = true
this.texts = '扫描完毕，暂无发现浇花器设备' this.texts = '扫描完毕，暂无发现设备'
} else { } else {
this.texts = '扫描到以下设备，请点击连接！' this.texts = '扫描到以下设备，请点击连接！'
} }

7
page_fenbao/statulist/myshop/shopdetail/index.vue
View File

@ -111,7 +111,7 @@
this.scanQRCode() this.scanQRCode()
} else if (type == '2') { } else if (type == '2') {
uni.navigateTo({ uni.navigateTo({
url: '/page_fenbao/device/index' url: '/page_fenbao/device/index?storeId=' + this.storeId
}) })
} }
}, },
@ -121,7 +121,10 @@
scanType: ['qrCode'], scanType: ['qrCode'],
success: res => { success: res => {
console.log('扫描结果：', res); console.log('扫描结果：', res);
this.qrResult = res.result; // 将扫描结果存储在数据中 this.qrResult = res.result;
uni.navigateTo({
url:'/page_fenbao/device/lianjie?mac=' + this.qrResult + '&storeId=' + this.storeId
})
}, },
fail: err => { fail: err => {
console.error('扫描失败：', err); console.error('扫描失败：', err);

3
page_fenbao/statulist/nearby/index.vue
View File

@ -219,7 +219,7 @@
} }
.list{ .list{
display: flex; display: flex;
justify-content: space-between; // justify-content: space-between;
margin-top: 44rpx; margin-top: 44rpx;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
padding-bottom: 16rpx; padding-bottom: 16rpx;
@ -235,6 +235,7 @@
} }
} }
.cen{ .cen{
width: 488rpx;
.cena{ .cena{
font-weight: 500; font-weight: 500;
font-size: 28rpx; font-size: 28rpx;

19
pages.json
View File

@ -215,6 +215,15 @@
"navigationBarTextStyle": "#FFFFFF", "navigationBarTextStyle": "#FFFFFF",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
},{
"path": "device/lianjie",
"style": {
"navigationBarTitleText": "添加设备",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#3996FD",
"navigationBarTextStyle": "#FFFFFF",
"navigationStyle": "custom"
}
}, },
{ {
"path": "device/wifiDevice", "path": "device/wifiDevice",
@ -225,8 +234,18 @@
"navigationBarTextStyle": "#FFFFFF", "navigationBarTextStyle": "#FFFFFF",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
},{
"path": "device/wifivideo",
"style": {
"navigationBarTitleText": "添加设备",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#3996FD",
"navigationBarTextStyle": "#FFFFFF",
"navigationStyle": "custom"
}
}, },
{ {
"path": "device/czDevice", "path": "device/czDevice",
"style": { "style": {

4
pages/index/index.vue
View File

@ -27,9 +27,9 @@
{{titlist}} {{titlist}}
</view> </view>
<view class="right"> <view class="right">
<view class="fd_set" @click="show = true"> <!-- <view class="fd_set" @click="show = true">
+ +
</view> </view> -->
<view class="fd_set iconfont icon-liebiao" @click="showfz = true"> <view class="fd_set iconfont icon-liebiao" @click="showfz = true">
</view> </view>

2
pages/shouye/index.vue
View File

@ -10,7 +10,7 @@
<view class="ditu"> <view class="ditu">
<view class="dtxs"> <view class="dtxs">
<map class='map' :latitude="latitude" :longitude="longitude" @markertap="handleMarkerClick" <map class='map' :latitude="latitude" :longitude="longitude" @markertap="handleMarkerClick"
:show-location="true" :markers="covers"/> :show-location="true" :markers="covers" :scale="13"/>
</view> </view>
<view class="fujin"> <view class="fujin">
<image src="https://api.ccttiot.com/smartmeter/img/static/u7HPhEwbIJqbLRpImBON" mode="" @click="btnindex(5)"></image> <image src="https://api.ccttiot.com/smartmeter/img/static/u7HPhEwbIJqbLRpImBON" mode="" @click="btnindex(5)"></image>