Commit c53a8998 by 霍志良

feat:用友盟的新API,否则有的微信unionID获取不到

parent 0cf94a37
...@@ -8,7 +8,7 @@ ext { ...@@ -8,7 +8,7 @@ ext {
"m-confide" : "0.0.48.91", "m-confide" : "0.0.48.91",
"m-consultant" : "0.0.59.40", "m-consultant" : "0.0.59.40",
"m-fm" : "0.0.30.00", "m-fm" : "0.0.30.00",
"m-user" : "0.0.60.54", "m-user" : "0.0.60.58",
"m-home" : "0.0.22.51", "m-home" : "0.0.22.51",
"m-im" : "0.0.18.30", "m-im" : "0.0.18.30",
"m-dynamic" : "0.0.7.13", "m-dynamic" : "0.0.7.13",
...@@ -91,7 +91,7 @@ ext { ...@@ -91,7 +91,7 @@ ext {
"m-confide" : "0.0.48.91", "m-confide" : "0.0.48.91",
"m-consultant" : "0.0.51.16", "m-consultant" : "0.0.51.16",
"m-fm" : "0.0.23.5", "m-fm" : "0.0.23.5",
"m-user" : "0.0.60.54", "m-user" : "0.0.60.58",
"m-home" : "0.0.22.51", "m-home" : "0.0.22.51",
"m-im" : "0.0.3.15", "m-im" : "0.0.3.15",
"m-dynamic" : "0.0.1.7", "m-dynamic" : "0.0.1.7",
......
...@@ -17,6 +17,7 @@ import com.ydl.ydlcommon.bean.StatusBarOptions; ...@@ -17,6 +17,7 @@ import com.ydl.ydlcommon.bean.StatusBarOptions;
import com.ydl.ydlcommon.data.http.ThrowableConsumer; import com.ydl.ydlcommon.data.http.ThrowableConsumer;
import com.ydl.ydlcommon.modular.ModularServiceManager; import com.ydl.ydlcommon.modular.ModularServiceManager;
import com.ydl.ydlcommon.router.YdlCommonOut; import com.ydl.ydlcommon.router.YdlCommonOut;
import com.ydl.ydlcommon.utils.LogUtil;
import com.ydl.ydlcommon.utils.SharedPreferencesEditor; import com.ydl.ydlcommon.utils.SharedPreferencesEditor;
import com.ydl.ydlcommon.utils.remind.ToastHelper; import com.ydl.ydlcommon.utils.remind.ToastHelper;
import com.ydl.ydlcommon.view.JumpTextView; import com.ydl.ydlcommon.view.JumpTextView;
...@@ -346,7 +347,7 @@ public class AccountSettingActivity extends BaseActivity implements View.OnClick ...@@ -346,7 +347,7 @@ public class AccountSettingActivity extends BaseActivity implements View.OnClick
*/ */
private void bindWx() { private void bindWx() {
showProgressDialog("绑定微信中..."); showProgressDialog("绑定微信中...");
UMShareAPI.get(this).doOauthVerify(this, SHARE_MEDIA.WEIXIN, new UMAuthListener() { UMShareAPI.get(this).getPlatformInfo(this, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
@Override @Override
public void onStart(SHARE_MEDIA share_media) { public void onStart(SHARE_MEDIA share_media) {
...@@ -360,7 +361,7 @@ public class AccountSettingActivity extends BaseActivity implements View.OnClick ...@@ -360,7 +361,7 @@ public class AccountSettingActivity extends BaseActivity implements View.OnClick
} }
String openid = map.get("openid"); String openid = map.get("openid");
String unionid = map.get("unionid"); String unionid = map.get("unionid");
LogUtil.e("aaaaa"+openid+"bbbb"+unionid);
userHttp.bindWX(new BindWX(openid, unionid)) userHttp.bindWX(new BindWX(openid, unionid))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
...@@ -394,6 +395,54 @@ public class AccountSettingActivity extends BaseActivity implements View.OnClick ...@@ -394,6 +395,54 @@ public class AccountSettingActivity extends BaseActivity implements View.OnClick
dismissProgressDialog(); dismissProgressDialog();
} }
}); });
/* UMShareAPI.get(this).doOauthVerify(this, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
@Override
public void onStart(SHARE_MEDIA share_media) {
}
@SuppressLint("CheckResult")
@Override
public void onComplete(SHARE_MEDIA share_media, int i, Map<String, String> map) {
if (map == null||map.size()==0) {
return;
}
String openid = map.get("openid");
String unionid = map.get("unionid");
LogUtil.e("aaaaa"+openid+"bbbb"+unionid);
userHttp.bindWX(new BindWX(openid, unionid))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(o -> {
dismissProgressDialog();
if(o.code == 0 ) {
UserHelper.INSTANCE.getUserInfo().getUserInfo().setBind_weixin(1);
jtv_wechat.setRightText("已绑定");
ToastUtil.toastShort("绑定成功");
}else{
ToastHelper.Companion.show(o.msg);
}
}, new ThrowableConsumer() {
@Override
public void accept(@NotNull String msg) {
dismissProgressDialog();
}
});
UMShareAPI.get(AccountSettingActivity.this).deleteOauth(AccountSettingActivity.this, SHARE_MEDIA.WEIXIN, this);
}
@Override
public void onError(SHARE_MEDIA share_media, int i, Throwable throwable) {
dismissProgressDialog();
ToastUtil.toastShort(throwable.getMessage());
}
@Override
public void onCancel(SHARE_MEDIA share_media, int i) {
dismissProgressDialog();
}
});*/
} }
/** /**
...@@ -434,14 +483,16 @@ public class AccountSettingActivity extends BaseActivity implements View.OnClick ...@@ -434,14 +483,16 @@ public class AccountSettingActivity extends BaseActivity implements View.OnClick
if (UserHelper.INSTANCE.getUserInfo().getUserInfo().getBind_qq() == 1) { if (UserHelper.INSTANCE.getUserInfo().getUserInfo().getBind_qq() == 1) {
flag++; flag++;
} }
if (flag != 2) { if (flag != 2) {
//满足再次弹窗确认条件 //满足再次弹窗确认条件
noticeDialog(type); noticeDialog(type);
}else{
unbindThirdLogin(type);
} }
} else { } else {
unbindThirdLogin(type); unbindThirdLogin(type);
} }
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment