1
0
forked from dyf/APP

6155部分功能提交

This commit is contained in:
liub
2025-07-11 16:08:17 +08:00
parent 4a0798f47d
commit 413c495880
9 changed files with 2111 additions and 283 deletions

View File

@ -6,6 +6,17 @@
"navigationStyle": "custom"
}
},
{
"path" : "pages/6155/deviceDetail",
"style" :
{
"navigationBarTitleText" : "HBY 6155"
}
},
{
"path": "pages/common/index/index",
"style": {
@ -85,18 +96,32 @@
}
},
{
"path": "pages/6155/index",
"style": {
"navigationBarTitleText": "6155"
"path" : "pages/common/addBLE/addEquip",
"style" :
{
"navigationBarTitleText" : "添加设备"
}
},
{
"path": "pages/6155/bluetooth/bluetooth",
"style": {
"navigationStyle": "custom"
"path" : "pages/common/addBLE/LinkBle",
"style" :
{
"navigationBarTitleText" : "扫描到的设备"
}
},
{
"path" : "pages/6155/ImgCrop",
"style" :
{
"navigationBarTitleText" : "图像裁剪",
"navigationStyle": "custom",
"fullscreen": true
}
}
],
"tabBar": {
"color": "#fff",

93
pages/6155/ImgCrop.vue Normal file
View File

@ -0,0 +1,93 @@
<template>
<view>
<canvas canvas-id="splashCanvas"
style="width: 160px; height: 80px; z-index: 9999;position: fixed; visibility: visible;top: 0px;left:0px;"
</canvas>
<qf-image-cropper :src="src" :showAngle="false" :width="1600" :height="800" fileType="jpg"
@crop="handleCrop" :gpu="true">
</qf-image-cropper>
</view>
</template>
<script>
import QfImageCropper from '@/uni_modules/qf-image-cropper/components/qf-image-cropper/qf-image-cropper.vue';
export default {
components: {
QfImageCropper
},
data() {
return {
src:"",
Statu: false
}
},
onLoad:function(option){
const eventChannel = this.getOpenerEventChannel();
var these=this;
eventChannel.on('checkImg', function(data) {
console.log("我收到你的消息了,消息内容是:"+JSON.stringify(data));
these.src=data.data;
})
},
methods: {
handleCrop(e) {
var these=this;
this.Statu = true;
console.log("裁剪完成");
console.log(e.tempFilePath);
const ctx = uni.createCanvasContext('splashCanvas', these);
console.log("1111111");
// 绘制图片到canvas
ctx.drawImage(e.tempFilePath, 0, 0, 160, 80);
console.log("22222");
ctx.draw(false, () => {
// 获取canvas像素数据
console.log("444444");
setTimeout(() => {
uni.canvasGetImageData({
canvasId: 'splashCanvas',
x: 0,
y: 0,
width: 160,
height: 80,
success: (res) => {
// 处理像素数据并发送
console.log("res.data.length="+res.data.length);
// this.processAndSendImageData(res.data).then(
// resolve).catch(reject);
const eventChannel = these.getOpenerEventChannel();
eventChannel.emit('ImgCutOver',res.data);
uni.navigateBack();
},
fail: (err) => {
reject(`获取canvas数据失败: ${err.errMsg}`);
}
});
}, 500); // 等待canvas绘制完成
});
console.log("333333");
}
}
}
</script>
<style>
.canvas {
width: 1600px;
height: 800px;
border: 1px solid #ccc;
}
</style>

View File

@ -1,257 +0,0 @@
<template>
<view class="">
<custom-navbar :showBack="true"></custom-navbar>
<view class="pageContent" :style="{ paddingTop: navBarHeight + 'px' }">
<view class="scanner">
<view class="pulse"></view>
<view class="device-name">
<!-- <image src="/static/images/svgg.png" class="bluth"></image> -->
</view>
</view>
<view class="device">我的设备</view>
<scroll-view class="device-list" scroll-y>
<block v-for="(item, index) in deviceList" :key="index" :ref="'swipeItem_' + index">
<!-- 设备卡片内容保持不变 -->
<view @click.stop="handleFile(item)" class="device-card">
<view class="device-header">
<view class="deviceIMG">
<!-- <image src="/static/images/bip.png" mode="" class="IMG"></image> -->
</view>
<view class="device-name1">
<view>设备:001-00</view>
<view class="ID">
<view>ID:0222222</view>
</view>
</view>
</view>
</view>
</block>
</scroll-view>
<view class="device">其他设备</view>
<scroll-view class="device-list" scroll-y>
<block v-for="(item, index) in 3" :key="index" :ref="'swipeItem_' + index">
<!-- 设备卡片内容保持不变 -->
<view @click.stop="handleFile(item)" class="device-card">
<view class="device-header">
<view class="deviceIMG">
<!-- <image src="/static/images/bip.png" mode="" class="IMG"></image> -->
</view>
<view class="device-name1">
<view>设备:001-00</view>
<view class="ID">
<view>ID:0222222</view>
</view>
</view>
</view>
</view>
</block>
</scroll-view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
// 这里可以添加数据绑定
navBarHeight: 70 + uni.getSystemInfoSync().statusBarHeight,
deviceList:[{}]
}
},
methods: {
// 扫描
}
}
</script>
<style scoped>
.pageContent {
min-height: 100vh;
background-color: rgb(18, 18, 18);
padding: 30rpx;
}
.scanner {
position: relative;
width: 600rpx;
height: 600rpx;
display: flex;
align-items: center;
justify-content: center;
margin: 0 auto;
}
/* 设备名称 */
.device-name {
position: relative;
z-index: 10;
width: 104rpx;
height: 104rpx;
background: rgba(187, 230, 0, 1);
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
}
.bluth {
width: 36rpx;
height: 36rpx;
}
/* 脉冲波纹效果 */
.pulse {
position: absolute;
width: 100%;
height: 100%;
border-radius: 50%;
border: 1px solid rgba(206, 242, 49, 0.05);
background: rgba(206, 242, 49, 0.05);
animation: pulse 4s infinite cubic-bezier(0.2, 0, 0.2, 1);
}
/* 通过伪元素创建4层波纹 */
.pulse::before,
.pulse::after,
.pulse .ripple-1,
.pulse .ripple-2 {
content: '';
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
border-radius: 50%;
background: rgba(187, 230, 0, 0.4);
border: 1px solid rgba(206, 242, 49, 0.04);
animation: inherit;
}
.pulse::before {
animation-delay: 1s;
}
.pulse::after {
animation-delay: 2s;
}
.pulse .ripple-1 {
animation-delay: 0.5s;
}
.pulse .ripple-2 {
animation-delay: 1.5s;
}
@keyframes pulse {
0% {
transform: scale(0.1);
opacity: 0.8;
}
70% {
opacity: 0.4;
}
100% {
transform: scale(1);
opacity: 0.5;
}
}
.device {
color: rgba(255, 255, 255, 0.6);
margin-bottom: 20rpx;
}
/* 设备卡片 */
.device-card {
background-color: rgb(26, 26, 26);
border-radius: 16rpx;
margin-bottom: 20rpx;
box-sizing: border-box;
position: relative;
}
.device-header {
display: flex;
align-items: center;
margin-bottom: 15rpx;
padding: 30rpx 0 10rpx 30rpx;
}
.device-name1 {
font-size: 32rpx;
color: rgba(255, 255, 255, 0.87);
margin-left:40rpx;
line-height: 50rpx;
width: 70%;
}
.ID {
color: rgba(255, 255, 255, 0.6);
font-size: 26rpx;
display: flex;
justify-content: space-between;
}
.device-status {
width: 122rpx;
height: 52rpx;
font-size: 26rpx;
border-radius: 0px 8px 0px 8px;
background-color: rgb(42, 42, 42);
position: absolute;
top: 0rpx;
right: 0rpx;
text-align: center;
line-height: 52rpx;
}
.circle {
width:8rpx;
height: 40rpx;
position: absolute;
right:25rpx;
top:85rpx;
}
.online {
color: rgb(187, 230, 0);
}
.device-id {
font-size: 26rpx;
color: #999;
margin-bottom: 20rpx;
display: block;
}
.device-info {
display: flex;
justify-content: space-evenly;
font-size: 28rpx;
color: rgba(255, 255, 255, 0.87);
position: relative;
padding: 0rpx 0rpx 30rpx 30rpx;
}
.deviceIMG {
/* width: 100rpx;
height: 100rpx;
border-radius: 16rpx;
position: relative;
background-color: rgba(42, 42, 42, 0.6);
display: flex;
align-items: center; */
}
.IMG {
width:38rpx;
height: 80rpx;
margin-left: 17%;
}
</style>

