diff --git a/app/src/main/java/com/aoleyun/sn/service/RemoteService.java b/app/src/main/java/com/aoleyun/sn/service/RemoteService.java index aa660df..e01a09c 100644 --- a/app/src/main/java/com/aoleyun/sn/service/RemoteService.java +++ b/app/src/main/java/com/aoleyun/sn/service/RemoteService.java @@ -10,6 +10,7 @@ import android.util.Log; import com.aoleyun.sn.SystemInfoInterface; import com.aoleyun.sn.utils.ForegroundAppUtil; import com.aoleyun.sn.utils.JGYUtils; +import com.aoleyun.sn.utils.SPUtils; import com.aoleyun.sn.utils.Utils; import java.util.List; @@ -63,12 +64,14 @@ public class RemoteService extends Service { @Override public boolean SystemPutInt(String name, int value) throws RemoteException { + Log.e(TAG, "SystemPutInt: " + "name = " + name + "\t value = " + value); return Settings.System.putInt(getContentResolver(), name, value); } @Override public void setDefaultDesktop(String pkg) throws RemoteException { JGYUtils.getInstance().setDefaultDesktop(pkg); + SPUtils.put(RemoteService.this, "default_launcher", pkg); } }; } diff --git a/app/src/main/java/com/aoleyun/sn/service/main/MainSPresenter.java b/app/src/main/java/com/aoleyun/sn/service/main/MainSPresenter.java index 72aeb89..d103665 100644 --- a/app/src/main/java/com/aoleyun/sn/service/main/MainSPresenter.java +++ b/app/src/main/java/com/aoleyun/sn/service/main/MainSPresenter.java @@ -15,6 +15,7 @@ import com.aoleyun.sn.utils.SPUtils; import com.aoleyun.sn.utils.ToastUtil; import com.aoleyun.sn.utils.URLUtils; import com.aoleyun.sn.utils.Utils; +import com.arialyy.aria.orm.annotation.Ignore; import com.tencent.mmkv.MMKV; import com.trello.rxlifecycle4.android.ActivityEvent; @@ -253,13 +254,19 @@ public class MainSPresenter implements MainSContact.Presenter { if (JGYUtils.isOfficialVersion() || !JGYUtils.getInstance().getDeviceIsLocked()) { mView.getDefaultDesktopFinish(); } else { - NetInterfaceManager.getInstance() - .getDefaultDesktop(true, getLifecycle(), new NetInterfaceManager.onCompleteCallback() { - @Override - public void onComplete() { - mView.getDefaultDesktopFinish(); - } - }); + int aihuaUnlock = Settings.System.getInt(mContext.getContentResolver(), CommonConfig.AIHUA_UNLOCK, 0); + if (JGYUtils.getInstance().isAihuaFramwwork() && aihuaUnlock == 1) { + mView.getDefaultDesktopFinish(); + } else { + NetInterfaceManager.getInstance() + .getDefaultDesktop(true, getLifecycle(), new NetInterfaceManager.onCompleteCallback() { + @Override + public void onComplete() { + mView.getDefaultDesktopFinish(); + } + }); + } + } } diff --git a/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java b/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java index bdce9b7..3d2ad64 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java @@ -2080,22 +2080,26 @@ public class JGYUtils { // setDefaultLauncher(mContext, pkg, className); Log.e(TAG, "setDefaultDesktop: setDefaultLauncher"); } - String oldDesktop = (String) SPUtils.get(mContext, "default_launcher", ""); - if (Objects.equals(oldDesktop, pkg)) { - Log.e(TAG, "setDefaultDesktop: " + "数据一致"); - return; - } +// String oldDesktop = (String) SPUtils.get(mContext, "default_launcher", ""); +// if (Objects.equals(oldDesktop, pkg)) { +// Log.e(TAG, "setDefaultDesktop: " + "数据一致"); +// return; +// } Intent intent = new Intent("setDefaultLauncher"); intent.putExtra("package", pkg); intent.putExtra("className", className); if (JGYUtils.getInstance().checkAppPlatform() == MTKPlatform) { + Log.e(TAG, "setDefaultDesktop: MTK"); //爱华定制 intent.setComponent(new ComponentName("com.android.settings", "com.android.settings.AoleReceiver")); + // TODO: 2022/7/6 有问题 setDefaultLauncher(mContext, "com.android.transfer", "com.android.transfer.MainActivity"); + SystemProperties.set("persist.sys.launcher.pkgname", pkg); + SystemProperties.set("persist.sys.launcher.classname", className); } intent.setPackage("com.android.settings"); mContext.sendBroadcast(intent); - ApkUtils.openPackage(mContext, pkg); +// ApkUtils.openPackage(mContext, pkg); Log.e(TAG, "setDefaultDesktop: " + pkg + ":" + className); Log.e(TAG, "setDefaultDesktop: " + "persist.sys.launcher.pkgname = " + SystemProperties.get("persist.sys.launcher.pkgname")); Log.e(TAG, "setDefaultDesktop: " + "persist.sys.launcher.classname = " + SystemProperties.get("persist.sys.launcher.classname"));