diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index dd266729d..27f3735e8 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -254,4 +254,26 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.opensource.svgaplayer.**{ public ; public static ; -} \ No newline at end of file +} +# json序列化的混淆 +-keep class tech.sud.mgp.hello.ui.scenes.ticket.model.** {*;} +-keep class tech.sud.mgp.hello.service.game.req.** {*;} +-keep class tech.sud.mgp.hello.service.game.resp.** {*;} +-keep class tech.sud.mgp.hello.service.login.req.** {*;} +-keep class tech.sud.mgp.hello.service.login.resp.** {*;} +-keep class tech.sud.mgp.hello.service.main.req.** {*;} +-keep class tech.sud.mgp.hello.service.main.resp.** {*;} +-keep class tech.sud.mgp.hello.service.main.config.** {*;} +-keep class tech.sud.mgp.hello.service.room.req.** {*;} +-keep class tech.sud.mgp.hello.service.room.resp.** {*;} +-keep class tech.sud.mgp.hello.service.room.model.** {*;} +-keep class tech.sud.mgp.hello.ui.main.home.model.** {*;} +-keep class tech.sud.mgp.hello.ui.scenes.base.model.** {*;} +-keep class tech.sud.mgp.hello.ui.scenes.common.cmd.** {*;} +-keep class tech.sud.mgp.hello.ui.scenes.custom.model.** {*;} +-keep class tech.sud.mgp.hello.ui.scenes.orderentertainment.model.** {*;} +-keep class tech.sud.mgp.hello.ui.main.settings.model.** {*;} +-keep class tech.sud.mgp.hello.ui.main.nft.model.** {*;} +-keep class tech.sud.mgp.hello.common.event.model.** {*;} + +-keep class com.yunbao.common.sud.** {*;} 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 da13bd644..9c47ff129 100644 --- a/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java +++ b/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java @@ -92,6 +92,13 @@ public class CreateSudGamePopup extends BottomPopupView { .show(); } }); + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.room_back), + new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + dismiss(); + } + }); ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.create_room), new ViewClicksAntiShake.ViewClicksCallBack() { @Override public void onViewClicks() { diff --git a/common/src/main/java/com/yunbao/common/sud/QuickStartGameViewModel.java b/common/src/main/java/com/yunbao/common/sud/QuickStartGameViewModel.java index f35ee471a..92b980804 100644 --- a/common/src/main/java/com/yunbao/common/sud/QuickStartGameViewModel.java +++ b/common/src/main/java/com/yunbao/common/sud/QuickStartGameViewModel.java @@ -10,11 +10,13 @@ import com.yunbao.common.CommonAppContext; import com.yunbao.common.bean.SudgameCodeModel; import com.yunbao.common.http.base.HttpCallback; import com.yunbao.common.http.live.LiveNetManager; +import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.sud.model.GameConfigModel; import com.yunbao.common.sud.model.GameViewInfoModel; import com.yunbao.common.sud.state.SudMGPMGState; import java.util.List; +import java.util.Locale; import tech.sud.mgp.core.ISudFSMMG; import tech.sud.mgp.core.ISudFSMStateHandle; @@ -62,6 +64,11 @@ public class QuickStartGameViewModel extends BaseGameViewModel { */ @Override protected void getCode(Activity activity, String userId, String appId, GameGetCodeListener listener) { + if (IMLoginManager.get(activity).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { + languageCode = "zh-CN"; + }else { + languageCode = "en-US"; + } // TODO: 2022/6/10 注意,这里是演示使用OkHttpClient请求hello-sud服务 // TODO: 2022/6/10 开发者在与后端联调时需将其改成自己的网络请求方式向自己的服务器获取code LiveNetManager.get(activity) diff --git a/common/src/main/res/layout/dialog_create_sud_game.xml b/common/src/main/res/layout/dialog_create_sud_game.xml index 2b310ffeb..62110e00f 100644 --- a/common/src/main/res/layout/dialog_create_sud_game.xml +++ b/common/src/main/res/layout/dialog_create_sud_game.xml @@ -29,6 +29,7 @@ android:textStyle="bold" /> + + - + + -