Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/newModuleStrike

YangShuai
2 parents 182c6c1a bcd995f5
Showing 116 changed files with 601 additions and 243 deletions
.idea/misc.xml
cloud/share/.gitignore → cloud/third_tool/.gitignore
cloud/share/build.gradle → cloud/third_tool/build.gradle
cloud/share/libs/open_sdk_r6008_lite.jar → cloud/third_tool/libs/open_sdk_r6008_lite.jar
cloud/share/proguard-rules.pro → cloud/third_tool/proguard-rules.pro
cloud/share/src/debug/AndroidManifest.xml → cloud/third_tool/src/debug/AndroidManifest.xml
cloud/share/src/debug/java/com/cnlive/cloud/debug/wxapi/WXEntryActivity.java → cloud/third_tool/src/debug/java/com/cnlive/strike/debug/wxapi/WXEntryActivity.java
cloud/share/src/main/AndroidManifest.xml → 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/third_tool/src/main/java/com/cnlive/login/model/ThirdLoginInfo.java
cloud/third_tool/src/main/java/com/cnlive/login/observer/ThirdLoginObservable.java
cloud/share/src/main/java/com/cnlive/share/observable/WechatLoginObservable.java → cloud/third_tool/src/main/java/com/cnlive/login/observer/WechatLoginObservable.java
cloud/third_tool/src/main/java/com/cnlive/login/utils/ThirdLoginUtil.java
cloud/share/src/main/java/com/cnlive/share/QQListener.java → cloud/third_tool/src/main/java/com/cnlive/share/QQListener.java
cloud/share/src/main/java/com/cnlive/share/adapter/DataBindingAdapter.java → cloud/third_tool/src/main/java/com/cnlive/share/adapter/DataBindingAdapter.java
cloud/share/src/main/java/com/cnlive/share/api/ApiShareService.java → cloud/third_tool/src/main/java/com/cnlive/share/api/ApiShareService.java
cloud/share/src/main/java/com/cnlive/share/arouter/ARouterUtil.java → cloud/third_tool/src/main/java/com/cnlive/share/arouter/ARouterUtil.java
cloud/share/src/main/java/com/cnlive/share/data/FullVideoShareItemData.java → cloud/third_tool/src/main/java/com/cnlive/share/data/FullVideoShareItemData.java
cloud/share/src/main/java/com/cnlive/share/data/IconInfo.java → cloud/third_tool/src/main/java/com/cnlive/share/data/IconInfo.java
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
+    <option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="12">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="android.annotation.Nullable" />
+          <item index="7" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="11">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="android.annotation.NonNull" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
-package com.cnlive.cloud.debug.wxapi;
+package com.cnlive.strike.debug.wxapi;
  
 import android.app.Activity;
 import android.content.Intent;
@@ -7,17 +7,17 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.widget.Toast;
  
+import com.cnlive.cloud.user.auth.UserService;
 import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.share.BuildConfig;
 import com.cnlive.share.arouter.ARouterUtil;
 import com.cnlive.share.data.ShareIntegralTypeInfo;
 import com.cnlive.share.data.WeChatInfo;
-import com.cnlive.share.observable.WechatLoginObservable;
+import com.cnlive.login.observer.WechatLoginObservable;
 import com.cnlive.share.observable.WechatShareObservable;
 import com.cnlive.share.util.DateTimeUtil;
 import com.cnlive.share.util.OkHttpUtils;
-import com.cnlive.cloud.user.auth.UserService;
 import com.google.gson.Gson;
 import com.tencent.mm.opensdk.modelbase.BaseReq;
 import com.tencent.mm.opensdk.modelbase.BaseResp;
