From b360945fa9bc64f6736283b003726a3a643e700c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Thu, 5 Aug 2021 20:57:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E9=80=9A=E7=9F=A5=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E7=9A=84=E6=B1=87=E6=80=BB=E5=88=B0notification=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/module/hmi/notification/WarningFloat.kt   |  7 ++++---
 .../hmi/notification/WarningFloatWindowHelper.kt       |  8 ++++----
 .../hmi/notification/WarningNotificationConfig.kt      | 10 +++++-----
 .../hmi/{ => notification}/anim/AnimatorManager.kt     |  2 +-
 .../hmi/{ => notification}/anim/DefaultAnimator.kt     |  6 +++---
 .../module/hmi/{ => notification}/enums/ShowPattern.kt |  2 +-
 .../module/hmi/{ => notification}/enums/SidePattern.kt |  2 +-
 .../{ => notification}/interfaces/OnFloatAnimator.kt   |  6 +++---
 .../{ => notification}/interfaces/OnFloatCallbacks.kt  |  4 ++--
 .../{ui => notification}/widget/ParentFrameLayout.kt   |  4 ++--
 .../java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt |  4 ++--
 11 files changed, 28 insertions(+), 27 deletions(-)
 rename modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/{ => notification}/anim/AnimatorManager.kt (94%)
 rename modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/{ => notification}/anim/DefaultAnimator.kt (97%)
 rename modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/{ => notification}/enums/ShowPattern.kt (86%)
 rename modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/{ => notification}/enums/SidePattern.kt (93%)
 rename modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/{ => notification}/interfaces/OnFloatAnimator.kt (80%)
 rename modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/{ => notification}/interfaces/OnFloatCallbacks.kt (90%)
 rename modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/{ui => notification}/widget/ParentFrameLayout.kt (94%)

diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/WarningFloat.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/WarningFloat.kt
index a61c5d3ca3..b0cddce603 100644
--- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/WarningFloat.kt
+++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/WarningFloat.kt
@@ -2,13 +2,13 @@ package com.mogo.module.hmi.notification
 
 import android.content.Context
 import android.view.View
-import com.mogo.module.hmi.enums.SidePattern
-import com.mogo.module.hmi.interfaces.OnFloatAnimator
+import com.mogo.module.hmi.notification.enums.SidePattern
+import com.mogo.module.hmi.notification.interfaces.OnFloatAnimator
 import com.mogo.utils.WindowUtils
 import com.mogo.utils.logger.Logger
 
 /**
- * @author xiaoyuzhou
+ * @author donghongyu
  * @date 2021/8/3 5:50 下午
  * 预警通知管理
  */
