微信授权接口调整

app/src/main/java/com/yihucha/hbyhc/presentation/login/LoginActivity.java

@@ -32,6 +32,8 @@ import java.util.List;
 
 public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPhoneBinding> implements View.OnClickListener {
     private static final String INTENT_OPEN_ID = "intentOpenId";
+    private static final String INTENT_NICK_NAME = "intentNickName";
+    private static final String INTENT_AVATAR = "intentAvatar";
     LoginViewModel loginViewModel;
     private CountDownTimeUtil mCountDownTimeUtil;
 
@@ -42,6 +44,8 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
 
     private LoginModel loginModel;
     private String mOpenId;//微信code
+    private String mNickName;//微信昵称
+    private String mAvatar;//微信头像
 
     private int loginType = 0; // 0 账号密码登录  1 验证码登录
 
@@ -50,6 +54,15 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
         super.onCreate(savedInstanceState);
 //        setContentView(R.layout.activity_login_phone);
         mOpenId = getIntent().getStringExtra(INTENT_OPEN_ID);
+        mNickName = getIntent().getStringExtra(INTENT_NICK_NAME);
+        if(mNickName == null){
+            mNickName = "";
+        }
+        mAvatar = getIntent().getStringExtra(INTENT_AVATAR);
+        if (mAvatar == null) {
+            mAvatar = "";
+        }
+
         if (EmptyCheckUtils.isNotEmpty(mOpenId)){
             loginType = 1;
             mViewBinding.layoutPhoneCode.setVisibility(View.VISIBLE);
@@ -123,7 +136,7 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
                 loginViewModel.getLogin(LoginActivity.this, mCode, uidAndPhoneBean.getUid());
             } else {
                 //微信绑定手机号
-                loginViewModel.getWxBinding(LoginActivity.this, mCode, mOpenId, uidAndPhoneBean.getUid());
+                loginViewModel.getWxBinding(LoginActivity.this, mCode, mOpenId, uidAndPhoneBean.getUid(),mNickName,mAvatar);
             }
         });
         loginViewModel.failed.observe(LoginActivity.this, msg -> {
@@ -282,7 +295,7 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
                 }
             } else {
                 //微信绑定手机号
-                loginViewModel.getWxBinding(LoginActivity.this, mCode, mOpenId);
+                loginViewModel.getWxBinding(LoginActivity.this, mCode, mOpenId,"","");
             }
 
         } else if (v == mViewBinding.tvRegistrationProtocol) {
@@ -325,9 +338,11 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
         context.startActivity(intent);
     }
 
-    public static void launch(Context context, String openId) {
+    public static void launch(Context context, String openId,String nickname ,String avatar) {
         Intent intent = new Intent(context, LoginActivity.class);
         intent.putExtra(INTENT_OPEN_ID, openId);
+        intent.putExtra(INTENT_NICK_NAME,nickname);
+        intent.putExtra(INTENT_AVATAR,avatar);
         context.startActivity(intent);
     }
 }

app/src/main/java/com/yihucha/hbyhc/presentation/login/view_model/LoginViewModel.java

@@ -213,11 +213,11 @@ public class LoginViewModel extends BaseViewModel {
      * @param context
      * @param sms_code 验证码
      */
-    public void getWxBinding(Context context, String sms_code, String openId) {
-        getWxBinding(context,sms_code,openId,null);
+    public void getWxBinding(Context context, String sms_code, String openId ,String nickName,String avatar) {
+        getWxBinding(context,sms_code,openId,null,nickName,avatar);
     }
     @SuppressLint("CheckResult")
-    public void getWxBinding(Context context, String sms_code, String openId,String uid) {
+    public void getWxBinding(Context context, String sms_code, String openId,String uid,String nickName,String avatar) {
         Map<String, Object> map = new HashMap<>();
         map.put("phone", mPhone.getValue());
         map.put("sms_code", sms_code);
@@ -226,6 +226,8 @@ public class LoginViewModel extends BaseViewModel {
         if (EmptyCheckUtils.isNotEmpty(uid)){
             map.put("spread", uid);
         }
+        map.put("nickname",nickName);
+        map.put("avatar",avatar);
 
         AuthService authService = NetworkApi.createService(AuthService.class);
         authService.wxloginbinding(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<LoginModel>>() {

app/src/main/java/com/yihucha/hbyhc/presentation/mine/ThirdPartyBindingActivity.java

@@ -267,7 +267,7 @@ public class ThirdPartyBindingActivity extends ViewBindingTitleBaseActivity<Acti
                             if(type == 1){
                                 mViewBinding.tvWxBeAuthorized.setVisibility(View.GONE);
                                 mViewBinding.tvWxUnauthorized.setVisibility(View.VISIBLE);
-                                flagWechatAuthorization = true;
+                                flagWechatAuthorization = false;
                                 mViewBinding.llWechatInfo.setVisibility(View.GONE);
                             }
                             else if(type == 2){

app/src/main/java/com/yihucha/hbyhc/wxapi/WXEntryActivity.java

@@ -215,8 +215,8 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
                         Log.d(TAG, "wechat onSuccess: "+ wechatOpenIdBeanDataJavaResponse.getData());
                         String nickName = wechatOpenIdBeanDataJavaResponse.getData().getNickName();
                         String avatar = wechatOpenIdBeanDataJavaResponse.getData().getAvater();
-                        getUpdateAccount(code,nickName,avatar);
-//                        getWechatLogin(wechatOpenIdBeanDataJavaResponse.getData().getUnionid());
+//                        getUpdateAccount(code,nickName,avatar);
+                        getWechatLogin(wechatOpenIdBeanDataJavaResponse.getData().getUnionid(),nickName,avatar);
                         finish();
                     }
                 } else {
@@ -316,11 +316,13 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
     }
 
     @SuppressLint("CheckResult")
-    private void getWechatLogin(String openid) {
+    private void getWechatLogin(String openid,String nickname, String avatar) {
         ShowLoadingDialog.showLoadingDialog(WXEntryActivity.this);
         //登录逻辑
         Map<String, Object> map = new HashMap<>();
         map.put("openid", openid);
+        map.put("nickname",nickname);
+        map.put("avatar",avatar);
         AuthService authService = NetworkApi.createService(AuthService.class);
         authService.getWechatLogIn(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<LoginModel>>() {
             @Override
@@ -345,7 +347,7 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
                     ToastUtils.showLong(loginModelDataResponse.responseError);
                     System.out.println(loginModelDataResponse.responseCode+"  5555555555555555  "+ loginModelDataResponse.responseError);
                     System.out.println(loginModelDataResponse.responseCode+"    "+ loginModelDataResponse.responseError);
-                    LoginActivity.launch(WXEntryActivity.this, openid);
+                    LoginActivity.launch(WXEntryActivity.this, openid,nickname,avatar);
                     finish();
                 }