refactor: 移动软件包

Jim-shop · May 10, 2023 · e6a4d10 · e6a4d10
1 parent 7c971f6
commit e6a4d10
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/app/src/main/java/net/imshit/aircraftwar/element/bullet/EnemyBullet.kt b/app/src/main/java/net/imshit/aircraftwar/element/bullet/EnemyBullet.kt
@@ -1,8 +1,8 @@
 package net.imshit.aircraftwar.element.bullet
 
+import net.imshit.aircraftwar.logic.EnemyListener
+import net.imshit.aircraftwar.logic.GameEvents
 import net.imshit.aircraftwar.logic.Games
-import net.imshit.aircraftwar.util.listener.EnemyListener
-import net.imshit.aircraftwar.util.listener.GameEvents
 
 class EnemyBullet(
     game: Games, initialX: Float, initialY: Float, speedX: Float, speedY: Float, power: Int

diff --git a/app/src/main/java/net/imshit/aircraftwar/gui/GameActivity.kt b/app/src/main/java/net/imshit/aircraftwar/gui/GameActivity.kt
@@ -7,8 +7,8 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout.LayoutParams
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
-import net.imshit.aircraftwar.Difficulty
 import net.imshit.aircraftwar.databinding.ActivityGameBinding
+import net.imshit.aircraftwar.logic.Difficulty
 import net.imshit.aircraftwar.logic.Games
 
 class GameActivity : AppCompatActivity() {

diff --git a/app/src/main/java/net/imshit/aircraftwar/gui/MainActivity.kt b/app/src/main/java/net/imshit/aircraftwar/gui/MainActivity.kt
@@ -3,9 +3,9 @@ package net.imshit.aircraftwar.gui
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import net.imshit.aircraftwar.Difficulty
 import net.imshit.aircraftwar.R
 import net.imshit.aircraftwar.databinding.ActivityMainBinding
+import net.imshit.aircraftwar.logic.Difficulty
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/app/src/main/java/net/imshit/aircraftwar/gui/ScoreboardActivity.kt b/app/src/main/java/net/imshit/aircraftwar/gui/ScoreboardActivity.kt
@@ -4,8 +4,8 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import net.imshit.aircraftwar.Difficulty
 import net.imshit.aircraftwar.databinding.ActivityScoreboardBinding
+import net.imshit.aircraftwar.logic.Difficulty
 
 class ScoreboardActivity : AppCompatActivity() {
     companion object {

diff --git a/app/src/main/java/net/imshit/aircraftwar/logic/Games.kt b/app/src/main/java/net/imshit/aircraftwar/logic/Games.kt
@@ -7,8 +7,7 @@ import android.util.Log
 import android.view.SurfaceHolder
 import android.view.SurfaceView
 import android.view.ViewTreeObserver
-import net.imshit.aircraftwar.Difficulty
-import net.imshit.aircraftwar.util.ImageManager
+import net.imshit.aircraftwar.element.aircraft.hero.HeroAircraft
 
 sealed class Games(context: Context, attrs: AttributeSet?, soundMode: Boolean) :
     SurfaceView(context, attrs), SurfaceHolder.Callback, Runnable {
@@ -36,6 +35,8 @@ sealed class Games(context: Context, attrs: AttributeSet?, soundMode: Boolean) :
     var screenHeight = 0
         private set
 
+    lateinit var heroAircraft: HeroAircraft
+
     init {
         viewTreeObserver.addOnGlobalLayoutListener(object :
             ViewTreeObserver.OnGlobalLayoutListener {
@@ -66,4 +67,12 @@ sealed class Games(context: Context, attrs: AttributeSet?, soundMode: Boolean) :
     override fun run() {
         Log.e("FFFFF", "RUN")
     }
+
+    fun notify(e: GameEvents) {
+        when (e) {
+            GameEvents.BOMB_ACTIVATE -> {
+                TODO()
+            }
+        }
+    }
 }