#|VkeSO?q&wHBroB_ZAQ*<2-=um3Lvr;U40?Yl1vJHIWqLm_2w|G5wlhX)c-
z)dU{LQ6f?$|r{py&vj@zjMG?6&wvu-D;$pas@!Pd-#NA$FYSA7}*SC`u$$Dep1
z2Z+axqT1zIrz~l*e`dL>e+Oi?8N=pVfLeyS;rXrz)yHm}jRZPOp9y-CKXwn&h6SG6
z$aZGii?R!TX;6_{3pH~T=ozZtb)CW$P4vBl#DI|emL$Gj;
zzLV|=*2b59Poa~!FWItJebtWRiJLLi*mRWJ!nbVif}=MbH{Y^OpB*BN}u4lVBFI&fKzbMfN3)AUc$7ge2AK-L|38i)8%1
z=`+n$&Kt0}hIr7W($!?Udk*vjza~uj}U#U3}^Y&ws_bVmjve
zIBv>Qr`~22<%bFZ>GC7pLkU8jnMt-)_|6Ue9)g#VTC^?}|0Yo4AqkY^)fD%)HeCmP
zVsi=%tGCZ@X)jxDa1hS^(M*JwUXYH{%~G>exzWLAv#**CtZLxLC*2Y^(7joZ6Pc0L
zw>$?ExFHvo#PxX)5f;nu`k}l?CY2}E3>*e~rg-+K*XTkeEvyzmeDpG;Z7Ow5ogZhUtaHVE~^jXpNn8Ex!G!~vBMZdI@R7xY+4c*n*2Num|
zG(WMAH$uhaLZYlB3w+SPJIoigsD9Vaw7$9&uzBnbqH-aB&D=Ls^^Kv^-ZStA1wlFN
K;Zo-udh!2?F#4+i
literal 5343
zcmY*ddpy(o|Nrd6Frt!NBW27zA-1UINGwcEk`ybq3Sn+ZvDGO@<M?DKxVUa$A_^?bfwulFbR2;N#!Tu~eV07;z9
zK>`4PDDLkZF%j<5ZZiHF0LbLx4q6<$x~=2<@F6W{F(GtTO*(N
zJ45Z*k4E{s1s_fTle3z{P5F!`v2uwFB3wJRb3j$I
z@t8$W2fdYk(m_@W*CIgSB&qz$%+p4)f17$K6M*P;~|i^xvZwv
zM3f;q2ZRZQfhmAlQp1RJi?0OB%TPOu42o+W5q1-PAoMo5mj-o^QRHT_HF>+x;<6+(
z11(Kowy=sW(D?g=)D%J&9;R37oOBS$j7jBg|vGl=IoJyG!~e
z^QRa6caP_WI_2QPX_o29;Be*qUp}B5u@wg#;iBkUz#;jdH=${s8e}(N_d*|1BKN|U
zfd+&wy~XTfmdp_>3_gG?+q@9Ka$_w+`=D%^h{1U#^9ytoN^kq~jd^)m)$$~nCqYy(P
zR}^YW&F65SQA%%(1}Zkv1$T&=$o|`&@%^&a8jzjd6u&d=YMDswh+>f@eVjrw8(C$u
z3M|x>f9|b9`mg$Y?A!V)P;cp$fux`Ciz4;ME)?8}>p`od%)kbr6`a;B6O$H^$7^1(
zabQ74xp)gcv)T7f_GC%(4op9zM;%i$RUed_GdVb^v}Q}@o^*@d;jsBDTNh+GA+*!?
zAJA*X(eO)GwX{Y&Z9N>h?qrT+eFC*;naHuTtQdPqMl2I|wpER8Ngi#DFtwjG(&w(=
zE^9ifI=;w0+Mzdg)FE5;wTT`EXC45L2j)UuIq0a7IG10Rh<3u|KNc>s_OjCL2i|n&
zusxMnme3%jxQX4Qn9HNZs6Ho{H3@k^M)vY{Tc|WRR7jywOi%t@g>aYf_~lCGTpCto
z^2){2XRS_Y@(x^|N%J
z9wzQ>>XiH2)SR2Kd=`rvJF8Y5DVG{+KU!j`5K1Zs(Mo;H8>O#*Xeg%fY*?upX(Yfh
zwa30%gGP_p$e3BL+nhA$gPKBG#u}eAv#?H}5;?dnWmG0mX=2YUHZqp^{?WkXTTA7*
zIGr_mWI<)ZgpFeXr2Q=E@Wm65m
z_v@R#in{s9V{lDw;+h-+rO1+LGMZG^!5D2VJ)g=S4T0E
zkN7cd4#0U&n22KCEIf>7=p~S%d|7|^@lN@RXsnSowFh~klJ#7i@+30BmDQ{l3lY5d
zW#oM+N)%hNjNjz4qA`YP5oHaczyje(o*2pC=dCv9m+_KGa!X$F#+V5I{zH|OBftus
z@7yj4x=+BfMSsL!NMs`??evA`CaZ%F2hGIW}&rfso_2-{le2WC{f{(i5vO7Y|jAJ
z1=T#MNM8NmvSbFq?)k^gZ^(2+$?U*abxeP*pVGUA!KSMMXf=T$7lzz{?zls{n9LoI
z-v2dhJQcZad}oR&YTJ;PX}()N+t$iq5fO&aUr#BgOF=Qh@YS6RPNbpLp*&lJvXMM+*>v6LMM_7O;pENbc>&0r%P^M$
z6NAHZOYCVhQy>#A8`hr{uC81Y2_6NU2lR*eYrPG0JIxzxQodBhf
zM)!P+tU$S~dm08!)iF=S(D`3%rrZVL0vGK`)C+#gEe{1~7-L!QkSJ4^(HvOypPTr)
zPzAa6RwT-{~_P5ToIMT9-X1ph)tIQ*)m=sN5>z)3s2A_=v@lJ78A*v%O8
zEuGg~$e_Kn0p@(yuz@Up2XW#_yu{fb8iJzjD4Z+%@>z0?R&^tq9}4k;&J(M?m7V`t
za;waxzW%>U9$%>w{kdqh*0#CzD_6`;d1XF`=;gT6P>S#ATov>hhsOi){(G)pcjhUB
zyYN&78(E=|w(nnZPRK4Cq|$zn3n$`VuJSrK*Y2-0v{80}x7CjdRCPh-#Ku}vCX>KA
zOmz8g;yGd*3KC^Yo@pIbc3Cep&xF5-;2lWi@IVbt`?H--+y$Tk3yOi$
z6@rehX>freXZvPJ$Bfw$N$w_FWpm>ZSc9=5SiiBF@TBQnyKG>vZCyY;svJ)j@9AMY
zPZ7m8iBkkY?pyE~TuJ1W?#At4$av2DD@VORXYsN}-Jh7u-B9fRcVpybF=b1o)sZLJ
z{~ml38oWg8PNS_Xwm}c}2z#dT>Cov$i6L8>HI7u4FmcfGfbVDvA3&}icLAv#DfB6c
zl|5x;H=*^Y22k9A*irS-WL}BA4?avpU&O6@zmjzkpPqZfhBng0i!$^u{oBxR^blcg
z&ydRVV{19cIt^;MMDGhkl%3&L%jlm{EL~z-*dqEQA6fY)&@;lr)y&*^vu=xMTZ#_F
zOHHct3m-%7?!vbBjlLgj@zXO#%q(R2K0i7!D@VBCLT+|CFU(J@U(^ndZk^-41V
zlVTtV=q{A-jN6;*Z7EwnbApoi02rL53{q%56Tyr$TJ1b!_@?~a%NGL~e3{xYpcyX&
z)4xvR7da?0-v6fHv9!&Ls%{F3+b#?XNgJL-7bxz4GtdhZ1W)Vqo=OOv
z{;&j)N-xQrIgFYD`?3_2I;;IOLfXo_%#Ai!X!M4apEOj
ze|oeR4zfL)3CmFpi;CaJ*K5HBFdXIsCUoR=`;(|)$HDC|*^b`)1AMW;;JJt*QGMXz
zmqU+I*`DcydC#9073cN|wqrNfROoJuc&2pMjY_Mm4tF{8Ji;_?Sy0l?)j=XGG)r{&
z@b~-loZ*l_bJj!hu=etPURDOQ5*vS%fX8PISE8s}j)kxbe>pl-FH4uau*l%}@R-
zoiY)0UFtB#35ANN4VK~fjBR)jp*APUKfl2f5MwlM1XcYoZ~v6PVQ(-stX$K?(bOgS
zpZ^S%@V?t*-J746AMeEA#s`xt!i!V}=ZiVlc}DJ3VIM;urs#Ph%2rNH+&_JFp0<&a
zibc2bcul@e
z4kq7-8#l%ZRCSQ37APC2!)dcnyuaH2m`1}7eg*e~elAW~3_%@=lRhDO3Rv-YbCf&X
zGYkH*P7(s`k36pTW$j(L0x8$=jyC4g_r(tc
zQ7=^Q!#f?OT{deZI;oR5tDca&S7SsW`OkbBZJW#`fU|?;l&zTaL(rGp!2`njLSN+B
zststET6wP`(np;W19e4-z8@E)OPaC=N+qXLrrHa}9-Cp9
zSrt-aZy+Y5bXwE3Z64y?KL_*@n@vV^CT+iLA6ufP^`$4$L;e}a)lGVx;xYNKa(R1f
z_F8cA8CY+dax1iid#1wa>WcZE95(W(#)ImV^7-Wy$M|%X=LR0j?CxXno9pvroR&Z2
z%hk2t=&xkw(6Xk)wh>z2JwFlFwTeNniI(yVUj8w3YoG+@5>1+h-+9Ee^VE+#+13JR
z(mXwnSJ0<)Fj(z1d8~q#i5W
z)uhufAHs)*j{3FHgj@a7v=+4j9SdBkdo(xLoe$#pv!9KU<`SsP$AyfO+aBp?Mw$3@pHYS-Ru(0N{(z1I6YX
z&!t`Sh-ap?(&)!U_AUf($EJO-^ql3<6Km&wyxGR8_Z8I~=BdZ5f*c;7f3|vDV^(fn
zhuoX$tg`57Tkh*P@v~lm@{1A>5p=Po>Om19Gnr$_Rq9(p?JtnJp5oGl`ft&P_qk+J
z^_UGNN5eZ`tc6l(!Ls&}2viyNRK_vDfO|a@hsz|x?yIhD(#b-^iQSzkW61||<5Xx%
z!(pd>nXf^xkJ?MehmIvT8;2*|DBc)9NEC^!{@idU9H16)zpLrF(kk|05^j`xtH<8v
zYlr)3O`5t#&9{v)vd8Nw=^vt{n+WSk93JxjYxdfQjt+~ 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);
diff --git a/main/src/main/java/com/yunbao/main/activity/LoginActivity.java b/main/src/main/java/com/yunbao/main/activity/LoginActivity.java
index 0abb94bba..6cd959c82 100644
--- a/main/src/main/java/com/yunbao/main/activity/LoginActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/LoginActivity.java
@@ -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() {
@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();
+ }
+ }
+ });
+
}
});
}
diff --git a/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java b/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java
index 6c8d78e28..bc221dc1c 100644
--- a/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java
@@ -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();