diff --git a/app/build.gradle b/app/build.gradle index bb609de..36a5121 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -60,6 +60,10 @@ android { exclude 'META-INF/LICENSE.txt' exclude 'META-INF/NOTICE.txt' } + + manifestPlaceholders = [ + AMAP_KEY: "db082446a68db8e3ffdc8277313c2e6a" + ] } externalNativeBuild { @@ -87,9 +91,6 @@ android { //Zipalign优化 zipAlignEnabled true buildConfigField "String", "platform", '"tuixin"' - manifestPlaceholders = [ - AMAP_KEY: "9c9fabf3934df224e927b2f9fbc51064" - ] signingConfig signingConfigs.tuixin applicationVariants.all { variant -> variant.outputs.each { output -> @@ -111,9 +112,6 @@ android { //签名 signingConfig signingConfigs.tuixin buildConfigField "String", "platform", '"tuixin"' - manifestPlaceholders = [ - AMAP_KEY: "9c9fabf3934df224e927b2f9fbc51064" - ] // 将release版本的包名重命名，加上版本及日期 applicationVariants.all { variant -> variant.outputs.each { output -> 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 7c136ee..662a8bf 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 @@ -63,7 +63,7 @@ import com.xwad.os.jxw.event.UpdateGradeEvent; import com.xwad.os.jxw.fragment.SztzFragment; import com.xwad.os.jxw.util.Util; 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.utils.ActivationUtil; import com.xwad.os.utils.ApkUtils; @@ -82,7 +82,7 @@ import java.util.List; import me.jessyan.autosize.AutoSizeCompat; import me.jessyan.autosize.AutoSizeConfig; -public class HomeActivity extends BaseMvvmActivity implements RemoteManager.ConnectedListener { +public class HomeActivity extends BaseMvvmActivity { private static final String TAG = "HomeActivity"; private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); @@ -94,13 +94,6 @@ public class HomeActivity extends BaseMvvmActivity= 33) { @@ -337,12 +329,12 @@ public class HomeActivity extends BaseMvvmActivity implements RemoteManager.ConnectedListener { +public class MainActivity extends BaseMvvmActivity { private static final String TAG = "MainActivity"; private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); @@ -80,13 +80,6 @@ public class MainActivity extends BaseMvvmActivity { 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(mContext); - } +// boolean is_activation = AdminManager.getInstance().getSnIsActivation(); +// if (is_activation) { +// mContext.startActivity(new Intent(mContext, ExitActivity.class)); +// } else { +// Utils.exitDesktop(mContext); +// } } @Override 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 fe89354..1976e2c 100644 --- a/app/src/main/java/com/xwad/os/base/BaseApplication.java +++ b/app/src/main/java/com/xwad/os/base/BaseApplication.java @@ -24,7 +24,6 @@ import com.xwad.os.manager.AmapManager; import com.xwad.os.manager.AppManager; import com.xwad.os.manager.ConnectManager; 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.push.PushManager; @@ -83,7 +82,6 @@ public class BaseApplication extends Application { Log.e(TAG, "mmkv root: " + rootDir); ActivationUtil.init(this); - RemoteManager.init(this); JgyUtils.init(this); AdminManager.init(this); diff --git a/app/src/main/java/com/xwad/os/fragment/user/UserFragment.java b/app/src/main/java/com/xwad/os/fragment/user/UserFragment.java index 4d9dfec..10816ad 100644 --- a/app/src/main/java/com/xwad/os/fragment/user/UserFragment.java +++ b/app/src/main/java/com/xwad/os/fragment/user/UserFragment.java @@ -46,7 +46,7 @@ import com.xwad.os.config.CommonConfig; import com.xwad.os.databinding.FragmentUserBinding; import com.xwad.os.jxw.JxwPackageConfig; 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.TimeUtils; import com.xwad.os.utils.Utils; @@ -322,25 +322,25 @@ public class UserFragment extends BaseMvvmFragment resolveinfoList = pm.queryIntentActivities(resolveIntent, 0); Set allowPackages = resolveinfoList.stream().map(resolveInfo -> resolveInfo.activityInfo.packageName).collect(Collectors.toSet()); - List adminApp = RemoteManager.getInstance().getAdminApp(); - Log.i(TAG, "queryFilterAppInfo: adminapp = " + adminApp); +// List adminApp = AdminManager.getInstance().getAdminApp(); +// Log.i(TAG, "queryFilterAppInfo: adminapp = " + adminApp); for (ResolveInfo resolveInfo : resolveinfoList) { String pkg = resolveInfo.activityInfo.packageName; if (ApkUtils.appIsDisable(mContext, pkg)) { @@ -115,11 +116,11 @@ public class AppManager { } } else { 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); - } else if (ApkUtils.showPackageName.contains(pkg)) { - resolveInfos.add(resolveInfo); - } +// } } } } @@ -148,8 +149,8 @@ public class AppManager { Set allowPackages = resolveinfoList.stream().map(resolveInfo -> resolveInfo.activityInfo.packageName).collect(Collectors.toSet()); - List adminApp = RemoteManager.getInstance().getAdminApp(); - Log.i(TAG, "queryFilterAppInfo: adminapp = " + adminApp); +// List adminApp = AdminManager.getInstance().getAdminApp(); +// Log.i(TAG, "queryFilterAppInfo: adminapp = " + adminApp); for (ResolveInfo resolveInfo : resolveinfoList) { String pkg = resolveInfo.activityInfo.packageName; if (ApkUtils.appIsDisable(mContext, pkg)) { @@ -166,11 +167,11 @@ public class AppManager { } } else { 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); - } else if (ApkUtils.showPackageName.contains(pkg)) { - resolveInfos.add(resolveInfo); - } +// } } } } @@ -234,8 +235,8 @@ public class AppManager { Set allowPackages = resolveinfoList.stream().map(resolveInfo -> resolveInfo.activityInfo.packageName).collect(Collectors.toSet()); - List adminApp = RemoteManager.getInstance().getAdminApp(); - Log.i(TAG, "queryFilterAppInfo: adminapp = " + adminApp); +// List adminApp = AdminManager.getInstance().getAdminApp(); +// Log.i(TAG, "queryFilterAppInfo: adminapp = " + adminApp); for (ResolveInfo resolveInfo : resolveinfoList) { String pkg = resolveInfo.activityInfo.packageName; if (ApkUtils.appIsDisable(mContext, pkg)) { diff --git a/app/src/main/java/com/xwad/os/manager/RemoteManager.java b/app/src/main/java/com/xwad/os/manager/RemoteManager.java deleted file mode 100644 index 30f8ce6..0000000 --- a/app/src/main/java/com/xwad/os/manager/RemoteManager.java +++ /dev/null @@ -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 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 getAdminApp() { - return new ArrayList<>(); - } - -} diff --git a/app/src/main/java/com/xwad/os/utils/ApkUtils.java b/app/src/main/java/com/xwad/os/utils/ApkUtils.java index 096d553..2fc3a8e 100644 --- a/app/src/main/java/com/xwad/os/utils/ApkUtils.java +++ b/app/src/main/java/com/xwad/os/utils/ApkUtils.java @@ -25,7 +25,7 @@ import com.xwad.os.BuildConfig; import com.xwad.os.R; import com.xwad.os.bean.AppUpdateInfo; 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 java.io.BufferedReader; @@ -222,8 +222,8 @@ public class ApkUtils { if (!TextUtils.isEmpty(appListString)) { packageList = new ArrayList<>(Arrays.asList(appListString.split(","))); } - List adminApp = RemoteManager.getInstance().getAdminApp(); - Log.i(TAG, "queryFilterAppInfo: adminapp = " + adminApp); +// List adminApp = AdminManager.getInstance().getAdminApp(); +// Log.i(TAG, "queryFilterAppInfo: adminapp = " + adminApp); for (ResolveInfo resolveInfo : resolveinfoList) { String pkg = resolveInfo.activityInfo.packageName; if (appIsDisable(context, pkg)) { @@ -245,11 +245,11 @@ public class ApkUtils { // } else { 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); - } else if (showPackageName.contains(pkg)) { - resolveInfos.add(resolveInfo); - } +// } } // } } diff --git a/app/src/main/java/com/xwad/os/utils/OpenApkUtils.java b/app/src/main/java/com/xwad/os/utils/OpenApkUtils.java index cf16262..69fffa3 100644 --- a/app/src/main/java/com/xwad/os/utils/OpenApkUtils.java +++ b/app/src/main/java/com/xwad/os/utils/OpenApkUtils.java @@ -23,7 +23,6 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.hjq.toast.Toaster; import com.tencent.mmkv.MMKV; -import com.xwad.os.BuildConfig; import com.xwad.os.R; import com.xwad.os.activity.activation.ActivationActivity; 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.jxw.JxwPackageConfig; 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.service.DownloadService; import com.xwad.os.view.jxw.widget.DefaultAppsDialog; @@ -91,12 +90,12 @@ public class OpenApkUtils { if (!ApkUtils.isAvailable(mContext, "com.uiui.zy")) { return true; } - boolean is_activation = RemoteManager.getInstance().getSnIsActivation(); - if (!is_activation) { - OpenApkUtils.getInstance().openZySn(); - Toaster.show("请激活设备后使用"); - } - return is_activation; +// boolean is_activation = AdminManager.getInstance().getSnIsActivation(); +// if (!is_activation) { +// OpenApkUtils.getInstance().openZySn(); +// Toaster.show("请激活设备后使用"); +// } + return false; } public boolean openPackageWithArgs(String packageName, String className, String name, String args) { diff --git a/app/src/main/java/com/xwad/os/utils/Utils.java b/app/src/main/java/com/xwad/os/utils/Utils.java index 6c26aad..48d6e18 100644 --- a/app/src/main/java/com/xwad/os/utils/Utils.java +++ b/app/src/main/java/com/xwad/os/utils/Utils.java @@ -36,7 +36,7 @@ import com.google.zxing.qrcode.QRCodeWriter; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; import com.xwad.os.BuildConfig; import com.xwad.os.R; -import com.xwad.os.manager.RemoteManager; +import com.xwad.os.mdm.AdminManager; import java.io.BufferedReader; import java.io.File; @@ -468,13 +468,13 @@ public class Utils { public static void exitDesktop(Activity context) { if ("HONOR".equalsIgnoreCase(Build.BRAND)) { - RemoteManager.getInstance().exitDesktop(); -// RemoteManager.getInstance().setDefaultDesktop("com.hihonor.android.launcher"); +// AdminManager.getInstance().exitDesktop(); +// AdminManager.getInstance().setDefaultDesktop("com.hihonor.android.launcher"); } else { if ("U807".equals(BuildConfig.platform) && ApkUtils.isAvailable(context, "com.uiuipad.os")) { - RemoteManager.getInstance().setDefaultDesktop("com.uiuipad.os"); + AdminManager.getInstance().setDefaultLauncher("com.uiuipad.os"); } 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) {