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

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>