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 | 67 +++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 20 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 8d31c90..e7745b1 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java
@@ -12,6 +12,7 @@
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;
@@ -21,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;
@@ -44,7 +46,35 @@
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
@@ -60,20 +90,6 @@
et_phone = findView(R.id.et_phone);
et_pwd = findView(R.id.et_pwd);
weixinlogin = findView(R.id.weixinlogin);
- initAnimator();
- }
-
- private void initAnimator() {
-// ObjectAnimator an = ObjectAnimator.ofFloat(bt_sure, "translationX", 500f, 0f);
-// an.start();
-//// ObjectAnimator translationY = ObjectAnimator.ofFloat(bt_sure, "rotation", 360f, 0f);
-// ObjectAnimator scaleY = ObjectAnimator.ofFloat(bt_sure, "scaleY", 0f, 1f);
-// ObjectAnimator scaleX = ObjectAnimator.ofFloat(bt_sure, "scaleX", 0f, 1f);
-//
-// AnimatorSet oo = new AnimatorSet();
-// oo.playTogether(scaleY, scaleX);
-// oo.setDuration(500);
-// oo.start();
}
@Override
@@ -127,6 +143,7 @@
protected void onErrorPageClick() {
}
+
private void login(String tel, final String pwd) {
final String url = API.LOGIN;
Map<String, String> params = new HashMap<>();
@@ -144,12 +161,7 @@
MainApp.theApp.sharedPreferencesUtil.saveLoginInfo(user);
user.setLogin_type(1);
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();
+ jumpMain();
}
}
@@ -168,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