From 5db5ad55a414ace48474b11fbc944710ee9fca18 Mon Sep 17 00:00:00 2001
From: Stapxs <1007028430.stapx@gmail.com>
Date: Sat, 23 Apr 2022 13:46:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=89=E8=99=AB=E5=AD=90=20:bug:=20=E4=BF=AE?=
=?UTF-8?q?=E6=AD=A3=E4=BA=86=E5=90=88=E5=B9=B6=E8=BD=AC=E5=8F=91=E6=B6=88?=
=?UTF-8?q?=E6=81=AF=E6=A1=86=E9=AB=98=E5=BA=A6=E9=94=99=E8=AF=AF=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=20:zap:=20=E9=99=90=E5=88=B6=E4=BA=86?=
=?UTF-8?q?=E6=B6=88=E6=81=AF=E6=BB=91=E5=8A=A8=E7=9A=84=E8=B7=9D=E7=A6=BB?=
=?UTF-8?q?=E4=BB=A5=E9=98=B2=E9=95=BF=E8=B7=9D=E7=A6=BB=E5=B8=83=E5=B1=80?=
=?UTF-8?q?=E5=81=8F=E7=A7=BB=E5=AF=BC=E8=87=B4=E7=9A=84=E6=80=A7=E8=83=BD?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=20:sparkles:=20#7=20=E7=8E=B0=E5=9C=A8?=
=?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=8D=E4=BC=9A=E5=87=BA=E5=B1=8F=E5=B9=95?=
=?UTF-8?q?=E4=BA=86=20<-=20@Logic-Accepted=20:sparkles:=20#8=20=E7=8E=B0?=
=?UTF-8?q?=E5=9C=A8=E6=92=A4=E5=9B=9E=E6=B6=88=E6=81=AF=E5=A4=B1=E8=B4=A5?=
=?UTF-8?q?=E4=BC=9A=E6=9C=89=E6=8F=90=E7=A4=BA=E4=BA=86=20<-=20@Logic-Acc?=
=?UTF-8?q?epted=20:sparkles:=20#6=20=E7=8E=B0=E5=9C=A8=E8=A7=A6=E5=8F=91?=
=?UTF-8?q?=E5=9B=9E=E5=A4=8D=E4=BC=9A=E8=87=AA=E5=8A=A8=E5=8F=96=E6=B6=88?=
=?UTF-8?q?=E6=8E=89=E8=BD=AC=E5=8F=91=EF=BC=8C=E5=8F=8D=E4=B9=8B=E5=90=8C?=
=?UTF-8?q?=20<-=20@Logic-Accepted?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 2 +-
js/chat.js | 48 ++++++++++++++++++++++++++++---------------
js/impl/notice_fun.js | 7 +++++++
main.js | 2 +-
4 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/index.html b/index.html
index 7983d45..d15059b 100644
--- a/index.html
+++ b/index.html
@@ -84,7 +84,7 @@
合并消息
-
+
diff --git a/js/chat.js b/js/chat.js
index 5ec9279..94bf198 100644
--- a/js/chat.js
+++ b/js/chat.js
@@ -476,23 +476,25 @@ function msgTouchMove(sender, event) {
if(x < -10) {
// 左滑
window.msgOnMove = "on"
- if(dx > sender.offsetWidth / 10) {
+ if(dx >= sender.offsetWidth / 10) {
showLog("b573f7", "fff", "UI", "触发左滑判定 ……")
window.msgOnMove = "right"
window.msgInMenu = sender
+ } else {
+ sender.style.transform = "translate(" + dx + "px)"
+ sender.style.transition = "transform 0s"
}
- sender.style.transform = "translate(" + dx + "px)"
- sender.style.transition = "transform 0s"
} else if(x > 10) {
// 右滑
window.msgOnMove = "on"
- if(dx > sender.offsetWidth / 10) {
+ if(dx >= sender.offsetWidth / 10) {
showLog("b573f7", "fff", "UI", "触发右滑判定 ……")
window.msgOnMove = "left"
window.msgInMenu = sender
+ } else {
+ sender.style.transform = "translate(-" + dx + "px)"
+ sender.style.transition = "transform 0s"
}
- sender.style.transform = "translate(-" + dx + "px)"
- sender.style.transition = "transform 0s"
}
}else {
window.msgOnMove = null
@@ -524,13 +526,14 @@ function msgTouchEnd(sender, event) {
}
function showMsgMenu(sender, event) {
+ const menu = document.getElementById("right-click-menu")
+ const body = document.getElementById("right-click-menu-body")
if(sender == undefined || sender == null) {
- document.getElementById("right-click-menu").children[1].style.transform = "scaleY(0)"
+ body.style.transform = "scaleY(0)"
document.getElementById("right-click-menu-bg").onmousedown = null
setTimeout(() => {
- document.getElementById("right-click-menu").style.display = "none"
+ menu.style.display = "none"
// 恢复被隐藏的菜单
- const body = document.getElementById("right-click-menu-body")
for(let i=0; i {
- document.getElementById("right-click-menu").children[1].style.transform = "scaleY(1)"
+ body.style.transform = "scaleY(1)"
setTimeout(() => {
document.getElementById("right-click-menu-bg").onmousedown = function() { showMsgMenu() }
}, 100)
@@ -571,6 +583,7 @@ function showMsgMenu(sender, event) {
}
function menuReply() {
+ cancelResend()
if(window.msgInMenu != undefined && window.msgInMenu != null) {
// 设置回复标志
document.getElementById("replyer-txt").innerText = window.msgInMenu.dataset.raw
@@ -594,6 +607,7 @@ function cancelReply() {
}
function menuResend() {
+ cancelReply()
if(window.msgInMenu != undefined && window.msgInMenu != null) {
// 显示提示控件
document.getElementById("resend-tips").style.height = "45px"
diff --git a/js/impl/notice_fun.js b/js/impl/notice_fun.js
index f814292..d8b4a41 100644
--- a/js/impl/notice_fun.js
+++ b/js/impl/notice_fun.js
@@ -20,6 +20,7 @@ function runJSON(json) {
case "send_msg": sendMsgBack(msg.data.message_id); break // 发送消息回调
case "get_forward_msg": printForwardMsg(msg.data); break // 输出合并转发消息详情
case "get_group_member_list": saveGroupMemberList(msg.data); break // 获取群成员列表
+ case "delete_msg": deleteMsgBack(msg); break // 删除消息回调
default: {
// 处理其他特殊的返回
if(msg.echo.indexOf("get_rep_msg_") >= 0) {
@@ -64,6 +65,12 @@ function runJSON(json) {
// ----------------------------------------------------------------------------------
+function deleteMsgBack(msg) {
+ if(msg.status == "failed") {
+ setStatue("err", "撤回消息失败，可能是消息不存在或消息超时。(" + msg.error.code + ":" + msg.error.message + ")")
+ }
+}
+
function setFriendList(data) {
// 遍历列表
//
diff --git a/main.js b/main.js
index f3cc11f..58c6875 100644
--- a/main.js
+++ b/main.js
@@ -1,4 +1,4 @@
-window.version = 'v1.27'
+window.version = 'v1.271'
document.getElementById("opt-version").innerText = window.version
// 自动暗黑模式标志
window.is_auto_dark = true