From 5e080d063f213f2b2c2ed34e1d54b9fd7df1c6b0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 23 十一月 2023 19:28:47 +0800
Subject: [PATCH] 2023年11月23日19:28:37
---
app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java | 118 ++++++++++++++++++++++++++++------------------------------
1 files changed, 57 insertions(+), 61 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
index e28e092..972a3c6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
@@ -89,6 +89,11 @@
private ServiceConnection mServiceConnection = null;
+ /**
+ * true琛ㄧず缁堟涓嬭浇鍗囩骇鏂囦欢(鐢ㄦ埛琛屼负)
+ */
+ private boolean stopDownload = false;
+
//region -----鍥轰欢鍗囩骇---------
/**
@@ -390,6 +395,13 @@
}
/**
+ * 璁剧疆缁堟涓嬭浇鏂囦欢鎸囦护
+ */
+ public void setStopDriversDownload() {
+ this.stopDownload = true;
+ }
+
+ /**
* 浜戠鍙戣捣銆愯澶囬┍鍔ㄣ�戝崌绾TA鎸囦护
*
* @param oid 缃戝叧璁惧oid
@@ -407,43 +419,6 @@
public void onSuccess(String json) {
if (callBack != null) {
callBack.onSuccess(true);
- }
- }
-
- @Override
- public void onFailure(HDLException e) {
- if (callBack != null) {
- callBack.onFailure(e);
- }
- }
- });
- }
-
- /**
- * 鍚戜簯绔幏鍙栥�愯澶囬┍鍔ㄣ�戝崌绾у寘涓嬭浇鍦板潃
- *
- * @param driverVersionId 椹卞姩鐗堟湰Id
- */
- public void getDeviceDriverDownloadUrl(String driverVersionId, CloudCallBeak<DownloadUrlBean> callBack) {
-
- String requestUrl = HttpApi.POST_OTA_GET_LinkDeviceDriverDownloadUrl;
- JsonObject json = new JsonObject();
- json.addProperty("driverVersionId", driverVersionId);
- HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
- @Override
- public void onSuccess(String s) {
- if (TextUtils.isEmpty(s)) {
- if (callBack != null) {
- callBack.onSuccess(new DownloadUrlBean());
- }
- return;
- }
- Gson gson = new Gson();
- Type typeOfT = new TypeToken<DownloadUrlBean>() {
- }.getType();
- DownloadUrlBean downloadUrlBean = gson.fromJson(s, typeOfT);
- if (callBack != null) {
- callBack.onSuccess(downloadUrlBean);
}
}
@@ -563,11 +538,11 @@
String driver = driver_type;
//-100:娌℃湁鏁版嵁;-101:娌℃湁md5绉橀挜;-102:md5绉橀挜涓嶅;-103:鏈夊紓甯�;
if (zipData == null) {
- this.eventBusPost(driver, -100, "娌℃湁鏁版嵁");
+ this.eventBusPost(fullPath,driver, -100, "娌℃湁鏁版嵁");
return false;
}
if (TextUtils.isEmpty(md5)) {
- this.eventBusPost(driver, -101, "娌℃湁md5绉橀挜");
+ this.eventBusPost(fullPath,driver, -101, "娌℃湁md5绉橀挜");
return false;
}
InputStream is = null;
@@ -580,7 +555,7 @@
is = zipData.byteStream();
long total = zipData.contentLength();
if (total == 0) {
- this.eventBusPost(driver, -100, "娌℃湁鏁版嵁");
+ this.eventBusPost(fullPath,driver, -100, "娌℃湁鏁版嵁");
return false;
}
fos = new FileOutputStream(file);
@@ -592,7 +567,7 @@
int progress = (int) (100 * sum * 1.0f / total);
if (sum != total) {
//涓嶇瓑浜�100閮借鎶�,绛変簬100澶勭悊鏁村潡閫昏緫瀹屼箣鍚庡啀鎶�100;
- this.eventBusPost(driver, progress, "姝ｅ父涓婃姤");
+ this.eventBusPost(fullPath,driver, progress, "姝ｅ父涓婃姤");
}
}
fos.flush();
@@ -601,19 +576,19 @@
byte[] bytes = FileUtils.readFileToByteArray(file);
String fileMD5 = Md5Utils.encodeMD5(bytes);
if (TextUtils.isEmpty(fileMD5)) {
- this.eventBusPost(driver, -106, "鏂囦欢鐢熸垚md5澶辫触.");
+ this.eventBusPost(fullPath,driver, -106, "鏂囦欢鐢熸垚md5澶辫触.");
return false;
}
if (!md5.equals(fileMD5)) {
- this.eventBusPost(driver, -107, "md5姣斿澶辫触.");
+ this.eventBusPost(fullPath,driver, -107, "md5姣斿澶辫触.");
return false;
}
- this.eventBusPost(driver, 100, "涓嬭浇瀹屾垚.");
+ this.eventBusPost(fullPath,driver, 100, "涓嬭浇瀹屾垚.");
return true;
} catch (Exception e) {
- this.eventBusPost(driver, -103, e.getMessage());
+ this.eventBusPost(fullPath,driver, -103, e.getMessage());
e.printStackTrace();
}
return false;
@@ -622,20 +597,21 @@
/**
* 澶勭悊涓嬭浇鏂囦欢鏁版嵁
*
- * @param fullPath 鏂囦欢鍏ㄨ矾寰�
- * @param zipData 鏂囦欢鏁版嵁娴佸璞�
- * @param md5 妫�楠屾枃浠禡D5鍊�
- * @param driver 椹卞姩鎴栬�呭浐浠�
+ * @param fileFullPath 鏂囦欢鍏ㄨ矾寰�
+ * @param zipData 鏂囦欢鏁版嵁娴佸璞�
+ * @param md5 妫�楠屾枃浠禡D5鍊�
+ * @param driver 椹卞姩鎴栬�呭浐浠�
* @return 鎴愬姛true
*/
- public boolean disposeDownLoadFile(String fullPath, ResponseBody zipData, String md5, String driver) {
+ public boolean disposeDownLoadFile(String fileFullPath, ResponseBody zipData, String md5, String driver) {
+ this.stopDownload = false;
//-100:娌℃湁鏁版嵁;-101:娌℃湁md5绉橀挜;-102:md5绉橀挜涓嶅;-103:鏈夊紓甯�;
if (zipData == null) {
- this.eventBusPost(driver, -100, "娌℃湁鏁版嵁");
+ this.eventBusPost(fileFullPath, driver, -100, "娌℃湁鏁版嵁");
return false;
}
if (TextUtils.isEmpty(md5)) {
- this.eventBusPost(driver, -101, "娌℃湁md5绉橀挜");
+ this.eventBusPost(fileFullPath, driver, -101, "娌℃湁md5绉橀挜");
return false;
}
InputStream is = null;
@@ -644,23 +620,31 @@
FileOutputStream fos = null;
File file = null;
try {
- file = new File(fullPath);
+ file = new File(fileFullPath);
is = zipData.byteStream();
long total = zipData.contentLength();
if (total == 0) {
- this.eventBusPost(driver, -100, "娌℃湁鏁版嵁");
+ this.eventBusPost(fileFullPath, driver, -100, "娌℃湁鏁版嵁");
return false;
}
fos = new FileOutputStream(file);
long sum = 0;
while ((len = is.read(buf)) != -1) {
+ if (this.stopDownload) {
+ this.eventBusPost(fileFullPath, driver, -108, "鐢ㄦ埛鍙栨秷涓嬭浇.");
+ fos.flush();
+ fos.close();
+ is.close();
+ //todo 鐢ㄦ埛缁堟瀹剁户缁鍙栨暟鎹�;
+ return false;
+ }
fos.write(buf, 0, len);
sum += len;
//todo 涓嬭浇涓紝鍙互鑷繁璁＄畻鐨勮繘搴︽潯(鍙互骞挎挱鍑哄幓)
int progress = (int) (100 * sum * 1.0f / total);
if (sum != total) {
//涓嶇瓑浜�100閮借鎶�,绛変簬100澶勭悊鏁村潡閫昏緫瀹屼箣鍚庡啀鎶�100;
- this.eventBusPost(driver, progress, "姝ｅ父涓婃姤");
+ this.eventBusPost(fileFullPath, driver, progress, "姝ｅ父涓婃姤");
}
}
fos.flush();
@@ -670,24 +654,24 @@
//涓嬭浇鏂囦欢闇�瑕佽В瀵嗕箣鍚庡啀杩涜md5鍘诲仛姣斿
byte[] decrypt = AesUtils.decrypt(bytes);
if (decrypt == null) {
- this.eventBusPost(driver, -105, "aes瑙ｅ瘑澶辫触.");
+ this.eventBusPost(fileFullPath, driver, -105, "aes瑙ｅ瘑澶辫触.");
return false;
}
String fileMD5 = Md5Utils.encodeMD5(decrypt);
if (TextUtils.isEmpty(fileMD5)) {
- this.eventBusPost(driver, -106, "鏂囦欢鐢熸垚md5澶辫触.");
+ this.eventBusPost(fileFullPath, driver, -106, "鏂囦欢鐢熸垚md5澶辫触.");
return false;
}
if (!md5.equals(fileMD5)) {
- this.eventBusPost(driver, -107, "md5姣斿澶辫触.");
+ this.eventBusPost(fileFullPath, driver, -107, "md5姣斿澶辫触.");
return false;
}
//todo 娉ㄦ剰:瑙ｅ瘑涔嬪悗锛岃閲嶆柊鍐欐暟鎹�;
FileUtils.writeByteArrayToFile(file, decrypt, false);
- this.eventBusPost(driver, 100, "涓嬭浇瀹屾垚.");
+ this.eventBusPost(fileFullPath, driver, 100, "涓嬭浇瀹屾垚.");
return true;
} catch (Exception e) {
- this.eventBusPost(driver, -103, e.getMessage());
+ this.eventBusPost(fileFullPath, driver, -103, e.getMessage());
e.printStackTrace();
}
return false;
@@ -701,7 +685,19 @@
* @param progressValue 杩涘害鍊�
* @param describe 鎻忚堪鏂囨湰
*/
- public void eventBusPost(String type, int progressValue, String describe) {
+ public void eventBusPost(String fileFullPath, String type, int progressValue, String describe) {
+ if (this.stopDownload) {
+ HdlFileLogic.getInstance().deleteFile(fileFullPath);//鍒犻櫎涓嬭浇涓嶅畬鎴愭暟鎹�;
+ BaseEventBus baseEventBus = new BaseEventBus();
+ baseEventBus.setTopic(localDownloadProgress);
+ Progress progress = new Progress();
+ progress.step = progressValue;
+ progress.describe = describe;
+ baseEventBus.setType(type);
+ baseEventBus.setData(progress);
+ EventBus.getDefault().post(baseEventBus);
+ return;
+ }
// HdlThreadLogic.runMainThread(new Runnable() {
// @Override
// public void run() {
--
Gitblit v1.8.0