|
@@ -5,14 +5,17 @@ import android.os.Build;
|
|
|
import android.os.Bundle;
|
|
|
import android.support.annotation.Nullable;
|
|
|
import android.text.TextUtils;
|
|
|
+import android.util.Log;
|
|
|
import android.view.View;
|
|
|
import android.widget.Button;
|
|
|
import android.widget.EditText;
|
|
|
import android.widget.ImageView;
|
|
|
+import android.widget.RelativeLayout;
|
|
|
import android.widget.TextView;
|
|
|
|
|
|
import com.common.library.okhttp.callback.Callback;
|
|
|
import com.google.gson.Gson;
|
|
|
+import com.umeng.socialize.UMShareAPI;
|
|
|
import com.ynstkz.shitu.android.R;
|
|
|
import com.ynstkz.shitu.android.base.TitleBarActivity;
|
|
|
import com.ynstkz.shitu.android.bean.LoginBean;
|
|
@@ -20,12 +23,15 @@ import com.ynstkz.shitu.android.data.RequestGroup;
|
|
|
import com.ynstkz.shitu.android.data.SharedPreferencesUtils;
|
|
|
import com.ynstkz.shitu.android.event.LoginEvent;
|
|
|
import com.ynstkz.shitu.android.event.RegisterSuccessEvent;
|
|
|
+import com.ynstkz.shitu.android.helper.UmengLoginHelper;
|
|
|
import com.ynstkz.shitu.android.utils.StatusBarUtil;
|
|
|
|
|
|
import org.greenrobot.eventbus.EventBus;
|
|
|
import org.greenrobot.eventbus.Subscribe;
|
|
|
import org.greenrobot.eventbus.ThreadMode;
|
|
|
|
|
|
+import java.util.Map;
|
|
|
+
|
|
|
import butterknife.Bind;
|
|
|
import okhttp3.Call;
|
|
|
import okhttp3.Response;
|
|
@@ -50,6 +56,14 @@ public class LoginActivity extends TitleBarActivity {
|
|
|
TextView tvForgetPw;
|
|
|
@Bind(R.id.btn_login)
|
|
|
Button btnLogin;
|
|
|
+ @Bind(R.id.rl_login_wx)
|
|
|
+ RelativeLayout rlLoginWx;
|
|
|
+ @Bind(R.id.rl_login_qq)
|
|
|
+ RelativeLayout rlLoginQq;
|
|
|
+ @Bind(R.id.rl_login_sina)
|
|
|
+ RelativeLayout rlLoginSina;
|
|
|
+
|
|
|
+ private UmengLoginHelper mLogin;
|
|
|
|
|
|
@Override
|
|
|
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
|
@@ -68,15 +82,15 @@ public class LoginActivity extends TitleBarActivity {
|
|
|
return R.layout.activity_login;
|
|
|
}
|
|
|
|
|
|
- private void initView(){
|
|
|
+ private void initView() {
|
|
|
EventBus.getDefault().register(this);
|
|
|
}
|
|
|
|
|
|
- private void initData(){
|
|
|
+ private void initData() {
|
|
|
|
|
|
}
|
|
|
|
|
|
- private void setListener(){
|
|
|
+ private void setListener() {
|
|
|
//关闭
|
|
|
ivCancel.setOnClickListener(new View.OnClickListener() {
|
|
|
@Override
|
|
@@ -111,19 +125,50 @@ public class LoginActivity extends TitleBarActivity {
|
|
|
public void onClick(View view) {
|
|
|
String userName = editUsername.getText().toString().trim();
|
|
|
String userPwd = editPassword.getText().toString().trim();
|
|
|
- if(verifyData(userName, userPwd)){
|
|
|
- login(userName,userPwd);
|
|
|
+ if (verifyData(userName, userPwd)) {
|
|
|
+ login(userName, userPwd);
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 微信登陆
|
|
|
+ */
|
|
|
+ rlLoginWx.setOnClickListener(new View.OnClickListener() {
|
|
|
+ @Override
|
|
|
+ public void onClick(View view) {
|
|
|
+ threeLogin(UmengLoginHelper.WX);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * qq登陆
|
|
|
+ */
|
|
|
+ rlLoginQq.setOnClickListener(new View.OnClickListener() {
|
|
|
+ @Override
|
|
|
+ public void onClick(View view) {
|
|
|
+ threeLogin(UmengLoginHelper.QQ);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 新浪登陆
|
|
|
+ */
|
|
|
+ rlLoginSina.setOnClickListener(new View.OnClickListener() {
|
|
|
+ @Override
|
|
|
+ public void onClick(View view) {
|
|
|
+ threeLogin(UmengLoginHelper.SINA);
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 登陆
|
|
|
+ *
|
|
|
* @param userName
|
|
|
* @param userPwd
|
|
|
*/
|
|
|
- private void login(String userName, String userPwd){
|
|
|
+ private void login(String userName, String userPwd) {
|
|
|
|
|
|
RequestGroup.login(userName, userPwd, new Callback() {
|
|
|
@Override
|
|
@@ -138,10 +183,10 @@ public class LoginActivity extends TitleBarActivity {
|
|
|
|
|
|
@Override
|
|
|
public void onResponse(Object response, int id) {
|
|
|
- LoginBean loginBean = (LoginBean)response;
|
|
|
- if(loginBean != null){
|
|
|
- if("200".equals(loginBean.getCode())){
|
|
|
- if(loginBean.getData() != null){
|
|
|
+ LoginBean loginBean = (LoginBean) response;
|
|
|
+ if (loginBean != null) {
|
|
|
+ if ("200".equals(loginBean.getCode())) {
|
|
|
+ if (loginBean.getData() != null) {
|
|
|
|
|
|
SharedPreferencesUtils.setLogin(true);
|
|
|
EventBus.getDefault().post(new LoginEvent());
|
|
@@ -161,17 +206,42 @@ public class LoginActivity extends TitleBarActivity {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
+ *
|
|
|
+ */
|
|
|
+ private void threeLogin(String type){
|
|
|
+
|
|
|
+ mLogin = new UmengLoginHelper(LoginActivity.this, new UmengLoginHelper.Callback() {
|
|
|
+ @Override
|
|
|
+ public void onComplete(Map<String, String> data) {
|
|
|
+ Log.d("login", data.toString());
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onError() {
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onCancel() {
|
|
|
+
|
|
|
+ }
|
|
|
+ });
|
|
|
+ mLogin.oAuth(type);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
* 校验数据
|
|
|
+ *
|
|
|
* @param userName
|
|
|
* @param userPwd
|
|
|
* @return
|
|
|
*/
|
|
|
- private boolean verifyData(String userName, String userPwd){
|
|
|
- if(TextUtils.isEmpty(userName)){
|
|
|
+ private boolean verifyData(String userName, String userPwd) {
|
|
|
+ if (TextUtils.isEmpty(userName)) {
|
|
|
showToast("用户名不能为空!");
|
|
|
return false;
|
|
|
}
|
|
|
- if(TextUtils.isEmpty(userPwd)){
|
|
|
+ if (TextUtils.isEmpty(userPwd)) {
|
|
|
showToast("密码不能为空!");
|
|
|
return false;
|
|
|
}
|
|
@@ -183,6 +253,13 @@ public class LoginActivity extends TitleBarActivity {
|
|
|
finish();
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ @Override
|
|
|
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
|
|
+ super.onActivityResult(requestCode, resultCode, data);
|
|
|
+ UMShareAPI.get(this).onActivityResult(requestCode, resultCode, data);
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
protected void onDestroy() {
|
|
|
super.onDestroy();
|