Merge pull request 'new-20250827 批量报警、批量发送消息，分供应商处理' (#37) from liubiao/APP:new-20250827 into main
Reviewed-on: #37
This commit is contained in:
@ -2,12 +2,12 @@
|
||||
"version" : "1.0",
|
||||
"configurations" : [
|
||||
{
|
||||
"playground" : "custom",
|
||||
"playground" : "standard",
|
||||
"type" : "uni-app:app-ios"
|
||||
},
|
||||
{
|
||||
"customPlaygroundType" : "local",
|
||||
"playground" : "custom",
|
||||
"playground" : "standard",
|
||||
"type" : "uni-app:app-android"
|
||||
},
|
||||
{
|
||||
@ -17,6 +17,9 @@
|
||||
"default" : {
|
||||
"launchtype" : "local"
|
||||
},
|
||||
"h5" : {
|
||||
"launchtype" : "local"
|
||||
},
|
||||
"provider" : "aliyun",
|
||||
"type" : "uniCloud"
|
||||
}
|
||||
|
||||
79
App.vue
79
App.vue
@ -30,43 +30,41 @@
|
||||
//以上代码仅在开发时使用,否则会出现不可预知的问题。
|
||||
|
||||
// #ifdef APP|APP-PLUS
|
||||
|
||||
bleTool.getBleTool();
|
||||
|
||||
var appid = plus.runtime.appid;
|
||||
console.log('应用的 appid 为：' + appid);
|
||||
if (plus.runtime.isAgreePrivacy()) {
|
||||
|
||||
|
||||
uni.getPushClientId({
|
||||
success(res) {
|
||||
console.log("推送信息:", res);
|
||||
uni.setStorageSync('push_cid', res.cid);
|
||||
},
|
||||
fail(err) {
|
||||
console.error(err)
|
||||
bleTool.getBleTool();
|
||||
|
||||
uni.getPushClientId({
|
||||
success(res) {
|
||||
console.log("推送信息:", res);
|
||||
uni.setStorageSync('push_cid', res.cid);
|
||||
},
|
||||
fail(err) {
|
||||
console.error(err)
|
||||
}
|
||||
});
|
||||
if (!uni.setAppBadgeNumber) { //兼容鸿蒙的写法
|
||||
uni.setAppBadgeNumber = plus.runtime.setBadgeNumber;
|
||||
}
|
||||
});
|
||||
if(!uni.setAppBadgeNumber){//兼容鸿蒙的写法
|
||||
uni.setAppBadgeNumber=plus.runtime.setBadgeNumber;
|
||||
}
|
||||
uni.onPushMessage((res) => {
|
||||
console.log("收到推送消息：", res); //监听推送消息
|
||||
if(res.type=='click'){
|
||||
//将App角标设置为0，清空app在消息中心的所有消息
|
||||
uni.setAppBadgeNumber(0);
|
||||
plus.push.clear();
|
||||
return;
|
||||
}
|
||||
uni.createPushMessage({
|
||||
title: res.data.title,
|
||||
content: res.data.content,
|
||||
payload:res.data.payload
|
||||
uni.onPushMessage((res) => {
|
||||
console.log("收到推送消息：", res); //监听推送消息
|
||||
if (res.type == 'click') {
|
||||
//将App角标设置为0，清空app在消息中心的所有消息
|
||||
uni.setAppBadgeNumber(0);
|
||||
plus.push.clear();
|
||||
return;
|
||||
}
|
||||
uni.createPushMessage({
|
||||
title: res.data.title,
|
||||
content: res.data.content,
|
||||
payload: res.data.payload
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
// #endif
|
||||
},
|
||||
@ -74,18 +72,15 @@
|
||||
console.log('App Show');
|
||||
|
||||
//将检查更新换到onshow,因为苹果用户喜欢一直挂着
|
||||
uni.getSystemInfo({
|
||||
success: function(res) {
|
||||
if (res.uniPlatform == 'app') {
|
||||
// #ifdef APP|APP-PLUS
|
||||
|
||||
let appid = plus.runtime.appid;
|
||||
if (appid !== 'HBuilder') {
|
||||
console.log("appid=", appid);
|
||||
upgrade.checkAndUpdateWgt();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
let appid = plus.runtime.appid;
|
||||
console.log("appid=", appid);
|
||||
|
||||
if (appid !== 'HBuilder') {
|
||||
upgrade.checkAndUpdateWgt();
|
||||
}
|
||||
// #endif
|
||||
},
|
||||
onHide: function() {
|
||||
console.log('App Hide');
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
"version" : "1",
|
||||
"prompt" : "template",
|
||||
"title" : "服务协议和隐私政策",
|
||||
"message" : " 请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/> 你可阅读<a href=\"https://cnxhyc.com/jquan/2026/02/09/80806c4209c74bd0a223415683ec300d.html\">《服务协议》</a>和<a href=\"https://cnxhyc.com/jquan/2026/02/09/4a4d05227c1242d1a505b98586704c39.html\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
|
||||
"message" : " 请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/> 你可阅读<a href=\"https://cnxhyc.com/jquan/2026/02/09/80806c4209c74bd0a223415683ec300d.html\">《服务协议》</a>和<a href=\"http://cnxhyc.com/jquan/2026/03/06/d60f8b8cbf5942b8a1b52bb6ea469aa6.html\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
|
||||
"buttonAccept" : "同意并接受",
|
||||
"buttonRefuse" : "暂不同意",
|
||||
"hrefLoader" : "system",
|
||||
|
||||
@ -63,6 +63,10 @@ export function mapReverseGeocoding(data) {
|
||||
})
|
||||
}
|
||||
|
||||
export function deviceRealTimeStatus(){
|
||||
return Promise.resolve({code:500});
|
||||
export function deviceRealTimeStatus(params){
|
||||
return request({
|
||||
url: `/app/device/realTimeStatus`,
|
||||
method: 'get',
|
||||
data:params
|
||||
})
|
||||
}
|
||||
@ -15,7 +15,7 @@
|
||||
</view>
|
||||
<view class="menu-items" v-if="config.menuItems && config.menuItems.length>0">
|
||||
<view class="menu-item" v-for="(item, index) in config.menuItems" :key="index" :style="{
|
||||
color: config.textColor,
|
||||
color: config.textColor,
|
||||
textAlign: config.textAlign,
|
||||
height:config.itemHeight,
|
||||
lineHeight:config.itemHeight,
|
||||
@ -23,7 +23,7 @@
|
||||
paddingRight: config.dividerMargin
|
||||
}" @click="handleItemClick(item, index)">
|
||||
|
||||
<view class="p100" :style="{backgroundColor:config.activeIndex==index?config.itemBgColor:'',
|
||||
<view class="p100" :style="{backgroundColor:(config.activeIndex==index || item[config.valueMember]==config.value) ?config.itemBgColor:'',
|
||||
justifyContent:config.textAlign
|
||||
}">
|
||||
<view class="imgContent" v-if="item.icon" :style="{
|
||||
@ -73,6 +73,8 @@
|
||||
maskBgColor: '', //mask的颜色
|
||||
menuItems: [], //菜单项 包含icon text
|
||||
activeIndex: -1, //当前已选中的项编号
|
||||
valueMember:'',
|
||||
value:null,
|
||||
bgColor: '#2a2a2a', //主体背景
|
||||
itemBgColor: '#3a3a3a', //各项被选中后的背景
|
||||
textColor: '#ffffffde', //各项的文字颜色
|
||||
@ -91,7 +93,16 @@
|
||||
|
||||
|
||||
},
|
||||
|
||||
created(){
|
||||
if(this.config.value && this.config.valueMember){
|
||||
this.config.menuItems.find((v,i)=>{
|
||||
if(v[this.config.valueMember]==this.config.value){
|
||||
this.config.activeIndex=i;
|
||||
return true;
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
closeMenu() {
|
||||
|
||||
@ -108,6 +119,16 @@
|
||||
let index = null;
|
||||
if (this.config.activeIndex > -1) {
|
||||
item = this.config.menuItems[this.config.activeIndex];
|
||||
}else{
|
||||
for (let i = 0; i < this.config.menuItems.length; i++) {
|
||||
var element = this.config.menuItems[i];
|
||||
if(element[this.config.valueMember]==this.config.value){
|
||||
item=element;
|
||||
index=i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
index = this.config.activeIndex;
|
||||
this.$emit('btnClick', item, index);
|
||||
|
||||
@ -1,398 +1,373 @@
|
||||
<template>
|
||||
<view class="message-popup" v-if="visible">
|
||||
<view class="popup-mask" @click="handleMaskClick"></view>
|
||||
<view
|
||||
class="popup-content"
|
||||
:style="{
|
||||
<view class="message-popup" v-if="visible">
|
||||
<view class="popup-mask" @click="handleMaskClick"></view>
|
||||
<view class="popup-content" :style="{
|
||||
backgroundColor: bgColor || getTypeStyle('bgColor'),
|
||||
borderColor: borderColor || getTypeStyle('borderColor'),
|
||||
color: textColor || getTypeStyle('textColor')
|
||||
}"
|
||||
>
|
||||
<view v-if="showHeader&&headerTxt" class="header"
|
||||
}">
|
||||
<view v-if="showHeader&&headerTxt" class="header">{{headerTxt}}</view>
|
||||
|
||||
>{{headerTxt}}</view>
|
||||
<view v-if="visibleClose" class="rightClose" :style="{color:textColor || getTypeStyle('textColor')}"
|
||||
@click="closeClick">x</view>
|
||||
|
||||
<view v-if="visibleClose" class="rightClose"
|
||||
:style="{color:textColor || getTypeStyle('textColor')}"
|
||||
@click="closeClick"
|
||||
>x</view>
|
||||
|
||||
<view v-if="!visiblePrompt">
|
||||
<image
|
||||
v-if="iconUrl"
|
||||
:src="iconUrl"
|
||||
mode="aspectFit"
|
||||
class="popup-icon"
|
||||
:style="{ tintColor: textColor || getTypeStyle('textColor') }"
|
||||
></image>
|
||||
<view class="popup-message" :class="showSlot?'displayNone':''">{{ message }}</view>
|
||||
<view class="popup-message" :class="showSlot?'':'displayNone'">
|
||||
<slot></slot>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="!visiblePrompt">
|
||||
<image v-if="iconUrl" :src="iconUrl" mode="aspectFit" class="popup-icon"
|
||||
:style="{ tintColor: textColor || getTypeStyle('textColor') }"></image>
|
||||
<view class="popup-message" :class="showSlot?'displayNone':''">{{ message }}</view>
|
||||
<view class="popup-message" :class="showSlot?'':'displayNone'">
|
||||
<slot></slot>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view v-else class="popup-prompt">
|
||||
<text class="popup-prompt-title">{{ promptTitle || '请输入信息' }}</text>
|
||||
<input
|
||||
class="popup-prompt-input"
|
||||
:placeholder="promptPlaceholder"
|
||||
:value="modelValue"
|
||||
@input="handleInput"
|
||||
@confirm="handleButtonClick"
|
||||
/>
|
||||
</view>
|
||||
<view v-else class="popup-prompt">
|
||||
<text class="popup-prompt-title">{{ promptTitle || '请输入信息' }}</text>
|
||||
<input class="popup-prompt-input" :placeholder="promptPlaceholder" :value="modelValue"
|
||||
@input="handleInput" @confirm="handleButtonClick" />
|
||||
</view>
|
||||
|
||||
<view class="popBtnContent" v-show="showCancel || buttonText">
|
||||
<view class="popBtnContent" v-show="showCancel || buttonText">
|
||||
|
||||
<view
|
||||
class="popup-button-cancel"
|
||||
v-if="showCancel"
|
||||
:style="{display:showCancel?'block':'none'}"
|
||||
@click="handleCancelClick"
|
||||
>{{ buttonCancelText?buttonCancelText:'取消' }}</view>
|
||||
<view class="popup-button-cancel" v-if="showCancel" :style="{display:showCancel?'block':'none'}"
|
||||
@click="handleCancelClick">{{ buttonCancelText?buttonCancelText:'取消' }}</view>
|
||||
|
||||
<view
|
||||
class="popup-button"
|
||||
:class="buttonText?'':'displayNone'"
|
||||
:style="{
|
||||
<view class="popup-button" :class="buttonText?'':'displayNone'" :style="{
|
||||
backgroundColor: buttonBgColor || getTypeStyle('buttonBgColor'),
|
||||
color: buttonTextColor || getTypeStyle('buttonTextColor')
|
||||
}"
|
||||
@click="handleButtonClick"
|
||||
>{{ buttonText }}</view>
|
||||
}" @click="handleButtonClick">{{ buttonText }}</view>
|
||||
|
||||
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: 'MessagePopup',
|
||||
props: {
|
||||
visible: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
visibleClose:{
|
||||
type:Boolean,
|
||||
default:true
|
||||
},
|
||||
visiblePrompt: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
promptTitle: String,
|
||||
promptPlaceholder: {
|
||||
type: String,
|
||||
default: "请输入"
|
||||
},
|
||||
modelValue: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
type: {
|
||||
type: String,
|
||||
default: 'info',
|
||||
validator: value => ['success', 'error', 'info','custom'].includes(value)
|
||||
},
|
||||
bgColor: String,
|
||||
borderColor: String,
|
||||
textColor: String,
|
||||
buttonBgColor: String,
|
||||
buttonTextColor: String,
|
||||
iconUrl: String,
|
||||
message: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
buttonText: {
|
||||
type: String,
|
||||
default: '确定'
|
||||
},
|
||||
buttonCancelText:{
|
||||
type:String,
|
||||
default:'取消'
|
||||
},
|
||||
showCancel:{
|
||||
type:Boolean,
|
||||
default:false
|
||||
},
|
||||
showHeader:{
|
||||
type:Boolean,
|
||||
default:false
|
||||
},
|
||||
headerTxt:{
|
||||
type:String,
|
||||
default:""
|
||||
},
|
||||
showSlot:{
|
||||
type:Boolean,
|
||||
default:false
|
||||
export default {
|
||||
name: 'MessagePopup',
|
||||
props: {
|
||||
visible: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
visibleClose: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
},
|
||||
visiblePrompt: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
promptTitle: String,
|
||||
promptPlaceholder: {
|
||||
type: String,
|
||||
default: "请输入"
|
||||
},
|
||||
modelValue: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
type: {
|
||||
type: String,
|
||||
default: 'info',
|
||||
validator: value => ['success', 'error', 'info', 'custom'].includes(value)
|
||||
},
|
||||
bgColor: String,
|
||||
borderColor: String,
|
||||
textColor: String,
|
||||
buttonBgColor: String,
|
||||
buttonTextColor: String,
|
||||
iconUrl: String,
|
||||
message: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
buttonText: {
|
||||
type: String,
|
||||
default: '确定'
|
||||
},
|
||||
buttonCancelText: {
|
||||
type: String,
|
||||
default: '取消'
|
||||
},
|
||||
showCancel: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
showHeader: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
headerTxt: {
|
||||
type: String,
|
||||
default: ""
|
||||
},
|
||||
showSlot: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
inputValue: this.modelValue
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
// 监听外部值变化
|
||||
modelValue(newVal) {
|
||||
this.inputValue = newVal
|
||||
},
|
||||
// 监听模式切换
|
||||
visiblePrompt(newVal) {
|
||||
console.log('[MessagePopup] visiblePrompt changed to:', newVal)
|
||||
// 重置输入值
|
||||
if (newVal) {
|
||||
this.inputValue = this.modelValue
|
||||
}
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
||||
},
|
||||
methods: {
|
||||
getTypeStyle(styleType) {
|
||||
const styles = {
|
||||
success: {
|
||||
bgColor: '#f0fff0',
|
||||
borderColor: '#52c41a',
|
||||
textColor: '#389e0d',
|
||||
buttonBgColor: '#52c41a',
|
||||
buttonTextColor: '#FFFFFF'
|
||||
},
|
||||
error: {
|
||||
bgColor: '#fff0f0',
|
||||
borderColor: '#ff4d4f',
|
||||
textColor: '#cf1322',
|
||||
buttonBgColor: '#ff4d4f',
|
||||
buttonTextColor: '#FFFFFF'
|
||||
},
|
||||
info: {
|
||||
bgColor: '#e6f7ff',
|
||||
borderColor: '#1890ff',
|
||||
textColor: '#0050b3',
|
||||
buttonBgColor: '#1890ff',
|
||||
buttonTextColor: '#FFFFFF'
|
||||
}
|
||||
}
|
||||
return styles[this.type][styleType]
|
||||
},
|
||||
handleButtonClick() {
|
||||
|
||||
this.$emit('buttonClick', this.inputValue)
|
||||
},
|
||||
handleMaskClick() {
|
||||
|
||||
this.$emit('maskClick')
|
||||
},
|
||||
closeClick() {
|
||||
|
||||
this.$emit('closePop')
|
||||
},
|
||||
handleCancelClick() {
|
||||
|
||||
this.$emit('cancelPop');
|
||||
},
|
||||
handleInput(e) {
|
||||
|
||||
this.inputValue = e.detail.value
|
||||
this.$emit('update:modelValue', this.inputValue)
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
inputValue: this.modelValue
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
// 监听外部值变化
|
||||
modelValue(newVal) {
|
||||
this.inputValue = newVal
|
||||
},
|
||||
// 监听模式切换
|
||||
visiblePrompt(newVal) {
|
||||
console.log('[MessagePopup] visiblePrompt changed to:', newVal)
|
||||
// 重置输入值
|
||||
if (newVal) {
|
||||
this.inputValue = this.modelValue
|
||||
}
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
||||
},
|
||||
methods: {
|
||||
getTypeStyle(styleType) {
|
||||
const styles = {
|
||||
success: {
|
||||
bgColor: '#f0fff0',
|
||||
borderColor: '#52c41a',
|
||||
textColor: '#389e0d',
|
||||
buttonBgColor: '#52c41a',
|
||||
buttonTextColor: '#FFFFFF'
|
||||
},
|
||||
error: {
|
||||
bgColor: '#fff0f0',
|
||||
borderColor: '#ff4d4f',
|
||||
textColor: '#cf1322',
|
||||
buttonBgColor: '#ff4d4f',
|
||||
buttonTextColor: '#FFFFFF'
|
||||
},
|
||||
info: {
|
||||
bgColor: '#e6f7ff',
|
||||
borderColor: '#1890ff',
|
||||
textColor: '#0050b3',
|
||||
buttonBgColor: '#1890ff',
|
||||
buttonTextColor: '#FFFFFF'
|
||||
}
|
||||
}
|
||||
return styles[this.type][styleType]
|
||||
},
|
||||
handleButtonClick() {
|
||||
|
||||
this.$emit('buttonClick', this.inputValue)
|
||||
},
|
||||
handleMaskClick() {
|
||||
|
||||
this.$emit('maskClick')
|
||||
},
|
||||
closeClick(){
|
||||
|
||||
this.$emit('closePop')
|
||||
},
|
||||
handleCancelClick(){
|
||||
|
||||
this.$emit('cancelPop');
|
||||
},
|
||||
handleInput(e) {
|
||||
|
||||
this.inputValue = e.detail.value
|
||||
this.$emit('update:modelValue', this.inputValue)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.displayNone{
|
||||
.displayNone {
|
||||
display: none !important
|
||||
}
|
||||
.message-popup {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
z-index: 9999;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.popup-mask {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
.message-popup {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
z-index: 9999;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.popup-content {
|
||||
position: relative;
|
||||
width: 80%;
|
||||
max-width: 400px;
|
||||
border-radius: 12px;
|
||||
padding: 30rpx;
|
||||
background-color: white;
|
||||
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
|
||||
border-width: 2rpx;
|
||||
border-style: solid;
|
||||
box-sizing: border-box;
|
||||
z-index: 10;
|
||||
}
|
||||
.header{
|
||||
width:100%;
|
||||
color: rgba(255, 255, 255, 0.87);
|
||||
font-family: PingFang SC;
|
||||
font-size: 32rpx;
|
||||
font-weight: 600;
|
||||
height: 80rpx;
|
||||
line-height: 80rpx;
|
||||
letter-spacing: 0.07px;
|
||||
text-align: center;
|
||||
}
|
||||
.rightClose{
|
||||
position: absolute;
|
||||
right: 20rpx;
|
||||
top: 20rpx;
|
||||
color: #FFFFFF;
|
||||
font-size: 36rpx;
|
||||
width: 24rpx;
|
||||
height: 24rpx;
|
||||
line-height: 24rpx;
|
||||
}
|
||||
.popup-icon {
|
||||
width: 60rpx;
|
||||
height: 60rpx;
|
||||
margin: 20rpx auto;
|
||||
display: block;
|
||||
}
|
||||
.popup-mask {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
|
||||
.popup-message {
|
||||
font-size: 28rpx;
|
||||
text-align: center;
|
||||
padding: 20rpx 0rpx 30rpx 0rpx;
|
||||
.popup-content {
|
||||
position: relative;
|
||||
width: 80%;
|
||||
max-width: 400px;
|
||||
border-radius: 12px;
|
||||
padding: 30rpx;
|
||||
background-color: white;
|
||||
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
|
||||
border-width: 2rpx;
|
||||
border-style: solid;
|
||||
box-sizing: border-box;
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
.header {
|
||||
width: 100%;
|
||||
color: rgba(255, 255, 255, 0.87);
|
||||
font-family: PingFang SC;
|
||||
font-size: 32rpx;
|
||||
font-weight: 600;
|
||||
height: 80rpx;
|
||||
line-height: 80rpx;
|
||||
letter-spacing: 0.07px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.rightClose {
|
||||
position: absolute;
|
||||
right: 20rpx;
|
||||
top: 20rpx;
|
||||
color: #FFFFFF;
|
||||
font-size: 36rpx;
|
||||
width: 24rpx;
|
||||
height: 24rpx;
|
||||
line-height: 24rpx;
|
||||
}
|
||||
|
||||
.popup-icon {
|
||||
width: 60rpx;
|
||||
height: 60rpx;
|
||||
margin: 20rpx auto;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.popup-message {
|
||||
font-size: 28rpx;
|
||||
text-align: center;
|
||||
padding: 20rpx 0rpx 30rpx 0rpx;
|
||||
font-weight: 400;
|
||||
letter-spacing: 0.07px;
|
||||
white-space: pre-wrap;
|
||||
word-wrap: break-word;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
.popup-prompt {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.popup-prompt-title {
|
||||
display: block;
|
||||
font-size: 32rpx;
|
||||
text-align: center;
|
||||
margin-bottom: 20rpx;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.popup-prompt-input {
|
||||
width: 100%;
|
||||
height: 80rpx;
|
||||
line-height: 80rpx;
|
||||
border: 1rpx solid #ddd;
|
||||
border-radius: 8rpx;
|
||||
padding: 0 20rpx;
|
||||
margin-bottom: 30rpx;
|
||||
font-size: 28rpx;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.popBtnContent {
|
||||
width: 100%;
|
||||
height: 60rpx;
|
||||
margin-top: 20rpx;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
flex-wrap: nowrap;
|
||||
align-content: center;
|
||||
justify-content: space-evenly;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.popup-button {
|
||||
width: 30%;
|
||||
height: 60rpx;
|
||||
line-height: 60rpx;
|
||||
border-radius: 44rpx;
|
||||
|
||||
text-align: center;
|
||||
font-size: 24rpx;
|
||||
font-weight: 500;
|
||||
letter-spacing: 4rpx;
|
||||
border: none;
|
||||
outline: none;
|
||||
cursor: pointer;
|
||||
|
||||
}
|
||||
|
||||
.popup-button-cancel {
|
||||
width: 30%;
|
||||
height: 60rpx;
|
||||
line-height: 60rpx;
|
||||
border-radius: 44rpx;
|
||||
|
||||
text-align: center;
|
||||
font-size: 24rpx;
|
||||
font-weight: 500;
|
||||
letter-spacing: 4rpx;
|
||||
border: none;
|
||||
outline: none;
|
||||
cursor: pointer;
|
||||
|
||||
box-sizing: border-box;
|
||||
border: 1px solid rgba(255, 255, 255, 0.5);
|
||||
|
||||
background-color: #00000000;
|
||||
|
||||
color: #FFFFFFde;
|
||||
}
|
||||
|
||||
.popup-prompt {
|
||||
width: 100%;
|
||||
height: 60rpx;
|
||||
line-height: 60rpx;
|
||||
padding-top: 40rpx;
|
||||
}
|
||||
|
||||
|
||||
font-weight: 400;
|
||||
|
||||
letter-spacing: 0.07px;
|
||||
}
|
||||
|
||||
.popup-prompt {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.popup-prompt-title {
|
||||
display: block;
|
||||
font-size: 32rpx;
|
||||
text-align: center;
|
||||
margin-bottom: 20rpx;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.popup-prompt-input {
|
||||
width: 100%;
|
||||
height: 80rpx;
|
||||
line-height: 80rpx;
|
||||
border: 1rpx solid #ddd;
|
||||
border-radius: 8rpx;
|
||||
padding: 0 20rpx;
|
||||
margin-bottom: 30rpx;
|
||||
font-size: 28rpx;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.popBtnContent{
|
||||
width:100%;
|
||||
height: 60rpx;
|
||||
margin-top: 20rpx;
|
||||
display: flex
|
||||
;
|
||||
flex-direction: row;
|
||||
flex-wrap: nowrap;
|
||||
align-content: center;
|
||||
justify-content: space-evenly;
|
||||
align-items: center;
|
||||
}
|
||||
.popup-button {
|
||||
width: 30%;
|
||||
height: 60rpx;
|
||||
line-height: 60rpx;
|
||||
border-radius: 44rpx;
|
||||
|
||||
text-align: center;
|
||||
font-size: 24rpx;
|
||||
font-weight: 500;
|
||||
letter-spacing: 4rpx;
|
||||
border: none;
|
||||
outline: none;
|
||||
cursor: pointer;
|
||||
|
||||
}
|
||||
|
||||
.popup-button-cancel{
|
||||
width: 30%;
|
||||
height: 60rpx;
|
||||
line-height: 60rpx;
|
||||
border-radius: 44rpx;
|
||||
|
||||
text-align: center;
|
||||
font-size: 24rpx;
|
||||
font-weight: 500;
|
||||
letter-spacing: 4rpx;
|
||||
border: none;
|
||||
outline: none;
|
||||
cursor: pointer;
|
||||
|
||||
box-sizing: border-box;
|
||||
border: 1px solid rgba(255, 255, 255, 0.5);
|
||||
|
||||
background-color: #00000000;
|
||||
|
||||
color: #FFFFFFde;
|
||||
}
|
||||
|
||||
.popup-prompt{
|
||||
width: 100%;
|
||||
height: 60rpx;
|
||||
line-height: 60rpx;
|
||||
padding-top: 40rpx;
|
||||
}
|
||||
|
||||
|
||||
.popup-prompt-title{
|
||||
color: rgba(255, 255, 255, 0.6);
|
||||
text-align: right;
|
||||
width: 30%;
|
||||
float: left;
|
||||
box-sizing: border-box;
|
||||
white-space:nowrap;
|
||||
padding-right: 10rpx;
|
||||
}
|
||||
.popup-prompt-input{
|
||||
float: left;
|
||||
width: 70%;
|
||||
height: 60rpx;
|
||||
line-height: 60rpx;
|
||||
color: rgba(255, 255, 255, 0.87) ;
|
||||
|
||||
box-sizing: border-box;
|
||||
border: 2rpx solid rgba(255, 255, 255, 0.4);
|
||||
border-radius: 8rpx;
|
||||
|
||||
}
|
||||
|
||||
.popup-prompt-title {
|
||||
color: rgba(255, 255, 255, 0.6);
|
||||
text-align: right;
|
||||
width: 30%;
|
||||
float: left;
|
||||
box-sizing: border-box;
|
||||
white-space: nowrap;
|
||||
padding-right: 10rpx;
|
||||
}
|
||||
|
||||
.popup-prompt-input {
|
||||
float: left;
|
||||
width: 70%;
|
||||
height: 60rpx;
|
||||
line-height: 60rpx;
|
||||
color: rgba(255, 255, 255, 0.87);
|
||||
|
||||
box-sizing: border-box;
|
||||
border: 2rpx solid rgba(255, 255, 255, 0.4);
|
||||
border-radius: 8rpx;
|
||||
|
||||
}
|
||||
</style>
|
||||
@ -6,50 +6,59 @@
|
||||
:buttonTextColor="item.buttonTextColor" :iconUrl="item.iconUrl" :message="item.message"
|
||||
:buttonText="item.buttonText" @buttonClick="okCallback(item,index)" :visiblePrompt="item.visiblePrompt"
|
||||
:promptTitle="item.promptTitle" v-model="item.modelValue" @closePop="closePop(item)"
|
||||
:buttonCancelText="item.buttonCancelText" :showCancel="item.showCancel" @cancelPop="cancelClick(item,index)" />
|
||||
:buttonCancelText="item.buttonCancelText" :showCancel="item.showCancel"
|
||||
:showHeader="item.showHeader" :headerTxt="item.headerTxt"
|
||||
|
||||
@cancelPop="cancelClick(item,index)" />
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Common from '@/utils/Common.js'
|
||||
export default {
|
||||
name: 'MsgBox',
|
||||
name: 'MsgBox',
|
||||
data() {
|
||||
return {
|
||||
Msgboxs:[]
|
||||
Msgboxs: []
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
//确认按钮事件，如果回调函数返回true,将阻止关闭弹窗
|
||||
okCallback(item,index){
|
||||
let flag=false;
|
||||
if(item.okCallback){
|
||||
flag=item.okCallback(item,index)
|
||||
okCallback(item, index) {
|
||||
let flag = false;
|
||||
if (item.okCallback) {
|
||||
flag = item.okCallback(item, index)
|
||||
}
|
||||
|
||||
if(flag){
|
||||
if (flag) {
|
||||
return;
|
||||
}
|
||||
this.closePop(item);
|
||||
},
|
||||
//取消按钮,如果回调函数返回true，将阻止关闭弹窗
|
||||
cancelClick(item,index){
|
||||
let flag=false;
|
||||
if(item.cancelCallback){
|
||||
flag=item.cancelCallback(item,index)
|
||||
cancelClick(item, index) {
|
||||
let flag = false;
|
||||
if (item.cancelCallback) {
|
||||
flag = item.cancelCallback(item, index)
|
||||
}
|
||||
|
||||
if(flag){
|
||||
if (flag) {
|
||||
return;
|
||||
}
|
||||
this.closePop(item);
|
||||
},
|
||||
closePop: function(item) {
|
||||
|
||||
debugger;
|
||||
if (item) {
|
||||
this.Msgboxs.find((v, i) => {
|
||||
if (item.key === v.key) {
|
||||
this.Msgboxs.splice(i, 1);
|
||||
debugger;
|
||||
if (item.key && v.key) {
|
||||
if (item.key === v.key) {
|
||||
this.Msgboxs.splice(i, 1);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
if (item.cancelCallback) {
|
||||
@ -64,7 +73,7 @@
|
||||
|
||||
},
|
||||
//根据传入的配置，自定义一个弹窗
|
||||
showPop: function(option,isClear) {
|
||||
showPop: function(option, isClear) {
|
||||
let def = {
|
||||
key: '',
|
||||
showPop: true, //是否显示弹窗
|
||||
@ -86,7 +95,12 @@
|
||||
showSlot: false,
|
||||
buttonCancelText: '',
|
||||
showCancel: false,
|
||||
cancelCallback: null
|
||||
cancelCallback: null,
|
||||
visible:false,
|
||||
promptPlaceholder:'',
|
||||
type:'custom',
|
||||
showHeader:false,
|
||||
headerTxt:''
|
||||
}
|
||||
let json = {};
|
||||
let keys = Object.keys(def);
|
||||
@ -96,13 +110,9 @@
|
||||
|
||||
json[key] = def[key];
|
||||
}
|
||||
if (option) {
|
||||
keys = Object.keys(option);
|
||||
for (let i = 0; i < keys.length; i++) {
|
||||
let key = keys[i];
|
||||
|
||||
json[key] = option[key];
|
||||
}
|
||||
if (option) {
|
||||
Object.assign(json, option);
|
||||
}
|
||||
|
||||
if (!json.borderColor) {
|
||||
@ -110,8 +120,10 @@
|
||||
json.buttonBgColor = '#BBE600';
|
||||
}
|
||||
json.showPop = true;
|
||||
if (!('key' in json)) {
|
||||
json.key = new Date().getTime();
|
||||
|
||||
|
||||
if(!json.key){
|
||||
json.key =Common.guid();
|
||||
}
|
||||
|
||||
this.Msgboxs.push(json);
|
||||
@ -119,7 +131,7 @@
|
||||
return json;
|
||||
},
|
||||
//弹出预定好的三种弹窗
|
||||
showMsg(msg,btnTxt, type,okCallback) {
|
||||
showMsg(msg, btnTxt, type, okCallback) {
|
||||
|
||||
let cfg = {
|
||||
error: {
|
||||
@ -147,25 +159,25 @@
|
||||
}
|
||||
|
||||
|
||||
let guid = new Date().getTime()+"";
|
||||
let guid =Common.guid();
|
||||
let options = {
|
||||
key: guid,
|
||||
message: msg,
|
||||
iconUrl: cfg[type].icoUrl,
|
||||
borderColor: cfg[type].borderColor,
|
||||
buttonBgColor: cfg[type].buttonBgColor,
|
||||
buttonText: btnTxt?btnTxt:'确定',
|
||||
okCallback: okCallback?okCallback:this.closePop
|
||||
buttonText: btnTxt ? btnTxt : '确定',
|
||||
okCallback: okCallback ? okCallback : this.closePop
|
||||
};
|
||||
return this.showPop(options);
|
||||
|
||||
},
|
||||
//清除所有弹窗
|
||||
clearPops(){
|
||||
this.Msgboxs=[];
|
||||
clearPops() {
|
||||
this.Msgboxs = [];
|
||||
},
|
||||
//获取当前所有弹窗的数量
|
||||
getPops(){
|
||||
getPops() {
|
||||
return this.Msgboxs.length;
|
||||
}
|
||||
}
|
||||
@ -173,15 +185,15 @@
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.msgBox{
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
z-index: 9999;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
.msgBox {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
z-index: 99999;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
</style>
|
||||
291
components/TextToHex/TextToHexV2.vue
Normal file
291
components/TextToHex/TextToHexV2.vue
Normal file
@ -0,0 +1,291 @@
|
||||
<template>
|
||||
<view>
|
||||
<canvas type="2d" canvas-id="reusableCanvas" :width="currentCanvasWidth" :height="currentCanvasHeight"
|
||||
class="offscreen-canvas"></canvas>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "TextToHexV2",
|
||||
props: {
|
||||
txts: {
|
||||
type: Array,
|
||||
default: () => [],
|
||||
validator: (value) => value.every(item => typeof item === 'string')
|
||||
},
|
||||
fontSize: {
|
||||
type: Number,
|
||||
default: 12,
|
||||
validator: (value) => value > 0 && value <= 100
|
||||
},
|
||||
bgColor: {
|
||||
type: String,
|
||||
default: "#ffffff"
|
||||
},
|
||||
color: {
|
||||
type: String,
|
||||
default: "#000000"
|
||||
},
|
||||
currentCanvasWidth: {
|
||||
type: Number,
|
||||
default: 80
|
||||
},
|
||||
currentCanvasHeight: {
|
||||
type: Number,
|
||||
default: 12
|
||||
},
|
||||
returnType: { //返回值的进制，默认16进制
|
||||
type: Number,
|
||||
default: 16
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
||||
// Canvas上下文（复用）
|
||||
ctx: null,
|
||||
// 标记是否已经预热过画布
|
||||
canvasWarmed: false
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
validTxts() {
|
||||
return this.txts.filter(line => line.trim() !== '');
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
// 初始化Canvas上下文（只创建一次）
|
||||
this.ctx = uni.createCanvasContext('reusableCanvas', this);
|
||||
},
|
||||
methods: {
|
||||
/**
|
||||
* 估算单行文本所需的Canvas宽度
|
||||
*/
|
||||
calcLineWidth(textLine) {
|
||||
return textLine.length * 16;
|
||||
},
|
||||
|
||||
/**
|
||||
* 清除Canvas内容
|
||||
*/
|
||||
clearCanvas() {
|
||||
this.ctx.setFillStyle(this.bgColor);
|
||||
this.ctx.fillRect(0, 0, this.currentCanvasWidth, this.currentCanvasHeight);
|
||||
},
|
||||
|
||||
/**
|
||||
* 预热画布，确保画布和字体完全准备好（解决APP重新打开后第一次获取数据不完整的问题）
|
||||
*/
|
||||
async warmupCanvas() {
|
||||
if (this.canvasWarmed) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
// 清空画布
|
||||
this.clearCanvas();
|
||||
|
||||
// 绘制一个测试字符来预热字体和画布
|
||||
this.ctx.setFillStyle(this.color);
|
||||
this.ctx.setFontSize(this.fontSize);
|
||||
this.ctx.font = `${this.fontSize}px "PingFangBold","PingFang SC", Arial, sans-serif`;
|
||||
this.ctx.setTextBaseline('middle');
|
||||
this.ctx.fillText('测', 0, 8);
|
||||
|
||||
// 等待画布绘制完成
|
||||
await new Promise((resolve) => {
|
||||
this.ctx.draw(false, () => {
|
||||
// 获取一次测试数据，确保canvasGetImageData API已准备好
|
||||
setTimeout(() => {
|
||||
uni.canvasGetImageData({
|
||||
canvasId: 'reusableCanvas',
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
success: () => {
|
||||
this.canvasWarmed = true;
|
||||
resolve();
|
||||
},
|
||||
fail: () => {
|
||||
this.canvasWarmed = true;
|
||||
resolve();
|
||||
}
|
||||
});
|
||||
}, 100);
|
||||
});
|
||||
});
|
||||
|
||||
// 额外等待确保字体完全加载
|
||||
await new Promise(resolve => setTimeout(resolve, 200));
|
||||
} catch (ex) {
|
||||
console.log("画布预热异常:", ex);
|
||||
this.canvasWarmed = true; // 即使失败也标记为已预热，避免重复尝试
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 复用单个Canvas处理所有文本行
|
||||
*/
|
||||
async drawAndGetPixels() {
|
||||
// 第一次调用时先预热画布（解决APP重新打开后第一次获取数据不完整的问题）
|
||||
await this.warmupCanvas();
|
||||
|
||||
let convertCharToMatrix = (imageData) => {
|
||||
|
||||
try {
|
||||
// console.log("imgData=",imageData.length)
|
||||
let matrix = [];
|
||||
let k = 0;
|
||||
let tmpArr = [];
|
||||
while (k < imageData.length) {
|
||||
|
||||
let r = imageData[k];
|
||||
let g = imageData[k + 1];
|
||||
let b = imageData[k + 2];
|
||||
let a = imageData[k + 3];
|
||||
|
||||
|
||||
// if (r === 255 && a >= 0) {
|
||||
// r = 255;
|
||||
// } else {
|
||||
// r = 0;
|
||||
// }
|
||||
|
||||
|
||||
// if (r === 255) {
|
||||
// tmpArr.push(1);
|
||||
// } else {
|
||||
// tmpArr.push(0);
|
||||
// }
|
||||
|
||||
|
||||
// 黑色像素（R值较低）视为1，白色视为0
|
||||
let isBlack = r < 128;
|
||||
|
||||
let byte1 = 0;
|
||||
|
||||
if (isBlack) {
|
||||
byte1 = 1; // 从左到右设置位
|
||||
}
|
||||
|
||||
tmpArr.push(byte1);
|
||||
|
||||
if (tmpArr.length == 8) {
|
||||
tmpArr = parseInt(tmpArr.join(''), 2);
|
||||
|
||||
if (this.returnType == 16) {
|
||||
matrix.push('0x' + tmpArr.toString(16).padStart(2, '0').toUpperCase());
|
||||
|
||||
} else if (this.returnType == 10) {
|
||||
matrix.push(tmpArr);
|
||||
|
||||
}
|
||||
if (this.returnType == 2) {
|
||||
matrix.push(tmpArr.toString(2).padStart(8, '0'));
|
||||
}
|
||||
|
||||
tmpArr = [];
|
||||
}
|
||||
|
||||
k += 4;
|
||||
}
|
||||
|
||||
// console.log("matrix=",matrix);
|
||||
|
||||
return matrix;
|
||||
} catch (ex) {
|
||||
console.error("ex=", ex);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
let drawTxt = async (textLine) => {
|
||||
let result = {};
|
||||
let ctx = this.ctx;
|
||||
|
||||
|
||||
|
||||
|
||||
// 2. 清空Canvas（绘制背景）
|
||||
this.clearCanvas();
|
||||
|
||||
// 3. 设置文字样式
|
||||
ctx.setFillStyle(this.color);
|
||||
ctx.setTextBaseline('middle');
|
||||
// ctx.setTextAlign('center')
|
||||
ctx.setFontSize(this.fontSize);
|
||||
ctx.font = `${this.fontSize}px "PingFangBold", "PingFang SC", Arial, sans-serif`;
|
||||
|
||||
// 4. 绘制当前行文本
|
||||
let currentX = 0;
|
||||
let currentY = this.fontSize / 2;
|
||||
console.log("textLine=", textLine)
|
||||
ctx.fillText(textLine, currentX, currentY);
|
||||
// for (let j = 0; j < textLine.length; j++) {
|
||||
// let char = textLine[j];
|
||||
// ctx.fillText(char, currentX, currentY);
|
||||
// // 按实际字符宽度计算间距
|
||||
// let charWidth = ctx.measureText(char).width;
|
||||
// currentX += charWidth;
|
||||
// }
|
||||
|
||||
// 5. 异步绘制并获取像素数据（串行处理避免冲突）
|
||||
await new Promise((resolve, reject) => {
|
||||
ctx.draw(false, () => {
|
||||
uni.canvasGetImageData({
|
||||
canvasId: 'reusableCanvas',
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: this.currentCanvasWidth,
|
||||
height: this.currentCanvasHeight,
|
||||
success: res => {
|
||||
|
||||
result = {
|
||||
line: textLine,
|
||||
pixelData: res.data,
|
||||
width: this.currentCanvasWidth,
|
||||
height: this.currentCanvasHeight
|
||||
};
|
||||
resolve();
|
||||
},
|
||||
fail: err => {
|
||||
console.error(`处理第${i+1}行失败:`, err);
|
||||
reject(err)
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
return result;
|
||||
}
|
||||
let arr = [];
|
||||
// 循环处理每行文本
|
||||
for (let i = 0; i < this.validTxts.length; i++) {
|
||||
|
||||
let linePixls = [];
|
||||
let item = this.validTxts[i];
|
||||
|
||||
console.log("item=", item);
|
||||
let result = await drawTxt(item);
|
||||
linePixls.push(convertCharToMatrix(result.pixelData));
|
||||
|
||||
|
||||
arr.push(linePixls);
|
||||
}
|
||||
|
||||
return arr;
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.offscreen-canvas {
|
||||
position: fixed;
|
||||
left: -9999px;
|
||||
top: -9999px;
|
||||
visibility: hidden;
|
||||
}
|
||||
</style>
|
||||
@ -2,7 +2,7 @@
|
||||
const config = {
|
||||
// 开发环境
|
||||
development: {
|
||||
BASE_URL: 'http://192.168.110.172:8000',//http://139.224.253.23:8000
|
||||
BASE_URL: 'http://192.168.110.57:8000',//http://139.224.253.23:8000
|
||||
API_PREFIX: '',
|
||||
// MQTT 配置
|
||||
MQTT_HOST: '47.120.79.150',
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
"name" : "星汉物联",
|
||||
"appid" : "__UNI__A21EF43",
|
||||
"description" : "设备管控",
|
||||
"versionName" : "1.0.18",
|
||||
"versionCode" : "100",
|
||||
"versionName" : "1.0.19",
|
||||
"versionCode" : 101,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus" : {
|
||||
@ -44,7 +44,6 @@
|
||||
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
|
||||
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
|
||||
@ -100,8 +99,23 @@
|
||||
},
|
||||
"push" : {
|
||||
"unipush" : {
|
||||
"offline" : true,
|
||||
"hms" : {},
|
||||
"oppo" : {},
|
||||
"vivo" : {},
|
||||
"mi" : {},
|
||||
"honor" : {},
|
||||
"version" : "2",
|
||||
"offline" : true
|
||||
"icons" : {
|
||||
"small" : {
|
||||
"ldpi" : "unpackage/res/icons/18x18.png",
|
||||
"mdpi" : "unpackage/res/icons/24x24.png",
|
||||
"hdpi" : "unpackage/res/icons/36x36.png",
|
||||
"xhdpi" : "unpackage/res/icons/48x48.png",
|
||||
"xxhdpi" : "unpackage/res/icons/72x72.png"
|
||||
}
|
||||
},
|
||||
"meizu" : {}
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -170,7 +184,8 @@
|
||||
"fallbackLocale" : "zh-Hans",
|
||||
"app-harmony" : {
|
||||
"distribute" : {
|
||||
"modules" : {}
|
||||
"modules" : {},
|
||||
"bundleName" : "uni.app.UNIA21EF43.Hommey"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
32
pages.json
32
pages.json
@ -52,8 +52,7 @@
|
||||
{
|
||||
"path": "pages/common/send/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "发送信息",
|
||||
"enablePullDownRefresh": true
|
||||
"navigationBarTitleText": "发送信息"
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -102,10 +101,9 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/6170/callPolice/index",
|
||||
"path": "pages/common/callPolice/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "报警",
|
||||
"enablePullDownRefresh": true
|
||||
"navigationBarTitleText": "报警"
|
||||
}
|
||||
},
|
||||
|
||||
@ -160,14 +158,7 @@
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/6155/ImgCrop",
|
||||
"style": {
|
||||
"navigationBarTitleText": "图像裁剪",
|
||||
"navigationStyle": "custom",
|
||||
"fullscreen": true
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
"path": "pages/6075/BJQ6075",
|
||||
"style": {
|
||||
@ -440,6 +431,21 @@
|
||||
"style": {
|
||||
"navigationBarTitleText": "蓝牙添加设备"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/6075J/BJQ6075J",
|
||||
"style" :
|
||||
{
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/common/ImgCrop/ImgCrop",
|
||||
"style": {
|
||||
"navigationBarTitleText": "图像裁剪",
|
||||
"navigationStyle": "custom",
|
||||
"fullscreen": true
|
||||
}
|
||||
}
|
||||
|
||||
],
|
||||
|
||||
@ -247,16 +247,16 @@
|
||||
</view>
|
||||
|
||||
<!-- 弹窗通知 -->
|
||||
<MessagePopup :visible="Status.Pop.showPop" :type="Status.Pop.popType" :bgColor="Status.Pop.bgColor"
|
||||
:borderColor="Status.Pop.borderColor" :textColor="Status.Pop.textColor"
|
||||
:buttonBgColor="Status.Pop.buttonBgColor" :buttonTextColor="Status.Pop.buttonTextColor"
|
||||
:iconUrl="Status.Pop.iconUrl" :message="Status.Pop.message" :buttonText="Status.Pop.buttonText"
|
||||
@buttonClick="HidePop" :visiblePrompt="Status.Pop.visiblePrompt" :promptTitle="Status.Pop.promptTitle"
|
||||
v-model="Status.Pop.modelValue" @closePop="closePop" :buttonCancelText="Status.Pop.buttonCancelText"
|
||||
:showCancel="Status.Pop.showCancel" @cancelPop="closePop" />
|
||||
<MessagePopup :visible="Status.Pop.showPop" :type="Status.Pop.popType" :bgColor="Status.Pop.bgColor"
|
||||
:borderColor="Status.Pop.borderColor" :textColor="Status.Pop.textColor"
|
||||
:buttonBgColor="Status.Pop.buttonBgColor" :buttonTextColor="Status.Pop.buttonTextColor"
|
||||
:iconUrl="Status.Pop.iconUrl" :message="Status.Pop.message" :buttonText="Status.Pop.buttonText"
|
||||
@buttonClick="HidePop" :visiblePrompt="Status.Pop.visiblePrompt" :promptTitle="Status.Pop.promptTitle"
|
||||
v-model="Status.Pop.modelValue" @closePop="closePop" :buttonCancelText="Status.Pop.buttonCancelText"
|
||||
:showCancel="Status.Pop.showCancel" @cancelPop="closePop" />
|
||||
|
||||
<!-- 下方菜单 -->
|
||||
<!-- <BottomSlideMenuPlus :config="Status.BottomMenu" @close="closeMenu" @itemClick="handleItemClick"
|
||||
<!-- 下方菜单 -->
|
||||
<!-- <BottomSlideMenuPlus :config="Status.BottomMenu" @close="closeMenu" @itemClick="handleItemClick"
|
||||
@btnClick="btnClick">
|
||||
<view>
|
||||
<view class="addIco">
|
||||
@ -267,7 +267,7 @@
|
||||
</view>
|
||||
</BottomSlideMenuPlus> -->
|
||||
|
||||
<global-loading ref="loading" />
|
||||
<global-loading ref="loading" />
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -336,7 +336,7 @@
|
||||
showHeader: true,
|
||||
menuItems: [{
|
||||
text: '强光',
|
||||
icon: '/static/images/6155/DeviceDetail/qiang.png'
|
||||
icon: '/static/images/lightImg/qiang.png'
|
||||
}],
|
||||
activeIndex: -1,
|
||||
bgColor: '#2a2a2a',
|
||||
@ -518,6 +518,11 @@
|
||||
recei = BleReceive.getBleReceive();
|
||||
ble = BleTool.getBleTool();
|
||||
|
||||
this.$watch("formData.sta_battery", (newVal, oldVal) => {
|
||||
if (newVal <= 20 && this.formData.sta_system==2) {
|
||||
this.showMsg("设备电量低");
|
||||
}
|
||||
});
|
||||
|
||||
ble.addReceiveCallback(this.bleValueNotify, pagePath);
|
||||
ble.addStateBreakCallback(this.bleStateBreak, pagePath);
|
||||
@ -572,10 +577,10 @@
|
||||
|
||||
these.formData.bleStatu = false;
|
||||
these.formData.deviceId = f.deviceId;
|
||||
these.formData.bleStatu = 'connecting';
|
||||
these.formData.bleStatu = 'connecting';
|
||||
ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
|
||||
these.formData.bleStatu = true;
|
||||
}).catch(ex=>{
|
||||
}).catch(ex => {
|
||||
these.formData.bleStatu = 'err';
|
||||
});
|
||||
these.setBleFormData();
|
||||
@ -592,17 +597,17 @@
|
||||
this.Status.pageHide = false;
|
||||
},
|
||||
computed: {
|
||||
getbleStatu(){
|
||||
if(this.formData.bleStatu===true){
|
||||
getbleStatu() {
|
||||
if (this.formData.bleStatu === true) {
|
||||
return '已连接';
|
||||
}
|
||||
if(this.formData.bleStatu==='connecting'){
|
||||
if (this.formData.bleStatu === 'connecting') {
|
||||
return '连接中';
|
||||
}
|
||||
if(this.formData.bleStatu==='dicconnect'){
|
||||
if (this.formData.bleStatu === 'dicconnect') {
|
||||
return '正在断开';
|
||||
}
|
||||
if(this.formData.bleStatu==='err'){
|
||||
if (this.formData.bleStatu === 'err') {
|
||||
return '连接异常';
|
||||
}
|
||||
return '未连接';
|
||||
@ -1196,9 +1201,9 @@
|
||||
return;
|
||||
}
|
||||
if (res.deviceId == these.formData.deviceId) {
|
||||
if(res.device){
|
||||
if (res.device) {
|
||||
these.formData.bleStatu = 'connecting';
|
||||
}else{
|
||||
} else {
|
||||
this.formData.bleStatu = false;
|
||||
}
|
||||
setTimeout(() => {
|
||||
@ -1233,14 +1238,14 @@
|
||||
showLoading(this, {
|
||||
text: "蓝牙恢复可用,正在连接设备"
|
||||
});
|
||||
these.formData.bleStatu='connecting';
|
||||
these.formData.bleStatu = 'connecting';
|
||||
ble.LinkBlue(these.formData.deviceId).then(() => {
|
||||
these.formData.bleStatu = true;
|
||||
updateLoading(these, {
|
||||
text: '连接成功'
|
||||
});
|
||||
}).catch(ex => {
|
||||
these.formData.bleStatu='err';
|
||||
these.formData.bleStatu = 'err';
|
||||
updateLoading(these, {
|
||||
text: ex.msg
|
||||
})
|
||||
@ -1313,9 +1318,10 @@
|
||||
}
|
||||
});
|
||||
|
||||
if (this.formData.sta_battery <= 20) {
|
||||
this.showMsg("设备电量低");
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
},
|
||||
getDevice: function() {
|
||||
|
||||
@ -1328,25 +1334,25 @@
|
||||
return f;
|
||||
},
|
||||
|
||||
bleStatuToggle(){
|
||||
let f=this.getDevice();
|
||||
if(!f){
|
||||
bleStatuToggle() {
|
||||
let f = this.getDevice();
|
||||
if (!f) {
|
||||
this.showBleUnConnect();
|
||||
return;
|
||||
}
|
||||
if(this.formData.bleStatu===true){
|
||||
this.formData.bleStatu='dicconnect';
|
||||
ble.disconnectDevice(f.deviceId).finally(r=>{
|
||||
this.formData.bleStatu=false;
|
||||
if (this.formData.bleStatu === true) {
|
||||
this.formData.bleStatu = 'dicconnect';
|
||||
ble.disconnectDevice(f.deviceId).finally(r => {
|
||||
this.formData.bleStatu = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if(this.formData.bleStatu===false || this.formData.bleStatu==='err'){
|
||||
this.formData.bleStatu='connecting';
|
||||
if (this.formData.bleStatu === false || this.formData.bleStatu === 'err') {
|
||||
this.formData.bleStatu = 'connecting';
|
||||
ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
|
||||
these.formData.bleStatu = true;
|
||||
}).catch(ex=>{
|
||||
}).catch(ex => {
|
||||
these.formData.bleStatu = 'err';
|
||||
});
|
||||
return;
|
||||
|
||||
@ -273,7 +273,7 @@
|
||||
showHeader: true,
|
||||
menuItems: [{
|
||||
text: '强光',
|
||||
icon: '/static/images/6155/DeviceDetail/qiang.png'
|
||||
icon: '/static/images/lightImg/qiang.png'
|
||||
}],
|
||||
activeIndex: -1,
|
||||
bgColor: '#2a2a2a',
|
||||
|
||||
@ -355,15 +355,15 @@
|
||||
showHeader: true,
|
||||
menuItems: [{
|
||||
text: '强光',
|
||||
icon: '/static/images/6155/DeviceDetail/qiang.png'
|
||||
icon: '/static/images/lightImg/qiang.png'
|
||||
},
|
||||
{
|
||||
text: '弱光',
|
||||
icon: '/static/images/6155/DeviceDetail/ruo.png'
|
||||
icon: '/static/images/lightImg/ruo.png'
|
||||
},
|
||||
{
|
||||
text: '爆闪',
|
||||
icon: '/static/images/6155/DeviceDetail/shan.png'
|
||||
icon: '/static/images/lightImg/shan.png'
|
||||
}
|
||||
],
|
||||
activeIndex: -1,
|
||||
|
||||
@ -279,15 +279,15 @@ import request, { baseURL } from '@/utils/request.js';
|
||||
showHeader: true,
|
||||
menuItems: [{
|
||||
text: '强光',
|
||||
icon: '/static/images/6155/DeviceDetail/qiang.png'
|
||||
icon: '/static/images/lightImg/qiang.png'
|
||||
},
|
||||
{
|
||||
text: '弱光',
|
||||
icon: '/static/images/6155/DeviceDetail/ruo.png'
|
||||
icon: '/static/images/lightImg/ruo.png'
|
||||
},
|
||||
{
|
||||
text: '爆闪',
|
||||
icon: '/static/images/6155/DeviceDetail/shan.png'
|
||||
icon: '/static/images/lightImg/shan.png'
|
||||
}
|
||||
],
|
||||
activeIndex: -1,
|
||||
|
||||
@ -679,7 +679,7 @@
|
||||
}
|
||||
let that = this;
|
||||
uni.navigateTo({
|
||||
url: "/pages/6155/ImgCrop",
|
||||
url: "/pages/ImgCrop/ImgCrop",
|
||||
events: {
|
||||
ImgCutOverPath: function(data) {
|
||||
that.selectedImage = data.picPath;
|
||||
|
||||
2908
pages/6075J/BJQ6075J.vue
Normal file
2908
pages/6075J/BJQ6075J.vue
Normal file
File diff suppressed because it is too large
Load Diff
@ -312,20 +312,20 @@
|
||||
dic: {
|
||||
menuItems: [{
|
||||
text: '强光',
|
||||
icon: '/static/images/6155/DeviceDetail/qiang.png',
|
||||
icon: '/static/images/lightImg/qiang.png',
|
||||
math: 100,
|
||||
type: 'main'
|
||||
},
|
||||
|
||||
{
|
||||
text: '弱光',
|
||||
icon: '/static/images/6155/DeviceDetail/ruo.png',
|
||||
icon: '/static/images/lightImg/ruo.png',
|
||||
math: 50,
|
||||
type: 'main'
|
||||
},
|
||||
{
|
||||
text: '爆闪',
|
||||
icon: '/static/images/6155/DeviceDetail/shan.png',
|
||||
icon: '/static/images/lightImg/shan.png',
|
||||
math: 30,
|
||||
type: 'main'
|
||||
},
|
||||
@ -337,13 +337,13 @@
|
||||
},
|
||||
{
|
||||
text: '泛光',
|
||||
icon: '/static/images/6155/DeviceDetail/fan.png',
|
||||
icon: '/static/images/lightImg/fan.png',
|
||||
math: 100,
|
||||
type: 'fu'
|
||||
},
|
||||
{
|
||||
text: '强+泛光',
|
||||
icon: '/static/images/6155/DeviceDetail/fan.png',
|
||||
icon: '/static/images/lightImg/fan.png',
|
||||
math: 70,
|
||||
type: 'fu'
|
||||
}
|
||||
@ -786,8 +786,11 @@
|
||||
iconUrl: "/static/images/common/success.png",
|
||||
});
|
||||
|
||||
ble.sendString(f.deviceId, "transmit complete", f.writeServiceId, f
|
||||
setTimeout(()=>{
|
||||
ble.sendString(f.deviceId, "transmit complete", f.writeServiceId, f
|
||||
.wirteCharactId);
|
||||
},1000);
|
||||
|
||||
these.rgb565Data = null;
|
||||
resolve();
|
||||
return;
|
||||
@ -906,7 +909,7 @@
|
||||
sourceType: ['album'],
|
||||
success: function(res) {
|
||||
uni.navigateTo({
|
||||
url: "/pages/6155/ImgCrop",
|
||||
url: "/pages/ImgCrop/ImgCrop",
|
||||
events: {
|
||||
ImgCutOver: function(data) {
|
||||
|
||||
@ -915,7 +918,7 @@
|
||||
});
|
||||
console.log("data=", data);
|
||||
these.Status.BottomMenu.show = false;
|
||||
these.rgb565Data = ble.convertToRGB565(data.piexls);
|
||||
these.rgb565Data = Common.convertToRGB565(data.piexls);
|
||||
|
||||
setTimeout(function() {
|
||||
sendImagePackets().catch(() => {
|
||||
|
||||
@ -1,100 +0,0 @@
|
||||
<template>
|
||||
<view>
|
||||
<canvas id="splashCanvas" canvas-id="splashCanvas" :style="{'width':width+'px','height':height+'px'}" style=" z-index: 9999;position: fixed; visibility: hidden;"></canvas>
|
||||
|
||||
|
||||
<qf-image-cropper :src="src" :showAngle="false" :width="cropWidth" :height="cropHeight" fileType="jpg"
|
||||
@crop="handleCrop" :areaScale="0.1" :minScale="0.1" :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,
|
||||
width:160,
|
||||
height:80,
|
||||
times:10
|
||||
}
|
||||
},
|
||||
computed:{
|
||||
cropWidth(){
|
||||
return this.width*this.times;
|
||||
}
|
||||
,
|
||||
cropHeight(){
|
||||
return this.height*this.times;
|
||||
}
|
||||
},
|
||||
onLoad: function(option) {
|
||||
const eventChannel = this.getOpenerEventChannel();
|
||||
var these = this;
|
||||
eventChannel.on('checkImg', (rec)=> {
|
||||
console.log("我收到你的消息了，消息内容是：" + JSON.stringify(rec));
|
||||
this.src = rec.data;
|
||||
this.width=rec.width?rec.width:160;
|
||||
this.height=rec.height?rec.height:80;
|
||||
this.times=rec.times?rec.times:10;
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
handleCrop(e) {
|
||||
|
||||
var these = this;
|
||||
const eventChannel = these.getOpenerEventChannel();
|
||||
this.Statu = true;
|
||||
console.log("裁剪完成");
|
||||
console.log(e.tempFilePath);
|
||||
eventChannel.emit('ImgCutOver_Path',e.tempFilePath);
|
||||
const ctx = uni.createCanvasContext('splashCanvas', this);
|
||||
ctx.drawImage(
|
||||
e.tempFilePath,
|
||||
0,0,these.width,these.height
|
||||
);
|
||||
setTimeout(() => {
|
||||
ctx.draw(false, ()=>{
|
||||
console.log("abcdefg")
|
||||
uni.canvasGetImageData({
|
||||
canvasId: 'splashCanvas',
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: these.width,
|
||||
height: these.height,
|
||||
success: (res) => {
|
||||
// 处理像素数据并发送
|
||||
|
||||
console.log("res.data.length="+res.data.length);
|
||||
eventChannel.emit('ImgCutOverPath', {
|
||||
picPath: e.tempFilePath
|
||||
});
|
||||
|
||||
eventChannel.emit('ImgCutOver',{piexls:res.data,picPath:e.tempFilePath});
|
||||
|
||||
uni.navigateBack();
|
||||
},
|
||||
fail: (err) => {
|
||||
reject(`获取canvas数据失败: ${err.errMsg}`);
|
||||
}
|
||||
});
|
||||
});
|
||||
}, 500);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.canvas {
|
||||
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
</style>
|
||||
@ -250,15 +250,15 @@
|
||||
showHeader: true,
|
||||
menuItems: [{
|
||||
text: '强光',
|
||||
icon: '/static/images/6155/DeviceDetail/qiang.png'
|
||||
icon: '/static/images/lightImg/qiang.png'
|
||||
},
|
||||
{
|
||||
text: '弱光',
|
||||
icon: '/static/images/6155/DeviceDetail/ruo.png'
|
||||
icon: '/static/images/lightImg/ruo.png'
|
||||
},
|
||||
{
|
||||
text: '爆闪',
|
||||
icon: '/static/images/6155/DeviceDetail/shan.png'
|
||||
icon: '/static/images/lightImg/shan.png'
|
||||
}
|
||||
],
|
||||
activeIndex: -1,
|
||||
@ -926,7 +926,7 @@
|
||||
sourceType: ['album'],
|
||||
success: function(res) {
|
||||
uni.navigateTo({
|
||||
url: "/pages/6155/ImgCrop",
|
||||
url: "/pages/ImgCrop/ImgCrop",
|
||||
events: {
|
||||
ImgCutOver: function(data) {
|
||||
|
||||
@ -1378,19 +1378,19 @@
|
||||
title = '主灯模式';
|
||||
items = [{
|
||||
text: '强光',
|
||||
icon: '/static/images/6155/DeviceDetail/qiang.png'
|
||||
icon: '/static/images/lightImg/qiang.png'
|
||||
},
|
||||
// {
|
||||
// text: '工作光',
|
||||
// icon: '/static/images/6155/DeviceDetail/fan.png'
|
||||
// icon: '/static/images/lightImg/fan.png'
|
||||
// },
|
||||
{
|
||||
text: '弱光',
|
||||
icon: '/static/images/6155/DeviceDetail/ruo.png'
|
||||
icon: '/static/images/lightImg/ruo.png'
|
||||
},
|
||||
{
|
||||
text: '爆闪',
|
||||
icon: '/static/images/6155/DeviceDetail/shan.png'
|
||||
icon: '/static/images/lightImg/shan.png'
|
||||
},
|
||||
{
|
||||
text: '关闭',
|
||||
@ -1402,11 +1402,11 @@
|
||||
title = '辅灯模式';
|
||||
items = [{
|
||||
text: '泛光',
|
||||
icon: '/static/images/6155/DeviceDetail/fan.png'
|
||||
icon: '/static/images/lightImg/fan.png'
|
||||
},
|
||||
{
|
||||
text: '强+泛光',
|
||||
icon: '/static/images/6155/DeviceDetail/fan.png'
|
||||
icon: '/static/images/lightImg/fan.png'
|
||||
},
|
||||
];
|
||||
break;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -71,7 +71,7 @@
|
||||
<view class="item" @click="lightSetting('jieN')" :class="formData.lightCurr=='jieN'?'active':''">
|
||||
<view class="imgContent center">
|
||||
<image class="img"
|
||||
:src="formData.lightCurr=='jieN'?'/static/images/6331/jieNActive.png':'/static/images/6331/jieN.png'"
|
||||
:src="formData.lightCurr=='jieN'?'/static/images/lightImg/jieNActive.png':'/static/images/lightImg/jieN.png'"
|
||||
mode="aspectFit"></image>
|
||||
</view>
|
||||
<view class="txt">节能光</view>
|
||||
@ -275,15 +275,15 @@ import request, { baseURL } from '@/utils/request.js';
|
||||
showHeader: true,
|
||||
menuItems: [{
|
||||
text: '强光',
|
||||
icon: '/static/images/6155/DeviceDetail/qiang.png'
|
||||
icon: '/static/images/lightImg/qiang.png'
|
||||
},
|
||||
{
|
||||
text: '弱光',
|
||||
icon: '/static/images/6155/DeviceDetail/ruo.png'
|
||||
icon: '/static/images/lightImg/ruo.png'
|
||||
},
|
||||
{
|
||||
text: '爆闪',
|
||||
icon: '/static/images/6155/DeviceDetail/shan.png'
|
||||
icon: '/static/images/lightImg/shan.png'
|
||||
}
|
||||
],
|
||||
activeIndex: -1,
|
||||
|
||||
@ -257,15 +257,15 @@ import request, { baseURL } from '@/utils/request.js';
|
||||
showHeader: true,
|
||||
menuItems: [{
|
||||
text: '强光',
|
||||
icon: '/static/images/6155/DeviceDetail/qiang.png'
|
||||
icon: '/static/images/lightImg/qiang.png'
|
||||
},
|
||||
{
|
||||
text: '弱光',
|
||||
icon: '/static/images/6155/DeviceDetail/ruo.png'
|
||||
icon: '/static/images/lightImg/ruo.png'
|
||||
},
|
||||
{
|
||||
text: '爆闪',
|
||||
icon: '/static/images/6155/DeviceDetail/shan.png'
|
||||
icon: '/static/images/lightImg/shan.png'
|
||||
}
|
||||
],
|
||||
activeIndex: -1,
|
||||
@ -1051,7 +1051,7 @@ import request, { baseURL } from '@/utils/request.js';
|
||||
var gotoCutImg = (imgPath) => {
|
||||
|
||||
uni.navigateTo({
|
||||
url: "/pages/6155/ImgCrop",
|
||||
url: "/pages/ImgCrop/ImgCrop",
|
||||
events: {
|
||||
ImgCutOver: function(data) {
|
||||
// console.log("我收到裁剪后的图片了，感谢老铁," + data)
|
||||
|
||||
@ -177,7 +177,7 @@
|
||||
<view class="item" @click="lightSetting('close')" :class="formData.lightCurr=='close'?'active':''">
|
||||
<view class="imgContent center">
|
||||
<image class="img"
|
||||
:src="formData.lightCurr=='close'?'/static/images/670/jieNActive.png':'/static/images/670/jieN.png'"
|
||||
:src="formData.lightCurr=='close'?'/static/images/lightImg/jieNActive.png':'/static/images/lightImg/jieN.png'"
|
||||
mode="aspectFit"></image>
|
||||
</view>
|
||||
<view class="txt">关闭</view>
|
||||
@ -363,15 +363,15 @@
|
||||
showHeader: true,
|
||||
menuItems: [{
|
||||
text: '强光',
|
||||
icon: '/static/images/6155/DeviceDetail/qiang.png'
|
||||
icon: '/static/images/lightImg/qiang.png'
|
||||
},
|
||||
{
|
||||
text: '弱光',
|
||||
icon: '/static/images/6155/DeviceDetail/ruo.png'
|
||||
icon: '/static/images/lightImg/ruo.png'
|
||||
},
|
||||
{
|
||||
text: '爆闪',
|
||||
icon: '/static/images/6155/DeviceDetail/shan.png'
|
||||
icon: '/static/images/lightImg/shan.png'
|
||||
}
|
||||
],
|
||||
activeIndex: -1,
|
||||
@ -486,10 +486,14 @@
|
||||
},
|
||||
onLoad: function() {
|
||||
|
||||
|
||||
these = this;
|
||||
recei = BleReceive.getBleReceive();
|
||||
ble = BleTool.getBleTool();
|
||||
this.$watch("formData.battary", (newVal, oldVal) => {
|
||||
if (newVal <= 20 && this.formData.sta_system==2) {
|
||||
this.showMsg("设备电量低");
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
ble.addReceiveCallback(these.bleValueNotify, pagePath);
|
||||
@ -928,30 +932,16 @@
|
||||
// console.log("收到文本回复", payload);
|
||||
// // this.SendTxtMQ(json);
|
||||
// }
|
||||
if (keys.indexOf('sta_BreakNews') > -
|
||||
1) { //紧急通知
|
||||
if (json.sta_BreakNews ===
|
||||
'I get it'
|
||||
) // && this.Status.msgOkTime && this.Status.msgOkIntval){
|
||||
{
|
||||
these.showPop({
|
||||
showPop: true,
|
||||
message: "用户已确认收到紧急通知",
|
||||
iconUrl: "/static/images/6155/DeviceDetail/uploadSuccess.png"
|
||||
});
|
||||
|
||||
// this.Status.msgOkTime=null
|
||||
// clearInterval(this.Status.msgOkIntval);
|
||||
|
||||
}
|
||||
|
||||
if (keys.indexOf('sta_BreakNews') > -1) { //紧急通知
|
||||
if(json.sta_BreakNews=='I get it'){
|
||||
these.showPop({
|
||||
showPop: true,
|
||||
message: "用户已确认收到紧急通知",
|
||||
iconUrl: "/static/images/6155/DeviceDetail/uploadSuccess.png"
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
// else {
|
||||
// console.log("收到不能处理的数据", payload);
|
||||
// }
|
||||
|
||||
|
||||
} catch (error) {
|
||||
console.error("无法解析此消息", payload);
|
||||
}
|
||||
@ -1881,7 +1871,7 @@
|
||||
var gotoCutImg = (imgPath) => {
|
||||
|
||||
uni.navigateTo({
|
||||
url: "/pages/6155/ImgCrop",
|
||||
url: "/pages/ImgCrop/ImgCrop",
|
||||
events: {
|
||||
ImgCutOver: function(data) {
|
||||
// console.log("我收到裁剪后的图片了，感谢老铁," + data)
|
||||
|
||||
@ -230,20 +230,20 @@
|
||||
showHeader: true,
|
||||
menuItems: [{
|
||||
text: '强光',
|
||||
icon: '/static/images/6155/DeviceDetail/qiang.png'
|
||||
icon: '/static/images/lightImg/qiang.png'
|
||||
},
|
||||
{
|
||||
text: '弱光',
|
||||
icon: '/static/images/6155/DeviceDetail/ruo.png'
|
||||
icon: '/static/images/lightImg/ruo.png'
|
||||
},
|
||||
{
|
||||
text: '爆闪',
|
||||
icon: '/static/images/6155/DeviceDetail/shan.png'
|
||||
icon: '/static/images/lightImg/shan.png'
|
||||
}
|
||||
],
|
||||
activeIndex: -1,
|
||||
bgColor: '#2a2a2a',
|
||||
itemBgColor: '#3a3a3a',
|
||||
itemBgColor: '#00000000',
|
||||
textColor: '#ffffffde',
|
||||
textAlign: 'flex-start',
|
||||
title: '主灯模式',
|
||||
@ -783,7 +783,7 @@
|
||||
sourceType: ['album'],
|
||||
success: function(res) {
|
||||
uni.navigateTo({
|
||||
url: "/pages/6155/ImgCrop",
|
||||
url: "/pages/ImgCrop/ImgCrop",
|
||||
events: {
|
||||
ImgCutOver: function(data) {
|
||||
//将8位的二进制数组转换成16进制数据
|
||||
@ -957,19 +957,19 @@
|
||||
title = '主灯模式';
|
||||
items = [{
|
||||
text: '强光',
|
||||
icon: '/static/images/6155/DeviceDetail/qiang.png'
|
||||
icon: '/static/images/lightImg/qiang.png'
|
||||
},
|
||||
// {
|
||||
// text: '工作光',
|
||||
// icon: '/static/images/6155/DeviceDetail/fan.png'
|
||||
// icon: '/static/images/lightImg/fan.png'
|
||||
// },
|
||||
{
|
||||
text: '弱光',
|
||||
icon: '/static/images/6155/DeviceDetail/ruo.png'
|
||||
icon: '/static/images/lightImg/ruo.png'
|
||||
},
|
||||
{
|
||||
text: '爆闪',
|
||||
icon: '/static/images/6155/DeviceDetail/shan.png'
|
||||
icon: '/static/images/lightImg/shan.png'
|
||||
},
|
||||
{
|
||||
text: '关闭',
|
||||
@ -981,7 +981,7 @@
|
||||
title = '辅灯模式';
|
||||
items = [{
|
||||
text: '泛光',
|
||||
icon: '/static/images/6155/DeviceDetail/fan.png'
|
||||
icon: '/static/images/lightImg/fan.png'
|
||||
}];
|
||||
break;
|
||||
}
|
||||
@ -1089,14 +1089,7 @@
|
||||
},
|
||||
handleItemClick(item, index) {
|
||||
|
||||
switch (this.Status.BottomMenu.type) {
|
||||
case "main":
|
||||
|
||||
break;
|
||||
case "fu":
|
||||
|
||||
break;
|
||||
}
|
||||
this.Status.BottomMenu.activeIndex = index;
|
||||
|
||||
},
|
||||
|
||||
100
pages/common/ImgCrop/ImgCrop.vue
Normal file
100
pages/common/ImgCrop/ImgCrop.vue
Normal file
@ -0,0 +1,100 @@
|
||||
<template>
|
||||
<view>
|
||||
<canvas id="splashCanvas" canvas-id="splashCanvas" :style="{'width':width+'px','height':height+'px'}" style=" z-index: 9999;position: fixed; visibility: hidden;"></canvas>
|
||||
|
||||
|
||||
<qf-image-cropper :src="src" :showAngle="false" :width="cropWidth" :height="cropHeight" fileType="jpg"
|
||||
@crop="handleCrop" :areaScale="0.1" :minScale="0.1" :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,
|
||||
width:160,
|
||||
height:80,
|
||||
times:10
|
||||
}
|
||||
},
|
||||
computed:{
|
||||
cropWidth(){
|
||||
return this.width*this.times;
|
||||
}
|
||||
,
|
||||
cropHeight(){
|
||||
return this.height*this.times;
|
||||
}
|
||||
},
|
||||
onLoad: function(option) {
|
||||
const eventChannel = this.getOpenerEventChannel();
|
||||
var these = this;
|
||||
eventChannel.on('checkImg', (rec)=> {
|
||||
console.log("我收到你的消息了，消息内容是：" + JSON.stringify(rec));
|
||||
this.src = rec.data;
|
||||
this.width=rec.width?rec.width:160;
|
||||
this.height=rec.height?rec.height:80;
|
||||
this.times=rec.times?rec.times:10;
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
handleCrop(e) {
|
||||
|
||||
var these = this;
|
||||
const eventChannel = these.getOpenerEventChannel();
|
||||
this.Statu = true;
|
||||
console.log("裁剪完成");
|
||||
console.log(e.tempFilePath);
|
||||
eventChannel.emit('ImgCutOver_Path',e.tempFilePath);
|
||||
const ctx = uni.createCanvasContext('splashCanvas', this);
|
||||
ctx.drawImage(
|
||||
e.tempFilePath,
|
||||
0,0,these.width,these.height
|
||||
);
|
||||
setTimeout(() => {
|
||||
ctx.draw(false, ()=>{
|
||||
console.log("abcdefg")
|
||||
uni.canvasGetImageData({
|
||||
canvasId: 'splashCanvas',
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: these.width,
|
||||
height: these.height,
|
||||
success: (res) => {
|
||||
// 处理像素数据并发送
|
||||
|
||||
console.log("res.data.length="+res.data.length);
|
||||
eventChannel.emit('ImgCutOverPath', {
|
||||
picPath: e.tempFilePath
|
||||
});
|
||||
|
||||
eventChannel.emit('ImgCutOver',{piexls:res.data,picPath:e.tempFilePath});
|
||||
|
||||
uni.navigateBack();
|
||||
},
|
||||
fail: (err) => {
|
||||
reject(`获取canvas数据失败: ${err.errMsg}`);
|
||||
}
|
||||
});
|
||||
});
|
||||
}, 500);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.canvas {
|
||||
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
</style>
|
||||
@ -72,7 +72,6 @@
|
||||
callback: this.scan
|
||||
}],
|
||||
title: '扫码'
|
||||
|
||||
},
|
||||
},
|
||||
formData: {
|
||||
@ -208,7 +207,7 @@
|
||||
this.qrCodeResult(cleanedResult, true, null);
|
||||
},
|
||||
fail: (err) => {
|
||||
this.showMsg("扫码失败:" + err.errMsg, MsgType.error);
|
||||
MsgError("扫码失败:" + err.errMsg,"确定",these);
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
@ -2,11 +2,12 @@
|
||||
<view class="container">
|
||||
<!-- 设备列表 -->
|
||||
<view class="allSelect" @click="selectAll"> 全选</view>
|
||||
<scroll-view class="device-list" scroll-y>
|
||||
<view class="device-card" v-for="(item, index) in deviceList" :key="index"
|
||||
@click="item.onlineStatus === 1 ? toggleSelect(index) : null">
|
||||
<mescroll-uni class="device-list" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
|
||||
:down="downOption" :fixed="false" :style="{ height: mescrollHeight + 'px' }">
|
||||
|
||||
<view class="device-card" v-for="(item, index) in deviceList" :key="index" @click="toggleSelect(index)">
|
||||
<!-- 复选框 -->
|
||||
<view class="checkbox" :class="{ checked: item.checked, disabled: item.onlineStatus !== 1 }">
|
||||
<view class="checkbox" :class="{ checked: item.checked }">
|
||||
<uni-icons v-if="item.checked" type="checkmarkempty" size="18" color="rgb(0, 0, 0)"></uni-icons>
|
||||
</view>
|
||||
<!-- 设备信息 -->
|
||||
@ -28,11 +29,12 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="editInfmation">
|
||||
<button class="login-btn qz" @click="forceAlarm">强制报警</button>
|
||||
<button class="login-btn jc" @click="cancelAlarm">解除报警</button>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</mescroll-uni>
|
||||
<view class="editInfmation">
|
||||
<button class="login-btn qz" @click="forceAlarm">强制报警</button>
|
||||
<button class="login-btn jc" @click="cancelAlarm">解除报警</button>
|
||||
</view>
|
||||
|
||||
<!-- 强制报警提示弹框 -->
|
||||
<CustomPopup v-if="popupType === 'force'" :show="showPopupFlag" popupBorder="1rpx solid rgba(224, 52, 52, 0.3)"
|
||||
:message="popupMessage" icon="/static/images/6170/bj.png" :confirm-text="popupConfirmText"
|
||||
@ -68,9 +70,16 @@
|
||||
deviceRealTimeStatus //设备状态
|
||||
} from '@/api/6170/deviceControl.js'
|
||||
|
||||
import MescrollUni from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.vue';
|
||||
|
||||
import MqTool from '@/utils/MqHelper.js';
|
||||
var timeout = null;
|
||||
var these = null;
|
||||
var mq=null;
|
||||
export default {
|
||||
components: {
|
||||
CustomPopup
|
||||
CustomPopup,
|
||||
MescrollUni
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@ -83,18 +92,53 @@
|
||||
pendingAlarmAction: '',
|
||||
sendInfo: '',
|
||||
// 2. 核心：typeName 与接口的映射表
|
||||
alarmApiMapping: {
|
||||
'HBY100-J': { //100J类型
|
||||
sendApi: deviceForceAlarmActivation,
|
||||
statusTypeName: 'FunctionAccessBatchStatusRule_BJQ100J'
|
||||
},
|
||||
'BJQ6170': { //6170类型
|
||||
sendApi: deviceSendAlarmMessage,
|
||||
statusTypeName: 'FunctionAccessBatchStatusRule_BJQ200J'
|
||||
}
|
||||
dic: {
|
||||
alarmApiMapping: [{
|
||||
type: ['HBY100-J'],
|
||||
sendApi: deviceForceAlarmActivation,
|
||||
statusTypeName: 'FunctionAccessBatchStatusRule_BJQ100J',
|
||||
sendType: 'FYSSend'
|
||||
},
|
||||
{
|
||||
type: ['BJQ6170'],
|
||||
sendApi: deviceSendAlarmMessage,
|
||||
statusTypeName: 'FunctionAccessBatchStatusRule_BJQ200J',
|
||||
sendType: 'FYSSend'
|
||||
},
|
||||
|
||||
{
|
||||
type: ['BJQ6075J'],
|
||||
sendApi: deviceSendAlarmMessage,
|
||||
statusTypeName: '',
|
||||
sendType: 'CommonSend'
|
||||
},
|
||||
{
|
||||
type: ['HBY670'],
|
||||
sendApi: deviceSendAlarmMessage,
|
||||
statusTypeName: '',
|
||||
sendType: 'XSSend'
|
||||
}
|
||||
]
|
||||
},
|
||||
loading: false,
|
||||
total: 0
|
||||
total: 0,
|
||||
mescroll: null,
|
||||
downOption: {
|
||||
auto: true,
|
||||
autoShowLoading: false,
|
||||
},
|
||||
upOption: {
|
||||
auto: false,
|
||||
noMoreSize: 0,
|
||||
offset: 50,
|
||||
isLock: false,
|
||||
empty: {
|
||||
tip: '暂无数据',
|
||||
hideScroll: false
|
||||
},
|
||||
textNoMore: '没有更多数据了'
|
||||
},
|
||||
mescrollHeight: 0
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@ -105,13 +149,53 @@
|
||||
currentApiConfig() {
|
||||
const currentTypeName = this.sendInfo.typeName || '';
|
||||
// 匹配到则用对应配置，匹配不到用默认配置
|
||||
return this.alarmApiMapping[currentTypeName] || {
|
||||
sendApi: deviceDefaultAlarm,
|
||||
statusTypeName: 'FunctionAccessBatchStatusRule_Default'
|
||||
};
|
||||
let f = this.dic.alarmApiMapping.find(v => {
|
||||
return v.type.indexOf(currentTypeName) > -1;
|
||||
});
|
||||
if (f) {
|
||||
return f;
|
||||
} else {
|
||||
return {
|
||||
sendApi: deviceDefaultAlarm,
|
||||
statusTypeName: 'FunctionAccessBatchStatusRule_Default',
|
||||
sendType:'FYSSend'
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
getSystemInfoSyncH() {
|
||||
|
||||
let sysInfo = uni.getSystemInfoSync();
|
||||
|
||||
// 底部 footer 高度约 220rpx + 120rpx = 340rpx，转换为 px（1rpx = sysInfo.pixelRatio / 750 * 屏幕宽度？不，直接用 rpx 转 px 公式）
|
||||
let footerHeight = 340 * (sysInfo.screenWidth / 750); // rpx 转 px
|
||||
|
||||
// console.log("footerHeight=", footerHeight);
|
||||
this.mescrollHeight = sysInfo.screenHeight - footerHeight;
|
||||
// console.log("mescrollHeight=", this.mescrollHeight);
|
||||
},
|
||||
mescrollInit(mescroll) {
|
||||
this.mescroll = mescroll;
|
||||
},
|
||||
// 下拉刷新
|
||||
downCallback() {
|
||||
|
||||
|
||||
if (this.mescroll) {
|
||||
this.mescroll.resetUpScroll(false);
|
||||
this.mescroll.scrollTo(0, 0);
|
||||
}
|
||||
this.getData(this.sendInfo.id);
|
||||
|
||||
|
||||
},
|
||||
// 上拉加载
|
||||
upCallback() {
|
||||
this.getData(this.sendInfo.id);
|
||||
},
|
||||
onclosePopup() {
|
||||
this.showPopupFlag = false
|
||||
},
|
||||
@ -123,37 +207,61 @@
|
||||
selectAll() {
|
||||
console.log('123');
|
||||
// 仅对在线设备进行全选/取消
|
||||
const allSelected = this.deviceList.every(item => item.onlineStatus === 1 && item.checked);
|
||||
const allSelected = this.deviceList.every(item => item.checked);
|
||||
this.deviceList.forEach(item => {
|
||||
// 离线设备不修改checked状态
|
||||
if (item.onlineStatus === 1) {
|
||||
item.checked = !allSelected;
|
||||
}
|
||||
|
||||
item.checked = !allSelected;
|
||||
|
||||
});
|
||||
this.$forceUpdate();
|
||||
},
|
||||
// 获取设备列表
|
||||
getData(deviceType) {
|
||||
console.log(deviceType, 'deviceTypedeviceType');
|
||||
this.loading = true;
|
||||
let data = {
|
||||
pageNum: 1,
|
||||
pageSize: 50,
|
||||
deviceType: deviceType
|
||||
}
|
||||
deviceInfo(data).then((res) => {
|
||||
if (res.code == 200) {
|
||||
const newDevices = res.rows.map(device => ({
|
||||
...device,
|
||||
showConfirm: false,
|
||||
checked: false
|
||||
}));
|
||||
this.total = res.total;
|
||||
this.deviceList = newDevices
|
||||
clearTimeout(timeout);
|
||||
timeout = setTimeout(() => {
|
||||
console.log(deviceType, 'deviceTypedeviceType');
|
||||
this.loading = true;
|
||||
let data = {
|
||||
pageNum: this.mescroll?this.mescroll.num:1,
|
||||
pageSize: 50,
|
||||
deviceType: deviceType
|
||||
}
|
||||
}).finally(() => {
|
||||
this.loading = false;
|
||||
});
|
||||
deviceInfo(data).then((res) => {
|
||||
if (res.code == 200) {
|
||||
const newDevices = res.rows.map(device => ({
|
||||
...device,
|
||||
showConfirm: false,
|
||||
checked: false
|
||||
}));
|
||||
this.total = res.total;
|
||||
|
||||
if(data.pageNum===1){
|
||||
this.deviceList = newDevices;
|
||||
}else{
|
||||
this.deviceList =this.deviceList.concat(newDevices);
|
||||
}
|
||||
|
||||
|
||||
let hasNext = true;
|
||||
if (res.rows.length < data.pageSize || this.deviceList.length >= this.total) {
|
||||
hasNext = false;
|
||||
} else {
|
||||
hasNext = true;
|
||||
}
|
||||
this.mescroll.endSuccess(res.rows.length, hasNext);
|
||||
|
||||
} else {
|
||||
this.mescroll.endSuccess(0, false);
|
||||
}
|
||||
}).finally(() => {
|
||||
this.loading = false;
|
||||
}).catch(ex => {
|
||||
this.mescroll.endSuccess(0, false);
|
||||
});
|
||||
|
||||
}, 200);
|
||||
|
||||
},
|
||||
// 强制报警
|
||||
forceAlarm() {
|
||||
@ -186,7 +294,7 @@
|
||||
this.pendingAlarmAction = 0
|
||||
},
|
||||
//动态调用对应接口
|
||||
async sendAlarmCommand() {
|
||||
sendAlarmCommand() {
|
||||
const selectedDevices = this.deviceList.filter(item => item.checked);
|
||||
const deviceIds = selectedDevices.map(item => item.id);
|
||||
const deviceImeiList = selectedDevices.map(item => item.deviceImei);
|
||||
@ -206,34 +314,78 @@
|
||||
// 获取当前typeName对应的接口和参数配置
|
||||
const {
|
||||
sendApi,
|
||||
statusTypeName
|
||||
statusTypeName,
|
||||
sendType
|
||||
} = this.currentApiConfig;
|
||||
// 准备请求数据
|
||||
// const batchId = generateShortId();
|
||||
const requestData = {
|
||||
deviceIds: deviceIds,
|
||||
typeName: this.sendInfo.typeName,
|
||||
deviceImeiList: deviceImeiList,
|
||||
// batchId: batchId,
|
||||
voiceStrobeAlarm: this.pendingAlarmAction == 1 ? '1' : '0'
|
||||
};
|
||||
// 动态调用匹配的接口
|
||||
const registerRes = await sendApi(requestData);
|
||||
if (registerRes.code == 200) {
|
||||
|
||||
//FYS的方法
|
||||
let FYSSend = async () => {
|
||||
const requestData = {
|
||||
deviceIds: deviceIds,
|
||||
typeName: this.sendInfo.typeName,
|
||||
deviceImeiList: deviceImeiList,
|
||||
// batchId: batchId,
|
||||
voiceStrobeAlarm: this.pendingAlarmAction == 1 ? '1' : '0'
|
||||
};
|
||||
// 动态调用匹配的接口
|
||||
const registerRes = await sendApi(requestData);
|
||||
if (registerRes.code == 200) {
|
||||
uni.showToast({
|
||||
title: isAlarming ? '强制报警开启成功' : '报警已解除',
|
||||
icon: 'success'
|
||||
});
|
||||
this.showPopupFlag = false
|
||||
uni.$emit('deviceStatusUpdate', {});
|
||||
setTimeout(() => {
|
||||
uni.navigateBack()
|
||||
}, 500)
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: registerRes.msg || '状态查询失败',
|
||||
icon: 'none'
|
||||
});
|
||||
}
|
||||
}
|
||||
//XS的方法
|
||||
let XSSend = () => {
|
||||
let json=JSON.stringify({ins_SOSGrade:[1]});
|
||||
for (let i = 0; i < deviceImeiList.length; i++) {
|
||||
let imei = deviceImeiList[i];
|
||||
|
||||
mq.sendData("B/"+imei,json,false);
|
||||
}
|
||||
|
||||
uni.showToast({
|
||||
title: isAlarming ? '强制报警开启成功' : '报警已解除',
|
||||
icon: 'success'
|
||||
});
|
||||
this.showPopupFlag = false
|
||||
uni.$emit('deviceStatusUpdate', {});
|
||||
setTimeout(() => {
|
||||
uni.navigateBack()
|
||||
}, 500)
|
||||
} else {
|
||||
}
|
||||
//统一通信协议方法
|
||||
let CommonSend = () => {
|
||||
let json=JSON.stringify({ins_ShakeBit:1});
|
||||
for (let i = 0; i < deviceImeiList.length; i++) {
|
||||
let imei = deviceImeiList[i];
|
||||
mq.sendData("B/"+imei,json,false);
|
||||
}
|
||||
|
||||
uni.showToast({
|
||||
title: registerRes.msg || '状态查询失败',
|
||||
icon: 'none'
|
||||
title: isAlarming ? '强制报警开启成功' : '报警已解除',
|
||||
icon: 'success'
|
||||
});
|
||||
this.showPopupFlag = false
|
||||
}
|
||||
|
||||
switch (sendType) {
|
||||
case "FYSSend":
|
||||
FYSSend();
|
||||
break;
|
||||
case "XSSend":
|
||||
XSSend();
|
||||
break;
|
||||
case "CommonSend":
|
||||
CommonSend();
|
||||
break;
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
@ -251,14 +403,26 @@
|
||||
this.sendAlarmCommand(this.popupType);
|
||||
},
|
||||
},
|
||||
onUnload() {
|
||||
if(mq){
|
||||
mq.disconnect();
|
||||
}
|
||||
},
|
||||
onLoad(options) {
|
||||
these = this;
|
||||
mq=MqTool.getMqTool();
|
||||
if(mq){
|
||||
mq.init();
|
||||
|
||||
}
|
||||
const eventChannel = this.getOpenerEventChannel();
|
||||
// 监听 'deviceSend' 事件，获取传过来的数据
|
||||
eventChannel.on('devicePolice', (data) => {
|
||||
this.getData(data.data.id)
|
||||
this.sendInfo = data.data
|
||||
});
|
||||
eventChannel.emit('ack', {})
|
||||
eventChannel.emit('ack', {});
|
||||
this.getSystemInfoSyncH();
|
||||
},
|
||||
}
|
||||
</script>
|
||||
@ -18,13 +18,16 @@
|
||||
<image src="/static/images/common/more.png" mode="aspectFit" class="more"></image>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="sendFlex" v-if="activeTab && activeTab.id !== ''&& activeTabInfo.communicationMode==0 || activeTabInfo.communicationMode==2">
|
||||
<view class="callpolice" @click="callpolice">报警</view>
|
||||
<view class="Sendmessage" @click="location">位置</view>
|
||||
<view class="Sendmessage" @click="handleSend" v-if="activeTabInfo.typeName!=='HBY100-J'">发送信息</view>
|
||||
</view> -->
|
||||
<!-- <scroll-view class="device-list" scroll-y @scrolltolower="onScrollToLower" :lower-threshold="100" style="height:80vh;"> -->
|
||||
<mescroll-uni class="device-list" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
|
||||
<view class="sendFlex"
|
||||
v-show="showSendFlex"
|
||||
>
|
||||
<view class="callpolice" @click="callpolice" v-show="showWarn">报警</view>
|
||||
<view class="Sendmessage" @click="location" v-show="showMap">位置</view>
|
||||
<view class="Sendmessage" @click="handleSend"
|
||||
v-show="ShowSendmessage">发送信息</view>
|
||||
</view>
|
||||
|
||||
<mescroll-uni class="device-list" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
|
||||
:down="downOption" :fixed="false" :style="{ height: mescrollHeight + 'px' }">
|
||||
<view v-if="deviceList.length>0">
|
||||
<uni-swipe-action ref="swipeAction">
|
||||
@ -40,15 +43,15 @@
|
||||
<view class="device-name">
|
||||
<view>设备:{{item.deviceName}}</view>
|
||||
<view class="ID">
|
||||
<view class="ID" v-if="item.communicationMode==0 || item.communicationMode==2">ID:{{item.deviceImei}}
|
||||
<view class="ID"
|
||||
v-if="item.communicationMode==0 || item.communicationMode==2">
|
||||
ID:{{item.deviceImei}}
|
||||
</view>
|
||||
<view class="ID" v-else>ID:{{item.deviceMac}}</view>
|
||||
<!-- 在线状态 -->
|
||||
<view class="onlines"
|
||||
v-if="item.onlineStatus==1">在线</view>
|
||||
<view class="onlines" v-if="item.onlineStatus==1">在线</view>
|
||||
<!-- 离线状态 -->
|
||||
<view class="offlines"
|
||||
v-if="item.onlineStatus==0">离线</view>
|
||||
<view class="offlines" v-if="item.onlineStatus==0">离线</view>
|
||||
<view>电量：{{item.battery || '0'}}%</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -74,7 +77,7 @@
|
||||
暂无数据
|
||||
</view> -->
|
||||
</mescroll-uni>
|
||||
<!-- </scroll-view> -->
|
||||
|
||||
</view>
|
||||
<!-- 删除弹框 -->
|
||||
<view class="agreement-mask" v-if="deleteShow" @click.stop="closePopup('delete')" catchtouchmove="true">
|
||||
@ -116,7 +119,7 @@
|
||||
<view class="tooltip-content" @click.stop>
|
||||
<view class="tooltip-item" v-for="(item, index) in menuItems" :key="index"
|
||||
@click="handleMenuClick(item)">
|
||||
<image :src="item.icon" class="item-icon" mode="aspectFit"/>
|
||||
<image :src="item.icon" class="item-icon" mode="aspectFit" />
|
||||
<text>{{ item.text }}</text>
|
||||
</view>
|
||||
</view>
|
||||
@ -146,17 +149,34 @@
|
||||
} from '@/api/common/index.js'
|
||||
import bleTool from '@/utils/BleHelper.js';
|
||||
import MescrollUni from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.vue'
|
||||
import BleReceive from '@/utils/BleReceive';
|
||||
import BleReceive from '@/utils/BleReceive';
|
||||
|
||||
var pagePath = 'pages/common/index';
|
||||
var ble = null;
|
||||
var timeout = null;
|
||||
var recei=null;
|
||||
var recei = null;
|
||||
export default {
|
||||
components: {
|
||||
MescrollUni
|
||||
},
|
||||
|
||||
computed:{
|
||||
showSendFlex(){
|
||||
// return this.activeTab && this.activeTab.id !== ''&& (this.activeTabInfo.communicationMode==0 || this.activeTabInfo.communicationMode==2);
|
||||
if(this.showMap || this.ShowSendmessage || this.showWarn){
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
},
|
||||
ShowSendmessage(){
|
||||
return this.dic.showMsgTypes.indexOf(this.activeTabInfo.typeName)>-1
|
||||
},
|
||||
showMap(){
|
||||
return this.dic.showMapTypes.indexOf(this.activeTabInfo.typeName)>-1
|
||||
},
|
||||
showWarn(){
|
||||
return this.dic.showCallPolice.indexOf(this.activeTabInfo.typeName)>-1
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
mescroll: null,
|
||||
@ -232,7 +252,12 @@ import BleReceive from '@/utils/BleReceive';
|
||||
|
||||
deviceId: '',
|
||||
deviceName: "", //重命名
|
||||
activeTabInfo: ''
|
||||
activeTabInfo: '',
|
||||
dic: {
|
||||
showMsgTypes: ['BJQ6170', 'HBY210', 'HBY670', 'BJQ6075', 'BJQ6075J'],//需要发送消息的类型
|
||||
showMapTypes:['BJQ6170','HBY210','HBY670','BJQ6075','HBY018A','HBY100-J','BJQ6075J','HBY008A','HBY100-Y'],//需要显示地图的类型
|
||||
showCallPolice:['BJQ6170','HBY210','HBY670','BJQ6075','HBY018A','HBY100-J','BJQ6075J','HBY008A','HBY100-Y']//需要发送报警的类型
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@ -495,7 +520,7 @@ import BleReceive from '@/utils/BleReceive';
|
||||
case 'scan':
|
||||
// 扫一扫
|
||||
uni.navigateTo({
|
||||
url:'/pages/common/addScan/ScanEquip'
|
||||
url: '/pages/common/addScan/ScanEquip'
|
||||
});
|
||||
|
||||
break;
|
||||
@ -618,7 +643,7 @@ import BleReceive from '@/utils/BleReceive';
|
||||
const deviceType = currentTab.id || '';
|
||||
console.log(`跳转到发送信息页面\n当前设备类型: ${deviceType}\n设备类型名称: ${currentTab.typeName}`);
|
||||
uni.navigateTo({
|
||||
url: '/pages/6170/callPolice/index',
|
||||
url: '/pages/common/callPolice/index',
|
||||
events: {
|
||||
ack: function(data) {}
|
||||
},
|
||||
@ -665,7 +690,7 @@ import BleReceive from '@/utils/BleReceive';
|
||||
// 列表跳转
|
||||
handleFile(item) {
|
||||
let url = item.detailPageUrl;
|
||||
// console.log("url=",url);
|
||||
// url="/pages/6075/BJQ6075L";
|
||||
// if(!url){
|
||||
// url="/pages/6075/BJQ6075"
|
||||
// }
|
||||
@ -771,8 +796,8 @@ import BleReceive from '@/utils/BleReceive';
|
||||
this.updateBleStatu();
|
||||
}, pagePath);
|
||||
|
||||
let phone=uni.getStorageSync("phone");
|
||||
if(phone==='17671332251'){//先写死方便自己使用，后面按人员权限区分
|
||||
let phone = uni.getStorageSync("phone");
|
||||
if (phone === '17671332251') { //先写死方便自己使用，后面按人员权限区分
|
||||
this.menuItems.push({
|
||||
text: '上报设备',
|
||||
icon: '/static/images/common/add.png',
|
||||
|
||||
@ -2,7 +2,10 @@
|
||||
<view class="device-page">
|
||||
<view class="title">星汉物联App联隐私政策</view>
|
||||
<view class="smalltitle">
|
||||
更新日期：2025-09-23
|
||||
编写日期：2025-09-23
|
||||
</view>
|
||||
<view class="smalltitle">
|
||||
更新日期：2026-03-05
|
||||
</view>
|
||||
<view class="smalltitle">
|
||||
生效日期：2025-10-08
|
||||
@ -38,7 +41,7 @@
|
||||
<view class="deviceTitle">(1).账号信息：手机号码、验证码,用于注册、登陆</view>
|
||||
<view class="deviceTitle">(2).蓝牙,用于设备连接后的通信、控制</view>
|
||||
<view class="deviceTitle">(3).相机/相册权限,拍摄的照片或视频用于上传给设备、扫码等</view>
|
||||
<view class="deviceTitle">(4).设备标识信息：IMEI、Android ID、MAC、OAID、软件安装列表,用于日志查询、统计分析、识别您的设备预防恶意程序及反作弊，提高服务安全性</view>
|
||||
<view class="deviceTitle">(4).设备标识信息：BSSID、Wi-Fi SSID、Wi-Fi BSSID、IMEI、Android ID、MAC、OAID、AAID、PushToken、APP ID、应用包名、软件安装列表,用于日志查询、统计分析、识别您的设备预防恶意程序及反作弊，提高服务安全性</view>
|
||||
<view class="deviceTitle">(5).GPS或网络位置,用于基于位置的服务，如地图导航、位置偏移预警</view>
|
||||
<view class="deviceTitle">(6).麦克风,我们的智能设备支持播放语音，需要录音以上传给设备</view>
|
||||
<view class="deviceTitle">(7).根据SDK功能，可能收集设备信息、位置信息等。我们会对合作的第三方SDK进行严格评估，并要求其遵守相关法规。具体清单见下文。</view>
|
||||
@ -51,6 +54,11 @@
|
||||
<view class="deviceTitle">(2).定位SDK(com.amap.api.location),所属公司:北京高德图强科技有限公司,隐私政策链接:https://lbs.amap.com/pages/privacy/</view>
|
||||
<view class="deviceTitle">(3).移动智能终端补充设备标识体系统一调用SDK(com.bun.miitmdid),所属公司:中国信息通信研究院,隐私政策链接:https://www.msa-alliance.cn/col.jsp?id=122</view>
|
||||
<view class="deviceTitle">(4).轻量版地图SDK(com.amap.api.maps.utils),所属公司:北京高德图强科技有限公司,隐私政策链接:https://lbs.amap.com/pages/privacy/</view>
|
||||
|
||||
<view class="deviceTitle">(5).个推消息推送(com.igexin.push),所属公司:浙江每日互动网络科技股份有限公司,隐私政策链接:http://docs.getui.com/download.html</view>
|
||||
<view class="deviceTitle">(6).阿里云快速json(com.alibaba.fastjson),所属公司:杭州阿里巴巴广告有限公司,隐私政策链接:https://github.com/alibaba/fastjson</view>
|
||||
<view class="deviceTitle">(7).vivo PUSH-SDK(com.vivo.push),所属公司:维沃移动通信有限公司,隐私政策链接:https://dev.vivo.com.cn/documentCenter/doc/180</view>
|
||||
<view class="deviceTitle">(8).OPPO PUSH 客户端SDK(com.heytap),所属公司:OPPO广东移动通信有限公司,隐私政策链接:https://open.oppomobile.com/new/introduction?page_name=oppopush</view>
|
||||
</view>
|
||||
<view class="smalltitle">
|
||||
4. 信息的存储与安全
|
||||
|
||||
@ -10,6 +10,7 @@
|
||||
<view class="example-body">
|
||||
<!-- 图片列表 -->
|
||||
<view class="image-list">
|
||||
|
||||
<view class="image-item" v-for="(image, index) in instructionImages" :key="index"
|
||||
@click="handleImageClick(index,image)">
|
||||
<image :src="image.fileUrl" mode="aspectFit" class="instruction-image"
|
||||
@ -71,6 +72,7 @@
|
||||
fileList: [],
|
||||
deviceID: "",
|
||||
instructionImages: [],
|
||||
typeImgs:[],//该设备类型的官方数据
|
||||
isDeleteMode: false, // 是否删除模式
|
||||
selectedImages: [], // 选中的图片索引
|
||||
deleteShow: false,
|
||||
@ -225,7 +227,8 @@
|
||||
},
|
||||
onLoad(options) {
|
||||
this.deviceID = options.id
|
||||
this.callOtherApi()
|
||||
this.callOtherApi();
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.0 KiB |
BIN
static/images/common/jig.png
Normal file
BIN
static/images/common/jig.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.7 KiB |
BIN
static/images/common/jigA.png
Normal file
BIN
static/images/common/jigA.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
BIN
static/images/common/sg.png
Normal file
BIN
static/images/common/sg.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
BIN
static/images/common/sgActive.png
Normal file
BIN
static/images/common/sgActive.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
BIN
static/images/lightImg/closeLight.png
Normal file
BIN
static/images/lightImg/closeLight.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 275 B After Width: | Height: | Size: 275 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 612 B After Width: | Height: | Size: 612 B |
|
Before Width: | Height: | Size: 528 B After Width: | Height: | Size: 528 B |
|
Before Width: | Height: | Size: 304 B After Width: | Height: | Size: 304 B |
BIN
static/images/lightImg/sos.png
Normal file
BIN
static/images/lightImg/sos.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 793 B |
BIN
static/images/lightImg/super.png
Normal file
BIN
static/images/lightImg/super.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 897 B |
BIN
static/images/lightImg/warn.png
Normal file
BIN
static/images/lightImg/warn.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
BIN
static/images/lightImg/work.png
Normal file
BIN
static/images/lightImg/work.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 813 B |
@ -1601,7 +1601,7 @@ class BleHelper {
|
||||
// console.log("正在连接" + deviceId);
|
||||
uni.createBLEConnection({
|
||||
deviceId: deviceId,
|
||||
timeout: 30000,
|
||||
timeout: 15000,
|
||||
success: (info) => {
|
||||
//释放连接锁
|
||||
|
||||
|
||||
@ -218,31 +218,31 @@ export default {
|
||||
value: "1",
|
||||
label: "灯光模式",
|
||||
checked: false,
|
||||
type: ['6170', '670','102','6155','650','7305']
|
||||
type: ['6170', '670','102','6155','650','7305','6075']
|
||||
},
|
||||
{
|
||||
value: "2",
|
||||
label: "激光模式",
|
||||
checked: false,
|
||||
type: ['6170']
|
||||
type: ['6170','6075']
|
||||
},
|
||||
{
|
||||
value: "3",
|
||||
label: "开机画面",
|
||||
checked: false,
|
||||
type: ['210', '6170', '670','6155','650','7305']
|
||||
type: ['210', '6170', '670','6155','650','7305','6075']
|
||||
},
|
||||
{
|
||||
value: "4",
|
||||
label: "人员信息登记",
|
||||
checked: false,
|
||||
type: ['210', '6170', '670','6155','650','7305']
|
||||
type: ['210', '6170', '670','6155','650','7305','6075']
|
||||
},
|
||||
{
|
||||
value: "5",
|
||||
label: "发送信息",
|
||||
checked: false,
|
||||
type: ['210', '6170', '670']
|
||||
type: ['210', '6170', '670','6075']
|
||||
},
|
||||
{
|
||||
value: "6",
|
||||
@ -258,7 +258,7 @@ export default {
|
||||
value: "42",
|
||||
label: "SOS",
|
||||
checked: false,
|
||||
type: ['670','4877']
|
||||
type: ['670','4877','6075']
|
||||
},
|
||||
{
|
||||
value: "43",
|
||||
|
||||
@ -281,7 +281,36 @@ class MqttClient {
|
||||
}
|
||||
}
|
||||
|
||||
publish(topic, message,retained) {
|
||||
async publish(topic, message,retained) {
|
||||
let getLan=()=>{
|
||||
return new Promise((succ,error)=>{
|
||||
uni.getNetworkType({
|
||||
success: (res) => {
|
||||
let networkType = res.networkType;
|
||||
// 判断网络是否连接
|
||||
if (networkType === 'none') {
|
||||
console.error('无网络连接')
|
||||
succ(false);
|
||||
} else {
|
||||
succ(true);
|
||||
}
|
||||
},
|
||||
fail: (err) => {
|
||||
console.error('获取网络状态失败：', err);
|
||||
|
||||
succ(false);
|
||||
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
let flag=await getLan();
|
||||
if(!flag){
|
||||
|
||||
return false;
|
||||
}
|
||||
if (this.client && this.client.isConnected()) {
|
||||
const mqttMessage = new Paho.Message(message);
|
||||
mqttMessage.destinationName = topic;
|
||||
|
||||
Reference in New Issue
Block a user