三方登录修改集成测试

韩亚云
1 parent ba42588e
Showing 22 changed files with 537 additions and 258 deletions
cloud/third_tool/build.gradle
cloud/third_tool/src/debug/java/com/cnlive/strike/debug/wxapi/WXEntryActivity.java
cloud/third_tool/src/main/AndroidManifest.xml
cloud/third_tool/src/main/java/com/cnlive/login/action/UserThirdAction.java
cloud/third_tool/src/main/java/com/cnlive/login/action/UserThirdUtilAction.java
cloud/user/src/main/java/com/cnlive/cloud/user/frame/data/OtherUserInfo.java → cloud/third_tool/src/main/java/com/cnlive/login/model/OtherUserInfo.java
cloud/third_tool/src/main/java/com/cnlive/login/model/ThirdLoginInfo.java
cloud/third_tool/src/main/java/com/cnlive/login/utils/ThirdLoginUtil.java
cloud/third_tool/src/main/java/com/cnlive/share/arouter/ARouterUtil.java
cloud/third_tool/src/main/java/com/cnlive/share/ui/ShareImgActivity.java
cloud/third_tool/src/main/java/com/cnlive/share/util/ShareUtils.java
cloud/third_tool/src/main/java/com/cnlive/share/util/Util.java
cloud/user/build.gradle
cloud/user/src/main/java/com/cnlive/cloud/user/UserUtilAction.java
cloud/user/src/main/java/com/cnlive/cloud/user/frame/presenter/LoginDialogPresenter.java
cloud/user/src/main/java/com/cnlive/cloud/user/frame/presenter/QuickLoginPresenter.java
cloud/user/src/main/java/com/cnlive/cloud/user/frame/view/LoginDialogView.java
cloud/user/src/main/java/com/cnlive/cloud/user/frame/view/QuickLoginView.java
cloud/user/src/main/java/com/cnlive/cloud/user/router/user/UserAction.java
cloud/user/src/main/java/com/cnlive/cloud/user/ui/activity/LoginDialogActivity.java
@@ -68,5 +68,5 @@ dependencies {
     implementation project(':core:network')
     implementation project(':core:base')
-    implementation project (':cloud:user')
+//    implementation project (':cloud:user')
 }
@@ -7,8 +7,9 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.widget.Toast;
-import com.cnlive.cloud.user.auth.UserService;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.cnlive.core.libs.base.application.AppConfig;
+import com.cnlive.core.libs.base.arouter.user.CNLiveUserService;
 import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.share.BuildConfig;
 import com.cnlive.share.arouter.ARouterUtil;
