leanote/leanote-android
1
0
Fork 0
mirror of https://github.com/leanote/leanote-android.git synced 2025-10-19 00:44:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix ProgressBar didn’t hide when host error

Browse Source
This commit is contained in:
bin
2017-03-26 21:31:11 +08:00
parent 5d43387369
commit 4e8ae67d81
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/org/houxg/leamonax/ui/SignInActivity.java
View File

@@ -70,6 +70,18 @@ public class SignInActivity extends BaseActivity implements TextWatcher {
@BindView(R.id.tv_example) @BindView(R.id.tv_example)
TextView mExampleTv; TextView mExampleTv;
/**
* @param data
* @return account local id or -1
*/
public static long getAccountIdFromData(Intent data) {
if (data == null) {
return -1;
} else {
return data.getLongExtra(EXTRA_ACCOUNT_LOCAL_ID, -1);
}
}
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@@ -211,8 +223,8 @@ public class SignInActivity extends BaseActivity implements TextWatcher {
ToastUtils.show(SignInActivity.this, R.string.illegal_host); ToastUtils.show(SignInActivity.this, R.string.illegal_host);
} else { } else {
ToastUtils.showNetworkError(SignInActivity.this); ToastUtils.showNetworkError(SignInActivity.this);
animateFinish(mSignInBtn, mSignInProgress);
} }
animateFinish(mSignInBtn, mSignInProgress);
} }
@Override @Override
@@ -299,19 +311,6 @@ public class SignInActivity extends BaseActivity implements TextWatcher {
} }
} }
/**
*
* @param data
* @return account local id or -1
*/
public static long getAccountIdFromData(Intent data) {
if (data == null) {
return -1;
} else {
return data.getLongExtra(EXTRA_ACCOUNT_LOCAL_ID, -1);
}
}
private Observable<String> initHost() { private Observable<String> initHost() {
return Observable.create(new Observable.OnSubscribe<String>() { return Observable.create(new Observable.OnSubscribe<String>() {
@Override @Override
@@ -330,9 +329,6 @@ public class SignInActivity extends BaseActivity implements TextWatcher {
}); });
} }
private static class IllegalHostException extends Exception {
}
private void animateProgress(View button, final View progressBar) { private void animateProgress(View button, final View progressBar) {
button.animate() button.animate()
.scaleX(0) .scaleX(0)
@@ -385,4 +381,7 @@ public class SignInActivity extends BaseActivity implements TextWatcher {
String password = mPasswordEt.getText().toString(); String password = mPasswordEt.getText().toString();
mSignInBtn.setEnabled(!TextUtils.isEmpty(email) && !TextUtils.isEmpty(password)); mSignInBtn.setEnabled(!TextUtils.isEmpty(email) && !TextUtils.isEmpty(password));
} }
private static class IllegalHostException extends Exception {
}
} }