fix:
update:去掉RemoteManager
This commit is contained in:
2026-01-12 15:01:36 +08:00
parent d1f392b839
commit 38c0e22737
13 changed files with 97 additions and 333 deletions

View File

@@ -60,6 +60,10 @@ android {
exclude 'META-INF/LICENSE.txt' exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE.txt' exclude 'META-INF/NOTICE.txt'
} }
manifestPlaceholders = [
AMAP_KEY: "db082446a68db8e3ffdc8277313c2e6a"
]
} }
externalNativeBuild { externalNativeBuild {
@@ -87,9 +91,6 @@ android {
//Zipalign优化 //Zipalign优化
zipAlignEnabled true zipAlignEnabled true
buildConfigField "String", "platform", '"tuixin"' buildConfigField "String", "platform", '"tuixin"'
manifestPlaceholders = [
AMAP_KEY: "9c9fabf3934df224e927b2f9fbc51064"
]
signingConfig signingConfigs.tuixin signingConfig signingConfigs.tuixin
applicationVariants.all { variant -> applicationVariants.all { variant ->
variant.outputs.each { output -> variant.outputs.each { output ->
@@ -111,9 +112,6 @@ android {
//签名 //签名
signingConfig signingConfigs.tuixin signingConfig signingConfigs.tuixin
buildConfigField "String", "platform", '"tuixin"' buildConfigField "String", "platform", '"tuixin"'
manifestPlaceholders = [
AMAP_KEY: "9c9fabf3934df224e927b2f9fbc51064"
]
// 将release版本的包名重命名加上版本及日期 // 将release版本的包名重命名加上版本及日期
applicationVariants.all { variant -> applicationVariants.all { variant ->
variant.outputs.each { output -> variant.outputs.each { output ->

View File

@@ -63,7 +63,7 @@ import com.xwad.os.jxw.event.UpdateGradeEvent;
import com.xwad.os.jxw.fragment.SztzFragment; import com.xwad.os.jxw.fragment.SztzFragment;
import com.xwad.os.jxw.util.Util; import com.xwad.os.jxw.util.Util;
import com.xwad.os.manager.DeviceSNManager; import com.xwad.os.manager.DeviceSNManager;
import com.xwad.os.manager.RemoteManager; import com.xwad.os.mdm.AdminManager;
import com.xwad.os.service.main.MainService; import com.xwad.os.service.main.MainService;
import com.xwad.os.utils.ActivationUtil; import com.xwad.os.utils.ActivationUtil;
import com.xwad.os.utils.ApkUtils; import com.xwad.os.utils.ApkUtils;
@@ -82,7 +82,7 @@ import java.util.List;
import me.jessyan.autosize.AutoSizeCompat; import me.jessyan.autosize.AutoSizeCompat;
import me.jessyan.autosize.AutoSizeConfig; import me.jessyan.autosize.AutoSizeConfig;
public class HomeActivity extends BaseMvvmActivity<HomeViewModel, ActivityHomeBinding> implements RemoteManager.ConnectedListener { public class HomeActivity extends BaseMvvmActivity<HomeViewModel, ActivityHomeBinding> {
private static final String TAG = "HomeActivity"; private static final String TAG = "HomeActivity";
private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
@@ -94,13 +94,6 @@ public class HomeActivity extends BaseMvvmActivity<HomeViewModel, ActivityHomeBi
private TabAdapter tabAdapter; private TabAdapter tabAdapter;
@Override
public void onRemoteConnected() {
Log.e(TAG, "onConnected: ");
mViewModel.getSystemSettings();
setDefaultDesktop();
}
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.activity_home; return R.layout.activity_home;
@@ -148,7 +141,6 @@ public class HomeActivity extends BaseMvvmActivity<HomeViewModel, ActivityHomeBi
// ComponentName componentName = new ComponentName(JxwPackageConfig.JXW_LAUNCHER_PACKAGE_NAME, JxwPackageConfig.JXW_LAUNCHER_CLASS_NAME); // ComponentName componentName = new ComponentName(JxwPackageConfig.JXW_LAUNCHER_PACKAGE_NAME, JxwPackageConfig.JXW_LAUNCHER_CLASS_NAME);
// startService(new Intent().setComponent(componentName)); // startService(new Intent().setComponent(componentName));
RemoteManager.setListener(this);
Utils.getAndroiodScreenProperty(this); Utils.getAndroiodScreenProperty(this);
if (Build.VERSION.SDK_INT >= 33) { if (Build.VERSION.SDK_INT >= 33) {
@@ -337,12 +329,12 @@ public class HomeActivity extends BaseMvvmActivity<HomeViewModel, ActivityHomeBi
} }
private void setDefaultDesktop() { private void setDefaultDesktop() {
boolean is_activation = RemoteManager.getInstance().getSnIsActivation(); // boolean is_activation = AdminManager.getInstance().getSnIsActivation();
if (is_activation) { // if (is_activation) {
RemoteManager.getInstance().setDefaultDesktop(BuildConfig.APPLICATION_ID); // AdminManager.getInstance().setDefaultLauncher(BuildConfig.APPLICATION_ID);
} else { // } else {
// RemoteManager.getInstance().setDefaultDesktop(ApkUtils.ANDROID_LAUNCHER3_PACKAGE_NAME); //// AdminManager.getInstance().setDefaultDesktop(ApkUtils.ANDROID_LAUNCHER3_PACKAGE_NAME);
} // }
} }
@@ -453,7 +445,6 @@ public class HomeActivity extends BaseMvvmActivity<HomeViewModel, ActivityHomeBi
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
RemoteManager.removeListener(this);
unRegistTimeReceiver(); unRegistTimeReceiver();
unregistBateeryReceiver(); unregistBateeryReceiver();
EventBus.getDefault().unregister(this); EventBus.getDefault().unregister(this);

View File

@@ -44,7 +44,7 @@ import com.xwad.os.fragment.safe.SafeFragment;
import com.xwad.os.jxw.JxwPackageConfig; import com.xwad.os.jxw.JxwPackageConfig;
import com.xwad.os.manager.AmapManager; import com.xwad.os.manager.AmapManager;
import com.xwad.os.manager.DeviceSNManager; import com.xwad.os.manager.DeviceSNManager;
import com.xwad.os.manager.RemoteManager; import com.xwad.os.mdm.AdminManager;
import com.xwad.os.utils.ApkUtils; import com.xwad.os.utils.ApkUtils;
import com.xwad.os.utils.OpenApkUtils; import com.xwad.os.utils.OpenApkUtils;
import com.xwad.os.utils.Utils; import com.xwad.os.utils.Utils;
@@ -58,7 +58,7 @@ import com.tencent.mmkv.MMKV;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBinding> implements RemoteManager.ConnectedListener { public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBinding> {
private static final String TAG = "MainActivity"; private static final String TAG = "MainActivity";
private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
@@ -80,13 +80,6 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
private ViewPager.OnPageChangeListener mListener; private ViewPager.OnPageChangeListener mListener;
private int defaultCurrent = 0; private int defaultCurrent = 0;
@Override
public void onRemoteConnected() {
Log.e(TAG, "onConnected: ");
mViewModel.getSystemSettings();
setDefaultDesktop();
}
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.activity_main; return R.layout.activity_main;
@@ -114,7 +107,6 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
} }
// toggleNotificationListenerService(this); // toggleNotificationListenerService(this);
RemoteManager.setListener(this);
Utils.getAndroiodScreenProperty(this); Utils.getAndroiodScreenProperty(this);
@@ -205,6 +197,8 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
// mViewDataBinding.ivRobot.setVisibility(voice_assistant == 1 ? View.VISIBLE : View.GONE); // mViewDataBinding.ivRobot.setVisibility(voice_assistant == 1 ? View.VISIBLE : View.GONE);
} }
}); });
mViewModel.getSystemSettings();
} }
private void hideSystemUI() { private void hideSystemUI() {
@@ -222,12 +216,12 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
} }
private void setDefaultDesktop() { private void setDefaultDesktop() {
boolean is_activation = RemoteManager.getInstance().getSnIsActivation(); // boolean is_activation = AdminManager.getInstance().getSnIsActivation();
if (is_activation) { // if (is_activation) {
RemoteManager.getInstance().setDefaultDesktop(BuildConfig.APPLICATION_ID); // AdminManager.getInstance().setDefaultLauncher(BuildConfig.APPLICATION_ID);
} else { // } else {
// RemoteManager.getInstance().setDefaultDesktop(ApkUtils.ANDROID_LAUNCHER3_PACKAGE_NAME); //// AdminManager.getInstance().setDefaultDesktop(ApkUtils.ANDROID_LAUNCHER3_PACKAGE_NAME);
} // }
} }
@@ -347,7 +341,6 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
unregisterReceiver(mVoiceAssistantReceiver); unregisterReceiver(mVoiceAssistantReceiver);
} }
RemoteManager.removeListener(this);
} }
@Override @Override
@@ -751,7 +744,7 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
// } else { // } else {
// Log.e(TAG, "onClick: putSecureInt failed"); // Log.e(TAG, "onClick: putSecureInt failed");
// } // }
ComponentName cn = new ComponentName(RemoteManager.SN_PACKAGE_NAME, "com.uiui.zy.activity.EyeProtectionActivity"); ComponentName cn = new ComponentName("com.uiui.zy", "com.uiui.zy.activity.EyeProtectionActivity");
Intent intent = new Intent(); Intent intent = new Intent();
intent.setComponent(cn); intent.setComponent(cn);
try { try {

View File

@@ -20,7 +20,6 @@ import com.xwad.os.bean.SystemSettings;
import com.xwad.os.config.CommonConfig; import com.xwad.os.config.CommonConfig;
import com.xwad.os.databinding.ActivityMainBinding; import com.xwad.os.databinding.ActivityMainBinding;
import com.xwad.os.manager.DeviceSNManager; import com.xwad.os.manager.DeviceSNManager;
import com.xwad.os.manager.RemoteManager;
import com.xwad.os.network.NetInterfaceManager; import com.xwad.os.network.NetInterfaceManager;
import com.xwad.os.utils.ActivationUtil; import com.xwad.os.utils.ActivationUtil;
import com.xwad.os.utils.ApkUtils; import com.xwad.os.utils.ApkUtils;

View File

@@ -36,7 +36,7 @@ import com.xwad.os.fragment.usercenter.device.DeviceFragment;
import com.xwad.os.fragment.usercenter.info.InfoFragment; import com.xwad.os.fragment.usercenter.info.InfoFragment;
import com.xwad.os.fragment.usercenter.parents.ParentsFragment; import com.xwad.os.fragment.usercenter.parents.ParentsFragment;
import com.xwad.os.manager.DeviceSNManager; import com.xwad.os.manager.DeviceSNManager;
import com.xwad.os.manager.RemoteManager; import com.xwad.os.mdm.AdminManager;
import com.xwad.os.network.NetInterfaceManager; import com.xwad.os.network.NetInterfaceManager;
import com.xwad.os.utils.ActivationUtil; import com.xwad.os.utils.ActivationUtil;
import com.xwad.os.utils.ApkUtils; import com.xwad.os.utils.ApkUtils;
@@ -334,12 +334,12 @@ public class UserActivity extends BaseMvvmActivity<UserViewModel, ActivityUserBi
intent.setPackage("com.uiui.zy"); intent.setPackage("com.uiui.zy");
sendBroadcast(intent); sendBroadcast(intent);
boolean is_activation = RemoteManager.getInstance().getSnIsActivation(); // boolean is_activation = AdminManager.getInstance().getSnIsActivation();
if (is_activation) { // if (is_activation) {
startActivity(new Intent(UserActivity.this, ExitActivity.class)); // startActivity(new Intent(UserActivity.this, ExitActivity.class));
} else { // } else {
Utils.exitDesktop(UserActivity.this); // Utils.exitDesktop(UserActivity.this);
} // }
} }
} }

