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

修复主页战令悬浮问题

Browse Source 
调整获取验证码接口设置语言
This commit is contained in:
zlzw
2024-05-14 17:16:28 +08:00
parent 8d87dda691
commit 0ff0cb52f6
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.gradle
View File

@@ -21,10 +21,10 @@ ext {
baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
// true表示谷歌支付 false 0 链接包 1 谷歌包 2华为包 3 samsung包 // true表示谷歌支付 false 0 链接包 1 谷歌包 2华为包 3 samsung包
isGooglePlay : 1, isGooglePlay : 0,
//是否上报异常日志 //是否上报异常日志
isUploadLog : true, isUploadLog : true,
//是否打包成插件包模式 //是否打包成插件包模式
isPluginModel : false, isPluginModel : true,
] ]
} }

25
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@@ -637,6 +637,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
} }
if (data.getShowWarOrder() == 0) { if (data.getShowWarOrder() == 0) {
floatWarOrder.setVisibility(View.GONE); floatWarOrder.setVisibility(View.GONE);
floatWarOrder.setTag(null);
//战令关闭情况下，在判断一次Banner是否足够 //战令关闭情况下，在判断一次Banner是否足够
if (data.getListShow() == 1 && data.getList().size() > 2) { if (data.getListShow() == 1 && data.getList().size() > 2) {
floatBanner.setVisibility(View.VISIBLE); floatBanner.setVisibility(View.VISIBLE);
@@ -649,8 +650,10 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
} else { } else {
if (mainHomeViewHolder != null && mainHomeViewHolder.isFloatWarOrder()) { if (mainHomeViewHolder != null && mainHomeViewHolder.isFloatWarOrder()) {
floatWarOrder.setVisibility(View.GONE); floatWarOrder.setVisibility(View.GONE);
floatWarOrder.setTag(null);
} else { } else {
floatWarOrder.setVisibility(View.VISIBLE); floatWarOrder.setVisibility(View.VISIBLE);
floatWarOrder.setTag(data);
} }
floatBanner.setVisibility(View.GONE); floatBanner.setVisibility(View.GONE);
@@ -798,18 +801,17 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
private void showStartDialog() { private void showStartDialog() {
if (isReady == true) { if (isReady == true) {
MainStartDialogFragment dialogFragment = new MainStartDialogFragment(); MainStartDialogFragment dialogFragment = new MainStartDialogFragment();
dialogFragment.setMainStartChooseCallback(true, this); dialogFragment.setMainStartChooseCallback(true, this);
dialogFragment.show(getSupportFragmentManager(), "MainStartDialogFragment"); dialogFragment.show(getSupportFragmentManager(), "MainStartDialogFragment");
} else { } else {
ToastUtil.show("正在初始化，請稍等...."); ToastUtil.show("正在初始化，請稍等....");
} }
} }
/** /**
* 检查版本更新 * 检查版本更新
*/ */
@@ -1499,10 +1501,15 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void onFloatWarOrderEvent(FloatWarOrderEvent event) { public void onFloatWarOrderEvent(FloatWarOrderEvent event) {
if (event.isFloatWarOrder()) { /* if (event.isFloatWarOrder()) {
floatWarOrder.setVisibility(View.GONE); floatWarOrder.setVisibility(View.GONE);
} else { } else {
floatWarOrder.setVisibility(View.VISIBLE); floatWarOrder.setVisibility(View.VISIBLE);
}*/
if(floatWarOrder.getTag()!=null){
floatWarOrder.setVisibility(View.VISIBLE);
}else{
floatWarOrder.setVisibility(View.GONE);
} }
} }

3
main/src/main/java/com/yunbao/main/http/MainHttpUtil.java
View File

@@ -517,6 +517,7 @@ public class MainHttpUtil {
.params("mobile", mobile) .params("mobile", mobile)
.params("sign", sign) .params("sign", sign)
.params("source", "1") .params("source", "1")
.params("langue", WordUtil.isNewZh()?"chinese":"english")
.execute(callback); .execute(callback);
} }
@@ -539,6 +540,7 @@ public class MainHttpUtil {
.params("MacAddress", macUitl.getNewMac()) .params("MacAddress", macUitl.getNewMac())
.params("Imei", uuid) .params("Imei", uuid)
.params("source", "1") .params("source", "1")
.params("langue", WordUtil.isNewZh()?"chinese":"english")
.execute(callback); .execute(callback);
} }
@@ -647,6 +649,7 @@ public class MainHttpUtil {
.params("mobile", mobile) .params("mobile", mobile)
.params("country_code", country_code) .params("country_code", country_code)
.params("source", "1") .params("source", "1")
.params("langue", WordUtil.isNewZh()?"chinese":"english")
.execute(callback); .execute(callback);
} }