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

新增主页面APk更新功能，区分强制非强制

Browse Source
This commit is contained in:
18401019693
2023-01-03 16:17:48 +08:00
parent af58ec755d
commit 7a9ed22ec9
11 changed files with 136 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,6 @@ import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.text.TextUtils;
import android.util.Log;
import android.view.Display;
@@ -41,6 +40,7 @@ import com.google.firebase.messaging.FirebaseMessaging;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.jakewharton.rxbinding3.view.RxView;
import com.lxj.xpopup.XPopup;
import com.lzf.easyfloat.EasyFloat;
import com.lzf.easyfloat.permission.PermissionUtils;
import com.tencent.imsdk.v2.V2TIMCallback;
@@ -75,6 +75,7 @@ import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.main.MainNetManager;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.manager.APKManager;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.manager.NoviceInstructorManager;
import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
@@ -88,16 +89,14 @@ import com.yunbao.common.utils.SpUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.VersionUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.APKUpdateCustomPopup;
import com.yunbao.common.views.AbsMainViewHolder;
import com.yunbao.common.views.floatingview.APPEasyFloat;
import com.yunbao.common.views.weight.LiveFloatView;
import com.yunbao.live.activity.LiveAudienceActivity;
import com.yunbao.live.activity.LiveRyAnchorActivity;
import com.yunbao.live.dialog.RandomPkDialogFragment;
import com.yunbao.live.http.LiveHttpConsts;
import com.yunbao.live.http.LiveHttpUtil;
import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
import com.yunbao.live.presenter.LiveRyLinkMicPkPresenter;
import com.yunbao.live.utils.LiveStorge;
import com.yunbao.live.views.ChatListViewHolder;
import com.yunbao.main.R;
@@ -682,8 +681,14 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
DialogUitl.showSimpleTipDialog(mContext, WordUtil.getString(R.string.main_maintain_notice), configBean.getMaintainTips());
}
if (!VersionUtil.isLatest(configBean.getVersion())) {
VersionUtil versionUtil = new VersionUtil();
versionUtil.showDialog(mContext, configBean, configBean.getDownloadApkUrl());
if (!APKManager.get().getApkVerNew()) {
new XPopup.Builder(mContext)
.isDestroyOnDismiss(true)
.dismissOnBackPressed(false) // 按返回键是否关闭弹窗，默认为true
.dismissOnTouchOutside(false) // 点击外部是否关闭弹窗，默认为true
.asCustom(new APKUpdateCustomPopup(mContext, false))
.show();
}
} else {
requestBonus();
}

5
main/src/main/java/com/yunbao/main/activity/SettingActivity.java
View File

@@ -32,6 +32,7 @@ import com.yunbao.common.http.CommonHttpConsts;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.APKManager;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.GlideCatchUtil;
@@ -286,9 +287,9 @@ public class SettingActivity extends AbsActivity implements OnItemClickListener<
} else if (bean.getId() == 21) {//清除缓存
startActivity(new Intent(SettingActivity.this, MsgSettActivity.class));
} else if (bean.getId() == 25) {//版本更新
if (!IMLoginManager.get(mContext).getApkVerNew()) {
if (!APKManager.get().getApkVerNew()) {
new XPopup.Builder(mContext)
.asCustom(new APKUpdateCustomPopup(mContext))
.asCustom(new APKUpdateCustomPopup(mContext, true))
.show();
}

3
main/src/main/java/com/yunbao/main/adapter/SettingAdapter.java
View File

@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.yunbao.common.Constants;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.APKManager;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.DeviceUtils;
import com.yunbao.common.utils.LogUtil;
@@ -147,7 +148,7 @@ public class SettingAdapter extends RecyclerView.Adapter {
mText.setText(DeviceUtils.getVersionName(itemView.getContext()));
mText.setTextColor(Color.parseColor("#969696"));
} else if (bean.getId() == 25) {
if (IMLoginManager.get(itemView.getContext()).getApkVerNew()) {
if (APKManager.get().getApkVerNew()) {
mText.setText(itemView.getContext().getString(R.string.latest_version));
mText.setTextColor(Color.parseColor("#969696"));

4
main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
View File

@@ -39,7 +39,7 @@ import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.manager.APKManager;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.ToastUtil;
@@ -180,7 +180,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), 10);
}
});
redPoint.setVisibility(IMLoginManager.get(mContext).getApkVerNew() ? View.GONE : View.VISIBLE);
redPoint.setVisibility(APKManager.get().getApkVerNew() ? View.GONE : View.VISIBLE);
}
@Override