diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/AppUpdateDialog.java b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/AppUpdateDialog.java index c41830a2..9f2e6015 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/AppUpdateDialog.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/AppUpdateDialog.java @@ -74,7 +74,7 @@ public class AppUpdateDialog extends BaseDialog implemen mProgressDialog.setCanceledOnTouchOutside(false); mProgressDialog.setMessage("下载中请稍等!!!"); mProgressDialog.show(); - DownloadUtil downloadUtil = new DownloadUtil(getContext()); + DownloadUtil downloadUtil = new DownloadUtil(getContext(),appUpdateModel.getUrl()); downloadUtil.downloadFile(appUpdateModel.getUrl(), this); } } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/DownloadUtil.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/DownloadUtil.java index 4d4e7c23..0ac59f38 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/DownloadUtil.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/DownloadUtil.java @@ -18,6 +18,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.util.Objects; import okhttp3.ResponseBody; import retrofit2.Call; @@ -41,14 +42,17 @@ public class DownloadUtil { private static final String PATH_AUDIO = Environment.getExternalStorageDirectory() + "/qipao/audio"; - public DownloadUtil(Context context) { + public DownloadUtil(Context context,String downUrl) { this.mContext = context; if (mApi == null) { //初始化网络请求接口 mApi = ApiHelper.getInstance().createService(ApiInterface.class); - mApkPath = new File(mContext.getFilesDir(), PATH_APK).getAbsolutePath(); - + int i = downUrl.lastIndexOf('/');//一定是找最后一个'/'出现的位置 + if (i != -1) { + downUrl = downUrl.substring(i); + } + mApkPath = new File(Objects.requireNonNull(mContext.getExternalFilesDir(PATH_APK+"_"+downUrl)).getAbsolutePath()).getAbsolutePath(); } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt index e868c5b5..d410ceca 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt @@ -1,5 +1,6 @@ package com.xscm.modulemain.activity.user.activity +import android.annotation.SuppressLint import android.os.Bundle import com.alibaba.android.arouter.launcher.ARouter import com.scwang.smartrefresh.layout.api.RefreshLayout @@ -40,7 +41,7 @@ class HeartCpActivity : BaseMvpActivity ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE) - .withString("userId", mHeartData?.gift_log!![position].from_user_id.toString()) + .withString("userId", dataList?.get(position)?.from_user_id.toString()) .navigation(); finish() } @@ -94,12 +95,12 @@ class HeartCpActivity : BaseMvpActivity