From 27bd1f81221b8c8e8047118a64c2beb7bc214bbb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 20 七月 2021 13:45:08 +0800
Subject: [PATCH] 木瓜接入布丸系统完成
---
library-base/src/main/java/com/yeshi/base/ui/LoginActivity.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/library-base/src/main/java/com/yeshi/base/ui/LoginActivity.java b/library-base/src/main/java/com/yeshi/base/ui/LoginActivity.java
index 5ad875b..32febd3 100644
--- a/library-base/src/main/java/com/yeshi/base/ui/LoginActivity.java
+++ b/library-base/src/main/java/com/yeshi/base/ui/LoginActivity.java
@@ -44,7 +44,7 @@
import com.yeshi.base.utils.BaseApiUtil;
import com.yeshi.base.utils.RouteConstant;
import com.yeshi.base.utils.http.BasicTextHttpResponseHandler;
-import com.yeshi.ec.base.R;
+import com.yeshi.base.R;
@Route(path = RouteConstant.PATH_USER_LOGIN)
public class LoginActivity extends BaseActivity implements OnClickListener {
@@ -161,6 +161,7 @@
tv_register.setOnClickListener(this);
tv_login.setOnClickListener(this);
findViewById(R.id.tv_user_agreement).setOnClickListener(this);
+ findViewById(R.id.tv_privacy).setOnClickListener(this);
}
@Override
@@ -169,6 +170,10 @@
if (id == R.id.login_tv_cancel) {// 鍙栨秷
finish();
} else if (id == R.id.login_tv_qq) {// QQ鐧诲綍
+ if (!cb_user_agreement.isChecked()) {
+ SingleToast.showToast(LoginActivity.this, "閫夋嫨鍚屾剰鐢ㄦ埛鍗忚涓庨殣绉佹斂绛栧悗鏂瑰彲鐧婚檰");
+ return;
+ }
if (isQQClientAvailable()) {
loginType = "1";
// qq鐧诲綍閫昏緫澶勭悊 鐐瑰嚮鐧诲綍鍚庨渶瑕佹殏鏃堕攣瀹氳繑鍥為敭鍜岃繑鍥炲姛鑳� 涓嶇劧浼氭姤閿�
@@ -185,13 +190,19 @@
BrowserActivity.class);
intent.putExtra("url", getString(R.string.agreement));
startActivity(intent);
+ } else if (id == R.id.tv_privacy) {
+ Intent intent = new Intent(LoginActivity.this,
+ BrowserActivity.class);
+ intent.putExtra("url", getString(R.string.privacy));
+ startActivity(intent);
} else if (id == R.id.tv_register) {
startActivity(new Intent(LoginActivity.this, RegisterActivity.class));
} else if (id == R.id.tv_login) {
- if (cb_user_agreement.isChecked())
- emailLogin();
- else
- SingleToast.showToast(LoginActivity.this, "閫夋嫨鍚屾剰鐢ㄦ埛鍗忚鍚庢柟鍙櫥闄�");
+ if (!cb_user_agreement.isChecked()) {
+ SingleToast.showToast(LoginActivity.this, "閫夋嫨鍚屾剰鐢ㄦ埛鍗忚涓庨殣绉佹斂绛栧悗鏂瑰彲鐧婚檰");
+ return;
+ }
+ emailLogin();
}
}
--
Gitblit v1.8.0