@@ -64,6 +64,7 @@ class WarningFloat {
         fun setLayout(layoutView: View) = apply {
             config.layoutView = layoutView
         }
+
         /**
          * 设置浮窗的对齐方式，以及偏移量
          * @param gravity 对齐方式
diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/WarningFloatWindowHelper.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/WarningFloatWindowHelper.kt
index 7794ea9a91..1b8e0cb2d2 100644
--- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/WarningFloatWindowHelper.kt
+++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/WarningFloatWindowHelper.kt
@@ -11,14 +11,14 @@ import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.WindowManager
-import com.mogo.module.hmi.anim.AnimatorManager
-import com.mogo.module.hmi.enums.ShowPattern
-import com.mogo.module.hmi.ui.widget.ParentFrameLayout
+import com.mogo.module.hmi.notification.anim.AnimatorManager
+import com.mogo.module.hmi.notification.enums.ShowPattern
+import com.mogo.module.hmi.notification.widget.ParentFrameLayout
 import com.mogo.utils.WindowUtils
 import com.mogo.utils.logger.Logger
 
 /**
- * @author xiaoyuzhou
+ * @author donghongyu
  * @date 2021/8/5 5:29 下午
  */
 internal class WarningFloatWindowHelper(
diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/WarningNotificationConfig.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/WarningNotificationConfig.kt
index b10f7f70fb..ddaa97702d 100644
--- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/WarningNotificationConfig.kt
+++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/WarningNotificationConfig.kt
@@ -1,11 +1,11 @@
 package com.mogo.module.hmi.notification
 
 import android.view.View
-import com.mogo.module.hmi.anim.DefaultAnimator
-import com.mogo.module.hmi.enums.ShowPattern
-import com.mogo.module.hmi.enums.SidePattern
-import com.mogo.module.hmi.interfaces.OnFloatAnimator
-import com.mogo.module.hmi.interfaces.OnFloatCallbacks
+import com.mogo.module.hmi.notification.anim.DefaultAnimator
+import com.mogo.module.hmi.notification.enums.ShowPattern
+import com.mogo.module.hmi.notification.enums.SidePattern
+import com.mogo.module.hmi.notification.interfaces.OnFloatAnimator
+import com.mogo.module.hmi.notification.interfaces.OnFloatCallbacks
 
 /**
  * @author xiaoyuzhou
diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/anim/AnimatorManager.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/anim/AnimatorManager.kt
similarity index 94%
rename from modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/anim/AnimatorManager.kt
rename to modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/anim/AnimatorManager.kt
index 15199d11ed..54fa109234 100644
--- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/anim/AnimatorManager.kt
+++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/anim/AnimatorManager.kt
@@ -1,4 +1,4 @@
-package com.mogo.module.hmi.anim
+package com.mogo.module.hmi.notification.anim
 
 import android.animation.Animator
 import android.view.View
diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/anim/DefaultAnimator.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/anim/DefaultAnimator.kt
similarity index 97%
rename from modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/anim/DefaultAnimator.kt
rename to modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/anim/DefaultAnimator.kt
index 01eacd459a..84472bea99 100644
--- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/anim/DefaultAnimator.kt
+++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/anim/DefaultAnimator.kt
@@ -1,12 +1,12 @@
-package com.mogo.module.hmi.anim
+package com.mogo.module.hmi.notification.anim
 
 import android.animation.Animator
 import android.animation.ValueAnimator
 import android.graphics.Rect
 import android.view.View
 import android.view.WindowManager
-import com.mogo.module.hmi.enums.SidePattern
-import com.mogo.module.hmi.interfaces.OnFloatAnimator
+import com.mogo.module.hmi.notification.enums.SidePattern
+import com.mogo.module.hmi.notification.interfaces.OnFloatAnimator
 import com.mogo.utils.WindowUtils
 import kotlin.math.min
 
diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/enums/ShowPattern.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/enums/ShowPattern.kt
similarity index 86%
rename from modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/enums/ShowPattern.kt
rename to modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/enums/ShowPattern.kt
index ed2165d89a..e2b08e57a5 100644
--- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/enums/ShowPattern.kt
+++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/enums/ShowPattern.kt
@@ -1,4 +1,4 @@
-package com.mogo.module.hmi.enums
+package com.mogo.module.hmi.notification.enums
 
 /**
  * @author: donghongyu
diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/enums/SidePattern.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/enums/SidePattern.kt
similarity index 93%
rename from modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/enums/SidePattern.kt
rename to modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/enums/SidePattern.kt
index 898fb3dccc..012dbe2c06 100644
--- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/enums/SidePattern.kt
+++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/enums/SidePattern.kt
@@ -1,4 +1,4 @@
-package com.mogo.module.hmi.enums
+package com.mogo.module.hmi.notification.enums
 
 /**
  * @author: donghongyu
diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/interfaces/OnFloatAnimator.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/interfaces/OnFloatAnimator.kt
similarity index 80%
rename from modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/interfaces/OnFloatAnimator.kt
rename to modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/interfaces/OnFloatAnimator.kt
index 3c62f04e93..409ef55da1 100644
--- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/interfaces/OnFloatAnimator.kt
+++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/interfaces/OnFloatAnimator.kt
@@ -1,12 +1,12 @@
-package com.mogo.module.hmi.interfaces
+package com.mogo.module.hmi.notification.interfaces
 
 import android.animation.Animator
 import android.view.View
 import android.view.WindowManager
-import com.mogo.module.hmi.enums.SidePattern
+import com.mogo.module.hmi.notification.enums.SidePattern
 
 /**
- * @author: liuzhenfeng
+ * @author: donghongyu
  * @function: 系统浮窗的出入动画
  * @date: 2019-07-22  16:40
  */
diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/interfaces/OnFloatCallbacks.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/interfaces/OnFloatCallbacks.kt
similarity index 90%
rename from modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/interfaces/OnFloatCallbacks.kt
rename to modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/interfaces/OnFloatCallbacks.kt
index f58f7044f9..5b2c90c31e 100644
--- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/interfaces/OnFloatCallbacks.kt
+++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/interfaces/OnFloatCallbacks.kt
@@ -1,10 +1,10 @@
-package com.mogo.module.hmi.interfaces
+package com.mogo.module.hmi.notification.interfaces
 
 import android.view.MotionEvent
 import android.view.View
 
 /**
- * @author: liuzhenfeng
+ * @author: donghongyu
  * @function: 浮窗的一些状态回调
  * @date: 2019-07-16  14:11
  */
diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/ParentFrameLayout.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/widget/ParentFrameLayout.kt
similarity index 94%
rename from modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/ParentFrameLayout.kt
rename to modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/widget/ParentFrameLayout.kt
index 69390dde16..cf7b51af21 100644
--- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/ParentFrameLayout.kt
+++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/widget/ParentFrameLayout.kt
@@ -1,4 +1,4 @@
-package com.mogo.module.hmi.ui.widget
+package com.mogo.module.hmi.notification.widget
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -7,7 +7,7 @@ import android.widget.FrameLayout
 import com.mogo.module.hmi.notification.WarningNotificationConfig
 
 /**
- * @author: liuzhenfeng
+ * @author: donghongyu
  * @function: 系统浮窗的父布局，对touch事件进行了重新分发
  * @date: 2019-07-10  14:16
  */
diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt
index 3f06dffff8..003b33fa9f 100644
--- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt
+++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt
@@ -7,9 +7,9 @@ import android.view.WindowManager
 import android.view.animation.OvershootInterpolator
 import com.mogo.commons.mvp.MvpFragment
 import com.mogo.module.hmi.R
-import com.mogo.module.hmi.anim.DefaultAnimator
-import com.mogo.module.hmi.enums.SidePattern
 import com.mogo.module.hmi.notification.WarningFloat
+import com.mogo.module.hmi.notification.anim.DefaultAnimator
+import com.mogo.module.hmi.notification.enums.SidePattern
 
 /**
  * @author xiaoyuzhou