StatusBar 高度计算设置background后需要重新设置padding

2022-11-18 12:49:34 +08:00
parent 1607c60435
commit 4be507613b
23 changed files with 108 additions and 302 deletions
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt
@@ -19,6 +19,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
 import com.mogo.eagle.core.utilcode.util.AppUtils
+import com.mogo.eagle.core.utilcode.util.BarUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.TimeUtils
 import com.mogo.eagle.core.utilcode.util.TimeUtils.millis2String
@@ -299,14 +300,14 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
                mInViewY = motionEvent.y
                // 获取相对屏幕的坐标，即以屏幕左上角为原点
                mDownInScreenX = motionEvent.rawX
-                mDownInScreenY = motionEvent.rawY - getSysBarHeight(mActivity)
+                mDownInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight()
                mInScreenX = motionEvent.rawX
-                mInScreenY = motionEvent.rawY - getSysBarHeight(mActivity)
+                mInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight()
            }
            MotionEvent.ACTION_MOVE -> {
                // 更新浮动窗口位置参数
                mInScreenX = motionEvent.rawX
-                mInScreenY = motionEvent.rawY - getSysBarHeight(mActivity)
+                mInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight()
                mWindowParams!!.x = (mInScreenX - mInViewX).toInt()
                mWindowParams!!.y = (mInScreenY - mInViewY).toInt()
                // 手指移动的时候更新小悬浮窗的位置
@@ -322,7 +323,7 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
            // 默认固定位置，靠屏幕右边缘的中间
            mWindowManager!!.defaultDisplay.getMetrics(metrics)
            mWindowParams!!.x = metrics.widthPixels
-            mWindowParams!!.y = metrics.heightPixels / 2 - getSysBarHeight(mActivity)-350
+            mWindowParams!!.y = metrics.heightPixels / 2 - BarUtils.getStatusBarHeight()-350
            mWindowManager!!.addView(mFloatLayout, mWindowParams)
        }
    }
@@ -335,25 +336,6 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
        if (mFloatLayout.parent != null) mWindowManager!!.removeView(mFloatLayout)
    }

-    // 获取系统状态栏高度
-    private fun getSysBarHeight(activity: Activity): Int {
-        val c: Class<*>
-        val obj: Any
-        val field: Field
-        val x: Int
-        var sbar = 0
-        try {
-            c = Class.forName("com.android.internal.R\$dimen")
-            obj = c.newInstance()
-            field = c.getField("status_bar_height")
-            x = field.get(obj).toString().toInt()
-            sbar = activity.resources.getDimensionPixelSize(x)
-        } catch (e1: Exception) {
-            e1.printStackTrace()
-        }
-        return sbar
-    }
-
    fun setClickListener(clickListener: ClickListener) {
        this.clickListener = clickListener
    }
--- 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
@@ -23,6 +23,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
 import com.mogo.eagle.core.utilcode.util.AppUtils
+import com.mogo.eagle.core.utilcode.util.BarUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.TimeUtils
 import com.mogo.eagle.core.utilcode.util.TimeUtils.millis2String
@@ -314,14 +315,14 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
                mInViewY = motionEvent.y
                // 获取相对屏幕的坐标，即以屏幕左上角为原点
                mDownInScreenX = motionEvent.rawX
-                mDownInScreenY = motionEvent.rawY - getSysBarHeight(mActivity)
+                mDownInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight()
                mInScreenX = motionEvent.rawX
