dyf/APP
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new-20250827 合并版本 #24

Closed
liubiao wants to merge 0 commits from liubiao/APP:new-20250827 into main
pull from: liubiao/APP:new-20250827
merge into: dyf:main
Conversation 0 Commits - Files Changed -
liubiao commented 2025-11-21 16:33:33 +08:00
First-time contributor
Copy Link
No description provided.
liubiao added 45 commits 2025-11-21 16:33:35 +08:00
添加几个函数 e470726fbd
Merge branch 'main' of http://47.107.152.87:3000/liubiao/APP 0ac0d1998a 
# Conflicts:
#	unpackage/dist/dev/app-plus/app-config-service.js
#	unpackage/dist/dev/app-plus/app-service.js
#	unpackage/dist/dev/app-plus/app-view.js
添加蓝牙通讯握手 3c0bf2f770
蓝牙握手提交 40639d2bad
Merge branch 'main' of http://47.107.152.87:3000/liubiao/APP e5e2aca0c4 
# Conflicts:
#	.gitignore
#	pages/common/index/index.vue
#	unpackage/dist/dev/app-plus/app-config-service.js
#	unpackage/dist/dev/app-plus/app-service.js
#	unpackage/dist/dev/app-plus/app-view.js
#	unpackage/dist/dev/app-plus/manifest.json
#	utils/request.js
Merge remote-tracking branch 'upstream/main' 4ebdec8dac 
# Conflicts:
#	pages/common/index/index.vue
添加文本行转点阵的插件 a3865e2f26
650蓝牙协议更新 b3c0b74628
6155点阵插件完成。 ca844723fa
BLE发送数据添加安卓苹果不同的逻辑 4ab10bb251
Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 47a9dace85 
# Conflicts:
#	pages.json
#	unpackage/dist/dev/app-plus/app-config-service.js
#	unpackage/dist/dev/app-plus/app-service.js
#	unpackage/dist/dev/app-plus/app-view.js
#	unpackage/dist/dev/app-plus/manifest.json
#	utils/request.js
添加全局蓝牙 d9a28d0345
增加650的跳转 5eea3a0fff
增加绑定蓝牙页面 e39356bbe0
修复650id大小写错误 1ed6ca4828
650全局蓝牙优化 958a74101e
增加6155、650跳转 6650334525
修改main.js，去除原有的蓝牙插件 6b4d47828e
650小bug修复 ceafd10b72
跟主分支合并 84c0a6ae18
添加类型路由后，合并版本 4df8330738
合并版本 6ef2bb08b9
6155完成部分协议对接 e95b2466e1
添加全局消息监听 535f4728ea
解决版本冲突 76329756c9
添加全局蓝牙消息监听 5e5bde6934
添加全局蓝牙监听 96acaa5d94
添加全局蓝牙监听 585bd76a0a
添加全局蓝牙监听 793fe7132b
650完成，670完成部分 bbf55c58f0
650完成 7f4fd00937
650完成 295f904b10
650完成，并解决了冲突 2c2a75aa02
Merge branch 'liubiao-main' b1ba355cb2
Revert "提交" c9996748eb 
This reverts commit 8d97dcf121.
670完成 dfb6f29683
670完成 cd912b861e
尝试解决主分支冲突 2adc73cdab
Merge branch 'main' into new-20250827 401e78cd8b
6155发送视频修改，方便随时切换切片大小 a8ce1d9680
merge upstream 4790892a24
Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827 864dd59b4c 
# Conflicts:
#	pages/6155/deviceDetail.vue
102主从机告警 1558045882
合并主分支 ec6deab32a 
# Conflicts:
#	pages/210/deviceControl/index.vue
#	pages/650/HBY650.vue
#	pages/common/index/index.vue
#	unpackage/dist/dev/app-plus/static/tabs/device-HL.png
#	unpackage/dist/dev/app-plus/static/tabs/device.png
#	unpackage/dist/dev/app-plus/static/tabs/my-HL.png
#	unpackage/dist/dev/app-plus/static/tabs/my.png
#	utils/BleReceive.js
#	utils/loading.js
Merge branch 'main' of http://47.107.152.87:3000/dyf/APP into new-20250827 8270cc77d7 
# Conflicts:
#	pages/6155/deviceDetail.vue
liubiao added 1 commit 2025-11-24 08:20:47 +08:00
merge upstream 2ba53fcf92
fengerli closed this pull request 2025-11-25 14:48:55 +08:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
chenyouting fengerli zhuhongkui dyf
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: dyf/APP#24
No description provided.
Delete Branch "liubiao/APP:new-20250827"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?