From b2d2e6dcf6ec38a2f24721f2bc925d634a6eb78d Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 05 十二月 2023 18:31:01 +0800
Subject: [PATCH] 2023年12月05日18:30:40
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 65 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index f18ca66..58ef4c6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -151,6 +151,7 @@
this.uniGetCurrentHomeLocalAndCloudGatewayList(callback);
}
break;
+ //modBus鍗忚涓撶敤
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
sendModBus(data, callback);
}
@@ -284,6 +285,20 @@
break;
}
+ } else if (HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL.equals(event)) {
+ //鍏跺畠妯″潡
+ switch (type) {
+ //鑾峰彇娓╁害鍗曚綅
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNIT: {
+ uniCallbackData(UserConfigManage.getInstance().getTemperature_unit(), callback);
+ }
+ break;
+ //鑾峰彇褰撳墠app璇█
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_APP_LANGUAGE: {
+ uniCallbackData(UserConfigManage.getInstance().getCurrentAppLanguage(), callback);
+ }
+ break;
+ }
}
HdlLogLogic.print("uni===鍘熺敓鎺ユ敹uni鍙戞潵鐨勬暟鎹�===" + event + "\r\n" + data, false);
} catch (Exception e) {
@@ -294,7 +309,7 @@
/**
- * 鍘熺敓鎵撳紑uni鎸囧畾椤甸潰
+ * 鍘熺敓銆愭墦寮�銆憉ni鎸囧畾椤甸潰
*
* @param path 鎵撳紑璺緞
* @param jsonObject 闄勪欢鏁版嵁(娌℃湁鏁版嵁濉玭ull)
@@ -396,7 +411,7 @@
try {
String hardwareModel = getKeyValue("hardwareModel", getKeyValue("data", data));//纭欢鍨嬪彿
String osImageId = getKeyValue("osImageId", getKeyValue("data", data));//绯荤粺闀滃儚id
- String firmwareVersionId = getKeyValue("firmwareVersionId", getKeyValue("data", data));//绯荤粺闀滃儚id
+ String firmwareVersionId = getKeyValue("firmwareVersionId", getKeyValue("data", data));//鍥轰欢鐗堟湰id
List<DeviceFirmwareBean> list = new ArrayList<>();
String driverFileList = HdlFileLogic.getInstance().getFirmwareRootPath();
File file = new File(driverFileList);
@@ -406,8 +421,9 @@
String[] ary = path.split("/");
String[] driverInfoAry = ary[ary.length - 1].split("_");
DeviceFirmwareBean deviceFirmwareBean = new DeviceFirmwareBean();
- deviceFirmwareBean.setVersion(driverInfoAry[0]);
- deviceFirmwareBean.setImageId(driverInfoAry[1].replace(".zip", ""));
+ deviceFirmwareBean.setOid(driverInfoAry[0]);
+ deviceFirmwareBean.setVersion(driverInfoAry[1].replace(".zip", ""));
+ deviceFirmwareBean.setLocalUrl(HdlFileLogic.getInstance().getFirmwarePathFileName(deviceFirmwareBean.getOid(), deviceFirmwareBean.getVersion()));
list.add(deviceFirmwareBean);
}
}
@@ -423,10 +439,10 @@
*/
private void uniDeviceFirmwareDownload(Object data, DCUniMPJSCallback callback) {
String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//浜戠涓婅澶噄d
- String oid = getKeyValue("oid", getKeyValue("data", data));//璁惧oid
- String imageId = getKeyValue("imageId", getKeyValue("data", data));//椹卞姩闀滃儚id
- String version = getKeyValue("version", getKeyValue("data", data));//椹卞姩鐗堟湰
- String localUrl = getKeyValue("localUrl", getKeyValue("data", data));//鍌ㄥ瓨鍦ㄦ湰鍦伴┍鍔ㄦ枃浠惰矾寰�
+ String oid = getKeyValue("oid", getKeyValue("data", data));//鍥轰欢鐨刼id
+ String imageId = getKeyValue("imageId", getKeyValue("data", data));//鍥轰欢闀滃儚id
+ String version = getKeyValue("version", getKeyValue("data", data));//鍥轰欢鐗堟湰
+ String localUrl = getKeyValue("localUrl", getKeyValue("data", data));//鍌ㄥ瓨鍦ㄦ湰鍦板浐浠舵枃浠惰矾寰�
String url = getKeyValue("url", getKeyValue("data", data));//浜戠涓婃枃浠跺湴鍧�
String md5 = getKeyValue("md5", getKeyValue("data", data));//浜戠涓婃枃浠禡D5
HdlOtaLogic.getInstance().getDeviceUpgradeDownloadFile(url, new CloudCallBeak<ResponseBody>() {
@@ -435,9 +451,9 @@
String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, version);
boolean isBoolean = HdlOtaLogic.getInstance().disposeDownLoadFile(firmwarePathFileName, responseBody, md5, HdlOtaLogic.firmware_type);
if (isBoolean) {
- HdlFileLogic.getInstance().deleteFile(localUrl);//涓嬭浇鎴愬姛,鍒犻櫎鏃ф枃浠�;
+ HdlFileLogic.getInstance().deleteFile(localUrl);//涓嬭浇鎴愬姛,鍒犻櫎鏃у浐浠舵枃浠�;
} else {
- HdlFileLogic.getInstance().deleteFile(firmwarePathFileName);//涓嬭浇澶辫触鍒犻櫎涓嶅畬鎴愭暟鎹�;
+ HdlFileLogic.getInstance().deleteFile(firmwarePathFileName);//涓嬭浇澶辫触锛屽垹闄や笉瀹屾暣鍥轰欢鏂囦欢;
}
HdlLogLogic.print("鍐欏叆鏂板浐浠舵枃浠跺埌鍐呭瓨鎴愬姛.", false);
}
@@ -454,11 +470,11 @@
* 鍚戜簯绔彂璧枫�愯澶囧浐浠躲�戝崌绾TA鎸囦护
*/
private void uniUpgradeDeviceFirmware(Object data, DCUniMPJSCallback callback) {
- String deviceMac = getKeyValue("mac", getKeyValue("data", data));//缃戝叧璁惧mac锛堟煡鎵緎ocket锛�
+ String deviceMac = getKeyValue("mac", getKeyValue("data", data));//閫嗗彉鍣ㄨ澶噈ac锛堟煡鎵緎ocket锛�
String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//浜戠涓婅澶噄d
- String oid = getKeyValue("oid", getKeyValue("data", data));//璁惧id
+ String oid = getKeyValue("oid", getKeyValue("data", data));//鍗囩骇鍥轰欢鐨刼id
String firmwareVersionId = getKeyValue("firmwareVersionId", getKeyValue("data", data));//鍥轰欢鐗堟湰id
- String version = getKeyValue("version", getKeyValue("data", data));//椹卞姩鐗堟湰
+ String version = getKeyValue("version", getKeyValue("data", data));//鍥轰欢鐗堟湰
String hardwareModel = getKeyValue("hardwareModel", getKeyValue("data", data));//浜戠涓婃枃浠禡D5
//鍗囩骇鏈湴浼樺厛->浜戠鍗囩骇
@@ -505,11 +521,11 @@
public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
//1锛氳繛鎺ヤ腑,2锛氭晠闅�,3锛氳繍琛�,4锛氱绾�,6:閫嗗彉鍣ㄨ繛涓嶄笂浜�(鑷畾涔�)
if (cloudInverterDeviceBean == null) {
- uniCallbackData(null, 6, HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
+ uniCallbackData(null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
return;
}
if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
- uniCallbackData(null, cloudInverterDeviceBean.getDeviceStatus(), getDeviceStatusString(cloudInverterDeviceBean.getDeviceStatus()), callback);
+ uniCallbackData(null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
return;
}
//4:杩愯
@@ -613,7 +629,7 @@
* 鍚戜簯绔彂璧枫�愯澶囬┍鍔ㄤ笅杞姐�戞寚浠�
*/
private void uniGatewayDriverDownload(Object data, DCUniMPJSCallback callback) {
- String deviceOid = getKeyValue("oid", getKeyValue("data", data));//缃戝叧璁惧oid
+ String deviceOid = getKeyValue("oid", getKeyValue("data", data));//閫嗗彉鍣ㄨ澶噊id
String driverCode = getKeyValue("driverCode", getKeyValue("data", data));//椹卞姩缂栫爜
String imageId = getKeyValue("imageId", getKeyValue("data", data));//椹卞姩闀滃儚id
String version = getKeyValue("version", getKeyValue("data", data));//椹卞姩鐗堟湰
@@ -627,9 +643,9 @@
String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName(driverCode, version);
boolean isBoolean = HdlOtaLogic.getInstance().disposeDownLoadFile(drivePathFileName, responseBody, md5, HdlOtaLogic.driver_type);
if (isBoolean) {
- HdlFileLogic.getInstance().deleteFile(localUrl);//涓嬭浇鎴愬姛,鍒犻櫎鏃ф枃浠�;
+ HdlFileLogic.getInstance().deleteFile(localUrl);//涓嬭浇鎴愬姛,鍒犻櫎鏃ч┍鍔ㄦ枃浠�;
} else {
- HdlFileLogic.getInstance().deleteFile(drivePathFileName);//涓嬭浇澶辫触鍒犻櫎涓嶅畬鎴愭暟鎹�;
+ HdlFileLogic.getInstance().deleteFile(drivePathFileName);//涓嬭浇澶辫触锛屽垹闄や笉瀹屾暣椹卞姩鏂囦欢;
}
HdlLogLogic.print("鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛.", false);
}
@@ -647,8 +663,8 @@
*/
private void uniUpgradeGatewayDriver(Object data, DCUniMPJSCallback callback) {
- String deviceMac = getKeyValue("mac", getKeyValue("data", data));//缃戝叧璁惧mac锛堟煡鎵緎ocket锛�
- String deviceOid = getKeyValue("oid", getKeyValue("data", data));//缃戝叧璁惧oid
+ String deviceMac = getKeyValue("mac", getKeyValue("data", data));//閫嗗彉鍣ㄨ澶噈ac锛堟煡鎵緎ocket锛�
+ String deviceOid = getKeyValue("oid", getKeyValue("data", data));//閫嗗彉鍣ㄨ澶噊id
String driverVersionId = getKeyValue("driverVersionId", getKeyValue("data", data));//椹卞姩鐗堟湰id
String module = getKeyValue("module", getKeyValue("data", data));//妯″潡淇℃伅
String version = getKeyValue("version", getKeyValue("data", data));//椹卞姩鐗堟湰鍙�
@@ -759,21 +775,18 @@
/**
- * @param deviceStatus 閫嗗彉鍣ㄨ繛鎺ヤ簯绔姸鎬佸�硷紙 1:寰呮満,2:杩炴帴涓�,3:鏁呴殰,4:杩愯,5:绂荤嚎锛�
+ * @param deviceStatus 閫嗗彉鍣ㄨ繛鎺ヤ簯绔姸鎬佸�硷紙 1锛氳繛鎺ヤ腑,2锛氭晠闅�,3锛氳繍琛�,4锛氱绾匡級
* @return 杩斿洖鏂囨湰
*/
public String getDeviceStatusString(int deviceStatus) {
switch (deviceStatus) {
case 1: {
- return HDLApp.getInstance().getString(R.string.my_power_station_await);
- }
- case 2: {
return HDLApp.getInstance().getString(R.string.my_power_station_connecting);
}
- case 3: {
+ case 2: {
return HDLApp.getInstance().getString(R.string.my_power_station_malfunction);
}
- case 5: {
+ case 4: {
return HDLApp.getInstance().getString(R.string.my_power_station_off_line);
}
default:
--
Gitblit v1.8.0