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

礼物包裹的逻辑进行修改

Browse Source
This commit is contained in:
ningwenqiang 2024-10-06 17:20:50 +08:00
parent c65a19dc4c
commit 2236a90b31
20 changed files with 166 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/src/main/res/layout/dialog_live_gift_popup2.xml
View File

@ -215,11 +215,11 @@
app:layout_constraintEnd_toEndOf="parent" />
<View
android:layout_width="1dp"
android:layout_width="1.5dp"
android:layout_height="11dp"
android:layout_gravity="center_vertical"
android:layout_marginTop="1dp"
android:background="@color/white"
android:background="#17FFFFFF"
app:layout_constraintBottom_toBottomOf="@+id/giftWrapTv"
app:layout_constraintEnd_toStartOf="@+id/giftWrapTv"
app:layout_constraintTop_toTopOf="@+id/giftWrapTv" />
@ -257,8 +257,11 @@
<TextView
android:id="@+id/lvTitleTv"
android:layout_width="40dp"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:minWidth="40dp"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:layout_gravity="center"
android:layout_marginStart="18dp"
android:layout_marginBottom="11dp"
@ -306,13 +309,14 @@
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="0dp"
android:layout_height="3dp"
android:layout_marginStart="1dp"
android:layout_marginEnd="18dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="10dp"
android:progressDrawable="@drawable/bg_gift_progressbar2"
app:layout_constraintEnd_toStartOf="@+id/openVipBg"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/lvTipsTv"
app:layout_constraintTop_toBottomOf="@+id/lvTipsTv"
app:layout_constraintWidth_percent="0.54"
tools:progress="10" />

10
common/src/main/res/values-en-rUS/strings.xml
View File

@ -293,8 +293,8 @@
<string name="live_dr">Multi PK</string>
<string name="live_mic">Voice connection</string>
<string name="live_wks">billboard</string>
<string name="live_zslk">leave temporarily</string>
<string name="live_zslk1">ResumeLive</string>
<string name="live_zslk">BRB</string>
<string name="live_zslk1">Continue</string>
<string name="live_flash">Flash lamp</string>
<string name="live_music">accompaniment</string>
<string name="live_share">share</string>
@ -306,7 +306,7 @@
<string name="live_open_flash">Only the rear camera can turn on the flash</string>
<string name="live_open_flash_error">Flash on failed</string>
<string name="live_you_are_shut">You\'ve been banned</string>
<string name="live_end">Live broadcast ended</string>
<string name="live_end">Live broadcast has ended</string>
<string name="live_back">Back to home page</string>
<string name="live_duration">Duration of live broadcast</string>
<string name="live_votes">Harvest</string>
@ -998,7 +998,7 @@ Limited ride And limited avatar frame</string>
<string name="robot_minimum_interval">At least once every 5 minutes</string>
<string name="robot_add_content_hint3">When a user enters the studio, the robot will @the user and automatically</string>
<string name="robot_add_content_hint4">The following sentence is random. Set a minimum of 1 to a maximum of 20.</string>
<string name="robot_setup">Robot setup</string>
<string name="robot_setup">Bot setup</string>
<string name="high_definition">High definition</string>
<string name="standard_clear">fluency</string>
<string name="ultra_hd">Ultra hd</string>
@ -1025,7 +1025,7 @@ Limited ride And limited avatar frame</string>
<string name="live_user_ban_hd">There is no choice, the anchor is not turned on HD live.</string>
<string name="function_is_suspended">Sorry, this feature is on hold.</string>
<string name="phone_number">Phone Number</string>
<string name="broadcast_data">Broadcast</string>
<string name="broadcast_data">Live data</string>
<string name="click_to_view">Click To View</string>
<string name="anchor_task">Anchor Task</string>
<string name="anchor_agreement">I have read and agreed to the </string>

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

