From d28d0dd3d7203d25dcf6d4e3841a001ebfd3f9ae Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Mon, 29 Apr 2024 11:02:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E5=8F=8D?=
=?UTF-8?q?=E9=A6=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/yunbao/common/Constants.java | 2 +
.../java/com/yunbao/common/HtmlConfig.java | 2 +-
.../common/activity/WebViewActivity.java | 15 ++++-
.../common/dialog/CreateSudGamePopup.java | 58 ++++++++++++++-----
.../common/dialog/SudGameListSelectPopup.java | 5 +-
.../yunbao/common/sud/BaseGameViewModel.java | 17 ++++++
.../common/sud/decorator/game/JumpEvent.java | 4 +-
.../com/yunbao/common/utils/DialogUitl.java | 6 ++
.../yunbao/common/views/LiveSudGamePopup.java | 1 -
.../src/main/res/layout/activity_webview.xml | 3 +-
common/src/main/res/values-en-rUS/string.xml | 2 +-
common/src/main/res/values-zh-rHK/strings.xml | 2 +-
common/src/main/res/values-zh-rTW/strings.xml | 2 +-
common/src/main/res/values-zh/strings.xml | 2 +-
config.gradle | 4 +-
.../live/presenter/LiveGiftAnimPresenter.java | 1 +
.../yunbao/live/socket/SocketRyClient.java | 13 ++++-
.../main/activity/ZhuangBanActivity.java | 9 ++-
.../main/res/layout/activity_battlepass.xml | 1 +
19 files changed, 117 insertions(+), 32 deletions(-)
diff --git a/common/src/main/java/com/yunbao/common/Constants.java b/common/src/main/java/com/yunbao/common/Constants.java
index a0ea5df91..ba53dd875 100644
--- a/common/src/main/java/com/yunbao/common/Constants.java
+++ b/common/src/main/java/com/yunbao/common/Constants.java
@@ -272,6 +272,8 @@ public class Constants {
public static final int LINK_MIC_TYPE_NORMAL = 0;//观众与主播连麦
public static final int LINK_MIC_TYPE_ANCHOR = 1;//主播与主播连麦
+ public static final String SOCKET_LIVE_ANCHOR_PK_DIALOG="GuildCompetitionNotice";//公会赛弹窗
+
//视频举报获取位置
public static int xIndex = 0;
public static int yindex = 0;
diff --git a/common/src/main/java/com/yunbao/common/HtmlConfig.java b/common/src/main/java/com/yunbao/common/HtmlConfig.java
index cc331d026..d128d9001 100644
--- a/common/src/main/java/com/yunbao/common/HtmlConfig.java
+++ b/common/src/main/java/com/yunbao/common/HtmlConfig.java
@@ -39,7 +39,7 @@ public class HtmlConfig {
public static final String TURNTABLE_URL = CommonAppConfig.HOST + "/Appapi/Turntable/index";
//在线商城
- public static final String SHOP = CommonAppConfig.HOST + "/h5/shoppingMall.html";
+ public static final String SHOP = CommonAppConfig.HOST + "/h5/shop/index.html";
//社区
public static final String ENCOURAGE = CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ";
diff --git a/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java b/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
index aeec0100e..2a1046b0d 100644
--- a/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
+++ b/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
@@ -29,6 +29,7 @@ import com.lxj.xpopup.XPopup;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.CommonAppContext;
import com.yunbao.common.Constants;
+import com.yunbao.common.HtmlConfig;
import com.yunbao.common.R;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.event.JavascriptInterfaceEvent;
@@ -100,7 +101,6 @@ public class WebViewActivity extends AbsActivity {
ft_title = (FrameLayout) findViewById(R.id.ft_title);
v_spacing = (View) findViewById(R.id.v_spacing);
mWebView = findViewById(R.id.webView);
-
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
params.topMargin = DpUtil.dp2px(1);
// mWebView.setLayoutParams(params);
@@ -136,11 +136,17 @@ public class WebViewActivity extends AbsActivity {
if (url.contains("for")) {
mWebView.loadUrl("javascript:goAnchorTab()");
}
+
+
+ if(url.startsWith(HtmlConfig.SHOP)){
+ //商店页不做动态变换
+ return;
+ }
//真实屏幕高度-(ft_title的高度+导航栏高度)
//屏蔽掉是因为在线客服页面 AndroidBug5497Workaround会失效
int height = DeviceUtils.getScreenRealHeight(mContext) - DpUtil.dp2px(72) - getCurrentNavigationBarHeight(mContext);
if (!navigationGestureEnabled(mContext)) {
- view.loadUrl("javascript:window.androidObject.setHeight(" + height + ",0,false)");
+ // view.loadUrl("javascript:window.androidObject.setHeight(" + height + ",0,false)");
}
}
@@ -194,6 +200,8 @@ public class WebViewActivity extends AbsActivity {
mWebView.getSettings().setAllowFileAccess(true);
mWebView.getSettings().setUseWideViewPort(true); // 关键点
mWebView.getSettings().setAllowFileAccess(true); // 允许访问文件
+ mWebView.setHorizontalScrollBarEnabled(false);
+ mWebView.setVerticalScrollBarEnabled(false);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
@@ -213,6 +221,9 @@ public class WebViewActivity extends AbsActivity {
ft_title.setVisibility(View.VISIBLE);
v_spacing.setVisibility(View.GONE);
}
+ if(!StringUtil.isEmpty(url)&&url.startsWith(HtmlConfig.SHOP)){
+ ft_title.setVisibility(View.GONE);
+ }
}
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 d265f74ea..82f607bfa 100644
--- a/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java
+++ b/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java
@@ -312,20 +312,50 @@ public class CreateSudGamePopup extends BottomPopupView {
animator.setDuration(animDuration);
animator.setInterpolator(new LinearInterpolator());
animator.start();
- XPopup.Builder builder = new XPopup.Builder(getContext()).atView(findViewById(R.id.currency_type));
- builder.hasShadowBg(false)
- .isDestroyOnDismiss(true)
- .isLightStatusBar(false)
- .popupPosition(PopupPosition.Bottom)
- .asCustom(new SudGameListSelectPopup(getContext(), 5, currencyTypeName,isYuanbao)
- .setOnDismissListener(new DialogInterface.OnDismissListener() {
- @Override
- public void onDismiss(DialogInterface dialog) {
- closeAnimSudGameListEvent();
- }
- })
- )
- .show();
+ if (hasMoveUp) {
+ InputMethodManager imm = getSystemService(getContext(), InputMethodManager.class);
+ if (imm != null) {
+ imm.hideSoftInputFromWindow(roomName.getWindowToken(), 0);
+ imm.hideSoftInputFromWindow(gameSill.getWindowToken(), 0);
+ }
+ new Handler().postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ XPopup.Builder builder = new XPopup.Builder(getContext()).atView(findViewById(R.id.currency_type));
+ builder.hasShadowBg(false)
+ .isDestroyOnDismiss(true)
+ .isLightStatusBar(false)
+ .popupPosition(PopupPosition.Bottom)
+ .asCustom(new SudGameListSelectPopup(getContext(), 5, currencyTypeName,isYuanbao)
+ .setOnDismissListener(new DialogInterface.OnDismissListener() {
+ @Override
+ public void onDismiss(DialogInterface dialog) {
+ closeAnimSudGameListEvent();
+ }
+ })
+ )
+ .show();
+ }
+ }, 500);
+ }else {
+ XPopup.Builder builder = new XPopup.Builder(getContext()).atView(findViewById(R.id.currency_type));
+ builder.hasShadowBg(false)
+ .isDestroyOnDismiss(true)
+ .isLightStatusBar(false)
+ .popupPosition(PopupPosition.Bottom)
+ .asCustom(new SudGameListSelectPopup(getContext(), 5, currencyTypeName,isYuanbao)
+ .setOnDismissListener(new DialogInterface.OnDismissListener() {
+ @Override
+ public void onDismiss(DialogInterface dialog) {
+ closeAnimSudGameListEvent();
+ }
+ })
+ )
+ .show();
+ }
+
+
+
}
});
}
diff --git a/common/src/main/java/com/yunbao/common/dialog/SudGameListSelectPopup.java b/common/src/main/java/com/yunbao/common/dialog/SudGameListSelectPopup.java
index 1d46c8f71..fbca07bed 100644
--- a/common/src/main/java/com/yunbao/common/dialog/SudGameListSelectPopup.java
+++ b/common/src/main/java/com/yunbao/common/dialog/SudGameListSelectPopup.java
@@ -88,12 +88,11 @@ public class SudGameListSelectPopup extends AttachPopupView {
if (mType == 0 || mType == 4) {
topSelect.setText(getContext().getString(R.string.interactive_game_room_all));
for (int i = 0; i < customSidebarChildModels.size(); i++) {
- DebugDialog.getInstance().setParams("UserType", IMLoginManager.get(getContext()).getUserInfo().getUsersType());
- if (!IMLoginManager.get(getContext()).getUserInfo().anchorUserType()) {
+ /* if (!IMLoginManager.get(getContext()).getUserInfo().anchorUserType()) {
if ("1490944230389182466".equals(customSidebarChildModels.get(i).getSrc())) {//友尽闯关
continue;
}
- }
+ }*/
selectString.add(customSidebarChildModels.get(i).getTitle());
if (TextUtils.equals(String.valueOf(interactionID), customSidebarChildModels.get(i).getSrc())) {
index = i;
diff --git a/common/src/main/java/com/yunbao/common/sud/BaseGameViewModel.java b/common/src/main/java/com/yunbao/common/sud/BaseGameViewModel.java
index 589fee469..803d333f7 100644
--- a/common/src/main/java/com/yunbao/common/sud/BaseGameViewModel.java
+++ b/common/src/main/java/com/yunbao/common/sud/BaseGameViewModel.java
@@ -9,6 +9,7 @@ import android.view.View;
import android.view.ViewTreeObserver;
import android.widget.Toast;
+import com.alibaba.fastjson.JSONObject;
import com.yunbao.common.sud.decorator.SudFSMMGCache;
import com.yunbao.common.sud.decorator.SudFSMMGDecorator;
import com.yunbao.common.sud.decorator.SudFSMMGListener;
@@ -16,7 +17,9 @@ import com.yunbao.common.sud.decorator.SudFSTAPPDecorator;
import com.yunbao.common.sud.model.GameConfigModel;
import com.yunbao.common.sud.model.GameViewInfoModel;
import com.yunbao.common.sud.state.MGStateResponse;
+import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.SudJsonUtils;
+import com.yunbao.common.utils.ToastUtil;
import tech.sud.mgp.core.ISudFSMStateHandle;
import tech.sud.mgp.core.ISudFSTAPP;
@@ -285,6 +288,20 @@ public abstract class BaseGameViewModel implements SudFSMMGListener {
public void onGameLog(String str) {
SudFSMMGListener.super.onGameLog(str);
Log.e("onGameStarted", "游戏日志:" + str);
+ if(!StringUtil.isEmpty()){
+ try{
+ JSONObject json=JSONObject.parseObject(str);
+ if("error".equals(json.getString("level"))){
+ String msg = json.getString("msg");
+ JSONObject error=JSONObject.parseObject(msg);
+ if(error.containsKey("msg")) {
+ ToastUtil.show(error.getString("msg") + ":" + error.getInteger("resultCode"));
+ }
+ }
+ }catch (Exception ignore){
+
+ }
+ }
}
/**
diff --git a/common/src/main/java/com/yunbao/common/sud/decorator/game/JumpEvent.java b/common/src/main/java/com/yunbao/common/sud/decorator/game/JumpEvent.java
index ba4a36aa9..c6a05d011 100644
--- a/common/src/main/java/com/yunbao/common/sud/decorator/game/JumpEvent.java
+++ b/common/src/main/java/com/yunbao/common/sud/decorator/game/JumpEvent.java
@@ -21,8 +21,10 @@ public class JumpEvent {
}
private synchronized static void createOrder(SudMGPMGState.MGCommonGameCreateOrder order) {
- if (System.currentTimeMillis() - clickTimer < 1000) {
+ if (System.currentTimeMillis() - clickTimer < 500) {
//TODO 防止重复点击
+ HttpCallbackModel _data=new HttpCallbackModel(1001,"");
+ Bus.get().post(new SubGameEvent(0, _data,order.dataJson));
return;
}
clickTimer = System.currentTimeMillis();
diff --git a/common/src/main/java/com/yunbao/common/utils/DialogUitl.java b/common/src/main/java/com/yunbao/common/utils/DialogUitl.java
index adf6ced3c..d431d1b0e 100644
--- a/common/src/main/java/com/yunbao/common/utils/DialogUitl.java
+++ b/common/src/main/java/com/yunbao/common/utils/DialogUitl.java
@@ -493,10 +493,16 @@ public class DialogUitl {
TextView btnConfirm = (TextView) dialog.findViewById(R.id.btn_confirm);
if (!TextUtils.isEmpty(mConfirmString)) {
btnConfirm.setText(mConfirmString);
+ btnConfirm.setVisibility(View.VISIBLE);
+ }else if(mConfirmString==null){
+ btnConfirm.setVisibility(View.GONE);
}
TextView btnCancel = (TextView) dialog.findViewById(R.id.btn_cancel);
if (!TextUtils.isEmpty(mCancelString)) {
btnCancel.setText(mCancelString);
+ btnCancel.setVisibility(View.VISIBLE);
+ }else if(mCancelString==null){
+ btnCancel.setVisibility(View.GONE);
}
View.OnClickListener listener = new View.OnClickListener() {
@Override
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 e30bac901..d1b90ec09 100644
--- a/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java
+++ b/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java
@@ -285,7 +285,6 @@ public class LiveSudGamePopup extends BottomPopupView {
@Subscribe(threadMode = ThreadMode.MAIN)
public void onSudGameStatus(SubGameEvent event) {
if (event.getType() == 0) {
- DebugDialog.getInstance().setParams("游戏回调", event.getModel().getCode() + "");
Log.i("游戏回调", "onGameStateChange: event :" + event.toString());
if (event.getModel().getCode() == 1001 || event.getModel().getCode() == 1002) {
JSONObject jsonObject = new JSONObject();
diff --git a/common/src/main/res/layout/activity_webview.xml b/common/src/main/res/layout/activity_webview.xml
index ec83eebe4..44c9ef453 100644
--- a/common/src/main/res/layout/activity_webview.xml
+++ b/common/src/main/res/layout/activity_webview.xml
@@ -1,5 +1,6 @@
@@ -67,6 +69,5 @@
\ No newline at end of file
diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index 98f09ea64..9198719be 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -1374,7 +1374,7 @@ Limited ride And limited avatar frame
" Currently No Records~"
"Today "
1. Interactive games are a new section provided by PDLIVE for users, who can participate in the game section on the homepage or in the live room;
- 2. Currently, we have launched \'GoBang\',\' Bumper car \',\' Flying Chess\', \'Minesweeping\', \'Dart Master\', and \'Monster Eliminating\'. We will provide more game types in the future. Stay tuned;
+ Currently, [Backgammon], [Flying Chess], [Bumper I’m the Strongest], [Monster Match], [Jump], [Friendly Challenge], [Magic Battle], [American 8 Ball] More game types will be provided in the future, so stay tuned;
3.Users can customize the game threshold, which must be between 100 to 50000 gold beans , and the amount must be a multiple of 10;
4.At the beginning of the game, chips from participating users will be collected. After the game ends, 10% of the chips will be collected as tickets, and all remaining chips will be given to the winning users.In a draw, the corresponding chips will be deducted from the tickets and returned to the users;
5. The final interpretation right of the event belongs to PDLIVE.
diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml
index 423420996..91f92f700 100644
--- a/common/src/main/res/values-zh-rHK/strings.xml
+++ b/common/src/main/res/values-zh-rHK/strings.xml
@@ -1371,7 +1371,7 @@
暫無記錄~
今日
1、互動遊戲是PDLIVE為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與；
- 2、目前已上線【五子棋】、【碰碰我最強】、【飛行棋】、【扫雷】、【飞镖达人】、【怪兽消消乐】，後續將會提供更多遊戲種類，敬請期待；
+ 2、目前已上線【五子棋】、【飛行棋】、【碰碰我最強】、【怪物消消樂】、【跳一跳】、【友情闖關】、【魔法大樂鬥】、【美式8球】後續將會提供更多遊戲種類，敬請期期待；
3、用戶可自定義設定遊戲門檻，要求在100~50000金豆之間，數額必須為10的倍數；
4、 遊戲開始時將會收取參與遊戲用戶的籌碼，在遊戲結束後，將收取10%的籌碼作為門票，剩餘籌碼將全部給予勝利用戶，平局時將會扣除相應籌碼门票後返還給用戶；
5、活動最終解釋權歸PDLIVE所有。
diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml
index fc5fa7cc7..fce6cda70 100644
--- a/common/src/main/res/values-zh-rTW/strings.xml
+++ b/common/src/main/res/values-zh-rTW/strings.xml
@@ -1370,7 +1370,7 @@
暫無記錄~
今日
1、互動遊戲是PDLIVE為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與；
- 2、目前已上線【五子棋】、【碰碰我最強】、【飛行棋】、【扫雷】、【飞镖达人】、【怪兽消消乐】，後續將會提供更多遊戲種類，敬請期待；
+ 2、目前已上線【五子棋】、【飛行棋】、【碰碰我最強】、【怪物消消樂】、【跳一跳】、【友情闖關】、【魔法大樂鬥】、【美式8球】後續將會提供更多遊戲種類，敬請期期待；
3、用戶可自定義設定遊戲門檻，要求在100~50000金豆之間，數額必須為10的倍數；
4、 遊戲開始時將會收取參與遊戲用戶的籌碼，在遊戲結束後，將收取10%的籌碼作為門票，剩餘籌碼將全部給予勝利用戶，平局時將會扣除相應籌碼门票後返還給用戶；
5、活動最終解釋權歸PDLIVE所有。
diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml
index b328ddb56..49eb50f29 100644
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -1369,7 +1369,7 @@
暫無記錄~
今日
1、互動遊戲是PDLIVE為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與；
- 2、目前已上線【五子棋】、【碰碰我最強】、【飛行棋】、【扫雷】、【飞镖达人】、【怪兽消消乐】，後續將會提供更多遊戲種類，敬請期待；
+ 2、目前已上線【五子棋】、【飛行棋】、【碰碰我最強】、【怪物消消樂】、【跳一跳】、【友情闖關】、【魔法大樂鬥】、【美式8球】後續將會提供更多遊戲種類，敬請期期待；
3、 用戶可自定義設定遊戲門檻，要求在100~50000金豆之間，數額必須為10的倍數；
4、 遊戲開始時將會收取參與遊戲用戶的籌碼，在遊戲結束後，將收取10%的籌碼作為門票，剩餘籌碼將全部給予勝利用戶，平局時將會扣除相應籌碼门票後返還給用戶；
5、活動最終解釋權歸PDLIVE所有。
diff --git a/config.gradle b/config.gradle
index 98e8cbf9f..74f2e22ce 100644
--- a/config.gradle
+++ b/config.gradle
@@ -5,7 +5,7 @@ ext {
minSdkVersion : 21,
targetSdkVersion : 33,
versionCode : 468,
- versionName : "6.6.6"
+ versionName : "6.6.8"
]
manifestPlaceholders = [
//正式、
@@ -25,6 +25,6 @@ ext {
//是否上报异常日志
isUploadLog : true,
//是否打包成插件包模式
- isPluginModel : false,
+ isPluginModel : true,
]
}
diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java
index b73e45d18..016b21b9f 100644
--- a/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java
+++ b/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java
@@ -101,6 +101,7 @@ import pl.droidsonroids.gif.GifImageView;
/**
* Created by cxf on 2018/10/13.
* 产品让改礼物效果
+ * 全服通知效果实现
*/
public class LiveGiftAnimPresenter {
diff --git a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
index 549c32778..b65c211a8 100644
--- a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
+++ b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
@@ -52,6 +52,7 @@ import com.yunbao.common.manager.MicedUserManager;
import com.yunbao.common.manager.NewLevelManager;
import com.yunbao.common.manager.RandomPkManager;
import com.yunbao.common.utils.Bus;
+import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
@@ -445,7 +446,7 @@ public class SocketRyClient {
NewAllServerNotifyGuardEvent notifyGuardEvent = GsonUtils.fromJson(map.toString(), NewAllServerNotifyGuardEvent.class);
Bus.get().post(notifyGuardEvent);
buyGuardInSameRoom(map);
- }else if (action2==91){
+ } else if (action2 == 91) {
AllServerNotifyFFGGGDJANEvent notifyFFGGGDJANEvent = GsonUtils.fromJson(map.toString(), AllServerNotifyFFGGGDJANEvent.class);
Bus.get().post(notifyFFGGGDJANEvent);
}
@@ -820,6 +821,16 @@ public class SocketRyClient {
case "SendMoneyLongEnd":
Bus.get().post(new SendMoneyLongEndEvent());
break;
+ case Constants.SOCKET_LIVE_ANCHOR_PK_DIALOG:
+ item = map.getJSONObject("ct");
+ //DialogUitl.showSimpleDialog(mContext,WordUtil.isNewZh()?item.getString("text"):item.getString("text_en"),null);
+ new DialogUitl.Builder(mContext)
+ .setContent(WordUtil.isNewZh() ? item.getString("text") : item.getString("text_en"))
+ .setConfirmString(WordUtil.isNewZh() ? "確定" : "confirm")
+ .setCancelString(null)
+ .build()
+ .show();
+ break;
}
}
diff --git a/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java b/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java
index bf2ac850f..81c65ad64 100644
--- a/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java
@@ -34,6 +34,7 @@ import com.opensource.svgaplayer.SVGAVideoEntity;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.CommonAppContext;
import com.yunbao.common.Constants;
+import com.yunbao.common.HtmlConfig;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.event.JavascriptInterfaceEvent;
@@ -49,6 +50,7 @@ import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.common.utils.MicStatusManager;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils;
+import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.main.R;
@@ -86,6 +88,7 @@ public class ZhuangBanActivity extends AbsActivity {
if (!"".equals(Constants.myPackageUrl)) {
url = Constants.myPackageUrl;
}
+
v_spacing = (View) findViewById(R.id.v_spacing);
lt_title = (LinearLayout) findViewById(R.id.lt_title);
LinearLayout rootView = (LinearLayout) findViewById(com.yunbao.live.R.id.rootView);
@@ -102,13 +105,12 @@ public class ZhuangBanActivity extends AbsActivity {
}
L.e("H5---5>" + url);
-
mProgressBar = (ProgressBar) findViewById(R.id.progressbar);
svga = (SVGAImageView) findViewById(R.id.svga);
mWebView = new WebView(mContext);
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
params.topMargin = DpUtil.dp2px(1);
- params.bottomMargin = DpUtil.dp2px(15);
+ //params.bottomMargin = DpUtil.dp2px(15);
mWebView.setLayoutParams(params);
mWebView.setOverScrollMode(View.OVER_SCROLL_NEVER);
rootView.addView(mWebView);
@@ -194,6 +196,9 @@ public class ZhuangBanActivity extends AbsActivity {
}
mWebView.loadUrl(url);
AndroidBug5497Workaround.assistActivity(this);
+ if(!StringUtil.isEmpty(url)&&url.startsWith(HtmlConfig.SHOP)){
+ lt_title.setVisibility(View.GONE);
+ }
}
diff --git a/main/src/main/res/layout/activity_battlepass.xml b/main/src/main/res/layout/activity_battlepass.xml
index 6a8e0e91d..aaad2a686 100644
--- a/main/src/main/res/layout/activity_battlepass.xml
+++ b/main/src/main/res/layout/activity_battlepass.xml
@@ -123,6 +123,7 @@
tools:visibility="visible"
android:layout_height="34dp"
android:textColor="#ff6c00"
+ android:textAllCaps="false"
android:layout_marginBottom="50dp"
android:layout_marginEnd="50dp"
android:background="@mipmap/icon_battle_all_get"