Commit 1afa2d8d by Baoxy

fix: 输错几次密码后(到锁定前),输对一次密码进行系统切换,再次输错密码时,输错次数未被重置

parent 8eceacee
...@@ -3015,6 +3015,7 @@ public class Launcher extends BaseActivity ...@@ -3015,6 +3015,7 @@ public class Launcher extends BaseActivity
InputUtil.closeSoftInput(getApplicationContext(), view); InputUtil.closeSoftInput(getApplicationContext(), view);
if (TextUtils.equals(((EditText) view).getText().toString(), Prefs.getLoginPwd(mAppContext))) { if (TextUtils.equals(((EditText) view).getText().toString(), Prefs.getLoginPwd(mAppContext))) {
IntentUtil.startExitService(mAppContext); IntentUtil.startExitService(mAppContext);
ErrorTimeHelper.getInstance(mAppContext).resetLockTimeAndCount();
} else { } else {
DialogUIUtils.showToastCenter("密码错误"); DialogUIUtils.showToastCenter("密码错误");
ErrorTimeHelper.getInstance(mAppContext).addErrorCount(); ErrorTimeHelper.getInstance(mAppContext).addErrorCount();
......
...@@ -26,7 +26,7 @@ MAVEN_URL=http://192.168.0.170:13000/nexus/content/repositories/releases/ ...@@ -26,7 +26,7 @@ MAVEN_URL=http://192.168.0.170:13000/nexus/content/repositories/releases/
MAVEN_URL_SNAPSHOT=http://192.168.0.170:13000/nexus/content/repositories/releases/ MAVEN_URL_SNAPSHOT=http://192.168.0.170:13000/nexus/content/repositories/releases/
#32位有符号数2147483647(10) #32位有符号数2147483647(10)
versionIntCode=2020041301 versionIntCode=2020041501
versionNameMajor=1 versionNameMajor=1
versionNameMinor=0 versionNameMinor=0
......
...@@ -44,9 +44,9 @@ object ImeiUtil { ...@@ -44,9 +44,9 @@ object ImeiUtil {
tm.deviceId tm.deviceId
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG, "No imei was obtained. error is ${e.message}") Log.e(TAG, "No imei was obtained. error is ${e.message}")
"unKnown" NULL
} }
if (imei != "unKnown") { if (imei != NULL) {
if (file.createNewFile()) { if (file.createNewFile()) {
val fileWriter = FileWriter(file, false) val fileWriter = FileWriter(file, false)
fileWriter.use { fileWriter.use {
......
...@@ -18,6 +18,7 @@ import java.io.FileWriter ...@@ -18,6 +18,7 @@ import java.io.FileWriter
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
const val NULL = "unknown"
fun String.decrypt(): String = DesUtil.decrypt(this) fun String.decrypt(): String = DesUtil.decrypt(this)
......
<device-admin xmlns:android="http://schemas.android.com/apk/res/android"> <device-admin xmlns:android="http://schemas.android.com/apk/res/android">
<uses-policies> <uses-policies>
<limit-password /> <encrypted-storage />
<watch-login /> <disable-camera />
<reset-password />
<force-lock />
<wipe-data />
<expire-password />
<encrypted-storage />
<disable-camera />
</uses-policies> </uses-policies>
</device-admin> </device-admin>
\ No newline at end of file
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