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

修改bug

Browse Source
This commit is contained in:
18401019693 2023-11-11 14:17:16 +08:00
parent 6990bd13ed
commit eb5aebda51
14 changed files with 347 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/src/main/java/com/yunbao/common/activity/SudGameActivity.java
View File

@ -44,7 +44,6 @@ public class SudGameActivity extends AbsActivity {
private CreateSudRoomModel mCreateSudRoomModel; private CreateSudRoomModel mCreateSudRoomModel;
private TextView gameTitle, roomName, roomNumber; private TextView gameTitle, roomName, roomNumber;
private RoundedImageView mAvatar; private RoundedImageView mAvatar;
@Override @Override
protected int getLayoutId() { protected int getLayoutId() {
return R.layout.activity_sud_game; return R.layout.activity_sud_game;
@ -164,9 +163,9 @@ public class SudGameActivity extends AbsActivity {
gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfIn(true, event.getSeatIndex(), true, 1); gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfIn(true, event.getSeatIndex(), true, 1);
} else { } else {
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("金豆不够 "); ToastUtil.show("貨幣数量不足 ");
} else { } else {
ToastUtil.show("Insufficient money "); ToastUtil.show("Shortage of money");
} }
} }
@ -175,9 +174,9 @@ public class SudGameActivity extends AbsActivity {
@Override @Override
public void onError(String error) { public void onError(String error) {
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("金豆不够 "); ToastUtil.show("貨幣数量不足 ");
} else { } else {
ToastUtil.show("Insufficient money "); ToastUtil.show("Shortage of money");
} }
} }
}); });

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

