moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

应用内更新逻辑修改

Browse Source
This commit is contained in:
wushaocheng
2022-11-08 14:59:51 +08:00
parent 792b63e0d5
commit 96ef49d305
26 changed files with 60 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/MainActivity.java
View File

@@ -249,6 +249,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
mMainTabLayout.setMainTabInfoList(mainTabInfos);
}
});
AppUpgradeHelper.checkAppUpgrade(this, false, false);
initMaterialView();
onParseIntent();
updateDatas();
@@ -676,7 +677,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
}
});
// checkShowAnchorCardView();
AppUpgradeHelper.checkAppUpgrade(this, false, false);
}
@SuppressLint("CheckResult")

2
app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
View File

@@ -202,7 +202,7 @@ public class XChatApplication extends Application {
String channel = "";
channel = ChannelReaderUtil.getChannel(instance);
if (TextUtils.isEmpty(channel)) {
channel = "google";
channel = Constants.GOOGLE;
}
BasicConfig.INSTANCE.setOriginalChannel(channel);

6
app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt
View File

@@ -35,6 +35,7 @@ import com.yizhuan.erban.ui.pay.BillingManager
import com.yizhuan.erban.ui.setting.ModifyPwdActivity
import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.erban.ui.webview.CommonWebViewActivity
import com.yizhuan.xchat_android_core.Constants
import com.yizhuan.xchat_android_core.UriProvider
import com.yizhuan.xchat_android_core.pay.PayModel
import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods
@@ -108,7 +109,7 @@ class FirstChargeDialog : BaseViewBindingActivity<DialogFirstChargeBinding>(),
val channel = AppMetaDataUtil.getChannelID()
if (position == -1) {
ResUtil.getString(R.string.avroom_firstcharge_firstchargedialog_01).toast()
} else if (channel.equals("google")) {
} else if (channel.equals(Constants.GOOGLE)) {
goodsList?.get(position)?.let { charge ->
buyProduct(charge.skuDetails)
}
@@ -174,8 +175,7 @@ class FirstChargeDialog : BaseViewBindingActivity<DialogFirstChargeBinding>(),
binding.rbPlanC.text = "${goodsList[2].chargeMoney}$"
}
}
val channel = AppMetaDataUtil.getChannelID()
if (channel.equals("google")) {
if (AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
initBilling()
}
}

3
app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt
View File

@@ -19,6 +19,7 @@ import com.yizhuan.erban.ui.pay.ChargeActivity
import com.yizhuan.erban.ui.setting.ModifyPwdActivity
import com.yizhuan.erban.ui.webview.CommonWebViewActivity
import com.yizhuan.erban.ui.webview.DialogWebViewActivity
import com.yizhuan.xchat_android_core.Constants
import com.yizhuan.xchat_android_core.UriProvider
import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.initial.InitialModel
@@ -122,7 +123,7 @@ class RedPackageSendDialog : BaseDialog<DialogRedPackageSendBinding>(), GridPass
binding.tvCharge.setOnClickListener {
if (!CommonUtils.isFastDoubleClick(800)) {
if (AppMetaDataUtil.getChannelID() == "google") {
if (AppMetaDataUtil.getChannelID() == Constants.GOOGLE) {
ChargeActivity.start(context)
} else {
CommonWebViewActivity.start(

3
app/src/main/java/com/yizhuan/erban/base/BaseActivity.java
View File

@@ -79,6 +79,7 @@ import com.yizhuan.erban.ui.widget.dialog.OpenNobleGlobalNoticeDialog;
import com.yizhuan.erban.utils.UserUtils;
import com.yizhuan.tutu.mentoring_relationship.dialog.GrabApprenticesNoticeDialog;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.bean.BaseProtocol;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
@@ -1016,7 +1017,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
isShowingChargeDialog = false;
StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_NOT_ENOUGH_TO_RECHARGE,
ResUtil.getString(R.string.erban_base_baseactivity_02));
if(AppMetaDataUtil.getChannelID().equals("google")) {
if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
ChargeActivity.start(context);
}else {
CommonWebViewActivity.start(

2
app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java
View File

@@ -176,7 +176,7 @@ public class BillGiftExpendActivity extends BillBaseActivity<ActivityBillsGiftBi
mTitleBar.addAction(new TitleBar.TextAction(ResUtil.getString(R.string.bills_activities_billgiftexpendactivity_02)) {
@Override
public void performAction(View view) {
if(AppMetaDataUtil.getChannelID().equals("google")) {
if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
ChargeActivity.start(mActivity);
}else {
CommonWebViewActivity.start(

2
app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftInComeActivity.java
View File

@@ -196,7 +196,7 @@ public class BillGiftInComeActivity extends BillBaseActivity<ActivityBillsGiftBi
mTitleBar.addAction(new TitleBar.TextAction(ResUtil.getString(R.string.bills_activities_billgiftincomeactivity_02)) {
@Override
public void performAction(View view) {
if(AppMetaDataUtil.getChannelID().equals("google")) {
if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
ChargeActivity.start(mActivity);
}else {
CommonWebViewActivity.start(

3
app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftIncomeGroupActivity.java
View File

@@ -30,6 +30,7 @@ import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator;
import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil;
@@ -124,7 +125,7 @@ public class BillGiftIncomeGroupActivity extends BaseMvpActivity<IBillGiftIncome
mTitleBar.addAction(new TitleBar.TextAction(ResUtil.getString(R.string.bills_activities_billgiftincomegroupactivity_03)) {
@Override
public void performAction(View view) {
if(AppMetaDataUtil.getChannelID().equals("google")) {
if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
startActivity(new Intent(BillGiftIncomeGroupActivity.this, ChargeActivity.class));
}else {
CommonWebViewActivity.start(

2
app/src/main/java/com/yizhuan/erban/bills/activities/ChargeBillsActivity.java
View File

@@ -179,7 +179,7 @@ public class ChargeBillsActivity extends BillBaseActivity<ActivityBillsBinding>
mTitleBar.addAction(new TitleBar.TextAction(ResUtil.getString(R.string.bills_activities_chargebillsactivity_02)) {
@Override
public void performAction(View view) {
if(AppMetaDataUtil.getChannelID().equals("google")) {
if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
ChargeActivity.start(mActivity);
}else {
CommonWebViewActivity.start(

2
app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java
View File

@@ -62,7 +62,7 @@ public class RedBagBillsActivity extends BillBaseActivity<ActivityBillsBinding>
mTitleBar.addAction(new TitleBar.TextAction(ResUtil.getString(R.string.bills_activities_redbagbillsactivity_01)) {
@Override
public void performAction(View view) {
if(AppMetaDataUtil.getChannelID().equals("google")) {
if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
startActivity(new Intent(RedBagBillsActivity.this, ChargeActivity.class));
}else {
CommonWebViewActivity.start(

3
app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java
View File

@@ -20,6 +20,7 @@ import com.yizhuan.erban.bills.fragmemt.WithdrawBillsFragment;
import com.yizhuan.erban.databinding.ActivityWithdrawBillsBinding;
import com.yizhuan.erban.ui.pay.ChargeActivity;
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil;
@@ -76,7 +77,7 @@ public class WithdrawBillsActivity extends BaseBindingActivity<ActivityWithdrawB
mTitleBar.addAction(new TitleBar.TextAction(ResUtil.getString(R.string.bills_activities_withdrawbillsactivity_01)) {
@Override
public void performAction(View view) {
if(AppMetaDataUtil.getChannelID().equals("google")) {
if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
startActivity(new Intent(WithdrawBillsActivity.this, ChargeActivity.class));
}else {
CommonWebViewActivity.start(

3
app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogUiHelper.java
View File

@@ -7,6 +7,7 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.radish.task.activity.TaskCenterActivity;
import com.yizhuan.erban.ui.pay.ChargeActivity;
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
@@ -52,7 +53,7 @@ public class DialogUiHelper {
true, () -> {
StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_NOT_ENOUGH_TO_RECHARGE,
ResUtil.getString(R.string.widget_dialog_dialoguihelper_05) + CHARGE_FROM);
if (AppMetaDataUtil.getChannelID().equals("google")) {
if (AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
ChargeActivity.start(context);
} else {
CommonWebViewActivity.start(

2
app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.kt
View File

@@ -74,7 +74,7 @@ class DecorationStoreActivity : BaseViewBindingActivity<ActivityDecorationStoreB
}
binding.tvCharge.setOnClickListener {
if (AppMetaDataUtil.getChannelID() == "google") {
if (AppMetaDataUtil.getChannelID() == Constants.GOOGLE) {
ChargeActivity.start(this)
} else {
CommonWebViewActivity.start(

4
app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt
View File

@@ -40,6 +40,7 @@ import com.yizhuan.erban.ui.utils.load
import com.yizhuan.erban.ui.webview.CommonWebViewActivity
import com.yizhuan.erban.vip.VipMainActivity
import com.yizhuan.erban.vip.VipViewModel
import com.yizhuan.xchat_android_core.Constants
import com.yizhuan.xchat_android_core.UriProvider
import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.initial.InitialModel
@@ -393,8 +394,7 @@ class MeFragment : BaseFragment(), View.OnClickListener {
StatisticsProtocol.EVENT_USERCENTER_RECHARGE_CARD_CLICK,
getString(R.string.me_personal_center_recharge_card_click)
)
val channel = AppMetaDataUtil.getChannelID()
if (channel.equals("google")) {
if (AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
ChargeActivity.start(mContext)
} else {
CommonWebViewActivity.start(

3
app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyCreationActivity.java
View File

@@ -23,6 +23,7 @@ import com.yizhuan.erban.databinding.ActivityLuckyMoneyCreationBinding;
import com.yizhuan.erban.team.viewmodel.TeamVM;
import com.yizhuan.erban.ui.pay.ChargeActivity;
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.family.bean.FamilyInfo;
@@ -272,7 +273,7 @@ public class LuckyMoneyCreationActivity extends BaseBindingActivity<ActivityLuck
true, new DialogManager.AbsOkDialogListener() {
@Override
public void onOk() {
if (AppMetaDataUtil.getChannelID().equals("google")) {
if (AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
ChargeActivity.start(LuckyMoneyCreationActivity.this);
} else {
CommonWebViewActivity.start(

3
app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java
View File

@@ -45,6 +45,7 @@ import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
import com.yizhuan.erban.ui.withdraw.BinderAlipayActivity;
import com.yizhuan.erban.vip.VipMainActivity;
import com.yizhuan.tutu.mentoring_relationship.activity.MentoringRelationshipActivity;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.DemoCache;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.auth.AuthModel;
@@ -99,7 +100,7 @@ public class RouterHandler {
CommonWebViewActivity.start(context, routerValue);
break;
case RouterType.RECHARGE:
if(AppMetaDataUtil.getChannelID().equals("google")) {
if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
ChargeActivity.start(context);
}else {
CommonWebViewActivity.start(

3
app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendFragmentCpDelegate.kt
View File

@@ -11,6 +11,7 @@ import com.yizhuan.erban.relation.cp.dialog.CpInvitePageDialog
import com.yizhuan.erban.relation.cp.viewmodel.CpViewModel
import com.yizhuan.erban.ui.pay.ChargeActivity
import com.yizhuan.erban.ui.webview.CommonWebViewActivity
import com.yizhuan.xchat_android_core.Constants
import com.yizhuan.xchat_android_core.UriProvider
import com.yizhuan.xchat_android_core.relation.cp.CpInvitePageEntity
import com.yizhuan.xchat_android_core.utils.toast
@@ -74,7 +75,7 @@ class FriendFragmentCpDelegate(private val fragment: BaseFragment) {
DialogManager(fragment.context).showOkCancelDialog(
"鉆石余額不足，請前去充值！"
) {
if (AppMetaDataUtil.getChannelID() == "google") {
if (AppMetaDataUtil.getChannelID() == Constants.GOOGLE) {
ChargeActivity.start(fragment.requireContext())
} else {
CommonWebViewActivity.start(

5
app/src/main/java/com/yizhuan/erban/ui/login/LoginActivity.java
View File

@@ -24,6 +24,7 @@ import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.erban.common.widget.OriginalDrawStatusClickSpan;
import com.yizhuan.erban.ui.login.helper.LogoutHelper;
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.DemoCache;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.auth.AuthModel;
@@ -63,9 +64,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
private void onFindViews() {
tvProtocol = findViewById(R.id.tv_protocol);
tvProtocolHint = findViewById(R.id.tv_protocol_hint);
if(AppMetaDataUtil.getChannelID().equals("google")){
if (AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
findViewById(R.id.tv_google).setVisibility(View.VISIBLE);
}else {
} else {
findViewById(R.id.tv_google).setVisibility(View.GONE);
}
}

3
app/src/main/java/com/yizhuan/erban/ui/webview/JSInterface.java
View File

@@ -33,6 +33,7 @@ import com.yizhuan.erban.ui.webview.event.ShowNavEvent;
import com.yizhuan.erban.ui.webview.event.TaroPayResultEvent;
import com.yizhuan.erban.ui.widget.ShareDialog;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.decoration.bean.DecorationStoreRouterType;
@@ -109,7 +110,7 @@ public class JSInterface {
@JavascriptInterface
public void openChargePage() {
if (context != null) {
if(AppMetaDataUtil.getChannelID().equals("google")) {
if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
ChargeActivity.start(context);
}else {
CommonWebViewActivity.start(

3
app/src/main/java/com/yizhuan/erban/ui/webview/SimpleJSInterface.java
View File

@@ -11,6 +11,7 @@ import com.orhanobut.logger.Logger;
import com.tencent.vasdolly.helper.ChannelReaderUtil;
import com.yizhuan.erban.application.XChatApplication;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_library.utils.AppUtils;
import com.yizhuan.xchat_android_library.utils.VersionUtil;
@@ -90,7 +91,7 @@ public class SimpleJSInterface {
String channel;
channel = ChannelReaderUtil.getChannel(XChatApplication.instance());
if (TextUtils.isEmpty(channel)) {
channel = "google";
channel = Constants.GOOGLE;
}
return channel;
}

3
app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
View File

@@ -59,6 +59,7 @@ import com.yizhuan.erban.ui.widget.recyclerview.decoration.VerticalDecoration;
import com.yizhuan.erban.utils.RegexUtil;
import com.yizhuan.erban.utils.SpannableBuilder;
import com.yizhuan.erban.vip.VipMainActivity;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
@@ -1065,7 +1066,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
if (itemType == ITEM_TYPE_GOLD) {
StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_GIFT_PANEL_TO_RECHARGE, ResUtil.getString(R.string.ui_widget_giftdialog_023) + GIFT_DIALOG_FROM);
if (AppMetaDataUtil.getChannelID().equals("google")) {
if (AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
ChargeActivity.start(context);
} else {
CommonWebViewActivity.start(

5
app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt
View File

@@ -37,6 +37,7 @@ import com.yizhuan.erban.ui.setting.ModifyPwdActivity
import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.erban.ui.webview.CommonWebViewActivity
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
import com.yizhuan.xchat_android_core.Constants
import com.yizhuan.xchat_android_core.UriProvider
import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.pay.PayModel
@@ -181,7 +182,7 @@ class VipMainActivity : BaseViewBindingActivity<ActivityVipMainBinding>(),
binding.slAuth.isVisible = true
binding.tvNotOpen.text = getString(R.string.me_no_aristocracy_yet)
val channel = AppMetaDataUtil.getChannelID()
if (channel.equals("google")) {
if (channel.equals(Constants.GOOGLE)) {
initBilling()
} else {
loadData()
@@ -224,7 +225,7 @@ class VipMainActivity : BaseViewBindingActivity<ActivityVipMainBinding>(),
}
binding.tvOpenVip.setOnClickListener {
if(AppMetaDataUtil.getChannelID().equals("google")){
if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)){
bean?.let { charge ->
StatisticManager.Instance()
.onEvent(

3
app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java
View File

@@ -26,6 +26,7 @@ import com.orhanobut.logger.Logger;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.UriHelper;
import com.yizhuan.xchat_android_core.upgrade.bean.NewestVersionInfo;
import com.yizhuan.xchat_android_core.upgrade.model.UpgradeModel;
@@ -117,7 +118,7 @@ public class AppUpdateDialog extends DialogFragment implements View.OnClickListe
Intent intent = new Intent();
intent.setAction("android.intent.action.VIEW");
Uri content_url = null;
if(AppMetaDataUtil.getChannelID().equals("google")){
if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)){
content_url = Uri.parse(UriHelper.applyTimestampForUrl(XChatConstants.appDownloadUrl));//拼接上时间戳，避免访问缓存文件
}else if(newestVersionInfo != null){
content_url = Uri.parse(newestVersionInfo.getUpdateDownloadLink());

14
app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeHelper.java
View File

@@ -5,10 +5,12 @@ import android.annotation.SuppressLint;
import com.trello.rxlifecycle3.android.ActivityEvent;
import com.trello.rxlifecycle3.components.support.RxAppCompatActivity;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.upgrade.bean.NewestVersionInfo;
import com.yizhuan.xchat_android_core.upgrade.bean.UpgradeCache;
import com.yizhuan.xchat_android_core.upgrade.model.UpgradeModel;
import com.yizhuan.xchat_android_core.utils.ActivityUtil;
import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
/**
@@ -20,6 +22,7 @@ public class AppUpgradeHelper {
/**
* 点击设置
*
* @param isUserAuto ture 表示，是用户主动发起的请求，比如设置页点更新
* @param isPush ture 表示是后台推送
*/
@@ -96,6 +99,7 @@ public class AppUpgradeHelper {
/**
* 非用户主动点击
*
* @param isUserAuto ture 表示，是用户主动发起的请求，比如设置页点更新
* @param isPush ture 表示是后台推送
*/
@@ -168,18 +172,22 @@ public class AppUpgradeHelper {
/**
* 推送
* @param isUserAuto ture 表示，是用户主动发起的请求，比如设置页点更新
* @param isPush ture 表示是后台推送
*
* @param isUserAuto ture 表示，是用户主动发起的请求，比如设置页点更新
* @param isPush ture 表示是后台推送
* @param newestVersionInfo 后台返回数据
*/
@SuppressLint("CheckResult")
public static void checkAppUpgrade(RxAppCompatActivity activity, boolean isUserAuto,
boolean isPush,NewestVersionInfo newestVersionInfo) {
boolean isPush, NewestVersionInfo newestVersionInfo) {
if (newestVersionInfo.getUpdateStatus() == NewestVersionInfo.STATUS_FORCE_UPDATE ||
newestVersionInfo.getUpdateStatus() == NewestVersionInfo.STATUS_RECOMMEND_UPDATE) {
if (!ActivityUtil.isCanShowAppCompatDialog(activity)) {
return;
}
if (!newestVersionInfo.getUpdateOs().equals(Constants.ANDROID) || !newestVersionInfo.getUpdateChannel().equals(AppMetaDataUtil.getChannelID())) {
return;
}
//如果是强更就直接弹，不走限制的逻辑
boolean forceUpdate = newestVersionInfo.getUpdateStatus()
== NewestVersionInfo.STATUS_FORCE_UPDATE;

5
core/src/main/java/com/yizhuan/xchat_android_core/Constants.java
View File

@@ -111,4 +111,9 @@ public class Constants {
//相亲模式男神坑位下标
public static final List<Integer> maleIndex = Arrays.asList(0, 1, 4, 5);
public static final String GOOGLE = "google";
public static final String ANDROID = "android";
}

2
core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/bean/NewestVersionInfo.java
View File

@@ -25,6 +25,7 @@ public class NewestVersionInfo {
private int updateStatus;
private String updateOs;
private String updateVersionDesc;
private String updateChannel;
@Override
public String toString() {
@@ -35,6 +36,7 @@ public class NewestVersionInfo {
", updateStatus=" + updateStatus +
", updateOs='" + updateOs + '\'' +
", updateVersionDesc='" + updateVersionDesc + '\'' +
", updateChannel='" + updateChannel + '\'' +
'}';
}
}