From 53cfbb7c949edc8e3d0b624e251afbad1a1c74ca Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 08 一月 2024 18:03:18 +0800
Subject: [PATCH] 2024年01月08日18:03:16
---
app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 03ffa54..f08d9c1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
@@ -27,8 +27,8 @@
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
import com.hdl.photovoltaic.utils.AesUtils;
-import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.Md5Utils;
+import com.hdl.photovoltaic.utils.NetworkUtils;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
@@ -38,12 +38,10 @@
import java.io.File;
import java.io.FileOutputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
-import java.util.Objects;
import okhttp3.ResponseBody;
@@ -502,7 +500,7 @@
//1,寤虹珛鏈湴鏈嶅姟锛�
//2锛屽憡璇夌綉鍏虫墜鏈篿p鍜岀鍙ｏ紱
//瀹炰緥鍖� 鑾峰彇ip 鍦板潃
- MyNanoHttpServer.getInstance(AppManagerUtils.getAppManager().getIPAddress(HDLApp.getInstance()));
+ MyNanoHttpServer.getInstance(NetworkUtils.getIPAddress(HDLApp.getInstance()));
//MyNanoHttpServer.getInstance("127.0.0.1");
intentServer = new Intent();
intentServer.setClass(HDLApp.getInstance(), MyNanoHttpService.class);
@@ -627,12 +625,13 @@
if (this.stopDownload) {
- HdlFileLogic.getInstance().deleteFile(fileFullPath);//鍒犻櫎涓嬭浇涓嶅畬鏁存暟鎹�;
+// HdlFileLogic.getInstance().deleteFile(fileFullPath);//鍒犻櫎涓嬭浇涓嶅畬鏁存暟鎹�;
+ //鍙栨秷涓嬭浇骞挎挱涓�娆�
BaseEventBus baseEventBus = new BaseEventBus();
baseEventBus.setTopic(localDownloadProgress);
Progress progress = new Progress();
progress.step = -108;
- progress.describe = "鐢ㄦ埛鍙栨秷涓嬭浇.";
+ progress.describe = describe;
baseEventBus.setType(type);
baseEventBus.setData(progress);
EventBus.getDefault().post(baseEventBus);
@@ -660,6 +659,8 @@
//鑷畾涔変笂鎶ヤ笅杞介┍鍔ㄦ垨鍥轰欢杩涘害涓婚
public static final String localDownloadProgress = "cloud/download/progress/up";
+
+
public static final String driver_type = "driver";
public static final String firmware_type = "firmware";
--
Gitblit v1.8.0