Skip to content

S
supplier
Commit bfeeddea by 王宇航
Options

登陸框修改

parent 52572e0b
Showing with 117 additions and 37 deletions
public-base/src/main/res/values/dimens.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="edit_text_size">18dp</dimen>
<dimen name="edit_text_size">18sp</dimen>
<dimen name="load_dialog_text_size">16dp</dimen>
<!-- font -->
......
user-login/src/main/java/com/gingersoft/gsa/cloud/user/login/mvp/ui/activity/LoginActivity.java
......@@ -2,25 +2,28 @@ package com.gingersoft.gsa.cloud.user.login.mvp.ui.activity;
import android.content.Intent;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.Log;
import android.view.View;
import android.widget.EditText;
import android.widget.ImageView;
import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
import com.gingersoft.gsa.cloud.ui.bean.mode.LoginBean;
import com.gingersoft.gsa.cloud.ui.bean.view.SectionTextItem;
import com.gingersoft.gsa.cloud.ui.widget.dialog.ChooseRestaurantDialog;
import com.gingersoft.gsa.cloud.user.login.R;
import com.gingersoft.gsa.cloud.user.login.R2;
import com.gingersoft.gsa.cloud.user.login.di.component.DaggerLoginComponent;
import com.gingersoft.gsa.cloud.ui.bean.mode.LoginBean;
import com.gingersoft.gsa.cloud.user.login.mvp.contract.LoginContract;
import com.gingersoft.gsa.cloud.user.login.mvp.presenter.LoginPresenter;
import com.jess.arms.base.BaseActivity;
import com.jess.arms.di.component.AppComponent;
import com.jess.arms.utils.ArmsUtils;
import com.gingersoft.gsa.cloud.user.login.mvp.contract.LoginContract;
import com.gingersoft.gsa.cloud.user.login.mvp.presenter.LoginPresenter;
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
import com.gingersoft.gsa.cloud.ui.view.MyEditText;
import java.io.IOException;
import java.util.List;
......@@ -54,9 +57,13 @@ import static com.jess.arms.utils.Preconditions.checkNotNull;
*/
public class LoginActivity extends BaseActivity<LoginPresenter> implements LoginContract.View, View.OnClickListener {
@BindView(R2.id.ed_login_user_account)
MyEditText edAccount;
EditText edAccount;
@BindView(R2.id.ed_login_user_pwd)
MyEditText edPwd;
EditText edPwd;
@BindView(R2.id.iv_clear_pwd)
ImageView icClear;
@BindView(R2.id.iv_clear_account)
ImageView icClearAccount;
@Override
public void setupActivityComponent(@NonNull AppComponent appComponent) {
......@@ -80,6 +87,47 @@ public class LoginActivity extends BaseActivity<LoginPresenter> implements Login
// jumpActivity();
// finish();
// }
edPwd.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
if (edPwd.getText().equals("")) {
icClear.setVisibility(View.GONE);
} else {
icClear.setVisibility(View.VISIBLE);
}
}
});
edAccount.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
if (edAccount.getText().equals("")) {
icClearAccount.setVisibility(View.GONE);
} else {
icClearAccount.setVisibility(View.VISIBLE);
}
}
@Override
public void afterTextChanged(Editable s) {
}
});
}
@Override
......@@ -137,11 +185,11 @@ public class LoginActivity extends BaseActivity<LoginPresenter> implements Login
@Override
public void loginSuccess(LoginBean loginBean) {
if (loginBean.getData() != null ) {
if (loginBean.getData() != null) {
GsaCloudApplication.setLoginToken(LoginActivity.this, loginBean.getData().getToken());
if(loginBean.getData().getUser() != null) {
if (loginBean.getData().getUser() != null) {
GsaCloudApplication.setMemberId(LoginActivity.this, loginBean.getData().getUser().getUserId());
GsaCloudApplication.setMemberName(LoginActivity.this, loginBean.getData().getUser().getUserName());
......@@ -154,7 +202,7 @@ public class LoginActivity extends BaseActivity<LoginPresenter> implements Login
.setOnItemClickListener(new ChooseRestaurantDialog.BottomListSheetBuilder.OnItemClickListener() {
@Override
public void onItemClick(ChooseRestaurantDialog dialog,SectionTextItem item, int position) {
public void onItemClick(ChooseRestaurantDialog dialog, SectionTextItem item, int position) {
GsaCloudApplication.setRestaurantId(LoginActivity.this, item.getId());
GsaCloudApplication.setRestaurantName(LoginActivity.this, item.getText());
jumpActivity();
......@@ -217,7 +265,7 @@ public class LoginActivity extends BaseActivity<LoginPresenter> implements Login
}
@Override
@OnClick({R.id.tv_gsa_user_login})
@OnClick({R.id.tv_gsa_user_login, R.id.iv_clear_pwd, R.id.iv_clear_account})
public void onClick(View v) {
switch (v.getId()) {
case R.id.tv_gsa_user_login:
......@@ -226,6 +274,16 @@ public class LoginActivity extends BaseActivity<LoginPresenter> implements Login
mPresenter.login(edAccount.getText().toString(), edPwd.getText().toString());
}
break;
case R.id.iv_clear_account:
//清空賬號框
edAccount.setText("");
icClearAccount.setVisibility(View.GONE);
break;
case R.id.iv_clear_pwd:
//清空密碼框
edPwd.setText("");
icClear.setVisibility(View.GONE);
break;
}
}
......
user-login/src/main/res/layout/user_login_activity_login.xml
......@@ -31,26 +31,37 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/login_title" />
<com.gingersoft.gsa.cloud.ui.view.MyEditText
<EditText
android:id="@+id/ed_login_user_account"
android:layout_width="0dp"
android:layout_height="0dp"
android:padding="10dp"
app:ed_MaxLength="11"
app:ed_clearIconSize="30dp"
app:ed_clearRes="@mipmap/ic_clear_text"
app:ed_hint="請輸入賬戶"
app:ed_hintColor="@color/user_login_edit_color"
app:ed_isInputIcon="false"
app:ed_singLeLine="true"
app:ed_textColor="#333"
app:ed_textSize="@dimen/edit_text_size"
android:background="@null"
android:hint="請輸入賬戶"
android:maxLength="11"
android:paddingLeft="@dimen/dp_10"
android:paddingRight="@dimen/dp_10"
android:singleLine="true"
android:textColor="@color/theme_333_color"
android:textColorHint="@color/user_login_edit_color"
android:textSize="@dimen/edit_text_size"
app:layout_constraintBottom_toBottomOf="@id/login_icon"
app:layout_constraintLeft_toRightOf="@id/login_icon"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintRight_toLeftOf="@id/iv_clear_account"
app:layout_constraintTop_toTopOf="@id/login_icon" />
<ImageView
android:id="@+id/iv_clear_account"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_10"
android:src="@mipmap/ic_clear_text"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/ed_login_user_account"
app:layout_constraintLeft_toRightOf="@id/ed_login_user_account"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/ed_login_user_account" />
<ImageView
android:id="@+id/iv_login_pwd_icon"
android:layout_width="40dp"
android:layout_height="40dp"
......@@ -62,27 +73,38 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/ed_login_user_account" />
<com.gingersoft.gsa.cloud.ui.view.MyEditText
<EditText
android:id="@+id/ed_login_user_pwd"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="#00000000"
android:padding="10dp"
app:ed_MaxLength="16"
app:ed_clearIconSize="30dp"
app:ed_clearRes="@mipmap/ic_clear_text"
app:ed_hint="請輸入密碼"
app:ed_hintColor="@color/user_login_edit_color"
app:ed_isInputIcon="false"
app:ed_singLeLine="true"
app:ed_textColor="#333"
app:ed_textSize="@dimen/edit_text_size"
app:inputType="textPassword"
android:gravity="center_vertical"
android:hint="請輸入密碼"
android:inputType="textPassword"
android:maxLength="16"
android:paddingLeft="@dimen/dp_10"
android:paddingRight="@dimen/dp_10"
android:singleLine="true"
android:textColor="@color/theme_333_color"
android:textColorHint="@color/user_login_edit_color"
android:textSize="@dimen/edit_text_size"
app:layout_constraintBottom_toBottomOf="@id/iv_login_pwd_icon"
app:layout_constraintLeft_toRightOf="@id/iv_login_pwd_icon"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintRight_toLeftOf="@id/iv_clear_pwd"
app:layout_constraintTop_toTopOf="@id/iv_login_pwd_icon" />
<ImageView
android:id="@+id/iv_clear_pwd"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_10"
android:src="@mipmap/ic_clear_text"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/ed_login_user_pwd"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/ed_login_user_pwd" />
<TextView
android:id="@+id/tv_forget_pwd"
android:layout_width="wrap_content"
......
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