diff --git a/common/src/main/res/layout/dialog_live_gift_popup2.xml b/common/src/main/res/layout/dialog_live_gift_popup2.xml
index f4b651fb0..5920e7ef8 100644
--- a/common/src/main/res/layout/dialog_live_gift_popup2.xml
+++ b/common/src/main/res/layout/dialog_live_gift_popup2.xml
@@ -215,11 +215,11 @@
app:layout_constraintEnd_toEndOf="parent" />
@@ -257,8 +257,11 @@
diff --git a/common/src/main/res/values-en-rUS/strings.xml b/common/src/main/res/values-en-rUS/strings.xml
index 6cc1bab90..8ee8d0ef7 100644
--- a/common/src/main/res/values-en-rUS/strings.xml
+++ b/common/src/main/res/values-en-rUS/strings.xml
@@ -293,8 +293,8 @@
Multi PK
Voice connection
billboard
- leave temporarily
- ResumeLive
+ BRB
+ Continue
Flash lamp
accompaniment
share
@@ -306,7 +306,7 @@
Only the rear camera can turn on the flash
Flash on failed
You\'ve been banned
- Live broadcast ended
+ Live broadcast has ended
Back to home page
Duration of live broadcast
Harvest
@@ -998,7 +998,7 @@ Limited ride And limited avatar frame
At least once every 5 minutes
When a user enters the studio, the robot will @the user and automatically
The following sentence is random. Set a minimum of 1 to a maximum of 20.
- Robot setup
+ Bot setup
High definition
fluency
Ultra hd
@@ -1025,7 +1025,7 @@ Limited ride And limited avatar frame
There is no choice, the anchor is not turned on HD live.
Sorry, this feature is on hold.
Phone Number
- Broadcast
+ Live data
Click To View
Anchor Task
I have read and agreed to the
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 497e12e49..6e09c3b4b 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -236,13 +236,13 @@
Multi PK
Voice connection
billboard
- leave temporarily
- ResumeLive
+ BRB
+ Continue
share
SinglePK
WishList
Only the rear camera can turn on the flash
- Live broadcast ended
+ Live broadcast has ended
Back to Home
Duration of live broadcast
Harvest
@@ -831,7 +831,7 @@ Limited ride And limited avatar frame
At least once every 5 minutes
When a user enters the studio, the robot will @the user and automatically
The following sentence is random. Set a minimum of 1 to a maximum of 20.
- Robot setup
+ Bot setup
High definition
fluency
Ultra hd
@@ -858,7 +858,7 @@ Limited ride And limited avatar frame
There is no choice, the anchor is not turned on HD live.
Sorry, this feature is on hold.
Phone Number
- Broadcast
+ Live data
Click To View
Anchor Task
I have read and agreed to the
diff --git a/live/src/main/java/com/yunbao/live/adapter/FrameGiftNewAdapter.java b/live/src/main/java/com/yunbao/live/adapter/FrameGiftNewAdapter.java
index 6b72ade78..768ba776a 100644
--- a/live/src/main/java/com/yunbao/live/adapter/FrameGiftNewAdapter.java
+++ b/live/src/main/java/com/yunbao/live/adapter/FrameGiftNewAdapter.java
@@ -50,6 +50,7 @@ public class FrameGiftNewAdapter extends RecyclerView.Adapter {
private List giftJson = new ArrayList<>();
private String mStream, mLiveUid, wishGiftId;
+ private boolean isWrap = false;
public FrameGiftNewAdapter(List 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 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 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 {
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java
index 93d036234..4d5bb2683 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java
@@ -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 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);
}
}
diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
index 039232dcc..fa9c437f7 100644
--- a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
+++ b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
@@ -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();
diff --git a/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java
index 169b32dce..3ebf46dd2 100644
--- a/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java
@@ -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);
diff --git a/live/src/main/res/layout/dialog_anchor_say.xml b/live/src/main/res/layout/dialog_anchor_say.xml
index 5ac30bdb8..db1761d43 100644
--- a/live/src/main/res/layout/dialog_anchor_say.xml
+++ b/live/src/main/res/layout/dialog_anchor_say.xml
@@ -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"
diff --git a/live/src/main/res/layout/item_frame_gift_new.xml b/live/src/main/res/layout/item_frame_gift_new.xml
index 28b32e688..07e3c7d22 100644
--- a/live/src/main/res/layout/item_frame_gift_new.xml
+++ b/live/src/main/res/layout/item_frame_gift_new.xml
@@ -40,22 +40,22 @@
tools:src="@mipmap/gif_rose" />
+
+ app:layout_constraintTop_toBottomOf="@+id/giftNameTv" />
+
+ app:constraint_referenced_ids="giftNamingBg,avatar,naming_name"
+ tools:visibility="gone" />
+ tools:visibility="gone" />
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/live/src/main/res/layout/view_live_audience.xml b/live/src/main/res/layout/view_live_audience.xml
index 8e783c578..dc66531af 100644
--- a/live/src/main/res/layout/view_live_audience.xml
+++ b/live/src/main/res/layout/view_live_audience.xml
@@ -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"
diff --git a/live/src/main/res/layout/view_live_end.xml b/live/src/main/res/layout/view_live_end.xml
index 16784a5f5..6b9a9f8c8 100644
--- a/live/src/main/res/layout/view_live_end.xml
+++ b/live/src/main/res/layout/view_live_end.xml
@@ -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 @@
-
@@ -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" />
diff --git a/live/src/main/res/layout/view_live_push_sw.xml b/live/src/main/res/layout/view_live_push_sw.xml
index 6aa05101e..086acd8f9 100644
--- a/live/src/main/res/layout/view_live_push_sw.xml
+++ b/live/src/main/res/layout/view_live_push_sw.xml
@@ -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"/>
+ tools:visibility="gone">
+ tools:visibility="gone">
主播經驗
本場直播信息
歷史數據可在主播中心查看
- * 人數及新增相關數據非实时计算
+ * 人數及新增數據非實時計算
来自%s的信
「%s」有更多話對你說
查看詳情
@@ -180,4 +180,7 @@
默認樣式
主播發起了整蠱娛樂，點擊查看
查看
+ 標題
+ 内容
+
diff --git a/live/src/main/res/values/strings.xml b/live/src/main/res/values/strings.xml
index 6d008d159..28835567f 100644
--- a/live/src/main/res/values/strings.xml
+++ b/live/src/main/res/values/strings.xml
@@ -33,7 +33,7 @@
exp
This live information
Historical data can be viewed in the anchor center
- * Non-real-time calculation of data
+ * Numbers and data are not calculated in real time
Guardian, always be there for your anchor~
return
@@ -183,6 +183,8 @@
Default style
The anchor initiated prank entertainment, click to view
See
+ Title
+ Content
\ No newline at end of file