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

冠名礼物

Browse Source
This commit is contained in:
Martin 2024-07-15 10:13:36 +08:00
parent ade837e85c
commit 484069dac7
20 changed files with 119 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
common/src/main/java/com/yunbao/common/custom/LiveGifWallAchieveWearTransformer.java
View File

@ -1,50 +0,0 @@
package com.yunbao.common.custom;
import android.view.View;
import com.stx.xhb.androidx.transformers.BasePageTransformer;
import com.yunbao.common.utils.L;
public class LiveGifWallAchieveWearTransformer extends BasePageTransformer {
private float mMinScale = 0.85f;
private float mMinAlpha = 1f;
@Override
public void handleInvisiblePage(View view, float position) {
}
@Override
public void handleLeftPage(View view, float position) {
float scale = Math.max(mMinScale, 1 + position);
float vertMargin = view.getHeight() * (1 - scale) / 2;
float horzMargin = view.getWidth() * (1 - scale) / 2;
view.setTranslationX(horzMargin - vertMargin / 2);
view.setScaleX(scale);
view.setScaleY( scale);
L.e("handleLeftPage scale:"+scale);
view.setAlpha( mMinAlpha + (scale - mMinScale) / (1 - mMinScale) * (1 - mMinAlpha));
}
@Override
public void handleRightPage(View view, float position) {
float scale = Math.max(mMinScale, 1 - position);
float vertMargin = view.getHeight() * (1 - scale) / 2;
float horzMargin = view.getWidth() * (1 - scale) / 2;
view.setTranslationX( -horzMargin + vertMargin / 2);
view.setScaleX( scale);
view.setScaleY( scale);
L.e("handleRightPage scale:"+scale);
view.setAlpha( mMinAlpha + (scale - mMinScale) / (1 - mMinScale) * (1 - mMinAlpha));
}
public void setMinAlpha(float minAlpha) {
if (minAlpha >= 0.6f && minAlpha <= 1.0f) {
mMinAlpha = minAlpha;
}
}
public void setMinScale(float minScale) {
if (minScale >= 0.6f && minScale <= 1.0f) {
mMinScale = minScale;
}
}
}

34
common/src/main/java/com/yunbao/common/dialog/GiftWallAchieveDialog.java
View File

