diff --git a/app/src/main/java/com/xwad/os/activity/ExitActivity.java b/app/src/main/java/com/xwad/os/activity/ExitActivity.java index fe37350..481a9d1 100644 --- a/app/src/main/java/com/xwad/os/activity/ExitActivity.java +++ b/app/src/main/java/com/xwad/os/activity/ExitActivity.java @@ -1,8 +1,11 @@ package com.xwad.os.activity; +import android.content.ComponentName; import android.content.Context; +import android.content.Intent; import android.media.AudioAttributes; import android.media.SoundPool; +import android.os.Build; import android.os.Handler; import android.provider.Settings; import android.text.TextUtils; @@ -109,19 +112,37 @@ public class ExitActivity extends BaseDataBindingActivity { String password = Settings.Global.getString(getContentResolver(), CommonConfig.LOCK_SCREEN_PASSWORD); if ((!TextUtils.isEmpty(content) && !TextUtils.isEmpty(password))) { if (password.equals(content)) { - Utils.exitDesktop(this); +// Utils.exitDesktop(this); + exitDesktop(); } else { setEmpty(); mBinding.tvHint.setText("密码错误"); } } else if (CommonConfig.DEFAULT_PASSWORD.equals(content)) { - Utils.exitDesktop(this); +// Utils.exitDesktop(this); + exitDesktop(); } else { setEmpty(); mBinding.tvHint.setText("密码错误"); } } + private void exitDesktop() { + ComponentName componentName = new ComponentName("com.hihonor.android.launcher", "com.hihonor.android.launcher.unihome.UniHomeLauncher"); + Intent intent = new Intent(); + intent.setComponent(componentName); + startActivity(intent); + startActivity(new Intent(Settings.ACTION_HOME_SETTINGS)); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + finishAndRemoveTask(); + } else { + finishAffinity(); + } + android.os.Process.killProcess(android.os.Process.myPid()); + System.exit(0); + } + private void setEmpty() { Handler.getMain().postDelayed(new Runnable() { @Override diff --git a/app/src/main/java/com/xwad/os/activity/home/HomeActivity.java b/app/src/main/java/com/xwad/os/activity/home/HomeActivity.java index 7378d9f..a28feeb 100644 --- a/app/src/main/java/com/xwad/os/activity/home/HomeActivity.java +++ b/app/src/main/java/com/xwad/os/activity/home/HomeActivity.java @@ -209,6 +209,7 @@ public class HomeActivity extends BaseMvvmActivity() { @Override public void onChanged(UserAvatarInfo userAvatarInfo) { diff --git a/app/src/main/java/com/xwad/os/base/BaseApplication.java b/app/src/main/java/com/xwad/os/base/BaseApplication.java index 7af43a2..55b8409 100644 --- a/app/src/main/java/com/xwad/os/base/BaseApplication.java +++ b/app/src/main/java/com/xwad/os/base/BaseApplication.java @@ -72,6 +72,7 @@ public class BaseApplication extends Application { private void init() { Log.e(TAG, "init: "); + long time = System.currentTimeMillis(); if (!BuildConfig.DEBUG) { catchException(); } @@ -106,6 +107,7 @@ public class BaseApplication extends Application { aliyunPushInit(); } + Log.e(this.getClass().getSimpleName(), "init: " + (System.currentTimeMillis() - time) + "ms"); } public void aliyunPushInit() { diff --git a/app/src/main/java/com/xwad/os/base/mvvm/fragment/BaseMvvmFragment.java b/app/src/main/java/com/xwad/os/base/mvvm/fragment/BaseMvvmFragment.java index e7ceb2b..12e2387 100644 --- a/app/src/main/java/com/xwad/os/base/mvvm/fragment/BaseMvvmFragment.java +++ b/app/src/main/java/com/xwad/os/base/mvvm/fragment/BaseMvvmFragment.java @@ -108,9 +108,13 @@ public abstract class BaseMvvmFragment tabBeanList = new ArrayList(); - private List mFragment = new ArrayList(); + private List tabBeanList = new ArrayList<>(); + private List mFragment = new ArrayList<>(); // TODO: Rename parameter arguments, choose names that match @@ -105,12 +111,39 @@ public class ComplexFragment extends BaseMvvmFragment getLearnStage() { - String grade = "一年级"; + String grade = SPUtils.getGrade(); + Log.e(TAG, "getLearnStage: grade = " + grade); String jsonString = AssertUtils.getFromAssets(mContext, "script/fragment_tbx.json"); Type type = new TypeToken>() { }.getType(); @@ -188,15 +211,16 @@ public class ComplexFragment extends BaseMvvmFragment= Build.VERSION_CODES.LOLLIPOP) { - mContext.finishAndRemoveTask(); - } else { - mContext.finishAffinity(); - } - android.os.Process.killProcess(android.os.Process.myPid()); - System.exit(0); - + startActivity(new Intent(mContext, ExitActivity.class)); // OpenApkUtils.getInstance().openJxwApp(mContext, "com.hihonor.android.launcher,com.hihonor.android.launcher.unihome.UniHomeLauncher,,,退出桌面"); } } diff --git a/app/src/main/java/com/xwad/os/fragment/safe/SafeFragment.java b/app/src/main/java/com/xwad/os/fragment/safe/SafeFragment.java index 89c4a48..afc4c27 100644 --- a/app/src/main/java/com/xwad/os/fragment/safe/SafeFragment.java +++ b/app/src/main/java/com/xwad/os/fragment/safe/SafeFragment.java @@ -280,22 +280,31 @@ public class SafeFragment extends BaseMvvmFragment + android:tag="@string/tag_args_new_jzgk"> + android:tag="@string/tag_args_new_settings"> com.jxw.jpkc,com.jxw.jpkc.ui.downloadsCollections.activity.main.DownloadsCollectionsMainActivity,String:key_model_type:MY_DOWNLOAD,,精品课 com.sprd.sprdnote,com.sprd.sprdnote.NoteActivity,,,记事本 com.android.calculator2,com.android.calculator2.Calculator,,,计算器 + com.android.settings,,,,系统设置 com.jxw.launcher,com.jxw.launcher.user.SettingsActivity,,,便捷设置 com.jxw.pushservice,com.jxw.pushservice.MainActivity,,,家长管理 + com.hihonor.deskclock,,,,时钟 + com.hihonor.calculator,,,,计算器 + com.hihonor.camera,,,,相机 + com.hihonor.photos,,,,图库 地理 化学 科学 @@ -427,6 +432,7 @@ com.jxw.huiben,com.jxw.huiben.activity.SplashActivity,huiben,,,学王指读 com.android.music,com.android.music.MusicBrowserActivity,,,音乐 com.jxw.clean,com.jxw.clean.MainActivity,,,一键加速 + com.xwad.os,com.xwad.os.activity.user.UserActivity,int:index:1,,家长管控 com.jxw.tbfd,com.jxw.tbfd.ui.activity.HomeActivity,String:subject:政治,,一课一练 com.jxw.tbfd,com.jxw.tbfd.ui.activity.HomeActivity,String:subject:政治,,一课一练 com.jxw.tbfd,com.jxw.tbfd.ui.activity.HomeActivity,String:subject:地理,,一课一练