From 5965c01b38a2e83cecd7616daa11185fc2499303 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 28 五月 2021 10:12:27 +0800
Subject: [PATCH] 特价完善

---
 app/src/main/java/com/tejia/lijin/app/ui/mine/LoginVerifyCodeActivity.java |  162 +++++++++++++++++++++++++----------------------------
 1 files changed, 77 insertions(+), 85 deletions(-)

diff --git a/app/src/main/java/com/tejia/lijin/app/ui/mine/LoginVerifyCodeActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/mine/LoginVerifyCodeActivity.java
index 1057661..516af25 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/mine/LoginVerifyCodeActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/mine/LoginVerifyCodeActivity.java
@@ -16,6 +16,9 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.tejia.lijin.app.util.ui.dialog.DialogUtil;
+import com.tejia.lijin.app.util.user.AccountBindManager;
+import com.tejia.lijin.app.util.user.LoginManager;
 import com.xiaomi.mipush.sdk.MiPushClient;
 import com.tejia.lijin.app.BasicTextHttpResponseHandler;
 import com.tejia.lijin.app.R;
@@ -221,46 +224,34 @@
      * 璇锋眰鏈嶅姟鍣ㄥ尮閰嶉獙璇佺爜鍚庣櫥褰�
      */
     private void loginNew(String code) {
-        ShoppingApi.loginNew(LoginVerifyCodeActivity.this, code, mobileNum, "", "1", new BasicTextHttpResponseHandler() {
+
+        LoginManager.loginByPhone(mobileNum, code, null, new LoginManager.LoginAndBindListener() {
             @Override
-            public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
-                if (jsonObject.optString("code").equalsIgnoreCase("0")) {
-                    Gson gson = new GsonBuilder().serializeNulls().create();
-                    JSONObject data = jsonObject.optJSONObject("data");
-                    final UserInfo info = gson.fromJson(data.optJSONObject("userInfo").toString(), new TypeToken<UserInfo>() {
-                    }.getType());
-                    tv_input_error.setVisibility(View.INVISIBLE);
-                    SharedPreferences sp = getSharedPreferences("user", MODE_PRIVATE);
-                    SharedPreferences.Editor editor = sp.edit();
-                    editor.putBoolean("isLogin", true);
-                    editor.putBoolean("isFirstInput", false);
-                    editor.putString("uid", info.getId());
-                    editor.putString("openid", info.getOpenid());
-                    editor.putString("portrait", info.getPortrait());
-                    editor.commit();
-
-                    MiPushClient.setAlias(LoginVerifyCodeActivity.this, info.getId(), null);
-
-                    //淇濆瓨閭�璇风爜
-                    String inviteCode = data.optString("inviteCode");
-                    UserUtil.setInviteCode(getApplicationContext(), inviteCode);
-                    if (StringUtils.isNullOrEmpty(inviteCode)) {
-                        startActivity(new Intent(LoginVerifyCodeActivity.this, ActivationInviteCodeAcitvity.class));
-                    } else {
-                        Toast.makeText(LoginVerifyCodeActivity.this, "鎭枩浣狅紝鐧诲綍鎴愬姛", Toast.LENGTH_SHORT).show();
-                    }
-                    setResult(100);
-                    finish();
-                } else {
-                    tv_input_error.setVisibility(View.VISIBLE);
-                    tv_input_error.setText(jsonObject.optString("msg"));
-                    Toast.makeText(LoginVerifyCodeActivity.this, jsonObject.optString("msg"), Toast.LENGTH_SHORT).show();
-                }
+            public void onLoginStart() {
+                super.onLoginStart();
             }
 
             @Override
-            public void onFinish() {
-                super.onFinish();
+            public void onLoginFinish() {
+                super.onLoginFinish();
+            }
+
+            @Override
+            public void onLoginSuccess(UserInfo user) {
+                super.onLoginSuccess(user);
+                tv_input_error.setVisibility(View.INVISIBLE);
+                UserUtil.loginSuccess(getApplicationContext(), user);
+                Toast.makeText(LoginVerifyCodeActivity.this, "鎭枩浣狅紝鐧诲綍鎴愬姛", Toast.LENGTH_SHORT).show();
+                setResult(100);
+                finish();
+            }
+
+            @Override
+            public void onLoginFail(int code, String msg) {
+                super.onLoginFail(code, msg);
+                tv_input_error.setVisibility(View.VISIBLE);
+                tv_input_error.setText(msg);
+                Toast.makeText(LoginVerifyCodeActivity.this, msg, Toast.LENGTH_SHORT).show();
             }
         });
     }
@@ -269,26 +260,12 @@
      * 璇锋眰鏈嶅姟鍣ㄥ尮閰嶉獙璇佺爜鍚庝慨鏀规墜鏈哄彿
      */
     private void bindPhoneNew(String code) {
-        ShoppingApi.bindPhoneNew(LoginVerifyCodeActivity.this, code, mobileNum, uid, new BasicTextHttpResponseHandler() {
+        AccountBindManager.bindPhone(LoginVerifyCodeActivity.this, code, mobileNum, null, new LoginManager.LoginAndBindListener() {
+
             @Override
-            public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
-                if (jsonObject.optString("code").equalsIgnoreCase("0")) {
-                    Gson gson = new GsonBuilder().serializeNulls().create();
-                    final UserInfo info = gson.fromJson(jsonObject.optJSONObject("data").optJSONObject("userInfo").toString(), new TypeToken<UserInfo>() {
-                    }.getType());
-                    tv_input_error.setVisibility(View.INVISIBLE);
-                    SharedPreferences sp = getSharedPreferences("user", MODE_PRIVATE);
-                    SharedPreferences.Editor editor = sp.edit();
-                    editor.putBoolean("isLogin", true);
-                    editor.putBoolean("isFirstInput", false);
-                    editor.putString("uid", info.getId());
-                    editor.putString("openid", info.getOpenid());
-                    editor.putString("portrait", info.getPortrait());
-                    editor.commit();
-                    Toast.makeText(LoginVerifyCodeActivity.this, "缁戝畾鎴愬姛", Toast.LENGTH_SHORT).show();
-                    setResult(100);
-                    finish();
-                } else if (jsonObject.optString("code").equalsIgnoreCase("2")) {
+            public void onBindFail(int code, String msg) {
+                super.onBindFail(code, msg);
+                if (code == 2) {
                     AddZFBInfoDialog.Builder builder = new AddZFBInfoDialog.Builder(LoginVerifyCodeActivity.this);
                     builder.setTitle("鍙风爜宸插崰鐢ㄦ彁绀�").setMessage("寰堟姳姝夛紝璇ユ墜鏈哄彿宸茶鍏朵粬甯愬彿鍗犵敤锛�" +
                             "鑻ヨ缁х画瀹屾垚鏈笎鍙锋墜鏈哄彿鏇存崲锛岃鍘诲彇娑堝崰鐢ㄦ垨鏇存崲鍏朵粬鎵嬫満鍙凤紝璋㈣阿銆俓n")
@@ -301,14 +278,29 @@
                     setResult(100);
                 } else {
                     tv_input_error.setVisibility(View.VISIBLE);
-                    tv_input_error.setText(jsonObject.optString("msg"));
-                    Toast.makeText(LoginVerifyCodeActivity.this, jsonObject.optString("msg"), Toast.LENGTH_SHORT).show();
+                    tv_input_error.setText(msg);
+                    Toast.makeText(LoginVerifyCodeActivity.this, msg, Toast.LENGTH_SHORT).show();
                 }
             }
 
             @Override
-            public void onFinish() {
-                super.onFinish();
+            public void onBindFinish() {
+                super.onBindFinish();
+            }
+
+            @Override
+            public void onBindStart() {
+                super.onBindStart();
+            }
+
+            @Override
+            public void onBindSuccess(UserInfo user) {
+                super.onBindSuccess(user);
+                tv_input_error.setVisibility(View.INVISIBLE);
+                UserUtil.loginSuccess(getApplicationContext(), user);
+                Toast.makeText(LoginVerifyCodeActivity.this, "缁戝畾鎴愬姛", Toast.LENGTH_SHORT).show();
+                setResult(100);
+                finish();
             }
         });
     }
@@ -320,26 +312,31 @@
      * @param code
      */
     private void bindPhoneWithOutLogin(String code, String mobile, String key) {
-        ShoppingApi.bindPhoneWithOutLogin(LoginVerifyCodeActivity.this, code, mobile, key, new BasicTextHttpResponseHandler() {
+        LoginManager.loginWithPhone(mobile, code, null, key, new LoginManager.LoginAndBindListener() {
             @Override
-            public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
-                if (jsonObject.optString("code").equalsIgnoreCase("0")) {
-                    Gson gson = new GsonBuilder().serializeNulls().create();
-                    final UserInfo info = gson.fromJson(jsonObject.optJSONObject("data").optJSONObject("userInfo").toString(), new TypeToken<UserInfo>() {
-                    }.getType());
-                    tv_input_error.setVisibility(View.INVISIBLE);
-                    SharedPreferences sp = getSharedPreferences("user", MODE_PRIVATE);
-                    SharedPreferences.Editor editor = sp.edit();
-                    editor.putBoolean("isLogin", true);
-                    editor.putBoolean("isFirstInput", false);
-                    editor.putString("uid", info.getId());
-                    editor.putString("openid", info.getOpenid());
-                    editor.putString("portrait", info.getPortrait());
-                    editor.commit();
-                    Toast.makeText(LoginVerifyCodeActivity.this, "缁戝畾鎴愬姛", Toast.LENGTH_SHORT).show();
-                    setResult(100);
-                    finish();
-                } else if (jsonObject.optString("code").equalsIgnoreCase("2")) {
+            public void onBindStart() {
+                super.onLoginStart();
+            }
+
+            @Override
+            public void onBindFinish() {
+                super.onLoginFinish();
+            }
+
+            @Override
+            public void onBindSuccess(UserInfo user) {
+                super.onLoginSuccess(user);
+                tv_input_error.setVisibility(View.INVISIBLE);
+                UserUtil.loginSuccess(getApplicationContext(), user);
+                Toast.makeText(LoginVerifyCodeActivity.this, "缁戝畾鎴愬姛", Toast.LENGTH_SHORT).show();
+                setResult(100);
+                finish();
+            }
+
+            @Override
+            public void onBindFail(int code, String msg) {
+                super.onLoginFail(code, msg);
+                if (code == 2) {
                     AddZFBInfoDialog.Builder builder = new AddZFBInfoDialog.Builder(LoginVerifyCodeActivity.this);
                     builder.setTitle("鍙风爜宸插崰鐢ㄦ彁绀�").setMessage("寰堟姳姝夛紝璇ユ墜鏈哄彿宸茶鍏朵粬甯愬彿鍗犵敤锛�" +
                             "鑻ヨ缁х画瀹屾垚鏈笎鍙锋墜鏈哄彿鏇存崲锛岃鍘诲彇娑堝崰鐢ㄦ垨鏇存崲鍏朵粬鎵嬫満鍙凤紝璋㈣阿銆俓n")
@@ -352,14 +349,9 @@
                     setResult(100);
                 } else {
                     tv_input_error.setVisibility(View.VISIBLE);
-                    tv_input_error.setText(jsonObject.optString("msg"));
-                    Toast.makeText(LoginVerifyCodeActivity.this, jsonObject.optString("msg"), Toast.LENGTH_SHORT).show();
+                    tv_input_error.setText(msg);
+                    Toast.makeText(LoginVerifyCodeActivity.this, msg, Toast.LENGTH_SHORT).show();
                 }
-            }
-
-            @Override
-            public void onFinish() {
-                super.onFinish();
             }
         });
     }

--
Gitblit v1.8.0