[同步]包名和文件结构不一致问题

app/src/main/AndroidManifest.xml

@@ -41,7 +41,7 @@
         </provider>
 
         <receiver
-            android:name=".push.receiver.AlarmReceiver"
+            android:name=".business.push.receiver.AlarmReceiver"
             android:enabled="true"
             android:exported="true"
             android:permission="android.permission.RECEIVE_BOOT_COMPLETED">

app/src/main/java/com/base/appzxhy/MyApplication.kt

@@ -30,12 +30,12 @@ import com.base.appzxhy.bean.config.AdConfigBean
 import com.base.appzxhy.bean.config.ConfigBean
 import com.base.appzxhy.bean.config.PopupConfigBean
 import com.base.appzxhy.business.ads.AdsMgr
-import com.base.appzxhy.push.fcm.FCMManager
-import com.base.appzxhy.push.notification.MyNotificationManager
-import com.base.appzxhy.push.receiver.AlarmReceiver.Companion.startAlarm
-import com.base.appzxhy.push.receiver.ScreenStatusReceiver
-import com.base.appzxhy.push.timer.TimerManager.Companion.changeTimer
-import com.base.appzxhy.push.work.RepeatingWorker.Companion.schedulePeriodicWork
+import com.base.appzxhy.business.push.fcm.FCMManager
+import com.base.appzxhy.business.push.notification.MyNotificationManager
+import com.base.appzxhy.business.push.receiver.AlarmReceiver.Companion.startAlarm
+import com.base.appzxhy.business.push.receiver.ScreenStatusReceiver
+import com.base.appzxhy.business.push.timer.TimerManager.Companion.changeTimer
+import com.base.appzxhy.business.push.work.RepeatingWorker.Companion.schedulePeriodicWork
 
 
 class MyApplication : Application() {

app/src/main/java/com/base/appzxhy/business/push/fcm/FCMManager.kt

-package com.base.appzxhy.push.fcm
+package com.base.appzxhy.business.push.fcm
 
 import android.content.Context
 import android.util.Log

app/src/main/java/com/base/appzxhy/business/push/fcm/FcmReceiver.kt

@@ -5,8 +5,8 @@ import android.content.Context
 import android.content.Intent
 import com.base.appzxhy.bean.push.NotificationSendBean
 import com.base.appzxhy.bean.push.NotificationSendBean.Companion.POPUP_WHERE_FCM
-import com.base.appzxhy.push.notification.MyNotificationManager
 import com.base.appzxhy.business.helper.EventUtils.event
+import com.base.appzxhy.business.push.notification.MyNotificationManager
 
 class FcmReceiver : BroadcastReceiver() {
 

app/src/main/java/com/base/appzxhy/business/push/fcm/MessagingService.kt

@@ -3,8 +3,8 @@ package com.base.appzxhy.business.push.fcm
 import android.annotation.SuppressLint
 import com.base.appzxhy.bean.push.NotificationSendBean
 import com.base.appzxhy.bean.push.NotificationSendBean.Companion.POPUP_WHERE_FCM
-import com.base.appzxhy.push.notification.MyNotificationManager
 import com.base.appzxhy.business.helper.EventUtils.event
+import com.base.appzxhy.business.push.notification.MyNotificationManager
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import org.json.JSONObject

app/src/main/java/com/base/appzxhy/business/push/notification/MyNotificationManager.kt

-package com.base.appzxhy.push.notification
+package com.base.appzxhy.business.push.notification
 
 import android.content.Context
 import com.base.appzxhy.BuildConfig
@@ -81,7 +81,7 @@ object MyNotificationManager {
                     }
 
                     //提前准备数据
-                    when(bean.actionId){
+                    when (bean.actionId) {
 
                     }
 

app/src/main/java/com/base/appzxhy/business/push/notification/NotificationBeanUtils.kt

-package com.base.appzxhy.push.notification
+package com.base.appzxhy.business.push.notification
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory

app/src/main/java/com/base/appzxhy/business/push/notification/NotificationHoverUtils.kt

-package com.base.appzxhy.push.notification
+package com.base.appzxhy.business.push.notification
 
 import android.os.Handler
 import android.os.HandlerThread

app/src/main/java/com/base/appzxhy/business/push/notification/NotificationUiUtil.kt

-package com.base.appzxhy.push.notification
+package com.base.appzxhy.business.push.notification
 
 import android.app.NotificationChannel
 import android.app.NotificationManager

app/src/main/java/com/base/appzxhy/business/push/receiver/AlarmReceiver.kt

-package com.base.appzxhy.push.receiver
+package com.base.appzxhy.business.push.receiver
 
 import android.annotation.SuppressLint
 import android.app.AlarmManager
@@ -11,8 +11,8 @@ import com.base.appzxhy.BuildConfig
 import com.base.appzxhy.bean.push.NotificationSendBean
 import com.base.appzxhy.bean.config.PopupConfigBean
 import com.base.appzxhy.business.helper.EventUtils
-import com.base.appzxhy.push.notification.MyNotificationManager
-import com.base.appzxhy.push.work.RepeatingWorker
+import com.base.appzxhy.business.push.notification.MyNotificationManager
+import com.base.appzxhy.business.push.work.RepeatingWorker
 import com.base.appzxhy.utils.LogEx
 import java.util.Calendar
 

app/src/main/java/com/base/appzxhy/business/push/receiver/ScreenStatusReceiver.kt

-package com.base.appzxhy.push.receiver
+package com.base.appzxhy.business.push.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -8,7 +8,7 @@ import android.os.Build
 import com.base.appzxhy.bean.push.NotificationSendBean
 import com.base.appzxhy.bean.push.NotificationSendBean.Companion.POPUP_WHERE_LOCK
 import com.base.appzxhy.bean.config.PopupConfigBean.Companion.popupConfigBean
-import com.base.appzxhy.push.notification.MyNotificationManager
+import com.base.appzxhy.business.push.notification.MyNotificationManager
 import java.util.Objects
 
 class ScreenStatusReceiver : BroadcastReceiver() {

app/src/main/java/com/base/appzxhy/business/push/timer/TimerManager.kt

-package com.base.appzxhy.push.timer
+package com.base.appzxhy.business.push.timer
 
 import android.util.Log
 import com.base.appzxhy.MyApplication
 import com.base.appzxhy.bean.push.NotificationSendBean
 import com.base.appzxhy.bean.push.NotificationSendBean.Companion.POPUP_WHERE_TIMER
 import com.base.appzxhy.bean.config.PopupConfigBean.Companion.popupConfigBean
-import com.base.appzxhy.push.notification.MyNotificationManager
-import com.base.appzxhy.push.receiver.ScreenStatusReceiver
+import com.base.appzxhy.business.push.notification.MyNotificationManager
+import com.base.appzxhy.business.push.receiver.ScreenStatusReceiver
 import java.util.Timer
 import java.util.TimerTask
 

app/src/main/java/com/base/appzxhy/business/push/work/RepeatingWorker.kt

-package com.base.appzxhy.push.work
+package com.base.appzxhy.business.push.work
 
 import android.content.Context
 import androidx.work.Constraints
@@ -11,8 +11,8 @@ import androidx.work.WorkerParameters
 import com.base.appzxhy.bean.push.NotificationSendBean
 import com.base.appzxhy.bean.push.NotificationSendBean.Companion.POPUP_WHERE_WORK_MANAGER
 import com.base.appzxhy.bean.config.PopupConfigBean
-import com.base.appzxhy.push.notification.MyNotificationManager
 import com.base.appzxhy.business.helper.EventUtils
+import com.base.appzxhy.business.push.notification.MyNotificationManager
 import java.util.concurrent.TimeUnit
 
 class RepeatingWorker(val appContext: Context, workerParams: WorkerParameters) : Worker(appContext, workerParams) {