diff --git a/app/build.gradle b/app/build.gradle index 16d4b84..5170e8a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { minSdkVersion 24 targetSdkVersion 29 - versionCode 104 - versionName "2.1.3" + versionCode 105 + versionName "2.1.4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/com/uiui/zyos/adapter/AppAdapter.java b/app/src/main/java/com/uiui/zyos/adapter/AppAdapter.java index 6cd68a7..3fa0aa6 100644 --- a/app/src/main/java/com/uiui/zyos/adapter/AppAdapter.java +++ b/app/src/main/java/com/uiui/zyos/adapter/AppAdapter.java @@ -1,5 +1,6 @@ package com.uiui.zyos.adapter; +import android.app.Activity; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -16,6 +17,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.hjq.toast.Toaster; import com.uiui.zyos.R; +import com.uiui.zyos.activity.ExitActivity; import com.uiui.zyos.activity.ManualActivity; import com.uiui.zyos.activity.PasswordActivity; import com.uiui.zyos.activity.service.ServiceActivity; @@ -26,6 +28,7 @@ import com.uiui.zyos.utils.ApkUtils; import com.uiui.zyos.utils.BitmapUtils; import com.uiui.zyos.utils.IconUtils; import com.uiui.zyos.utils.OpenApkUtils; +import com.uiui.zyos.utils.Utils; import java.util.List; @@ -107,6 +110,9 @@ public class AppAdapter extends RecyclerView.Adapter { case "com.jxw.huiben": OpenApkUtils.getInstance().openARHuiben(); break; + case AppManager.DESKTOP_EXIT: + exitDesktop(); + break; default: boolean settingOtherAppInstaller = RemoteManager.getInstance().showThirdApp(); if (!settingOtherAppInstaller && !ApkUtils.isSystemApp(mContext, desktopIcon.getPackageName())) { @@ -121,6 +127,19 @@ public class AppAdapter extends RecyclerView.Adapter { }); } + public void exitDesktop() { + Intent intent = new Intent("Receiver_Refresh_Password_Action"); + intent.setPackage("com.uiui.zy"); + mContext.sendBroadcast(intent); + + boolean is_activation = RemoteManager.getInstance().getSnIsActivation(); + if (is_activation) { + mContext.startActivity(new Intent(mContext, ExitActivity.class)); + } else { + Utils.exitDesktop((Activity) mContext); + } + } + @Override public int getItemCount() { return desktopIcons == null ? 0 : desktopIcons.size(); diff --git a/app/src/main/java/com/uiui/zyos/fragment/app/AppViewModel.java b/app/src/main/java/com/uiui/zyos/fragment/app/AppViewModel.java index 897b461..3752e66 100644 --- a/app/src/main/java/com/uiui/zyos/fragment/app/AppViewModel.java +++ b/app/src/main/java/com/uiui/zyos/fragment/app/AppViewModel.java @@ -94,6 +94,12 @@ public class AppViewModel extends BaseViewModel + + @@ -169,7 +182,7 @@ -