@ -236,13 +236,13 @@
<string name="live_dr">Multi PK</string>
<string name="live_mic">Voice connection</string>
<string name="live_wks">billboard</string>
<string name="live_zslk">leave temporarily</string>
<string name="live_zslk1">ResumeLive</string>
<string name="live_zslk">BRB</string>
<string name="live_zslk1">Continue</string>
<string name="live_share">share</string>
<string name="live_link_pk">SinglePK</string>
<string name="live_wishlist">WishList</string>
<string name="live_open_flash">Only the rear camera can turn on the flash</string>
<string name="live_end">Live broadcast ended</string>
<string name="live_end">Live broadcast has ended</string>
<string name="live_back">Back to Home</string>
<string name="live_duration">Duration of live broadcast</string>
<string name="live_votes">Harvest</string>
@ -831,7 +831,7 @@ Limited ride And limited avatar frame</string>
<string name="robot_minimum_interval">At least once every 5 minutes</string>
<string name="robot_add_content_hint3">When a user enters the studio, the robot will @the user and automatically</string>
<string name="robot_add_content_hint4">The following sentence is random. Set a minimum of 1 to a maximum of 20.</string>
<string name="robot_setup">Robot setup</string>
<string name="robot_setup">Bot setup</string>
<string name="high_definition">High definition</string>
<string name="standard_clear">fluency</string>
<string name="ultra_hd">Ultra hd</string>
@ -858,7 +858,7 @@ Limited ride And limited avatar frame</string>
<string name="live_user_ban_hd">There is no choice, the anchor is not turned on HD live.</string>
<string name="function_is_suspended">Sorry, this feature is on hold.</string>
<string name="phone_number">Phone Number</string>
<string name="broadcast_data">Broadcast</string>
<string name="broadcast_data">Live data</string>
<string name="click_to_view">Click To View</string>
<string name="anchor_task">Anchor Task</string>
<string name="anchor_agreement">I have read and agreed to the </string>

42
live/src/main/java/com/yunbao/live/adapter/FrameGiftNewAdapter.java
View File

