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

中英文页面适配修改

Browse Source
This commit is contained in:
18401019693
2023-09-28 14:47:10 +08:00
parent e191fb82a3
commit 4b46c72f5a
23 changed files with 293 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common/src/main/java/com/yunbao/common/bean/SudRoomListModel.java
View File

@@ -38,6 +38,17 @@ public class SudRoomListModel extends BaseModel {
private String liveUid;
@SerializedName("sex")
private String sex;
@SerializedName("sud_game_icon")
private String sudgameicon;
public String getSudgameicon() {
return sudgameicon;
}
public SudRoomListModel setSudgameicon(String sudgameicon) {
this.sudgameicon = sudgameicon;
return this;
}
public String getLiveUid() {
return liveUid;

2
common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java
View File

@@ -109,7 +109,7 @@ public class SudGameListPopup extends BottomPopupView {
@Override
public void loadData(int p, HttpCallback callback) {
page = p;
LiveHttpUtil.getRoomList(id, mSill, roomHolderType, mLiveUid, p, callback);
LiveHttpUtil.getRoomList(id, mSill, roomHolderType, mLiveUid, p-1, callback);
}
@Override

39
common/src/main/java/com/yunbao/common/sud/BaseGameViewModel.java
View File

@@ -8,7 +8,6 @@ import android.view.View;
import android.view.ViewTreeObserver;
import android.widget.Toast;
import com.yunbao.common.sud.decorator.SudFSMMGCache;
import com.yunbao.common.sud.decorator.SudFSMMGDecorator;
import com.yunbao.common.sud.decorator.SudFSMMGListener;
@@ -178,7 +177,9 @@ public abstract class BaseGameViewModel implements SudFSMMGListener {
// region 生命周期相关
/** 页面销毁的时候调用 */
/**
* 页面销毁的时候调用
*/
public void onDestroy() {
isRunning = false;
destroyMG();
@@ -186,7 +187,9 @@ public abstract class BaseGameViewModel implements SudFSMMGListener {
// endregion 生命周期相关
/** 销毁游戏 */
/**
* 销毁游戏
*/
private void destroyMG() {
if (playingGameId > 0) {
sudFSTAPPDecorator.destroyMG();
@@ -197,7 +200,9 @@ public abstract class BaseGameViewModel implements SudFSMMGListener {
}
}
/** 获取当前游戏房id */
/**
* 获取当前游戏房id
*/
public String getGameRoomId() {
return gameRoomId;
}
@@ -330,7 +335,9 @@ public abstract class BaseGameViewModel implements SudFSMMGListener {
// endregion 游戏侧回调
/** 处理code过期 */
/**
* 处理code过期
*/
public void processOnExpireCode(SudFSTAPPDecorator sudFSTAPPDecorator, ISudFSMStateHandle handle) {
// code过期，刷新code
getCode(null, getUserId(), getAppId(), new GameGetCodeListener() {
@@ -377,14 +384,16 @@ public abstract class BaseGameViewModel implements SudFSMMGListener {
});
}
/** 通知游戏，游戏视图信息 */
/**
* 通知游戏，游戏视图信息
*/
private void notifyGameViewInfo(ISudFSMStateHandle handle, int gameViewWidth, int gameViewHeight) {
GameViewInfoModel gameViewInfoModel = new GameViewInfoModel();
gameViewInfoModel.ret_code = 0;
// 游戏View大小
gameViewInfoModel.view_size.width = gameViewWidth;
gameViewInfoModel.view_size.height = gameViewHeight;
gameViewInfoModel.view_game_rect.bottom = gameViewHeight / 10;
// 游戏安全操作区域
getGameRect(gameViewInfoModel);
@@ -415,16 +424,24 @@ public abstract class BaseGameViewModel implements SudFSMMGListener {
handle.success(SudJsonUtils.toJson(gameConfigModel));
}
/** 游戏login(getCode)监听 */
/**
* 游戏login(getCode)监听
*/
public interface GameGetCodeListener {
/** 成功 */
/**
* 成功
*/
void onSuccess(String code);
/** 失败 */
/**
* 失败
*/
void onFailed();
}
/** 获取游戏状态缓存 */
/**
* 获取游戏状态缓存
*/
public SudFSMMGCache getSudFSMMGCache() {
return sudFSMMGDecorator.getSudFSMMGCache();
}

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

@@ -21,6 +21,7 @@ import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.sud.QuickStartGameViewModel;
import com.yunbao.common.sud.model.GameConfigModel;
import com.yunbao.common.sud.model.GameViewInfoModel;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
@@ -105,6 +106,7 @@ public class LiveSudGamePopup extends BottomPopupView {
GameConfigModel gameConfigModel = gameViewModel.getGameConfigModel();
gameConfigModel.ui.ping.hide = true; // 配置不隐藏ping值
gameConfigModel.ui.level.hide = true; // 配置不隐藏ping值
// SudMGP平台64bit游戏ID
gameViewModel.switchGame((Activity) getContext(), mLiveUid, mInteractionID);
}

55
common/src/main/java/com/yunbao/common/views/SudGameListViewHolder.java
View File

@@ -38,7 +38,8 @@ public class SudGameListViewHolder extends RecyclerView.ViewHolder {
private TextView roomName, playerWeAre, playerWeAre2, goldenBeanNumber;
private RoundedImageView avatarList1, avatarList2, avatarList3, avatarList4, avatarList5;
private GifImageView gifImageView;
private ImageView sex;
private ImageView sex,game_icon;
public SudGameListViewHolder(@NonNull View itemView) {
super(itemView);
@@ -46,6 +47,7 @@ public class SudGameListViewHolder extends RecyclerView.ViewHolder {
roomName = itemView.findViewById(R.id.room_name);
playerWeAre = itemView.findViewById(R.id.player_we_are);
playerWeAre2 = itemView.findViewById(R.id.player_we_are_2);
game_icon = itemView.findViewById(R.id.game_icon);
goldenBeanNumber = itemView.findViewById(R.id.golden_bean_number);
gifImageView = itemView.findViewById(R.id.btn_live);
avatarList1 = itemView.findViewById(R.id.avatar_list1);
@@ -73,31 +75,32 @@ public class SudGameListViewHolder extends RecyclerView.ViewHolder {
} else if (TextUtils.equals(model.getSex(), "2")) {
ImgLoader.display(itemView.getContext(), R.mipmap.icon_sex_woman, sex);
}
List<playerObject> playerObjects = model.getPlayerObjects();
for (int i = 0; i < playerObjects.size(); i++) {
switch (i) {
case 0:
avatarList1.setVisibility(View.VISIBLE);
ImgLoader.display(itemView.getContext(), playerObjects.get(i).getAvatar(), avatarList1);
break;
case 1:
avatarList2.setVisibility(View.VISIBLE);
ImgLoader.display(itemView.getContext(), playerObjects.get(i).getAvatar(), avatarList2);
break;
case 2:
avatarList3.setVisibility(View.VISIBLE);
ImgLoader.display(itemView.getContext(), playerObjects.get(i).getAvatar(), avatarList3);
break;
case 3:
avatarList4.setVisibility(View.VISIBLE);
ImgLoader.display(itemView.getContext(), playerObjects.get(i).getAvatar(), avatarList4);
break;
case 4:
avatarList5.setVisibility(View.VISIBLE);
ImgLoader.display(itemView.getContext(), playerObjects.get(i).getAvatar(), avatarList5);
break;
}
}
// List<playerObject> playerObjects = model.getPlayerObjects();
// for (int i = 0; i < playerObjects.size(); i++) {
// switch (i) {
// case 0:
// avatarList1.setVisibility(View.VISIBLE);
// ImgLoader.display(itemView.getContext(), playerObjects.get(i).getAvatar(), avatarList1);
// break;
// case 1:
// avatarList2.setVisibility(View.VISIBLE);
// ImgLoader.display(itemView.getContext(), playerObjects.get(i).getAvatar(), avatarList2);
// break;
// case 2:
// avatarList3.setVisibility(View.VISIBLE);
// ImgLoader.display(itemView.getContext(), playerObjects.get(i).getAvatar(), avatarList3);
// break;
// case 3:
// avatarList4.setVisibility(View.VISIBLE);
// ImgLoader.display(itemView.getContext(), playerObjects.get(i).getAvatar(), avatarList4);
// break;
// case 4:
// avatarList5.setVisibility(View.VISIBLE);
// ImgLoader.display(itemView.getContext(), playerObjects.get(i).getAvatar(), avatarList5);
// break;
// }
// }
ImgLoader.display(itemView.getContext(), model.getSudgameicon(), game_icon);
ViewClicksAntiShake.clicksAntiShake(itemView.findViewById(R.id.layout), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {