diff --git a/app/build.gradle b/app/build.gradle index fe393d22a..d15ce5126 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -108,7 +108,6 @@ android { java.srcDirs = [ 'src/main/java', 'src/module_public_chat_hall/java', - 'src/module_upgrade_app/java', 'src/module_mentoring_relationship/java', 'src/module_labour_union/java', 'src/module_room_chat/java', @@ -126,7 +125,6 @@ android { 'src/main/res', 'src/common/res', 'src/module_public_chat_hall/res', - 'src/module_upgrade_app/res', 'src/module_mentoring_relationship/res', 'src/module_labour_union/res', 'src/module_room_chat/res', diff --git a/app/src/main/java/com/chwl/app/MainActivity.java b/app/src/main/java/com/chwl/app/MainActivity.java index 5f921e243..d2ffe0cf0 100644 --- a/app/src/main/java/com/chwl/app/MainActivity.java +++ b/app/src/main/java/com/chwl/app/MainActivity.java @@ -38,7 +38,6 @@ import com.netease.nimlib.sdk.team.constant.TeamMessageNotifyTypeEnum; import com.netease.nimlib.sdk.team.model.Team; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; import com.orhanobut.logger.Logger; -import com.chwl.app.upgrade.AppUpgradeHelper; import com.trello.rxlifecycle3.android.ActivityEvent; import com.chwl.app.application.IReportConstants; import com.chwl.app.application.ReportManager; @@ -246,8 +245,6 @@ public class MainActivity extends BaseMvpActivity mMainTabLayout.setMainTabInfoList(mainTabInfo); } }); - //检测更新 - AppUpgradeHelper.checkAppUpgrade(this); initMaterialView(); onParseIntent(); updateDatas(); diff --git a/app/src/main/java/com/chwl/app/application/GlobalHandleManager.java b/app/src/main/java/com/chwl/app/application/GlobalHandleManager.java index db1a8d613..f42537fe7 100644 --- a/app/src/main/java/com/chwl/app/application/GlobalHandleManager.java +++ b/app/src/main/java/com/chwl/app/application/GlobalHandleManager.java @@ -2,8 +2,6 @@ package com.chwl.app.application; import android.app.Activity; -import com.chwl.app.upgrade.AppUpgradeHelper; -import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; import com.chwl.app.avroom.newuserchargegift.NewUserChargePrizeDialog; import com.chwl.app.relation.cp.dialog.CpGlobalDialog; import com.chwl.app.ui.widget.LevelUpDialog; @@ -55,7 +53,6 @@ public class GlobalHandleManager { @Subscribe(threadMode = ThreadMode.MAIN) public void onImPushUpdateAppEvent(ImPushUpdateAppEvent event) { - AppUpgradeHelper.checkAppUpgrade((RxAppCompatActivity) getActivity(), event.getInfo()); } @Subscribe(threadMode = ThreadMode.MAIN) diff --git a/app/src/main/java/com/chwl/app/ui/login/LoginActivity.java b/app/src/main/java/com/chwl/app/ui/login/LoginActivity.java index 5476ba3b2..566138c34 100644 --- a/app/src/main/java/com/chwl/app/ui/login/LoginActivity.java +++ b/app/src/main/java/com/chwl/app/ui/login/LoginActivity.java @@ -18,7 +18,6 @@ import androidx.core.content.ContextCompat; import com.example.module_base.support.google.IGoogleService; import com.netease.nim.uikit.StatusBarUtil; -import com.chwl.app.upgrade.AppUpgradeHelper; import com.trello.rxlifecycle3.android.ActivityEvent; import com.chwl.app.MainActivity; import com.chwl.app.NimMiddleActivity; @@ -67,7 +66,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener onFindViews(); onSetListener(); setProtocol(); - AppUpgradeHelper.checkAppUpgrade(this); //登录页展示时 HashMap map = new HashMap<>(2); map.put(IReportConstants.MODULE, IReportConstants.PEKO_LOGIN); diff --git a/app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt b/app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt index a612bac07..541ec7718 100644 --- a/app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt @@ -8,7 +8,6 @@ import android.text.SpannableString import android.view.View import com.example.lib_utils.log.ILog import com.netease.nim.uikit.StatusBarUtil -import com.chwl.app.upgrade.AppUpgradeHelper import com.chwl.app.BuildConfig import com.chwl.app.R import com.chwl.app.UIHelper @@ -53,7 +52,6 @@ class SettingActivity : BaseViewBindingActivity(), View. @SuppressLint("SetTextI18n") private fun initView() { - binding.versions.text = "V${BasicConfig.getLocalVersionName(this)}" val cacheLoginUserInfo = UserModel.get().cacheLoginUserInfo ?: return if (cacheLoginUserInfo.isBindPasswd) { binding.tvLoginPwd.text = ResUtil.getString(R.string.text_reset_password) @@ -69,14 +67,12 @@ class SettingActivity : BaseViewBindingActivity(), View. binding.rlyUpdate.setOnClickListener(this) binding.tvBlackManager.setOnClickListener(this) binding.rlyLoginPwd.setOnClickListener(this) - binding.rlyPayPwd.setOnClickListener(this) binding.btnLoginOut.setOnClickListener(this) binding.tvCommunityNorms.setOnClickListener(this) binding.rlyClearCache.setOnClickListener(this) binding.tvNoticeSetting.setOnClickListener(this) binding.tvShieldManager.setOnClickListener(this) binding.rlyPermission.setOnClickListener(this) - binding.rlyCheck.setOnClickListener(this) if (BuildConfig.DEBUG) { binding.titleBar.setOnTitleClickListener { @@ -118,14 +114,6 @@ class SettingActivity : BaseViewBindingActivity(), View. R.id.rly_update -> startActivity(Intent(applicationContext, AboutActivity::class.java)) R.id.tv_black_manager -> BlackListManageActivity.start(this) R.id.rly_login_pwd -> ModifyPwdActivity.start(this, ModifyPwdActivity.LOGIN_PWD) - R.id.rly_pay_pwd -> { - if (UserModel.get().cacheLoginUserInfo == null) { - toast(ResUtil.getString(R.string.ui_setting_settingactivity_06)) - return - } - ModifyPwdActivity.start(this, ModifyPwdActivity.PAY_PWD) - } - R.id.btn_login_out -> { val cacheLoginUserInfo = UserModel.get().cacheLoginUserInfo ?: return if (!cacheLoginUserInfo.isBindPasswd && !SPUtils.getBoolean( @@ -172,7 +160,6 @@ class SettingActivity : BaseViewBindingActivity(), View. R.id.tv_notice_setting -> NoticeSettingActivity.start(context) R.id.tv_shield_manager -> ShieldManageActivity.start(context) R.id.rly_permission -> PermissionGuideActivity.start(context) - R.id.rly_check -> AppUpgradeHelper.checkAppUpgrade(this, dialogManager) } } diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index 8537e32e1..d37b1df83 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -94,49 +94,6 @@ android:layout_marginEnd="15dp" android:background="@color/line_353548" /> - - - - - - - - - - - - - - - - - = MAX_COUNT_FOR_EVERY_VERSION) { - LogUtil.print("cacheCount more than " + MAX_COUNT_FOR_EVERY_VERSION); - return false; - } - if (TimeUtils.isTomorrow(cache.getTime())) { - //第二天，次数不到3次，也要弹窗 - LogUtil.print("isTomorrow and need updateDialog"); - return true; - } else { - LogUtil.print("today has show updateDialog"); - return false; - } - } catch (Exception ex) { - ex.printStackTrace(); - } - return true; - } - - public static void saveCache(UpgradeCache cache, String netVersion) { - try { - if (TextUtils.isEmpty(netVersion)) { - return; - } - if (cache == null) { - cache = new UpgradeCache(); - } - if (!Objects.equals(cache.getVersion(), netVersion)) { - LogUtil.print("[cacheVersion=" + cache.getVersion() + ", netVersion=" + netVersion + - ", to set count=0]"); - cache.setCount(0); - } - cache.setCount(cache.getCount() + 1); - cache.setTime(System.currentTimeMillis()); - cache.setVersion(netVersion); - String string = new Gson().toJson(cache); - LogUtil.print(string); - SharedPreferenceUtils.put(KEY_APP_UPGRADE_DIALOG_COUNT, string); - } catch (Exception ex) { - ex.printStackTrace(); - } - - } - -} diff --git a/app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppUpgradeHelper.java b/app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppUpgradeHelper.java deleted file mode 100644 index 07f41f41d..000000000 --- a/app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppUpgradeHelper.java +++ /dev/null @@ -1,151 +0,0 @@ -package com.chwl.app.upgrade; - -import android.annotation.SuppressLint; - -import com.trello.rxlifecycle3.android.ActivityEvent; -import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; -import com.chwl.app.common.widget.dialog.DialogManager; -import com.chwl.core.Constants; -import com.chwl.core.upgrade.bean.NewestVersionInfo; -import com.chwl.core.upgrade.bean.UpgradeCache; -import com.chwl.core.upgrade.model.UpgradeModel; -import com.chwl.core.utils.ActivityUtil; -import com.chwl.core.utils.CoreLogger; -import com.chwl.library.utils.AppMetaDataUtil; -import com.chwl.library.utils.SingleToastUtil; -import com.chwl.library.utils.config.BasicConfig; - -/** - * @author jack - * @Description - * @Date 2018/12/14 - */ -public class AppUpgradeHelper { - - /** - * 点击设置 - */ - @SuppressLint("CheckResult") - public static void checkAppUpgrade(RxAppCompatActivity activity, - DialogManager dialogManager) { - dialogManager.showProgressDialog(activity); - UpgradeModel.get() - .checkUpgrade() - .compose(activity.bindUntilEvent(ActivityEvent.DESTROY)) - .subscribe((newestVersionInfo, throwable) -> { - dialogManager.dismissDialog(); - if (throwable == null) { - if (newestVersionInfo.getUpdateStatus() == NewestVersionInfo.STATUS_FORCE_UPDATE || - newestVersionInfo.getUpdateStatus() == NewestVersionInfo.STATUS_RECOMMEND_UPDATE) { - if (!ActivityUtil.isCanShowAppCompatDialog(activity)) { - return; - } - if (AppVersionUtil.compareVersion(newestVersionInfo.getUpdateVersion(), BasicConfig.getLocalVersionName(activity)) <= 0) { - return; - } - AppUpdateDialog appUpdateDialog = new AppUpdateDialog(); - appUpdateDialog.setNewestVersionInfo(newestVersionInfo); - appUpdateDialog.show(activity.getSupportFragmentManager()); - } - } else { - CoreLogger.error("AppUpgradeHelper",throwable.getMessage()); - SingleToastUtil.showToastShort(throwable.getMessage()); - } - }); - } - - /** - * 非用户主动点击 - */ - @SuppressLint("CheckResult") - public static void checkAppUpgrade(RxAppCompatActivity activity) { - - if (UpgradeModel.get().isHasShowDialog()) { - //如果已经弹窗过，则不再调用接口了 - return; - } - - UpgradeModel.get() - .checkUpgrade() - .compose(activity.bindUntilEvent(ActivityEvent.DESTROY)) - .subscribe((newestVersionInfo, throwable) -> { - if (throwable == null) { - if (newestVersionInfo.getUpdateStatus() == NewestVersionInfo.STATUS_FORCE_UPDATE || - newestVersionInfo.getUpdateStatus() == NewestVersionInfo.STATUS_RECOMMEND_UPDATE) { - if (!ActivityUtil.isCanShowAppCompatDialog(activity)) { - return; - } - if (AppVersionUtil.compareVersion(newestVersionInfo.getUpdateVersion(), BasicConfig.getLocalVersionName(activity)) <= 0) { - return; - } - //如果是强更就直接弹，不走限制的逻辑 - boolean forceUpdate = newestVersionInfo.getUpdateStatus() - == NewestVersionInfo.STATUS_FORCE_UPDATE; - - boolean needShow = true; - if (!forceUpdate) { - UpgradeCache cache = AppUpgradeDataMrg.getCache(); - needShow = AppUpgradeDataMrg.isNeedDialog( - cache, newestVersionInfo.getUpdateVersion()); - if (needShow) { - //保存缓存 - AppUpgradeDataMrg.saveCache(cache, - newestVersionInfo.getUpdateVersion()); - } - } - //如果是强更，一定要弹窗 - if (forceUpdate || needShow) { - AppUpdateDialog appUpdateDialog = new AppUpdateDialog(); - appUpdateDialog.setNewestVersionInfo(newestVersionInfo); - appUpdateDialog.show(activity.getSupportFragmentManager()); - UpgradeModel.get().setHasShowDialog(true); - } - } - } else { - CoreLogger.error("AppUpgradeHelper",throwable.getMessage()); - } - }); - } - - /** - * 推送 - * @param newestVersionInfo 后台返回数据 - */ - @SuppressLint("CheckResult") - public static void checkAppUpgrade(RxAppCompatActivity activity, 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; - } - if (AppVersionUtil.compareVersion(newestVersionInfo.getUpdateVersion(), BasicConfig.getLocalVersionName(activity)) <= 0) { - return; - } - //如果是强更就直接弹，不走限制的逻辑 - boolean forceUpdate = newestVersionInfo.getUpdateStatus() - == NewestVersionInfo.STATUS_FORCE_UPDATE; - - boolean needShow = true; - if (!forceUpdate) { - UpgradeCache cache = AppUpgradeDataMrg.getCache(); - needShow = AppUpgradeDataMrg.isNeedDialog( - cache, newestVersionInfo.getUpdateVersion()); - if (needShow) { - //保存缓存 - AppUpgradeDataMrg.saveCache(cache, - newestVersionInfo.getUpdateVersion()); - } - } - //如果是强更，一定要弹窗 - if (forceUpdate || needShow) { - AppUpdateDialog appUpdateDialog = new AppUpdateDialog(); - appUpdateDialog.setNewestVersionInfo(newestVersionInfo); - appUpdateDialog.show(activity.getSupportFragmentManager()); - } - } - } - -} diff --git a/app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppVersionUtil.java b/app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppVersionUtil.java deleted file mode 100644 index 113722fea..000000000 --- a/app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppVersionUtil.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.chwl.app.upgrade; - -/** - * @Author: yangming - * @Date: 2019/12/30 15:55 - * @Description: 版本号判断工具类 - **/ -public class AppVersionUtil { - - /** - * 比较版本号的大小,前者大则返回一个正数,后者大返回一个负数,相等则返回0 - * - * @param version1 - * @param version2 - */ - public static int compareVersion(String version1, String version2) { - // 注意此处为正则匹配，不能用.； - String[] versionArray1 = version1.split("\\."); - String[] versionArray2 = version2.split("\\."); - int idx = 0; - // 取最小长度值 - int minLength = Math.min(versionArray1.length, versionArray2.length); - int diff = 0; - // 先比较长度, 再比较字符 - while (idx < minLength - && (diff = versionArray1[idx].length() - versionArray2[idx].length()) == 0 - && (diff = versionArray1[idx].compareTo(versionArray2[idx])) == 0) { - ++idx; - } - // 如果已经分出大小，则直接返回，如果未分出大小，则再比较位数，有子版本的为大； - diff = (diff != 0) ? diff : versionArray1.length - versionArray2.length; - return diff; - } -} diff --git a/app/src/module_upgrade_app/res/drawable-xhdpi/dialog_update_bg.webp b/app/src/module_upgrade_app/res/drawable-xhdpi/dialog_update_bg.webp deleted file mode 100644 index fc760f384..000000000 Binary files a/app/src/module_upgrade_app/res/drawable-xhdpi/dialog_update_bg.webp and /dev/null differ diff --git a/app/src/module_upgrade_app/res/drawable-xhdpi/dialog_update_bg_bottom.webp b/app/src/module_upgrade_app/res/drawable-xhdpi/dialog_update_bg_bottom.webp deleted file mode 100644 index 51bdaa495..000000000 Binary files a/app/src/module_upgrade_app/res/drawable-xhdpi/dialog_update_bg_bottom.webp and /dev/null differ diff --git a/app/src/module_upgrade_app/res/drawable-xhdpi/dialog_update_bg_top.webp b/app/src/module_upgrade_app/res/drawable-xhdpi/dialog_update_bg_top.webp deleted file mode 100644 index 4e4417fb8..000000000 Binary files a/app/src/module_upgrade_app/res/drawable-xhdpi/dialog_update_bg_top.webp and /dev/null differ diff --git a/app/src/module_upgrade_app/res/drawable-xhdpi/dialog_update_icon.webp b/app/src/module_upgrade_app/res/drawable-xhdpi/dialog_update_icon.webp deleted file mode 100644 index 96038fce4..000000000 Binary files a/app/src/module_upgrade_app/res/drawable-xhdpi/dialog_update_icon.webp and /dev/null differ diff --git a/app/src/module_upgrade_app/res/drawable-xhdpi/update_banner.webp b/app/src/module_upgrade_app/res/drawable-xhdpi/update_banner.webp deleted file mode 100644 index ba602f504..000000000 Binary files a/app/src/module_upgrade_app/res/drawable-xhdpi/update_banner.webp and /dev/null differ diff --git a/app/src/module_upgrade_app/res/drawable/shape_yellow_round.xml b/app/src/module_upgrade_app/res/drawable/shape_yellow_round.xml deleted file mode 100644 index 014e7a96c..000000000 --- a/app/src/module_upgrade_app/res/drawable/shape_yellow_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/module_upgrade_app/res/layout/dialog_erban_update.xml b/app/src/module_upgrade_app/res/layout/dialog_erban_update.xml deleted file mode 100644 index ac297909d..000000000 --- a/app/src/module_upgrade_app/res/layout/dialog_erban_update.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/module_upgrade_app/res/values/strings.xml b/app/src/module_upgrade_app/res/values/strings.xml deleted file mode 100644 index 7d7400277..000000000 --- a/app/src/module_upgrade_app/res/values/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - ·正在更新%s· - 新版本升級 - VERSION UPDATE - \ No newline at end of file