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

Merge remote-tracking branch 'origin/新潘多拉_6.8.2' into 新潘多拉_6.8.2

Browse Source
This commit is contained in:
ningwenqiang
2024-10-16 15:09:01 +08:00
parent fb09b8ef35 ecb44e510a
commit 87e372e8f9
12 changed files with 105 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java
View File

@@ -68,6 +68,7 @@ import com.yunbao.common.http.HttpClient;
import com.yunbao.common.http.LiveHttpConsts;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.manager.MicUserManager;
import com.yunbao.common.manager.MicedUserManager;
@@ -588,6 +589,14 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
}
private CommonCallback<Boolean> resultCallBack = new CommonCallback<Boolean>() {
@Override
public void callback(Boolean bean) {
if(true && mLiveRoomViewHolder!=null){
mLiveRoomViewHolder.initWishData();
}
}
};
/**
* 打开心愿单窗口
*/
@@ -596,10 +605,11 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
// if (mContext instanceof LiveRyAnchorActivity) {
// fragment.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "LiveWishListDialogFragment");
// }
LiveNewWishListPopup popup= new LiveNewWishListPopup(LiveSwAnchorActivity.this);
popup.setResultCallback(resultCallBack);
new XPopup.Builder(mContext)
.enableDrag(false)
.asCustom(new LiveNewWishListPopup(LiveSwAnchorActivity.this))
.asCustom(popup)
.show();
}

29
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@@ -3471,6 +3471,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
}
initWishListData(wishlistBean);
}else {
stopPart2Flipper(wishFlipperRoot);
}
} catch (Exception e) {
e.printStackTrace();
@@ -3518,7 +3520,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
* @param view 要从翻页器中移除的视图
*/
private void stopPart2Flipper(View view) {
if (view == null) return;
if (view == null || newPart2Flipper==null) return;
// 获取翻页器中当前的子视图数量，以判断是否满足停止翻页的条件
newPart2Flipper.getChildCount();
@@ -4219,18 +4221,19 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
public void showGiftWall(String toUid, boolean isAnchor, String mAnchorName, String mAvatarUrl) {
GiftWallDialog giftWallDialog = new GiftWallDialog();
Bundle bundle = new Bundle();
bundle.putString(Constants.LIVE_UID, mLiveUid);
bundle.putString(Constants.LIVE_STREAM, mStream);
bundle.putString("mAnchorName", mAnchorName);
bundle.putString("mAvatarUrl", mAvatarUrl);
bundle.putString("toUid", toUid);
bundle.putInt("isAttention", isAttention);
bundle.putBoolean("isLive", isAnchor);
bundle.putBoolean("SBW", !(mContext instanceof LiveSwAnchorActivity || mContext instanceof LiveRyAnchorActivity));
giftWallDialog.setArguments(bundle);
giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog");
// GiftWallDialog giftWallDialog = new GiftWallDialog();
new com.yunbao.common.dialog.GiftWallDialog(mContext, toUid, mAnchorName, toUid, isAnchor).setFullWindows(false).showDialog();
// Bundle bundle = new Bundle();
// bundle.putString(Constants.LIVE_UID, mLiveUid);
// bundle.putString(Constants.LIVE_STREAM, mStream);
// bundle.putString("mAnchorName", mAnchorName);
// bundle.putString("mAvatarUrl", mAvatarUrl);
// bundle.putString("toUid", toUid);
// bundle.putInt("isAttention", isAttention);
// bundle.putBoolean("isLive", isAnchor);
// bundle.putBoolean("SBW", !(mContext instanceof LiveSwAnchorActivity || mContext instanceof LiveRyAnchorActivity));
// giftWallDialog.setArguments(bundle);
// giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog");
}

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

@@ -144,7 +144,7 @@
android:layout_height="0dp"
android:layout_marginEnd="8dp"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:paddingEnd="4.5dp"
android:src="@mipmap/ic_live_new_voice"
app:layout_constraintBottom_toBottomOf="@+id/et_input"
app:layout_constraintEnd_toEndOf="@+id/et_input"
@@ -178,13 +178,15 @@
<ImageView
android:id="@+id/pd_pao"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dp"
android:layout_width="0dp"
android:layout_height="0dp"
android:padding="4.5dp"
app:layout_constraintDimensionRatio="1"
android:src="@mipmap/ic_live_menu_panda"
app:layout_constraintEnd_toStartOf="@+id/gift_image"
app:layout_constraintStart_toEndOf="@+id/btn_msg"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="@+id/btn_msg"
app:layout_constraintBottom_toBottomOf="@+id/btn_msg" />
<View
android:id="@+id/red_point"
@@ -240,7 +242,7 @@
app:layout_constraintEnd_toEndOf="@+id/pd_pao"
app:layout_constraintStart_toStartOf="@+id/pd_pao"
app:layout_constraintTop_toTopOf="@+id/pd_pao"
tools:visibility="visible" />
tools:visibility="gone" />
<TextView
android:id="@+id/time_text"
@@ -279,11 +281,13 @@
android:id="@+id/total_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dp"
android:padding="4.5dp"
app:layout_constraintDimensionRatio="1"
android:src="@mipmap/ic_live_menu_menu"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/gift_image"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="@+id/gift_image"
app:layout_constraintBottom_toBottomOf="@+id/gift_image" />
<View
android:id="@+id/total_image_red_point"