From 8902fcc18af94f07da6fc124d91ca08c543fd260 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 26 Aug 2024 15:03:49 +0800 Subject: [PATCH] =?UTF-8?q?[6.6.0]=E8=B0=83=E6=95=B4=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=BC=B9=E7=AA=97=E4=BD=8D=E7=BD=AE=E5=92=8C?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E9=80=89=E6=8B=A9=E7=AA=97=E5=8F=A3=E5=BD=95?= =?UTF-8?q?=E9=9F=B3=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/BadCaseManager.kt | 4 +++- .../workorder/FaultReasonWindow.kt | 10 +++++----- .../workorder/ReportTypeWindow.kt | 13 ++++++++----- .../workorder/TakeOverReasonWindow.kt | 3 ++- .../workorder/WorkOrderWindow.kt | 2 +- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt index f01ca7f96c..27fb6cfbdd 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt @@ -205,7 +205,9 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis reportTypeWindow = null } }) - reportTypeWindow?.showFloatWindow() + val xPosition: Int = (view.left+view.right)/2 - 228 + val yPosition: Int = view.top - 250 + reportTypeWindow?.showFloatWindow(xPosition,yPosition) } }else{ //展示工单上报弹窗 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt index e5ff7af426..c25f0f64a0 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt @@ -353,7 +353,9 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener, } //开始录音，展示放大缩小动效 val scaleAnimation = ScaleAnimation( - 1.0f, 0.8f, 1.0f, 0.8f) + 1.0f, 0.8f, 1.0f, 0.8f, + Animation.RELATIVE_TO_SELF, 0.5f, + Animation.RELATIVE_TO_SELF, 0.5f) scaleAnimation.duration = 1000 scaleAnimation.repeatCount = -1 ivNoteAudio.startAnimation(scaleAnimation) @@ -509,10 +511,8 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener, super.problemPadAddSuccess() //显示上报成功页面，短暂停留关闭弹窗 ThreadUtils.runOnUiThread { - if(ivNoteAudio.hasTransientState()){ - //结束动画 - ivNoteAudio.clearAnimation() - } + //结束动画 + ivNoteAudio.clearAnimation() rvFaultList.visibility = View.GONE tvUploadSuccess.visibility = View.VISIBLE faultReasonGroup.visibility = View.GONE diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt index 494914ba77..b525184120 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt @@ -19,7 +19,6 @@ import androidx.constraintlayout.widget.Group import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager -import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.zhjt.mogo_core_function_devatools.R @@ -118,7 +117,6 @@ class ReportTypeWindow constructor(activity: Activity): IMoGoDevaToolsListener { hasReportOperate = true //TODO - CallerDevaToolsListenerManager.invokeProblemPadAddSuccess() } //故障类 tvReportTypeFault.setOnClickListener { @@ -149,13 +147,18 @@ class ReportTypeWindow constructor(activity: Activity): IMoGoDevaToolsListener { } - fun showFloatWindow() { + /** + * 展示弹窗 + * @param xPosition X轴坐标 + * @param yPosition Y轴坐标 + */ + fun showFloatWindow(xPosition: Int,yPosition: Int) { if (mFloatLayout.parent == null) { val metrics = DisplayMetrics() // 默认固定位置，靠屏幕右边缘的中间 mWindowManager!!.defaultDisplay.getMetrics(metrics) - mWindowParams!!.x = metrics.widthPixels-2258 - mWindowParams!!.y = metrics.heightPixels - BarUtils.getStatusBarHeight()-420 + mWindowParams!!.x = xPosition + mWindowParams!!.y = yPosition mWindowManager!!.addView(mFloatLayout, mWindowParams) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt index da5e546bc0..859c8b16d0 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt @@ -291,7 +291,8 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene //开始录音，展示放大缩小动效 val scaleAnimation = ScaleAnimation( 1.0f, 0.8f, 1.0f, 0.8f, - Animation.RELATIVE_TO_SELF, 0.8f, Animation.RELATIVE_TO_SELF, 0.8f + Animation.RELATIVE_TO_SELF, 0.5f, + Animation.RELATIVE_TO_SELF, 0.5f ) scaleAnimation.duration = 1000 scaleAnimation.repeatCount = -1 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt index 266fa91225..895a24ab16 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt @@ -260,7 +260,7 @@ class WorkOrderWindow constructor(activity: Activity) : View.OnTouchListener, //开始录音，展示放大缩小动效 val scaleAnimation = ScaleAnimation( 1.0f, 0.8f, 1.0f, 0.8f, - Animation.RELATIVE_TO_SELF, 0.8f, Animation.RELATIVE_TO_SELF, 0.8f + Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f ) scaleAnimation.duration = 1000 scaleAnimation.repeatCount = -1