1334
pages/6155/deviceDetail.vue Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +0,0 @@
<template>
<div>
<h1>6155</h1>
</div>
</template>
<script setup>
</script>

View File

@ -0,0 +1,22 @@
<template>
<view>
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style>
</style>

View File

@ -0,0 +1,598 @@
<template>
<view class="content">
<view class="topAnimate">
<view class="animate center">
<view class="animateContent">
<view class="circle"></view>
<view class="circle"></view>
<view class="circle"></view>
</view>
<view class="imgContent center">
<view class="img center">
<image src="/static/images/bluetooth.png" class="titleIco" mode="aspectFit">
</image>
</view>
</view>
</view>
</view>
<view class="mainContent">
<view class="p100">
<view class="lblTitle">配对设备</view>
<view class="list" style="margin-bottom: 30rpx;">
<view class="item " v-for="item, index in PairEquip" v-show="PairEquip.length>0">
<view class="leftImg ">
<image src="/static/images/BLEAdd/device.png" class="titleIco" mode="aspectFit">
</image>
</view>
<view class="centertxt ">
<view class="name" v-text="item.name"></view>
<view class="id" v-text="item.deviceId"></view>
</view>
<view class="rightIco center">
<image src="/static/images/BLEAdd/linked.png" class="img" mode="aspectFit">
</image>
</view>
</view>
<view v-show="PairEquip.length==0" class="item center">
<view class="noLink">无已配对设备</view>
</view>
</view>
<view class="lblTitle">搜索设备</view>
<view class="list searchList">
<view class="item" v-on:click="Link(item,index)" v-for="item, index in EquipMents"
v-show="!item['linkStatu']">
<view class="leftImg ">
<image src="/static/images/BLEAdd/device.png" class="titleIco" mode="aspectFit">
</image>
</view>
<view class="centertxt ">
<view class="name" v-text="item.name?item.name:'Unnamed'"></view>
<view class="id" v-text="item.deviceId"></view>
</view>
<view class="rightIco center">
<image :src="isItemLink(item,index)" class="img" mode="aspectFit">
</image>
</view>
</view>
</view>
</view>
</view>
<BottomSlideMenuPlus :config="Status.BottomMenu">
<view class="openBlue">
<view class="txt">
当前手机蓝牙关闭,是否打开以扫描附近的蓝牙设备?
</view>
<view class="btns">
<view class="btn cancel" @click="Status.BottomMenu.show=false">
<view>取消</view>
</view>
<view class="ok btn" @click="gotoSetting">
<view>开启</view>
</view>
</view>
</view>
</BottomSlideMenuPlus>
</view>
</template>
<script>
import ble from '../../../api/6155/BlueHelper.js';
import request from '../../../utils/request.js';
export default {
data() {
return {
Status: {
BottomMenu: {
show: false,
showHeader: false,
menuItems: [],
activeIndex: -1,
bgColor: '#2a2a2a',
itemBgColor: '#3a3a3a',
textColor: '#ffffffde',
textAlign: 'flex-start',
title: '主灯模式',
showDivider: false,
dividerColor: '#00000000',
dividerThickness: '0rpx',
dividerMargin: '10rpx',
itemHeight: '80rpx',
type: '',
showBtn: false,
btnBgColor: "#bbe600",
btnText: "确定",
btnTextColor: "#232323de",
showMask: true,
maskBgColor: '#00000066',
showClose: false
}
},
PairEquip: [], //已配对设备
EquipMents: [] //搜索出来的设备
}
},
computed: {
},
onHide: function() {
ble.StopSearch();
},
onBackPress: (e) => {
ble.StopSearch();
ble.disconnectDevice();
},
onShow: function() {
// return;
var these = this;
uni.getStorage({
key: "linkedDevices",
success: (res) => {
this.PairEquip = JSON.parse(res.data);
},
fail: (ex) => {
this.PairEquip = [];
}
});
if (process.env.UNI_PLATFORM == 'mp-weixin' ||
process.env.UNI_PLATFORM == 'mp-alipay' ||
process.env.UNI_PLATFORM == 'app-plus' ||
process.env.UNI_PLATFORM == 'app'
) {
//打开蓝牙开始搜索设备
ble.OpenBlue(true, () => {
ble.StartSearch(function(arr) {
arr = arr.devices;
for (var i = 0; i < arr.length; i++) {
arr[i].linkStatu = false;
let f = these.EquipMents.find(function(v) {
return v.deviceId == arr[i].deviceId;
});
if (!f) {
these.EquipMents.push(arr[i]);
}
}
console.log("设备列表:" + JSON.stringify(these.EquipMents));
});
},
() => {
these.showOpenSetting();
}
)
} else {
console.log('当前环境:' + process.env.UNI_PLATFORM + '不支持蓝牙');
}
},
methods: {
isItemLink: function(item, index) {
let src = '/static/images/BLEAdd/noLink.png';
if (this.PairEquip && this.PairEquip instanceof Array) {
if (this.PairEquip.length > 0) {
let f = this.PairEquip.find(function(v) {
return v.deviceId == item.deviceId;
});
if (f) {
src = '/static/images/BLEAdd/linked.png';
}
}
}
return src;
},
alert: function(title, content, callback) {
if (!title) {
title = '提示'
}
if (!content) {
content = title;
}
uni.showModal({
title: title,
content: content,
success: function(res) {
if (res.confirm) {
console.log('用户点击确定');
} else if (res.cancel) {
console.log('用户点击取消');
}
if (callback) {
callback(res);
}
}
});
},
showOpenSetting: function() {
this.Status.BottomMenu.show = true;
},
gotoSetting: function() {
this.Status.BottomMenu.show = false;
ble.showBluetoothGuide(false);
},
Link: function(item, index) {
var these = this;
if (process.env.UNI_PLATFORM == 'mp-weixin' ||
process.env.UNI_PLATFORM == 'mp-alipay' ||
process.env.UNI_PLATFORM == 'app-plus' ||
process.env.UNI_PLATFORM == 'app'
) {
uni.showLoading({
title: "正在连接",
mask: true
});
setTimeout(() => {
ble.LinkBlue(item.deviceId, function() {
let c = these.PairEquip.find(function(v) {
return v.deviceId == item.deviceId;
});
if (!c) {
these.PairEquip.push(item);
uni.setStorage({
key: 'linkedDevices',
data: JSON.stringify(these.PairEquip),
success: () => {}
});
}
// 调用绑定设备接口
let promise = request({
url: '/app/device/bind',
method: 'POST',
data: {
deviceImei: '',
deviceMac: item.deviceId,
communicationMode: '1', //0是4g,1是蓝牙
}
});
promise.then((res) => {
console.log("1111" + JSON.stringify(res));
if (res.code == 0) {
uni.hideLoading()
uni.showToast({
title: res.data,
icon: 'success'
});
} else {
uni.showToast({
title: res.msg,
});
}
}).catch((ex) => {
uni.showToast({
title: '出现了未知的异常,操作失败',
});
});
}, (ex) => {
uni.hideLoading();
});
}, 0);
} else {
these.alert("提示", "当前平台不支持蓝牙");
}
}
}
}
</script>
<style>
.noLink {
text-align: center;
width: 100%;
font-size: 28rpx;
}
.content {
background-color: #1d1d1d;
color: #ffffffde;
box-sizing: border-box;
overflow: hidden;
width: 100%;
min-height: 100vh;
height: auto;
}
.p100 {
width: 100%;
height: 100%;
}
.fleft {
float: left;
}
.fright {
float: right;
}
.clear {
clear: both;
}
.center {
display: flex;
flex-direction: row;
flex-wrap: nowrap;
align-content: center;
justify-content: center;
align-items: center;
}
.topAnimate {
position: absolute;
left: 0rpx;
width: 100%;
height: 400rpx;
top: 20px;
/* 距离视口顶部 20px 时固定 */
z-index: 100;
/* 确保元素显示在最上层 */
}
.animate {
width: 100%;
height: 400rpx;
position: relative;
}
.animate .animateContent {
position: relative;
z-index: 0;
}
.animate .imgContent {
position: absolute;
z-index: 1;
width: 100%;
height: 100%;
}
.animate .imgContent .img {
height: 100rpx;
width: 100rpx;
background: #bbe600;
border-radius: 50%;
}
.animate .titleIco {
width: 36rpx;
height: 36rpx;
}
.circle {
position: absolute;
border-radius: 50%;
background-color: #bbe60033;
animation: expand 3s infinite ease-out;
}
.circle:nth-child(2) {
animation-delay: 1s;
}
.circle:nth-child(3) {
animation-delay: 2s;
}
@keyframes expand {
0% {
width: 0;
height: 0;
opacity: 0.8;
transform: translate(-50%, -50%);
}
100% {
width: 18.75rem;
height: 18.75rem;
opacity: 0;
transform: translate(-50%, -50%);
}
}
.mainContent {
padding: 30rpx;
box-sizing: border-box;
width: 100%;
height: calc(100% - 400rpx);
overflow-y: scroll;
position: absolute;
top: 400rpx;
left: 0rpx;
}
.mainContent .p100 {}
.mainContent .lblTitle {
color: #ffffffde;
font-family: PingFang SC;
font-size: 28rpx;
font-weight: 700;
text-align: left;
width: 100%;
height: 28rpx;
line-height: 28rpx;
}
.list {
min-height: 120rpx;
}
.searchList {
width: 100%;
height: calc(100% - 186rpx);
overflow-y: scroll;
}
.list .item {
width: 100%;
height: 120rpx;
box-sizing: border-box;
padding: 30rpx;
border-radius: 8px;
background: #1a1a1a;
display: flex;
flex-direction: row;
flex-wrap: nowrap;
justify-content: flex-start;
align-items: center;
margin-top: 10rpx;
}
.list .item .leftImg {
width: 100rpx;
height: 70rpx;
}
.list .item .centertxt {
width: calc(100% - 150rpx);
height: 100%;
padding-left: 10rpx;
display: flex;
flex-direction: column;
flex-wrap: nowrap;
justify-content: space-evenly;
align-items: flex-start;
align-content: flex-start;
}
.list .item .rightIco {
width: 50rpx;
height: 100%;
}
.list .item .leftImg .titleIco {
width: 100%;
height: 100%;
}
.list .item .name {
color: #ffffffde;
font-family: PingFang SC;
font-size: 26rpx;
font-weight: 400;
line-height: 50rpx;
text-align: left;
}
.list .item .id {
color: #ffffff99;
font-family: PingFang SC;
font-size: 24rpx;
font-weight: 400;
line-height: 30rpx;
text-align: left;
}
.list .item .rightIco .img {
width: 50rpx;
height: 50rpx;
}
.openBlue {
padding: 30rpx;
width: 100%;
box-sizing: border-box;
height: auto;
}
.openBlue .txt {
color: rgba(255, 255, 255, 0.87);
font-family: PingFang SC;
font-size: 28rpx;
font-weight: 400;
letter-spacing: 0.14rpx;
text-align: center;
}
.openBlue .btns {
display: flex;
flex-direction: row;
flex-wrap: nowrap;
align-content: center;
align-items: center;
justify-content: space-evenly;
margin-top: 50rpx;
width: 100%;
height: auto;
}
.openBlue .btn {
border-radius: 91rpx;
box-sizing: border-box;
width: 25%;
height: 60rpx;
text-align: center;
font-family: PingFang SC;
font-size: 28rpx;
letter-spacing: 12rpx;
display: flex !important;
align-items: center;
letter-spacing: 0.375rem;
flex-direction: row;
flex-wrap: nowrap;
align-content: center;
justify-content: center;
}
.openBlue .cancel {
border: 1px solid rgba(255, 255, 255, 1);
color: rgba(255, 255, 255, 1);
}
.openBlue .ok {
background-color: #BBE600;
color: #232323;
}
</style>

