diff --git a/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/device/NavDeviceFragment.java b/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/device/NavDeviceFragment.java similarity index 96% rename from app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/device/NavDeviceFragment.java rename to app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/device/NavDeviceFragment.java index b7ac57c..95d7c7b 100644 --- a/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/device/NavDeviceFragment.java +++ b/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/device/NavDeviceFragment.java @@ -1,4 +1,4 @@ -package cc.niushuai.project.devcontrol.ui.nav.main.device; +package cc.niushuai.project.devcontrol.ui.nav.device; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; @@ -12,15 +12,12 @@ import android.widget.SimpleAdapter; import android.widget.TextView; import android.widget.Toast; -import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; -import androidx.gridlayout.widget.GridLayout; import androidx.lifecycle.ViewModelProvider; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Map; import cc.niushuai.project.devcontrol.R; import cc.niushuai.project.devcontrol.base.entity.device.DeviceInfo; diff --git a/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/device/NavDeviceViewModel.java b/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/device/NavDeviceViewModel.java similarity index 87% rename from app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/device/NavDeviceViewModel.java rename to app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/device/NavDeviceViewModel.java index 5d77a31..68c6619 100644 --- a/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/device/NavDeviceViewModel.java +++ b/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/device/NavDeviceViewModel.java @@ -1,4 +1,4 @@ -package cc.niushuai.project.devcontrol.ui.nav.main.device; +package cc.niushuai.project.devcontrol.ui.nav.device; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; diff --git a/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/log/NavLogFragment.java b/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/log/NavLogFragment.java similarity index 95% rename from app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/log/NavLogFragment.java rename to app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/log/NavLogFragment.java index bc424ce..9d5e044 100644 --- a/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/log/NavLogFragment.java +++ b/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/log/NavLogFragment.java @@ -1,4 +1,4 @@ -package cc.niushuai.project.devcontrol.ui.nav.main.log; +package cc.niushuai.project.devcontrol.ui.nav.log; import android.os.Bundle; import android.view.LayoutInflater; diff --git a/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/log/NavLogViewModel.java b/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/log/NavLogViewModel.java similarity index 87% rename from app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/log/NavLogViewModel.java rename to app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/log/NavLogViewModel.java index ec3b543..122ee8b 100644 --- a/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/log/NavLogViewModel.java +++ b/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/log/NavLogViewModel.java @@ -1,4 +1,4 @@ -package cc.niushuai.project.devcontrol.ui.nav.main.log; +package cc.niushuai.project.devcontrol.ui.nav.log; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; diff --git a/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/setup/NavSetUpFragment.java b/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/setup/NavSetUpFragment.java similarity index 95% rename from app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/setup/NavSetUpFragment.java rename to app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/setup/NavSetUpFragment.java index a1a4596..9d499c1 100644 --- a/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/setup/NavSetUpFragment.java +++ b/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/setup/NavSetUpFragment.java @@ -1,4 +1,4 @@ -package cc.niushuai.project.devcontrol.ui.nav.main.setup; +package cc.niushuai.project.devcontrol.ui.nav.setup; import android.os.Bundle; import android.view.LayoutInflater; diff --git a/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/setup/NavSetUpViewModel.java b/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/setup/NavSetUpViewModel.java similarity index 87% rename from app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/setup/NavSetUpViewModel.java rename to app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/setup/NavSetUpViewModel.java index d4701b8..3509e1a 100644 --- a/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/setup/NavSetUpViewModel.java +++ b/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/setup/NavSetUpViewModel.java @@ -1,4 +1,4 @@ -package cc.niushuai.project.devcontrol.ui.nav.main.setup; +package cc.niushuai.project.devcontrol.ui.nav.setup; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; diff --git a/app/src/main/res/layout/main_nav_fragment_device.xml b/app/src/main/res/layout/main_nav_fragment_device.xml index d02cacb..196816a 100644 --- a/app/src/main/res/layout/main_nav_fragment_device.xml +++ b/app/src/main/res/layout/main_nav_fragment_device.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" - tools:context=".ui.nav.main.device.NavDeviceFragment"> + tools:context=".ui.nav.device.NavDeviceFragment"> + tools:context=".ui.nav.log.NavLogFragment"> + tools:context=".ui.nav.setup.NavSetUpFragment"> \ No newline at end of file