From 9054b529a2fe29a54d543698494bc702db4a696d Mon Sep 17 00:00:00 2001
From: Administrator <123>
Date: Thu, 04 Nov 2021 02:40:04 +0000
Subject: [PATCH] 框架调整
---
app/src/main/java/com/duqing/missions/base/adapter/FragmentAdapter.java | 2
app/src/main/java/com/duqing/missions/ui/main/home/adapter/MissionAdapter.java | 4 +-
app/src/main/AndroidManifest.xml | 3 +
app/src/main/java/com/duqing/missions/base/activities/BaseLoadPageActivity.java | 2
app/src/main/java/com/duqing/missions/ui/main/MainActivity.java | 7 ++-
app/src/main/java/com/duqing/missions/ui/main/home/adapter/MissionTopAdapter.java | 4 +-
app/src/main/java/com/duqing/missions/base/activities/BaseTabActivity.java | 2
app/src/main/java/com/duqing/missions/base/fragments/BaseTabFragment.java | 2
app/src/main/java/com/duqing/missions/base/fragments/BaseLoadPageFragment.java | 2
/dev/null | 7 ---
app/src/main/java/com/duqing/missions/ui/main/hall/HallFragment.java | 6 +-
app/src/main/java/com/duqing/missions/base/adapter/BaseAdapter.java | 3 -
app/src/main/java/com/duqing/missions/ui/login/view/LoginActivity.java | 15 +++----
app/src/main/java/com/duqing/missions/ui/main/MainViewModel.java | 9 ++++
14 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f2b6215..066f60b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
<uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
<application
+ android:name=".MyApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
@@ -13,7 +14,7 @@
android:supportsRtl="true"
android:theme="@style/Theme.Missions" >
<activity
- android:name=".MainActivity"
+ android:name=".ui.main.MainActivity"
android:exported="true"
android:label="@string/app_name" >
<intent-filter>
diff --git a/app/src/main/java/com/duqing/missions/base/activities/BaseLoadPageActivity.java b/app/src/main/java/com/duqing/missions/base/activities/BaseLoadPageActivity.java
index ef17679..bcd52ad 100644
--- a/app/src/main/java/com/duqing/missions/base/activities/BaseLoadPageActivity.java
+++ b/app/src/main/java/com/duqing/missions/base/activities/BaseLoadPageActivity.java
@@ -7,7 +7,7 @@
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewbinding.ViewBinding;
-import com.duqing.missions.base.BaseAdapter;
+import com.duqing.missions.base.adapter.BaseAdapter;
import com.duqing.missions.base.model.BaseLoadPageViewModel;
import com.duqing.missions.data.BasePageResult;
import com.scwang.smart.refresh.footer.ClassicsFooter;
diff --git a/app/src/main/java/com/duqing/missions/base/activities/BaseTabActivity.java b/app/src/main/java/com/duqing/missions/base/activities/BaseTabActivity.java
index 1afd695..1ded49f 100644
--- a/app/src/main/java/com/duqing/missions/base/activities/BaseTabActivity.java
+++ b/app/src/main/java/com/duqing/missions/base/activities/BaseTabActivity.java
@@ -7,7 +7,7 @@
import androidx.viewbinding.ViewBinding;
import androidx.viewpager2.widget.ViewPager2;
-import com.duqing.missions.base.FragmentAdapter;
+import com.duqing.missions.base.adapter.FragmentAdapter;
import com.duqing.missions.base.fragments.BaseFragment;
import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;
diff --git a/app/src/main/java/com/duqing/missions/base/activity.java b/app/src/main/java/com/duqing/missions/base/activity.java
deleted file mode 100644
index 6a431e6..0000000
--- a/app/src/main/java/com/duqing/missions/base/activity.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.duqing.missions.base;
-
-/**
- * Created by Administrator on 2021/11/3 0003.
- */
-public class activity {
-}
diff --git a/app/src/main/java/com/duqing/missions/base/BaseAdapter.java b/app/src/main/java/com/duqing/missions/base/adapter/BaseAdapter.java
similarity index 98%
rename from app/src/main/java/com/duqing/missions/base/BaseAdapter.java
rename to app/src/main/java/com/duqing/missions/base/adapter/BaseAdapter.java
index 735ccef..3f25fc8 100644
--- a/app/src/main/java/com/duqing/missions/base/BaseAdapter.java
+++ b/app/src/main/java/com/duqing/missions/base/adapter/BaseAdapter.java
@@ -1,4 +1,4 @@
-package com.duqing.missions.base;
+package com.duqing.missions.base.adapter;
import android.graphics.drawable.Drawable;
import android.view.LayoutInflater;
@@ -34,7 +34,6 @@
protected String nullTxt="暂无数据";
protected String TAG = "BaseAdapter";
protected A activity;
- protected LayoutNullBinding nullBinding;
public BaseAdapter(){
}
diff --git a/app/src/main/java/com/duqing/missions/base/FragmentAdapter.java b/app/src/main/java/com/duqing/missions/base/adapter/FragmentAdapter.java
similarity index 96%
rename from app/src/main/java/com/duqing/missions/base/FragmentAdapter.java
rename to app/src/main/java/com/duqing/missions/base/adapter/FragmentAdapter.java
index 3d5bb42..d5f3e04 100644
--- a/app/src/main/java/com/duqing/missions/base/FragmentAdapter.java
+++ b/app/src/main/java/com/duqing/missions/base/adapter/FragmentAdapter.java
@@ -1,4 +1,4 @@
-package com.duqing.missions.base;
+package com.duqing.missions.base.adapter;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
diff --git a/app/src/main/java/com/duqing/missions/base/fragments/BaseLoadPageFragment.java b/app/src/main/java/com/duqing/missions/base/fragments/BaseLoadPageFragment.java
index 327311a..17f64db 100644
--- a/app/src/main/java/com/duqing/missions/base/fragments/BaseLoadPageFragment.java
+++ b/app/src/main/java/com/duqing/missions/base/fragments/BaseLoadPageFragment.java
@@ -5,7 +5,7 @@
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewbinding.ViewBinding;
-import com.duqing.missions.base.BaseAdapter;
+import com.duqing.missions.base.adapter.BaseAdapter;
import com.duqing.missions.base.model.BaseLoadPageViewModel;
import com.duqing.missions.data.BasePageResult;
import com.scwang.smart.refresh.footer.ClassicsFooter;
diff --git a/app/src/main/java/com/duqing/missions/base/fragments/BaseTabFragment.java b/app/src/main/java/com/duqing/missions/base/fragments/BaseTabFragment.java
index a70076a..f751c86 100644
--- a/app/src/main/java/com/duqing/missions/base/fragments/BaseTabFragment.java
+++ b/app/src/main/java/com/duqing/missions/base/fragments/BaseTabFragment.java
@@ -4,7 +4,7 @@
import androidx.viewbinding.ViewBinding;
import androidx.viewpager2.widget.ViewPager2;
-import com.duqing.missions.base.FragmentAdapter;
+import com.duqing.missions.base.adapter.FragmentAdapter;
import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;
diff --git a/app/src/main/java/com/duqing/missions/ui/login/view/LoginActivity.java b/app/src/main/java/com/duqing/missions/ui/login/view/LoginActivity.java
index 551e4c9..7d5c6d8 100644
--- a/app/src/main/java/com/duqing/missions/ui/login/view/LoginActivity.java
+++ b/app/src/main/java/com/duqing/missions/ui/login/view/LoginActivity.java
@@ -16,26 +16,23 @@
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProvider;
import com.duqing.missions.R;
import com.duqing.missions.base.activities.BaseTitleBarActivity;
import com.duqing.missions.databinding.ActivityLoginBinding;
-public class LoginActivity extends BaseTitleBarActivity<ActivityLoginBinding> {
+public class LoginActivity extends BaseTitleBarActivity<ActivityLoginBinding,LoginViewModel> {
- private LoginViewModel loginViewModel;
@Override
public void initViews() {
- loginViewModel = new ViewModelProvider(this, new LoginViewModelFactory()).get(LoginViewModel.class);
final EditText phoneEdit = binding.editPhone;
final EditText passwordEditText = binding.editPassword;
final Button loginButton = binding.login;
- loginViewModel.getLoginFormState().observe(this, new Observer<LoginFormState>() {
+ viewModel.getLoginFormState().observe(this, new Observer<LoginFormState>() {
@Override
public void onChanged(@Nullable LoginFormState loginFormState) {
if (loginFormState == null) {
@@ -51,7 +48,7 @@
}
});
- loginViewModel.getLoginResult().observe(this, new Observer<LoginResult>() {
+ viewModel.getLoginResult().observe(this, new Observer<LoginResult>() {
@Override
public void onChanged(@Nullable LoginResult loginResult) {
if (loginResult == null) {
@@ -103,7 +100,7 @@
@Override
public void afterTextChanged(Editable s) {
- loginViewModel.loginDataChanged(phoneEdit.getText().toString(),
+ viewModel.loginDataChanged(phoneEdit.getText().toString(),
passwordEditText.getText().toString());
}
};
@@ -114,7 +111,7 @@
@Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
if (actionId == EditorInfo.IME_ACTION_DONE) {
- loginViewModel.login(phoneEdit.getText().toString(),
+ viewModel.login(phoneEdit.getText().toString(),
passwordEditText.getText().toString());
}
return false;
@@ -124,7 +121,7 @@
loginButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- loginViewModel.login(phoneEdit.getText().toString(),
+ viewModel.login(phoneEdit.getText().toString(),
passwordEditText.getText().toString());
}
});
diff --git a/app/src/main/java/com/duqing/missions/MainActivity.java b/app/src/main/java/com/duqing/missions/ui/main/MainActivity.java
similarity index 92%
rename from app/src/main/java/com/duqing/missions/MainActivity.java
rename to app/src/main/java/com/duqing/missions/ui/main/MainActivity.java
index 09a3b32..ba81d04 100644
--- a/app/src/main/java/com/duqing/missions/MainActivity.java
+++ b/app/src/main/java/com/duqing/missions/ui/main/MainActivity.java
@@ -1,15 +1,16 @@
-package com.duqing.missions;
+package com.duqing.missions.ui.main;
import androidx.viewpager2.widget.ViewPager2;
-import com.duqing.missions.base.FragmentAdapter;
+import com.duqing.missions.R;
+import com.duqing.missions.base.adapter.FragmentAdapter;
import com.duqing.missions.base.activities.BaseActivity;
import com.duqing.missions.databinding.ActivityMainBinding;
import com.duqing.missions.ui.main.hall.HallFragment;
import com.duqing.missions.ui.main.home.HomeFragment;
import com.duqing.missions.ui.main.mine.MineFragment;
-public class MainActivity extends BaseActivity<ActivityMainBinding> {
+public class MainActivity extends BaseActivity<ActivityMainBinding,MainViewModel> {
@Override
diff --git a/app/src/main/java/com/duqing/missions/ui/main/MainViewModel.java b/app/src/main/java/com/duqing/missions/ui/main/MainViewModel.java
new file mode 100644
index 0000000..491b774
--- /dev/null
+++ b/app/src/main/java/com/duqing/missions/ui/main/MainViewModel.java
@@ -0,0 +1,9 @@
+package com.duqing.missions.ui.main;
+
+import androidx.lifecycle.ViewModel;
+
+/**
+ * Created by Administrator on 2021/11/4 0004.
+ */
+public class MainViewModel extends ViewModel {
+}
diff --git a/app/src/main/java/com/duqing/missions/ui/main/hall/HallFragment.java b/app/src/main/java/com/duqing/missions/ui/main/hall/HallFragment.java
index 9127bf2..1e55993 100644
--- a/app/src/main/java/com/duqing/missions/ui/main/hall/HallFragment.java
+++ b/app/src/main/java/com/duqing/missions/ui/main/hall/HallFragment.java
@@ -3,10 +3,10 @@
import androidx.annotation.NonNull;
import androidx.viewpager2.widget.ViewPager2;
-import com.duqing.missions.base.FragmentAdapter;
+import com.duqing.missions.base.adapter.FragmentAdapter;
import com.duqing.missions.base.fragments.BaseFragment;
import com.duqing.missions.base.fragments.BaseTabFragment;
-import com.duqing.missions.databinding.FragmentHallBinding;
+import com.duqing.missions.databinding.LayoutTabViewpagerBinding;
import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;
@@ -14,7 +14,7 @@
import java.util.Arrays;
import java.util.List;
-public class HallFragment extends BaseTabFragment<FragmentHallBinding,HallViewModel> {
+public class HallFragment extends BaseTabFragment<LayoutTabViewpagerBinding,HallViewModel> {
@Override
diff --git a/app/src/main/java/com/duqing/missions/ui/main/home/adapter/MissionAdapter.java b/app/src/main/java/com/duqing/missions/ui/main/home/adapter/MissionAdapter.java
index 1349dac..5626273 100644
--- a/app/src/main/java/com/duqing/missions/ui/main/home/adapter/MissionAdapter.java
+++ b/app/src/main/java/com/duqing/missions/ui/main/home/adapter/MissionAdapter.java
@@ -1,7 +1,7 @@
package com.duqing.missions.ui.main.home.adapter;
-import com.duqing.missions.MainActivity;
-import com.duqing.missions.base.BaseAdapter;
+import com.duqing.missions.ui.main.MainActivity;
+import com.duqing.missions.base.adapter.BaseAdapter;
import com.duqing.missions.databinding.HomtItemRecommendBinding;
import com.duqing.missions.ui.main.home.model.MissionDesc;
diff --git a/app/src/main/java/com/duqing/missions/ui/main/home/adapter/MissionTopAdapter.java b/app/src/main/java/com/duqing/missions/ui/main/home/adapter/MissionTopAdapter.java
index 2a0090d..14faafb 100644
--- a/app/src/main/java/com/duqing/missions/ui/main/home/adapter/MissionTopAdapter.java
+++ b/app/src/main/java/com/duqing/missions/ui/main/home/adapter/MissionTopAdapter.java
@@ -1,7 +1,7 @@
package com.duqing.missions.ui.main.home.adapter;
-import com.duqing.missions.MainActivity;
-import com.duqing.missions.base.BaseAdapter;
+import com.duqing.missions.ui.main.MainActivity;
+import com.duqing.missions.base.adapter.BaseAdapter;
import com.duqing.missions.databinding.HomeItemTopBinding;
import com.duqing.missions.ui.main.home.model.MissionDesc;
--
Gitblit v1.9.1