View File

@@ -28,7 +28,7 @@ import com.xwad.os.activity.service.ServiceActivity;
import com.xwad.os.bean.DesktopIcon; import com.xwad.os.bean.DesktopIcon;
import com.xwad.os.config.CommonConfig; import com.xwad.os.config.CommonConfig;
import com.xwad.os.manager.AppManager; import com.xwad.os.manager.AppManager;
import com.xwad.os.manager.RemoteManager; import com.xwad.os.mdm.AdminManager;
import com.xwad.os.utils.ActivationUtil; import com.xwad.os.utils.ActivationUtil;
import com.xwad.os.utils.ApkUtils; import com.xwad.os.utils.ApkUtils;
import com.xwad.os.utils.OpenApkUtils; import com.xwad.os.utils.OpenApkUtils;
@@ -172,12 +172,12 @@ public class AppAdapter extends RecyclerView.Adapter<AppAdapter.AppHolder> {
intent.setPackage("com.uiui.zy"); intent.setPackage("com.uiui.zy");
mContext.sendBroadcast(intent); mContext.sendBroadcast(intent);
boolean is_activation = RemoteManager.getInstance().getSnIsActivation(); // boolean is_activation = AdminManager.getInstance().getSnIsActivation();
if (is_activation) { // if (is_activation) {
mContext.startActivity(new Intent(mContext, ExitActivity.class)); // mContext.startActivity(new Intent(mContext, ExitActivity.class));
} else { // } else {
Utils.exitDesktop(mContext); // Utils.exitDesktop(mContext);
} // }
} }
@Override @Override

