diff --git a/app/tmp/full-r8-config.txt b/app/tmp/full-r8-config.txt index b0731b31e..b2e167dd7 100644 --- a/app/tmp/full-r8-config.txt +++ b/app/tmp/full-r8-config.txt @@ -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 { (); } -keep class androidx.core.content.FileProvider { (); } -keep class androidx.core.content.FileProvider4Utils { (); } @@ -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. diff --git a/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java b/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java index 88801f6bd..0348168f1 100644 --- a/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java +++ b/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java @@ -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 mSetResultCallback ; + public void setResultCallback(CommonCallback 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 diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java index cf01a8fe7..0cc741ee4 100644 --- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java +++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java @@ -263,7 +263,7 @@ public interface PDLiveApi { /** * PK排位赛接口 */ - @GET("/api/public/?service=Ranking.getAnchorRankData") + @GET("/api/public/?service=Ranking.getAnchorRankData&app_from=PDL") Observable> getPkRanksList(@Query("anchor_id") String anchorId, @Query("anchor_id2") String pkUid); /** diff --git a/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java b/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java index b0f409204..af38b6a8f 100644 --- a/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java +++ b/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java @@ -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 mSetResultCallback ; + + public void setResultCallback(CommonCallback 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); diff --git a/common/src/main/java/com/yunbao/common/views/LiveOpenCustomPopup.java b/common/src/main/java/com/yunbao/common/views/LiveOpenCustomPopup.java index 30910ea5d..507ee5090 100644 --- a/common/src/main/java/com/yunbao/common/views/LiveOpenCustomPopup.java +++ b/common/src/main/java/com/yunbao/common/views/LiveOpenCustomPopup.java @@ -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 diff --git a/common/src/main/res/values-en-rUS/strings.xml b/common/src/main/res/values-en-rUS/strings.xml index f3e7c73d0..7c9022141 100644 --- a/common/src/main/res/values-en-rUS/strings.xml +++ b/common/src/main/res/values-en-rUS/strings.xml @@ -1012,6 +1012,7 @@ Limited ride And limited avatar frame Not set no yes + Ultra HD hint 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? Stick to choice @@ -1504,7 +1505,9 @@ Limited ride And limited avatar frame Notice Start Q&A Language Settings - openVip + open Vip After this setting, all robot languages will be covered by translation, please confirm whether this operation is completed! return + ON + OFF diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index a2ff7bfa8..81a042d98 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1638,4 +1638,6 @@ 開通貴族 此設定後，所有機器人語言將會被翻譯覆蓋，請確認是否完成此操作 返回 + 開 + 關 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 3ccf33fc5..1e378f0cb 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1447,9 +1447,12 @@ Limited ride And limited avatar frame Game Notice Start Q&A - openVip + open Vip Language Settings After this setting, all robot languages will be covered by translation, please confirm whether this operation is completed! return + ON + OFF + diff --git a/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java index 9ffffe5c7..81455f0bd 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java @@ -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 resultCallBack = new CommonCallback() { + @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(); } diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 236c622cd..0a98d5c52 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -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"); } diff --git a/live/src/main/res/layout/view_live_audience.xml b/live/src/main/res/layout/view_live_audience.xml index dc66531af..a13a37c38 100644 --- a/live/src/main/res/layout/view_live_audience.xml +++ b/live/src/main/res/layout/view_live_audience.xml @@ -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 @@ + app:layout_constraintTop_toTopOf="@+id/btn_msg" + app:layout_constraintBottom_toBottomOf="@+id/btn_msg" /> + tools:visibility="gone" /> + app:layout_constraintTop_toTopOf="@+id/gift_image" + app:layout_constraintBottom_toBottomOf="@+id/gift_image" />