diff --git a/.idea/misc.xml b/.idea/misc.xml index 0da94ac..8e96465 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,11 +9,15 @@ + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 0da94ac..8e96465 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,11 +9,15 @@ + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index 0da94ac..8e96465 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,11 +9,15 @@ + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index 0da94ac..8e96465 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,11 +9,15 @@ + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 0da94ac..8e96465 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,11 +9,15 @@ + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 0da94ac..8e96465 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,11 +9,15 @@ + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 0da94ac..8e96465 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,11 +9,15 @@ + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" /> + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e1c6eb..52d2866 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java index f3205e0..ae1b542 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PermissionActivity.java @@ -30,7 +30,7 @@ protected void initData() { //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, LocaleConstant.USER_PERMISSIONS)) { - startLoginActivity(); + startSplashScreenActivity(); } else { viewBinding.enterMainButton.setOnClickListener(new View.OnClickListener() { @Override @@ -46,8 +46,8 @@ } - private void startLoginActivity() { - startActivity(new Intent(this, LoginActivity.class)); + private void startSplashScreenActivity() { + startActivity(new Intent(this, SplashScreenActivity.class)); finish(); } @@ -59,7 +59,7 @@ @Override public void onPermissionsGranted(int requestCode, @NonNull List perms) { - startLoginActivity(); + startSplashScreenActivity(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java new file mode 100644 index 0000000..37d5731 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/view/SplashScreenActivity.java @@ -0,0 +1,57 @@ +package com.casic.dcms.mvvm.view; + +import android.content.Context; +import android.os.CountDownTimer; + +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.casic.dcms.databinding.ActivitySplashBinding; +import com.casic.dcms.mvvm.model.UserBean; +import com.casic.dcms.mvvm.vm.UserViewModel; +import com.gyf.immersionbar.ImmersionBar; +import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.ContextUtil; + +public class SplashScreenActivity extends AndroidxBaseActivity { + + private final Context context = SplashScreenActivity.this; + private UserViewModel userViewModel; + private final CountDownTimer countDownTimer = new CountDownTimer(1000, 500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + userViewModel.obtainUserData(); + } + }; + + @Override + protected void setupTopBarLayout() { + ImmersionBar.with(this).init(); + } + + @Override + protected void initData() { + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + } + + @Override + protected void initEvent() { + countDownTimer.start(); + userViewModel.userDataModel.observe(this, new Observer() { + @Override + public void onChanged(UserBean userBean) { + if (userBean.getCode() == 200) { + ContextUtil.navigatePageTo(context, MainActivity.class); + } else { + ContextUtil.navigatePageTo(context, LoginActivity.class); + } + finish(); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3a3af9e..8536010 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,10 +10,10 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..8054659 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recycleview.xml b/app/src/main/res/layout/item_home_recycleview.xml index 4c27868..b1bb791 100644 --- a/app/src/main/res/layout/item_home_recycleview.xml +++ b/app/src/main/res/layout/item_home_recycleview.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="10dp" - app:cardCornerRadius="5dp" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_5" app:cardUseCompatPadding="true"> + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginBottom="@dimen/dp_5" />