View File

@@ -24,7 +24,6 @@ import com.xwad.os.manager.AmapManager;
import com.xwad.os.manager.AppManager; import com.xwad.os.manager.AppManager;
import com.xwad.os.manager.ConnectManager; import com.xwad.os.manager.ConnectManager;
import com.xwad.os.manager.DeviceSNManager; import com.xwad.os.manager.DeviceSNManager;
import com.xwad.os.manager.RemoteManager;
import com.xwad.os.mdm.AdminManager; import com.xwad.os.mdm.AdminManager;
import com.xwad.os.network.NetInterfaceManager; import com.xwad.os.network.NetInterfaceManager;
import com.xwad.os.push.PushManager; import com.xwad.os.push.PushManager;
@@ -83,7 +82,6 @@ public class BaseApplication extends Application {
Log.e(TAG, "mmkv root: " + rootDir); Log.e(TAG, "mmkv root: " + rootDir);
ActivationUtil.init(this); ActivationUtil.init(this);
RemoteManager.init(this);
JgyUtils.init(this); JgyUtils.init(this);
AdminManager.init(this); AdminManager.init(this);

View File

@@ -46,7 +46,7 @@ import com.xwad.os.config.CommonConfig;
import com.xwad.os.databinding.FragmentUserBinding; import com.xwad.os.databinding.FragmentUserBinding;
import com.xwad.os.jxw.JxwPackageConfig; import com.xwad.os.jxw.JxwPackageConfig;
import com.xwad.os.jxw.SPUtils; import com.xwad.os.jxw.SPUtils;
import com.xwad.os.manager.RemoteManager; import com.xwad.os.mdm.AdminManager;
import com.xwad.os.utils.OpenApkUtils; import com.xwad.os.utils.OpenApkUtils;
import com.xwad.os.utils.TimeUtils; import com.xwad.os.utils.TimeUtils;
import com.xwad.os.utils.Utils; import com.xwad.os.utils.Utils;
@@ -322,25 +322,25 @@ public class UserFragment extends BaseMvvmFragment<UserViewModel, FragmentUserBi
} }
private void setButtonVisibility() { private void setButtonVisibility() {
boolean is_activation = RemoteManager.getInstance().getSnIsActivation(); // boolean is_activation = AdminManager.getInstance().getSnIsActivation();
Log.e(TAG, "setButtonVisibility: " + is_activation); // Log.e(TAG, "setButtonVisibility: " + is_activation);
if (is_activation) { // if (is_activation) {
boolean isReturnAndroid = RemoteManager.getInstance().isReturnAndroid(); // boolean isReturnAndroid = AdminManager.getInstance().isReturnAndroid();
if (isReturnAndroid) { // if (isReturnAndroid) {
// mViewDataBinding.tvExit.setVisibility(View.VISIBLE); //// mViewDataBinding.tvExit.setVisibility(View.VISIBLE);
} else { // } else {
// mViewDataBinding.tvExit.setVisibility(View.INVISIBLE); //// mViewDataBinding.tvExit.setVisibility(View.INVISIBLE);
} // }
mViewDataBinding.ivActivation.setVisibility(View.GONE); // mViewDataBinding.ivActivation.setVisibility(View.GONE);
mViewDataBinding.clStudyTime.setVisibility(View.VISIBLE); // mViewDataBinding.clStudyTime.setVisibility(View.VISIBLE);
} else { // } else {
// mViewDataBinding.tvExit.setVisibility(View.VISIBLE); //// mViewDataBinding.tvExit.setVisibility(View.VISIBLE);
mViewDataBinding.ivActivation.setVisibility(View.VISIBLE); // mViewDataBinding.ivActivation.setVisibility(View.VISIBLE);
mViewDataBinding.clStudyTime.setVisibility(View.GONE); // mViewDataBinding.clStudyTime.setVisibility(View.GONE);
Glide.with(mViewDataBinding.ivAvatar).load(mMMKV.decodeString(CommonConfig.UIUI_USER_AVATAR_KEY)).error(R.drawable.default_avatar).into(mViewDataBinding.ivAvatar); // Glide.with(mViewDataBinding.ivAvatar).load(mMMKV.decodeString(CommonConfig.UIUI_USER_AVATAR_KEY)).error(R.drawable.default_avatar).into(mViewDataBinding.ivAvatar);
mViewDataBinding.tvName.setText(mMMKV.decodeString(CommonConfig.UIUI_USER_NAME_KEY, getString(R.string.default_nickname))); // mViewDataBinding.tvName.setText(mMMKV.decodeString(CommonConfig.UIUI_USER_NAME_KEY, getString(R.string.default_nickname)));
mViewDataBinding.tvGrade.setText(mMMKV.decodeString(CommonConfig.UIUI_USER_GRADE_KEY, getString(R.string.default_grade))); // mViewDataBinding.tvGrade.setText(mMMKV.decodeString(CommonConfig.UIUI_USER_GRADE_KEY, getString(R.string.default_grade)));
} // }
} }
@Override @Override
@@ -659,12 +659,12 @@ public class UserFragment extends BaseMvvmFragment<UserViewModel, FragmentUserBi
intent.setPackage("com.uiui.zy"); intent.setPackage("com.uiui.zy");
mContext.sendBroadcast(intent); mContext.sendBroadcast(intent);
boolean is_activation = RemoteManager.getInstance().getSnIsActivation(); // boolean is_activation = AdminManager.getInstance().getSnIsActivation();
if (is_activation) { // if (is_activation) {
startActivity(new Intent(mContext, ExitActivity.class)); // startActivity(new Intent(mContext, ExitActivity.class));
} else { // } else {
Utils.exitDesktop(mContext); // Utils.exitDesktop(mContext);
} // }
} }
public void openSn(View view) { public void openSn(View view) {

View File

@@ -14,6 +14,7 @@ import com.tencent.mmkv.MMKV;
import com.xwad.os.R; import com.xwad.os.R;
import com.xwad.os.bean.DesktopIcon; import com.xwad.os.bean.DesktopIcon;
import com.xwad.os.config.CommonConfig; import com.xwad.os.config.CommonConfig;
import com.xwad.os.mdm.AdminManager;
import com.xwad.os.utils.ApkUtils; import com.xwad.os.utils.ApkUtils;
import java.text.Collator; import java.text.Collator;
@@ -97,8 +98,8 @@ public class AppManager {
List<ResolveInfo> resolveinfoList = pm.queryIntentActivities(resolveIntent, 0); List<ResolveInfo> resolveinfoList = pm.queryIntentActivities(resolveIntent, 0);
Set<String> allowPackages = resolveinfoList.stream().map(resolveInfo -> resolveInfo.activityInfo.packageName).collect(Collectors.toSet()); Set<String> allowPackages = resolveinfoList.stream().map(resolveInfo -> resolveInfo.activityInfo.packageName).collect(Collectors.toSet());
List<String> adminApp = RemoteManager.getInstance().getAdminApp(); // List<String> adminApp = AdminManager.getInstance().getAdminApp();
Log.i(TAG, "queryFilterAppInfo: adminapp = " + adminApp); // Log.i(TAG, "queryFilterAppInfo: adminapp = " + adminApp);
for (ResolveInfo resolveInfo : resolveinfoList) { for (ResolveInfo resolveInfo : resolveinfoList) {
String pkg = resolveInfo.activityInfo.packageName; String pkg = resolveInfo.activityInfo.packageName;
if (ApkUtils.appIsDisable(mContext, pkg)) { if (ApkUtils.appIsDisable(mContext, pkg)) {
@@ -115,11 +116,11 @@ public class AppManager {
} }
} else { } else {
if (allowPackages.contains(pkg) && !ApkUtils.excludePackageName.contains(pkg)) { if (allowPackages.contains(pkg) && !ApkUtils.excludePackageName.contains(pkg)) {
if (adminApp.contains(pkg)) { // if (adminApp.contains(pkg)) {
// resolveInfos.add(resolveInfo);
// } else if (ApkUtils.showPackageName.contains(pkg)) {
resolveInfos.add(resolveInfo); resolveInfos.add(resolveInfo);
} else if (ApkUtils.showPackageName.contains(pkg)) { // }
resolveInfos.add(resolveInfo);
}
} }
} }
} }
@@ -148,8 +149,8 @@ public class AppManager {
Set<String> allowPackages = resolveinfoList.stream().map(resolveInfo -> resolveInfo.activityInfo.packageName).collect(Collectors.toSet()); Set<String> allowPackages = resolveinfoList.stream().map(resolveInfo -> resolveInfo.activityInfo.packageName).collect(Collectors.toSet());
List<String> adminApp = RemoteManager.getInstance().getAdminApp(); // List<String> adminApp = AdminManager.getInstance().getAdminApp();
Log.i(TAG, "queryFilterAppInfo: adminapp = " + adminApp); // Log.i(TAG, "queryFilterAppInfo: adminapp = " + adminApp);
for (ResolveInfo resolveInfo : resolveinfoList) { for (ResolveInfo resolveInfo : resolveinfoList) {
String pkg = resolveInfo.activityInfo.packageName; String pkg = resolveInfo.activityInfo.packageName;
if (ApkUtils.appIsDisable(mContext, pkg)) { if (ApkUtils.appIsDisable(mContext, pkg)) {
@@ -166,11 +167,11 @@ public class AppManager {
} }
} else { } else {
if (allowPackages.contains(pkg) && !ApkUtils.excludePackageName.contains(pkg)) { if (allowPackages.contains(pkg) && !ApkUtils.excludePackageName.contains(pkg)) {
if (adminApp.contains(pkg)) { // if (adminApp.contains(pkg)) {
// resolveInfos.add(resolveInfo);
// } else if (ApkUtils.showPackageName.contains(pkg)) {
resolveInfos.add(resolveInfo); resolveInfos.add(resolveInfo);
} else if (ApkUtils.showPackageName.contains(pkg)) { // }
resolveInfos.add(resolveInfo);
}
} }
} }
} }
@@ -234,8 +235,8 @@ public class AppManager {
Set<String> allowPackages = resolveinfoList.stream().map(resolveInfo -> resolveInfo.activityInfo.packageName).collect(Collectors.toSet()); Set<String> allowPackages = resolveinfoList.stream().map(resolveInfo -> resolveInfo.activityInfo.packageName).collect(Collectors.toSet());
List<String> adminApp = RemoteManager.getInstance().getAdminApp(); // List<String> adminApp = AdminManager.getInstance().getAdminApp();
Log.i(TAG, "queryFilterAppInfo: adminapp = " + adminApp); // Log.i(TAG, "queryFilterAppInfo: adminapp = " + adminApp);
for (ResolveInfo resolveInfo : resolveinfoList) { for (ResolveInfo resolveInfo : resolveinfoList) {
String pkg = resolveInfo.activityInfo.packageName; String pkg = resolveInfo.activityInfo.packageName;
if (ApkUtils.appIsDisable(mContext, pkg)) { if (ApkUtils.appIsDisable(mContext, pkg)) {

View File

@@ -1,215 +0,0 @@
package com.xwad.os.manager;
import android.annotation.SuppressLint;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.os.IBinder;
import android.os.RemoteException;
import android.provider.Settings;
import android.util.Log;
import com.tencent.bugly.crashreport.CrashReport;
import com.tencent.mmkv.MMKV;
import com.uiui.zy.IGetInfoInterface;
import com.xwad.os.config.CommonConfig;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
public class RemoteManager {
private static final String TAG = "RemoteManager";
@SuppressLint("StaticFieldLeak")
private static RemoteManager sInstance;
private Context mContext;
private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
private static boolean mServiceConnected = false;
private IGetInfoInterface mIGetInfoInterface;
private ServiceConnection mServiceConnection;
private static final String SN_AIDL_NAME = "com.uiui.zy.IGetInfoInterface";
public static final String SN_PACKAGE_NAME = "com.uiui.zy";
private static final String SN_SERVICE_NAME = "com.uiui.zy.service.RemoteService";
private static final String SN_KEY = "sn_serial_key";
private RemoteManager(Context context) {
if (context == null) {
throw new RuntimeException("Context is NULL");
}
this.mContext = context;
mServiceConnection = new ServiceConnection() {
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
Log.e(TAG, "onServiceConnected: mIGetInfoConnection");
mIGetInfoInterface = IGetInfoInterface.Stub.asInterface(service);
mServiceConnected = true;
for (ConnectedListener listener : mListeners) {
listener.onRemoteConnected();
}
try {
String sn = mIGetInfoInterface.getSerial();
CrashReport.setDeviceId(mContext, sn);
mMMKV.encode(SN_KEY, sn);
Log.e(TAG, "onServiceConnected: sn = " + sn);
} catch (RemoteException e) {
e.printStackTrace();
}
// aliyunPushInit();
}
@Override
public void onServiceDisconnected(ComponentName name) {
Log.e(TAG, "onServiceDisconnected: mIGetInfoConnection");
//置空,重连
mIGetInfoInterface = null;
mServiceConnected = false;
bindInfoService();
}
};
bindInfoService();
}
public static void init(Context context) {
if (sInstance == null) {
Log.e(TAG, "init: ");
sInstance = new RemoteManager(context);
}
}
public static RemoteManager getInstance() {
if (sInstance == null) {
throw new IllegalStateException("You must be init RemoteManager first");
}
return sInstance;
}
private void bindInfoService() {
if (mIGetInfoInterface == null) {
//这是连接aidl服务的代码
Intent intent = new Intent();
intent.setAction(SN_AIDL_NAME);
intent.setPackage(SN_PACKAGE_NAME);
intent.setComponent(new ComponentName(SN_PACKAGE_NAME, SN_SERVICE_NAME));
mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE);
}
}
public interface ConnectedListener {
void onRemoteConnected();
}
private static Set<ConnectedListener> mListeners = new HashSet<>();
public static void setListener(ConnectedListener listener) {
mListeners.add(listener);
if (mServiceConnected) {
listener.onRemoteConnected();
}
}
public static void removeListener(ConnectedListener listener) {
mListeners.remove(listener);
}
// public void aliyunPushInit() {
// String sn = getSerial();
// if (TextUtils.isEmpty(sn)) {
// Log.e(TAG, "aliyunPushInit: empty");
// return;
// }
// PushServiceFactory.init(mContext);
// CloudPushService pushService = PushServiceFactory.getCloudPushService();
// pushService.register(mContext, new CommonCallback() {
// @Override
// public void onSuccess(String response) {
// Log.e("AliyunPush", "init cloudchannel success");
// Log.e("AliyunPush", "init cloudchannel success " + pushService.getDeviceId());
// pushService.bindAccount(sn, new CommonCallback() {
// @Override
// public void onSuccess(String s) {
// Log.e("AliyunPush", "bind account " + sn + " success\n");
// }
//
// @Override
// public void onFailed(String errorCode, String errorMsg) {
// Log.e("AliyunPush", "bind account " + sn + " failed." +
// "errorCode: " + errorCode + ", errorMsg:" + errorMsg);
// }
// });
// pushService.addAlias(sn, new CommonCallback() {
// @Override
// public void onSuccess(String s) {
// Log.e("AliyunPush", "add alias " + sn + " success\n");
// }
//
// @Override
// public void onFailed(String errorCode, String errorMsg) {
// Log.e("AliyunPush", "add alias " + sn + " failed." +
// "errorCode: " + errorCode + ", errorMsg:" + errorMsg + "\n");
// }
// });
// }
//
// @Override
// public void onFailed(String errorCode, String errorMessage) {
// Log.e("AliyunPush", "init cloudchannel failed -- errorcode:" + errorCode + " -- errorMessage:" + errorMessage);
// }
// });
// }
/**
* @return 获取sn
*/
// public String getSerial() {
// if (mIGetInfoInterface != null) {
// try {
// return mIGetInfoInterface.getSerial();
// } catch (Exception e) {
// Log.e(TAG, "getSerial: " + e.getMessage());
// }
// } else {
// bindInfoService();
// }
// return mMMKV.decodeString(SN_KEY, "unknown");
// }
//
// public String getAppUsedStatistics() {
// Log.e(TAG, "getAppUsedStatistics: " );
// return null;
// }
public boolean getSnIsActivation() {
int is_activation = Settings.Global.getInt(mContext.getContentResolver(), CommonConfig.UIUI_ACTIVATION_KEY, 0);
return is_activation == 1;
}
public void setDefaultDesktop(String pkg) {
Log.e(TAG, "setDefaultDesktop: " + pkg);
}
public void exitDesktop() {
Log.e(TAG, "exitDesktop: ");
}
public boolean isReturnAndroid() {
return false;
}
public boolean showThirdApp() {
return false;
}
public List<String> getAdminApp() {
return new ArrayList<>();
}
}

View File

@@ -25,7 +25,7 @@ import com.xwad.os.BuildConfig;
import com.xwad.os.R; import com.xwad.os.R;
import com.xwad.os.bean.AppUpdateInfo; import com.xwad.os.bean.AppUpdateInfo;
import com.xwad.os.bean.DesktopIcon; import com.xwad.os.bean.DesktopIcon;
import com.xwad.os.manager.RemoteManager; import com.xwad.os.mdm.AdminManager;
import com.xwad.os.receiver.InstallResultReceiver; import com.xwad.os.receiver.InstallResultReceiver;
import java.io.BufferedReader; import java.io.BufferedReader;
@@ -222,8 +222,8 @@ public class ApkUtils {
if (!TextUtils.isEmpty(appListString)) { if (!TextUtils.isEmpty(appListString)) {
packageList = new ArrayList<>(Arrays.asList(appListString.split(","))); packageList = new ArrayList<>(Arrays.asList(appListString.split(",")));
} }
List<String> adminApp = RemoteManager.getInstance().getAdminApp(); // List<String> adminApp = AdminManager.getInstance().getAdminApp();
Log.i(TAG, "queryFilterAppInfo: adminapp = " + adminApp); // Log.i(TAG, "queryFilterAppInfo: adminapp = " + adminApp);
for (ResolveInfo resolveInfo : resolveinfoList) { for (ResolveInfo resolveInfo : resolveinfoList) {
String pkg = resolveInfo.activityInfo.packageName; String pkg = resolveInfo.activityInfo.packageName;
if (appIsDisable(context, pkg)) { if (appIsDisable(context, pkg)) {
@@ -245,11 +245,11 @@ public class ApkUtils {
// } else { // } else {
if (allowPackages.contains(pkg) && !excludePackageName.contains(pkg)) { if (allowPackages.contains(pkg) && !excludePackageName.contains(pkg)) {
if (adminApp.contains(pkg)) { // if (adminApp.contains(pkg)) {
// resolveInfos.add(resolveInfo);
// } else if (showPackageName.contains(pkg)) {
resolveInfos.add(resolveInfo); resolveInfos.add(resolveInfo);
} else if (showPackageName.contains(pkg)) { // }
resolveInfos.add(resolveInfo);
}
} }
// } // }
} }

View File

@@ -23,7 +23,6 @@ import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.hjq.toast.Toaster; import com.hjq.toast.Toaster;
import com.tencent.mmkv.MMKV; import com.tencent.mmkv.MMKV;
import com.xwad.os.BuildConfig;
import com.xwad.os.R; import com.xwad.os.R;
import com.xwad.os.activity.activation.ActivationActivity; import com.xwad.os.activity.activation.ActivationActivity;
import com.xwad.os.activity.login.LoginActivity; import com.xwad.os.activity.login.LoginActivity;
@@ -33,7 +32,7 @@ import com.xwad.os.bean.LessonJson;
import com.xwad.os.config.CommonConfig; import com.xwad.os.config.CommonConfig;
import com.xwad.os.jxw.JxwPackageConfig; import com.xwad.os.jxw.JxwPackageConfig;
import com.xwad.os.jxw.SPUtils; import com.xwad.os.jxw.SPUtils;
import com.xwad.os.manager.RemoteManager; import com.xwad.os.mdm.AdminManager;
import com.xwad.os.network.NetInterfaceManager; import com.xwad.os.network.NetInterfaceManager;
import com.xwad.os.service.DownloadService; import com.xwad.os.service.DownloadService;
import com.xwad.os.view.jxw.widget.DefaultAppsDialog; import com.xwad.os.view.jxw.widget.DefaultAppsDialog;
@@ -91,12 +90,12 @@ public class OpenApkUtils {
if (!ApkUtils.isAvailable(mContext, "com.uiui.zy")) { if (!ApkUtils.isAvailable(mContext, "com.uiui.zy")) {
return true; return true;
} }
boolean is_activation = RemoteManager.getInstance().getSnIsActivation(); // boolean is_activation = AdminManager.getInstance().getSnIsActivation();
if (!is_activation) { // if (!is_activation) {
OpenApkUtils.getInstance().openZySn(); // OpenApkUtils.getInstance().openZySn();
Toaster.show("请激活设备后使用"); // Toaster.show("请激活设备后使用");
} // }
return is_activation; return false;
} }
public boolean openPackageWithArgs(String packageName, String className, String name, String args) { public boolean openPackageWithArgs(String packageName, String className, String name, String args) {

View File

@@ -36,7 +36,7 @@ import com.google.zxing.qrcode.QRCodeWriter;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import com.xwad.os.BuildConfig; import com.xwad.os.BuildConfig;
import com.xwad.os.R; import com.xwad.os.R;
import com.xwad.os.manager.RemoteManager; import com.xwad.os.mdm.AdminManager;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
@@ -468,13 +468,13 @@ public class Utils {
public static void exitDesktop(Activity context) { public static void exitDesktop(Activity context) {
if ("HONOR".equalsIgnoreCase(Build.BRAND)) { if ("HONOR".equalsIgnoreCase(Build.BRAND)) {
RemoteManager.getInstance().exitDesktop(); // AdminManager.getInstance().exitDesktop();
// RemoteManager.getInstance().setDefaultDesktop("com.hihonor.android.launcher"); // AdminManager.getInstance().setDefaultDesktop("com.hihonor.android.launcher");
} else { } else {
if ("U807".equals(BuildConfig.platform) && ApkUtils.isAvailable(context, "com.uiuipad.os")) { if ("U807".equals(BuildConfig.platform) && ApkUtils.isAvailable(context, "com.uiuipad.os")) {
RemoteManager.getInstance().setDefaultDesktop("com.uiuipad.os"); AdminManager.getInstance().setDefaultLauncher("com.uiuipad.os");
} else { } else {
RemoteManager.getInstance().setDefaultDesktop(ApkUtils.ANDROID_LAUNCHER3_PACKAGE_NAME); AdminManager.getInstance().setDefaultLauncher(ApkUtils.ANDROID_LAUNCHER3_PACKAGE_NAME);
} }
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) { if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {