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

Merge remote-tracking branch 'origin/dev_改版主分支-升级融云SDK&AGP8' into dev_改版主分支-升级融云SDK&AGP8

Browse Source
This commit is contained in:
zlzw
2024-03-28 16:29:19 +08:00
parent df996435ec f31c20f49a
commit 4725e67c75
7 changed files with 69 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -519,12 +519,9 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
//选中监听
mTabButtonGroup.addTabButtonGroupChangeListener((view, index) -> {
if (index == 0) {
floatBanner.setVisibility(View.GONE);
floatRedPacket.setVisibility(View.GONE);
floatWarOrder.setVisibility(View.GONE);
findViewById(R.id.banner_click).setVisibility(View.GONE);
isfloatBannernet = false;
if (index == 1) {
isfloatBannernet = true;
initAnchorRecommendBanner();
} else if (index == 2) {
floatBanner.setVisibility(View.GONE);
floatRedPacket.setVisibility(View.GONE);
@@ -533,8 +530,11 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
isfloatBannernet = false;
if (mainMessageViewHolder != null) mainMessageViewHolder.onResume();
} else {
isfloatBannernet = true;
initAnchorRecommendBanner();
floatBanner.setVisibility(View.GONE);
floatRedPacket.setVisibility(View.GONE);
floatWarOrder.setVisibility(View.GONE);
findViewById(R.id.banner_click).setVisibility(View.GONE);
isfloatBannernet = false;
}
});
//获取指导员账号
@@ -545,20 +545,19 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
}
private void showFirstLogin() {
LiveNetManager.get(mContext)
.isFirstLogin(new com.yunbao.common.http.base.HttpCallback<FirstLoginBean>() {
@Override
public void onSuccess(FirstLoginBean data) {
if (data.getStatus() == 0) {
mContext.startActivity(new Intent(mContext, CompleteUserInfoActivity.class));
}
}
LiveNetManager.get(mContext).isFirstLogin(new com.yunbao.common.http.base.HttpCallback<FirstLoginBean>() {
@Override
public void onSuccess(FirstLoginBean data) {
if (data.getStatus() == 0) {
mContext.startActivity(new Intent(mContext, CompleteUserInfoActivity.class));
}
}
@Override
public void onError(String error) {
@Override
public void onError(String error) {
}
});
}
});
}
/**

42
main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
View File

@@ -71,6 +71,8 @@ import com.yunbao.common.views.UserHomeImgsViewHolder;
import com.yunbao.live.activity.LiveRyAnchorActivity;
import com.yunbao.live.dialog.GiftWallDialog;
import com.yunbao.live.views.ShowBigPhoto;
import com.yunbao.video.activity.VideoPlayActivity;
import com.yunbao.video.utils.VideoStorge;
import java.io.File;
import java.util.ArrayList;
@@ -152,7 +154,7 @@ public class UserHomeActivity extends AbsActivity {
private LinearLayout bottomEditLayout;
private UploadQnImpl mUploadStrategy;
private List<ActiveBean> videoList = new ArrayList<>();
List<ActiveOtherBean> beanList = new ArrayList<>();
List<ActiveBean> beanList = new ArrayList<>();
private UserHomeImgsViewHolder userHomeImgsViewHolder;
private Map<String, String> gotoRoomKey = new HashMap<>();
@@ -176,33 +178,27 @@ public class UserHomeActivity extends AbsActivity {
}
initView();
getUseData();
getCommunityList();
}
private void getCommunityList() {
CommonHttpUtil.getOtherDynamicList(uid, new com.yunbao.common.http.HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
beanList = JSONArray.parseArray(Arrays.toString(info), ActiveOtherBean.class);
beanList = JSONArray.parseArray(Arrays.toString(info), ActiveBean.class);
for (int j = 0; j < beanList.size(); j++) {
if (beanList.get(j).getImg_or_video().equals("2")) {
videoList.add(beanList.get(j));
}
}
UserCommunityAdapter userCommunityAdapter = new UserCommunityAdapter(mContext, beanList, isMe);
userCommunityAdapter.setOnItemClickListener(new UserCommunityAdapter.onItemClickListener() {
@Override
public void onImgItem(ActiveOtherBean bean, int position) {
if (bean.getImg_or_video().equals("1")) {
RouteUtil.forwardCommunity(bean.getId());
} else {
/*int playPosition = 0;
for (int i = 0; i < videoList.size(); i++) {
if (videoList.get(i).getId().equals(bean.getId())) {
playPosition = i;
}
}
RouteUtil.forwardVideoActivity();*/
}
public void onImgItem(ActiveBean bean, int position) {
RouteUtil.forwardCommunity(bean.getId());
}
@Override
public void onItemMore(ActiveOtherBean bean, int position) {
public void onItemMore(ActiveBean bean, int position) {
DialogUitl.showSimpleDialog(mContext, getResources().getString(com.yunbao.main.R.string.msg_del_sure), false, new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
@@ -218,6 +214,18 @@ public class UserHomeActivity extends AbsActivity {
}
});
}
@Override
public void onItemVideo(ActiveBean activeBean, int position) {
int playPosition = 0;
for (int i = 0; i < videoList.size(); i++) {
if (videoList.get(i).getId().equals(activeBean.getId())) {
playPosition = i;
}
}
VideoStorge.getInstance().put(Constants.VIDEO_HOME, videoList);
VideoPlayActivity.forward(mContext, playPosition, Constants.VIDEO_HOME, 1);
}
});
communityRecyclerView.setAdapter(userCommunityAdapter);
}
@@ -240,6 +248,7 @@ public class UserHomeActivity extends AbsActivity {
likeCount.setText(String.valueOf(userInfo.getUserHomeTopInfo().getUser_love_num()));//关注数量
if (isMe) {
findViewById(R.id.setting).setVisibility(View.VISIBLE);
bottomEditLayout.setVisibility(View.VISIBLE);
imgUp.setVisibility(View.VISIBLE);
imgLabel.setVisibility(View.VISIBLE);
@@ -437,6 +446,7 @@ public class UserHomeActivity extends AbsActivity {
}
});
mBanner.start();
getCommunityList();
}
private void initView() {