From c5bf501d8b507d1e3e79541e7ac9b45910860b4d Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Wed, 29 May 2019 16:17:07 +0800
Subject: [PATCH] 添加新功能
---
app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java | 90 +++++++++++++++++++++++++++++++++++---------
1 files changed, 71 insertions(+), 19 deletions(-)
diff --git a/app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java b/app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java
index 36b0007..e7745b1 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java
@@ -7,10 +7,12 @@
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
+import android.widget.ImageView;
import android.widget.TextView;
import com.lzy.okgo.cache.CacheMode;
import com.moral.andbrickslib.utils.FastJsonTools;
+import com.moral.andbrickslib.utils.NetworkUtil;
import com.moral.andbrickslib.utils.StatusBarUtil;
import com.moral.yunfushao.MainActivity;
import com.moral.yunfushao.MainApp;
@@ -20,6 +22,7 @@
import com.moral.yunfushao.httputils.HttpCallBack;
import com.moral.yunfushao.httputils.HttpUtils;
import com.moral.yunfushao.model.User;
+import com.moral.yunfushao.utils.SharedPreferencesUtil;
import java.util.HashMap;
import java.util.Map;
@@ -30,8 +33,10 @@
public class LoginActivity extends BaseActivity {
private Button bt_sure;
- private TextView tv_forget,tv_register;
+ private ImageView weixinlogin;
+ private TextView tv_forget, tv_register;
private EditText et_phone, et_pwd;
+
@Override
protected void getBundleExtras(Bundle extras) {
@@ -41,7 +46,36 @@
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
StatusBarUtil.translucentStatusBar(LoginActivity.this);
+
+ int type = SharedPreferencesUtil.getUtil(this).getLoginInfo().getLogin_type();
+
+ if (!NetworkUtil.isAvailable(this)) {
+ return;
+ }
+ switch (type) {
+ case 1:
+ //������������
+ goHome();
+ break;
+ case 2:
+ //������������
+ sendReq();
+ break;
+ }
}
+
+ private void goHome() {
+ if (!TextUtils.isEmpty(MainApp.userId)) {
+ Intent intent = new Intent(this, MainActivity.class);
+ startActivity(intent);
+ } else {
+ Intent intent = new Intent(this, LoginActivity.class);
+ startActivity(intent);
+ }
+ finish();
+ }
+
+
@Override
protected int getLayoutId() {
@@ -55,8 +89,7 @@
tv_register = findView(R.id.tv_register);
et_phone = findView(R.id.et_phone);
et_pwd = findView(R.id.et_pwd);
- et_phone.setText("15950198162");
- et_pwd.setText("888888");
+ weixinlogin = findView(R.id.weixinlogin);
}
@Override
@@ -64,6 +97,7 @@
bt_sure.setOnClickListener(this);
tv_forget.setOnClickListener(this);
tv_register.setOnClickListener(this);
+ weixinlogin.setOnClickListener(this);
}
@Override
@@ -73,7 +107,7 @@
@Override
protected void processClick(View view) {
- switch (view.getId()){
+ switch (view.getId()) {
case R.id.bt_sure:
String userphone = et_phone.getText().toString().trim();
String password = et_pwd.getText().toString().trim();
@@ -85,17 +119,24 @@
mToatUtils.showSingletonToast("���������������");
return;
}
- login(userphone,password);
+ login(userphone, password);
break;
case R.id.tv_forget:
- Intent intent = new Intent(LoginActivity.this,ForgetPasswordActivity.class);
+ Intent intent = new Intent(LoginActivity.this, ForgetPasswordActivity.class);
startActivity(intent);
break;
case R.id.tv_register:
- Intent intentRgister = new Intent(LoginActivity.this,RegisterActivity.class);
+ Intent intentRgister = new Intent(LoginActivity.this, RegisterActivity.class);
startActivity(intentRgister);
break;
+ case R.id.weixinlogin:
+ weixinlogin();
+ break;
}
+ }
+
+ private void weixinlogin() {
+ sendReq();
}
@Override
@@ -104,9 +145,9 @@
}
private void login(String tel, final String pwd) {
- String url = API.LOGIN;
+ final String url = API.LOGIN;
Map<String, String> params = new HashMap<>();
- params.put("username", tel);
+ params.put("phone", tel);
params.put("password", pwd);
HttpUtils.doPost(url, params, CacheMode.DEFAULT, true, new HttpCallBack() {
@Override
@@ -115,16 +156,12 @@
if (progressDialog.isShowing()) {
progressDialog.dismiss();
}
- User user = FastJsonTools.getJson(res,User.class);
- if(user!=null){
+ User user = FastJsonTools.getJson(res, User.class);
+ if (user != null) {
MainApp.theApp.sharedPreferencesUtil.saveLoginInfo(user);
-// MainApp.theApp.userId = user.get_id();
- Intent intent = new Intent(getApplicationContext(), MainActivity.class);
- Bundle bundle = new Bundle();
- bundle.putBoolean("islogin",true);
- intent.putExtras(bundle);
- startActivity(intent);
- finish();
+ user.setLogin_type(1);
+ MainApp.theApp.userId = user.get_id();
+ jumpMain();
}
}
@@ -135,7 +172,7 @@
}
@Override
- public void onFail(int errno,String s) {
+ public void onFail(int errno, String s) {
mToatUtils.showSingletonToast(s);
if (progressDialog.isShowing()) {
progressDialog.dismiss();
@@ -143,4 +180,19 @@
}
});
}
+
+ @Override
+ protected void onStop() {
+ super.onStop();
+ finish();
+ }
+
+ private void jumpMain() {
+ Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+ Bundle bundle = new Bundle();
+ bundle.putBoolean("islogin", true);
+ intent.putExtras(bundle);
+ startActivity(intent);
+ finish();
+ }
}
--
Gitblit v1.8.0