fix: 修复BUG

Launcher3/src/com/android/launcher3/function/setting/SettingBuyActivity.kt

@@ -13,6 +13,7 @@ import com.secspace.lib.common.dialog.LoadingDialog
 import com.secspace.lib.common.dialog.other.DialogUIUtils
 import com.secspace.lib.common.function.ActivationHelper
 import com.secspace.lib.common.function.ActivationHelper.ActivationListener
+import com.secspace.lib.common.utils.ImeiUtil
 import com.secspace.lib.common.utils.dp2px
 import kotlinx.android.synthetic.main.activity_setting.*
 
@@ -21,6 +22,7 @@ class SettingBuyActivity : BaseActivity() {
     private var code: QMUICommonListItemView? = null
     private var timeStart: QMUICommonListItemView? = null
     private var timeEnd: QMUICommonListItemView? = null
+    private var uniqueId: QMUICommonListItemView? = null
     private lateinit var mContext: Context
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -58,11 +60,18 @@ class SettingBuyActivity : BaseActivity() {
                 UCharacter.DecompositionType.VERTICAL,
                 QMUICommonListItemView.ACCESSORY_TYPE_NONE,
                 dp2px(48f))
+        uniqueId = grouplistview.createItemView(null,
+                getString(R.string.edu_item_unique),
+                ImeiUtil.uniqueId(mContext, true),
+                UCharacter.DecompositionType.VERTICAL,
+                QMUICommonListItemView.ACCESSORY_TYPE_NONE,
+                dp2px(48f))
         QMUIGroupListView.newSection(mContext)
                 .addItemView(activationType) {}
                 .addItemView(code) { }
                 .addItemView(timeStart) {}
                 .addItemView(timeEnd) { }
+                .addItemView(uniqueId) { }
                 .addTo(grouplistview)
         btn_activation.setOnClickListener {
             LoadingDialog.getInstance(mContext).show("请稍后")

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

@@ -31,6 +31,7 @@ import kotlin.coroutines.suspendCoroutine
 const val PROBATION = "probation"
 const val SP_TRIAL_ACTIVE_START_TIME = "trialActiveStartTime"
 const val PROBATION_TIME: Long = 7 * 24 * 60 * 60 * 1000
+//const val PROBATION_TIME: Long = 1 * 60 * 1000
 
 object ActivationHelper {
     private const val TAG = "ActivationHelper"
@@ -38,7 +39,7 @@ object ActivationHelper {
     private const val PROBATION_FILE_NAME = "probation.xml"
     private const val ACTIVATE_FILE_NAME = "activate.xml"
 
-    fun active(context: Activity, listener: ActivationListener, force: Boolean = false) {
+    fun active(context: Context, listener: ActivationListener, force: Boolean = false) {
         ActivationApi.getInstance().isActiveFromLocalAndNet(context.packageName, object : CheckLocalActiveStatusListener {
             override fun hasActivated() {
                 listener.activated()
@@ -77,7 +78,7 @@ object ActivationHelper {
     }
 
     fun checkActivate(context: Context, listener: CheckActiveStatusListener?) {
-        ActivationApi.getInstance().checkActivateCodeStatus(context.packageName, listener)
+        ActivationApi.getInstance().checkActivateCodeStatus(context.packageName, listener, false)
     }
 
     private suspend fun getCurrentTimeByNet(): Long = suspendCoroutine { cont ->
@@ -216,6 +217,12 @@ object ActivationHelper {
     }
 
     fun getActivationTimeEnd(context: Context): String? {
+        val activationState = getValueByXmlKey(context, SP_IS_ACTIVE, ACTIVATE_FILE_NAME)
+        if (activationState.isNotEmpty()) {
+            if(activationState == ACTIVE_TYPE_RELEASE_CODE){
+                return "永久"
+            }
+        }
         val activationEndTime = getValueByXmlKey(context, SP_TRIAL_ACTIVE_END_TIME, ACTIVATE_FILE_NAME)
         if (activationEndTime.isNotEmpty()) {
             return activationEndTime.replace("  ", " ")

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

@@ -65,17 +65,18 @@ class BuyCodeDialog private constructor(val mContext: Context) : DialogInterface
     override fun onClick(v: View) {
         when (v.id) {
             R.id.btn_accept -> {
+                dismiss()
+                WorkManager.removeForbidden(mContext)
                 active(mContext, object : ActivationListener {
                     override fun activationFailed() {}
                     override fun activated() {
                         IntentUtil.startEduLauncher(mContext)
                     }
                 }, true)
-                dismiss()
-                WorkManager.removeForbidden(mContext)
             }
             R.id.btn_exit -> {
                 dismiss()
+                WorkManager.removeForbidden(mContext)
             }
         }
     }

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

@@ -143,7 +143,7 @@ object WorkManager {
     fun removeForbidden(context: Context){
         Prefs.setMdmInitializedWhenEnter(context, false)
         GlobalScope.launch(Dispatchers.IO) {
-            SwitchOutMdm.onInit(context)
+            SwitchOutMdm.onExit(context)
             UninstallUtil.removeForbidden(context)
         }
     }
@@ -155,26 +155,27 @@ object WorkManager {
                 if (isActivateLocal) {
                     return@launch
                 }
-                DialogManager.showActivateLoseDialog(activity, activity.getString(R.string.common_remind), activity.getString(R.string.dialog_tip_activate_lose), object : DialogManager.MessageListener {
-                    override fun onPositive() {
-                        IntentUtil.startExitService(activity)
-                        removeForbidden(activity)
-                    }
-
-                    override fun onNegative() {
-                        ActivationHelper.active(activity, object : ActivationHelper.ActivationListener {
-                            override fun activated() {
-                                IntentUtil.startEduLauncher(activity)
-                            }
-
-                            override fun activationFailed() {
-                                IntentUtil.startExitService(activity)
-                                removeForbidden(activity)
-                            }
-                        }, true)
-                        removeForbidden(activity)
-                    }
-                })
+                DialogManager.showBuyCodeDialog(activity)
+//                DialogManager.showActivateLoseDialog(activity, activity.getString(R.string.common_remind), activity.getString(R.string.dialog_tip_activate_lose), object : DialogManager.MessageListener {
+//                    override fun onPositive() {
+//                        IntentUtil.startExitService(activity)
+//                        removeForbidden(activity)
+//                    }
+//
+//                    override fun onNegative() {
+//                        ActivationHelper.active(activity, object : ActivationHelper.ActivationListener {
+//                            override fun activated() {
+//                                IntentUtil.startEduLauncher(activity)
+//                            }
+//
+//                            override fun activationFailed() {
+//                                IntentUtil.startExitService(activity)
+//                                removeForbidden(activity)
+//                            }
+//                        }, true)
+//                        removeForbidden(activity)
+//                    }
+//                })
             }
         }
 

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

@@ -14,8 +14,8 @@ public class VUidUtil {
     }
 
     public static void test(){
-        String p1 = "WSlY8BwZOLSYs2VDI3tORA==";
-        String p2 = "OHGoTezawno=";
+        String p1 = "kAm2OaAw+pqEJrtMkupX7Q==";
+        String p2 = "dcyvcY/13lcojC2xXAn+7AWgIEi5Mz1j";
         String p3 = "Z8MSUpI7MsfCjMqljoyXfg==";
         String p4 = "6aUHDn194eTCjMqljoyXfg==";