fix: 目标版本更改为26

Launcher3/src/com/android/launcher3/App.java

@@ -19,8 +19,6 @@ public class App extends Application {
         if (dpmHelper.isMiddlewareLatest()) {
             dpmHelper.initMiddleWare();
         }
-        ActivationHelper.INSTANCE.init(mApp);
-        CheckUpdateCore.get().init(this);
         DialogUIUtils.init(mApp);
     }
 }

Launcher3/src/com/android/launcher3/settings/BlankActivity.java

@@ -5,7 +5,9 @@ import android.text.TextUtils;
 
 import com.android.launcher3.function.pwd.PwdPinSetPwdActivity;
 import com.secspace.lib.common.base.BaseActivity;
+import com.secspace.lib.common.function.ActivationHelper;
 import com.secspace.lib.common.function.DialogManager;
+import com.secspace.lib.common.update.CheckUpdateCore;
 import com.secspace.lib.common.utils.IntentUtil;
 import com.secspace.lib.common.utils.Prefs;
 
@@ -28,12 +30,17 @@ public class BlankActivity extends BaseActivity {
             DialogManager.INSTANCE.showPrivacyPolicyDialog(this);
             return;
         }
+        if(!checkPermissions()){
+            return;
+        }
         String pwd = Prefs.getLoginPwd(this);
         if (TextUtils.isEmpty(pwd)) {
             Intent intent = new Intent(this, PwdPinSetPwdActivity.class);
             startActivity(intent);
             return;
         }
+        ActivationHelper.INSTANCE.init(this);
+        CheckUpdateCore.get().init(this);
         IntentUtil.startEduLauncher(this);
     }
 

build.gradle

@@ -78,6 +78,6 @@ ext {
     compileSdkVersion = 28
     buildToolsVersion = '28.0.0'
     minSdkVersion = 21
-    targetSdkVersion = 22
+    targetSdkVersion = 26
     supportLibraryVersion = '28.0.0'
 }

lib_common/src/main/java/com/secspace/lib/common/base/BaseActivity.java

@@ -24,6 +24,7 @@ import com.secspace.lib.common.R;
 import com.secspace.lib.common.R2;
 import com.secspace.lib.common.utils.ActivityHelper;
 
+import java.util.Arrays;
 import java.util.List;
 
 import butterknife.BindView;
@@ -43,30 +44,12 @@ public abstract class BaseActivity extends AppCompatActivity implements EasyPerm
     private static final int PERMISSION_REQUEST_CODE = 0x10;
     public static final String INTENT_FROM_MANUAL = "isFromManual";
     private static final String[] RUNTIME_PERMISSIONS = new String[]{
-            "android.permission.WRITE_CONTACTS",
-            "android.permission.GET_ACCOUNTS",
-            "android.permission.READ_CONTACTS",
-            "android.permission.READ_CALL_LOG",
             "android.permission.READ_PHONE_STATE",
             "android.permission.CALL_PHONE",
-            "android.permission.WRITE_CALL_LOG",
-            "android.permission.PROCESS_OUTGOING_CALLS",
-            "android.permission.READ_CALENDAR",
-            "android.permission.WRITE_CALENDAR",
-            "android.permission.CAMERA",
             "android.permission.ACCESS_FINE_LOCATION",
             "android.permission.ACCESS_COARSE_LOCATION",
             "android.permission.READ_EXTERNAL_STORAGE",
             "android.permission.WRITE_EXTERNAL_STORAGE",
-            "android.permission.RECORD_AUDIO",
-            "android.permission.READ_SMS",
-            "android.permission.RECEIVE_WAP_PUSH",
-            "android.permission.RECEIVE_MMS",
-            "android.permission.RECEIVE_SMS",
-            "android.permission.SEND_SMS",
-            "android.permission.READ_CELL_BROADCASTS"
-            //            "android.permission.READ_CALENDAR",
-//            "android.permission.WRITE_CALENDAR"
     };
     protected View mRootView;
     protected String fromWhere;
@@ -184,8 +167,9 @@ public abstract class BaseActivity extends AppCompatActivity implements EasyPerm
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        Log.e("TAG1", "onRequestPermissionsResult permissions: " + Arrays.toString(permissions) );
+        Log.e("TAG1", "onRequestPermissionsResult grantResults: " + Arrays.toString(grantResults) );
         EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
-
     }
 
     @Override

lib_common/src/main/java/com/secspace/lib/common/function/PrivacyPolicyDialog.java

@@ -177,12 +177,13 @@ public class PrivacyPolicyDialog implements DialogInterface.OnDismissListener, V
         } else if (v.getId() == R.id.btn_accept) {
             Prefs.setPrivacyPolicyState(mActivity, true);
             try {
-                mActivity.startActivity(new Intent(mActivity, Class.forName("com.android.launcher3.settings.BlankActivity")));
+                Intent intent = new Intent(mActivity, Class.forName("com.android.launcher3.settings.BlankActivity"));
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                mActivity.startActivity(intent);
             } catch (ClassNotFoundException e) {
                 e.printStackTrace();
             }
             dismiss();
-            mActivity.finish();
         }
     }
 

lib_common/src/main/java/com/secspace/lib/common/function/WorkManager.kt

@@ -7,8 +7,8 @@ import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.os.SystemClock
-import com.secspace.lib.common.R
 import com.secspace.lib.common.dialog.LoadingDialog
+import com.secspace.lib.common.env.Packages.PkgSecSpace
 import com.secspace.lib.common.env.SEnvironment
 import com.secspace.lib.common.utils.*
 import com.secspace.log.Log
@@ -25,6 +25,11 @@ object WorkManager {
     private val mHandler: Handler = Handler(Looper.getMainLooper(), Handler.Callback { true })
     private var mEnterTime: Long = 0
     private var isChecksCompleted = false
+    private val SYSTEM_AGENT_RUNTIME_PERMISSIONS = arrayOf(
+            "android.permission.READ_PHONE_STATE",
+            "android.permission.WRITE_EXTERNAL_STORAGE",
+            "android.permission.READ_EXTERNAL_STORAGE"
+    )
 
     fun enter(launcher: Activity?) {
         mContext = launcher!!.applicationContext
@@ -53,6 +58,13 @@ object WorkManager {
             mHandler.postDelayed({ enter(launcher) }, 2000)
             return
         }
+        //检查系统代理件动态权限
+        //检查系统代理件动态权限
+        if (!hasPermissions(SYSTEM_AGENT_RUNTIME_PERMISSIONS, PkgSecSpace.PACKAGENAME_MIDDLEWARE)) {
+            IntentUtil.startRuntimePermissionActivity(mContext, PkgSecSpace.PACKAGENAME_MIDDLEWARE)
+            Log.i(TAG, "system agent request runtime permission")
+            return
+        }
         LoadingDialog.getInstance(launcher).show("切换中")
         GlobalScope.launch(Dispatchers.IO) {
             SwitchInMdm.onInit(launcher)

lib_common/src/main/java/com/secspace/lib/common/utils/IntentUtil.java

@@ -80,6 +80,13 @@ public class IntentUtil {
         safeStartActivity(context, launcher);
     }
 
+    public static void startRuntimePermissionActivity(Context context, String packageName) {
+        Intent intent = new Intent("com.mdm.action.RUNTIME_PERMISSION");
+        intent.addCategory(Intent.CATEGORY_DEFAULT);
+        intent.setPackage(packageName);
+        safeStartActivity(context, intent);
+    }
+
     private static void safeStartActivity(Context context, Intent intent){
         try{
             context.startActivity(intent);