View File

@ -24,8 +24,8 @@
<scroll-view class="device-list" scroll-y @scrolltolower="onScrollToLower" :lower-threshold="100"
style="height:80vh;">
<uni-swipe-action ref="swipeAction">
<block v-for="(item, index) in deviceList" :key="index" :ref="'swipeItem_' + index">
<uni-swipe-action-item :right-options="Options" @click="handleSwipeClick($event, item, index)"
<block v-for="(item, index) in deviceList" :key="index" :ref="'swipeItem_' + index" >
<uni-swipe-action-item :right-options="Options" @click.stop="handleSwipeClick($event, item, index)"
class="device-card">
<!-- 设备卡片内容保持不变 -->
<view @click.stop="handleFile(item)">
@ -165,6 +165,7 @@
getTab() {
deviceTypeList({}).then((res) => {
if (res.code == 200) {
console.log("deviceTypeList="+JSON.stringify(res.data));
this.tabs = [{
id: '',
name: '全部设备',
@ -237,9 +238,18 @@
});
break;
case 'bluetooth':
// uni.navigateTo({
// url: 'pages/common/addBLE/AddDevice',
// success:(res)=>{
// res.eventChannel.emit('key', { data: 'data from starter page' })
// },fail: (ex) => {
// console.log("跳转失败了",JSON.stringify(ex));
// }
// });
uni.navigateTo({
url: '/pages/6155/bluetooth/bluetooth'
});
url:"/pages/common/addBLE/addEquip"
})
break;
}
},
@ -330,17 +340,29 @@
})
},
handleFile(item) {
console.log(item, 'item');
console.log('item'+JSON.stringify(item));
// communicationMode 0是4G 1是蓝牙
if (item.communicationMode == 0) {
uni.navigateTo({
url: '/pages/6170/deviceControl/index'
})
} else {
});
return;
}
if(item.typeName=='6155'){
uni.navigateTo({
url: '/pages/6155/index'
url:"/pages/6155/deviceDetail",
events:{
ack:function(data){
}
},
success: (res) => {
res.eventChannel.emit('detailData', { data: item });
}
})
}
},
onIntall() {

View File

@ -62,12 +62,12 @@
return {
showView: false,
//codebtn: '获取验证码',
phone: '', //手机号码
code: "", //验证码
phone: '17671332251', //手机号码
code: "123456", //验证码
agreed: false,
isCounting: false,
countdown: 0,
isChecked: false,
isChecked: true,
showAgreement: false, // 控制弹窗显示
}
},