diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt index 9d415bf026..86ae7fbd0d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt @@ -75,6 +75,7 @@ import record_cache.RecordPanelOuterClass import java.io.File import java.util.* import kotlin.collections.ArrayList +import kotlin.math.absoluteValue /** @@ -128,8 +129,6 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList private var mInViewX = 0f private var mInViewY = 0f - private var mDownInScreenX = 0f - private var mDownInScreenY = 0f private var mInScreenX = 0f private var mInScreenY = 0f @@ -501,8 +500,6 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList mInViewX = motionEvent.x mInViewY = motionEvent.y // 获取相对屏幕的坐标,即以屏幕左上角为原点 - mDownInScreenX = motionEvent.rawX - mDownInScreenY = motionEvent.rawY mInScreenX = motionEvent.rawX mInScreenY = motionEvent.rawY } @@ -510,6 +507,9 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList // 更新浮动窗口位置参数 mInScreenX = motionEvent.rawX mInScreenY = motionEvent.rawY + if(((mInScreenX - mInViewX)-mWindowParams!!.x).absoluteValue>150 || ((mInScreenY - mInViewY)-mWindowParams!!.y).absoluteValue>150){ + return true + } mWindowParams!!.x = (mInScreenX - mInViewX).toInt() mWindowParams!!.y = (mInScreenY - mInViewY).toInt() // 手指移动的时候更新小悬浮窗的位置 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt index 40271498b2..c47990e270 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt @@ -66,6 +66,7 @@ import org.json.JSONException import org.json.JSONObject import java.io.File import java.lang.StringBuilder +import kotlin.math.absoluteValue /** * @author XuXinChao @@ -103,8 +104,6 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene private var mInViewX = 0f private var mInViewY = 0f - private var mDownInScreenX = 0f - private var mDownInScreenY = 0f private var mInScreenX = 0f private var mInScreenY = 0f @@ -497,12 +496,6 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene mInViewX = motionEvent.x mInViewY = motionEvent.y // 获取相对屏幕的坐标,即以屏幕左上角为原点 - mDownInScreenX = motionEvent.rawX -// mDownInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight() -// mInScreenX = motionEvent.rawX -// mInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight() - - mDownInScreenY = motionEvent.rawY mInScreenX = motionEvent.rawX mInScreenY = motionEvent.rawY @@ -511,8 +504,10 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene hasOperated = true // 更新浮动窗口位置参数 mInScreenX = motionEvent.rawX -// mInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight() mInScreenY = motionEvent.rawY + if(((mInScreenX - mInViewX)-mWindowParams!!.x).absoluteValue>150 || ((mInScreenY - mInViewY)-mWindowParams!!.y).absoluteValue>150){ + return true + } mWindowParams!!.x = (mInScreenX - mInViewX).toInt() mWindowParams!!.y = (mInScreenY - mInViewY).toInt() // 手指移动的时候更新小悬浮窗的位置