詹子聪 пре 6 година
родитељ
комит
21f6c5f051

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

@@ -13,6 +13,7 @@ import com.miekir.eden.R;
 import com.miekir.eden.base.BaseBeiActivity;
 import com.miekir.eden.bean.BeiUser;
 import com.miekir.eden.bean.SystemBean;
+import com.miekir.eden.constant.ConstantString;
 import com.miekir.eden.manager.UserInfoManager;
 import com.miekir.eden.tool.StringTool;
 import com.miekir.eden.ui.TabActivity;
@@ -49,7 +50,7 @@ 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});
 
-        findViewById(R.id.ll_login).setOnLongClickListener(this);
+        findViewById(R.id.toolbar).setOnLongClickListener(this);
         //BeiUser user = UserInfoManager.getInstance().getBeiUser();
         //if (user != null && !TextUtils.isEmpty(user.email)) {
         //    et_email.setText(user.email);
@@ -65,7 +66,12 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
 
             case R.id.btn_login:
                 String email = et_email.getEditableText().toString();
-                if (til_email.getVisibility() != View.VISIBLE) {
+                if (til_email.getVisibility() == View.VISIBLE) {
+                    if (TextUtils.equals(email, ConstantString.NAME_ADMIN)) {
+                        ToastTool.showShort("暂不开放账号登录");
+                        return;
+                    }
+                } else {
                     email = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
                     email = StringTool.getEncodeString(email);
                 }
@@ -106,7 +112,7 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
 
     @Override
     public boolean onLongClick(View v) {
-        if (v.getId() == R.id.ll_login) {
+        if (v.getId() == R.id.toolbar) {
             til_email.setVisibility(View.VISIBLE);
         }
         return false;

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

@@ -6,8 +6,7 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:focusable="true"
-    android:focusableInTouchMode="true"
-    android:id="@+id/ll_login">
+    android:focusableInTouchMode="true">
     <!--启用深色模式之后,需要使用fitsSystemWindows来不让布局上滑-->
 
     <include layout="@layout/view_toolbar" />