111
This commit is contained in:
@@ -72,6 +72,7 @@ import com.yunbao.common.bean.LoginData;
|
||||
import com.yunbao.common.bean.UserBean;
|
||||
import com.yunbao.common.http.CommonHttpUtil;
|
||||
import com.yunbao.common.http.HttpCallback;
|
||||
import com.yunbao.common.http.HttpClient;
|
||||
import com.yunbao.common.interfaces.CommonCallback;
|
||||
import com.yunbao.common.manager.IMLoginManager;
|
||||
import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
|
||||
@@ -235,7 +236,7 @@ public class EntryActivity extends AppCompatActivity {
|
||||
CommonHttpUtil.setAdvertisingChannels("tyqsyf", new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info) {
|
||||
if(code == 0) {
|
||||
if (code == 0) {
|
||||
mFirebaseAnalytics.logEvent("FS_registration", null);
|
||||
logger.logEvent("FB_registration");
|
||||
}
|
||||
@@ -271,7 +272,7 @@ public class EntryActivity extends AppCompatActivity {
|
||||
CommonHttpUtil.setAdvertisingChannels("umk7ri", new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info) {
|
||||
if(code == 0) {
|
||||
if (code == 0) {
|
||||
mFirebaseAnalytics.logEvent("FS_click_fb", null);
|
||||
logger.logEvent("FB_click_fb");
|
||||
}
|
||||
@@ -310,7 +311,7 @@ public class EntryActivity extends AppCompatActivity {
|
||||
CommonHttpUtil.setAdvertisingChannels("iqd6b7", new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info) {
|
||||
if(code == 0) {
|
||||
if (code == 0) {
|
||||
mFirebaseAnalytics.logEvent("FS_click_google", null);
|
||||
logger.logEvent("FB_click_google");
|
||||
}
|
||||
@@ -329,7 +330,7 @@ public class EntryActivity extends AppCompatActivity {
|
||||
CommonHttpUtil.setAdvertisingChannels("le2qca", new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info) {
|
||||
if(code == 0) {
|
||||
if (code == 0) {
|
||||
mFirebaseAnalytics.logEvent("FS_click_twitter", null);
|
||||
logger.logEvent("FB_click_twitter");
|
||||
}
|
||||
@@ -378,7 +379,7 @@ public class EntryActivity extends AppCompatActivity {
|
||||
CommonHttpUtil.setAdvertisingChannels("gev462", new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info) {
|
||||
if(code == 0) {
|
||||
if (code == 0) {
|
||||
mFirebaseAnalytics.logEvent("FS_click_line", null);
|
||||
logger.logEvent("FB_click_line");
|
||||
}
|
||||
@@ -591,24 +592,24 @@ public class EntryActivity extends AppCompatActivity {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info) {
|
||||
onLoginSuccess(code, msg, info);
|
||||
if(code == 0){
|
||||
if (code == 0) {
|
||||
//完成第三方登录
|
||||
if(mLoginType.equals("twitter")){
|
||||
if (mLoginType.equals("twitter")) {
|
||||
AdjustEvent adjustEvent1 = new AdjustEvent("winf6e");
|
||||
Adjust.trackEvent(adjustEvent1);
|
||||
mFirebaseAnalytics.logEvent("FS_log_twitter", null);
|
||||
logger.logEvent("FB_log_twitter");
|
||||
}else if(mLoginType.equals("facebook")){
|
||||
} else if (mLoginType.equals("facebook")) {
|
||||
AdjustEvent adjustEvent1 = new AdjustEvent("oywoff");
|
||||
Adjust.trackEvent(adjustEvent1);
|
||||
mFirebaseAnalytics.logEvent("FS_log_fb", null);
|
||||
logger.logEvent("FB_log_fb");
|
||||
}else if(mLoginType.equals("google")){
|
||||
} else if (mLoginType.equals("google")) {
|
||||
AdjustEvent adjustEvent1 = new AdjustEvent("1cm8gl");
|
||||
Adjust.trackEvent(adjustEvent1);
|
||||
mFirebaseAnalytics.logEvent("FS_log_google", null);
|
||||
logger.logEvent("FB_log_google");
|
||||
}else if(mLoginType.equals("line")){
|
||||
} else if (mLoginType.equals("line")) {
|
||||
AdjustEvent adjustEvent1 = new AdjustEvent("71p74r");
|
||||
Adjust.trackEvent(adjustEvent1);
|
||||
mFirebaseAnalytics.logEvent("FS_log_line", null);
|
||||
@@ -618,7 +619,7 @@ public class EntryActivity extends AppCompatActivity {
|
||||
CommonHttpUtil.setAdvertisingChannels("1com4k", new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info) {
|
||||
if(code == 0) {
|
||||
if (code == 0) {
|
||||
mFirebaseAnalytics.logEvent("FS_createdRole", null);
|
||||
logger.logEvent("FB_createdRole");
|
||||
}
|
||||
@@ -633,7 +634,7 @@ public class EntryActivity extends AppCompatActivity {
|
||||
|
||||
|
||||
//登录成功!
|
||||
private void onLoginSuccess(int code, String msg, String[] info) {
|
||||
private void onLoginSuccess(int code, String msg, String[] info) {
|
||||
Log.e("他", code + "code" + info.toString());
|
||||
if (code == 0 && info.length > 0) {
|
||||
JSONObject obj = JSON.parseObject(info[0]);
|
||||
@@ -672,53 +673,53 @@ public class EntryActivity extends AppCompatActivity {
|
||||
Adjust.trackEvent(adjustEvent);
|
||||
|
||||
//完成第三方登录
|
||||
if(mLoginType.equals("twitter")){
|
||||
if (mLoginType.equals("twitter")) {
|
||||
AdjustEvent adjustEvent1 = new AdjustEvent("ea6lld");
|
||||
Adjust.trackEvent(adjustEvent1);
|
||||
CommonHttpUtil.setAdvertisingChannels("ea6lld", new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info) {
|
||||
if(code == 0) {
|
||||
if (code == 0) {
|
||||
mFirebaseAnalytics.logEvent("FS_reg_twitter", null);
|
||||
logger.logEvent("FB_reg_twitter");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
}else if(mLoginType.equals("facebook")){
|
||||
} else if (mLoginType.equals("facebook")) {
|
||||
AdjustEvent adjustEvent1 = new AdjustEvent("5jbk95");
|
||||
Adjust.trackEvent(adjustEvent1);
|
||||
CommonHttpUtil.setAdvertisingChannels("5jbk95", new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info) {
|
||||
if(code == 0) {
|
||||
if (code == 0) {
|
||||
mFirebaseAnalytics.logEvent("FS_reg_fb", null);
|
||||
logger.logEvent("FB_reg_fb");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
}else if(mLoginType.equals("google")){
|
||||
} else if (mLoginType.equals("google")) {
|
||||
AdjustEvent adjustEvent1 = new AdjustEvent("krap47");
|
||||
Adjust.trackEvent(adjustEvent1);
|
||||
CommonHttpUtil.setAdvertisingChannels("krap47", new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info) {
|
||||
if(code == 0) {
|
||||
if (code == 0) {
|
||||
mFirebaseAnalytics.logEvent("FS_reg_google", null);
|
||||
logger.logEvent("FB_reg_google");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
}else if(mLoginType.equals("line")){
|
||||
} else if (mLoginType.equals("line")) {
|
||||
AdjustEvent adjustEvent1 = new AdjustEvent("uaacbn");
|
||||
Adjust.trackEvent(adjustEvent1);
|
||||
|
||||
CommonHttpUtil.setAdvertisingChannels("uaacbn", new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info) {
|
||||
if(code == 0) {
|
||||
if (code == 0) {
|
||||
mFirebaseAnalytics.logEvent("FS_reg_line", null);
|
||||
logger.logEvent("FB_reg_line");
|
||||
}
|
||||
@@ -727,9 +728,23 @@ public class EntryActivity extends AppCompatActivity {
|
||||
}
|
||||
if (CommonAppConfig.IS_GOOGLE_PLAY == true) {
|
||||
EntryActivity.this.startActivity(new Intent(EntryActivity.this, OneLoginActivity.class));
|
||||
}else{
|
||||
gotoLive("97714");
|
||||
MainActivity.forward(EntryActivity.this, false);
|
||||
} else {
|
||||
HttpClient.getInstance().post("Home.getRandJoinAnchor", "Home.getRandJoinAnchor")
|
||||
.params("uid", CommonAppConfig.getInstance().getUid())
|
||||
.params("token", CommonAppConfig.getInstance().getToken())
|
||||
.execute(new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info) {
|
||||
if (info[0] != null) {
|
||||
JSONObject obj = JSON.parseObject(info[0]);
|
||||
MainActivity.forward(EntryActivity.this, false);
|
||||
gotoLive(obj.getString("anchor_id"));
|
||||
IMLoginManager.get(EntryActivity.this).setisNewUserOne(true);
|
||||
} else {
|
||||
MainActivity.forward(EntryActivity.this, false);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
} else {
|
||||
MainActivity.forward(EntryActivity.this, false);
|
||||
|
||||
@@ -38,11 +38,16 @@ import com.yunbao.common.bean.UserBean;
|
||||
import com.yunbao.common.http.CommonHttpConsts;
|
||||
import com.yunbao.common.http.CommonHttpUtil;
|
||||
import com.yunbao.common.http.HttpCallback;
|
||||
import com.yunbao.common.http.HttpClient;
|
||||
import com.yunbao.common.interfaces.CommonCallback;
|
||||
import com.yunbao.common.manager.IMLoginManager;
|
||||
import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
|
||||
import com.yunbao.common.utils.ToastUtil;
|
||||
import com.yunbao.common.utils.WordUtil;
|
||||
import com.yunbao.live.activity.LiveAudienceActivity;
|
||||
import com.yunbao.live.bean.LiveBean;
|
||||
import com.yunbao.live.http.LiveHttpUtil;
|
||||
import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
|
||||
import com.yunbao.main.R;
|
||||
import com.yunbao.main.event.RegSuccessEvent;
|
||||
import com.yunbao.main.http.MainHttpConsts;
|
||||
@@ -70,7 +75,7 @@ public class LoginActivity extends AbsActivity {
|
||||
private View mBtnLogin;
|
||||
private RecyclerView mRecyclerView;
|
||||
// private MobLoginUtil mLoginUtil;
|
||||
private static boolean mFirstLogin;//是否是第一次登录
|
||||
private boolean mFirstLogin;//是否是第一次登录
|
||||
private static boolean mShowInvite;//显示邀请码弹窗
|
||||
private static String mLoginType = Constants.MOB_PHONE;//登录方式
|
||||
private String mPromoCode = "";//推广码
|
||||
@@ -217,21 +222,53 @@ public class LoginActivity extends AbsActivity {
|
||||
});
|
||||
hideKeyboard(mEditPwd);
|
||||
}
|
||||
|
||||
/**
|
||||
* 强隐键盘
|
||||
*
|
||||
* @param view
|
||||
*/
|
||||
private void hideKeyboard(View view) {
|
||||
InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
|
||||
imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
|
||||
}
|
||||
|
||||
//登录即代表同意服务和隐私条款
|
||||
private void forwardTip() {
|
||||
WebViewActivity.forward(mContext, HtmlConfig.LOGIN_PRIVCAY);
|
||||
}
|
||||
|
||||
private LiveRoomCheckLivePresenter mCheckLivePresenter;
|
||||
|
||||
private void gotoLive(final String live_id) {
|
||||
LiveHttpUtil.getLiveInfo(live_id, new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info) {
|
||||
if (code == 0 && info.length > 0) {
|
||||
LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
|
||||
|
||||
if (mCheckLivePresenter == null) {
|
||||
mCheckLivePresenter = new LiveRoomCheckLivePresenter(LoginActivity.this, new LiveRoomCheckLivePresenter.ActionListener() {
|
||||
@Override
|
||||
public void onLiveRoomChanged(LiveBean liveBean, int liveType, int liveTypeVal, int liveSdk) {
|
||||
if (liveBean == null) {
|
||||
return;
|
||||
}
|
||||
LiveAudienceActivity.forward(LoginActivity.this, liveBean, liveType, liveTypeVal, "", 0, liveSdk);
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
mCheckLivePresenter.checkLive(liveBean);
|
||||
} else {
|
||||
MainActivity.forward(LoginActivity.this, false);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//登录成功!
|
||||
private static void onLoginSuccess(int code, String msg, String[] info) {
|
||||
private void onLoginSuccess(int code, String msg, String[] info) {
|
||||
if (code == 0 && info.length > 0) {
|
||||
JSONObject obj = JSON.parseObject(info[0]);
|
||||
String uid = obj.getString("id");
|
||||
@@ -258,7 +295,7 @@ public class LoginActivity extends AbsActivity {
|
||||
/**
|
||||
* 获取用户信息
|
||||
*/
|
||||
private static void getBaseUserInfo() {
|
||||
private void getBaseUserInfo() {
|
||||
MainHttpUtil.getBaseInfo(new CommonCallback<UserBean>() {
|
||||
@Override
|
||||
public void callback(UserBean bean) {
|
||||
@@ -267,9 +304,28 @@ public class LoginActivity extends AbsActivity {
|
||||
mFirebaseAnalytics.logEvent("FS_login", null);
|
||||
logger.logEvent("FB_login");
|
||||
Adjust.trackEvent(adjustEvent1);
|
||||
MainActivity.forward(Contexts, mShowInvite);
|
||||
EntryActivity.activity.finish();
|
||||
activity.finish();
|
||||
ToastUtil.show(mFirstLogin+"");
|
||||
HttpClient.getInstance().post("Home.getRandJoinAnchor", "Home.getRandJoinAnchor")
|
||||
.params("uid", CommonAppConfig.getInstance().getUid())
|
||||
.params("token", CommonAppConfig.getInstance().getToken())
|
||||
.execute(new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info) {
|
||||
if (info[0] != null && mFirstLogin == true) {
|
||||
JSONObject obj = JSON.parseObject(info[0]);
|
||||
MainActivity.forward(LoginActivity.this, false);
|
||||
gotoLive(obj.getString("anchor_id"));
|
||||
IMLoginManager.get(mContext).setisNewUserOne(true);
|
||||
EntryActivity.activity.finish();
|
||||
activity.finish();
|
||||
} else {
|
||||
MainActivity.forward(LoginActivity.this, false);
|
||||
EntryActivity.activity.finish();
|
||||
activity.finish();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -39,12 +39,17 @@ import com.yunbao.common.bean.IMLoginModel;
|
||||
import com.yunbao.common.bean.UserBean;
|
||||
import com.yunbao.common.http.CommonHttpUtil;
|
||||
import com.yunbao.common.http.HttpCallback;
|
||||
import com.yunbao.common.http.HttpClient;
|
||||
import com.yunbao.common.interfaces.CommonCallback;
|
||||
import com.yunbao.common.manager.IMLoginManager;
|
||||
import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
|
||||
import com.yunbao.common.utils.DialogUitl;
|
||||
import com.yunbao.common.utils.ToastUtil;
|
||||
import com.yunbao.common.utils.WordUtil;
|
||||
import com.yunbao.live.activity.LiveAudienceActivity;
|
||||
import com.yunbao.live.bean.LiveBean;
|
||||
import com.yunbao.live.http.LiveHttpUtil;
|
||||
import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
|
||||
import com.yunbao.main.R;
|
||||
import com.yunbao.main.event.RegSuccessEvent;
|
||||
import com.yunbao.main.http.MainHttpConsts;
|
||||
@@ -490,6 +495,7 @@ public class RegisterActivity extends AbsActivity {
|
||||
IMLoginManager.get(activity).setupLoginUser(model);
|
||||
//融云连接服务器
|
||||
RongcloudIMManager.connectIM(activity);
|
||||
|
||||
} else {
|
||||
ToastUtil.show(msg);
|
||||
}
|
||||
@@ -516,9 +522,22 @@ public class RegisterActivity extends AbsActivity {
|
||||
}
|
||||
if (bean != null) {
|
||||
if (mFirstLogin) {
|
||||
RecommendActivity.forward(mContext, mShowInvite);
|
||||
} else {
|
||||
MainActivity.forward(mContext, mShowInvite);
|
||||
HttpClient.getInstance().post("Home.getRandJoinAnchor", "Home.getRandJoinAnchor")
|
||||
.params("uid", CommonAppConfig.getInstance().getUid())
|
||||
.params("token", CommonAppConfig.getInstance().getToken())
|
||||
.execute(new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info) {
|
||||
if (info[0] != null) {
|
||||
JSONObject obj = JSON.parseObject(info[0]);
|
||||
MainActivity.forward(RegisterActivity.this, false);
|
||||
gotoLive(obj.getString("anchor_id"));
|
||||
IMLoginManager.get(RegisterActivity.this).setisNewUserOne(true);
|
||||
} else {
|
||||
MainActivity.forward(RegisterActivity.this, false);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
EventBus.getDefault().post(new RegSuccessEvent());
|
||||
}
|
||||
@@ -526,6 +545,35 @@ public class RegisterActivity extends AbsActivity {
|
||||
});
|
||||
}
|
||||
|
||||
private LiveRoomCheckLivePresenter mCheckLivePresenter;
|
||||
|
||||
private void gotoLive(final String live_id) {
|
||||
LiveHttpUtil.getLiveInfo(live_id, new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info) {
|
||||
if (code == 0 && info.length > 0) {
|
||||
LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
|
||||
|
||||
if (mCheckLivePresenter == null) {
|
||||
mCheckLivePresenter = new LiveRoomCheckLivePresenter(RegisterActivity.this, new LiveRoomCheckLivePresenter.ActionListener() {
|
||||
@Override
|
||||
public void onLiveRoomChanged(LiveBean liveBean, int liveType, int liveTypeVal, int liveSdk) {
|
||||
if (liveBean == null) {
|
||||
return;
|
||||
}
|
||||
LiveAudienceActivity.forward(RegisterActivity.this, liveBean, liveType, liveTypeVal, "", 0, liveSdk);
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
mCheckLivePresenter.checkLive(liveBean);
|
||||
} else {
|
||||
MainActivity.forward(RegisterActivity.this, false);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||
public void onRegSuccessEvent(RegSuccessEvent e) {
|
||||
finish();
|
||||
|
||||
Reference in New Issue
Block a user