Skip to content

Commit 8f7cca1

Browse files
committed
在未发现新版本的位置增加日志,方便排查问题
1 parent 64caecc commit 8f7cca1

File tree

6 files changed

+18
-5
lines changed

6 files changed

+18
-5
lines changed

xupdate-lib/src/main/java/com/xuexiang/xupdate/UpdateManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ public void findNewVersion(@NonNull UpdateEntity updateEntity, @NonNull IUpdateP
335335
startDownload(updateEntity, mOnFileDownloadListener);
336336
} else {
337337
//已经下载好的直接安装
338-
_XUpdate.startInstallApk(getContext(), UpdateUtils.getApkFileByUpdateEntity(mUpdateEntity), mUpdateEntity.getDownLoadEntity());
338+
_XUpdate.startInstallApk(getContext(), mUpdateEntity);
339339
}
340340
} else {
341341
if (mUpdateProxy != null) {

xupdate-lib/src/main/java/com/xuexiang/xupdate/_XUpdate.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import androidx.annotation.NonNull;
2929

3030
import com.xuexiang.xupdate.entity.DownloadEntity;
31+
import com.xuexiang.xupdate.entity.UpdateEntity;
3132
import com.xuexiang.xupdate.entity.UpdateError;
3233
import com.xuexiang.xupdate.listener.OnInstallListener;
3334
import com.xuexiang.xupdate.listener.OnUpdateFailureListener;
@@ -42,6 +43,7 @@
4243
import com.xuexiang.xupdate.proxy.impl.DefaultFileEncryptor;
4344
import com.xuexiang.xupdate.service.DownloadService;
4445
import com.xuexiang.xupdate.utils.ApkInstallUtils;
46+
import com.xuexiang.xupdate.utils.UpdateUtils;
4547

4648
import java.io.File;
4749
import java.util.Map;
@@ -84,7 +86,7 @@ public final class _XUpdate {
8486
/**
8587
* 获取是否正在进行更新
8688
*
87-
* @param url 请求地址
89+
* @param url 请求地址
8890
*/
8991
public static boolean isAppUpdating(String url) {
9092
return DownloadService.isRunning() || _XUpdate.getCheckUrlStatus(url) || _XUpdate.isPrompterShow(url);
@@ -266,6 +268,16 @@ public static void startInstallApk(@NonNull Context context, @NonNull File apkFi
266268
startInstallApk(context, apkFile, new DownloadEntity());
267269
}
268270

271+
/**
272+
* 开始安装apk文件
273+
*
274+
* @param context 传activity可以获取安装的返回值,详见{@link ApkInstallUtils#REQUEST_CODE_INSTALL_APP}
275+
* @param updateEntity 版本更新信息实体
276+
*/
277+
public static void startInstallApk(@NonNull Context context, @NonNull UpdateEntity updateEntity) {
278+
startInstallApk(context, UpdateUtils.getApkFileByUpdateEntity(updateEntity), updateEntity.getDownLoadEntity());
279+
}
280+
269281
/**
270282
* 开始安装apk文件
271283
*

xupdate-lib/src/main/java/com/xuexiang/xupdate/utils/UpdateUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ public static void processUpdateEntity(UpdateEntity updateEntity, @NonNull Strin
9191
updateProxy.findNewVersion(updateEntity, updateProxy);
9292
}
9393
} else {
94+
UpdateLog.i("未发现新版本, 解析后的版本更新信息如下:" + updateEntity);
9495
updateProxy.noNewVersion(null);
9596
}
9697
} else {

xupdate-lib/src/main/java/com/xuexiang/xupdate/widget/UpdateDialog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ private void showUpdateButton() {
426426
}
427427

428428
private void onInstallApk() {
429-
_XUpdate.startInstallApk(getContext(), UpdateUtils.getApkFileByUpdateEntity(mUpdateEntity), mUpdateEntity.getDownLoadEntity());
429+
_XUpdate.startInstallApk(getContext(), mUpdateEntity);
430430
}
431431

432432
@Override

xupdate-lib/src/main/java/com/xuexiang/xupdate/widget/UpdateDialogActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ private void showUpdateButton() {
442442
}
443443

444444
private void onInstallApk() {
445-
_XUpdate.startInstallApk(this, UpdateUtils.getApkFileByUpdateEntity(mUpdateEntity), mUpdateEntity.getDownLoadEntity());
445+
_XUpdate.startInstallApk(this, mUpdateEntity);
446446
}
447447

448448
/**

xupdate-lib/src/main/java/com/xuexiang/xupdate/widget/UpdateDialogFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ private void showUpdateButton() {
491491
}
492492

493493
private void onInstallApk() {
494-
_XUpdate.startInstallApk(getContext(), UpdateUtils.getApkFileByUpdateEntity(mUpdateEntity), mUpdateEntity.getDownLoadEntity());
494+
_XUpdate.startInstallApk(getContext(), mUpdateEntity);
495495
}
496496

497497
/**

0 commit comments

Comments
 (0)