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 |   49 ++++++++++++++++++++++++++-----------------------
 1 files changed, 26 insertions(+), 23 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 8074f2b..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;
@@ -20,9 +21,6 @@
 import com.moral.yunfushao.httputils.HttpCallBack;
 import com.moral.yunfushao.httputils.HttpUtils;
 import com.moral.yunfushao.model.User;
-import com.tencent.mm.opensdk.modelmsg.SendAuth;
-import com.tencent.mm.opensdk.openapi.IWXAPI;
-import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -32,10 +30,10 @@
  */
 
 public class LoginActivity extends BaseActivity {
-    private Button bt_sure, weixinlogin;
+    private Button bt_sure;
+    private ImageView weixinlogin;
     private TextView tv_forget, tv_register;
     private EditText et_phone, et_pwd;
-    private IWXAPI iwxapi;
 
     @Override
     protected void getBundleExtras(Bundle extras) {
@@ -46,21 +44,6 @@
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         StatusBarUtil.translucentStatusBar(LoginActivity.this);
-        regToWx();
-    }
-
-    private void regToWx() {
-        iwxapi = WXAPIFactory.createWXAPI(this, "app_id", true);
-        iwxapi.registerApp("app_id");
-    }
-
-    private void sendReq() {
-        //������
-        SendAuth.Req req = new SendAuth.Req();
-        req.scope = "snsapi_userinfo";
-        req.state = "wechat_sdk_demo_test";
-        iwxapi.sendReq(req);
-        System.out.println("chenqi fasongcehngqo");
     }
 
 
@@ -77,8 +60,20 @@
         et_phone = findView(R.id.et_phone);
         et_pwd = findView(R.id.et_pwd);
         weixinlogin = findView(R.id.weixinlogin);
-//        et_phone.setText("18362724160");
-//        et_pwd.setText("123456");
+        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
@@ -86,6 +81,7 @@
         bt_sure.setOnClickListener(this);
         tv_forget.setOnClickListener(this);
         tv_register.setOnClickListener(this);
+        weixinlogin.setOnClickListener(this);
     }
 
     @Override
@@ -132,8 +128,14 @@
 
     }
 
+    @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("phone", tel);
         params.put("password", pwd);
@@ -147,6 +149,7 @@
                 User user = FastJsonTools.getJson(res, User.class);
                 if (user != null) {
                     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();

--
Gitblit v1.8.0