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
commit 87e372e8f9
12 changed files with 105 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/tmp/full-r8-config.txt
View File

@ -1,4 +1,4 @@
# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1
# The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1
# This is a configuration file for ProGuard.
# http://proguard.sourceforge.net/index.html#manual/usage.html
#
@ -95,8 +95,8 @@
# These classes are duplicated between android.jar and core-lambda-stubs.jar.
-dontnote java.lang.invoke.**
# End of content from D:\AndroidProject\pandorapan\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1
# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\app\proguard-rules.pro
# End of content from D:\AndroidProject\pandorapanP\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1
# The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\app\proguard-rules.pro
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /Users/macpro/Library/Android/sdk/tools/proguard/proguard-android.txt
@ -420,8 +420,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
-ignorewarnings
# End of content from D:\AndroidProject\pandorapan\app\proguard-rules.pro
# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\link_testRelease\processLink_testReleaseResources\aapt_rules.txt
# End of content from D:\AndroidProject\pandorapanP\app\proguard-rules.pro
# The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\app\build\intermediates\aapt_proguard_file\link_onlineRelease\processLink_onlineReleaseResources\aapt_rules.txt
-keep class androidx.core.app.CoreComponentFactory { <init>(); }
-keep class androidx.core.content.FileProvider { <init>(); }
-keep class androidx.core.content.FileProvider4Utils { <init>(); }
@ -1094,10 +1094,10 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
-keepclassmembers class * { *** videoEditClick(android.view.View); }
# End of content from D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\link_testRelease\processLink_testReleaseResources\aapt_rules.txt
# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\lib0\proguard.txt
# End of content from D:\AndroidProject\pandorapanP\app\build\intermediates\aapt_proguard_file\link_onlineRelease\processLink_onlineReleaseResources\aapt_rules.txt
# The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\lib_faceunity\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
# End of content from D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\lib0\proguard.txt
# End of content from D:\AndroidProject\pandorapanP\lib_faceunity\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\8d3e3177c15403546de73d87508067d6\transformed\jetified-XPopup-2.10.0\proguard.txt
# Generated keep rule for Lifecycle observer adapter.
-if class com.lxj.xpopup.core.BasePopupView {
@ -1157,9 +1157,9 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\a1df9a6aa192455030f7c9970b70e0e9\transformed\material-1.4.0\proguard.txt
# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\lib0\proguard.txt
# The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\lib_google\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
# End of content from D:\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\lib0\proguard.txt
# End of content from D:\AndroidProject\pandorapanP\lib_google\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\2929985d9627ba3bb45a0ebd18eaf9d3\transformed\jetified-linesdk-5.0.1\proguard.txt
-keepattributes *Annotation*
@ -1510,9 +1510,9 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
public boolean isLayoutSuppressed();
}
# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\e9de7db2640f13ae2ab2a585dfd19337\transformed\recyclerview-1.2.1\proguard.txt
# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\TabLayout\build\intermediates\consumer_proguard_dir\release\exportReleaseConsumerProguardFiles\lib0\proguard.txt
# The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\TabLayout\build\intermediates\consumer_proguard_dir\release\exportReleaseConsumerProguardFiles\lib0\proguard.txt
# End of content from D:\AndroidProject\pandorapan\TabLayout\build\intermediates\consumer_proguard_dir\release\exportReleaseConsumerProguardFiles\lib0\proguard.txt
# End of content from D:\AndroidProject\pandorapanP\TabLayout\build\intermediates\consumer_proguard_dir\release\exportReleaseConsumerProguardFiles\lib0\proguard.txt
# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\bb5ec4ef561b90312eb1ca52da1f144d\transformed\jetified-facebook-applinks-15.2.0\proguard.txt
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.

16
common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
View File

