From 829a82272bedd358d5902df42327282cf8dcd2c5 Mon Sep 17 00:00:00 2001
From: lefengyang <lefengyang@tencent.com>
Date: Thu, 27 Aug 2026 20:42:10 +0800
Subject: [PATCH] 增加"下移"
---
ledApp/pages/addTemplate/addTemplate.vue | 376 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 305 insertions(+), 71 deletions(-)
diff --git a/ledApp/pages/addTemplate/addTemplate.vue b/ledApp/pages/addTemplate/addTemplate.vue
index f5c0355..e28e928 100644
--- a/ledApp/pages/addTemplate/addTemplate.vue
+++ b/ledApp/pages/addTemplate/addTemplate.vue
@@ -31,6 +31,22 @@
</uv-upload>
</view>
</view>
+ <view class="temp_item" v-if="!isEditMode">
+ <view class="title">
+ 预制动画
+ </view>
+ <view class="item">
+ <uv-radio-group v-model="selectedPreset" placement="column" @change="changePreset" labelSize="26rpx">
+ <uv-radio
+ class="spec_radio"
+ v-for="(item, index) in presetList"
+ :key="index"
+ :label="'预制动画：'+item.name+'（'+item.fpsTotal+'帧）'"
+ :name="item.name">
+ </uv-radio>
+ </uv-radio-group>
+ </view>
+ </view>
<view class="temp_item">
<view class="title">
屏幕规格
@@ -91,6 +107,7 @@
</view>
<view class="item">
<uv-button text="编辑" @click="popupAnimationOpen(index)" shape="circle" size="small" color="linear-gradient( 142deg, #6FD2FF 0%, #268DFF 100%)"></uv-button>
+ <uv-button text="复制" @click="copyFrame(index)" shape="circle" size="small" color="linear-gradient( 142deg, #FFB347 0%, #FF8C00 100%)"></uv-button>
</view>
</view>
</view>
@@ -124,7 +141,7 @@
<!-- 动画弹出框 -->
<uv-popup ref="popupAnimation" mode="center" @change="changeAnimation" :safeAreaInsetTop="false" :safeAreaInsetBottom="false" :zoom="false" duration="0">
<view class="animation_pixel">
- <view class="back_btn" @click="popupAnimationClose">
+ <view class="back_btn" v-show="false" @click="popupAnimationClose">
<uv-icon name="arrow-leftward" color="#333" size="30"></uv-icon>
</view>
<!-- 操作按钮 -->
@@ -134,9 +151,12 @@
<!-- 动画按钮 -->
<view class="controls" v-if="showControls">
- <uv-button type="primary" :plain="true" text="分辨率" @click="changeRatio()"></uv-button>
+ <!-- <uv-button type="primary" :plain="true" text="分辨率" @click="changeRatio()"></uv-button> -->
<uv-button type="primary" :plain="true" text="颜色" @click="changeColor()"></uv-button>
- <uv-button type="primary" :plain="true" text="添加文字" @click="addText()"></uv-button>
+ <uv-button type="primary" :plain="true" text="左移" @click="shiftLeft()"></uv-button>
+ <uv-button type="primary" :plain="true" text="下移" @click="shiftDown()"></uv-button>
+ <uv-button type="primary" :plain="true" text="右移" @click="shiftRight()"></uv-button>
+ <uv-button type="primary" :plain="true" text="文字" @click="addText()"></uv-button>
<uv-button type="primary" :plain="true" text="清除" @click="clear()"></uv-button>
<uv-button type="primary" :plain="true" text="保存" @click="clickSaveData"></uv-button>
</view>
@@ -162,17 +182,58 @@
<view class="pixel_cell_item" :style="{ backgroundColor: cell }"></view>
</view>
</view>
+ <view style="height:20vh;"></view>
</scroll-view>
+ <view class="exit_btn">
+ <uv-button type="success" :plain="true" text="退出" @click="popupAnimationClose"></uv-button>
+ </view>
</view>
</uv-popup>
<!-- 分辨率 -->
<uv-picker ref="pickerRatio" :columns="columnsRatio" @confirm="confirmRatio"></uv-picker>
- <!-- 颜色 -->
+ <!-- 颜色选择器 -->
<uv-popup ref="pickerColor" mode="bottom" round="10" :closeable="true">
- <view class="color_list">
- <view class="color_item" v-for="(item, index) in colorList" :class="{ hover: color === item }" :key="index" :style="{ backgroundColor: item }" @click="clickColor(item)"></view>
+ <scroll-view scroll-y :show-scrollbar="false" class="color-picker-scroll">
+ <view class="color-picker-wrapper">
+ <view class="color-picker-inner">
+ <x-color-picker
+ v-model="color"
+ :show-alpha="false"
+ :save-history="true"
+ :options="pickerOptions"
+ @confirm="onColorConfirm"
+ @cancel="onColorCancel" />
+ </view>
+ </view>
+ </scroll-view>
+ </uv-popup>
+
+ <!-- 添加文字弹窗 -->
+ <uv-popup ref="popupText" mode="center" round="10" :safeAreaInsetTop="false" :safeAreaInsetBottom="false" :zoom="false" duration="0">
+ <view class="text_popup">
+ <view class="text_popup_title">添加文字</view>
+ <view class="text_popup_item">
+ <view class="text_popup_label">文字</view>
+ <view class="text_popup_input">
+ <uv-input placeholder="请输入文字" border="none" v-model="tempText" fontSize="16px"
+ customStyle="background: #ECEFF6;padding:8px 10px;border-radius: 6px;"></uv-input>
+ </view>
+ </view>
+ <view class="text_popup_item">
+ <view class="text_popup_label">类型</view>
+ <view class="text_popup_type">
+ <uv-radio-group v-model="textType" placement="row" labelSize="16px" style="gap:10px;">
+ <uv-radio label="覆盖" name="overwrite"></uv-radio>
+ <uv-radio label="追加" name="append"></uv-radio>
+ </uv-radio-group>
+ </view>
+ </view>
+ <view class="text_popup_btn">
+ <uv-button type="info" text="取消" @click="closeTextPopup"></uv-button>
+ <uv-button type="primary" text="确定" @click="confirmAddText" customStyle=""></uv-button>
+ </view>
</view>
</uv-popup>
@@ -183,7 +244,8 @@
import {
templeteAdd,
templeteInfo,
- templeteEdit
+ templeteEdit,
+ templeteList
} from '@/api/api.js'
let ctx = null
export default {
@@ -253,17 +315,11 @@
// columnsRatio: [
// ['12*24']
// ],
- colorList: [
- '#FF0000',
- '#00FF00',
- '#0000FF',
- '#FFFF00',
- '#FFA500',
- '#800080',
- '#00FFFF',
- '#FFC0CB'
- ],
- fpsIndex: 0,
+ color: '#FF0000',
+ gridRect: null,
+ pickerOptions: {
+ width: '50%',
+ },
fpsList: [],
tId: '',
tempInfo:{},
@@ -276,6 +332,11 @@
previewHeight: 12,
showControls: false,
scrollLeft: 0,
+ textType: 'overwrite',
+ tempText: '',
+ presetList: [],
+ selectedPreset: '',
+ isEditMode: false,
}
},
computed: {
@@ -291,9 +352,12 @@
this.tId = opt.id
this.getTempleteInfo()
this.titleName = '编辑模版'
+ this.isEditMode = true
}
else{
this.titleName = '新增模版'
+ this.isEditMode = false
+ this.getPresetList()
}
},
onShow() {
@@ -313,6 +377,30 @@
}
},
methods: {
+ getPresetList() {
+ templeteList({
+ userId: 1,
+ pageNum: 1,
+ pageSize: 99
+ }).then(res => {
+ console.log('预制动画列表-------', res.rows)
+ if(res.code == 200){
+ this.presetList = res.rows || []
+ }
+ })
+ },
+ changePreset(val) {
+ const preset = this.presetList.find(item => item.name === val)
+ if (preset) {
+ this.specVal = preset.screen
+ this.modeVal = preset.mode
+ this.total = preset.fpsTotal
+ this.speed = preset.speed
+ if (preset.fpsList) {
+ this.fpsList = JSON.parse(preset.fpsList)
+ }
+ }
+ },
handleScroll(e){
this.scrollLeft = e.detail.scrollLeft
},
@@ -521,9 +609,11 @@
changeColor() {
this.$refs.pickerColor.open();
},
- clickColor(item) {
- console.log('confirmColor---', item);
- this.color = item;
+ onColorConfirm(colorObj) {
+ this.color = colorObj.hex;
+ this.$refs.pickerColor.close();
+ },
+ onColorCancel() {
this.$refs.pickerColor.close();
},
changeRatio() {
@@ -557,14 +647,14 @@
getCellByTouch(touch, cb) {
this.getGridRect(rect => {
if (!rect) return
- const x = touch.clientX - rect.left + this.scrollLeft
+ const x = touch.clientX + this.scrollLeft
const y = touch.clientY - rect.top
const colCount = this.width * (this.modeVal == 2 ? 10 : 1)
const cellWidth = rect.width / colCount
const cellHeight = rect.height / this.height
const colIndex = Math.floor(x / cellWidth)
const rowIndex = Math.floor(y / cellHeight)
- console.log('colCount', colCount, 'colIndex', colIndex)
+ //console.log('colCount', colCount, 'rowIndex', rowIndex, 'colIndex', colIndex, x, cellWidth)
if (
colIndex >= 0 && colIndex < colCount &&
rowIndex >= 0 && rowIndex < this.height
@@ -619,6 +709,43 @@
// 将所有像素点设置为空字符串
this.pixelData = new Array(this.height * colCount).fill('')
},
+ shiftLeft() {
+ const colCount = this.width * (this.modeVal == 2 ? 10 : 1)
+ for (let r = 0; r < this.height; r++) {
+ const rowStart = r * colCount
+ const row = this.pixelData.slice(rowStart, rowStart + colCount)
+ const shifted = row.slice(1).concat(row.slice(0, 1))
+ for (let c = 0; c < colCount; c++) {
+ this.$set(this.pixelData, rowStart + c, shifted[c])
+ }
+ }
+ },
+ shiftRight() {
+ const colCount = this.width * (this.modeVal == 2 ? 10 : 1)
+ for (let r = 0; r < this.height; r++) {
+ const rowStart = r * colCount
+ const row = this.pixelData.slice(rowStart, rowStart + colCount)
+ const shifted = row.slice(colCount - 1).concat(row.slice(0, colCount - 1))
+ for (let c = 0; c < colCount; c++) {
+ this.$set(this.pixelData, rowStart + c, shifted[c])
+ }
+ }
+ },
+ shiftDown() {
+ const colCount = this.width * (this.modeVal == 2 ? 10 : 1)
+ const lastRowStart = (this.height - 1) * colCount
+ const lastRow = this.pixelData.slice(lastRowStart, lastRowStart + colCount)
+ for (let r = this.height - 1; r > 0; r--) {
+ const currentStart = r * colCount
+ const prevStart = (r - 1) * colCount
+ for (let c = 0; c < colCount; c++) {
+ this.$set(this.pixelData, currentStart + c, this.pixelData[prevStart + c])
+ }
+ }
+ for (let c = 0; c < colCount; c++) {
+ this.$set(this.pixelData, c, lastRow[c])
+ }
+ },
toggleControls() {
this.showControls = !this.showControls;
},
@@ -661,6 +788,26 @@
const colCount = this.width * (this.modeVal == 2 ? 10 : 1)
this.pixelData = new Array(this.height * colCount).fill('')
},
+ // 复制当前帧
+ copyFrame(index) {
+ uni.showModal({
+ title: '提示',
+ content: '确定要复制当前帧吗？',
+ success: (res) => {
+ if (res.confirm) {
+ const source = this.fpsList[index];
+ const copy = source ? [...source] : null;
+ this.fpsList.splice(index + 1, 0, copy);
+ this.total = this.fpsList.length;
+ uni.showToast({
+ title: '复制成功',
+ icon: 'success',
+ duration: 1500
+ });
+ }
+ }
+ });
+ },
// 屏幕规格
changeSpec(e) {
const ratio = e.split('*');
@@ -847,7 +994,7 @@
})
},
// 生成点阵数据
- generateDotMatrix(char) {
+ generateDotMatrix(char, startCol = null) {
return new Promise((resolve, reject) => {
// 使用 uni-app 的 canvas context
@@ -860,8 +1007,14 @@
// 绘制文字
// 垂直居中，稍微向上偏移一点
const y = this.canvasHeight / 2 + 10;
+ const colCount = this.width * (this.modeVal == 2 ? 10 : 1)
- if (this.modeVal == 2) {
+ if (startCol !== null) {
+ ctx.setTextAlign('left')
+ const cellWidth = this.canvasWidth / colCount;
+ const x = startCol * cellWidth;
+ ctx.fillText(char, x, y);
+ } else if (this.modeVal == 2) {
// 滚动动画：文字靠左对齐
ctx.setTextAlign('left')
const x = 20;
@@ -1015,38 +1168,66 @@
this.previewTimer = null;
}
},
- // 修改添加文字方法
- async addText() {
- uni.showModal({
- title: '添加文字',
- content: '',
- editable: true,
- placeholderText: '请输入文字',
- success: async (res) => {
- if (res.confirm) {
- const text = res.content;
- if (text.length > 0) {
- try {
- // 生成点阵数据
- const dotMatrix = await this.generateDotMatrix(text);
- console.log('点阵数据：', dotMatrix);
- this.pixelData = dotMatrix
- } catch (error) {
- console.error('生成点阵失败：', error);
- uni.showToast({
- title: '生成点阵失败',
- icon: 'none'
- });
- }
- } else {
- uni.showToast({
- title: '请输入文字',
- icon: 'none'
- });
- }
+ addText() {
+ this.tempText = '';
+ this.textType = 'overwrite';
+ this.$refs.popupText.open();
+ },
+ closeTextPopup() {
+ this.$refs.popupText.close();
+ },
+ async confirmAddText() {
+ const text = this.tempText;
+ if (!text || text.length === 0) {
+ uni.showToast({
+ title: '请输入文字',
+ icon: 'none'
+ });
+ return;
+ }
+
+ try {
+ if (this.textType === 'overwrite') {
+ const dotMatrix = await this.generateDotMatrix(text);
+ this.pixelData = dotMatrix;
+ } else {
+ const colCount = this.width * (this.modeVal == 2 ? 10 : 1);
+ const rightmostCol = this.findRightmostNonEmptyCol(colCount);
+ const startCol = rightmostCol === -1 ? 0 : rightmostCol + 2;
+ const dotMatrix = await this.generateDotMatrix(text, startCol);
+ this.mergePixelData(dotMatrix);
+ }
+ this.$refs.popupText.close();
+ } catch (error) {
+ console.error('生成点阵失败：', error);
+ uni.showToast({
+ title: '生成点阵失败',
+ icon: 'none'
+ });
+ }
+ },
+ findRightmostNonEmptyCol(colCount) {
+ for (let col = colCount - 1; col >= 0; col--) {
+ let isEmpty = true;
+ for (let row = 0; row < this.height; row++) {
+ const index = row * colCount + col;
+ if (this.pixelData[index] !== '' && this.pixelData[index] !== null && this.pixelData[index] !== undefined) {
+ isEmpty = false;
+ break;
}
}
- });
+ if (!isEmpty) {
+ return col;
+ }
+ }
+ return -1;
+ },
+ mergePixelData(dotMatrix) {
+ for (let i = 0; i < dotMatrix.length; i++) {
+ if (dotMatrix[i] !== '' && dotMatrix[i] !== null && dotMatrix[i] !== undefined) {
+ this.$set(this.pixelData, i, dotMatrix[i]);
+ }
+ }
},
}
}
@@ -1066,20 +1247,18 @@
justify-content: center;
margin-bottom: 15rpx;
}
- .color_list {
- width: 100%;
+ .color_picker_wrapper {
+ padding: 30rpx 0;
display: flex;
justify-content: center;
- flex-wrap: wrap;
- gap: 30rpx;
+ }
+ .color-picker-scroll {
+ max-height: 90vh;
box-sizing: border-box;
- padding: 50rpx;
-
- .color_item {
- width: 30rpx;
- height: 30rpx;
- border-radius: 5rpx;
- }
+ }
+ .color-picker-wrapper {
+ zoom: 0.5;
+ padding: 0 25%;
}
.action_btn {
@@ -1094,12 +1273,18 @@
}
.controls {
position: absolute;
- bottom: 10px;
- left: 130px;
+ bottom: 10rpx;
+ left: 100rpx;
display: flex;
- gap: 20px;
+ gap: 10rpx;
z-index: 9;
}
+ .exit_btn{
+ position: absolute;
+ right: 30rpx;
+ bottom: 10rpx;
+ z-index: 9999;
+ }
.animation_pixel{
width: 100vw;
height: 100vh;
@@ -1119,7 +1304,7 @@
top: -9999px;
}
.pixel_grid {
- height: 85vh;
+ height: 80vh;
border-bottom: 1px solid #eee;
display: grid;
gap: 1px;
@@ -1259,7 +1444,11 @@
}
- .item {}
+ .item {
+ flex-direction:row;
+ gap:20rpx;
+ display:flex;
+ }
}
.temp_item {
@@ -1301,4 +1490,49 @@
background: url('/static/img/bg_2.jpg') no-repeat center top;
background-size: 100% auto;
}
+
+ .text_popup {
+ width: 600rpx;
+ background: #fff;
+ border-radius: 20rpx;
+ padding: 40rpx 30rpx;
+ box-sizing: border-box;
+
+ .text_popup_title {
+ font-size: 16px;
+ font-weight: bold;
+ color: #333;
+ text-align: center;
+ margin-bottom: 15px;
+ }
+
+ .text_popup_item {
+ display: flex;
+ align-items: center;
+ margin-bottom: 15px;
+
+ .text_popup_label {
+ width: 50px;
+ font-size: 16px;
+ color: #666;
+ flex-shrink: 0;
+ }
+
+ .text_popup_input {
+ flex: 1;
+ font-size: 16px;
+ }
+
+ .text_popup_type {
+ flex: 1;
+ }
+ }
+
+ .text_popup_btn {
+ display: flex;
+ margin-top: 20px;
+ justify-content: center;
+ gap: 20px;
+ }
+ }
</style>
\ No newline at end of file
--
Gitblit v1.10.0