version:2.1.4
bugfixes: update:修改退出逻辑,放在app列表显示
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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<AppAdapter.AppHolder> {
|
||||
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<AppAdapter.AppHolder> {
|
||||
});
|
||||
}
|
||||
|
||||
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();
|
||||
|
||||
@@ -94,6 +94,12 @@ public class AppViewModel extends BaseViewModel<FragmentAppBinding, FragmentEven
|
||||
desktopIcons.add(zwpgIcon);
|
||||
}
|
||||
|
||||
DesktopIcon exitIcon = new DesktopIcon();
|
||||
exitIcon.setLable("退出桌面");
|
||||
exitIcon.setPackageName(AppManager.DESKTOP_EXIT);
|
||||
exitIcon.setIcon(getCtx().getDrawable(R.drawable.exit_icon));
|
||||
desktopIcons.add(desktopIcons.size(), exitIcon);
|
||||
|
||||
DesktopIcon desktopIcon = new DesktopIcon();
|
||||
desktopIcon.setLable("添加应用");
|
||||
desktopIcon.setPackageName(AppManager.ADD_NAME);
|
||||
|
||||
@@ -39,6 +39,8 @@ public class AppManager {
|
||||
private static final String SHOW_PACKAGE_KEY = "SHOW_PACKAGE_KEY";
|
||||
public static final String BROWSER_PACKAGE_NAME = "com.uiui.zybrowser";
|
||||
public static final String BROWSER_CLASS_NAME = "com.uiui.zybrowser.activity.main.MainActivity";
|
||||
public static final String DESKTOP_EXIT = "com.zyos.exit";
|
||||
|
||||
|
||||
@SuppressLint("StaticFieldLeak")
|
||||
private static AppManager sInstance;
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_qrcode"
|
||||
android:layout_width="@dimen/dp_159"
|
||||
android:layout_height="@dimen/dp_250"
|
||||
android:layout_width="@dimen/dp_178"
|
||||
android:layout_height="@dimen/dp_280"
|
||||
android:adjustViewBounds="true"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/wechat_service"
|
||||
|
||||
@@ -57,6 +57,19 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageView26"
|
||||
android:layout_width="@dimen/dp_72"
|
||||
android:layout_height="@dimen/dp_20"
|
||||
android:layout_marginEnd="@dimen/dp_16"
|
||||
android:adjustViewBounds="true"
|
||||
android:onClick="@{click::openService}"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/ic_wechat_logo"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -67,7 +80,7 @@
|
||||
android:text="退出桌面"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/sp_10"
|
||||
android:visibility="visible"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
@@ -169,7 +182,7 @@
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/imageView26"
|
||||
app:layout_constraintBottom_toTopOf="@+id/tv_beian"
|
||||
app:layout_constraintTop_toBottomOf="@+id/cl_avatar">
|
||||
|
||||
<RadioGroup
|
||||
@@ -229,16 +242,19 @@
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageView26"
|
||||
android:layout_width="@dimen/dp_72"
|
||||
android:layout_height="@dimen/dp_20"
|
||||
android:layout_marginBottom="@dimen/dp_4"
|
||||
android:adjustViewBounds="true"
|
||||
android:onClick="@{click::openService}"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/ic_wechat_logo"
|
||||
app:layout_constraintBottom_toTopOf="@+id/tv_permission"
|
||||
<TextView
|
||||
android:id="@+id/tv_beian"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="@dimen/dp_8"
|
||||
android:gravity="center"
|
||||
android:maxLines="1"
|
||||
android:singleLine="true"
|
||||
android:text="粤ICP备15019259号"
|
||||
android:textColor="@color/title_gray"
|
||||
android:textSize="@dimen/sp_9"
|
||||
android:visibility="visible"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
|
||||
Reference in New Issue
Block a user