@ -50,6 +50,7 @@ public class FrameGiftNewAdapter extends RecyclerView.Adapter {
private List<LiveGiftBean> giftJson = new ArrayList<>();
private String mStream, mLiveUid, wishGiftId;
private boolean isWrap = false;
public FrameGiftNewAdapter(List<LiveGiftBean> giftJson, String mStream, String mLiveUid, String wishGiftId) {
this.giftJson = giftJson;
@ -58,6 +59,14 @@ public class FrameGiftNewAdapter extends RecyclerView.Adapter {
this.wishGiftId = wishGiftId;
}
public FrameGiftNewAdapter(List<LiveGiftBean> giftJson, String mStream, String mLiveUid, String wishGiftId,boolean isWrap) {
this.giftJson = giftJson;
this.mStream = mStream;
this.mLiveUid = mLiveUid;
this.wishGiftId = wishGiftId;
this.isWrap = isWrap;
}
public void setLiveUserGiftBeanList(List<LiveGiftBean> giftJson) {
this.giftJson = giftJson;
@ -88,13 +97,19 @@ public class FrameGiftNewAdapter extends RecyclerView.Adapter {
}
GiftViewHolder frameGiftViewHolder = (GiftViewHolder) holder;
frameGiftViewHolder.showData(giftJson.get(position));
frameGiftViewHolder.showData(giftJson.get(position),isWrap);
frameGiftViewHolder.giftSelect(giftJson.get(position), position, mStream, mLiveUid, new GiftViewHolder.FrameGiftClickListener() {
@Override
public void onCallBack(int position, LiveGiftBean model) {
Bus.get().post(new LiveGiftItemEvent().setLiveGiftModel(model));
wishGiftId = null;
giftSelect(model);
if(isWrap){
model.setPageGift(true);
Bus.get().post(new LiveGiftItemEvent().setLiveGiftModel(model));
giftSelect(model);
}else {
Bus.get().post(new LiveGiftItemEvent().setLiveGiftModel(model));
wishGiftId = null;
giftSelect(model);
}
}
});
}
@ -110,13 +125,13 @@ public class FrameGiftNewAdapter extends RecyclerView.Adapter {
// 声明所有需要初始化的视图组件
private View isSelectView, loadImgClickView;
private ImageView giftIconImg;
private TextView giftNameTv;
private TextView giftNameTv,warpGiftNumberTv,warpGiftTimeTv;
private TextView priceTv,price2Tv;
private ImageView payIco;
private ImageView giftNamingBg, loadImgImageView;
private RoundedImageView avatar;
private MarqueeTextView namingName;
private Group namingGroup, loadImgGroup;
private Group namingGroup, loadImgGroup,warpGroup;
private ImageView cornerMark;
private ScaleAnimation mAnimation;
private View rootView;
@ -136,6 +151,9 @@ public class FrameGiftNewAdapter extends RecyclerView.Adapter {
this.namingName = findViewById(R.id.naming_name);
this.namingGroup = findViewById(R.id.namingGroup);
this.cornerMark = findViewById(R.id.corner_mark);
this.warpGroup = findViewById(R.id.warpGroup);
warpGiftNumberTv = findViewById(R.id.warpGiftNumberTv);
warpGiftTimeTv = findViewById(R.id.warpGiftTimeTv);
loadImgImageView = findViewById(R.id.loadImgImageView);
loadImgGroup = findViewById(R.id.loadImgGroup);
loadImgClickView = findViewById(R.id.loadImgClickView);
@ -156,7 +174,15 @@ public class FrameGiftNewAdapter extends RecyclerView.Adapter {
return rootView.findViewById(id);
}
public void showData(LiveGiftBean model) {
public void showData(LiveGiftBean model,boolean isWarp) {
if (isWarp)
{
warpGroup.setVisibility(View.VISIBLE);
warpGiftNumberTv.setText(model.getGiftNum());
warpGiftTimeTv.setText(model.getEnd_time());
}else {
warpGroup.setVisibility(View.GONE);
}
isSelectView.setVisibility(model.isChecked() ? View.VISIBLE : View.INVISIBLE);
if (model.isChecked()) {
@ -283,8 +309,6 @@ public class FrameGiftNewAdapter extends RecyclerView.Adapter {
int sendCount = refreshEvent.getSendCount();//赠送礼物数量
for (int i = 0; i < giftJson.size(); i++) {
if (giftJson.get(i).getId() == liveGiftBean.getId()) {
String giftNum = giftJson.get(i).getGiftNum();
int number = 0;
try {

43
live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java
View File

@ -104,6 +104,7 @@ import java.math.BigDecimal;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@ -132,8 +133,8 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
private MarqueeTextView giftDescription;
private ImageView continuousClicksBg;
private TextView lianText, liveGiftSendTv;
private androidx.constraintlayout.widget.Group continuousClickGroup,emptyGroup;
private ImageView operateImage, openVipArrowImg,vipIdentityImg;
private androidx.constraintlayout.widget.Group continuousClickGroup, emptyGroup;
private ImageView operateImage, openVipArrowImg, vipIdentityImg;
private View blindBox;
private ImageView giftSponsorBgImg;
private ImageView giftItle;
@ -289,7 +290,7 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
giftSendGroup = findViewById(R.id.giftSendGroup);
openVipArrowImg = findViewById(R.id.openVipArrowImg);
emptyGroup = findViewById(R.id.emptyGroup);
vipIdentityImg =findViewById(R.id.vipIdentityImg);
vipIdentityImg = findViewById(R.id.vipIdentityImg);
//赞助信息
giftSponsorGroup.setVisibility(View.GONE);
//设置礼物弹窗背景 这里不设置
@ -364,16 +365,34 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
giftSendGroup.setVisibility(View.INVISIBLE);
//TODO 切换到包裹取消更爱
GiftCacheUtil.getInstance().addDownloadList(mWrapGiftList);
if (mWrapGiftList !=null && !mWrapGiftList.isEmpty()){
mWrapGiftList.get(0).setChecked(true);
mFrameGiftNewAdapter = new FrameGiftNewAdapter(mWrapGiftList, mStream, mLiveUid, mWrapGiftList.get(0).getGift_id()+"");
//礼物过滤掉数量为0的礼物
Iterator<LiveGiftBean> iterator = mWrapGiftList.iterator();
while (iterator.hasNext()) {
LiveGiftBean bean = iterator.next();
String giftNum = bean.getGiftNum();
int number = 0;
try {
number = Integer.parseInt(giftNum);
} catch (NumberFormatException e) {
e.printStackTrace();
number = 0;
}
if (number == 0) {
iterator.remove();
}
}
if (mWrapGiftList != null && !mWrapGiftList.isEmpty()) {
//mWrapGiftList.get(0).setChecked(true);
mFrameGiftNewAdapter = new FrameGiftNewAdapter(mWrapGiftList, mStream, mLiveUid, "",true);
giftRecyclerView.setAdapter(mFrameGiftNewAdapter);
emptyGroup.setVisibility(View.GONE);
// mWrapGiftList.get(0).setChecked(true);
// liveGiftSendTv.setText(1+"");
// liveGiftModel= mWrapGiftList.get(0);
hideLianBtn();
}else {
} else {
emptyGroup.setVisibility(View.VISIBLE);
Log.i("LiveGiftPopup2", "包裹为空");
}
@ -517,7 +536,7 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
.enableDrag(false)
.asCustom(new GiftNumberPopup(getContext()))
.show();
liveGiftImg.setImageResource( R.mipmap.ic_gift_top_arrow);
liveGiftImg.setImageResource(R.mipmap.ic_gift_top_arrow);
}
});
@ -999,7 +1018,7 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
BigDecimal maxLeve = new BigDecimal(coinModel.getUserLevelUpgrades()).add(new BigDecimal(coinModel.getUserLevelCurrentConsumption()));
try {
String leveNext = String.valueOf(nextLeve);
String userNextLevel = String.valueOf(Integer.parseInt(coinModel.getUserLevel())+1);
String userNextLevel = String.valueOf(Integer.parseInt(coinModel.getUserLevel()) + 1);
StringBuffer stringBuffer = new StringBuffer();
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
stringBuffer.append("升至Lv.")
@ -1201,9 +1220,9 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
@Subscribe(threadMode = ThreadMode.MAIN)
public void onGiftNumberEvent(GiftNumberEvent event) {
if (TextUtils.equals(event.getmCount(), "-1")) {
liveGiftImg.setImageResource( R.mipmap.ic_gift_right_arrow);
liveGiftImg.setImageResource(R.mipmap.ic_gift_right_arrow);
} else {
liveGiftImg.setImageResource( R.mipmap.ic_gift_right_arrow);
liveGiftImg.setImageResource(R.mipmap.ic_gift_right_arrow);
mCount = event.getmCount();
liveGiftSendTv.setText(mCount);
}
@ -1212,7 +1231,7 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
@Subscribe(threadMode = ThreadMode.MAIN)
public void onLiveParcelItemRefreshEvent(LiveParcelItemRefreshEvent event) {
if (isWrap){
if (isWrap) {
mFrameGiftNewAdapter.refreshWrapListAfterSend(event);
}
}

3
live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
View File

@ -758,6 +758,9 @@ public class LiveRyLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
}
});
LivePushRyViewHolder.btn_close.setVisibility(View.VISIBLE);
//关闭连麦移动到顶层 这个只是将次父类的关闭按钮bringToFront 实际无用
//LivePushRyViewHolder.btn_close.bringToFront();
LiveRyAnchorActivity.isDRPK = 1;
ScreenDimenUtil util = ScreenDimenUtil.getInstance();
int mScreenWdith = util.getScreenWdith();

1
live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java
View File

@ -491,6 +491,7 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
dr_pk_view.setVisibility(View.GONE);
cameraPreview3.setVisibility(View.GONE);
btn_close = (TextView) findViewById(R.id.btn_close);
tv_avatarOther_name = (TextView) findViewById(R.id.tv_avatarOther_name);
avatarOther = (ImageView) findViewById(R.id.avatarOther);
goto_room_view = (LinearLayout) findViewById(R.id.goto_room_view);

4
live/src/main/res/layout/dialog_anchor_say.xml
View File

@ -72,7 +72,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="6dp"
android:text="標題"
android:text="@string/say_title"
android:textColor="@color/white"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="parent"
@ -106,7 +106,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="6dp"
android:text="内容"
android:text="@string/say_content"
android:textColor="@color/white"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="parent"

66
live/src/main/res/layout/item_frame_gift_new.xml
View File

@ -40,22 +40,22 @@
tools:src="@mipmap/gif_rose" />
<TextView
android:id="@+id/giftNameTv"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:gravity="center"
android:lines="1"
android:textColor="@color/white"
android:textSize="11sp"
app:autoSizeMaxTextSize="11sp"
app:autoSizeMinTextSize="7sp"
app:autoSizeStepGranularity="1sp"
app:autoSizeTextType="uniform"
android:id="@+id/giftNameTv"
android:layout_width="0dp"
app:layout_constraintWidth_percent="0.76"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:textColor="@color/white"
android:lines="1"
android:textSize="11sp"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/giftIconImg"
app:layout_constraintWidth_percent="0.76"
tools:text="玫瑰" />
<TextView
@ -70,17 +70,18 @@
app:layout_constraintTop_toBottomOf="@+id/giftNameTv"
tools:text="2000" />
<!--红包的需要居中 -->
<TextView
android:id="@+id/price2Tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:layout_marginTop="1dp"
android:textColor="@color/white"
android:textSize="9sp"
app:layout_constraintEnd_toEndOf="@+id/giftIconImg"
app:layout_constraintStart_toStartOf="@+id/giftIconImg"
app:layout_constraintTop_toBottomOf="@+id/giftNameTv"
tools:text="2000" />
app:layout_constraintTop_toBottomOf="@+id/giftNameTv" />
<ImageView
android:id="@+id/pay_ico"
android:layout_width="9dp"
@ -144,8 +145,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
tools:visibility="visible"
app:constraint_referenced_ids="giftNamingBg,avatar,naming_name" />
app:constraint_referenced_ids="giftNamingBg,avatar,naming_name"
tools:visibility="gone" />
<!--corner_mark 不知道干嘛的 -->
<ImageView
@ -172,7 +173,7 @@
app:layout_constraintStart_toStartOf="@+id/isSelectView"
app:layout_constraintTop_toTopOf="@+id/isSelectView"
app:layout_constraintWidth_percent="0.80"
tools:visibility="visible" />
tools:visibility="gone" />
<ImageView
android:id="@+id/loadImgImageView"
@ -185,6 +186,7 @@
app:layout_constraintStart_toStartOf="@+id/loadImgClickView"
app:layout_constraintTop_toTopOf="@+id/loadImgClickView" />
<androidx.constraintlayout.widget.Group
android:id="@+id/loadImgGroup"
android:layout_width="wrap_content"
@ -192,5 +194,39 @@
android:visibility="gone"
app:constraint_referenced_ids="loadImgClickView,loadImgImageView" />
<!--礼物数量 -->
<TextView
android:id="@+id/warpGiftNumberTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:background="@drawable/bg_parcel_point"
android:paddingStart="3dp"
android:paddingEnd="3dp"
android:text="11"
android:textColor="@color/white"
android:textSize="8sp"
app:layout_constraintStart_toStartOf="@+id/isSelectView"
app:layout_constraintTop_toTopOf="@+id/isSelectView" />
<TextView
android:id="@+id/warpGiftTimeTv"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="#D996cff0"
android:gravity="center"
android:textColor="@color/color_white"
android:textSize="8sp"
app:layout_constraintBottom_toBottomOf="@+id/giftIconImg"
app:layout_constraintEnd_toEndOf="@+id/giftIconImg"
app:layout_constraintStart_toStartOf="@+id/giftIconImg" />
<androidx.constraintlayout.widget.Group
android:id="@+id/warpGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
tools:visibility="visible"
app:constraint_referenced_ids="warpGiftNumberTv,warpGiftTimeTv" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
live/src/main/res/layout/view_live_audience.xml
View File

@ -266,7 +266,7 @@
android:id="@+id/gift_image"
android:layout_width="0dp"
android:layout_height="0dp"
android:padding="3dp"
android:padding="4.5dp"
android:src="@mipmap/ic_live_menu_gift"
app:layout_constraintDimensionRatio="1"
app:layout_constraintEnd_toStartOf="@+id/total_image"

24
live/src/main/res/layout/view_live_end.xml
View File

@ -433,7 +433,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="14dp"
android:layout_toEndOf="@+id/image_anchorLayout"
android:text="用户名称"
tools:text="用户名称"
android:textColor="@color/white"
android:textSize="14sp" />
@ -452,7 +452,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="14dp"
android:layout_weight="1"
android:text="主播等级Lv.1 | 差600經驗升級"
tools:text="主播等级Lv.1 | 差600經驗升級"
android:textColor="#898989"
android:textSize="10sp" />
@ -519,7 +519,7 @@
</LinearLayout>
<LinearLayout
-<LinearLayout
android:layout_width="match_parent"
android:layout_height="51dp"
android:layout_marginTop="10dp"
@ -644,7 +644,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.8"
android:text="0"
tools:text="0"
android:textColor="@color/white"
android:textSize="16sp" />
@ -653,7 +653,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:text="0"
tools:text="0"
android:textColor="@color/white"
android:textSize="16sp" />
@ -663,7 +663,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="0"
tools:text="0"
android:textColor="@color/white"
android:textSize="16sp" />
@ -711,7 +711,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.8"
android:text="0"
tools:text="0"
android:textColor="@color/white"
android:textSize="16sp" />
@ -720,7 +720,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:text="0"
tools:text="0"
android:textColor="@color/white"
android:textSize="16sp" />
@ -730,7 +730,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="0"
tools:text="0"
android:textColor="@color/white"
android:textSize="16sp" />
@ -778,7 +778,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.8"
android:text="0"
tools:text="0"
android:textColor="@color/white"
android:textSize="16sp" />
@ -787,7 +787,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:text="0"
tools:text="0"
android:textColor="@color/white"
android:textSize="16sp" />
@ -796,7 +796,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="0"
tools:text="0"
android:textColor="@color/white"
android:textSize="16sp"
android:visibility="invisible" />

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

@ -199,7 +199,8 @@
android:text="@string/live_link_mic_3"
android:textColor="@color/color_white"
android:textSize="13sp"
android:visibility="gone" />
android:visibility="gone"
tools:visibility="visible"/>
<com.yunbao.live.custom.MyFrameLayout3

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

@ -3083,7 +3083,7 @@
android:layout_marginStart="35dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="20dp"
android:text="主播名稱"
tools:text="主播名稱"
android:textColor="@color/white"
android:textSize="14sp"
android:visibility="visible"
@ -3132,7 +3132,7 @@
android:layout_marginTop="5dp"
android:background="@drawable/background_live_sud_hint"
android:visibility="gone"
tools:visibility="visible">
tools:visibility="gone">
<ImageView
android:id="@+id/tricky_coin"
@ -3190,7 +3190,7 @@
android:layout_marginTop="5dp"
android:background="@drawable/background_live_sud_hint"
android:visibility="gone"
tools:visibility="visible">
tools:visibility="gone">
<ImageView
android:id="@+id/sud_game_coin"

BIN
live/src/main/res/mipmap-hdpi/ic_live_menu_gift.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
live/src/main/res/mipmap-hdpi/live_icon_focus.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.3 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
live/src/main/res/mipmap-xhdpi/ic_live_menu_gift.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
live/src/main/res/mipmap-xxxhdpi/ic_live_menu_gift.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 26 KiB

5
live/src/main/res/values-zh/strings.xml
View File

@ -64,7 +64,7 @@
<string name="live_task_item_xp">主播經驗</string>
<string name="live_data_msg1">本場直播信息</string>
<string name="live_data_msg2">歷史數據可在主播中心查看</string>
<string name="live_data_tip">* 人數及新增相關數據非实时计算</string>
<string name="live_data_tip">* 人數及新增數據非實時計算</string>
<string name="live_user_mailbox_top_text">来自%s的信</string>
<string name="live_user_mailbox_tip_text">「%s」有更多話對你說</string>
<string name="live_user_mailbox_more_text">查看詳情</string>
@ -180,4 +180,7 @@
<string name="default_style">默認樣式</string>
<string name="anchor_initiated_prank_entertainment">主播發起了整蠱娛樂，點擊查看</string>
<string name="see_tips">查看</string>
<string name="say_title">標題</string>
<string name="say_content">内容</string>
</resources>

4
live/src/main/res/values/strings.xml
View File

@ -33,7 +33,7 @@
<string name="live_task_item_xp">exp</string>
<string name="live_data_msg1">This live information</string>
<string name="live_data_msg2">Historical data can be viewed in the anchor center</string>
<string name="live_data_tip">* Non-real-time calculation of data</string>
<string name="live_data_tip">* Numbers and data are not calculated in real time</string>
<string name="buy_guard_info" >Guardian, always be there for your anchor~ </string>
<string name="buy_guard_back_coin" >return</string>
@ -183,6 +183,8 @@
<string name="default_style">Default style</string>
<string name="anchor_initiated_prank_entertainment">The anchor initiated prank entertainment, click to view</string>
<string name="see_tips">See</string>
<string name="say_title">Title</string>
<string name="say_content">Content</string>
</resources>