@ -1,6 +1,7 @@
package com.yunbao.common.fragment;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -19,6 +20,7 @@ import com.yunbao.common.bean.WishModel2;
import com.yunbao.common.event.LiveNewWishListCloseEvent;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
@ -34,7 +36,11 @@ public class LiveNewWishListFragment extends BaseFragment {
private RecyclerView wishList;
private LiveNewWishAdapter liveNewWishAdapter;
private ImageView imageView2, tvDone;
private CommonCallback<Boolean> mSetResultCallback ;
public void setResultCallback(CommonCallback<Boolean> mCommonCallback) {
this.mSetResultCallback = mCommonCallback;
}
@Override
public View createView(LayoutInflater layoutInflater, ViewGroup viewGroup) {
return layoutInflater.inflate(R.layout.view_live_new_wish, viewGroup, false);
@ -151,6 +157,9 @@ public class LiveNewWishListFragment extends BaseFragment {
@Override
public void onSuccess(String data) {
ToastUtil.show(WordUtil.isNewZh()?"修改成功":"Success");
if (mSetResultCallback!=null){
mSetResultCallback.callback(true);
}
}
@Override
@ -183,6 +192,10 @@ public class LiveNewWishListFragment extends BaseFragment {
@Override
public void onSuccess(String data) {
ToastUtil.show(WordUtil.isNewZh()?"修改成功":"Success");
//这里需要通知刷新心愿信息
if (mSetResultCallback!=null){
mSetResultCallback.callback(true);
}
}
@Override
@ -202,6 +215,9 @@ public class LiveNewWishListFragment extends BaseFragment {
@Override
public void onSuccess(String data) {
ToastUtil.show(WordUtil.isNewZh()?"修改成功":"Success");
if (mSetResultCallback!=null){
mSetResultCallback.callback(true);
}
}
@Override

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

@ -263,7 +263,7 @@ public interface PDLiveApi {
/**
* PK排位赛接口
*/
@GET("/api/public/?service=Ranking.getAnchorRankData")
@GET("/api/public/?service=Ranking.getAnchorRankData&app_from=PDL")
Observable<ResponseModel<PkRankBean>> getPkRanksList(@Query("anchor_id") String anchorId, @Query("anchor_id2") String pkUid);
/**

13
common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java
View File

@ -2,6 +2,8 @@ package com.yunbao.common.views;
import android.graphics.Color;
import android.text.TextUtils;
import android.util.Log;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -28,6 +30,7 @@ import com.yunbao.common.event.PopupViewDismissEvent;
import com.yunbao.common.fragment.LiveNewWishListFragment;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DpUtil;
@ -61,6 +64,12 @@ public class LiveNewWishListPopup extends BottomPopupView {
private LiveNewWishListFragment dayWishFragment, zhouXinFragment, lunarWishFragment, seasonalWishFragment;
private ImageView wishListTop;
private CommonCallback<Boolean> mSetResultCallback ;
public void setResultCallback(CommonCallback<Boolean> mCommonCallback) {
this.mSetResultCallback = mCommonCallback;
}
public LiveNewWishListPopup(@NonNull FragmentActivity context) {
super(context);
mContext = context;
@ -198,6 +207,10 @@ public class LiveNewWishListPopup extends BottomPopupView {
zhouXinFragment = LiveNewWishListFragment.newInstance(2);
lunarWishFragment = LiveNewWishListFragment.newInstance(3);
seasonalWishFragment = LiveNewWishListFragment.newInstance(4);
dayWishFragment.setResultCallback(mSetResultCallback);
zhouXinFragment.setResultCallback(mSetResultCallback);
lunarWishFragment.setResultCallback(mSetResultCallback);
seasonalWishFragment.setResultCallback(mSetResultCallback);
ViewList.add(dayWishFragment);
ViewList.add(zhouXinFragment);
ViewList.add(lunarWishFragment);

2
common/src/main/java/com/yunbao/common/views/LiveOpenCustomPopup.java
View File

@ -178,7 +178,7 @@ public class LiveOpenCustomPopup extends BottomPopupView {
@Override
public void onSuccess(LiveStetUpStatusModel data) {
textLiveWishlist.setText(data.getWishListState() ? R.string.do_set : R.string.not_set);
textRobot.setText(data.getAiStateState() ? R.string.robot_yes : R.string.robot_no);
textRobot.setText(data.getAiStateState() ? R.string.robot_on : R.string.robot_off);
}
@Override

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

@ -1012,6 +1012,7 @@ Limited ride And limited avatar frame</string>
<string name="not_set">Not set</string>
<string name="robot_no">no</string>
<string name="robot_yes">yes</string>
<string name="ultra_hd_hint">Ultra HD hint</string>
<string name="ultra_hd_hint2">In the case of unstable network speed, the selection of ultra HD may lead to the delay of the picture in the broadcast room. Do you confirm the selection?</string>
<string name="stick_to_choice">Stick to choice</string>
@ -1504,7 +1505,9 @@ Limited ride And limited avatar frame</string>
<string name="live_interaction_god_say">Notice</string>
<string name="live_interaction_ask_question">Start Q&amp;A</string>
<string name="ai_anguage_settings">Language Settings</string>
<string name="open_vip_live">openVip</string>
<string name="open_vip_live">open Vip</string>
<string name="chang_langue_tips">After this setting, all robot languages will be covered by translation, please confirm whether this operation is completed!</string>
<string name="return_str">return</string>
<string name="robot_on">ON</string>
<string name="robot_off">OFF</string>
</resources>

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

@ -1638,4 +1638,6 @@
<string name="open_vip_live">開通貴族</string>
<string name="chang_langue_tips">此設定後，所有機器人語言將會被翻譯覆蓋，請確認是否完成此操作</string>
<string name="return_str">返回</string>
<string name="robot_on">開</string>
<string name="robot_off">關</string>
</resources>

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

@ -1447,9 +1447,12 @@ Limited ride And limited avatar frame</string>
<string name="live_interaction_game">Game</string>
<string name="live_interaction_god_say">Notice</string>
<string name="live_interaction_ask_question">Start Q&amp;A</string>
<string name="open_vip_live">openVip</string>
<string name="open_vip_live">open Vip</string>
<string name="ai_anguage_settings">Language Settings</string>
<string name="chang_langue_tips">After this setting, all robot languages will be covered by translation, please confirm whether this operation is completed!</string>
<string name="return_str">return</string>
<string name="robot_on">ON</string>
<string name="robot_off">OFF</string>
</resources>

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"

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

@ -77,8 +77,6 @@ import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.GradientDrawable;
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 com.yunbao.video.activity.VideoPlayActivity;
import com.yunbao.video.utils.VideoStorge;
@ -788,17 +786,18 @@ public class UserHomeActivity extends AbsActivity {
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");
new com.yunbao.common.dialog.GiftWallDialog(mContext, uid,userInfo.getUserHomeTopInfo().getUser_name(), null,isAnchor).setFullWindows(true).showDialog();
// 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() {