From d830fef6a2bc2ab061e6ac2b423c4a49dda3cf21 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 06 十二月 2023 18:08:26 +0800
Subject: [PATCH] 2023年12月06日18:08:20
---
app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java | 186 +++++++++++++++++-----------------------------
1 files changed, 70 insertions(+), 116 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..3eb589a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
@@ -88,6 +88,16 @@
private Intent intentServer = null;
private ServiceConnection mServiceConnection = null;
+ /**
+ * 鏈嶅姟鏄惁寮�鍚� true=寮�鍚�
+ */
+ public boolean mServiceStart = false;
+
+ /**
+ * true琛ㄧず缁堟涓嬭浇鍗囩骇鏂囦欢(鐢ㄦ埛琛屼负)
+ */
+ private boolean stopDownload = false;
+
//region -----鍥轰欢鍗囩骇---------
@@ -245,59 +255,6 @@
}
- /**
- * 鍚戜簯绔幏鍙栥�愯澶囧浐浠躲�戝崌绾у寘涓嬭浇鍦板潃
- *
- * @param firmwareVersionId 鍥轰欢鐗堟湰Id
- */
- public void getDeviceFirmwareDownloadUrl(String firmwareVersionId, CloudCallBeak<DownloadUrlBean> callBack) {
-// "protocolType":"bus",
-// "deviceModel":"029B9988",
-// "firmwareNameEn":"鏍稿績灞�",
-// "firmwareNameCn":"鏍稿績灞�",
-// "imageId":"12345678",
-// "version":"V01.02.20"
- String requestUrl = HttpApi.POST_OTA_GET_LinkDeviceFirmwareDownloadUrl;
- JsonObject json = new JsonObject();
- json.addProperty("firmwareVersionId", firmwareVersionId);
- HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
- @Override
- public void onSuccess(String json) {
-
- if (TextUtils.isEmpty(json)) {
- if (callBack != null) {
- callBack.onSuccess(new DownloadUrlBean());
- }
- return;
- }
- Gson gson = new Gson();
- Type typeOfT = new TypeToken<DownloadUrlBean>() {
- }.getType();
- DownloadUrlBean downloadUrlBean = gson.fromJson(json, typeOfT);
- if (callBack != null) {
- callBack.onSuccess(downloadUrlBean);
- }
- }
-
- @Override
- public void onFailure(HDLException e) {
- if (callBack != null) {
- callBack.onFailure(e);
- }
- }
- });
- }
-
- /**
- * 鍚戜簯绔幏鍙栥�愯澶囧浐浠躲�戜笅杞藉崌绾ф枃浠�
- *
- * @param downloadUrl 浜戠鍥轰欢鍦板潃
- */
- public void getDeviceFirmwareDownloadFile(String downloadUrl, CloudCallBeak<DownloadUrlBean> callBack) {
- String requestUrl = HttpApi.POST_OTA_GET_LinkDeviceFirmwareDownloadUrl;
- JsonObject json = new JsonObject();
-
- }
//endregion
@@ -389,8 +346,9 @@
}
+
/**
- * 浜戠鍙戣捣銆愯澶囬┍鍔ㄣ�戝崌绾TA鎸囦护
+ * 浜戠鍙戣捣銆愯澶囬┍鍔ㄥ崌绾с�慜TA鎸囦护
*
* @param oid 缃戝叧璁惧oid
* @param driverVersionId 椹卞姩鐗堟湰id
@@ -419,49 +377,22 @@
});
}
+
+ //endregion
+
/**
- * 鍚戜簯绔幏鍙栥�愯澶囬┍鍔ㄣ�戝崌绾у寘涓嬭浇鍦板潃
- *
- * @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);
- }
- }
-
- @Override
- public void onFailure(HDLException e) {
- if (callBack != null) {
- callBack.onFailure(e);
- }
- }
- });
+ public void setStopDriversDownload() {
+ this.stopDownload = true;
}
/**
- * 鍚戜簯绔幏鍙栥�愯澶囬┍鍔ㄣ�戜笅杞藉崌绾ф枃浠�
+ * 鍚戜簯绔幏鍙栥�愯澶囧崌绾ф枃浠�(椹卞姩,鍥轰欢)涓嬭浇銆戝崌绾ф枃浠�
*
* @param downloadUrl 浜戠椹卞姩鍦板潃
*/
- public void getDeviceDriverDownloadFile(String downloadUrl, CloudCallBeak<ResponseBody> callBack) {
+ public void getDeviceUpgradeDownloadFile(String downloadUrl, CloudCallBeak<ResponseBody> callBack) {
HttpClient.getInstance().downLoadFile(downloadUrl, new CloudCallBeak<ResponseBody>() {
@Override
public void onSuccess(ResponseBody s) {
@@ -481,9 +412,6 @@
}
-
-
- //endregion
/**
* 鏈湴鍗囩骇鍖呮帹閫�(鍛婅瘔缃戝叧涓嬭浇鍗囩骇鍖呭湴鍧�绛変俊鎭�)
@@ -539,6 +467,7 @@
intentServer = new Intent();
intentServer.setClass(HDLApp.getInstance(), MyNanoHttpService.class);
this.mServiceConnection = serviceConnection;
+ this.mServiceStart = true;
//鍚姩鏈嶅姟鐩戝惉
HDLApp.getInstance().bindService(intentServer, serviceConnection, Context.BIND_AUTO_CREATE);
}
@@ -549,6 +478,7 @@
public void unLocalService() {
if (intentServer != null && this.mServiceConnection != null) {
HDLApp.getInstance().unbindService(this.mServiceConnection);
+ this.mServiceStart = false;
}
}
@@ -563,11 +493,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 +510,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 +522,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 +531,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 +552,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 +575,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 +609,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 +640,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 = -108;
+ progress.describe = "鐢ㄦ埛鍙栨秷涓嬭浇.";
+ baseEventBus.setType(type);
+ baseEventBus.setData(progress);
+ EventBus.getDefault().post(baseEventBus);
+ return;
+ }
// HdlThreadLogic.runMainThread(new Runnable() {
// @Override
// public void run() {
@@ -710,6 +661,7 @@
Progress progress = new Progress();
progress.step = progressValue;
progress.describe = describe;
+ progress.type = type;
baseEventBus.setType(type);
baseEventBus.setData(progress);
EventBus.getDefault().post(baseEventBus);
@@ -729,6 +681,8 @@
public int step;
//杩涘害鎻忚堪淇℃伅
public String describe;
+ //琛ㄧず鏄┍鍔紝鍥轰欢;
+ public String type;
}
--
Gitblit v1.8.0