Commit 3f8d9c8a by Baoxy

fix: 网络异常时提示并退出

parent 59b74cc3
...@@ -1203,7 +1203,19 @@ public class Launcher extends BaseActivity ...@@ -1203,7 +1203,19 @@ public class Launcher extends BaseActivity
ActivationHelper.INSTANCE.active(this, new ActivationHelper.ActivationListener() { ActivationHelper.INSTANCE.active(this, new ActivationHelper.ActivationListener() {
@Override @Override
public void activationFailed() { public void activationFailed() {
DialogManager.INSTANCE.showActivateLoseDialog(Launcher.this, getString(R.string.common_remind)
, getString(R.string.dialog_tip_activate_lose), new DialogManager.MessageListener() {
@Override
public void onPositive() {
IntentUtil.startHomeIntent(Launcher.this);
}
@Override
public void onNegative() {
}
})
;
} }
@Override @Override
......
...@@ -69,7 +69,7 @@ object DialogManager{ ...@@ -69,7 +69,7 @@ object DialogManager{
} }
fun showActivateLoseDialog(activity: Activity?, title: String?, content: String?, listener: MessageListener) { fun showActivateLoseDialog(activity: Activity?, title: String?, content: String?, listener: MessageListener) {
DialogUIUtils.showAlert(activity, title, content, "", "", "确定", "输入激活码", false, false, false, object : DialogUIListener() { DialogUIUtils.showAlert(activity, title, content, "", "", "确定", "", false, false, false, object : DialogUIListener() {
override fun onPositive() { override fun onPositive() {
listener.onPositive() listener.onPositive()
} }
......
...@@ -8,15 +8,12 @@ import android.content.pm.PackageManager ...@@ -8,15 +8,12 @@ import android.content.pm.PackageManager
import android.content.pm.ResolveInfo import android.content.pm.ResolveInfo
import android.os.Build.VERSION_CODES import android.os.Build.VERSION_CODES
import android.util.Log import android.util.Log
import com.secspace.lib.common.dialog.LoadingDialog
import com.secspace.lib.common.env.Packages.PkgSecSpace import com.secspace.lib.common.env.Packages.PkgSecSpace
import com.secspace.lib.common.utils.* import com.secspace.lib.common.utils.*
import com.secspace.lib.common.utils.Package.ComponentNames.COMPONENT_UPDATE_SYSTEM import com.secspace.lib.common.utils.Package.ComponentNames.COMPONENT_UPDATE_SYSTEM
import com.secspace.lib.common.utils.Package.ComponentNames.EnterprisePrivacySettingsActivity import com.secspace.lib.common.utils.Package.ComponentNames.EnterprisePrivacySettingsActivity
import com.secspace.mdmengine.api.manager.MdmFactoryManager import com.secspace.mdmengine.api.manager.MdmFactoryManager
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import java.util.* import java.util.*
...@@ -25,6 +22,9 @@ object SwitchInMdm: ISwitch() { ...@@ -25,6 +22,9 @@ object SwitchInMdm: ISwitch() {
private val TAG = "SwitchInMdm" private val TAG = "SwitchInMdm"
override suspend fun init(context: Context) { override suspend fun init(context: Context) {
this.context = context this.context = context
if(MdmFactoryManager.getInstance().deviceApplicationManager == null){
return
}
MdmUtils.setDefaultLauncher(context) MdmUtils.setDefaultLauncher(context)
val mdmFactoryManager = DpmHelper.getInstance(context).getmMdmFactoryManager() val mdmFactoryManager = DpmHelper.getInstance(context).getmMdmFactoryManager()
......
...@@ -39,5 +39,5 @@ ...@@ -39,5 +39,5 @@
<string name="close_btn">关闭</string> <string name="close_btn">关闭</string>
<string name="btn_input_code">输入激活码</string> <string name="btn_input_code">输入激活码</string>
<string name="dialog_tip_activate_lose">您的激活已失效,如有疑问请致电4008265936</string> <string name="dialog_tip_activate_lose">网络异常,请确认网络后重新进入</string>
</resources> </resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment