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

Merge branch 'master' into dev_test

Browse Source
This commit is contained in:
zlzw
2022-09-22 15:27:41 +08:00
parent ff7bfc040d a9302d3e54
commit 7f423a9ae2
10 changed files with 135 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/src/main/java/com/yunbao/common/bean/ConfigBean.java
View File

@@ -57,6 +57,15 @@ public class ConfigBean {
private String txVideoUgcLicenceUrl;//腾讯直播视频鉴权
private String txPlayUgcLicenceUrl;//腾讯短视频鉴权
private String txVideoUgcKey;
private String google_isup;
@JSONField(name = "google_isup")
public String getGoogle_isup() {
return google_isup;
}
@JSONField(name = "google_isup")
public void setGoogle_isup(String google_isup) {
this.google_isup = google_isup;
}
@JSONField(name = "tx_play_ugc_licence_url")
public String getTxPlayUgcLicenceUrl() {

3
common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
View File

@@ -165,7 +165,8 @@ public class CommonHttpUtil {
//或者仅仅使用 locale = Locale.getDefault(); 不需要考虑接口 deprecated(弃用)问题
HttpClient.getInstance().get("Home.getConfig", CommonHttpConsts.GET_CONFIG)
.params("langue", lang)
.params("version", "6.4.1")
.params("version", ""+VersionUtil.getVersion())
.params("from", "android")
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

115
common/src/main/java/com/yunbao/common/utils/VersionUtil.java
View File

@@ -1,5 +1,6 @@
package com.yunbao.common.utils;
import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
@@ -8,6 +9,7 @@ import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Handler;
import android.text.TextUtils;
import android.util.Log;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.CommonAppContext;
@@ -47,7 +49,7 @@ public class VersionUtil {
//是否是谷歌版本
public static void showDialog(final Context context, ConfigBean configBean, final String downloadUrl) {
public static void showDialog(final Activity context, ConfigBean configBean, final String downloadUrl) {
if (configBean.getForceUpdate() != 0) {
if (CommonAppConfig.IS_GOOGLE_PLAY == false) {
if (!TextUtils.isEmpty(downloadUrl)) {
@@ -79,15 +81,16 @@ public class VersionUtil {
//谷歌更新
} else if (CommonAppConfig.IS_GOOGLE_PLAY == true) {
DialogUitl.Builder builder = new DialogUitl.Builder(context);
builder.setTitle(WordUtil.getString(R.string.version_update))
.setContent(configBean.getUpdateDes())
.setConfrimString(WordUtil.getString(R.string.version_immediate_use))
.setCancelString(WordUtil.getString(R.string.version_not_update))
.setCancelable(true)
.setClickCallback(new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
if (configBean.getGoogle_isup().equals("0")) {
DialogUitl.Builder builder = new DialogUitl.Builder(context);
builder.setTitle(WordUtil.getString(R.string.version_update))
.setContent(configBean.getUpdateDes())
.setConfrimString(WordUtil.getString(R.string.version_immediate_use))
.setCancelString(WordUtil.getString(R.string.version_not_update))
.setCancelable(true)
.setClickCallback(new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
try {
Intent i = new Intent(android.content.Intent.ACTION_VIEW);
i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pdlive.shayu"));
@@ -95,11 +98,33 @@ public class VersionUtil {
} catch (Exception e) {
ToastUtil.show(R.string.version_download_url_error);
}
}
})
.build()
.show();
}
})
.build()
.show();
} else {
DialogUitl.Builder builder = new DialogUitl.Builder(context);
builder.setTitle(WordUtil.getString(R.string.version_update))
.setContent(configBean.getUpdateDes())
.setConfrimString(WordUtil.getString(R.string.version_immediate_use))
.setCancelString(WordUtil.getString(R.string.version_not_update))
.setCancelable(false)
.setClickCallback(new DialogUitl.SimpleCallback2() {
public void onCancelClick() {
context.finish();
}
@Override
public void onConfirmClick(Dialog dialog, String content) {
Intent i = new Intent(android.content.Intent.ACTION_VIEW);
i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pdlive.shayu"));
context.startActivity(i);
context.finish();
}
})
.build()
.show();
}
}
} else {
if (CommonAppConfig.IS_GOOGLE_PLAY == false) {
@@ -124,7 +149,7 @@ public class VersionUtil {
.updateContent(configBean.getUpdateDes())
.update();
}
},2000);
}, 2000);
} catch (Exception e) {
@@ -133,27 +158,53 @@ public class VersionUtil {
} else {
ToastUtil.show(R.string.version_download_url_error);
}
}else if(CommonAppConfig.IS_GOOGLE_PLAY == true){
DialogUitl.Builder builder = new DialogUitl.Builder(context);
builder.setTitle(WordUtil.getString(R.string.version_update))
.setContent(configBean.getUpdateDes())
.setConfrimString(WordUtil.getString(R.string.version_immediate_use))
.setCancelString(WordUtil.getString(R.string.version_not_update))
.setCancelable(true)
.setClickCallback(new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
try {
} else if (CommonAppConfig.IS_GOOGLE_PLAY == true) {
if (configBean.getGoogle_isup().equals("0")) {
Log.e("tagg", "111111");
DialogUitl.Builder builder = new DialogUitl.Builder(context);
builder.setTitle(WordUtil.getString(R.string.version_update))
.setContent(configBean.getUpdateDes())
.setConfrimString(WordUtil.getString(R.string.version_immediate_use))
.setCancelString(WordUtil.getString(R.string.version_not_update))
.setCancelable(true)
.setClickCallback(new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
try {
Intent i = new Intent(android.content.Intent.ACTION_VIEW);
i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pdlive.shayu"));
context.startActivity(i);
} catch (Exception e) {
ToastUtil.show(R.string.version_download_url_error);
}
}
})
.build()
.show();
} else {
DialogUitl.Builder builder = new DialogUitl.Builder(context);
builder.setTitle(WordUtil.getString(R.string.version_update))
.setContent(configBean.getUpdateDes())
.setConfrimString(WordUtil.getString(R.string.version_immediate_use))
.setCancelString(WordUtil.getString(R.string.version_not_update))
.setCancelable(false)
.setClickCallback(new DialogUitl.SimpleCallback2() {
public void onCancelClick() {
context.finish();
}
@Override
public void onConfirmClick(Dialog dialog, String content) {
Intent i = new Intent(android.content.Intent.ACTION_VIEW);
i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pdlive.shayu"));
context.startActivity(i);
} catch (Exception e) {
ToastUtil.show(R.string.version_download_url_error);
context.finish();
}
}
})
.build()
.show();
})
.build()
.show();
}
}
}

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

@@ -478,7 +478,7 @@
<string name="share_cancel">分享取消</string>
<string name="version_update">版本更新</string>
<string name="versions">版本號</string>
<string name="version_immediate_use">立即使用</string>
<string name="version_immediate_use">立即更新</string>
<string name="version_not_update">暫不更新</string>
<string name="version_latest">已經是最新版本</string>
<string name="version_download_url_error">下載地址無效</string>