优化密码

app/src/main/java/com/xplora/xpsettings/Activity/BasePasswordActivity.java

@@ -2,10 +2,10 @@ package com.xplora.xpsettings.Activity;
 
 import android.os.SystemProperties;
 import android.provider.Settings;
+import android.util.Log;
 
 public class BasePasswordActivity extends BaseActivity {
-    protected static final String BD_PW_TEST = "011235";
-    protected static final String BD_PW_LOG = "023445";
+    protected static final String BD_PW_DEFAULT = "011235";
     protected static final int BD_TIMEOUT = 3600;
 
     protected void resetAfterTimeout(boolean isForce) {
@@ -19,8 +19,8 @@ public class BasePasswordActivity extends BaseActivity {
     protected long getLeftTime() {
         long curTime = getCurrentTime();
         long lockTime = getLockTime();
-        long leftTime = curTime - lockTime;
-        return leftTime >= BD_TIMEOUT ? 0 : leftTime;
+        long costTime = curTime - lockTime;
+        return costTime >= BD_TIMEOUT ? 0 : BD_TIMEOUT - costTime;
     }
 
     protected boolean isLock() {
@@ -30,13 +30,13 @@ public class BasePasswordActivity extends BaseActivity {
     }
 
     protected boolean checkTestPassword(String value) {
-        boolean isDefault = (getImei().length() < 15 && value.equals(BD_PW_TEST));
+        boolean isDefault = (getImei().length() < 15 && value.equals(BD_PW_DEFAULT));
         boolean isOK = value.equals(getPwd(0));
         return isDefault || isOK;
     }
 
     protected boolean checkLogPassword(String value) {
-        boolean isDefault = (getImei().length() < 15 && value.equals(BD_PW_LOG));
+        boolean isDefault = (getImei().length() < 15 && value.equals(BD_PW_DEFAULT));
         boolean isOK = value.equals(getPwd(1));
         return isDefault || isOK;
     }
@@ -45,29 +45,18 @@ public class BasePasswordActivity extends BaseActivity {
     protected String getPwd(int type) {
         String imei = getImei();
         if (imei.length() < 15) {
-            return type == 0 ? BD_PW_TEST : BD_PW_LOG;
+            return BD_PW_DEFAULT;
         } else {
             imei = new StringBuilder(imei).reverse().toString();
             int start = imei.charAt(0) - '0';
-            if (type == 0) {
-                StringBuilder sb = new StringBuilder();
-                sb.append(imei.charAt(start));
-                sb.append(imei.charAt(start + 1));
-                sb.append(imei.charAt(start + 1));
-                sb.append(imei.charAt(start + 2));
-                sb.append(imei.charAt(start + 3));
-                sb.append(imei.charAt(start + 5));
-                return sb.toString();
-            } else {
-                StringBuilder sb = new StringBuilder();
-                sb.append(imei.charAt(start));
-                sb.append(imei.charAt(start + 2));
-                sb.append(imei.charAt(start + 3));
-                sb.append(imei.charAt(start + 4));
-                sb.append(imei.charAt(start + 4));
-                sb.append(imei.charAt(start + 5));
-                return sb.toString();
-            }
+            StringBuilder sb = new StringBuilder();
+            sb.append(imei.charAt(start));
+            sb.append(imei.charAt(start + 1));
+            sb.append(imei.charAt(start + 1));
+            sb.append(imei.charAt(start + 2));
+            sb.append(imei.charAt(start + 3));
+            sb.append(imei.charAt(start + 5));
+            return sb.toString();
         }
     }
 
@@ -80,8 +69,10 @@ public class BasePasswordActivity extends BaseActivity {
     }
 
     public String getImei() {
-        //return "351851370085380";
-        return SystemProperties.get("persist.zs.imei.number", "");
+        String imei = SystemProperties.get("persist.zs.imei.number", "");
+        //imei = "351851370085380";
+        Log.d(TAG, "getImei: " + imei);
+        return imei;
     }
 
     public int getErrorCount() {

app/src/main/java/com/xplora/xpsettings/Activity/BlackDoorActivity.java

@@ -30,6 +30,7 @@ public class BlackDoorActivity extends BasePasswordActivity {
         resetAfterTimeout(false);
         initInputView();
         refreshLockView();
+        getImei();
     }
 
     private void refreshLockView() {
@@ -127,6 +128,7 @@ public class BlackDoorActivity extends BasePasswordActivity {
             addError();
             Toast toast = Toast.makeText(this, getString(R.string.blackdoor_password_error), Toast.LENGTH_SHORT);
             toast.show();
+            refreshLockView();
         }
     }
 }