From 96ef49d305ff3a60045304f1dea1b3491bc9dbaa Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Tue, 8 Nov 2022 14:59:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=86=85=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yizhuan/erban/MainActivity.java | 2 +- .../erban/application/XChatApplication.java | 2 +- .../erban/avroom/firstcharge/FirstChargeDialog.kt | 6 +++--- .../avroom/redpackage/RedPackageSendDialog.kt | 3 ++- .../java/com/yizhuan/erban/base/BaseActivity.java | 3 ++- .../bills/activities/BillGiftExpendActivity.java | 2 +- .../bills/activities/BillGiftInComeActivity.java | 2 +- .../activities/BillGiftIncomeGroupActivity.java | 3 ++- .../bills/activities/ChargeBillsActivity.java | 2 +- .../bills/activities/RedBagBillsActivity.java | 2 +- .../bills/activities/WithdrawBillsActivity.java | 3 ++- .../erban/common/widget/dialog/DialogUiHelper.java | 3 ++- .../decoration/view/DecorationStoreActivity.kt | 2 +- .../com/yizhuan/erban/home/fragment/MeFragment.kt | 4 ++-- .../view/LuckyMoneyCreationActivity.java | 3 ++- .../com/yizhuan/erban/ui/im/RouterHandler.java | 3 ++- .../erban/ui/im/friend/FriendFragmentCpDelegate.kt | 3 ++- .../com/yizhuan/erban/ui/login/LoginActivity.java | 5 +++-- .../com/yizhuan/erban/ui/webview/JSInterface.java | 3 ++- .../erban/ui/webview/SimpleJSInterface.java | 3 ++- .../com/yizhuan/erban/ui/widget/GiftDialog.java | 3 ++- .../java/com/yizhuan/erban/vip/VipMainActivity.kt | 5 +++-- .../tongdaxing/erban/upgrade/AppUpdateDialog.java | 3 ++- .../tongdaxing/erban/upgrade/AppUpgradeHelper.java | 14 +++++++++++--- .../com/yizhuan/xchat_android_core/Constants.java | 5 +++++ .../upgrade/bean/NewestVersionInfo.java | 2 ++ 26 files changed, 60 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index 6759db57e..f1be306f5 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -249,6 +249,7 @@ public class MainActivity extends BaseMvpActivity mMainTabLayout.setMainTabInfoList(mainTabInfos); } }); + AppUpgradeHelper.checkAppUpgrade(this, false, false); initMaterialView(); onParseIntent(); updateDatas(); @@ -676,7 +677,6 @@ public class MainActivity extends BaseMvpActivity } }); // checkShowAnchorCardView(); - AppUpgradeHelper.checkAppUpgrade(this, false, false); } @SuppressLint("CheckResult") diff --git a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java index 787bac854..177bb9c05 100644 --- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java +++ b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java @@ -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); diff --git a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt index cc599d3a9..7ef1e5191 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt @@ -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(), 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(), binding.rbPlanC.text = "${goodsList[2].chargeMoney}$" } } - val channel = AppMetaDataUtil.getChannelID() - if (channel.equals("google")) { + if (AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) { initBilling() } } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt index 1af866450..7b45a7be9 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt @@ -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(), GridPass binding.tvCharge.setOnClickListener { if (!CommonUtils.isFastDoubleClick(800)) { - if (AppMetaDataUtil.getChannelID() == "google") { + if (AppMetaDataUtil.getChannelID() == Constants.GOOGLE) { ChargeActivity.start(context) } else { CommonWebViewActivity.start( diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java index ce2769497..33a35d0ce 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java @@ -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( diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java index f41739485..395baa9d8 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java +++ b/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java @@ -176,7 +176,7 @@ public class BillGiftExpendActivity extends BillBaseActivity 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( diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java index df8d92112..2af919d0e 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java +++ b/app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java @@ -62,7 +62,7 @@ public class RedBagBillsActivity extends BillBaseActivity 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( diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java index 6744fbaac..e847c3259 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java +++ b/app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java @@ -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 { 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( diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.kt b/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.kt index e71b9bd5e..622f91b8a 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.kt @@ -74,7 +74,7 @@ class DecorationStoreActivity : BaseViewBindingActivity(), 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(), } binding.tvOpenVip.setOnClickListener { - if(AppMetaDataUtil.getChannelID().equals("google")){ + if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)){ bean?.let { charge -> StatisticManager.Instance() .onEvent( diff --git a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java index f2ad8561b..e534bfa66 100644 --- a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java +++ b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java @@ -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()); diff --git a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeHelper.java b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeHelper.java index 178a89f2a..6e2c8fdf3 100644 --- a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeHelper.java +++ b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeHelper.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/Constants.java b/core/src/main/java/com/yizhuan/xchat_android_core/Constants.java index 58bf2cce1..36b2ce100 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/Constants.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/Constants.java @@ -111,4 +111,9 @@ public class Constants { //相亲模式男神坑位下标 public static final List maleIndex = Arrays.asList(0, 1, 4, 5); + + public static final String GOOGLE = "google"; + + public static final String ANDROID = "android"; + } diff --git a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/bean/NewestVersionInfo.java b/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/bean/NewestVersionInfo.java index f50faf03c..c6616fc0e 100644 --- a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/bean/NewestVersionInfo.java +++ b/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/bean/NewestVersionInfo.java @@ -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 + '\'' + '}'; } }