@@ -172,12 +173,13 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
         try {
             Gson gson = new Gson();
             ShareIntegralTypeInfo integralTypeInfo = gson.fromJson(shareType, ShareIntegralTypeInfo.class);
-
+            CNLiveUserService service = (CNLiveUserService) ARouter.getInstance().navigation(CNLiveUserService.class);
+            String userId = service.getUid(this);
             if ("witnessVideo".equals(integralTypeInfo.getShareType())) {
                 SharedPreferences preferences = this.getSharedPreferences("sharevideo", MODE_PRIVATE);
-                boolean status = preferences.getBoolean(UserService.getUid(this), false);
+                boolean status = preferences.getBoolean(userId, false);
                 String newTime = DateTimeUtil.getCurrentTime();
-                String oldtime = preferences.getString(UserService.getUid(this) + "time", "2019-04-10");
+                String oldtime = preferences.getString(userId + "time", "2019-04-10");
                 boolean sameDay = DateTimeUtil.isSameDay(newTime, oldtime);
                 if (!status) {
                     ARouterUtil.addIntegrationPic(this, "share_video", integralTypeInfo.getContentId(), "sharevideo");
@@ -188,9 +190,9 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
             } else if (integralTypeInfo.getShareType() != null) {
                 SharedPreferences preferences = this.getSharedPreferences("sharearticle", MODE_PRIVATE);
-                boolean status = preferences.getBoolean(UserService.getUid(this), false);
+                boolean status = preferences.getBoolean(userId, false);
                 String newTime = DateTimeUtil.getCurrentTime();
-                String oldtime = preferences.getString(UserService.getUid(this) + "time", "2019-04-10");
+                String oldtime = preferences.getString(userId + "time", "2019-04-10");
                 boolean sameDay = DateTimeUtil.isSameDay(newTime, oldtime);
                 if (!status) {
                     ARouterUtil.addIntegrationPic(this, "share_article", integralTypeInfo.getContentId(), "sharearticle");
@@ -14,7 +14,8 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <application android:largeHeap="true">
-
+        <uses-library android:name="org.apache.http.legacy"
+            android:required="false" />
         <meta-data
             android:name="WEIBO_APPKEY"
             android:value="3884700821" />
-package com.cnlive.login.action;
-
-import android.accounts.Account;
-import android.content.Context;
-import android.text.TextUtils;
-
-import com.cnlive.cloud.user.auth.UserService;
-import com.cnlive.cloud.user.model.CNLiveUserInfo;
-import com.cnlive.core.network.HttpConn;
-import com.cnlive.core.network.NetCallBack;
-import com.cnlive.core.network.model.BaseResult;
-import com.cnlive.core.network.model.UserData;
-
-import io.reactivex.Observable;
-
-//import com.cnlive.strike.user.model.CNLiveUserInfo;
-
-/**
- * created by hanyayun
- * on 2019/12/4
- */
-public class UserThirdAction {
-
-
-    private static final int MAX_USER_COUNT = 1;
-
-    public static void otherLogin(Context context, String thirdPartyPlat, String thirdPartyId, CallBack callBack) {
-
-        HttpConn.action(UserThirdUtilAction.otherLogin(context, thirdPartyPlat, thirdPartyId), new NetCallBack<BaseResult<UserData>>() {
-            @Override
-            public void onRequestState(int state) {
-                if (null != callBack) {
-                    callBack.callback(state, "", null);
-                }
-            }
-
-            @Override
-            public void onSuccess(BaseResult<UserData> data) {
-                loginAppAction(data, context, "", "", true, callBack);
-            }
-
-            @Override
-            public void onFailure(String errCode, String errMsg, Exception e) {
-                if (null != callBack) {
-                    callBack.callback(Integer.parseInt(errCode), errMsg, null);
-                }
-            }
-        });
-    }
-
-
-    public static void otherLoginBindMobile(Context context, String phone, String countryCode, String ems,
-                                            String thirdPartyPlat, String thirdPartyId, String nickName, String gender,
-                                            String location, String faceUrl, CallBack callBack) {
-
-        HttpConn.action(UserThirdUtilAction.otherLoginBindMobile(context, phone, countryCode, ems,
-                thirdPartyPlat, thirdPartyId, nickName, gender, location, faceUrl), new NetCallBack<BaseResult<UserData>>() {
-            @Override
-            public void onRequestState(int state) {
-                if (null != callBack) {
-                    callBack.callback(state, "", null);
-                }
-            }
-
-            @Override
-            public void onSuccess(BaseResult<UserData> data) {
-                loginAppAction(data,context, "", "", true, callBack);
-            }
-
-            @Override
-            public void onFailure(String errCode, String errMsg, Exception e) {
-
-            }
-        });
-    }
-
-
-    private static Observable<CNLiveUserInfo> loginAppAction(BaseResult<UserData> data, Context context, String userName, String userPassword, boolean otherLogin, CallBack callBack) {
-        CNLiveUserInfo userinfo = null;
-        if (null == data || null == data.getData()) {
-            if (null != callBack) {
-                callBack.callback(-5, "获取账户信息失败 请重试.", null);
-            }
-        } else if (TextUtils.isEmpty(data.getData().getMobile())) {
-            callBack.callback(-5, "绑定手机号已失效..", null);
-        } else {
-            //更新登录用户信息
-            UserService userService = UserService.getInstance(context);
-            userService.loginAppAccount(
-                    otherLogin ? data.getData().getMobile() : userName,
-                    otherLogin ? data.getData().getMobile() : userPassword,
-                    data.getData());
-            //保留近期登录用户
-            Account[] accounts = userService.getUserList();
-            userinfo = userService.getAppAccount();
-            if (accounts.length <= MAX_USER_COUNT) {
-                callBack.callback(0, "", userinfo);
-            } else {
-                CNLiveUserInfo finalUserinfo = userinfo;
-                userService.removeUser(accounts[0], future -> callBack.callback(0, "", finalUserinfo));
-            }
-        }
-        return Observable.just(userinfo);
-    }
-
-
-    public interface CallBack {
-        void callback(int state, String msg, Object object);
-    }
-}
-package com.cnlive.login.action;
-
-import android.content.Context;
-
-import com.cnlive.core.libs.base.application.AppConfig;
-import com.cnlive.core.network.api.ApiBaseServiceOpen;
-import com.cnlive.core.network.model.BaseResult;
-import com.cnlive.core.network.model.UserData;
-import com.cnlive.core.network.request.BaseRequest;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import io.reactivex.Observable;
-
-/**
- * created by hanyayun
- * on 2019/12/4
- */
-public class UserThirdUtilAction {
-
-    /**
-     * 其他平台账户登录
-     *
-     * @param context
-     * @param thirdPartyPlat 平台类型  1:sina 2:qq 3:weixin 4:renren
-     * @param thirdPartyId   第三方用户ID
-     *                       [qq: 建议使用openid, wx: 建议使用unionid, sina: 建议使用idstr]；
-     *                       注意：同一用户在登录Sp下不同app时，thirdPartyId必须相同
-     */
-    public static Observable<BaseResult<UserData>> otherLogin(Context context, String thirdPartyPlat, String thirdPartyId) {
-
-            Map<String, String> requestMap = new HashMap<>();
-            requestMap.put("appId", AppConfig.getAppId());
-            requestMap.put("thirdPartyPlat", thirdPartyPlat);
-            requestMap.put("thirdPartyId", thirdPartyId);
-            requestMap.put("frmId", AppConfig.getAppChannel());
-            requestMap.put("clientPlat", "a");
-            return BaseRequest.init().service(ApiBaseServiceOpen.class).loginIn3rdForWJJ(requestMap);
-    }
-
-    /**
-     * 其他平台账户版定手机号并登录
-     *
-     * @param context
-     * @param thirdPartyPlat 平台类型  1:sina 2:qq 3:weixin 4:renren
-     * @param thirdPartyId   第三方用户ID
-     *                       [qq: 建议使用openid, wx: 建议使用unionid, sina: 建议使用idstr]；
-     *                       注意：同一用户在登录Sp下不同app时，thirdPartyId必须相同
-     */
-
-
-    public static Observable<BaseResult<UserData>> otherLoginBindMobile(Context context,
-                                                                                String phone,
-                                                                                String countryCode,
-                                                                                String ems,
-                                                                                String thirdPartyPlat,
-                                                                                String thirdPartyId,
-                                                                                String nickName,
-                                                                                String gender,
-                                                                                String location,
-                                                                                String faceUrl) {
-            Map<String, String> requestMap = new HashMap<>();
-
-            requestMap.put("frmId", AppConfig.getAppChannel());
-            requestMap.put("clientPlat", "a");
-            requestMap.put("uuid", AppConfig.getAppUUID());
-
-            requestMap.put("appId", AppConfig.getAppId());
-            requestMap.put("mobile", phone);
-            requestMap.put("countryCode", countryCode);
-            requestMap.put("verificationCode", ems);
-
-            requestMap.put("thirdPartyPlat", thirdPartyPlat);
-            requestMap.put("thirdPartyId", thirdPartyId);
-            requestMap.put("nickName", nickName);
-            requestMap.put("gender", gender);
-            requestMap.put("location", location);
-            requestMap.put("faceUrl", faceUrl);
-
-            return BaseRequest.init().service(ApiBaseServiceOpen.class).loginIn3rdAndMobileForWJJ(requestMap);
-    }
-}
-package com.cnlive.cloud.user.frame.data;
+package com.cnlive.login.model;
 import java.io.Serializable;
 package com.cnlive.login.model;
-import com.cnlive.cloud.user.frame.data.OtherUserInfo;
 /**
  * 作者: 吴奎庆
 package com.cnlive.login.utils;
+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.text.TextUtils;
+import android.util.Log;
-import com.cnlive.cloud.user.frame.data.OtherUserInfo;
+import com.cnlive.core.libs.base.application.AppConfig;
+import com.cnlive.core.libs.base.util.AlertUtil;
+import com.cnlive.login.model.OtherUserInfo;
 import com.cnlive.login.model.ThirdLoginInfo;
 import com.cnlive.login.observer.ThirdLoginObservable;
+import com.cnlive.share.BuildConfig;
 import com.sina.weibo.sdk.auth.Oauth2AccessToken;
+import com.sina.weibo.sdk.auth.WbAuthListener;
+import com.sina.weibo.sdk.auth.WbConnectErrorMessage;
+import com.sina.weibo.sdk.auth.sso.SsoHandler;
 import com.sina.weibo.sdk.net.HttpManager;
 import com.sina.weibo.sdk.net.WeiboParameters;
 import com.tencent.connect.UserInfo;
+import com.tencent.mm.opensdk.modelmsg.SendAuth;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.tencent.tauth.IUiListener;
 import com.tencent.tauth.Tencent;
 import com.tencent.tauth.UiError;
@@ -37,6 +49,101 @@ import static com.tencent.open.SocialConstants.PARAM_OPEN_ID;
  * 简介:  三方登陆的工具类
  */
 public class ThirdLoginUtil {
+
+    //qq登录
+    private static Tencent mTencent;
+    public static final String ACOPE_ALL = "all";
+    private static Activity mContext;
+
+    private static SsoHandler mSsoHandler;
+
+    public static void init(Context context) {
+        synchronized (Tencent.class) {
+            if (mTencent == null) {
+                mTencent = Tencent.createInstance(BuildConfig.QQ_SHARE, context);
+            }
+        }
+    }
+
+
+    /**
+     * 是否安装qq
+     * @param context
+     * @return
+     */
+    public static boolean isQQInstalled(Activity context){
+        boolean isInstall = false;
+        mContext = context;
+        isInstall = mTencent.isQQInstalled(context);
+        if(isInstall) mTencent.login(context, ACOPE_ALL, listener);
+        return isInstall;
+    }
+
+    /**
+     * 回调处理
+     * @param requestCode
+     * @param resultCode
+     * @param data
+     */
+    public static void getQQResult(int requestCode, int resultCode, Intent data){
+        Tencent.onActivityResultData(requestCode, resultCode, data, listener);
+    }
+
+
+    /**
+     * 微博登录
+     * @param activity
+     */
+    public static void loginWeibo(Activity activity){
+        if(mSsoHandler == null)mSsoHandler = new SsoHandler(activity);
+        mSsoHandler.authorize(new WbAuthListener() {
+            @Override
+            public void onSuccess(Oauth2AccessToken oauth2AccessToken) {
+                getWeiBoInfo(activity, oauth2AccessToken);
+            }
+
+            @Override
+            public void cancel() {
+                AlertUtil.showDeftToast(activity, "取消登录");
+            }
+
+            @Override
+            public void onFailure(WbConnectErrorMessage wbConnectErrorMessage) {
+                AlertUtil.showDeftToast(activity, "登录失败");
+            }
+        });
+    }
+
+    /**
+     * 微博回调处理
+     * @param requestCode
+     * @param resultCode
+     * @param data
+     */
+    public static void getWeiboResult(int requestCode, int resultCode, Intent data){
+        if (mSsoHandler != null) {
+            try {
+                mSsoHandler.authorizeCallBack(requestCode, resultCode, data);
+            } catch (Exception e) {
+                Log.e("新浪异常:", "", e);
+            }
+        }
+    }
+
+    /**
+     * 微信登录
+     * @param activity
+     * @param wechatAppId
+     */
+    public static void loginWechat(Activity activity,String wechatAppId){
+        SendAuth.Req req = new SendAuth.Req();
+        req.scope = "snsapi_userinfo";
+        req.state = BuildConfig.SEND_AUTH_REQ_STATE;
+
+        IWXAPI iwxapi = WXAPIFactory.createWXAPI(activity, AppConfig.getWechatAppid(), true);
+        iwxapi.registerApp(wechatAppId);
+        iwxapi.sendReq(req);
+    }
     /**
      * 获取微博信息
      *
@@ -206,4 +313,20 @@ public class ThirdLoginUtil {
         });
     }
+    static IUiListener listener = new IUiListener() {
+        @Override
+        public void onComplete(Object o) {
+            getQQInfo(mContext, mTencent, o);
+        }
+
+        @Override
+        public void onError(UiError uiError) {
+            AlertUtil.showDeftToast(mContext, "登录失败");
+        }
+
+        @Override
+        public void onCancel() {
+            AlertUtil.showDeftToast(mContext, "取消登录");
+        }
+    };
 }
@@ -3,9 +3,9 @@ package com.cnlive.share.arouter;
 import android.content.Context;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.cnlive.core.libs.base.arouter.user.CNLiveUserService;
 import com.cnlive.core.libs.base.util.SharedPreferencesHelper;
 import com.cnlive.core.network.action.CoinRainAction;
-import com.cnlive.cloud.user.auth.UserService;
 public class ARouterUtil {
     /**
@@ -14,7 +14,9 @@ public class ARouterUtil {
     public static void addIntegrationPic(Context context, String taskId, String contentId, String addtype) {
         Boolean app_is_show_integral = SharedPreferencesHelper.getInstance(context).getBoolValue("APP_IS_SHOW_INTEGRAL");
         if (app_is_show_integral) {
-            CoinRainAction.code(context, UserService.getUid(context), taskId, contentId, addtype,false);
+            CNLiveUserService service = (CNLiveUserService) ARouter.getInstance().navigation(CNLiveUserService.class);
+            String sid = service.getUid(context);
+            CoinRainAction.code(context, sid, taskId, contentId, addtype,false);
         }
     }
@@ -15,6 +15,8 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.cnlive.core.libs.base.arouter.user.CNLiveUserService;
 import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.core.libs.base.util.DoublePressed;
 import com.cnlive.share.BuildConfig;
@@ -23,7 +25,6 @@ import com.cnlive.share.data.IconInfo;
 import com.cnlive.share.observable.ShareClickObservable;
 import com.cnlive.share.util.ShareUtils;
 import com.cnlive.share.util.Util;
-import com.cnlive.cloud.user.auth.UserService;
 import com.sina.weibo.sdk.share.WbShareCallback;
 import com.sina.weibo.sdk.share.WbShareHandler;
 import com.tencent.connect.common.Constants;
@@ -90,8 +91,11 @@ public class ShareImgActivity extends AppCompatActivity implements ShareDialogLi
     }
     private void initList() {
-        if (getIntent().getStringExtra("fileName") != null)
-            fileName = UserService.getUid(this) + getIntent().getStringExtra("fileName");
+        if (getIntent().getStringExtra("fileName") != null){
+            CNLiveUserService service = (CNLiveUserService) ARouter.getInstance().navigation(CNLiveUserService.class);
+            String sid = service.getUid(this);
+            fileName = sid + getIntent().getStringExtra("fileName");
+        }
         SharedPreferences sp = this.getSharedPreferences("sp", Context.MODE_PRIVATE);
         String bt = sp.getString("share_img_string", "");
         bitmap = convertStringToIcon(bt);
@@ -16,6 +16,7 @@ import com.alibaba.android.arouter.launcher.ARouter;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.cnlive.core.libs.base.application.AppConfig;
+import com.cnlive.core.libs.base.arouter.user.CNLiveUserService;
 import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.core.libs.base.util.FileUtils;
 import com.cnlive.core.libs.base.util.NetworkUtil;
@@ -33,7 +34,6 @@ import com.cnlive.share.data.ShareInfo;
 import com.cnlive.share.data.ShareIntegralTypeInfo;
 import com.cnlive.share.model.ShareReleaseInfoUtil;
 import com.cnlive.share.model.ShortLinkInfo;
-import com.cnlive.cloud.user.auth.UserService;
 import com.google.gson.Gson;
 import com.sina.weibo.sdk.api.ImageObject;
 import com.sina.weibo.sdk.api.TextObject;
@@ -284,12 +284,14 @@ public class ShareUtils {
      */
     public static void processQQCallBack(Activity mContext, String shareType, String contentId) {
         if (TextUtils.isEmpty(shareType)) return;
+        CNLiveUserService service = (CNLiveUserService) ARouter.getInstance().navigation(CNLiveUserService.class);
+        String sid = service.getUid(mContext);
         switch (shareType) {
             case "witnessVideo":
                 SharedPreferences preferences = mContext.getSharedPreferences("sharevideo", MODE_PRIVATE);
-                boolean status = preferences.getBoolean(UserService.getUid(mContext), false);
+                boolean status = preferences.getBoolean(sid, false);
                 String newTime = DateTimeUtil.getCurrentTime();
-                String oldtime = preferences.getString(UserService.getUid(mContext) + "time", "2019-04-10");
+                String oldtime = preferences.getString(sid + "time", "2019-04-10");
                 boolean sameDay = DateTimeUtil.isSameDay(newTime, oldtime);
                 if (!status) {
                     ARouterUtil.addIntegrationPic(mContext, "share_video", contentId, "sharevideo");
@@ -300,9 +302,9 @@ public class ShareUtils {
                 break;
             default:
                 SharedPreferences preferences1 = mContext.getSharedPreferences("sharearticle", MODE_PRIVATE);
-                boolean status1 = preferences1.getBoolean(UserService.getUid(mContext), false);
+                boolean status1 = preferences1.getBoolean(sid, false);
                 String newTime1 = DateTimeUtil.getCurrentTime();
-                String oldtime1 = preferences1.getString(UserService.getUid(mContext) + "time", "2019-04-10");
+                String oldtime1 = preferences1.getString(sid + "time", "2019-04-10");
                 boolean sameDay1 = DateTimeUtil.isSameDay(newTime1, oldtime1);
                 if (!status1) {
                     ARouterUtil.addIntegrationPic(mContext, "share_article", contentId, "sharearticle");
@@ -20,10 +20,11 @@ import android.graphics.Rect;
 import android.net.Uri;
 import android.text.TextUtils;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.cnlive.core.libs.base.application.AppConfig;
+import com.cnlive.core.libs.base.arouter.user.CNLiveUserService;
 import com.cnlive.core.network.util.UriUtil;
 import com.cnlive.share.BuildConfig;
-import com.cnlive.cloud.user.auth.UserService;
 import com.sina.weibo.sdk.WbSdk;
 import com.sina.weibo.sdk.auth.AuthInfo;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
@@ -156,6 +157,8 @@ public class Util {
      */
     public static String processUrlData(String shareInfoUrl, Context mContext, boolean isToWjj) {
         if (shareInfoUrl.contains("http://wjjh5.cnlive.com") || shareInfoUrl.contains("http://wjjh5test.cnlive.com")) {
+            CNLiveUserService service = (CNLiveUserService) ARouter.getInstance().navigation(CNLiveUserService.class);
+            String userId = service.getUid(mContext);
             Uri oldUri = Uri.parse(shareInfoUrl);
             //判断分享地址中是否有参数，如果没有则先拼接问号
             if (oldUri.getQueryParameterNames().size() <= 0) {
@@ -164,13 +167,13 @@ public class Util {
             }
             if (!shareInfoUrl.contains("?sid=") && !shareInfoUrl.contains("&sid=")) {
                 StringBuilder pageUrl = new StringBuilder(shareInfoUrl);
-                pageUrl.append(oldUri.getQueryParameterNames().size() <= 0 ? "sid=" : "&sid=").append(UserService.getUid(mContext));
+                pageUrl.append(oldUri.getQueryParameterNames().size() <= 0 ? "sid=" : "&sid=").append(userId);
                 shareInfoUrl = pageUrl.toString();
             }
             if (!shareInfoUrl.contains("?shareSid=") && !shareInfoUrl.contains("&shareSid=")) {
                 StringBuilder pageUrl = new StringBuilder(shareInfoUrl);
-                pageUrl.append("&shareSid=").append(UserService.getUid(mContext));
+                pageUrl.append("&shareSid=").append(userId);
                 shareInfoUrl = pageUrl.toString();
             }
             if (!shareInfoUrl.contains("?isApp=") && !shareInfoUrl.contains("&isApp=")) {
@@ -208,15 +211,16 @@ public class Util {
             String url = urls[0];
             StringBuilder pageUrl = new StringBuilder(url);
             pageUrl.append("?");
+
             for (String key : uri.getQueryParameterNames()) {
                 if ("sid".equals(key)) {
-                    pageUrl.append(key).append("=").append(Uri.encode(TextUtils.isEmpty(UserService.getUid(mContext)) ? "" : UserService.getUid(mContext))).append("&");
+                    pageUrl.append(key).append("=").append(Uri.encode(TextUtils.isEmpty(userId) ? "" : userId)).append("&");
                 } else if ("ver".equals(key)) {
                     pageUrl.append(key).append("=").append(Uri.encode(TextUtils.isEmpty(AppConfig.getAppVersion()) ? "" : AppConfig.getAppVersion())).append("&");
                 } else if ("plat".equals(key)) {
                     pageUrl.append(key).append("=").append(Uri.encode("a")).append("&");
                 } else if ("shareSid".equals(key)) {
-                    pageUrl.append(key).append("=").append(Uri.encode(TextUtils.isEmpty(UserService.getUid(mContext)) ? "" : UserService.getUid(mContext))).append("&");
+                    pageUrl.append(key).append("=").append(Uri.encode(TextUtils.isEmpty(userId) ? "" : userId)).append("&");
                 } else if ("isApp".equals(key)) {
                     pageUrl.append(key).append("=").append(isToWjj).append("&");
                 } else if ("wjjFrom".equals(key)) {
@@ -49,6 +49,6 @@ dependencies {
     implementation "com.cnlive.libs:emoj:$rootProject.libEmoj"
     //图片选择器
     implementation "com.cnlive.libs:mediapicker:$rootProject.libMediaPicker"
-//    implementation project(path: ':cloud:third_tool')
+    implementation project(path: ':cloud:third_tool')
 }
@@ -325,6 +325,70 @@ public class UserUtilAction {
 //        return null;
 //    }
+
+    /**
+     * 其他平台账户登录
+     *
+     * @param context
+     * @param thirdPartyPlat 平台类型  1:sina 2:qq 3:weixin 4:renren
+     * @param thirdPartyId   第三方用户ID
+     *                       [qq: 建议使用openid, wx: 建议使用unionid, sina: 建议使用idstr]；
+     *                       注意：同一用户在登录Sp下不同app时，thirdPartyId必须相同
+     */
+    public static Observable<BaseResult<UserData>> otherLogin(Context context, String thirdPartyPlat, String thirdPartyId) {
+
+        Map<String, String> requestMap = new HashMap<>();
+        requestMap.put("appId", AppConfig.getAppId());
+        requestMap.put("thirdPartyPlat", thirdPartyPlat);
+        requestMap.put("thirdPartyId", thirdPartyId);
+        requestMap.put("frmId", AppConfig.getAppChannel());
+        requestMap.put("clientPlat", "a");
+        return BaseRequest.init().service(ApiBaseServiceOpen.class).loginIn3rdForWJJ(requestMap);
+    }
+
+    /**
+     * 其他平台账户版定手机号并登录
+     *
+     * @param context
+     * @param thirdPartyPlat 平台类型  1:sina 2:qq 3:weixin 4:renren
+     * @param thirdPartyId   第三方用户ID
+     *                       [qq: 建议使用openid, wx: 建议使用unionid, sina: 建议使用idstr]；
+     *                       注意：同一用户在登录Sp下不同app时，thirdPartyId必须相同
+     */
+
+
+    public static Observable<BaseResult<UserData>> otherLoginBindMobile(Context context,
+                                                                        String phone,
+                                                                        String countryCode,
+                                                                        String ems,
+                                                                        String thirdPartyPlat,
+                                                                        String thirdPartyId,
+                                                                        String nickName,
+                                                                        String gender,
+                                                                        String location,
+                                                                        String faceUrl) {
+        Map<String, String> requestMap = new HashMap<>();
+
+        requestMap.put("frmId", AppConfig.getAppChannel());
+        requestMap.put("clientPlat", "a");
+        requestMap.put("uuid", AppConfig.getAppUUID());
+
+        requestMap.put("appId", AppConfig.getAppId());
+        requestMap.put("mobile", phone);
+        requestMap.put("countryCode", countryCode);
+        requestMap.put("verificationCode", ems);
+
+        requestMap.put("thirdPartyPlat", thirdPartyPlat);
+        requestMap.put("thirdPartyId", thirdPartyId);
+        requestMap.put("nickName", nickName);
+        requestMap.put("gender", gender);
+        requestMap.put("location", location);
+        requestMap.put("faceUrl", faceUrl);
+
+        return BaseRequest.init().service(ApiBaseServiceOpen.class).loginIn3rdAndMobileForWJJ(requestMap);
+    }
+
+
     private static String getPath() {
         String path = Environment.getExternalStorageDirectory() + "/strike/image/";
         File file = new File(path);
@@ -13,7 +13,6 @@ import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.cloud.user.R;
 import com.cnlive.cloud.user.UserUtilAction;
 import com.cnlive.cloud.user.auth.UserService;
-import com.cnlive.cloud.user.frame.data.OtherUserInfo;
 import com.cnlive.cloud.user.frame.data.QuickLoginData;
 import com.cnlive.cloud.user.frame.view.LoginDialogView;
 import com.cnlive.cloud.user.model.CNLiveUserInfo;
@@ -21,6 +20,7 @@ import com.cnlive.cloud.user.router.user.UserAction;
 import com.cnlive.cloud.user.ui.activity.LoginDialogActivity;
 import com.cnlive.cloud.user.util.RegexUtils;
 import com.cnlive.cloud.user.util.TimeEvent;
+import com.cnlive.login.model.OtherUserInfo;
 import java.util.Arrays;
 import java.util.Collections;
@@ -40,6 +40,7 @@ public class LoginDialogPresenter extends BasePresenter&lt;LoginDialogView&gt; {
     private static final String TAG = "QuickLoginPresenter";
     private Disposable event;
+    private Disposable otherEvent;
     private Disposable sendMsgBefQuickLogin;
     private TimerWaitUtil timerUtil; //计时工具类
@@ -65,8 +66,10 @@ public class LoginDialogPresenter extends BasePresenter&lt;LoginDialogView&gt; {
         Account account = accounts.length > 0 ? accounts[0] : null;
         String name = account == null ? "" : account.name;
         //页面填充数据
-        ifViewAttached(view -> view.uploadInputData(name));
-        ifViewAttached(view -> view.uploadListData(accounts));
+        if(getView() != null){
+            getView().uploadInputData(name);
+            getView().uploadListData(accounts);
+        }
     }
     private void startTimer() {
@@ -217,26 +220,27 @@ public class LoginDialogPresenter extends BasePresenter&lt;LoginDialogView&gt; {
                 break;
         }
     }
-//    /**
-//     * 三方登陆
-//     *
-//     * @param context
-//     * @param otherUserInfo
-//     */
-//    public void otherLogin(LoginDialogActivity context, OtherUserInfo otherUserInfo) {
-//        if (otherUserInfo == null) {
-//            getView().showToast(context.getString(R.string.user_toast_other_info_error));
-//        } else {
-//            cancelLoad();
-//            context.isLogin = true;
-//
-//            UserAction.otherLogin(context, context.otherUserInfo.getLoginType(), context.otherUserInfo.getThirdPartyId(), initLoginEvent(context, false, otherUserInfo));
-//        }
-//    }
-//
-//    private Event<CNLiveUserInfo> initLoginEvent(LoginDialogActivity context, Boolean retry) {
-//        return initLoginEvent(context, retry, null);
-//    }
+    /**
+     * 三方登陆
+     *
+     * @param context
+     * @param otherUserInfo
+     */
+    public void otherLogin(LoginDialogActivity context, OtherUserInfo otherUserInfo) {
+        if (otherUserInfo == null) {
+            getView().showToast(context.getString(R.string.user_toast_other_info_error));
+        } else {
+            cancelLoad();
+            context.isLogin = true;
+
+            otherEvent = UserAction.otherLogin(context, otherUserInfo.getLoginType(), otherUserInfo.getThirdPartyId(), new UserAction.CallBack() {
+                @Override
+                public void callback(int state, String msg, Object object) {
+                    initLoginEvent(context, state,msg,false, otherUserInfo);
+                }
+            });
+        }
+    }
     public void cancelLoad() {
@@ -246,6 +250,13 @@ public class LoginDialogPresenter extends BasePresenter&lt;LoginDialogView&gt; {
             }
             event = null;
         }
+
+        if (otherEvent != null) {
+            if (!otherEvent.isDisposed()) {
+                otherEvent.dispose();
+            }
+            otherEvent = null;
+        }
     }
     /**
 package com.cnlive.cloud.user.frame.presenter;
 import android.accounts.Account;
+import android.app.Activity;
 import android.content.Context;
 import android.text.TextUtils;
 import com.cnlive.cloud.user.R;
 import com.cnlive.cloud.user.UserUtilAction;
 import com.cnlive.cloud.user.auth.UserService;
-import com.cnlive.cloud.user.frame.data.OtherUserInfo;
 import com.cnlive.cloud.user.frame.data.QuickLoginData;
 import com.cnlive.cloud.user.frame.view.QuickLoginView;
 import com.cnlive.cloud.user.model.CNLiveUserInfo;
 import com.cnlive.cloud.user.router.user.UserAction;
+import com.cnlive.cloud.user.ui.activity.LoginDialogActivity;
 import com.cnlive.cloud.user.ui.fragment.QuickLoginFragment;
 import com.cnlive.cloud.user.util.RegexUtils;
 import com.cnlive.cloud.user.util.TimeEvent;
@@ -21,6 +22,7 @@ import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.libs.base.util.TimerWaitUtil;
+import com.cnlive.login.model.OtherUserInfo;
 import java.util.Arrays;
 import java.util.Collections;
@@ -38,7 +40,7 @@ public class QuickLoginPresenter extends BasePresenter&lt;QuickLoginView&gt; {
     private Disposable event;
     private Disposable sendMsgBefQuickLogin;
-//    private Event otherEvent;
+    private Disposable otherEvent;
     public void deleteUserInfo(Context context, String userName) {
         UserService.getInstance(context).removeUser(userName, future -> {
@@ -62,8 +64,8 @@ public class QuickLoginPresenter extends BasePresenter&lt;QuickLoginView&gt; {
         Account account = accounts.length > 0 ? accounts[0] : null;
         String name = account == null ? "" : account.name;
         //页面填充数据
-            ifViewAttached(view -> view.uploadInputData(name));
-            ifViewAttached(view -> view.uploadListData(accounts));
+        getView().uploadInputData(name);
+        getView().uploadListData(accounts);
     }
     private void startTimer() {
@@ -137,6 +139,29 @@ public class QuickLoginPresenter extends BasePresenter&lt;QuickLoginView&gt; {
         }
     }
+
+    /**
+     * 三方登陆
+     *
+     * @param context
+     * @param otherUserInfo
+     */
+    public void otherLogin(QuickLoginFragment context, OtherUserInfo otherUserInfo) {
+        if (otherUserInfo == null) {
+            getView().showToast(context.getString(R.string.user_toast_other_info_error));
+        } else {
+            cancelLoad();
+            context.isLogin = true;
+
+            otherEvent = UserAction.otherLogin(context.getActivity(), otherUserInfo.getLoginType(), otherUserInfo.getThirdPartyId(), new UserAction.CallBack() {
+                @Override
+                public void callback(int state, String msg, Object object) {
+                    initLoginEvent(context, state,msg,false, otherUserInfo);
+                }
+            });
+        }
+    }
+
     private void initLoginEvent(QuickLoginFragment context, int state, String msg, Boolean retry, OtherUserInfo otherUserInfo) {
         switch (state) {
             //请求成功
@@ -173,10 +198,12 @@ public class QuickLoginPresenter extends BasePresenter&lt;QuickLoginView&gt; {
                 }
                 break;
             case HttpConn.ON_START:
-                ifViewAttached(view -> view.showProgress());
+                if(getView() != null) getView().showProgress();
+//                ifViewAttached(view -> view.showProgress());
                 break;
             case HttpConn.ON_END:
-                ifViewAttached(view -> view.hideProgress());
+                if(getView() != null) getView().hideProgress();
+//                ifViewAttached(view -> view.hideProgress());
                 break;
             case 41010: //手机号无效
                 ifViewAttached(view -> view.showToast(msg));
@@ -301,5 +328,12 @@ public class QuickLoginPresenter extends BasePresenter&lt;QuickLoginView&gt; {
             }
             event = null;
         }
+
+        if (otherEvent != null) {
+            if (!otherEvent.isDisposed()) {
+                otherEvent.dispose();
+            }
+            otherEvent = null;
+        }
     }
 }
@@ -19,13 +19,13 @@ import com.cnlive.core.libs.base.frame.view.BaseView;
 import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.core.libs.base.util.DoublePressed;
 import com.cnlive.cloud.user.R;
-import com.cnlive.cloud.user.frame.data.OtherUserInfo;
 import com.cnlive.cloud.user.sms.OnSmsCatchListener;
 import com.cnlive.cloud.user.sms.SmsVerifyCatcher;
 import com.cnlive.cloud.user.ui.activity.FirstLoginActivity;
 import com.cnlive.cloud.user.ui.activity.LoginActivity;
 import com.cnlive.cloud.user.ui.activity.LoginDialogActivity;
 import com.cnlive.cloud.user.util.UserRouterHelper;
+import com.cnlive.login.model.OtherUserInfo;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -17,7 +17,6 @@ import android.view.View;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cnlive.cloud.user.R;
-import com.cnlive.cloud.user.frame.data.OtherUserInfo;
 import com.cnlive.cloud.user.model.LoginSuccessInfo;
 import com.cnlive.cloud.user.sms.OnSmsCatchListener;
 import com.cnlive.cloud.user.sms.SmsVerifyCatcher;
@@ -28,6 +27,8 @@ import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.frame.view.BaseView;
 import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.core.libs.base.util.DoublePressed;
+import com.cnlive.login.model.OtherUserInfo;
+
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -76,6 +76,31 @@ public class UserAction {
     }
+
+    public static Disposable otherLogin(Context context, String thirdPartyPlat, String thirdPartyId, CallBack callBack) {
+
+        return HttpConn.action(UserUtilAction.otherLogin(context, thirdPartyPlat, thirdPartyId), new NetCallBack<BaseResult<UserData>>() {
+            @Override
+            public void onRequestState(int state) {
+                if (null != callBack) {
+                    callBack.callback(state, "", null);
+                }
+            }
+
+            @Override
+            public void onSuccess(BaseResult<UserData> data) {
+                loginAppAction(data, context, "", "", true, callBack);
+            }
+
+            @Override
+            public void onFailure(String errCode, String errMsg, Exception e) {
+                if (null != callBack) {
+                    callBack.callback(Integer.parseInt(errCode), errMsg, null);
+                }
+            }
+        });
+    }
+
     private static Observable<CNLiveUserInfo> loginAppAction(BaseResult<UserData> data, Context context, String userName, String userPassword, boolean otherLogin, CallBack callBack) {
         CNLiveUserInfo userinfo = null;
         if (null == data || null == data.getData()) {
@@ -104,6 +129,32 @@ public class UserAction {
         return Observable.just(userinfo);
     }
+
+    public static void otherLoginBindMobile(Context context, String phone, String countryCode, String ems,
+                                            String thirdPartyPlat, String thirdPartyId, String nickName, String gender,
+                                            String location, String faceUrl, CallBack callBack) {
+
+        HttpConn.action(UserUtilAction.otherLoginBindMobile(context, phone, countryCode, ems,
+                thirdPartyPlat, thirdPartyId, nickName, gender, location, faceUrl), new NetCallBack<BaseResult<UserData>>() {
+            @Override
+            public void onRequestState(int state) {
+                if (null != callBack) {
+                    callBack.callback(state, "", null);
+                }
+            }
+
+            @Override
+            public void onSuccess(BaseResult<UserData> data) {
+                loginAppAction(data,context, "", "", true, callBack);
+            }
+
+            @Override
+            public void onFailure(String errCode, String errMsg, Exception e) {
+
+            }
+        });
+    }
+
     public interface CallBack {
         void callback(int state, String msg, Object object);
     }
@@ -25,6 +25,15 @@ import com.cnlive.cloud.user.frame.view.LoginDialogView;
 import com.cnlive.cloud.user.router.user.UserAction;
 import com.cnlive.cloud.user.sms.SmsVerifyCatcher;
 import com.cnlive.cloud.user.ui.adapter.UserListAdapter;
+import com.cnlive.login.model.OtherUserInfo;
+import com.cnlive.login.model.ThirdLoginInfo;
+import com.cnlive.login.observer.ThirdLoginObservable;
+import com.cnlive.login.observer.WechatLoginObservable;
+import com.cnlive.login.utils.ThirdLoginUtil;
+import com.cnlive.share.data.WeChatInfo;
+import com.cnlive.share.util.Util;
+
+import java.util.Observable;
 import static com.cnlive.cloud.user.ui.activity.LoginActivity.TAG_CLICK_AD;
@@ -48,11 +57,11 @@ public class LoginDialogActivity extends BaseActivity&lt;LoginDialogView, LoginDial
     public boolean hasLogin = false;//是否已经登录
     public Uri uri;
     public String tagShare;
-    //三方登陆
-    //qq的权限
-    public final String ACOPE_ALL = "all";
+
     //三方登陆的信息
+    public OtherUserInfo otherUserInfo;
     public Boolean clickAd;
+
     public String tagUrl;
     public ActivityLoginDialogBinding binding;
     public QuickLoginData data;
@@ -83,7 +92,7 @@ public class LoginDialogActivity extends BaseActivity&lt;LoginDialogView, LoginDial
         p.height = WindowManager.LayoutParams.MATCH_PARENT;
         p.width = (ScreenUtils.getScreenWidth(this) - dp2px(88));
         getWindow().setAttributes(p);
-//        initThreeLogin();
+        initThreeLogin();
         uri = UserAction.getUri(this);
         tagUrl = getIntent().getStringExtra(TAG_URL);
         clickAd = getIntent().getBooleanExtra(TAG_CLICK_AD, false);
@@ -108,6 +117,15 @@ public class LoginDialogActivity extends BaseActivity&lt;LoginDialogView, LoginDial
     }
+    /**
+     * 初始化第三方
+     */
+    private void initThreeLogin() {
+        ThirdLoginUtil.init(this);
+        WechatLoginObservable.getInstance().addObserver(this);
+        ThirdLoginObservable.getInstance().addObserver(this);
+    }
+
     @Override
     public void onStart() {
@@ -153,8 +171,24 @@ public class LoginDialogActivity extends BaseActivity&lt;LoginDialogView, LoginDial
 //        }
         else if (id == R.id.iv_qq) {
             if (DoublePressed.onDoublePressed()) return;
+            if (!ThirdLoginUtil.isQQInstalled(LoginDialogActivity.this) && getMvpView() != null)
+                getMvpView().showToast("您未安装该第三方应用，无法获取用户信息！");
         } else if (id == R.id.iv_wb) {
             if (DoublePressed.onDoublePressed()) return;
+            if (Util.isWeiboInstallAndInit(this)) {
+                ThirdLoginUtil.loginWeibo(LoginDialogActivity.this);
+            } else {
+                if (getMvpView() != null) getMvpView().showToast("您未安装该第三方应用，无法获取用户信息！");
+            }
+        } else if (id == R.id.iv_wc) {
+            if (DoublePressed.onDoublePressed()) return;
+            if (Util.isWXAppInstalledAndSupported(this)) {
+                new Thread(() -> {
+                    ThirdLoginUtil.loginWechat(LoginDialogActivity.this, AppConfig.getWechatAppid());
+                }).start();
+            } else {
+                if (getMvpView() != null) getMvpView().showToast("您未安装该第三方应用，无法获取用户信息！");
+            }
         } else if (id == R.id.iv_close) {
             finish();
         }
@@ -190,6 +224,9 @@ public class LoginDialogActivity extends BaseActivity&lt;LoginDialogView, LoginDial
         super.onDestroy();
         if (getMvpView() != null) getMvpView().hideProgress();
         if (getPresenter() != null) getPresenter().destroy();
+
+        WechatLoginObservable.getInstance().deleteObserver(this);
+        ThirdLoginObservable.getInstance().deleteObserver(this);
     }
     @Override
@@ -214,6 +251,9 @@ public class LoginDialogActivity extends BaseActivity&lt;LoginDialogView, LoginDial
             }
         }
+        ThirdLoginUtil.getQQResult(requestCode, resultCode, data);
+        ThirdLoginUtil.getWeiboResult(requestCode, resultCode, data);
+
     }
     @Override
@@ -225,6 +265,48 @@ public class LoginDialogActivity extends BaseActivity&lt;LoginDialogView, LoginDial
         }
     }
+    //微信登录回调接口
+    @Override
+    public void update(Observable observable, Object o) {
+        if (observable instanceof WechatLoginObservable && null != o) {
+            WeChatInfo weChatInfo = (WeChatInfo) o;
+            if (weChatInfo != null) {
+                otherUserInfo = new OtherUserInfo();
+                otherUserInfo.setFaceUrl(weChatInfo.getHeadimgurl());
+                if ("1".equals(weChatInfo.getSex())) {
+                    otherUserInfo.setGender("m");
+                } else if ("2".equals(weChatInfo.getSex())) {
+                    otherUserInfo.setGender("f");
+                } else {
+                    otherUserInfo.setGender("n");
+                }
+
+                otherUserInfo.setNickName(weChatInfo.getNickname());
+                if (!TextUtils.isEmpty(weChatInfo.getProvince())) {
+                    otherUserInfo.setLocation(weChatInfo.getProvince());
+                } else {
+                    otherUserInfo.setLocation(weChatInfo.getCountry());
+                }
+
+                otherUserInfo.setThirdPartyId(weChatInfo.getUnionid());
+                otherUserInfo.setLoginType("3");
+            }
+            if (otherUserInfo != null && getPresenter() != null)
+                getPresenter().otherLogin(this, otherUserInfo);
+        } else if (observable instanceof ThirdLoginObservable) {
+            ThirdLoginInfo info = (ThirdLoginInfo) o;
+            if (info != null) {
+                if (info.getType() == 1) {
+                    if (info.getOtherUserInfo() != null) otherUserInfo = info.getOtherUserInfo();
+                    getPresenter().otherLogin(this, otherUserInfo);
+                } else if (info.getType() == 2) {
+                    if (getMvpView() != null) getMvpView().showToast(info.getMessage());
+                }
+            }
+
+        }
+    }
+
     @Override
     public void finish() {
         super.finish();
@@ -11,6 +11,7 @@ import androidx.databinding.ViewDataBinding;
 import com.cnlive.cloud.user.databinding.FragmentQuickLoginBinding;
 import com.cnlive.cloud.user.frame.presenter.QuickLoginPresenter;
+import com.cnlive.cloud.user.ui.activity.LoginDialogActivity;
 import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
 import com.cnlive.core.libs.base.util.DoublePressed;
@@ -22,6 +23,16 @@ import com.cnlive.cloud.user.sms.SmsVerifyCatcher;
 import com.cnlive.cloud.user.ui.activity.LoginActivity;
 import com.cnlive.cloud.user.ui.activity.SelectCountryActivity;
 import com.cnlive.cloud.user.ui.adapter.UserListAdapter;
+import com.cnlive.login.model.OtherUserInfo;
+import com.cnlive.login.model.ThirdLoginInfo;
+import com.cnlive.login.observer.ThirdLoginObservable;
+import com.cnlive.login.observer.WechatLoginObservable;
+import com.cnlive.login.utils.ThirdLoginUtil;
+import com.cnlive.share.BuildConfig;
+import com.cnlive.share.data.WeChatInfo;
+import com.cnlive.share.util.Util;
+
+import java.util.Observable;
 /**
  * @author Lynn
@@ -48,6 +59,10 @@ public class QuickLoginFragment extends BaseFragment&lt;QuickLoginView, QuickLoginP
     public String tagUrl;
     public static String TAG_URL = "tagurl";
+    //三方登陆的信息
+    public OtherUserInfo otherUserInfo;
+    private boolean needEntranceBtn;
+
     @Override
     protected int getBindLayoutId() {
         return R.layout.fragment_quick_login;
@@ -100,6 +115,7 @@ public class QuickLoginFragment extends BaseFragment&lt;QuickLoginView, QuickLoginP
     @Override
     protected void initView() {
+        initThreeLogin();
         adapter = new UserListAdapter(getActivity(), 0);
         adapter.setClickListener((name) -> getMvpView().onUploadLoginUser(name));
         adapter.setDeleteListener((name) -> getMvpView().onDeleteLoginUser(name));
@@ -116,6 +132,16 @@ public class QuickLoginFragment extends BaseFragment&lt;QuickLoginView, QuickLoginP
         if (getMvpView() != null) getMvpView().initView();
     }
+
+    /**
+     * 初始化第三方
+     */
+    private void initThreeLogin() {
+        ThirdLoginUtil.init(getActivity());
+        WechatLoginObservable.getInstance().addObserver(this);
+        ThirdLoginObservable.getInstance().addObserver(this);
+    }
+
     @Override
     public void onStart() {
         super.onStart();
@@ -158,8 +184,28 @@ public class QuickLoginFragment extends BaseFragment&lt;QuickLoginView, QuickLoginP
             if (DoublePressed.onDoublePressed()) return;
             SelectCountryActivity.startSelectCountryActivity(getActivity(), 1010, countryCode);
-        } else {
-            if (getMvpView() != null) getMvpView().showToast("您未安装该第三方应用，无法获取用户信息！");
+        }else if (id == R.id.iv_qq) {
+            if (DoublePressed.onDoublePressed()) return;
+            if (!ThirdLoginUtil.isQQInstalled(getActivity()) && getMvpView() != null)
+                getMvpView().showToast("您未安装该第三方应用，无法获取用户信息！");
+        } else if (id == R.id.iv_wb) {
+            if (DoublePressed.onDoublePressed()) return;
+            if (Util.isWeiboInstallAndInit(getActivity())) {
+                ThirdLoginUtil.loginWeibo(getActivity());
+            } else {
+                if (getMvpView() != null) getMvpView().showToast("您未安装该第三方应用，无法获取用户信息！");
+            }
+        } else if (id == R.id.iv_wc) {
+            if (DoublePressed.onDoublePressed()) return;
+            if (Util.isWXAppInstalledAndSupported(getActivity())) {
+                new Thread(() -> {
+                    ThirdLoginUtil.loginWechat(getActivity(), AppConfig.getWechatAppid());
+                }).start();
+            } else {
+                if (getMvpView() != null) getMvpView().showToast("您未安装该第三方应用，无法获取用户信息！");
+            }
+        } else if (id == R.id.iv_close) {
+            getActivity().finish();
         }
     }
@@ -193,6 +239,8 @@ public class QuickLoginFragment extends BaseFragment&lt;QuickLoginView, QuickLoginP
         super.onDestroy();
         if (getMvpView() != null) getMvpView().hideProgress();
         if (getPresenter() != null) getPresenter().destroy();
+        WechatLoginObservable.getInstance().deleteObserver(this);
+        ThirdLoginObservable.getInstance().deleteObserver(this);
     }
     @Override
@@ -216,6 +264,9 @@ public class QuickLoginFragment extends BaseFragment&lt;QuickLoginView, QuickLoginP
                 return;
             }
         }
+
+        ThirdLoginUtil.getQQResult(requestCode, resultCode, data);
+        ThirdLoginUtil.getWeiboResult(requestCode, resultCode, data);
     }
     @Override
@@ -227,5 +278,46 @@ public class QuickLoginFragment extends BaseFragment&lt;QuickLoginView, QuickLoginP
         }
     }
+    //微信登录回调接口
+    @Override
+    public void update(Observable observable, Object o) {
+        if (observable instanceof WechatLoginObservable && null != o) {
+            WeChatInfo weChatInfo = (WeChatInfo) o;
+            if (weChatInfo != null) {
+                otherUserInfo = new OtherUserInfo();
+                otherUserInfo.setFaceUrl(weChatInfo.getHeadimgurl());
+                if ("1".equals(weChatInfo.getSex())) {
+                    otherUserInfo.setGender("m");
+                } else if ("2".equals(weChatInfo.getSex())) {
+                    otherUserInfo.setGender("f");
+                } else {
+                    otherUserInfo.setGender("n");
+                }
+
+                otherUserInfo.setNickName(weChatInfo.getNickname());
+                if (!TextUtils.isEmpty(weChatInfo.getProvince())) {
+                    otherUserInfo.setLocation(weChatInfo.getProvince());
+                } else {
+                    otherUserInfo.setLocation(weChatInfo.getCountry());
+                }
+
+                otherUserInfo.setThirdPartyId(weChatInfo.getUnionid());
+                otherUserInfo.setLoginType("3");
+            }
+            if (otherUserInfo != null && getPresenter() != null)
+                getPresenter().otherLogin(this, otherUserInfo);
+        } else if (observable instanceof ThirdLoginObservable) {
+            ThirdLoginInfo info = (ThirdLoginInfo) o;
+            if (info != null) {
+                if (info.getType() == 1) {
+                    if (info.getOtherUserInfo() != null) otherUserInfo = info.getOtherUserInfo();
+                    getPresenter().otherLogin(this, otherUserInfo);
+                } else if (info.getType() == 2) {
+                    if (getMvpView() != null) getMvpView().showToast(info.getMessage());
+                }
+            }
+
+        }
+    }
 }
@@ -163,7 +163,7 @@ public class MvpBasePresenter&lt;V extends MvpView&gt; implements MvpPresenter&lt;V&gt; {
      * {@inheritDoc}
      */
     public void destroy() {
-        detachView(false);
+//        detachView(false);
         presenterDestroyed = true;
     }
 }