From 4b6a433d77c9e0a5071d032d8aff80c440a70598 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 19 三月 2026 18:02:42 +0800
Subject: [PATCH] 2026年03月19日18:02:40
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 355 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 339 insertions(+), 16 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 679940a..1689ec0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -2,6 +2,8 @@
import android.Manifest;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.le.ScanResult;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -9,6 +11,7 @@
import android.content.pm.PackageManager;
import android.location.Location;
import android.location.LocationManager;
+import android.net.Uri;
import android.os.IBinder;
import android.os.SystemClock;
import android.provider.Settings;
@@ -47,13 +50,16 @@
import com.hdl.photovoltaic.listener.LinkCallBack;
import com.hdl.photovoltaic.ui.LoginActivity;
import com.hdl.photovoltaic.ui.bean.CUserInfo;
+import com.hdl.photovoltaic.ui.bean.ChatMessageBean;
import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
+import com.hdl.photovoltaic.ui.bean.CustomBluetoothBean;
import com.hdl.photovoltaic.ui.bean.DeviceInfoBean;
import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
import com.hdl.photovoltaic.ui.bean.Geolocation;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.ui.bean.LinkBean;
import com.hdl.photovoltaic.ui.bean.MemberBean;
+import com.hdl.photovoltaic.ui.bean.MessageBean;
import com.hdl.photovoltaic.ui.bean.NotRunBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.ui.bean.QrcodeUrlBean;
@@ -62,13 +68,17 @@
import com.hdl.photovoltaic.ui.bean.UserRightTypeBean;
import com.hdl.photovoltaic.ui.me.AsRegardsActivity;
import com.hdl.photovoltaic.ui.me.CPersonalDataActivity;
+import com.hdl.photovoltaic.ui.me.HelpWebActivity;
import com.hdl.photovoltaic.ui.me.SetActivity;
+import com.hdl.photovoltaic.ui.message.MessageInfoActivity;
import com.hdl.photovoltaic.ui.newC.MessageCenterListActivity;
import com.hdl.photovoltaic.ui.newC.PowerStationsListActivity;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
+import com.hdl.photovoltaic.utils.BleWifiConfiguratorUtils;
import com.hdl.photovoltaic.utils.NetworkUtils;
import com.hdl.photovoltaic.utils.PermissionUtils;
+import com.hdl.photovoltaic.utils.SharedPreUtils;
import com.hdl.photovoltaic.utils.WifiUtils;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
@@ -401,6 +411,11 @@
this.uniDeleteOid(mode_type, data, callback);
}
break;
+ //璁惧娓呯┖杩愯鏁版嵁
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_clear_data: {
+ this.uniDeviceClearData(mode_type, data, callback);
+ }
+ break;
}
} else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(topic)) {
@@ -669,6 +684,29 @@
}
break;
+ //鎵撳紑娑堟伅璇︽儏
+ case HDLUniMP.UNI_EVENT_REPLY_Message_Center_Detail: {
+ try {
+ String msgId = getKeyValue("msgId", getKeyValue("data", data));//鍞竴鏍囪瘑
+ MessageBean messageBean = new MessageBean();
+ messageBean.setMsgId(Long.parseLong(msgId));
+ Intent intent = new Intent();
+ intent.putExtra("messageBean", new Gson().toJson(messageBean));
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.setClass(HDLApp.getInstance(), MessageInfoActivity.class);
+ HDLApp.getInstance().startActivity(intent);
+ } catch (Exception e) {
+ }
+ }
+ break;
+ //鎵撳紑C绔府鍔╅〉闈�
+ case HDLUniMP.UNI_EVENT_REPLY_help_Detail: {
+ Intent intent = new Intent();
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.setClass(HDLApp.getInstance(), HelpWebActivity.class);
+ HDLApp.getInstance().startActivity(intent);
+ }
+ break;
}
@@ -817,6 +855,11 @@
}
break;
+ //璁惧瀹氫綅
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_GET_DEVICE_LOCATION: {
+ this.uniGetDeviceFind(mode_type, data, TopicApi.DELETING_GATEWAY_FIND, callback);
+ }
+ break;
}
} else if (HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL.equals(topic)) {
//鏃犵綉妯″紡
@@ -901,6 +944,164 @@
}
});
+ } else if (HDLUniMP.UNI_EVENT_REPLY_AI_MODEL.equals(topic)) {
+ switch (type) {
+ //鍙戦�乤i瀵硅瘽鑱婂ぉ
+ case HDLUniMP.UNI_EVENT_REPLY_AI_MODEL_SENDAIREQUEST: {
+ this.uniSendAIChat(mode_type, data, callback);
+ }
+ break;
+ //鍙戦��(鍙栨秷/鏆傚仠)AI鑱婂ぉ瀵硅瘽
+ case HDLUniMP.UNI_EVENT_REPLY_AI_MODEL_PAUSEAIREQUEST: {
+ this.uniSendStopAIChat(mode_type, data, callback);
+ }
+ break;
+ }
+ } else if (HDLUniMP.UNI_EVENT_REPLY_BLUETOOTH_MODEL.equals(topic)) {
+ //钃濈墮妯″潡
+ switch (type) {
+ case HDLUniMP.UNI_EVENT_REPLY_BLUETOOTH_PERMISSION: {
+ //璇锋眰钃濈墮鏉冮檺
+ boolean isGranted = HdlBluetoothLogic.getInstance().getMissingPermissions();
+ uniSuccessCallback(mode_type, isGranted, callback);
+ }
+ break;
+ case HDLUniMP.UNI_EVENT_REPLY_BLUETOOTH_OPEN_SETTING: {
+ //鍓嶅線钃濈墮璁剧疆椤�
+ Intent intent = new Intent();
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+ Uri uri = Uri.fromParts("package", HDLApp.getInstance().getPackageName(), null);
+ intent.setData(uri);
+ HDLApp.getInstance().startActivity(intent);
+ }
+ break;
+ case HDLUniMP.UNI_EVENT_REPLY_BLUETOOTH_LIST: {
+ //鎼滅储/鍋滄钃濈墮(startSearch,stopSearch)
+ String startSearch = getKeyValue("operateType", getKeyValue("data", data));
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ if (!HdlBluetoothLogic.getInstance().checkBluetoothEnabled()) {
+ uniCallbackData(mode_type, 1, -2, HDLApp.getInstance().getString(R.string.bluetooth_not_enabled), callback);
+ }
+ if (startSearch.equals("startSearch")) {
+ HdlBluetoothLogic.getInstance().scanDevices(new BleWifiConfiguratorUtils.ScanListener() {
+ @Override
+ public void onDeviceFound(BluetoothDevice device, int rssi, byte[] scanRecord, ScanResult result) {
+ try {
+// Log.d("===", "onDeviceFound: " + Objects.requireNonNull(result.getScanRecord()).getDeviceName());
+ if (result.getScanRecord().getDeviceName() == null || !result.getScanRecord().getDeviceName().startsWith("BMS")) {
+ return;
+ }
+ // 妫�鏌� MAC 鍦板潃鏄惁鍖归厤
+ String deviceAddress = device.getAddress();
+ if (!TextUtils.isEmpty(mac) && !deviceAddress.equals(mac)) {
+ // 濡傛灉鎸囧畾浜� MAC 鍦板潃涓斾笉鍖归厤锛岀洿鎺ヨ繑鍥�
+ return;
+ }
+ //鍒涘缓骞舵帹閫佽澶囦俊鎭�
+ CustomBluetoothBean customBluetoothBean = new CustomBluetoothBean();
+ customBluetoothBean.setBluetoothName(result.getScanRecord().getDeviceName());
+ customBluetoothBean.setBluetoothMac(device.getAddress());
+// customBluetoothBean.setUuid(result.getScanRecord());
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_find_bluetooth_device);
+ uniCallBackBaseBean.setData(customBluetoothBean);
+ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
+
+ } catch (Exception ignored) {
+
+ }
+
+ }
+
+ @Override
+ public void onScanFailed(int errorCode) {
+// uniCallbackData(mode_type, errorCode, -2, "Bluetooth is not enabled.", callback);
+ }
+ });
+ } else {
+ HdlBluetoothLogic.getInstance().stopScan();
+// uniSuccessCallback(mode_type, true, callback);
+ }
+ uniSuccessCallback(mode_type, true, callback);
+ }
+ break;
+ case HDLUniMP.UNI_EVENT_REPLY_BLUETOOTH_Connect: {
+ //鍏堝仠姝㈠惂锛屽啀杩炴帴
+ HdlBluetoothLogic.getInstance().stopScan();
+ //杩炴帴钃濈墮
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ HdlBluetoothLogic.getInstance().connect(mac, new BleWifiConfiguratorUtils.ConnectListener() {
+ @Override
+ public void onConnected() {
+ uniSuccessCallback(mode_type, true, callback);
+ }
+
+ @Override
+ public void onDisconnected() {
+ uniCallbackData(type, null, -2, "disconnected", callback);
+ }
+
+ @Override
+ public void onConnectionFailed(String reason) {
+ uniCallbackData(type, null, -2, "connectionFailed " + reason, callback);
+ }
+ });
+
+ }
+ break;
+ case HDLUniMP.UNI_EVENT_REPLY_BLUETOOTH_Disconnect: {
+ //鏂紑钃濈墮璁惧
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ HdlBluetoothLogic.getInstance().disconnect(mac);
+
+ }
+ break;
+ case HDLUniMP.UNI_EVENT_REPLY_BLUETOOTH_Send: {
+ //鍙戦�佹暟鎹粰璁惧
+ String objString = getKeyValue("data", data);
+ HdlBluetoothLogic.getInstance().sendConfig(objString, new BleWifiConfiguratorUtils.WriteListener() {
+ @Override
+ public void onWriteSuccess() {
+ Log.d("HdlUniLogic", "onWriteSuccess: ");
+ }
+
+ @Override
+ public void onWriteComplete(boolean success) {
+ Log.d("HdlUniLogic", "onWriteComplete: " + success);
+ }
+
+ @Override
+ public void onWriteFailed(int status) {
+ Log.d("HdlUniLogic", "onWriteFailed: ");
+ uniCallbackData(type, status, -2, "write failed", callback);
+ }
+
+ @Override
+ public void onDeviceResponse(String response) {
+ Log.d("HdlUniLogic", "onDeviceResponse: ");
+ uniSuccessCallback(mode_type, response, callback);
+ }
+ });
+
+ }
+ break;
+ case HDLUniMP.UNI_EVENT_REPLY_BLUETOOTH_status_check: {
+ //妫�鏌ヨ摑鐗欒繛鎺ョ姸鎬�
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ boolean status = HdlBluetoothLogic.getInstance().bluetoothStatusCheck(mac);
+ uniSuccessCallback(mode_type, status, callback);
+
+ }
+ break;
+ case HDLUniMP.UNI_EVENT_REPLY_BLUETOOTH_Release: {
+ //閲婃斁钃濈墮璁惧璧勬簮
+ HdlBluetoothLogic.getInstance().release();
+
+ }
+ break;
+ }
+
}
} catch (Exception e) {
@@ -909,6 +1110,62 @@
}
+ /**
+ * Uni(鍙栨秷/鏆傚仠)AI鑱婂ぉ瀵硅瘽
+ *
+ * @param callback -
+ */
+ private void uniSendStopAIChat(String type, Object data, DCUniMPJSCallback callback) {
+ String task_id = getKeyValue("task_id", getKeyValue("data", data));
+ if (TextUtils.isEmpty(task_id)) {
+ uniCallbackData(type, null, -2, "task_id empty", callback);
+ }
+ HdlAiLogic.getInstance().chatMessageStop(task_id, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ if (callback != null) {
+ uniSuccessCallback(type, obj, callback);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
+
+ /**
+ * Uni鍙戣捣AI鑱婂ぉ瀵硅瘽
+ *
+ * @param callback -
+ */
+ private void uniSendAIChat(String type, Object data, DCUniMPJSCallback callback) {
+ String query = getKeyValue("query", getKeyValue("data", data));
+ HdlAiLogic.getInstance().chatMessages(query, new CloudCallBeak<ChatMessageBean>() {
+ @Override
+ public void onSuccess(ChatMessageBean obj) {
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ if (obj == null) {
+ //琛ㄧず缁撴潫
+ uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_REPLY_AI_MODEL_AISTREAMINGEND);
+ } else {
+ uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_REPLY_AI_MODEL_AISTREAMING);
+ uniCallBackBaseBean.setData(obj);
+ }
+ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+// HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+// uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_REPLY_AI_MODEL_AISTREAMINGEND);
+// uniCallBackBaseBean.setData(e.getMessage());
+// HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
+ }
+ });
+ }
/**
* 鍘熺敓銆愭墦寮�銆憉ni鎸囧畾椤甸潰
@@ -931,6 +1188,7 @@
*/
public void sendUni(String topic, HDLUniMP.UniCallBackBaseBean callBackBaseBean) {
try {
+// HdlLogLogic.print("uni---鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡浜嬩欢---" +topic, false);
HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, topic, getJSONObject(callBackBaseBean));
} catch (Exception e) {
HdlLogLogic.print("uni---鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡浜嬩欢---" + e.getMessage(), false);
@@ -965,6 +1223,47 @@
@Override
public void onError(HDLLinkException e) {
+ if (callback != null) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ }
+ });
+ }
+
+ /**
+ * 璁惧瀹氫綅
+ */
+ private void uniGetDeviceFind(String type, Object data, String TopicApi, DCUniMPJSCallback callback) {
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ JsonObject jObject = new JsonObject();
+ String attribute_data = getKeyValue("attribute_data", getKeyValue("data", data));
+ if (!TextUtils.isEmpty(attribute_data)) {
+ try {
+ jObject = new Gson().fromJson(attribute_data, JsonObject.class);
+ } catch (Exception ignored) {
+ jObject = new JsonObject();
+ }
+ }
+ TcpClient.getInstance().sendDataToLinkGateway(mac, false, TopicApi, jObject, "", new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String s) {
+ if (callback != null) {
+ try {
+ if (s.startsWith("{")) {
+ uniSuccessCallback(type, new Gson().fromJson(s, JsonObject.class), callback);
+ } else if (s.startsWith("[")) {
+ uniSuccessCallback(type, new Gson().fromJson(s, JsonArray.class), callback);
+ } else {
+ uniSuccessCallback(type, s, callback);
+ }
+ } catch (Exception e) {
+ uniSuccessCallback(type, s, callback);
+ }
+ }
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
if (callback != null) {
uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
}
@@ -1670,7 +1969,7 @@
uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
return;
}
- if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
+ if (cloudInverterDeviceBean.getDeviceStatus() == 1 || cloudInverterDeviceBean.getDeviceStatus() == 4) {
uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
return;
}
@@ -1709,7 +2008,7 @@
uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
return;
}
- if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
+ if (cloudInverterDeviceBean.getDeviceStatus() == 1 || cloudInverterDeviceBean.getDeviceStatus() == 4) {
uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
return;
}
@@ -1784,7 +2083,7 @@
private void uniGetLocalDrivers(String type, Object data, DCUniMPJSCallback callback) {
try {
String driveCode = getKeyValue("driveCode", getKeyValue("data", data));//椹卞姩缂栧彿鎴栭┍鍔ㄥ悕绉�
-// String osImageId = getKeyValue("osImageId", getKeyValue("data", data));//椹卞姩绫诲瀷id
+ String imageId = getKeyValue("imageId", getKeyValue("data", data));//椹卞姩闀滃儚Id
// String driverVersionId = getKeyValue("driverVersionId", getKeyValue("data", data));//椹卞姩绫诲瀷id
List<GatewayDriverBean> list = new ArrayList<>();
String driverFileList = HdlFileLogic.getInstance().getDriveRootPath();
@@ -1792,14 +2091,15 @@
if (file.list() != null) {
for (int i = 0; i < Objects.requireNonNull(file.list()).length; i++) {
String fileName = Objects.requireNonNull(file.list())[i];
- if (!fileName.contains(driveCode)) {
+ if (!fileName.contains(driveCode + "_" + imageId)) {
continue;
}
String[] driverInfoAry = fileName.split("_");
GatewayDriverBean gatewayDriverBean = new GatewayDriverBean();
gatewayDriverBean.setDriverCode(driverInfoAry[0]);
- gatewayDriverBean.setVersion(driverInfoAry[1].replace(".zip", ""));
- gatewayDriverBean.setLocalUrl(HdlFileLogic.getInstance().getDrivePathFileName(gatewayDriverBean.getDriverCode(), gatewayDriverBean.getVersion()));
+ gatewayDriverBean.setImageId(driverInfoAry[1]);
+ gatewayDriverBean.setVersion(driverInfoAry[2].replace(".zip", ""));
+ gatewayDriverBean.setLocalUrl(HdlFileLogic.getInstance().getDrivePathFileName(gatewayDriverBean.getDriverCode(), gatewayDriverBean.getImageId(), gatewayDriverBean.getVersion()));
list.add(gatewayDriverBean);
}
}
@@ -1819,7 +2119,7 @@
// String deviceOid = getKeyValue("oid", getKeyValue("data", data));//閫嗗彉鍣ㄨ澶噊id
String driverCode = getKeyValue("driverCode", getKeyValue("data", data));//椹卞姩缂栫爜
-// String imageId = getKeyValue("imageId", getKeyValue("data", data));//椹卞姩闀滃儚id
+ String imageId = getKeyValue("imageId", getKeyValue("data", data));//椹卞姩闀滃儚id
String version = getKeyValue("version", getKeyValue("data", data));//椹卞姩鐗堟湰
// String driverVersionId = getKeyValue("driverVersionId", getKeyValue("data", data));//椹卞姩鐗堟湰id
String localUrl = getKeyValue("localUrl", getKeyValue("data", data));//鍌ㄥ瓨鍦ㄦ湰鍦伴┍鍔ㄦ枃浠惰矾寰�
@@ -1832,7 +2132,7 @@
@Override
public void run() {
- String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName(driverCode, version);
+ String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName(driverCode, imageId, version);
//涓嶅湪瀛愮嚎绋嬭娴佷細鍗℃涓荤嚎绋�
boolean isBoolean = HdlOtaLogic.getInstance().disposeDownLoadFile(drivePathFileName, responseBody, md5, HdlOtaLogic.driver_type);
if (isBoolean) {
@@ -1884,7 +2184,7 @@
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
//鏈湴鍗囩骇椹卞姩鏂囦欢璺緞
- String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName(driverCode, version);
+ String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName(driverCode, imageId, version);
byte[] data = HdlFileLogic.getInstance().readFileByte(drivePathFileName);
if (data == null || data.length == 0) {
uniCallbackData(type, null, -2, HDLApp.getInstance().getAppLocaleContext().getString(R.string.found_locally_drive_file), callback);
@@ -1923,7 +2223,7 @@
uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
return;
}
- if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
+ if (cloudInverterDeviceBean.getDeviceStatus() == 1 || cloudInverterDeviceBean.getDeviceStatus() == 4) {
uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
return;
}
@@ -1962,7 +2262,7 @@
uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
return;
}
- if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
+ if (cloudInverterDeviceBean.getDeviceStatus() == 1 || cloudInverterDeviceBean.getDeviceStatus() == 4) {
uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
return;
}
@@ -2525,15 +2825,15 @@
if (gatewayBean == null) {
continue;
}
- if (gatewayBean.getSpk().equals(HdlDeviceLogic.getInstance().INVERTER_DEVICE_SPK)
- || gatewayBean.getSpk().equals(HdlDeviceLogic.getInstance().OFF_INVERTER_OG_SPK)) {
- if (gatewayBean.isActivate()) {
+ if (gatewayBean.isActivate()) {
+ if (gatewayBean.getSpk().equals(HdlDeviceLogic.getInstance().INVERTER_DEVICE_SPK)
+ || gatewayBean.getSpk().equals(HdlDeviceLogic.getInstance().OFF_INVERTER_OG_SPK)) {
inverterList.add(gatewayBean);
} else {
- inverterUnactivatedList.add(gatewayBean);
+ lcList.add(gatewayBean);
}
} else {
- lcList.add(gatewayBean);
+ inverterUnactivatedList.add(gatewayBean);
}
}
newList.addAll(inverterUnactivatedList);
@@ -2902,6 +3202,28 @@
});
}
+ /**
+ * 璁惧娓呯┖杩愯鏁版嵁
+ *
+ * @param type 绫诲瀷
+ * @param data uni璇锋眰鏁版嵁
+ * @param callback uni鍥炶皟
+ */
+ public void uniDeviceClearData(String type, Object data, DCUniMPJSCallback callback) {
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ HdlDeviceLogic.getInstance().DeviceClearData(mac, new LinkCallBack<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ uniSuccessCallback(type, obj, callback);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
+
/**
* 鍙戦�乵odbus鍗忚鏁版嵁
@@ -2986,6 +3308,7 @@
// data.put("appSecret", AppConfigManage.getAppSecret());
// }
data.put("appLanguage", UserConfigManage.getInstance().getCurrentAppLanguage());
+ data.put("tourist_mode", UserConfigManage.getInstance().isTourist_mode());
uniCallBackBaseBean.setData(data);
return getJSONObject(uniCallBackBaseBean);
} catch (Exception e) {
--
Gitblit v1.8.0