@ -8,6 +8,17 @@ public class CheckRemainingBalance extends BaseModel {
private int goldenBeanRemainingBalance; private int goldenBeanRemainingBalance;
@SerializedName("status") @SerializedName("status")
private int 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() { public int getStatus() {
return status; return status;

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

@ -154,7 +154,7 @@ public class CreateSudGamePopup extends BottomPopupView {
String sill = gameSill.getText().toString(); String sill = gameSill.getText().toString();
String name = roomName.getText().toString(); String name = roomName.getText().toString();
if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
if (name.length() > 10) { if (name.length() > 15) {
ToastUtil.show("房間名长度为[1-10]"); ToastUtil.show("房間名长度为[1-10]");
return; return;
} }

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

@ -100,7 +100,7 @@ public class SudGameListPopup extends BottomPopupView {
for (CustomSidebarChildModel model : customSidebarChildModels) { for (CustomSidebarChildModel model : customSidebarChildModels) {
if (TextUtils.equals(String.valueOf(interactionID), model.getSrc())) { if (TextUtils.equals(String.valueOf(interactionID), model.getSrc())) {
gameTitle.setText(model.getTitle().substring(0, 2)); gameTitle.setText(model.getTitle());
id = model.getId(); id = model.getId();
} }
} }
@ -294,13 +294,13 @@ public class SudGameListPopup extends BottomPopupView {
public void onSudGameListEvent(SudGameListEvent event) { public void onSudGameListEvent(SudGameListEvent event) {
interactionID = event.getInteractionID(); interactionID = event.getInteractionID();
if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
gameTitle.setText(event.getTitle().substring(0, 2)); gameTitle.setText(event.getTitle());
} else { } else {
if (event.getTitle().contains("All")) { if (event.getTitle().contains("All")) {
gameTitle.setText("All"); gameTitle.setText("All");
} else { } else {
if ((event.getTitle().length() > 6)) { if ((event.getTitle().length() > 6)) {
gameTitle.setText(event.getTitle().substring(0, 5)); gameTitle.setText(event.getTitle());
} else { } else {
gameTitle.setText(event.getTitle()); gameTitle.setText(event.getTitle());
} }

2
common/src/main/java/com/yunbao/common/sud/decorator/SudFSTAPPDecorator.java
View File

@ -94,7 +94,7 @@ public class SudFSTAPPDecorator {
if (iSudFSTAPP != null) { if (iSudFSTAPP != null) {
SudMGPAPPState.APPCommonSelfPlaying state = new SudMGPAPPState.APPCommonSelfPlaying(); SudMGPAPPState.APPCommonSelfPlaying state = new SudMGPAPPState.APPCommonSelfPlaying();
state.isPlaying = isPlaying; state.isPlaying = isPlaying;
// state.reportGameInfoExtras = reportGameInfoExtras; // state.reportGameInfoExtras = deductMoneyKey;
// state.reportGameInfoKey = reportGameInfoKey; // state.reportGameInfoKey = reportGameInfoKey;
iSudFSTAPP.notifyStateChange(SudMGPAPPState.APP_COMMON_SELF_PLAYING, SudJsonUtils.toJson(state), null); iSudFSTAPP.notifyStateChange(SudMGPAPPState.APP_COMMON_SELF_PLAYING, SudJsonUtils.toJson(state), null);
} }

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

@ -51,7 +51,7 @@ public class LiveSudGamePopup extends BottomPopupView {
private CreateSudRoomModel mCreateSudRoomModel; private CreateSudRoomModel mCreateSudRoomModel;
private TextView gameTitle, roomName, roomNumber; private TextView gameTitle, roomName, roomNumber;
private RoundedImageView mAvatar; private RoundedImageView mAvatar;
private boolean selfClick = false;
public LiveSudGamePopup(@NonNull Context context, long interactionID, String liveUid) { public LiveSudGamePopup(@NonNull Context context, long interactionID, String liveUid) {
super(context); super(context);
@ -167,7 +167,9 @@ public class LiveSudGamePopup extends BottomPopupView {
// SudMGP平台64bit游戏ID // SudMGP平台64bit游戏ID
gameViewModel.switchGame((Activity) getContext(), mLiveUid, mInteractionID); gameViewModel.switchGame((Activity) getContext(), mLiveUid, mInteractionID);
} }
private List<CustomSidebarChildModel> customSidebarChildModels = new ArrayList<>(); private List<CustomSidebarChildModel> customSidebarChildModels = new ArrayList<>();
private void initDate() { private void initDate() {
LiveNetManager.get(getContext()) LiveNetManager.get(getContext())
.getCustomSidebarInfo("1", new HttpCallback<List<CustomSidebarInfoModel>>() { .getCustomSidebarInfo("1", new HttpCallback<List<CustomSidebarInfoModel>>() {
@ -223,9 +225,9 @@ public class LiveSudGamePopup extends BottomPopupView {
gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfIn(true, event.getSeatIndex(), true, 1); gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfIn(true, event.getSeatIndex(), true, 1);
} else { } else {
if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("金豆不够 "); ToastUtil.show("貨幣数量不足 ");
} else { } else {
ToastUtil.show("Insufficient money "); ToastUtil.show("Shortage of money");
} }
} }
@ -234,9 +236,9 @@ public class LiveSudGamePopup extends BottomPopupView {
@Override @Override
public void onError(String error) { public void onError(String error) {
if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("金豆不够 "); ToastUtil.show("貨幣数量不足 ");
} else { } else {
ToastUtil.show("Insufficient money "); ToastUtil.show("Shortage of money");
} }
} }
}); });
@ -250,9 +252,10 @@ public class LiveSudGamePopup extends BottomPopupView {
HttpCallback<CheckRemainingBalance>() { HttpCallback<CheckRemainingBalance>() {
@Override @Override
public void onSuccess(CheckRemainingBalance data) { public void onSuccess(CheckRemainingBalance data) {
if (data.getStatus()==1){ if (data.getStatus() == 1) {
gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfPlaying(true); gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfPlaying(true);
}else { } else {
} }
@ -265,7 +268,7 @@ public class LiveSudGamePopup extends BottomPopupView {
}); });
break; break;
case SudMGPMGState.MG_COMMON_GAME_STATE: case SudMGPMGState.MG_COMMON_GAME_STATE:
LiveNetManager.get(getContext()).deductMoney( mCreateSudRoomModel.getSudGameRoomId()); LiveNetManager.get(getContext()).deductMoney(mCreateSudRoomModel.getSudGameRoomId());
break; break;
} }

2
common/src/main/res/layout/dialog_live_sud_game.xml
View File

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="580dp" android:layout_height="650dp"
android:background="@drawable/bg_live_sud_list" android:background="@drawable/bg_live_sud_list"
android:orientation="vertical"> android:orientation="vertical">

212
common/src/main/res/layout/dialog_live_sud_game_history.xml
View File

@ -19,132 +19,138 @@
android:textColor="#000000" android:textColor="#000000"
android:textSize="16sp" /> android:textSize="16sp" />
<LinearLayout <HorizontalScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_marginTop="30dp"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
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" />
<LinearLayout <LinearLayout
android:id="@+id/interactive_game_room_game" android:layout_width="match_parent"
android:layout_width="58dp" android:layout_height="wrap_content"
android:layout_height="28dp" android:layout_marginTop="30dp"
android:layout_marginStart="4dp"
android:background="@drawable/bg_home_sud_list_btn"
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/game_title" android:layout_width="wrap_content"
android:layout_width="40dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="6dp" android:layout_marginStart="14dp"
android:ellipsize="end" android:text="@string/interactive_game_room_game"
android:singleLine="true" android:textColor="#000000"
android:text="@string/interactive_game_create_unlimited" android:textSize="14sp"
android:textColor="#666666" android:textStyle="bold" />
android:textSize="10sp" />
<View <LinearLayout
android:layout_width="0dp" android:id="@+id/interactive_game_room_game"
android:layout_height="0dp" android:layout_width="58dp"
android:layout_weight="1" /> android:layout_height="28dp"
android:layout_marginStart="4dp"
android:background="@drawable/bg_home_sud_list_btn"
android:gravity="center_vertical">
<ImageView <TextView
android:id="@+id/room_game_arrow" android:id="@+id/game_title"
android:layout_width="8dp" android:layout_width="40dp"
android:layout_height="14dp" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginStart="6dp"
android:src="@mipmap/icon_home_interactive_game_arrow" /> android:ellipsize="end"
</LinearLayout> android:singleLine="true"
android:text="@string/interactive_game_create_unlimited"
android:textColor="#666666"
android:textSize="10sp" />
<TextView <View
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_marginStart="10dp" android:layout_weight="1" />
android:text="@string/sud_in_game_game_time"
android:textColor="#000000"
android:textSize="14sp"
android:textStyle="bold" />
<FrameLayout <ImageView
android:id="@+id/room_sill" android:id="@+id/room_game_arrow"
android:layout_width="82dp" android:layout_width="8dp"
android:layout_height="28dp" android:layout_height="14dp"
android:layout_marginStart="4dp" android:layout_marginEnd="8dp"
android:background="@drawable/bg_home_sud_list_btn"> android:src="@mipmap/icon_home_interactive_game_arrow" />
</LinearLayout>
<TextView <TextView
android:id="@+id/room_sill_text" android:layout_width="wrap_content"
android:layout_width="55dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_marginStart="10dp"
android:layout_marginStart="6dp" android:text="@string/sud_in_game_game_time"
android:ellipsize="end" android:textColor="#000000"
android:singleLine="true" android:textSize="14sp"
android:text="@string/interactive_game_create_unlimited" android:textStyle="bold" />
android:textColor="#666666"
android:textSize="10sp" />
<ImageView <FrameLayout
android:id="@+id/room_sill_arrow" android:id="@+id/room_sill"
android:layout_width="8dp" android:layout_width="82dp"
android:layout_height="14dp" android:layout_height="28dp"
android:layout_gravity="center_vertical|end" android:layout_marginStart="4dp"
android:layout_marginEnd="8dp" android:background="@drawable/bg_home_sud_list_btn">
android:src="@mipmap/icon_home_interactive_game_arrow" />
</FrameLayout>
<TextView <TextView
android:layout_width="wrap_content" android:id="@+id/room_sill_text"
android:layout_height="wrap_content" android:layout_width="55dp"
android:layout_marginStart="10dp" android:layout_height="wrap_content"
android:text="@string/sud_in_game_game_currency" android:layout_gravity="center_vertical"
android:textColor="#000000" android:layout_marginStart="6dp"
android:textSize="14sp" android:ellipsize="end"
android:textStyle="bold" /> android:singleLine="true"
android:text="@string/interactive_game_create_unlimited"
android:textColor="#666666"
android:textSize="10sp" />
<LinearLayout <ImageView
android:id="@+id/house_owner" android:id="@+id/room_sill_arrow"
android:layout_width="70dp" android:layout_width="8dp"
android:layout_height="28dp" android:layout_height="14dp"
android:layout_marginStart="4dp" android:layout_gravity="center_vertical|end"
android:background="@drawable/bg_home_sud_list_btn" android:layout_marginEnd="8dp"
android:gravity="center_vertical" android:src="@mipmap/icon_home_interactive_game_arrow" />
android:orientation="horizontal"> </FrameLayout>
<TextView <TextView
android:id="@+id/house_owner_text" android:layout_width="wrap_content"
android:layout_width="55dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="6dp" android:layout_marginStart="10dp"
android:ellipsize="end" android:text="@string/sud_in_game_game_currency"
android:singleLine="true" android:textColor="#000000"
android:text="@string/interactive_game_create_unlimited" android:textSize="14sp"
android:textColor="#666666" android:textStyle="bold" />
android:textSize="10sp" />
<View <LinearLayout
android:layout_width="0dp" android:id="@+id/house_owner"
android:layout_height="0dp" android:layout_width="70dp"
android:layout_weight="1" /> android:layout_height="28dp"
android:layout_marginStart="4dp"
android:background="@drawable/bg_home_sud_list_btn"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView <TextView
android:id="@+id/house_owner_arrow" android:id="@+id/house_owner_text"
android:layout_width="8dp" android:layout_width="55dp"
android:layout_height="14dp" android:layout_height="wrap_content"
android:layout_marginEnd="5dp" android:layout_marginStart="6dp"
android:src="@mipmap/icon_home_interactive_game_arrow" /> android:ellipsize="end"
android:singleLine="true"
android:text="@string/interactive_game_create_unlimited"
android:textColor="#666666"
android:textSize="10sp" />
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<ImageView
android:id="@+id/house_owner_arrow"
android:layout_width="8dp"
android:layout_height="14dp"
android:layout_marginEnd="5dp"
android:src="@mipmap/icon_home_interactive_game_arrow" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </HorizontalScrollView>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

194
common/src/main/res/layout/dialog_sud_game_list.xml
View File

@ -66,129 +66,135 @@
android:visibility="visible" /> android:visibility="visible" />
</LinearLayout> </LinearLayout>
<LinearLayout <HorizontalScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_marginTop="12dp"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="14dp"
android:text="@string/interactive_game_room_game"
android:textColor="#fff"
android:textSize="10sp" />
<LinearLayout <LinearLayout
android:id="@+id/interactive_game_room_game" android:layout_width="match_parent"
android:layout_width="58dp" android:layout_height="wrap_content"
android:layout_height="28dp" android:layout_marginTop="12dp"
android:layout_marginStart="4dp"
android:background="@drawable/bg_live_sud_list_btn"
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/game_title" android:layout_width="wrap_content"
android:layout_width="40dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="6dp" android:layout_marginStart="14dp"
android:ellipsize="end" android:text="@string/interactive_game_room_game"
android:singleLine="true"
android:text="@string/interactive_game_create_unlimited"
android:textColor="#fff" android:textColor="#fff"
android:textSize="10sp" /> android:textSize="10sp" />
<View <LinearLayout
android:layout_width="0dp" android:id="@+id/interactive_game_room_game"
android:layout_height="0dp" android:layout_width="wrap_content"
android:layout_weight="1" /> android:layout_height="28dp"
android:layout_marginStart="4dp"
android:background="@drawable/bg_live_sud_list_btn"
android:gravity="center_vertical">
<ImageView <TextView
android:id="@+id/room_game_arrow" android:id="@+id/game_title"
android:layout_width="8dp" android:layout_width="40dp"
android:layout_height="14dp" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginStart="6dp"
android:src="@mipmap/icon_interactive_game_arrow" /> android:ellipsize="end"
</LinearLayout> android:singleLine="true"
android:text="@string/interactive_game_create_unlimited"
android:textColor="#fff"
android:textSize="10sp" />
<TextView <View
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_marginStart="10dp" android:layout_weight="1" />
android:text="@string/interactive_game_room_sill"
android:textColor="#fff"
android:textSize="10sp" />
<FrameLayout <ImageView
android:id="@+id/room_sill" android:id="@+id/room_game_arrow"
android:layout_width="82dp" android:layout_width="8dp"
android:layout_height="28dp" android:layout_height="14dp"
android:layout_marginStart="4dp" android:layout_marginEnd="8dp"
android:background="@drawable/bg_live_sud_list_btn"> android:src="@mipmap/icon_interactive_game_arrow" />
</LinearLayout>
<TextView <TextView
android:id="@+id/room_sill_text" android:layout_width="wrap_content"
android:layout_width="55dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_marginStart="10dp"
android:layout_marginStart="6dp" android:text="@string/interactive_game_room_sill"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/interactive_game_create_unlimited"
android:textColor="#fff" android:textColor="#fff"
android:textSize="10sp" /> android:textSize="10sp" />
<ImageView <FrameLayout
android:id="@+id/room_sill_arrow" android:id="@+id/room_sill"
android:layout_width="8dp" android:layout_width="wrap_content"
android:layout_height="14dp" android:layout_height="28dp"
android:layout_gravity="center_vertical|end" android:layout_marginStart="4dp"
android:layout_marginEnd="8dp" android:background="@drawable/bg_live_sud_list_btn">
android:src="@mipmap/icon_interactive_game_arrow" />
</FrameLayout>
<TextView <TextView
android:layout_width="wrap_content" android:id="@+id/room_sill_text"
android:layout_height="wrap_content" android:layout_width="55dp"
android:layout_marginStart="10dp" android:layout_height="wrap_content"
android:text="@string/interactive_game_room_house_owner" android:layout_gravity="center_vertical"
android:textColor="#fff" android:layout_marginStart="6dp"
android:textSize="10sp" /> android:ellipsize="end"
android:singleLine="true"
android:text="@string/interactive_game_create_unlimited"
android:textColor="#fff"
android:textSize="10sp" />
<LinearLayout <ImageView
android:id="@+id/house_owner" android:id="@+id/room_sill_arrow"
android:layout_width="70dp" android:layout_width="8dp"
android:layout_height="28dp" android:layout_height="14dp"
android:layout_marginStart="4dp" android:layout_gravity="center_vertical|end"
android:background="@drawable/bg_live_sud_list_btn" android:layout_marginEnd="8dp"
android:gravity="center_vertical" android:src="@mipmap/icon_interactive_game_arrow" />
android:orientation="horizontal"> </FrameLayout>
<TextView <TextView
android:id="@+id/house_owner_text" android:layout_width="wrap_content"
android:layout_width="55dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="6dp" android:layout_marginStart="10dp"
android:ellipsize="end" android:text="@string/interactive_game_room_house_owner"
android:singleLine="true"
android:text="@string/interactive_game_create_unlimited"
android:textColor="#fff" android:textColor="#fff"
android:textSize="10sp" /> android:textSize="10sp" />
<View <LinearLayout
android:layout_width="0dp" android:id="@+id/house_owner"
android:layout_height="0dp" android:layout_width="wrap_content"
android:layout_weight="1" /> android:layout_height="28dp"
android:layout_marginStart="4dp"
android:background="@drawable/bg_live_sud_list_btn"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView <TextView
android:id="@+id/house_owner_arrow" android:id="@+id/house_owner_text"
android:layout_width="8dp" android:layout_width="55dp"
android:layout_height="14dp" android:layout_height="wrap_content"
android:layout_marginEnd="5dp" android:layout_marginStart="6dp"
android:src="@mipmap/icon_interactive_game_arrow" /> android:ellipsize="end"
android:singleLine="true"
android:text="@string/interactive_game_create_unlimited"
android:textColor="#fff"
android:textSize="10sp" />
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<ImageView
android:id="@+id/house_owner_arrow"
android:layout_width="8dp"
android:layout_height="14dp"
android:layout_marginEnd="5dp"
android:src="@mipmap/icon_interactive_game_arrow" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </HorizontalScrollView>
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"

2
common/src/main/res/values-zh-rHK/strings.xml
View File

@ -1379,7 +1379,7 @@
<string name="sud_in_game_game_currency">貨幣：</string> <string name="sud_in_game_game_currency">貨幣：</string>
<string name="sud_in_game_game_time">時間：</string> <string name="sud_in_game_game_time">時間：</string>
<string name="sud_in_game_game_record">游戲記錄</string> <string name="sud_in_game_game_record">游戲記錄</string>
<string name="sud_in_game_random_name">随机</string> <string name="sud_in_game_random_name">隨機</string>
<string name="room_sill0_100">0-100星幣</string> <string name="room_sill0_100">0-100星幣</string>
<string name="room_sill100_500">100-500星幣</string> <string name="room_sill100_500">100-500星幣</string>
<string name="room_sill500_m">500以上星幣</string> <string name="room_sill500_m">500以上星幣</string>

2
common/src/main/res/values-zh-rTW/strings.xml
View File

@ -1378,7 +1378,7 @@
<string name="sud_in_game_game_currency">貨幣：</string> <string name="sud_in_game_game_currency">貨幣：</string>
<string name="sud_in_game_game_time">時間：</string> <string name="sud_in_game_game_time">時間：</string>
<string name="sud_in_game_game_record">游戲記錄</string> <string name="sud_in_game_game_record">游戲記錄</string>
<string name="sud_in_game_random_name">随机</string> <string name="sud_in_game_random_name">隨機</string>
<string name="room_sill0_100">0-100星幣</string> <string name="room_sill0_100">0-100星幣</string>
<string name="room_sill100_500">100-500星幣</string> <string name="room_sill100_500">100-500星幣</string>
<string name="room_sill500_m">500以上星幣</string> <string name="room_sill500_m">500以上星幣</string>

2
common/src/main/res/values-zh/strings.xml
View File

@ -1378,7 +1378,7 @@
<string name="sud_in_game_game_currency">貨幣：</string> <string name="sud_in_game_game_currency">貨幣：</string>
<string name="sud_in_game_game_time">時間：</string> <string name="sud_in_game_game_time">時間：</string>
<string name="sud_in_game_game_record">游戲記錄</string> <string name="sud_in_game_game_record">游戲記錄</string>
<string name="sud_in_game_random_name">随机</string> <string name="sud_in_game_random_name">隨機</string>
<string name="room_sill0_100">0-100星幣</string> <string name="room_sill0_100">0-100星幣</string>
<string name="room_sill100_500">100-500星幣</string> <string name="room_sill100_500">100-500星幣</string>
<string name="room_sill500_m">500以上星幣</string> <string name="room_sill500_m">500以上星幣</string>

4
main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java
View File

@ -328,13 +328,13 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement
public void onSudGameListEvent(SudGameListEvent event) { public void onSudGameListEvent(SudGameListEvent event) {
interactionID = event.getInteractionID(); interactionID = event.getInteractionID();
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
gameTitle.setText(event.getTitle().substring(0, 2)); gameTitle.setText(event.getTitle());
} else { } else {
if (event.getTitle().contains("All")) { if (event.getTitle().contains("All")) {
gameTitle.setText("All"); gameTitle.setText("All");
} else { } else {
if ((event.getTitle().length() > 6)) { if ((event.getTitle().length() > 6)) {
gameTitle.setText(event.getTitle().substring(0, 5)); gameTitle.setText(event.getTitle());
} else { } else {
gameTitle.setText(event.getTitle()); gameTitle.setText(event.getTitle());
} }

197
main/src/main/res/layout/view_main_home_sud_game_list.xml
View File

@ -59,126 +59,131 @@
android:visibility="visible" /> android:visibility="visible" />
</LinearLayout> </LinearLayout>
<LinearLayout <HorizontalScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_marginTop="12dp"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
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" />
<LinearLayout <LinearLayout
android:id="@+id/interactive_game_room_game" android:layout_width="match_parent"
android:layout_width="58dp" android:layout_height="wrap_content"
android:layout_height="28dp" android:layout_marginTop="12dp"
android:layout_marginStart="4dp"
android:background="@drawable/bg_home_sud_list_btn"
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/game_title"
android:layout_width="40dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/interactive_game_create_unlimited"
android:textColor="#000"
android:textSize="10sp" />
<ImageView
android:id="@+id/room_game_arrow"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginStart="14dp"
android:src="@mipmap/icon_home_interactive_game_arrow" /> android:text="@string/interactive_game_room_game"
</LinearLayout> android:textColor="#000"
android:textSize="10sp"
android:textStyle="bold" />
<TextView <LinearLayout
android:layout_width="wrap_content" android:id="@+id/interactive_game_room_game"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginStart="20dp" android:layout_height="28dp"
android:text="@string/interactive_game_room_sill" android:layout_marginStart="4dp"
android:textColor="#000" android:background="@drawable/bg_home_sud_list_btn"
android:textSize="10sp" android:gravity="center_vertical">
android:textStyle="bold" />
<FrameLayout <TextView
android:id="@+id/room_sill" android:id="@+id/game_title"
android:layout_width="74dp" android:layout_width="40dp"
android:layout_height="28dp" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="6dp"
android:background="@drawable/bg_home_sud_list_btn"> android:ellipsize="end"
android:singleLine="true"
android:text="@string/interactive_game_create_unlimited"
android:textColor="#000"
android:textSize="10sp" />
<ImageView
android:id="@+id/room_game_arrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:src="@mipmap/icon_home_interactive_game_arrow" />
</LinearLayout>
<TextView <TextView
android:id="@+id/room_sill_text" android:layout_width="wrap_content"
android:layout_width="55dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_marginStart="20dp"
android:layout_marginStart="6dp" android:text="@string/interactive_game_room_sill"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/interactive_game_create_unlimited"
android:textColor="#000" android:textColor="#000"
android:textSize="10sp" /> android:textSize="10sp"
android:textStyle="bold" />
<ImageView <FrameLayout
android:id="@+id/room_sill_arrow" android:id="@+id/room_sill"
android:layout_width="8dp" android:layout_width="wrap_content"
android:layout_height="14dp" android:layout_height="28dp"
android:layout_gravity="center_vertical|end" android:layout_marginStart="4dp"
android:layout_marginEnd="8dp" android:background="@drawable/bg_home_sud_list_btn">
android:src="@mipmap/icon_home_interactive_game_arrow" />
</FrameLayout>
<TextView <TextView
android:layout_width="wrap_content" android:id="@+id/room_sill_text"
android:layout_height="wrap_content" android:layout_width="55dp"
android:layout_marginStart="20dp" android:layout_height="wrap_content"
android:text="@string/interactive_game_room_house_owner" android:layout_gravity="center_vertical"
android:textColor="#000" android:layout_marginStart="6dp"
android:textSize="10sp" android:ellipsize="end"
android:textStyle="bold" /> android:singleLine="true"
android:text="@string/interactive_game_create_unlimited"
android:textColor="#000"
android:textSize="10sp" />
<LinearLayout <ImageView
android:id="@+id/house_owner" android:id="@+id/room_sill_arrow"
android:layout_width="70dp" android:layout_width="8dp"
android:layout_height="28dp" android:layout_height="14dp"
android:layout_marginStart="4dp" android:layout_gravity="center_vertical|end"
android:background="@drawable/bg_home_sud_list_btn" android:layout_marginEnd="8dp"
android:gravity="center_vertical"> android:src="@mipmap/icon_home_interactive_game_arrow" />
</FrameLayout>
<TextView <TextView
android:id="@+id/house_owner_text" android:layout_width="wrap_content"
android:layout_width="50dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="6dp" android:layout_marginStart="20dp"
android:ellipsize="end" android:text="@string/interactive_game_room_house_owner"
android:singleLine="true"
android:text="@string/interactive_game_create_unlimited"
android:textColor="#000" android:textColor="#000"
android:textSize="10sp" /> android:textSize="10sp"
android:textStyle="bold" />
<View <LinearLayout
android:layout_width="0dp" android:id="@+id/house_owner"
android:layout_height="0dp" android:layout_width="wrap_content"
android:layout_weight="1" /> android:layout_height="28dp"
android:layout_marginStart="4dp"
android:background="@drawable/bg_home_sud_list_btn"
android:gravity="center_vertical">
<ImageView <TextView
android:id="@+id/house_owner_arrow" android:id="@+id/house_owner_text"
android:layout_width="8dp" android:layout_width="50dp"
android:layout_height="14dp" android:layout_height="wrap_content"
android:layout_marginEnd="5dp" android:layout_marginStart="6dp"
android:src="@mipmap/icon_home_interactive_game_arrow" /> android:ellipsize="end"
android:singleLine="true"
android:text="@string/interactive_game_create_unlimited"
android:textColor="#000"
android:textSize="10sp" />
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<ImageView
android:id="@+id/house_owner_arrow"
android:layout_width="8dp"
android:layout_height="14dp"
android:layout_marginEnd="5dp"
android:src="@mipmap/icon_home_interactive_game_arrow" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </HorizontalScrollView>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"