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

111

Browse Source
This commit is contained in:
18142669586
2022-07-27 20:44:55 +08:00
parent 8b9d10ca92
commit 1fc6a3adfe
20 changed files with 124 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -529,12 +529,10 @@ public class EntryActivity extends AppCompatActivity {
private void updateUI() {
boolean enableButtons = AccessToken.getCurrentAccessToken() != null;
ToastUtil.show(enableButtons + "");
Profile profile = Profile.getCurrentProfile();
if (enableButtons && profile != null) {
ToastUtil.show(profile.getId() + "");
LoginData data = new LoginData();
// data.setAvatar(profile.getProfilePictureUri(150, 150).toString());
data.setAvatar(profile.getProfilePictureUri(150, 150).toString());
data.setNickName(profile.getName());
data.setOpenID(AccessToken.getCurrentAccessToken().getUserId());
data.setType("facebook");
@@ -734,9 +732,10 @@ public class EntryActivity extends AppCompatActivity {
public void onSuccess(int code, String msg, String[] info) {
if (info[0] != null) {
JSONObject obj = JSON.parseObject(info[0]);
IMLoginManager.get(EntryActivity.this).setNewUserGif(true);
IMLoginManager.get(EntryActivity.this).setisNewUserOne(true);
MainActivity.forward(EntryActivity.this, false);
gotoLive(obj.getString("anchor_id"));
IMLoginManager.get(EntryActivity.this).setisNewUserOne(true);
if (obj.containsKey("home_zdy_pop")) {
NoviceInstructorManager.get(activity).setHomeZdyPop(obj.getString("home_zdy_pop"));
}

10
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@@ -999,11 +999,11 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
@Subscribe(threadMode = ThreadMode.MAIN)
public void onUpdateFieldEvent(UpdateTablePointMe updateTablePointMe) {
numberMe = updateTablePointMe.getPoint();
if (updateTablePointMe.getPoint() == 0) {
v_table_redpoint_me.setVisibility(View.VISIBLE);
} else {
v_table_redpoint_me.setVisibility(View.GONE);
}
// if (updateTablePointMe.getPoint() == 0) {
// v_table_redpoint_me.setVisibility(View.VISIBLE);
// } else {
// v_table_redpoint_me.setVisibility(View.GONE);
// }
}
/**

27
main/src/main/java/com/yunbao/main/activity/RegisterActivity.java
View File

@@ -38,9 +38,11 @@ import com.yunbao.common.HtmlConfig;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.activity.WebViewActivity;
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.NoviceInstructorManager;
import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
@@ -470,16 +472,11 @@ public class RegisterActivity extends AbsActivity {
IMLoginManager.get(activity).setupLoginUser(model);
//融云连接服务器
RongcloudIMManager.connectIM(activity);
if (mFirstLogin) {
if (mDialog != null) {
mDialog.dismiss();
}
getBaseUserInfo();
//绑定广告渠道用户
AdjustEvent adjustEvent = new AdjustEvent("s1or0t");
adjustEvent.addCallbackParameter("userid", CommonAppConfig.getInstance().getUid());
Adjust.trackEvent(adjustEvent);
netHandler.post(getRandJoinAnchor);
}
} else {
@@ -496,6 +493,23 @@ public class RegisterActivity extends AbsActivity {
});
}
/**
* 获取用户信息
*/
private void getBaseUserInfo() {
MainHttpUtil.getBaseInfo(new CommonCallback<UserBean>() {
@Override
public void callback(UserBean bean) {
if (mDialog != null) {
mDialog.dismiss();
}
if (bean != null) {
netHandler.post(getRandJoinAnchor);
// EventBus.getDefault().post(new RegSuccessEvent());
}
}
});
}
/**
* 用户自动签到
*/
@@ -512,6 +526,7 @@ public class RegisterActivity extends AbsActivity {
if (info[0] != null) {
JSONObject obj = JSON.parseObject(info[0]);
IMLoginManager.get(activity).setisNewUserOne(true);
IMLoginManager.get(activity).setNewUserGif(true);
gotoLive(obj.getString("anchor_id"));
if (obj.containsKey("home_zdy_pop")) {
NoviceInstructorManager.get(mContext).setHomeZdyPop(obj.getString("home_zdy_pop"));

4
main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java
View File

@@ -30,6 +30,7 @@ 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.activity.EntryActivity;
import com.yunbao.main.activity.MainActivity;
import static com.yunbao.common.CommonAppContext.logger;
@@ -122,8 +123,9 @@ public class OneLoginDialog extends AbsDialogFragment {
if (info[0] != null) {
JSONObject obj = JSON.parseObject(info[0]);
MainActivity.forward(getContext(), false);
gotoLive(obj.getString("anchor_id"));
IMLoginManager.get(mContext).setNewUserGif(true);
IMLoginManager.get(mContext).setisNewUserOne(true);
gotoLive(obj.getString("anchor_id"));
if (obj.containsKey("home_zdy_pop")) {
NoviceInstructorManager.get(mContext).setHomeZdyPop(obj.getString("home_zdy_pop"));
}

3
main/src/main/res/layout/activity_one_login.xml
View File

@@ -72,8 +72,7 @@
android:gravity="left|center"
android:hint="@string/edit_profile_name_empty"
android:background="@null"
android:maxLines="10"
android:maxLength="20"
android:maxLength="10"
android:singleLine="true"
android:textColor="#161616"
android:textColorHint="#B6B6B6"