Merge remote-tracking branch 'origin/新潘多拉_6.8.2' into 新潘多拉_6.8.2
This commit is contained in:
commit
87e372e8f9
@ -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.
|
# This is a configuration file for ProGuard.
|
||||||
# http://proguard.sourceforge.net/index.html#manual/usage.html
|
# 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.
|
# These classes are duplicated between android.jar and core-lambda-stubs.jar.
|
||||||
-dontnote java.lang.invoke.**
|
-dontnote java.lang.invoke.**
|
||||||
|
|
||||||
# End of content from D:\AndroidProject\pandorapan\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1
|
# 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\pandorapan\app\proguard-rules.pro
|
# The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\app\proguard-rules.pro
|
||||||
# Add project specific ProGuard rules here.
|
# Add project specific ProGuard rules here.
|
||||||
# By default, the flags in this file are appended to flags specified
|
# By default, the flags in this file are appended to flags specified
|
||||||
# in /Users/macpro/Library/Android/sdk/tools/proguard/proguard-android.txt
|
# in /Users/macpro/Library/Android/sdk/tools/proguard/proguard-android.txt
|
||||||
@ -420,8 +420,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
|
|||||||
-ignorewarnings
|
-ignorewarnings
|
||||||
|
|
||||||
|
|
||||||
# End of content from D:\AndroidProject\pandorapan\app\proguard-rules.pro
|
# End of content from D:\AndroidProject\pandorapanP\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
|
# 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.app.CoreComponentFactory { <init>(); }
|
||||||
-keep class androidx.core.content.FileProvider { <init>(); }
|
-keep class androidx.core.content.FileProvider { <init>(); }
|
||||||
-keep class androidx.core.content.FileProvider4Utils { <init>(); }
|
-keep class androidx.core.content.FileProvider4Utils { <init>(); }
|
||||||
@ -1094,10 +1094,10 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
|
|||||||
-keepclassmembers class * { *** videoEditClick(android.view.View); }
|
-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
|
# 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\pandorapan\lib_faceunity\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_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
|
# 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.
|
# Generated keep rule for Lifecycle observer adapter.
|
||||||
-if class com.lxj.xpopup.core.BasePopupView {
|
-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
|
# 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
|
# 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*
|
-keepattributes *Annotation*
|
||||||
|
|
||||||
@ -1510,9 +1510,9 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
|
|||||||
public boolean isLayoutSuppressed();
|
public boolean isLayoutSuppressed();
|
||||||
}
|
}
|
||||||
# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\e9de7db2640f13ae2ab2a585dfd19337\transformed\recyclerview-1.2.1\proguard.txt
|
# 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
|
# 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.
|
# Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package com.yunbao.common.fragment;
|
package com.yunbao.common.fragment;
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
@ -19,6 +20,7 @@ import com.yunbao.common.bean.WishModel2;
|
|||||||
import com.yunbao.common.event.LiveNewWishListCloseEvent;
|
import com.yunbao.common.event.LiveNewWishListCloseEvent;
|
||||||
import com.yunbao.common.http.base.HttpCallback;
|
import com.yunbao.common.http.base.HttpCallback;
|
||||||
import com.yunbao.common.http.live.LiveNetManager;
|
import com.yunbao.common.http.live.LiveNetManager;
|
||||||
|
import com.yunbao.common.interfaces.CommonCallback;
|
||||||
import com.yunbao.common.utils.Bus;
|
import com.yunbao.common.utils.Bus;
|
||||||
import com.yunbao.common.utils.ToastUtil;
|
import com.yunbao.common.utils.ToastUtil;
|
||||||
import com.yunbao.common.utils.WordUtil;
|
import com.yunbao.common.utils.WordUtil;
|
||||||
@ -34,7 +36,11 @@ public class LiveNewWishListFragment extends BaseFragment {
|
|||||||
private RecyclerView wishList;
|
private RecyclerView wishList;
|
||||||
private LiveNewWishAdapter liveNewWishAdapter;
|
private LiveNewWishAdapter liveNewWishAdapter;
|
||||||
private ImageView imageView2, tvDone;
|
private ImageView imageView2, tvDone;
|
||||||
|
private CommonCallback<Boolean> mSetResultCallback ;
|
||||||
|
|
||||||
|
public void setResultCallback(CommonCallback<Boolean> mCommonCallback) {
|
||||||
|
this.mSetResultCallback = mCommonCallback;
|
||||||
|
}
|
||||||
@Override
|
@Override
|
||||||
public View createView(LayoutInflater layoutInflater, ViewGroup viewGroup) {
|
public View createView(LayoutInflater layoutInflater, ViewGroup viewGroup) {
|
||||||
return layoutInflater.inflate(R.layout.view_live_new_wish, viewGroup, false);
|
return layoutInflater.inflate(R.layout.view_live_new_wish, viewGroup, false);
|
||||||
@ -151,6 +157,9 @@ public class LiveNewWishListFragment extends BaseFragment {
|
|||||||
@Override
|
@Override
|
||||||
public void onSuccess(String data) {
|
public void onSuccess(String data) {
|
||||||
ToastUtil.show(WordUtil.isNewZh()?"修改成功":"Success");
|
ToastUtil.show(WordUtil.isNewZh()?"修改成功":"Success");
|
||||||
|
if (mSetResultCallback!=null){
|
||||||
|
mSetResultCallback.callback(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -183,6 +192,10 @@ public class LiveNewWishListFragment extends BaseFragment {
|
|||||||
@Override
|
@Override
|
||||||
public void onSuccess(String data) {
|
public void onSuccess(String data) {
|
||||||
ToastUtil.show(WordUtil.isNewZh()?"修改成功":"Success");
|
ToastUtil.show(WordUtil.isNewZh()?"修改成功":"Success");
|
||||||
|
//这里需要通知刷新心愿信息
|
||||||
|
if (mSetResultCallback!=null){
|
||||||
|
mSetResultCallback.callback(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -202,6 +215,9 @@ public class LiveNewWishListFragment extends BaseFragment {
|
|||||||
@Override
|
@Override
|
||||||
public void onSuccess(String data) {
|
public void onSuccess(String data) {
|
||||||
ToastUtil.show(WordUtil.isNewZh()?"修改成功":"Success");
|
ToastUtil.show(WordUtil.isNewZh()?"修改成功":"Success");
|
||||||
|
if (mSetResultCallback!=null){
|
||||||
|
mSetResultCallback.callback(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -263,7 +263,7 @@ public interface PDLiveApi {
|
|||||||
/**
|
/**
|
||||||
* PK排位赛接口
|
* 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);
|
Observable<ResponseModel<PkRankBean>> getPkRanksList(@Query("anchor_id") String anchorId, @Query("anchor_id2") String pkUid);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -2,6 +2,8 @@ package com.yunbao.common.views;
|
|||||||
|
|
||||||
import android.graphics.Color;
|
import android.graphics.Color;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.view.KeyEvent;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
@ -28,6 +30,7 @@ import com.yunbao.common.event.PopupViewDismissEvent;
|
|||||||
import com.yunbao.common.fragment.LiveNewWishListFragment;
|
import com.yunbao.common.fragment.LiveNewWishListFragment;
|
||||||
import com.yunbao.common.http.base.HttpCallback;
|
import com.yunbao.common.http.base.HttpCallback;
|
||||||
import com.yunbao.common.http.live.LiveNetManager;
|
import com.yunbao.common.http.live.LiveNetManager;
|
||||||
|
import com.yunbao.common.interfaces.CommonCallback;
|
||||||
import com.yunbao.common.manager.IMLoginManager;
|
import com.yunbao.common.manager.IMLoginManager;
|
||||||
import com.yunbao.common.utils.Bus;
|
import com.yunbao.common.utils.Bus;
|
||||||
import com.yunbao.common.utils.DpUtil;
|
import com.yunbao.common.utils.DpUtil;
|
||||||
@ -61,6 +64,12 @@ public class LiveNewWishListPopup extends BottomPopupView {
|
|||||||
private LiveNewWishListFragment dayWishFragment, zhouXinFragment, lunarWishFragment, seasonalWishFragment;
|
private LiveNewWishListFragment dayWishFragment, zhouXinFragment, lunarWishFragment, seasonalWishFragment;
|
||||||
private ImageView wishListTop;
|
private ImageView wishListTop;
|
||||||
|
|
||||||
|
private CommonCallback<Boolean> mSetResultCallback ;
|
||||||
|
|
||||||
|
public void setResultCallback(CommonCallback<Boolean> mCommonCallback) {
|
||||||
|
this.mSetResultCallback = mCommonCallback;
|
||||||
|
}
|
||||||
|
|
||||||
public LiveNewWishListPopup(@NonNull FragmentActivity context) {
|
public LiveNewWishListPopup(@NonNull FragmentActivity context) {
|
||||||
super(context);
|
super(context);
|
||||||
mContext = context;
|
mContext = context;
|
||||||
@ -198,6 +207,10 @@ public class LiveNewWishListPopup extends BottomPopupView {
|
|||||||
zhouXinFragment = LiveNewWishListFragment.newInstance(2);
|
zhouXinFragment = LiveNewWishListFragment.newInstance(2);
|
||||||
lunarWishFragment = LiveNewWishListFragment.newInstance(3);
|
lunarWishFragment = LiveNewWishListFragment.newInstance(3);
|
||||||
seasonalWishFragment = LiveNewWishListFragment.newInstance(4);
|
seasonalWishFragment = LiveNewWishListFragment.newInstance(4);
|
||||||
|
dayWishFragment.setResultCallback(mSetResultCallback);
|
||||||
|
zhouXinFragment.setResultCallback(mSetResultCallback);
|
||||||
|
lunarWishFragment.setResultCallback(mSetResultCallback);
|
||||||
|
seasonalWishFragment.setResultCallback(mSetResultCallback);
|
||||||
ViewList.add(dayWishFragment);
|
ViewList.add(dayWishFragment);
|
||||||
ViewList.add(zhouXinFragment);
|
ViewList.add(zhouXinFragment);
|
||||||
ViewList.add(lunarWishFragment);
|
ViewList.add(lunarWishFragment);
|
||||||
|
@ -178,7 +178,7 @@ public class LiveOpenCustomPopup extends BottomPopupView {
|
|||||||
@Override
|
@Override
|
||||||
public void onSuccess(LiveStetUpStatusModel data) {
|
public void onSuccess(LiveStetUpStatusModel data) {
|
||||||
textLiveWishlist.setText(data.getWishListState() ? R.string.do_set : R.string.not_set);
|
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
|
@Override
|
||||||
|
@ -1012,6 +1012,7 @@ Limited ride And limited avatar frame</string>
|
|||||||
<string name="not_set">Not set</string>
|
<string name="not_set">Not set</string>
|
||||||
<string name="robot_no">no</string>
|
<string name="robot_no">no</string>
|
||||||
<string name="robot_yes">yes</string>
|
<string name="robot_yes">yes</string>
|
||||||
|
|
||||||
<string name="ultra_hd_hint">Ultra HD hint</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="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>
|
<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_god_say">Notice</string>
|
||||||
<string name="live_interaction_ask_question">Start Q&A</string>
|
<string name="live_interaction_ask_question">Start Q&A</string>
|
||||||
<string name="ai_anguage_settings">Language Settings</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="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="return_str">return</string>
|
||||||
|
<string name="robot_on">ON</string>
|
||||||
|
<string name="robot_off">OFF</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -1638,4 +1638,6 @@
|
|||||||
<string name="open_vip_live">開通貴族</string>
|
<string name="open_vip_live">開通貴族</string>
|
||||||
<string name="chang_langue_tips">此設定後,所有機器人語言將會被翻譯覆蓋,請確認是否完成此操作</string>
|
<string name="chang_langue_tips">此設定後,所有機器人語言將會被翻譯覆蓋,請確認是否完成此操作</string>
|
||||||
<string name="return_str">返回</string>
|
<string name="return_str">返回</string>
|
||||||
|
<string name="robot_on">開</string>
|
||||||
|
<string name="robot_off">關</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -1447,9 +1447,12 @@ Limited ride And limited avatar frame</string>
|
|||||||
<string name="live_interaction_game">Game</string>
|
<string name="live_interaction_game">Game</string>
|
||||||
<string name="live_interaction_god_say">Notice</string>
|
<string name="live_interaction_god_say">Notice</string>
|
||||||
<string name="live_interaction_ask_question">Start Q&A</string>
|
<string name="live_interaction_ask_question">Start Q&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="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="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="return_str">return</string>
|
||||||
|
<string name="robot_on">ON</string>
|
||||||
|
<string name="robot_off">OFF</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -68,6 +68,7 @@ import com.yunbao.common.http.HttpClient;
|
|||||||
import com.yunbao.common.http.LiveHttpConsts;
|
import com.yunbao.common.http.LiveHttpConsts;
|
||||||
import com.yunbao.common.http.LiveHttpUtil;
|
import com.yunbao.common.http.LiveHttpUtil;
|
||||||
import com.yunbao.common.http.live.LiveNetManager;
|
import com.yunbao.common.http.live.LiveNetManager;
|
||||||
|
import com.yunbao.common.interfaces.CommonCallback;
|
||||||
import com.yunbao.common.manager.IMLoginManager;
|
import com.yunbao.common.manager.IMLoginManager;
|
||||||
import com.yunbao.common.manager.MicUserManager;
|
import com.yunbao.common.manager.MicUserManager;
|
||||||
import com.yunbao.common.manager.MicedUserManager;
|
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) {
|
// if (mContext instanceof LiveRyAnchorActivity) {
|
||||||
// fragment.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "LiveWishListDialogFragment");
|
// fragment.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "LiveWishListDialogFragment");
|
||||||
// }
|
// }
|
||||||
|
LiveNewWishListPopup popup= new LiveNewWishListPopup(LiveSwAnchorActivity.this);
|
||||||
|
popup.setResultCallback(resultCallBack);
|
||||||
new XPopup.Builder(mContext)
|
new XPopup.Builder(mContext)
|
||||||
.enableDrag(false)
|
.enableDrag(false)
|
||||||
.asCustom(new LiveNewWishListPopup(LiveSwAnchorActivity.this))
|
.asCustom(popup)
|
||||||
|
|
||||||
.show();
|
.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3471,6 +3471,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
initWishListData(wishlistBean);
|
initWishListData(wishlistBean);
|
||||||
|
}else {
|
||||||
|
stopPart2Flipper(wishFlipperRoot);
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
@ -3518,7 +3520,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
* @param view 要从翻页器中移除的视图
|
* @param view 要从翻页器中移除的视图
|
||||||
*/
|
*/
|
||||||
private void stopPart2Flipper(View view) {
|
private void stopPart2Flipper(View view) {
|
||||||
if (view == null) return;
|
if (view == null || newPart2Flipper==null) return;
|
||||||
// 获取翻页器中当前的子视图数量,以判断是否满足停止翻页的条件
|
// 获取翻页器中当前的子视图数量,以判断是否满足停止翻页的条件
|
||||||
newPart2Flipper.getChildCount();
|
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) {
|
public void showGiftWall(String toUid, boolean isAnchor, String mAnchorName, String mAvatarUrl) {
|
||||||
GiftWallDialog giftWallDialog = new GiftWallDialog();
|
// GiftWallDialog giftWallDialog = new GiftWallDialog();
|
||||||
Bundle bundle = new Bundle();
|
new com.yunbao.common.dialog.GiftWallDialog(mContext, toUid, mAnchorName, toUid, isAnchor).setFullWindows(false).showDialog();
|
||||||
bundle.putString(Constants.LIVE_UID, mLiveUid);
|
// Bundle bundle = new Bundle();
|
||||||
bundle.putString(Constants.LIVE_STREAM, mStream);
|
// bundle.putString(Constants.LIVE_UID, mLiveUid);
|
||||||
bundle.putString("mAnchorName", mAnchorName);
|
// bundle.putString(Constants.LIVE_STREAM, mStream);
|
||||||
bundle.putString("mAvatarUrl", mAvatarUrl);
|
// bundle.putString("mAnchorName", mAnchorName);
|
||||||
bundle.putString("toUid", toUid);
|
// bundle.putString("mAvatarUrl", mAvatarUrl);
|
||||||
bundle.putInt("isAttention", isAttention);
|
// bundle.putString("toUid", toUid);
|
||||||
bundle.putBoolean("isLive", isAnchor);
|
// bundle.putInt("isAttention", isAttention);
|
||||||
bundle.putBoolean("SBW", !(mContext instanceof LiveSwAnchorActivity || mContext instanceof LiveRyAnchorActivity));
|
// bundle.putBoolean("isLive", isAnchor);
|
||||||
giftWallDialog.setArguments(bundle);
|
// bundle.putBoolean("SBW", !(mContext instanceof LiveSwAnchorActivity || mContext instanceof LiveRyAnchorActivity));
|
||||||
giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog");
|
// giftWallDialog.setArguments(bundle);
|
||||||
|
// giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -144,7 +144,7 @@
|
|||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
android:layout_marginEnd="8dp"
|
android:layout_marginEnd="8dp"
|
||||||
android:paddingStart="5dp"
|
android:paddingStart="5dp"
|
||||||
android:paddingEnd="5dp"
|
android:paddingEnd="4.5dp"
|
||||||
android:src="@mipmap/ic_live_new_voice"
|
android:src="@mipmap/ic_live_new_voice"
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/et_input"
|
app:layout_constraintBottom_toBottomOf="@+id/et_input"
|
||||||
app:layout_constraintEnd_toEndOf="@+id/et_input"
|
app:layout_constraintEnd_toEndOf="@+id/et_input"
|
||||||
@ -178,13 +178,15 @@
|
|||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/pd_pao"
|
android:id="@+id/pd_pao"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="0dp"
|
||||||
android:padding="5dp"
|
android:padding="4.5dp"
|
||||||
|
app:layout_constraintDimensionRatio="1"
|
||||||
android:src="@mipmap/ic_live_menu_panda"
|
android:src="@mipmap/ic_live_menu_panda"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/gift_image"
|
app:layout_constraintEnd_toStartOf="@+id/gift_image"
|
||||||
app:layout_constraintStart_toEndOf="@+id/btn_msg"
|
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
|
<View
|
||||||
android:id="@+id/red_point"
|
android:id="@+id/red_point"
|
||||||
@ -240,7 +242,7 @@
|
|||||||
app:layout_constraintEnd_toEndOf="@+id/pd_pao"
|
app:layout_constraintEnd_toEndOf="@+id/pd_pao"
|
||||||
app:layout_constraintStart_toStartOf="@+id/pd_pao"
|
app:layout_constraintStart_toStartOf="@+id/pd_pao"
|
||||||
app:layout_constraintTop_toTopOf="@+id/pd_pao"
|
app:layout_constraintTop_toTopOf="@+id/pd_pao"
|
||||||
tools:visibility="visible" />
|
tools:visibility="gone" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/time_text"
|
android:id="@+id/time_text"
|
||||||
@ -279,11 +281,13 @@
|
|||||||
android:id="@+id/total_image"
|
android:id="@+id/total_image"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="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"
|
android:src="@mipmap/ic_live_menu_menu"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@+id/gift_image"
|
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
|
<View
|
||||||
android:id="@+id/total_image_red_point"
|
android:id="@+id/total_image_red_point"
|
||||||
|
@ -77,8 +77,6 @@ import com.yunbao.common.utils.WordUtil;
|
|||||||
import com.yunbao.common.views.GradientDrawable;
|
import com.yunbao.common.views.GradientDrawable;
|
||||||
import com.yunbao.common.views.UserHomeImgsViewHolder;
|
import com.yunbao.common.views.UserHomeImgsViewHolder;
|
||||||
import com.yunbao.live.activity.LiveRyAnchorActivity;
|
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.activity.VideoPlayActivity;
|
||||||
import com.yunbao.video.utils.VideoStorge;
|
import com.yunbao.video.utils.VideoStorge;
|
||||||
|
|
||||||
@ -788,17 +786,18 @@ public class UserHomeActivity extends AbsActivity {
|
|||||||
itemLayout03.setOnClickListener(new View.OnClickListener() {
|
itemLayout03.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
GiftWallDialog giftWallDialog = new GiftWallDialog();
|
new com.yunbao.common.dialog.GiftWallDialog(mContext, uid,userInfo.getUserHomeTopInfo().getUser_name(), null,isAnchor).setFullWindows(true).showDialog();
|
||||||
Bundle bundle = new Bundle();
|
// GiftWallDialog giftWallDialog = new GiftWallDialog();
|
||||||
bundle.putString(Constants.LIVE_UID, uid);
|
// Bundle bundle = new Bundle();
|
||||||
bundle.putString("mAnchorName", userInfo.getUserHomeTopInfo().getUser_name());
|
// bundle.putString(Constants.LIVE_UID, uid);
|
||||||
bundle.putString("mAvatarUrl", userInfo.getUserHomeTopInfo().getUser_avatar());
|
// bundle.putString("mAnchorName", userInfo.getUserHomeTopInfo().getUser_name());
|
||||||
bundle.putString("toUid", uid);
|
// bundle.putString("mAvatarUrl", userInfo.getUserHomeTopInfo().getUser_avatar());
|
||||||
bundle.putInt("isAttention", userInfo.getUserHomeTopInfo().getIs_attention());
|
// bundle.putString("toUid", uid);
|
||||||
bundle.putBoolean("isLive", isAnchor);
|
// bundle.putInt("isAttention", userInfo.getUserHomeTopInfo().getIs_attention());
|
||||||
bundle.putBoolean("SBW", !(mContext instanceof LiveRyAnchorActivity));
|
// bundle.putBoolean("isLive", isAnchor);
|
||||||
giftWallDialog.setArguments(bundle);
|
// bundle.putBoolean("SBW", !(mContext instanceof LiveRyAnchorActivity));
|
||||||
giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog");
|
// giftWallDialog.setArguments(bundle);
|
||||||
|
// giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
itemLayout04.setOnClickListener(new View.OnClickListener() {
|
itemLayout04.setOnClickListener(new View.OnClickListener() {
|
||||||
|
Loading…
Reference in New Issue
Block a user