-                mInScreenY = motionEvent.rawY - getSysBarHeight(mActivity)
+                mInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight()
            }
            MotionEvent.ACTION_MOVE -> {
                // 更新浮动窗口位置参数
                mInScreenX = motionEvent.rawX
-                mInScreenY = motionEvent.rawY - getSysBarHeight(mActivity)
+                mInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight()
                mWindowParams!!.x = (mInScreenX - mInViewX).toInt()
                mWindowParams!!.y = (mInScreenY - mInViewY).toInt()
                // 手指移动的时候更新小悬浮窗的位置
@@ -337,7 +338,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
            // 默认固定位置，靠屏幕右边缘的中间
            mWindowManager!!.defaultDisplay.getMetrics(metrics)
            mWindowParams!!.x = metrics.widthPixels
-            mWindowParams!!.y = metrics.heightPixels / 2 - getSysBarHeight(mActivity)-350
+            mWindowParams!!.y = metrics.heightPixels / 2 - BarUtils.getStatusBarHeight()-350
            mWindowManager!!.addView(mFloatLayout, mWindowParams)
            //开启录包
            if(recordCaseEntity!=null){
@@ -358,25 +359,6 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
        if (mFloatLayout.parent != null) mWindowManager!!.removeView(mFloatLayout)
    }

-    // 获取系统状态栏高度
-    private fun getSysBarHeight(activity: Activity): Int {
-        val c: Class<*>
-        val obj: Any
-        val field: Field
-        val x: Int
-        var sbar = 0
-        try {
-            c = Class.forName("com.android.internal.R\$dimen")
-            obj = c.newInstance()
-            field = c.getField("status_bar_height")
-            x = field.get(obj).toString().toInt()
-            sbar = activity.resources.getDimensionPixelSize(x)
-        } catch (e1: Exception) {
-            e1.printStackTrace()
-        }
-        return sbar
-    }
-
    override fun onAutopilotRecordResult(recordPanel: RecordPanelOuterClass.RecordPanel) {
        CallerLogger.d("${M_DEVA}${TAG}", "-- 收到工控机录制任务回调 -- $recordPanel")
        ThreadUtils.runOnUiThread {
--- 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
@@ -21,10 +21,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarStatusListe
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
-import com.mogo.eagle.core.utilcode.util.AppUtils
-import com.mogo.eagle.core.utilcode.util.SizeUtils
-import com.mogo.eagle.core.utilcode.util.ThreadUtils
-import com.mogo.eagle.core.utilcode.util.TimeUtils
+import com.mogo.eagle.core.utilcode.util.*
 import com.mogo.eagle.core.utilcode.util.TimeUtils.millis2String
 import com.zhidao.loglib.call.LogInfoManagerFactory
 import com.zhidao.loglib.upload.OnUploadListener
@@ -270,14 +267,14 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
                mInViewY = motionEvent.y
                // 获取相对屏幕的坐标，即以屏幕左上角为原点
                mDownInScreenX = motionEvent.rawX
-                mDownInScreenY = motionEvent.rawY - getSysBarHeight(mActivity)
+                mDownInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight()
                mInScreenX = motionEvent.rawX
-                mInScreenY = motionEvent.rawY - getSysBarHeight(mActivity)
+                mInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight()
            }
            MotionEvent.ACTION_MOVE -> {
                // 更新浮动窗口位置参数
                mInScreenX = motionEvent.rawX
-                mInScreenY = motionEvent.rawY - getSysBarHeight(mActivity)
+                mInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight()
                mWindowParams!!.x = (mInScreenX - mInViewX).toInt()
                mWindowParams!!.y = (mInScreenY - mInViewY).toInt()
                // 手指移动的时候更新小悬浮窗的位置
@@ -293,7 +290,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
            // 默认固定位置，靠屏幕右边缘的中间
            mWindowManager!!.defaultDisplay.getMetrics(metrics)
            mWindowParams!!.x = metrics.widthPixels
-            mWindowParams!!.y = metrics.heightPixels / 2 - getSysBarHeight(mActivity)-350
+            mWindowParams!!.y = metrics.heightPixels / 2 - BarUtils.getStatusBarHeight()-350
            mWindowManager!!.addView(mFloatLayout, mWindowParams)
        }

@@ -346,25 +343,6 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
        if (mFloatLayout.parent != null) mWindowManager!!.removeView(mFloatLayout)
    }

-    // 获取系统状态栏高度
-    private fun getSysBarHeight(activity: Activity): Int {
-        val c: Class<*>
-        val obj: Any
-        val field: Field
-        val x: Int
-        var sbar = 0
-        try {
-            c = Class.forName("com.android.internal.R\$dimen")
-            obj = c.newInstance()
-            field = c.getField("status_bar_height")
-            x = field.get(obj).toString().toInt()
-            sbar = activity.resources.getDimensionPixelSize(x)
-        } catch (e1: Exception) {
-            e1.printStackTrace()
-        }
-        return sbar
-    }
-
    fun setRecord(key:String,fileName:String){
        recordKey = key
        recordFileName = fileName