+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.login.model;
+
+
+import com.cnlive.cloud.user.frame.data.OtherUserInfo;
+
+/**
+ * 作者: 吴奎庆
+ * <p>
+ * 时间: 2019/9/19
+ * <p>
+ * 简介:
+ */
+public class ThirdLoginInfo {
+    //类型  1 成功   2失败
+    private int type;
+    //错误信息
+    private String message;
+    //登陆信息
+    OtherUserInfo otherUserInfo;
+
+    public ThirdLoginInfo() {
+    }
+
+    public ThirdLoginInfo(int type, String message, OtherUserInfo otherUserInfo) {
+        this.type = type;
+        this.message = message;
+        this.otherUserInfo = otherUserInfo;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public OtherUserInfo getOtherUserInfo() {
+        return otherUserInfo;
+    }
+
+    public void setOtherUserInfo(OtherUserInfo otherUserInfo) {
+        this.otherUserInfo = otherUserInfo;
+    }
+}
+package com.cnlive.login.observer;
+
+
+import com.cnlive.login.model.ThirdLoginInfo;
+
+import java.util.Observable;
+
+/**
+ * 作者: 吴奎庆
+ * <p>
+ * 时间: 2019/9/19
+ * <p>
+ * 简介:
+ */
+public class ThirdLoginObservable extends Observable {
+
+   private  static ThirdLoginObservable instance;
+
+    public static ThirdLoginObservable getInstance() {
+        synchronized (ThirdLoginObservable.class) {
+            if (instance == null) {
+                instance = new ThirdLoginObservable();
+            }
+        }
+        return instance;
+    }
+
+    public  void  update(ThirdLoginInfo userInfo){
+        setChanged();
+        notifyObservers(userInfo);
+    }
+}
-package com.cnlive.share.observable;
+package com.cnlive.login.observer;
  
 import com.cnlive.share.data.WeChatInfo;
  
+package com.cnlive.login.utils;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import com.cnlive.cloud.user.frame.data.OtherUserInfo;
+import com.cnlive.login.model.ThirdLoginInfo;
+import com.cnlive.login.observer.ThirdLoginObservable;
+import com.sina.weibo.sdk.auth.Oauth2AccessToken;
+import com.sina.weibo.sdk.net.HttpManager;
+import com.sina.weibo.sdk.net.WeiboParameters;
+import com.tencent.connect.UserInfo;
+import com.tencent.tauth.IUiListener;
+import com.tencent.tauth.Tencent;
+import com.tencent.tauth.UiError;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import io.reactivex.Observable;
+import io.reactivex.ObservableEmitter;
+import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.Observer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
+
+import static com.tencent.connect.common.Constants.PARAM_ACCESS_TOKEN;
+import static com.tencent.connect.common.Constants.PARAM_EXPIRES_IN;
+import static com.tencent.open.SocialConstants.PARAM_OPEN_ID;
+
+/**
+ * 作者: 吴奎庆
+ * <p>
+ * 时间: 2019/9/19
+ * <p>
+ * 简介:  三方登陆的工具类
+ */
+public class ThirdLoginUtil {
+    /**
+     * 获取微博信息
+     *
+     * @param context
+     * @param oauth2AccessToken
+     */
+    public static void getWeiBoInfo(Context context, Oauth2AccessToken oauth2AccessToken) {
+
+        Oauth2AccessToken mAccessToken = oauth2AccessToken;
+        //从这里获取用户输入的 电话号码信息
+        if (mAccessToken.isSessionValid()) {
+            // 显示 Token
+            Observable.create(new ObservableOnSubscribe<String>() {
+                @Override
+                public void subscribe(ObservableEmitter<String> emitter) throws Exception {
+
+                    WeiboParameters parameters = new WeiboParameters("3884700821");
+                    parameters.put("access_token", oauth2AccessToken.getToken());
+                    parameters.put("uid", oauth2AccessToken.getUid());
+                    String message = HttpManager.openUrl(context, "https://api.weibo.com/2/users/show.json", "GET", parameters);
+                    emitter.onNext(message);
+                }
+            }).subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(new Observer<String>() {
+                        @Override
+                        public void onSubscribe(Disposable d) {
+
+                        }
+
+                        @Override
+                        public void onNext(String message) {
+                            try {
+
+                                JSONObject jsonObject = new JSONObject(message);
+                                if (jsonObject == null) return;
+                                String id = jsonObject.getString("idstr");
+                                String name = jsonObject.getString("name");
+                                String urlface = jsonObject.getString("avatar_large");
+                                String location = jsonObject.getString("location");
+                                String gender = jsonObject.getString("gender");
+                                if (TextUtils.isEmpty(id)) return;
+
+                                OtherUserInfo userInfo = new OtherUserInfo();
+                                userInfo.setFaceUrl(urlface);
+                                userInfo.setGender(gender);
+                                userInfo.setNickName(name);
+                                userInfo.setLocation(location);
+                                userInfo.setThirdPartyId(id);
+                                userInfo.setLoginType("1");
+
+                                ThirdLoginInfo thirdLoginInfo = new ThirdLoginInfo();
+                                thirdLoginInfo.setType(1);
+                                thirdLoginInfo.setOtherUserInfo(userInfo);
+                                ThirdLoginObservable.getInstance().update(thirdLoginInfo);
+
+                            } catch (Exception e) {
+                                ThirdLoginObservable.getInstance().update(new ThirdLoginInfo(2, "登陆失败", null));
+                            }
+                        }
+
+                        @Override
+                        public void onError(Throwable e) {
+                            ThirdLoginObservable.getInstance().update(new ThirdLoginInfo(2, "登陆失败", null));
+                        }
+
+                        @Override
+                        public void onComplete() {
+
+                        }
+                    });
+        } else {
+            // 以下几种情况，您会收到 Code：
+            // 1. 当您未在平台上注册的应用程序的包名与签名时；
+            // 2. 当您注册的应用程序包名与签名不正确时；
+            // 3. 当您在平台上注册的包名和签名与您当前测试的应用的包名和签名不匹配时。
+            String code = oauth2AccessToken.getBundle().getString("code");
+            String message = "null";
+            if (!TextUtils.isEmpty(code)) {
+                message = message + "\nObtained the code: " + code;
+            }
+            ThirdLoginObservable.getInstance().update(new ThirdLoginInfo(2, "登陆失败", null));
+        }
+
+    }
+
+
+    public static  void getQQInfo(Context context, Tencent mTencent, Object obj) {
+        JSONObject jsonObject = (JSONObject) obj;
+        if (jsonObject != null) {
+            try {
+                int ret = jsonObject.getInt("ret");
+                if (ret == 0) {
+                    //此处登录授权成功
+                    String openId = jsonObject.getString(PARAM_OPEN_ID);
+                    String access_token = jsonObject.getString(PARAM_ACCESS_TOKEN);
+                    String expires = jsonObject.getString(PARAM_EXPIRES_IN);
+                    mTencent.setOpenId(openId);
+                    mTencent.setAccessToken(access_token, expires);
+                    //获取用户信息
+                    getUserInfo(context, mTencent, openId);
+                } else {
+                    ThirdLoginObservable.getInstance().update(new ThirdLoginInfo(2, "登陆失败", null));
+                }
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+    private static void getUserInfo(Context context, Tencent mTencent, String openId) {
+        UserInfo info = new UserInfo(context, mTencent.getQQToken());
+        info.getUserInfo(new IUiListener() {
+            @Override
+            public void onComplete(Object value) {
+                JSONObject jsonObject = (JSONObject) value;
+                if (jsonObject == null) return;
+
+                try {
+                    String name = jsonObject.getString("nickname");
+                    String urlface = jsonObject.getString("figureurl_qq");
+                    String gender = jsonObject.getString("gender");
+                    String province = jsonObject.getString("province");
+                    String city = jsonObject.getString("city");
+
+                    if (TextUtils.isEmpty(openId)) return;
+
+                    OtherUserInfo otherUserInfo = new OtherUserInfo();
+                    otherUserInfo.setFaceUrl(urlface);
+
+                    otherUserInfo.setNickName(name);
+                    if (TextUtils.isEmpty(city)) {
+                        otherUserInfo.setLocation(province);
+                    } else {
+                        otherUserInfo.setLocation(city);
+                    }
+
+                    if ("男".equals(gender)) {
+                        otherUserInfo.setGender("m");
+                    } else if ("女".equals(gender)) {
+                        otherUserInfo.setGender("f");
+                    } else {
+                        otherUserInfo.setGender("n");
+                    }
+
+                    otherUserInfo.setThirdPartyId(openId);
+                    otherUserInfo.setLoginType("2");
+                    ThirdLoginInfo thirdLoginInfo = new ThirdLoginInfo();
+                    thirdLoginInfo.setType(1);
+                    thirdLoginInfo.setOtherUserInfo(otherUserInfo);
+                    ThirdLoginObservable.getInstance().update(thirdLoginInfo);
+
+                } catch (JSONException e) {
+                    ThirdLoginObservable.getInstance().update(new ThirdLoginInfo(2, "登陆失败", null));
+                }
+            }
+
+            @Override
+            public void onError(UiError uiError) {
+                ThirdLoginObservable.getInstance().update(new ThirdLoginInfo(2, "登陆失败", null));
+            }
+
+            @Override
+            public void onCancel() {
+            }
+        });
+    }
+
+}
 package com.cnlive.share.observable;
  
+import com.cnlive.login.observer.WechatLoginObservable;
+
 import java.util.Observable;
  
 /**
@@ -127,6 +127,7 @@ public class ShareUtils {
         }
         String url = Util.processUrlData(shareInfo.getUrl(), mContext, false);
         WXWebpageObject webpage = new WXWebpageObject();
+        //TODO 上传maven考虑正式版测试版
         IWXAPI api = WXAPIFactory.createWXAPI(mContext, AppConfig.getWechatAppid());
         webpage.webpageUrl = url;
         WXMediaMessage msg = new WXMediaMessage(webpage);
@@ -49,5 +49,6 @@ dependencies {
     implementation "com.cnlive.libs:emoj:$rootProject.libEmoj"
     //图片选择器
     implementation "com.cnlive.libs:mediapicker:$rootProject.libMediaPicker"
+//    implementation project(path: ':cloud:third_tool')
  
 }
@@ -4,12 +4,6 @@ import android.accounts.Account;
 import android.content.Context;
 import android.text.TextUtils;
  
-import com.cnlive.core.libs.base.application.AppConfig;
-import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
-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.cloud.user.R;
 import com.cnlive.cloud.user.UserUtilAction;
 import com.cnlive.cloud.user.auth.UserService;
@@ -21,6 +15,12 @@ import com.cnlive.cloud.user.router.user.UserAction;
 import com.cnlive.cloud.user.ui.fragment.QuickLoginFragment;
 import com.cnlive.cloud.user.util.RegexUtils;
 import com.cnlive.cloud.user.util.TimeEvent;
+import com.cnlive.core.libs.base.application.AppConfig;
+import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
+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 java.util.Arrays;
 import java.util.Collections;
@@ -114,7 +114,6 @@ public class QuickLoginPresenter extends BasePresenter&lt;QuickLoginView&gt; {
                 @Override
                 public void onFailure(String errCode, String errMsg, Exception e) {
                     ifViewAttached(view -> view.showToast(errMsg));
-
                 }
             });
         }
@@ -154,14 +153,14 @@ public class QuickLoginPresenter extends BasePresenter&lt;QuickLoginView&gt; {
 //                        MobclickAgent.onProfileSignIn("CNLive", user.getUid());
                     //三方登陆不需要重新设置头像  otherUserInfo不为空表示三方登陆
                     if (otherUserInfo != null) {
-                        ifViewAttached(view -> view.showMainView());
+                        ifViewAttached(view -> view.showMainView(true, true));
                     } else {
-                        ifViewAttached(view -> view.showEditView());
+                        ifViewAttached(view -> view.showEditView(false));
                     }
                 } else {
                     //友盟账号登录统计,暂时只有平台登录，后续对接三方登录
 //                        MobclickAgent.onProfileSignIn("CNLive", user.getUid());
-                    ifViewAttached(view -> view.showMainView());
+                    ifViewAttached(view -> view.showMainView(false, false));
                     //todo 测试首次用户
 //                    ifViewAttached(view -> view.showEditView(false));
                 }
@@ -16,10 +16,6 @@ import android.text.style.ForegroundColorSpan;
 import android.view.View;
  
 import com.alibaba.android.arouter.launcher.ARouter;
-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.cloud.user.R;
 import com.cnlive.cloud.user.frame.data.OtherUserInfo;
 import com.cnlive.cloud.user.model.LoginSuccessInfo;
@@ -28,8 +24,10 @@ 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.fragment.QuickLoginFragment;
-import com.cnlive.cloud.user.util.UserRouterHelper;
-
+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 java.util.regex.Matcher;
 import java.util.regex.Pattern;
  
@@ -180,8 +178,14 @@ public class QuickLoginView extends BaseView {
     }
  
  
-    public void showEditView() {
+    public void showEditView(boolean isHasOtherUserInfo) {
         if (getContext() == null) return;
+        //设置跳转信息
+//        LoginSuccessInfo successInfo = new LoginSuccessInfo();
+//        successInfo.setTagMsg(TextUtils.isEmpty(fragment.tagMsg) ? "" : fragment.tagMsg);
+//        successInfo.setClickAd(fragment.clickAd);
+//        HelperUtil.isNewUser(fragment.getActivity(), successInfo, isHasOtherUserInfo);
+
         Intent intent = new Intent(getContext(), FirstLoginActivity.class);
         intent.putExtra(LoginActivity.TAG_MSG, TextUtils.isEmpty(fragment.tagMsg) ? "" : fragment.tagMsg);
         intent.putExtra(LoginActivity.TAG_CLICK_AD, fragment.clickAd);
@@ -189,7 +193,7 @@ public class QuickLoginView extends BaseView {
         getContext().finish();
     }
  
-    public void showMainView() {
+    public void showMainView(boolean isNewUser, boolean isHasOtherUserInfo) {
         if (getContext() == null) return;
         //判断如果是因为token为空跳转到的登录页面则不需要跳转到MainActivity，直接关闭登录页面即可
         if (fragment.fromTokenError) {
@@ -201,14 +205,25 @@ public class QuickLoginView extends BaseView {
         successInfo.setType("login");
         successInfo.setUri(fragment.uri);
         successInfo.setClickAd(fragment.clickAd);
-        if (!TextUtils.isEmpty(fragment.tagUrl)) {
-            successInfo.setTagUrl(fragment.tagUrl);
-        }
         successInfo.setTagShare(fragment.tagShare);
-        if (!TextUtils.isEmpty(fragment.tagMsg)) {
-            successInfo.setClassifyTagMsg(fragment.tagMsg);
+        successInfo.setTagMsg(fragment.tagMsg);
+        ARouter.getInstance().build("/strick/MyActivity")
+                .navigation(getContext());
+        if (isNewUser) {
+//            HelperUtil.isNewUser(fragment.getActivity(), successInfo, isHasOtherUserInfo);
+        } else {
+//            HelperUtil.isNotNewUser(fragment.getActivity(), successInfo);
         }
-        UserRouterHelper.showMainView(fragment.getActivity(), successInfo);
+//        EventBus.getDefault().post(new UserEventMsg(UserEventMsg.LOGIN_SUCCESS, successInfo));
+//        Intent intent = new Intent(getContext(), MainTestActivity.class);
+//        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+//        intent.putExtra("type", "login");
+//        intent.putExtra("uri", fragment.uri);
+//        intent.putExtra(LoginActivity.TAG_CLICK_AD, fragment.clickAd);
+//        intent.putExtra("sharetype", fragment.tagShare);
+//        if (!TextUtils.isEmpty(fragment.tagMsg))
+//            intent.putExtra("classifyTagMsg", fragment.tagMsg);
+//        getContext().startActivity(intent);
     }
  
     public void showProgress() {
-package com.cnlive.cloud.user.model;
-
-/**
- * Created by Lynn on 2018/10/15.
- */
-
-public class UserData {
-    private String uid;
-    private String nickName;
-    private String gender;
-    private String location;
-    private String faceUrl;
-    private String mobile;
-    private String email;
-    private String extInfo;
-    private String qqUid;
-    private String wxUid;
-    private String sinaUid;
-    private String renrenUid;
-    private String hUid;
-    private String platformId;
-    private String token;
-    private String callbackAcitvityStatushttpPostUrl;
-    private boolean isNewUser;
-    private String bigFaceUrl;
-    private String countryCode = "86";//手机号国家码
-
-    public String getUid() {
-        return uid;
-    }
-
-    public void setUid(String uid) {
-        this.uid = uid;
-    }
-
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public String getGender() {
-        return gender;
-    }
-
-    public void setGender(String gender) {
-        this.gender = gender;
-    }
-
-    public String getFaceUrl() {
-        return faceUrl;
-    }
-
-    public void setFaceUrl(String faceUrl) {
-        this.faceUrl = faceUrl;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getExtInfo() {
-        return extInfo;
-    }
-
-    public void setExtInfo(String extInfo) {
-        this.extInfo = extInfo;
-    }
-
-    public String getMobile() {
-        return mobile;
-    }
-
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getQqUid() {
-        return qqUid;
-    }
-
-    public void setQqUid(String qqUid) {
-        this.qqUid = qqUid;
-    }
-
-    public String getWxUid() {
-        return wxUid;
-    }
-
-    public void setWxUid(String wxUid) {
-        this.wxUid = wxUid;
-    }
-
-    public String getSinaUid() {
-        return sinaUid;
-    }
-
-    public void setSinaUid(String sinaUid) {
-        this.sinaUid = sinaUid;
-    }
-
-    public String getRenrenUid() {
-        return renrenUid;
-    }
-
-    public void setRenrenUid(String renrenUid) {
-        this.renrenUid = renrenUid;
-    }
-
-    public String gethUid() {
-        return hUid;
-    }
-
-    public void sethUid(String hUid) {
-        this.hUid = hUid;
-    }
-
-    public String getPlatformId() {
-        return platformId;
-    }
-
-    public void setPlatformId(String platformId) {
-        this.platformId = platformId;
-    }
-
-    public boolean isNewUser() {
-        return isNewUser;
-    }
-
-    public void setNewUser(boolean newUser) {
-        isNewUser = newUser;
-    }
-
-    public String getBigFaceUrl() {
-        return bigFaceUrl;
-    }
-
-    public void setBigFaceUrl(String bigFaceUrl) {
-        this.bigFaceUrl = bigFaceUrl;
-    }
-
-    public String getCountryCode() {
-        return countryCode;
-    }
-
-    public void setCountryCode(String countryCode) {
-        this.countryCode = countryCode;
-    }
-
-    public String getCallbackAcitvityStatushttpPostUrl() {
-        return callbackAcitvityStatushttpPostUrl;
-    }
-
-    public void setCallbackAcitvityStatushttpPostUrl(String callbackAcitvityStatushttpPostUrl) {
-        this.callbackAcitvityStatushttpPostUrl = callbackAcitvityStatushttpPostUrl;
-    }
-
-    @Override
-    public String toString() {
-        return "UserData{" +
-                "uid='" + uid + '\'' +
-                ", nickName='" + nickName + '\'' +
-                ", gender='" + gender + '\'' +
-                ", location='" + location + '\'' +
-                ", faceUrl='" + faceUrl + '\'' +
-                ", mobile='" + mobile + '\'' +
-                ", email='" + email + '\'' +
-                ", extInfo='" + extInfo + '\'' +
-                ", qqUid='" + qqUid + '\'' +
-                ", wxUid='" + wxUid + '\'' +
-                ", sinaUid='" + sinaUid + '\'' +
-                ", renrenUid='" + renrenUid + '\'' +
-                ", hUid='" + hUid + '\'' +
-                ", platformId='" + platformId + '\'' +
-                ", token='" + token + '\'' +
-                ", callbackAcitvityStatushttpPostUrl='" + callbackAcitvityStatushttpPostUrl + '\'' +
-                ", isNewUser=" + isNewUser +
-                ", bigFaceUrl='" + bigFaceUrl + '\'' +
-                ", countryCode='" + countryCode + '\'' +
-                '}';
-    }
-}
@@ -13,18 +13,19 @@ import androidx.annotation.NonNull;
 import androidx.databinding.ViewDataBinding;
  
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.cnlive.cloud.user.databinding.ActivityLoginDialogBinding;
 import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.libs.base.util.DoublePressed;
 import com.cnlive.core.libs.base.util.ScreenUtils;
 import com.cnlive.cloud.user.R;
-import com.cnlive.cloud.user.databinding.ActivityLoginDialogBinding;
 import com.cnlive.cloud.user.frame.data.QuickLoginData;
 import com.cnlive.cloud.user.frame.presenter.LoginDialogPresenter;
 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 static com.cnlive.cloud.user.ui.activity.LoginActivity.TAG_CLICK_AD;
  
 /**
@@ -12,13 +12,13 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.RequestOptions;
+import com.cnlive.cloud.user.databinding.ActivityPersonalDataBinding;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.libs.base.ui.widget.BottomMenuDialog;
 import com.cnlive.core.libs.base.util.GlideUtil;
 import com.cnlive.core.libs.base.util.StatusBarConfig;
 import com.cnlive.cloud.user.R;
 import com.cnlive.cloud.user.auth.UserService;
-import com.cnlive.cloud.user.databinding.ActivityPersonalDataBinding;
 import com.cnlive.cloud.user.frame.presenter.PersonalDataPresenter;
 import com.cnlive.cloud.user.frame.view.PersonalDataView;
 import com.qmuiteam.qmui.widget.QMUITopBar;
@@ -8,6 +8,7 @@ import android.view.View;
  
 import androidx.databinding.ViewDataBinding;
  
+import com.cnlive.cloud.user.databinding.ActivityPersonalImageBinding;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.core.libs.base.util.GlideUtil;
@@ -16,7 +17,6 @@ import com.cnlive.media.picker.PickerConfig;
 import com.cnlive.media.picker.entity.Media;
 import com.cnlive.cloud.user.R;
 import com.cnlive.cloud.user.auth.UserService;
-import com.cnlive.cloud.user.databinding.ActivityPersonalImageBinding;
 import com.cnlive.cloud.user.frame.presenter.PersonalImagePresenter;
 import com.cnlive.cloud.user.frame.view.PersonalImageView;
 import com.qmuiteam.qmui.widget.QMUITopBar;
@@ -6,10 +6,10 @@ import android.content.Intent;
  
 import androidx.databinding.ViewDataBinding;
  
+import com.cnlive.cloud.user.databinding.ActivitySelectCountryBinding;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.libs.base.util.StatusBarConfig;
 import com.cnlive.cloud.user.R;
-import com.cnlive.cloud.user.databinding.ActivitySelectCountryBinding;
 import com.cnlive.cloud.user.frame.presenter.SelectCountryPresenter;
 import com.cnlive.cloud.user.frame.view.SelectCountryView;
  
@@ -9,13 +9,13 @@ import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.databinding.ViewDataBinding;
  
+import com.cnlive.cloud.user.databinding.FragmentQuickLoginBinding;
+import com.cnlive.cloud.user.frame.presenter.QuickLoginPresenter;
 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;
 import com.cnlive.cloud.user.R;
-import com.cnlive.cloud.user.databinding.FragmentQuickLoginBinding;
 import com.cnlive.cloud.user.frame.data.QuickLoginData;
-import com.cnlive.cloud.user.frame.presenter.QuickLoginPresenter;
 import com.cnlive.cloud.user.frame.view.QuickLoginView;
 import com.cnlive.cloud.user.router.user.UserAction;
 import com.cnlive.cloud.user.sms.SmsVerifyCatcher;
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <style name="Login.Spinner" parent="Widget.AppCompat.Spinner"></style>
  
 <!--    个人资料-->
@@ -27,4 +27,21 @@
         <item name="android:windowActionBar">true</item>
         <item name="android:windowCloseOnTouchOutside">false</item>
     </style>
+
+    <style name="AppProgressDialog" parent="Theme.AppCompat.Dialog.Alert">
+        <!--文字大小-->
+        <item name="android:textSize">16sp</item>
+        <!-- 这里是修改顶部标题背景颜色，具体颜色自己定，可以是图片 -->
+        <item name="android:topDark">@android:color/white</item>
+        <!--修改底部背景颜色-->
+        <item name="android:bottomDark">@android:color/white</item>
+        <!-- 这里是修改内容区域背景颜色 -->
+        <item name="android:centerDark">@android:color/white</item>
+        <!--//窗口半透明-->
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:textColor">@color/color_232326</item>
+        <!--设置progressbar的颜色-->
+        <item name="android:indeterminateTint" tools:ignore="NewApi">#008577</item>
+        <item name="android:indeterminateTintMode" tools:ignore="NewApi">src_atop</item>
+    </style>
 </resources>
@@ -12,5 +12,5 @@ dependencies {
     //友盟
     implementation "com.umeng.umsdk:analytics:8.0.0"
     implementation "com.umeng.umsdk:common:2.0.0"
-    compile project(path: ':core:network')
+    implementation project(path: ':core:network')
 }
@@ -160,7 +160,7 @@ public interface ApiBaseServiceOpen {
  
  
     /**
-     * 音频播放鉴权接口
+     * 三方登录
      *
      * @param map
      * @return
@@ -91,5 +91,5 @@ dependencies {
     implementation 'q.rorbin:badgeview:1.1.3'
     implementation project(path: ':core:network')
     implementation project(path: ':library_baidumap')
-    implementation project(path: ':cloud:share')
+    implementation project(path: ':cloud:third_tool')
 }
 include ':app:strike'
 //基础库
 include ':core:base',':core:network',':core:imageload' ,':core:app_qr'
-include ':cloud:user',':cloud:pay',':cloud:share',':cloud:video'
+include ':cloud:user',':cloud:pay',':cloud:third_tool',':cloud:video'
 include ':module:xiaojiasoundbox',':module:pedometer',':module:shanghaishop'
 include ':library_baidumap'
 rootProject.name='ModuleStrike'