@ -1,10 +1,14 @@
package com.yunbao.common.dialog;
import android.content.Context;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@ -13,8 +17,10 @@ import com.yunbao.common.R;
import com.yunbao.common.adapter.GiftWallAchieveAdapter;
import com.yunbao.common.bean.MedalAchievementModel;
import com.yunbao.common.bean.UserMedalListModel;
import com.yunbao.common.fragment.GiftWallMainTab1Fragment;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.ScreenDimenUtil;
import com.yunbao.common.utils.ToastUtil;
@ -33,6 +39,8 @@ public class GiftWallAchieveDialog extends AbsDialogPopupWindow {
private RecyclerView mRecyclerView;
private GiftWallAchieveAdapter giftWallAchieveAdapter;
private String toUid;
private boolean isAnchor;
private View topBar;
private List<UserMedalListModel> userMedalListModelList = new ArrayList<>();
@ -45,6 +53,12 @@ public class GiftWallAchieveDialog extends AbsDialogPopupWindow {
return this;
}
public GiftWallAchieveDialog setAnchor(boolean anchor) {
isAnchor = anchor;
return this;
}
public GiftWallAchieveDialog setToUid(String toUid) {
this.toUid = toUid;
return this;
@ -75,29 +89,33 @@ public class GiftWallAchieveDialog extends AbsDialogPopupWindow {
mRecyclerView = findViewById(R.id.recyclerView);
mRecyclerView.setLayoutManager(new GridLayoutManager(mContext, 3, GridLayoutManager.VERTICAL, false));
numCount = findViewById(R.id.numCount);
topBar = findViewById(R.id.top_bar);
mIvBack.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
dialog.dismiss();
}
});
}
@Override
protected void onCreate() {
super.onCreate();
initView();
/*RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mIvBack.getLayoutParams();
if (isFullWindows) {
params.width=DpUtil.dp2px(20);
mIvBack.setVisibility(View.VISIBLE);
mIvBg.setScaleType(ImageView.ScaleType.CENTER_CROP);
ViewGroup.LayoutParams params1 = topBar.getLayoutParams();
params1.height=DpUtil.dp2px(35);;
topBar.setLayoutParams(params1);
} else {
params.width=DpUtil.dp2px(1);
mIvBack.setVisibility(View.INVISIBLE);
mIvBg.setScaleType(ImageView.ScaleType.FIT_XY);
}
mIvBack.setLayoutParams(params);*/
initData();
}
private void initData() {
LiveNetManager.get(getContext())
.getGiftHallMedalList(toUid,"",new HttpCallback<MedalAchievementModel>() {
.getGiftHallMedalList(toUid,isAnchor?"1":"2",new HttpCallback<MedalAchievementModel>() {
@Override
public void onSuccess(MedalAchievementModel data) {
numCount.setText(data.getMedalLightNumber()+"/"+data.getMedalTotalNumber());
@ -106,7 +124,7 @@ public class GiftWallAchieveDialog extends AbsDialogPopupWindow {
giftWallAchieveAdapter.setOnItemClickListener(new GiftWallAchieveAdapter.OnItemClickListener() {
@Override
public void onItemClick(int position) {
GiftWallAchieveWearDialog giftWallAchieveWearDialog = new GiftWallAchieveWearDialog(mContext,userMedalListModelList.get(position).getDressInfo());
GiftWallAchieveWearDialog giftWallAchieveWearDialog = new GiftWallAchieveWearDialog(mContext,isAnchor,userMedalListModelList.get(position).getDressInfo());
giftWallAchieveWearDialog.showDialog();
}
});

4
common/src/main/java/com/yunbao/common/dialog/GiftWallAchieveWearDialog.java
View File

@ -38,13 +38,15 @@ public class GiftWallAchieveWearDialog extends AbsDialogPopupWindow {
private TextView textAchieveHint;
private TextView btnConfirm;
private int selectPosition = 0;
private boolean isAnchor;
String putOn = WordUtil.isNewZh() ? "佩戴" : "wearing";
String wearing = WordUtil.isNewZh() ? "已佩戴" : "worn";
private List<UserMedalModel> achieveWearModels = new ArrayList<>();
public GiftWallAchieveWearDialog(@NonNull Context context, List<UserMedalModel> achieveWearModels) {
public GiftWallAchieveWearDialog(@NonNull Context context,boolean isAnchor, List<UserMedalModel> achieveWearModels) {
super(context);
this.isAnchor = isAnchor;
this.achieveWearModels = achieveWearModels;
}

4
common/src/main/java/com/yunbao/common/dialog/GiftWallDialog.java
View File

@ -157,10 +157,10 @@ public class GiftWallDialog extends AbsDialogPopupWindow {
mViewPager.setCurrentItem(1, false);
});
ViewClicksAntiShake.clicksAntiShake(mAchievement, () -> {
new GiftWallAchieveDialog(mContext).setFullWindows(false).setToUid("98889").showDialog();
new GiftWallAchieveDialog(mContext).setFullWindows(isFullWindows).setAnchor(isAnchor).setToUid(toUserId).showDialog();
});
ViewClicksAntiShake.clicksAntiShake(mIvTips, () -> {
new GiftWallRuleDialog(mContext).setFullWindows(false).showDialog();
new GiftWallRuleDialog(mContext).setFullWindows(isFullWindows).showDialog();
});
}

22
common/src/main/java/com/yunbao/common/dialog/GiftWallMainTab2ClassicInfoDialog.java
View File

@ -6,6 +6,7 @@ import android.graphics.Typeface;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
@ -59,7 +60,6 @@ public class GiftWallMainTab2ClassicInfoDialog extends AbsDialogPopupWindow {
private List<BaseFragment> fragments = new ArrayList<>();
private RecyclerView recyclerView;
GiftWallTab2GiftInfoListItemAdapter adapter;
private boolean isFullWindows;
GiftWallTab2Bean.Gift gift;
String userName;
@ -97,18 +97,17 @@ public class GiftWallMainTab2ClassicInfoDialog extends AbsDialogPopupWindow {
}
void initData() {
LiveNetManager.get(mContext)
.lastAllGiftHallWeekStarDetail(gift.getGiftId() + "", gift.getNamingLiveId() + "", new HttpCallback<GiftWallMainTab2ClassicInfoBean>() {
@Override
public void onSuccess(GiftWallMainTab2ClassicInfoBean data) {
initData(data);
}
LiveNetManager.get(mContext).lastAllGiftHallWeekStarDetail(gift.getGiftId() + "", gift.getNamingLiveId() + "", new HttpCallback<GiftWallMainTab2ClassicInfoBean>() {
@Override
public void onSuccess(GiftWallMainTab2ClassicInfoBean data) {
initData(data);
}
@Override
public void onError(String error) {
@Override
public void onError(String error) {
}
});
}
});
}
void initData(GiftWallMainTab2ClassicInfoBean data) {
@ -131,6 +130,7 @@ public class GiftWallMainTab2ClassicInfoDialog extends AbsDialogPopupWindow {
break;
}
}
}
void setTopData(GiftWallMainTab2ClassicInfoBean.GiftData data, ImageView avatar, TextView name, TextView value) {

21
common/src/main/java/com/yunbao/common/dialog/GiftWallRuleDialog.java
View File

@ -2,7 +2,10 @@ package com.yunbao.common.dialog;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
@ -17,6 +20,7 @@ import com.yunbao.common.bean.UserMedalListModel;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.ScreenDimenUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
@ -33,6 +37,7 @@ public class GiftWallRuleDialog extends AbsDialogPopupWindow {
private ImageView mIvBack;
private ImageView iv_rule;
private boolean isFullWindows;
private View topBar;
public GiftWallRuleDialog(@NonNull Context context) {
super(context);
}
@ -65,23 +70,27 @@ public class GiftWallRuleDialog extends AbsDialogPopupWindow {
mIvBg = findViewById(R.id.iv_root_bg);
mIvBack = findViewById(R.id.iv_back);
iv_rule= findViewById(R.id.iv_rule);
topBar = findViewById(R.id.top_bar);
mIvBack.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
dialog.dismiss();
}
});
}
@Override
protected void onCreate() {
super.onCreate();
initView();
/*RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mIvBack.getLayoutParams();
if (isFullWindows) {
params.width=DpUtil.dp2px(20);
mIvBack.setVisibility(View.VISIBLE);
mIvBg.setScaleType(ImageView.ScaleType.CENTER_CROP);
ViewGroup.LayoutParams params1 = topBar.getLayoutParams();
params1.height= DpUtil.dp2px(35);;
topBar.setLayoutParams(params1);
} else {
params.width=DpUtil.dp2px(1);
mIvBack.setVisibility(View.INVISIBLE);
mIvBg.setScaleType(ImageView.ScaleType.FIT_XY);
}
mIvBack.setLayoutParams(params);*/
ImgLoader.displayDrawable(mContext, WordUtil.isNewZh() ? "https://downs.yaoulive.com/Group%201384.png" : "https://downs.yaoulive.com/Group%201381.png", -1, -1, new ImgLoader.DrawableCallback() {
@Override
public void onLoadSuccess(Drawable drawable) {

1
common/src/main/java/com/yunbao/common/http/PDLiveApi.java
View File

@ -1277,7 +1277,6 @@ public interface PDLiveApi {
Observable<ResponseModel<BaseModel>> userUseDress(@Query("dress_type") String dress_type,@Query("users_dress_id")String users_dress_id);
/**
* 个人展馆
*/

10
common/src/main/res/layout/dialog_gift_wall_achieve.xml
View File

@ -12,9 +12,16 @@
android:scaleType="fitXY"
android:src="@mipmap/dialog_gift_wall_achieve" />
<View
android:id="@+id/top_bar"
android:layout_width="0dp"
android:layout_height="0dp"/>
<ImageView
android:id="@+id/iv_back"
android:layout_width="50dp"
android:paddingEnd="25dp"
android:layout_width="80dp"
android:layout_below="@+id/top_bar"
android:layout_height="60dp"
android:scaleType="center"
android:src="@mipmap/dialog_gift_wall_back" />
@ -23,6 +30,7 @@
android:text="@string/gift_wall_achieve_title"
android:layout_width="match_parent"
android:textSize="20sp"
android:layout_below="@+id/top_bar"
android:textColor="@color/white"
android:gravity="center"
android:textStyle="bold"

12
common/src/main/res/layout/dialog_gift_wall_rule.xml
View File

@ -12,9 +12,16 @@
android:scaleType="fitXY"
android:src="@mipmap/dialog_gift_wall_achieve" />
<View
android:id="@+id/top_bar"
android:layout_width="0dp"
android:layout_height="0dp"/>
<ImageView
android:id="@+id/iv_back"
android:layout_width="50dp"
android:paddingEnd="25dp"
android:layout_width="80dp"
android:layout_below="@+id/top_bar"
android:layout_height="60dp"
android:scaleType="center"
android:src="@mipmap/dialog_gift_wall_back" />
@ -24,9 +31,10 @@
android:layout_width="match_parent"
android:textSize="20sp"
android:textColor="@color/white"
android:layout_below="@+id/top_bar"
android:gravity="center"
android:textStyle="bold"
android:layout_height="60dp" />
android:layout_height="60dp"/>
<ScrollView
android:layout_below="@+id/iv_back"

2
common/src/main/res/values-en-rUS/string.xml
View File

@ -1258,7 +1258,7 @@ Limited ride And limited avatar frame</string>
<string name="reach_the_top">You have reached the highest level!</string>
<string name="nothing_in_the_package_yet">There\'s nothing in the package yet</string>
<string name="custom_quantity">Enter count</string>
<string name="gift_wall">Gift wall</string>
<string name="gift_wall">Gift Hall</string>
<string name="has_been_lit">Has been lit %s</string>
<string name="codex">Illustrated book</string>
<string name="unlit_icon">Not lit up</string>

2
common/src/main/res/values-zh-rHK/strings.xml
View File

@ -1254,7 +1254,7 @@
<string name="reach_the_top">恭喜，你已達到最高等級</string>
<string name="nothing_in_the_package_yet">包裹中暫無物品哦</string>
<string name="custom_quantity">自定義數量</string>
<string name="gift_wall">禮物墻</string>
<string name="gift_wall">禮物展館</string>
<string name="has_been_lit">已點亮%s個</string>
<string name="codex">圖鑒</string>
<string name="honorary_achievement">榮譽成就</string>

2
common/src/main/res/values-zh-rTW/strings.xml
View File

@ -1253,7 +1253,7 @@
<string name="reach_the_top">恭喜，你已達到最高等級</string>
<string name="nothing_in_the_package_yet">包裹中暫無物品哦</string>
<string name="custom_quantity">自定義數量</string>
<string name="gift_wall">禮物墻</string>
<string name="gift_wall">禮物展館</string>
<string name="has_been_lit">已點亮%s個</string>
<string name="codex">圖鑒</string>
<string name="honorary_achievement">榮譽成就</string>

2
common/src/main/res/values-zh/strings.xml
View File

@ -1252,7 +1252,7 @@
<string name="reach_the_top">恭喜，你已達到最高等級</string>
<string name="nothing_in_the_package_yet">包裹中暫無物品哦</string>
<string name="custom_quantity">自定義數量</string>
<string name="gift_wall">禮物墻</string>
<string name="gift_wall">禮物展館</string>
<string name="has_been_lit">已點亮%s個</string>
<string name="codex">圖鑒</string>
<string name="unlit_icon">未點亮</string>

2
common/src/main/res/values/strings.xml
View File

@ -1258,7 +1258,7 @@
<string name="nothing_in_the_package_yet">There\'s nothing in the package yet</string>
<string name="reach_the_top">You have reached the highest level!</string>
<string name="custom_quantity">Enter count</string>
<string name="gift_wall">Gift wall</string>
<string name="gift_wall">Gift Hall</string>
<string name="has_been_lit">Has been lit %s</string>
<string name="unlit_icon">Not lit up</string>
<string name="all_service_champion">Platform title</string>

3
live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java
View File

@ -2,6 +2,7 @@ package com.yunbao.live.views;
import android.content.Context;
import android.graphics.Color;
import android.text.TextUtils;
import android.util.TypedValue;
import android.view.View;
import android.view.animation.AccelerateDecelerateInterpolator;
@ -44,7 +45,7 @@ public class FrameGiftViewHolder extends RecyclerView.ViewHolder {
private ScaleAnimation mAnimation;
private LinearLayout mLoadingLayout;
private ImageView mLoading;
private LinearLayout namingLayout;
private RelativeLayout namingLayout;
private MarqueeTextView naming_name;
private RoundedImageView avatar;

15
live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java
View File

@ -185,16 +185,13 @@ public class LiveGiftViewHolder extends AbsViewHolder {
!TextUtils.isEmpty(bean.getNamingUid()) &&
!TextUtils.equals(bean.getNamingLiveuid(), "0") &&
!TextUtils.equals(bean.getNamingUid(), "0")) {
root_back.setBackgroundResource(R.drawable.background_naming);
findViewById(R.id.naming_icon).setVisibility(View.VISIBLE);
giftNamingIcon.setVisibility(View.VISIBLE);
root_back.setBackgroundResource(R.mipmap.icon_live_gift_anim_11);
/*root_back.setBackgroundResource(R.drawable.background_naming);
findViewById(R.id.naming_icon).setVisibility(View.VISIBLE);*/
} else {
if(bean.getUser_naming_status()==1){
giftNamingIcon.setVisibility(View.VISIBLE);
root_back.setBackgroundResource(R.mipmap.icon_live_gift_anim_11);
}else{
giftNamingIcon.setVisibility(View.GONE);
root_back.setBackgroundResource(R.mipmap.icon_live_gift_anim_3);
}
giftNamingIcon.setVisibility(View.VISIBLE);
root_back.setBackgroundResource(R.mipmap.icon_live_gift_anim_11);
//root_back.setBackgroundResource(R.mipmap.icon_live_gift_anim_3);
findViewById(R.id.naming_icon).setVisibility(View.GONE);
}

47
live/src/main/res/layout/item_frame_gift.xml
View File

@ -59,43 +59,52 @@
android:layout_gravity="end"
android:layout_marginEnd="2dp" />
<LinearLayout
<RelativeLayout
android:id="@+id/namingLayout"
android:layout_width="70dp"
android:background="@mipmap/item_frame_gift_naming_bg"
android:layout_height="20dp"
android:visibility="gone"
tools:visibility="visible"
android:layout_marginBottom="27dp"
android:layout_gravity="center_horizontal|bottom">
<LinearLayout
android:background="@mipmap/item_frame_gift_naming_bg"
android:layout_width="match_parent"
android:layout_centerVertical="true"
android:layout_height="18dp">
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/naming_name"
android:layout_width="0dp"
android:layout_marginStart="23dp"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:ellipsize="marquee"
android:layout_marginEnd="3dp"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:textColor="#FFFFFFFF"
android:textSize="10sp" />
</LinearLayout>
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="20dp"
android:layout_centerVertical="true"
android:layout_height="20dp"
android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia"
app:riv_oval="true" />
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/naming_name"
android:layout_width="0dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="2dp"
android:layout_weight="1"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center_vertical"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:textColor="#FFFFFFFF"
android:textSize="10sp" />
</LinearLayout>
</RelativeLayout>
</FrameLayout>

1
live/src/main/res/layout/view_live_gift.xml
View File

@ -115,6 +115,7 @@
android:layout_width="56dp"
android:layout_height="15dp"
android:layout_gravity="bottom"
android:visibility="gone"
android:layout_marginStart="11dp"
android:background="@drawable/background_naming_icon"
android:gravity="center"

3
live/src/main/res/layout/view_live_room.xml
View File

@ -1212,8 +1212,7 @@
android:layout_height="51dp"
android:translationX="500dp"
android:visibility="invisible"
tools:translationX="0dp"
tools:visibility="visible">
tools:translationX="0dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"

BIN
live/src/main/res/mipmap-mdpi/icon_live_gift_anim_11.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 51 KiB