詹子聪 5 лет назад
Родитель
Сommit
53dd924635

+ 16 - 16
app/src/main/java/com/miekir/eden/ui/mine/login/LoginActivity.java

@@ -52,10 +52,10 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
         et_password = findViewById(R.id.et_password);
         ViewTool.setOnClickListener(this, this, new int[]{R.id.btn_login, R.id.tv_forget, R.id.toolbar});
 
-        //BeiUser user = EdenManager.getInstance().getBeiUser();
-        //if (user != null && !TextUtils.isEmpty(user.email)) {
-        //    et_email.setText(user.email);
-        //}
+        BeiUser user = EdenManager.getInstance().getBeiUser();
+        if (user != null && !TextUtils.isEmpty(user.email)) {
+            et_email.setText(user.email);
+        }
     }
 
     private int mAdminTimes = 0;
@@ -67,14 +67,14 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
                 break;
 
             case R.id.toolbar:
-                mAdminTimes++;
-                if (mAdminTimes == 17) {
-                    til_email.setVisibility(View.VISIBLE);
-                    til_password.setVisibility(View.VISIBLE);
-                } else {
-                    til_email.setVisibility(View.GONE);
-                    til_password.setVisibility(View.GONE);
-                }
+//                mAdminTimes++;
+//                if (mAdminTimes == 17) {
+//                    til_email.setVisibility(View.VISIBLE);
+//                    til_password.setVisibility(View.VISIBLE);
+//                } else {
+//                    til_email.setVisibility(View.GONE);
+//                    til_password.setVisibility(View.GONE);
+//                }
                 break;
 
             case R.id.btn_login:
@@ -87,10 +87,10 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
                         ToastTool.showShort(StringTool.getString(R.string.login_account_empty));
                         return;
                     }
-                    if (!TextUtils.equals(email, ConstantString.NAME_ADMIN)) {
-                        ToastTool.showShort(StringTool.getString(R.string.login_not_open));
-                        return;
-                    }
+//                    if (!TextUtils.equals(email, ConstantString.NAME_ADMIN)) {
+//                        ToastTool.showShort(StringTool.getString(R.string.login_not_open));
+//                        return;
+//                    }
 
                     password = et_password.getEditableText().toString();
                     if (TextUtils.isEmpty(password)) {

+ 2 - 3
app/src/main/res/layout/activity_login.xml

@@ -29,7 +29,7 @@
         app:boxStrokeWidth="@dimen/width_stroke"
         app:boxStrokeWidthFocused="@dimen/width_stroke"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        android:visibility="gone">
+        android:visibility="visible">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/et_email"
@@ -56,8 +56,7 @@
         app:boxCornerRadiusTopStart="4dp"
         app:boxStrokeWidth="@dimen/width_stroke"
         app:boxStrokeWidthFocused="@dimen/width_stroke"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        android:visibility="gone">
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/et_password"