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

Merge remote-tracking branch 'origin/dev_改版主分支' into dev_改版主分支

Browse Source
This commit is contained in:
zlzw
2024-03-25 13:07:34 +08:00
parent 511a354155 28f00f1c8a
commit 253fe38067
5 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
main/src/main/java/com/yunbao/main/activity/CommunityDetailsActivity.java
View File

@@ -48,6 +48,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import pl.droidsonroids.gif.GifImageView;
@Route(path = RouteUtil.PATH_COMMUNITY)
public class CommunityDetailsActivity extends AbsActivity {
private ActiveBean activeBean;
@@ -71,6 +73,7 @@ public class CommunityDetailsActivity extends AbsActivity {
private ImageView send;
private boolean isComment = false;
private RelativeLayout videoLayout;
private GifImageView liveStatus;
@Override
protected int getLayoutId() {
@@ -97,6 +100,7 @@ public class CommunityDetailsActivity extends AbsActivity {
}
private void initView() {
liveStatus = findViewById(R.id.liveStatus);
videoLayout = findViewById(R.id.videoLayout);
send = findViewById(R.id.send);
comment = findViewById(R.id.comment);
@@ -248,23 +252,10 @@ public class CommunityDetailsActivity extends AbsActivity {
if (!jsonArray.isEmpty()) {
image = jsonArray.getString(0);
}
}else{
image=activeBean.getVideo() + "?vframe/jpg/offset/0";
} else {
image = activeBean.getVideo() + "?vframe/jpg/offset/0";
}
new SharePopDialog(mContext)
.setShareType(SharePopDialog.TYPE_DYNAMIC)
.setShareData(ShareBean.ShareBuilder.create()
.setShareType(SharePopDialog.TYPE_DYNAMIC)
.setUid(CommonAppConfig.getInstance().getUid())
.setCover(StringUtil.isEmpty(image) ? activeBean.getUser_avatar() : image)
.setTitle(StringUtil.isEmpty(activeBean.getContent()) ? activeBean.getUser_name() : JSONObject.parseObject(activeBean.getContent()).getString("msg"))
.setAnchorId(activeBean.getUser_id())
.setAnchorName(activeBean.getUser_name())
.setAnchorAvatar(activeBean.getUser_avatar())
.setExtraData(activeId)
.build()
)
.showDialog();
new SharePopDialog(mContext).setShareType(SharePopDialog.TYPE_DYNAMIC).setShareData(ShareBean.ShareBuilder.create().setShareType(SharePopDialog.TYPE_DYNAMIC).setUid(CommonAppConfig.getInstance().getUid()).setCover(StringUtil.isEmpty(image) ? activeBean.getUser_avatar() : image).setTitle(StringUtil.isEmpty(activeBean.getContent()) ? activeBean.getUser_name() : JSONObject.parseObject(activeBean.getContent()).getString("msg")).setAnchorId(activeBean.getUser_id()).setAnchorName(activeBean.getUser_name()).setAnchorAvatar(activeBean.getUser_avatar()).setExtraData(activeId).build()).showDialog();
});
}
@@ -363,6 +354,9 @@ public class CommunityDetailsActivity extends AbsActivity {
if (!StringUtil.isEmpty(activeBean.getContent())) {
content.setText(String.valueOf(JSONObject.parseObject(activeBean.getContent()).get("msg")));
}
if (activeBean.getIs_live().equals("1")) {
liveStatus.setVisibility(View.VISIBLE);
}
if (activeBean.getIs_attention().equals("1")) {//关注
ImgLoader.display(CommunityDetailsActivity.this, R.mipmap.icon_like_followed, followIcon);
followName.setText(getResources().getString(R.string.following));

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

@@ -246,6 +246,17 @@ public class UserHomeActivity extends AbsActivity {
authorIcon.setVisibility(View.GONE);
authenticationLayout.setVisibility(View.GONE);
}
if (userInfo.getUserHomeTopInfo().getIs_attention() == 1) {
ImgLoader.display(UserHomeActivity.this, R.mipmap.icon_like_followed, followIcon);
followName.setText(getResources().getString(R.string.following));
followName.setTextColor(Color.parseColor("#777777"));
followLayout.setBackground(getResources().getDrawable(R.drawable.bg_main_com_type_1));
} else {
ImgLoader.display(UserHomeActivity.this, R.mipmap.icon_like_follow, followIcon);
followName.setText(getResources().getString(R.string.follow));
followName.setTextColor(getResources().getColor(R.color.white));
followLayout.setBackground(getResources().getDrawable(R.drawable.bg_main_com_type));
}
signature.setText(userInfo.getUserHomeTopInfo().getUser_signature());//个性签名
//标签
myAdapter = new LabelTagAdapter(mContext, new LabelTagAdapter.OnSureOnClickListener() {
@@ -541,7 +552,7 @@ public class UserHomeActivity extends AbsActivity {
public void onClick(View v) {
if (bannerImgList.size() < 9) {
selectImg();
}else{
} else {
ToastUtil.show(getResources().getString(com.yunbao.main.R.string._9));
}
}