yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into tmp_mon

Browse Source 
# Conflicts:
#	main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
This commit is contained in:
zlzw
2023-02-14 10:16:06 +08:00
parent af00538101 d36ece4c54
commit 0294296ada
5 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/java/com/yunbao/main/activity/EntryActivity.java
View File

@@ -608,10 +608,11 @@ public class EntryActivity extends AppCompatActivity {
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]);
String uid = obj.getString("id");
String token = obj.getString("token");
if (obj.getString("need_bind").equals("0")) {
if (obj.containsKey("need_bind") && obj.getString("need_bind").equals("0")) {
mFirstLogin = obj.getIntValue("first_login") == 1;
mShowInvite = obj.getIntValue("isagent") == 1;
CommonAppConfig.getInstance().setLoginInfo(uid, token, true);
@@ -687,7 +688,7 @@ public class EntryActivity extends AppCompatActivity {
new LiveRoomCheckLivePresenter(activity, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal));
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal));
}
@Override