From 0e7dd8919ae2811063057f18a4db4156c771448a Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Fri, 07 Dec 2018 16:54:04 +0800
Subject: [PATCH] [*]添加了微信登陆

---
 app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 46 insertions(+), 14 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..9a51198 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java
@@ -7,6 +7,7 @@
 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;
@@ -30,8 +31,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) {
 
@@ -42,6 +45,7 @@
         super.onCreate(savedInstanceState);
         StatusBarUtil.translucentStatusBar(LoginActivity.this);
     }
+
 
     @Override
     protected int getLayoutId() {
@@ -55,8 +59,21 @@
         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);
+        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
@@ -64,6 +81,7 @@
         bt_sure.setOnClickListener(this);
         tv_forget.setOnClickListener(this);
         tv_register.setOnClickListener(this);
+        weixinlogin.setOnClickListener(this);
     }
 
     @Override
@@ -73,7 +91,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 +103,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
@@ -103,10 +128,16 @@
 
     }
 
+    @Override
+    protected void onStop() {
+        super.onStop();
+        finish();
+    }
+
     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,13 +146,14 @@
                 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();
+                    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);
+                    bundle.putBoolean("islogin", true);
                     intent.putExtras(bundle);
                     startActivity(intent);
                     finish();
@@ -135,7 +167,7 @@
             }
 
             @Override
-            public void onFail(int errno,String s) {
+            public void onFail(int errno, String s) {
                 mToatUtils.showSingletonToast(s);
                 if (progressDialog.isShowing()) {
                     progressDialog.dismiss();

--
Gitblit v1.8.0