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-27 16:13:49 +08:00
commit 79c691f5b2
2 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/main/res/layout/activity_user_home.xml
View File

@ -383,6 +383,7 @@
android:textStyle="bold" />
<TextView
android:id="@+id/fanName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"

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

@ -9,6 +9,7 @@ import android.graphics.Color;
import android.graphics.Outline;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.util.SparseArray;
import android.view.View;
import android.view.ViewOutlineProvider;
@ -36,6 +37,7 @@ import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.R;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.activity.WebViewActivity;
import com.yunbao.common.adapter.LabelTagAdapter;
import com.yunbao.common.adapter.UserCommunityAdapter;
import com.yunbao.common.adapter.UserHomeImgAdapter;
@ -62,6 +64,8 @@ import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
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 java.io.File;
@ -133,6 +137,7 @@ public class UserHomeActivity extends AbsActivity {
private List<String> tagList;
private GifImageView liveStatus;
private TextView topName;
private TextView fanName;
private LinearLayout topLayout;
private ScrollView scrollView;
private RelativeLayout topImgLayout;
@ -260,6 +265,7 @@ public class UserHomeActivity extends AbsActivity {
authenticationLayout.setVisibility(View.VISIBLE);
} else {
imgUp.setVisibility(View.GONE);
imgLabel.setVisibility(View.GONE);
authorIcon.setVisibility(View.GONE);
authenticationLayout.setVisibility(View.GONE);
}
@ -304,6 +310,9 @@ public class UserHomeActivity extends AbsActivity {
myAdapter.setData(tagList);
}
}
if (!StringUtil.isEmpty(userInfo.getUserHomeTopInfo().getFans_name())) {
fanName.setText(userInfo.getUserHomeTopInfo().getFans_name());
}
mBanner.setOutlineProvider(new ViewOutlineProvider() {
@Override
public void getOutline(View view, Outline outline) {
@ -425,6 +434,7 @@ public class UserHomeActivity extends AbsActivity {
}
private void initView() {
fanName = findViewById(R.id.fanName);
bottomEditLayout = findViewById(R.id.bottomEditLayout);
imgUp = findViewById(R.id.imgUp);
imgLabel = findViewById(R.id.imgLabel);
@ -613,6 +623,48 @@ public class UserHomeActivity extends AbsActivity {
RouteUtil.forwardEditProfileActivity();
}
});
itemLayout01.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
//
Constants.myIntoIndex = 2;
String url = CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/FengSiTuan?touid=" + uid;
WebViewActivity.forward(mContext, url, false);
}
});
itemLayout02.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Constants.myIntoIndex = 2;
String url = CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/ShouHu?touid=" + uid;
WebViewActivity.forward(mContext, url, false);
}
});
itemLayout03.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
GiftWallDialog giftWallDialog = new GiftWallDialog();
Bundle bundle = new Bundle();
bundle.putString(Constants.LIVE_UID, uid);
bundle.putString("mAnchorName", userInfo.getUserHomeTopInfo().getUser_name());
bundle.putString("mAvatarUrl", userInfo.getUserHomeTopInfo().getUser_avatar());
bundle.putString("toUid", uid);
bundle.putInt("isAttention", userInfo.getUserHomeTopInfo().getIs_attention());
bundle.putBoolean("isLive", isAnchor);
bundle.putBoolean("SBW", !(mContext instanceof LiveRyAnchorActivity));
giftWallDialog.setArguments(bundle);
giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog");
}
});
itemLayout04.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Constants.myIntoIndex = 2;
String url = CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/RongYuQiang??touid=" + uid;
WebViewActivity.forward(mContext, url, false);
}
});
findViewById(R.id.setting).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {