diff --git a/static/js/lib/common/MyUtils.js b/static/js/lib/common/MyUtils.js index 4d999a7..fe7cc0f 100644 --- a/static/js/lib/common/MyUtils.js +++ b/static/js/lib/common/MyUtils.js @@ -340,12 +340,50 @@ export class MyUtils { console.log("body-frontSize: ", myEditFrontSize.style.fontSize); - setTimeout(() => { - this.keyBoardHeight = window.innerHeight - window.visualViewport.height; - // console.log("mobile: ", this.keyBoardHeight); - let testDiv = document.getElementById("testDevice"); - testDiv.innerText = "\nmobile: " + this.keyBoardHeight - }, 800); + let testDiv = document.getElementById("testDevice"); + var resizeHeight = document.documentElement.clientHeight || document.body.clientHeight; + if (window.myEdit.ctx.originHeight < resizeHeight) { + console.log('Android 键盘收起啦!'); + testDiv.innerText = "\nmobile: " + 'Android 键盘收起啦!' + + "\noriginHeight " + window.myEdit.ctx.originHeight + + "\nresizeHeight:" + resizeHeight + + "\ninnerHeight:" + window.innerHeight + + "\nvisualViewport.height: " + window.visualViewport.height + // Android 键盘收起后操作 + let styleUtils = document.getElementById("_style_utils"); + styleUtils.style.display = "none"; + } else { + console.log('Android 键盘弹起啦!'); + testDiv.innerText = "\nmobile: " + 'Android 键盘弹起啦!' + + "\noriginHeight " + window.myEdit.ctx.originHeight + + "\nresizeHeight " + resizeHeight + + "\ninnerHeight:" + window.innerHeight + + "\nvisualViewport.height: " + window.visualViewport.height + + + // Android 键盘弹起后操作 + setTimeout(() => { + this.keyBoardHeight = window.innerHeight - window.visualViewport.height; + // console.log("mobile: ", this.keyBoardHeight); + + testDiv.innerText = "\nmobile: " + this.keyBoardHeight + + "\noriginHeight " + window.myEdit.ctx.originHeight + + "\nresizeHeight " + resizeHeight + + "\ninnerHeight:" + window.innerHeight + + "\nvisualViewport.height: " + window.visualViewport.height + + + let styleUtils = document.getElementById("_style_utils"); + styleUtils.style.display = "block"; + // styleUtils.style.left = 0; + styleUtils.style.bottom = "600px"; + }, 800); + + + } + window.myEdit.ctx.originHeight = resizeHeight; + + } /** diff --git a/static/js/lib/event/MyEventListener.js b/static/js/lib/event/MyEventListener.js index a3ca687..dda152d 100644 --- a/static/js/lib/event/MyEventListener.js +++ b/static/js/lib/event/MyEventListener.js @@ -150,8 +150,10 @@ export class MyEventListener { MouseUpOrTouchend(e) { let styleUtils = document.getElementById("_style_utils"); if (window.myEdit.utils.GetSelection().isCollapsed) { - console.log("none") - styleUtils.style.display = "none"; + // console.log("none") + if (!window.myEdit.ctx.isMobile) { + styleUtils.style.display = "none"; + } return } diff --git a/static/js/lib/main.js b/static/js/lib/main.js index 47afb80..699e363 100644 --- a/static/js/lib/main.js +++ b/static/js/lib/main.js @@ -182,12 +182,6 @@ window.onload = function () { } - setTimeout(() => { - this.keyBoardHeight = window.innerHeight - window.visualViewport.height; - // console.log("mobile: ", this.keyBoardHeight); - let testDiv = document.getElementById("testDevice"); - testDiv.innerText = "\nmobile: " + this.keyBoardHeight - }, 800); } }