diff --git a/common/src/main/java/com/yunbao/common/activity/SudGameActivity.java b/common/src/main/java/com/yunbao/common/activity/SudGameActivity.java index e69384e7b..93544495f 100644 --- a/common/src/main/java/com/yunbao/common/activity/SudGameActivity.java +++ b/common/src/main/java/com/yunbao/common/activity/SudGameActivity.java @@ -44,7 +44,6 @@ public class SudGameActivity extends AbsActivity { private CreateSudRoomModel mCreateSudRoomModel; private TextView gameTitle, roomName, roomNumber; private RoundedImageView mAvatar; - @Override protected int getLayoutId() { return R.layout.activity_sud_game; @@ -164,9 +163,9 @@ public class SudGameActivity extends AbsActivity { gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfIn(true, event.getSeatIndex(), true, 1); } else { if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { - ToastUtil.show("金豆不够 "); + ToastUtil.show("貨幣数量不足 "); } else { - ToastUtil.show("Insufficient money "); + ToastUtil.show("Shortage of money"); } } @@ -175,9 +174,9 @@ public class SudGameActivity extends AbsActivity { @Override public void onError(String error) { if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { - ToastUtil.show("金豆不够 "); + ToastUtil.show("貨幣数量不足 "); } else { - ToastUtil.show("Insufficient money "); + ToastUtil.show("Shortage of money"); } } }); diff --git a/common/src/main/java/com/yunbao/common/bean/CheckRemainingBalance.java b/common/src/main/java/com/yunbao/common/bean/CheckRemainingBalance.java index ca8d2f3f9..611c289ef 100644 --- a/common/src/main/java/com/yunbao/common/bean/CheckRemainingBalance.java +++ b/common/src/main/java/com/yunbao/common/bean/CheckRemainingBalance.java @@ -8,6 +8,17 @@ public class CheckRemainingBalance extends BaseModel { private int goldenBeanRemainingBalance; @SerializedName("status") private int status; + @SerializedName("deduct_money_key") + private String deductMoneyKey; + + public String getDeductMoneyKey() { + return deductMoneyKey; + } + + public CheckRemainingBalance setDeductMoneyKey(String deductMoneyKey) { + this.deductMoneyKey = deductMoneyKey; + return this; + } public int getStatus() { return status; diff --git a/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java b/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java index 0a093f923..b6d59a596 100644 --- a/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java +++ b/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java @@ -154,7 +154,7 @@ public class CreateSudGamePopup extends BottomPopupView { String sill = gameSill.getText().toString(); String name = roomName.getText().toString(); if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { - if (name.length() > 10) { + if (name.length() > 15) { ToastUtil.show("房間名长度为[1-10]"); return; } diff --git a/common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java b/common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java index 5c09314c0..c844d7008 100644 --- a/common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java +++ b/common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java @@ -100,7 +100,7 @@ public class SudGameListPopup extends BottomPopupView { for (CustomSidebarChildModel model : customSidebarChildModels) { if (TextUtils.equals(String.valueOf(interactionID), model.getSrc())) { - gameTitle.setText(model.getTitle().substring(0, 2)); + gameTitle.setText(model.getTitle()); id = model.getId(); } } @@ -294,13 +294,13 @@ public class SudGameListPopup extends BottomPopupView { public void onSudGameListEvent(SudGameListEvent event) { interactionID = event.getInteractionID(); if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { - gameTitle.setText(event.getTitle().substring(0, 2)); + gameTitle.setText(event.getTitle()); } else { if (event.getTitle().contains("All")) { gameTitle.setText("All"); } else { if ((event.getTitle().length() > 6)) { - gameTitle.setText(event.getTitle().substring(0, 5)); + gameTitle.setText(event.getTitle()); } else { gameTitle.setText(event.getTitle()); } diff --git a/common/src/main/java/com/yunbao/common/sud/decorator/SudFSTAPPDecorator.java b/common/src/main/java/com/yunbao/common/sud/decorator/SudFSTAPPDecorator.java index eaf54acb8..33cf83112 100644 --- a/common/src/main/java/com/yunbao/common/sud/decorator/SudFSTAPPDecorator.java +++ b/common/src/main/java/com/yunbao/common/sud/decorator/SudFSTAPPDecorator.java @@ -94,7 +94,7 @@ public class SudFSTAPPDecorator { if (iSudFSTAPP != null) { SudMGPAPPState.APPCommonSelfPlaying state = new SudMGPAPPState.APPCommonSelfPlaying(); state.isPlaying = isPlaying; -// state.reportGameInfoExtras = reportGameInfoExtras; +// state.reportGameInfoExtras = deductMoneyKey; // state.reportGameInfoKey = reportGameInfoKey; iSudFSTAPP.notifyStateChange(SudMGPAPPState.APP_COMMON_SELF_PLAYING, SudJsonUtils.toJson(state), null); } diff --git a/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java b/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java index 9abc53cf4..1b69c3fe6 100644 --- a/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java +++ b/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java @@ -51,7 +51,7 @@ public class LiveSudGamePopup extends BottomPopupView { private CreateSudRoomModel mCreateSudRoomModel; private TextView gameTitle, roomName, roomNumber; private RoundedImageView mAvatar; - + private boolean selfClick = false; public LiveSudGamePopup(@NonNull Context context, long interactionID, String liveUid) { super(context); @@ -167,7 +167,9 @@ public class LiveSudGamePopup extends BottomPopupView { // SudMGP平台64bit游戏ID gameViewModel.switchGame((Activity) getContext(), mLiveUid, mInteractionID); } + private List customSidebarChildModels = new ArrayList<>(); + private void initDate() { LiveNetManager.get(getContext()) .getCustomSidebarInfo("1", new HttpCallback>() { @@ -223,9 +225,9 @@ public class LiveSudGamePopup extends BottomPopupView { gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfIn(true, event.getSeatIndex(), true, 1); } else { if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { - ToastUtil.show("金豆不够 "); + ToastUtil.show("貨幣数量不足 "); } else { - ToastUtil.show("Insufficient money "); + ToastUtil.show("Shortage of money"); } } @@ -234,9 +236,9 @@ public class LiveSudGamePopup extends BottomPopupView { @Override public void onError(String error) { if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { - ToastUtil.show("金豆不够 "); + ToastUtil.show("貨幣数量不足 "); } else { - ToastUtil.show("Insufficient money "); + ToastUtil.show("Shortage of money"); } } }); @@ -250,9 +252,10 @@ public class LiveSudGamePopup extends BottomPopupView { HttpCallback() { @Override public void onSuccess(CheckRemainingBalance data) { - if (data.getStatus()==1){ + if (data.getStatus() == 1) { + gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfPlaying(true); - }else { + } else { } @@ -265,7 +268,7 @@ public class LiveSudGamePopup extends BottomPopupView { }); break; case SudMGPMGState.MG_COMMON_GAME_STATE: - LiveNetManager.get(getContext()).deductMoney( mCreateSudRoomModel.getSudGameRoomId()); + LiveNetManager.get(getContext()).deductMoney(mCreateSudRoomModel.getSudGameRoomId()); break; } diff --git a/common/src/main/res/layout/dialog_live_sud_game.xml b/common/src/main/res/layout/dialog_live_sud_game.xml index 94cb24f99..3dbc47e2e 100644 --- a/common/src/main/res/layout/dialog_live_sud_game.xml +++ b/common/src/main/res/layout/dialog_live_sud_game.xml @@ -2,7 +2,7 @@ diff --git a/common/src/main/res/layout/dialog_live_sud_game_history.xml b/common/src/main/res/layout/dialog_live_sud_game_history.xml index e9dd0ba85..bcfe7248f 100644 --- a/common/src/main/res/layout/dialog_live_sud_game_history.xml +++ b/common/src/main/res/layout/dialog_live_sud_game_history.xml @@ -19,132 +19,138 @@ android:textColor="#000000" android:textSize="16sp" /> - - - + android:layout_height="wrap_content"> + android:layout_marginStart="14dp" + android:text="@string/interactive_game_room_game" + android:textColor="#000000" + android:textSize="14sp" + android:textStyle="bold" /> - + - - + - + - + + + android:layout_marginStart="10dp" + android:text="@string/sud_in_game_game_time" + android:textColor="#000000" + android:textSize="14sp" + android:textStyle="bold" /> - - + - + - + + + android:layout_marginStart="10dp" + android:text="@string/sud_in_game_game_currency" + android:textColor="#000000" + android:textSize="14sp" + android:textStyle="bold" /> - + - + + + + + + - + + - - - + android:layout_height="wrap_content"> - + - - + - + - + + - - + - + - + + - + - + + + + + + - + + 貨幣: 時間: 游戲記錄 - 随机 + 隨機 0-100星幣 100-500星幣 500以上星幣 diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index 840cdae55..4223f8ce8 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -1378,7 +1378,7 @@ 貨幣: 時間: 游戲記錄 - 随机 + 隨機 0-100星幣 100-500星幣 500以上星幣 diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 310b9db53..036162336 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1378,7 +1378,7 @@ 貨幣: 時間: 游戲記錄 - 随机 + 隨機 0-100星幣 100-500星幣 500以上星幣 diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java index 2fed9fc45..11bf76eb6 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java @@ -328,13 +328,13 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement public void onSudGameListEvent(SudGameListEvent event) { interactionID = event.getInteractionID(); if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { - gameTitle.setText(event.getTitle().substring(0, 2)); + gameTitle.setText(event.getTitle()); } else { if (event.getTitle().contains("All")) { gameTitle.setText("All"); } else { if ((event.getTitle().length() > 6)) { - gameTitle.setText(event.getTitle().substring(0, 5)); + gameTitle.setText(event.getTitle()); } else { gameTitle.setText(event.getTitle()); } diff --git a/main/src/main/res/layout/view_main_home_sud_game_list.xml b/main/src/main/res/layout/view_main_home_sud_game_list.xml index a7bf32d76..af578c36a 100644 --- a/main/src/main/res/layout/view_main_home_sud_game_list.xml +++ b/main/src/main/res/layout/view_main_home_sud_game_list.xml @@ -59,126 +59,131 @@ android:visibility="visible" /> - - - + android:layout_height="wrap_content"> - - - + android:layout_marginStart="14dp" + android:text="@string/interactive_game_room_game" + android:textColor="#000" + android:textSize="10sp" + android:textStyle="bold" /> - + - + + + + + android:textSize="10sp" + android:textStyle="bold" /> - - + - + - + + + android:textSize="10sp" + android:textStyle="bold" /> - + - + + + + + + - +