From f10cda784bede39a861566850898747c38e6c94f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 21 一月 2025 15:32:54 +0800
Subject: [PATCH] 2025年01月21日15:31:52
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 644 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 556 insertions(+), 88 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 0d2919e..019000b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -10,9 +10,10 @@
import android.location.Location;
import android.location.LocationManager;
import android.os.IBinder;
-import android.print.PageRange;
+import android.os.SystemClock;
import android.provider.Settings;
import android.text.TextUtils;
+import android.util.Log;
import androidx.core.app.ActivityCompat;
@@ -20,6 +21,7 @@
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
+import com.hdl.link.error.HDLLinkCode;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.device.bean.DeviceOidInfoBean;
import com.hdl.linkpm.sdk.ota.bean.CloudDeviceFirmwaresBean;
@@ -30,25 +32,30 @@
import com.hdl.linkpm.sdk.utils.HDLMD5Utils;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.bean.InverterBean;
+import com.hdl.photovoltaic.bean.LocalResponse;
import com.hdl.photovoltaic.bean.ModBusBean;
import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.AppConfigManage;
-import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
-import com.hdl.photovoltaic.enums.LowerTagType;
+import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
import com.hdl.photovoltaic.internet.TcpClient;
-import com.hdl.photovoltaic.internet.api.HttpApi;
import com.hdl.photovoltaic.internet.api.TopicApi;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
import com.hdl.photovoltaic.ui.bean.CUserInfo;
import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
+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.HouseInfoBean;
import com.hdl.photovoltaic.ui.bean.LinkBean;
import com.hdl.photovoltaic.ui.bean.MemberBean;
+import com.hdl.photovoltaic.ui.bean.NotRunBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
+import com.hdl.photovoltaic.ui.bean.QrcodeUrlBean;
import com.hdl.photovoltaic.ui.bean.StaffBean;
import com.hdl.photovoltaic.ui.bean.UnCountBean;
import com.hdl.photovoltaic.ui.bean.UserRightTypeBean;
@@ -61,7 +68,6 @@
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.NetworkUtils;
import com.hdl.photovoltaic.utils.WifiUtils;
-import com.hdl.sdk.link.common.exception.HDLLinkCode;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
@@ -69,12 +75,13 @@
import com.hdl.sdk.link.core.callback.GatewayCallBack;
import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
import com.hdl.sdk.link.core.callback.ModbusCallBack;
+import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.core.connect.HDLModBusConnect;
import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
-import com.huawei.hms.api.Api;
import org.greenrobot.eventbus.EventBus;
+import org.json.JSONArray;
import org.json.JSONObject;
@@ -136,6 +143,8 @@
if (!HDLUniMP.UNI_APP_ID.equals(appId)) {
return;
}
+ long startTime = System.currentTimeMillis();
+ Log.d("===寮�濮嬫椂闂�===", String.valueOf(startTime));
String type = getKeyValue("type", data);//灏忕被
String logTag = getKeyValue("logTag", data);//鏍囪uni鎸囦护
String mode_type = "澶х被-" + topic + "---" + "灏忕被-" + type;//鐢ㄦ潵鎵撳嵃鐨�
@@ -159,7 +168,17 @@
jsonObject.addProperty("user_name", UserConfigManage.getInstance().getUserName());
jsonObject.addProperty("user_image_url", UserConfigManage.getInstance().getUserImageUrl());
jsonObject.addProperty("user_account", UserConfigManage.getInstance().getAccount());
+
+ jsonObject.addProperty("token", HDLLinkPMUser.getInstance().getAccessToken());
+ jsonObject.addProperty("refreshToken", HDLLinkPMUser.getInstance().getRefreshToken());
+ if (TextUtils.isEmpty(AppConfigManage.getUserRegionUrl())) {
+ AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
+ }
+ jsonObject.addProperty("serverAddress", AppConfigManage.getUserRegionUrl());
+ jsonObject.addProperty("appKey", AppConfigManage.getAppKey());
+ jsonObject.addProperty("appSecret", AppConfigManage.getAppSecret());
uniSuccessCallback(mode_type, jsonObject, callback);
+ HdlLogLogic.print("鑾峰彇鐢ㄦ埛鏈湴缂撳瓨淇℃伅---->>>" + jsonObject.toString());
}
break;
}
@@ -171,23 +190,24 @@
case HDLUniMP.UNI_EVENT_REPLY_HOME_ADD: {
String url = getKeyValue("url", getKeyValue("data", data));
//EventBus浜嬩欢鍒嗗彂
- HdlCommonLogic.getInstance().postEventBusSticky(
- HDLUniMP.UNI_EVENT_REPLY_HOME_ADD,
- HDLUniMP.UNI_EVENT_REPLY_HOME_ADD,
- url);
+ HdlCommonLogic.getInstance().postEventBusSticky(HDLUniMP.UNI_EVENT_REPLY_HOME_ADD, HDLUniMP.UNI_EVENT_REPLY_HOME_ADD, url);
if (callback != null) {
uniSuccessCallback(type, null, callback);
}
}
break;
+ //璐﹀彿涓嬫槸鍚︽湁鐢电珯鍒楄〃
+ case HDLUniMP.UNI_EVENT_REPLY_HOME_LIST: {
+ if (callback != null) {
+ uniSuccessCallback(type, HdlResidenceLogic.getInstance().getHouseIdList().size(), callback);
+ }
+ }
+ break;
//鍒涘缓鐢电珯
case HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION: {
//EventBus浜嬩欢鍒嗗彂
- HdlCommonLogic.getInstance().postEventBus(
- HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL,
- HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION,
- getKeyValue("data", data));
+ HdlCommonLogic.getInstance().postEventBus(HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL, HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION, getKeyValue("data", data));
if (callback != null) {
uniSuccessCallback(type, null, callback);
}
@@ -222,18 +242,20 @@
//浣忓畢銆愮數绔欍�戠紪杈�
case HDLUniMP.UNI_EVENT_REPLY_HOME_EDIT: {
//EventBus浜嬩欢鍒嗗彂
- HdlCommonLogic.getInstance().postEventBus(
- HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL,
- HDLUniMP.UNI_EVENT_REPLY_HOME_EDIT,
- getKeyValue("data", data));
+ HdlCommonLogic.getInstance().postEventBus(HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL, HDLUniMP.UNI_EVENT_REPLY_HOME_EDIT, getKeyValue("data", data));
if (callback != null) {
uniSuccessCallback(type, null, callback);
}
}
break;
- //鐢电珯鐨勪氦浠樹簩缁寸爜(瀹夎鍟�)
+// //鐢电珯鐨勪氦浠樹簩缁寸爜(瀹夎鍟�)
+// case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
+// uniGetDeliveryUrlQrcode(type, data, callback);
+// }
+// break;
+ //鐢电珯鐨勪氦浠楿RL(瀹夎鍟�)
case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
- uniGetDeliveryUrlQrcode(type, data, callback);
+ uniGetDeliveryUrl(type, data, callback);
}
break;
//鐢电珯鎵嬪姩浜や粯(瀹夎鍟�)
@@ -248,7 +270,6 @@
}
break;
-
}
@@ -340,6 +361,26 @@
this.uniOidEditName(mode_type, data, callback);
}
break;
+ //鑾峰彇鏈繍琛岄�嗗彉鍣ㄥ垪琛�
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_NOT_RUN_DEVICE_LIST: {
+ this.uniGetListNotRun(mode_type, data, callback);
+ }
+ break;
+ //蹇嵎寮�鍚�嗗彉鍣�
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OPEN_DEVICE_LIST: {
+ this.uniSetDeviceStartup(mode_type, data, callback);
+ }
+ break;
+ //鑾峰彇璁惧璇︽儏锛堜簯绔澶囷級
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OPEN_DEVICE_info: {
+ this.uniGetDeviceInfo(mode_type, data, callback);
+ }
+ break;
+ //鑾峰彇閫嗗彉鍣ㄨ鎯咃紙鐗╃悊璁惧锛�
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OPEN_gateway_info: {
+ this.uniGetGatewayInfo(mode_type, data, callback);
+ }
+ break;
}
} else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(topic)) {
@@ -388,12 +429,18 @@
break;
//閫嗗彉鍣ㄤ互澶綉閰嶇疆
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ETHERNET_SET: {
- uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_ETHERNET_EDIT, callback);
+ if (callback != null) {
+ uniSuccessCallback(type, "", callback);
+ }
+ //uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_ETHERNET_EDIT, callback);
}
break;
//閫嗗彉鍣ㄤ互澶綉鑾峰彇
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ETHERNET_GET: {
- uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_ETHERNET_GET, callback);
+ if (callback != null) {
+ uniSuccessCallback(type, "", callback);
+ }
+ //uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_ETHERNET_GET, callback);
}
break;
@@ -499,9 +546,17 @@
break;
//娑堟伅涓績
case HDLUniMP.UNI_EVENT_REPLY_MINE_MESSAGE_CENTER: {
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
+ String isShowFault = getKeyValue("isShowFault", getKeyValue("data", data));
Intent intent = new Intent();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setClass(HDLApp.getInstance(), MessageCenterList.class);
+ if (!TextUtils.isEmpty(homeId)) {
+ intent.putExtra("homeId", homeId);
+ }
+ if (!TextUtils.isEmpty(isShowFault)) {
+ intent.putExtra("isShowFault", isShowFault);
+ }
HDLApp.getInstance().startActivity(intent);
}
break;
@@ -519,6 +574,12 @@
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setClass(HDLApp.getInstance(), SetActivity.class);
HDLApp.getInstance().startActivity(intent);
+
+ }
+ break;
+ //涓嬭浇鎴愬憳锛堝瓙璐﹀彿锛夊ご鍍�
+ case HDLUniMP.UNI_EVENT_REPLY_DOWNLOAD_MEMBER_AVATAR: {
+ uniGetHeadPIortrait(type, data, callback);
}
break;
@@ -555,6 +616,13 @@
}
break;
+ //鍛樺伐璇︽儏鑾峰彇
+ case HDLUniMP.UNI_EVENT_REPLY_STAFF_DETAIL: {
+ uniGetStaffInfo(type, data, callback);
+
+ }
+
+ break;
//鍛樺伐鍒犻櫎
case HDLUniMP.UNI_EVENT_REPLY_STAFF_DELETE: {
@@ -569,7 +637,7 @@
}
break;
//鑾峰彇褰撳墠璐﹀彿鍦ㄥ叕鍙哥殑韬唤
- case HDLUniMP.UNI_EVENT_REPLY_USERRIGHTTYPe: {
+ case HDLUniMP.UNI_EVENT_REPLY_USERRIGHTTYP: {
uniGetUserRightType(type, data, callback);
}
@@ -621,6 +689,121 @@
HDLLinkPMUser.getInstance().logout(0);
}
break;
+ //鏈湴瀵嗛挜鑾峰彇
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCAL_ENCRYPT_GET: {
+ String localSecret = HDLLinkConfig.getInstance().getLocalSecret();
+ JsonObject jsonObject = new JsonObject();
+ jsonObject.addProperty("local_encrypt", localSecret);
+ HdlLogLogic.print("uni---log---鏈湴瀵嗛挜鑾峰彇---" + localSecret, true);
+ if (callback != null) {
+ uniSuccessCallback(type, jsonObject, callback);
+ }
+
+ }
+ break;
+ //鏈湴瀵嗛挜璁剧疆
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCAL_ENCRYPT_SET: {
+ String local_encrypt = getKeyValue("local_encrypt", getKeyValue("data", data));
+ if (!TextUtils.isEmpty(local_encrypt)) {
+ //閲嶆柊璁剧疆鏈湴閫氳绉橀挜
+ UserConfigManage.getInstance().setLocalSecret(local_encrypt);
+ UserConfigManage.getInstance().Save();
+ //閰嶇疆鏈湴閫氫俊鐨勪俊鎭�
+ HDLLinkConfig.getInstance().setLocalSecret(local_encrypt);
+ HdlLogLogic.print("uni---log---鏈湴瀵嗛挜璁剧疆---" + local_encrypt, true);
+ }
+ if (callback != null) {
+ uniSuccessCallback(type, true, callback);
+ }
+ }
+ break;
+ //link杩涜瀵嗙爜楠岃瘉
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_PASSWORD_VERIFIY: {
+ uniCheckPasswordVerification(mode_type, data, callback);
+ }
+ break;
+ //鏈湴json璧勬簮鏂囦欢鑾峰彇
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_GET_LOCAL_JSON: {
+ String url = getKeyValue("url", getKeyValue("data", data));
+ String deviceModel = getKeyValue("deviceModel", getKeyValue("data", data));
+ String language = getKeyValue("language", getKeyValue("data", data));
+ String json = HdlESLocalJsonLogic.getInstance().readHdlESLocalJson(url, deviceModel);
+ if (TextUtils.isEmpty(json)) {
+ //鏈湴娌℃湁缂撳瓨
+ HdlESLocalJsonLogic.getInstance().getHdlESLocalJson(url, deviceModel, new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String obj) {
+// if (callback != null) {
+// uniSuccessCallback(type, obj, callback);
+// }
+ String s = HdlESLocalJsonLogic.getInstance().readHdlESLocalJson(url, deviceModel);
+ //鏈湴缂撳瓨鏁版嵁
+ 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 onFailure(HDLException e) {
+ if (callback != null) {
+ uniExceptionCallback(type, e, callback);
+ }
+ }
+ });
+ } else {
+ //鏈湴缂撳瓨鏁版嵁
+ if (callback != null) {
+ try {
+ if (json.startsWith("{")) {
+ uniSuccessCallback(type, new Gson().fromJson(json, JsonObject.class), callback);
+ } else if (json.startsWith("[")) {
+ uniSuccessCallback(type, new Gson().fromJson(json, JsonArray.class), callback);
+ } else {
+ uniSuccessCallback(type, json, callback);
+ }
+ } catch (Exception e) {
+ uniSuccessCallback(type, json, callback);
+ }
+ long endTime = System.currentTimeMillis() - startTime;
+ Log.d("====鑰楁椂鏃堕棿====", String.valueOf(endTime));
+ }
+ }
+ }
+ break;
+ }
+ } else if (HDLUniMP.UNI_EVENT_REPLY_COMMON_MODEL.equals(topic)) {
+ //缃戠粶璇锋眰妯″潡
+ if (type.equals(HDLUniMP.UNI_EVENT_REPLY_UNI_SEND_TO_CLOUD)) {
+ String url = getKeyValue("url", getKeyValue("data", data));
+ JsonObject jObject = new JsonObject();
+ String body = getKeyValue("body", getKeyValue("data", data));
+ if (!TextUtils.isEmpty(body)) {
+ try {
+ jObject = new Gson().fromJson(body, JsonObject.class);
+ } catch (Exception ignored) {
+ }
+ }
+ HttpClient.getInstance().requestHttp(url, jObject.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ uniSuccessCallback(mode_type, jsonStr, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniExceptionCallback(mode_type, e, callback);
+ }
+ });
}
}
@@ -640,13 +823,7 @@
public void openUniMP(String path, JSONObject jsonObject) {
JSONObject json = this.createdJSONObject(jsonObject, true);
HDLUniMPSDKManager.getInstance().openUniMP(HDLUniMP.UNI_APP_ID, path, json, HdlUniLogic.this);
- HdlLogLogic.print("uni---缁勮uni鍙戦�佹暟鎹牸寮�---" + json, false);
- }
-
- public void openUniMPDelay(String path, JSONObject jsonObject) {
- JSONObject json = this.createdJSONObject(jsonObject, true);
- HDLUniMPSDKManager.getInstance().openUniMPDelay(HDLUniMP.UNI_APP_ID, path, json, HdlUniLogic.this);
- HdlLogLogic.print("uni---缁勮uni鍙戦�佹暟鎹牸寮�---" + json, false);
+// HdlLogLogic.print("uni---缁勮uni鍙戦�佹暟鎹牸寮�---" + json, false);
}
/**
@@ -675,13 +852,43 @@
//region ******uni鎺ュ彛鏂规硶******
/**
+ * link杩涜鏈湴瀵嗙爜鐧诲綍楠岃瘉
+ */
+ private void uniCheckPasswordVerification(String type, Object data, DCUniMPJSCallback callback) {
+ String password = getKeyValue("password", getKeyValue("data", data));
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ HdlDeviceLogic.getInstance().getPasswordVerification(mac, password, new LinkCallBack<LocalResponse>() {
+ @Override
+ public void onSuccess(LocalResponse obj) {
+
+ if (callback != null) {
+ uniCallbackData(type, obj.getObjects(), obj.getCode(), obj.getMsg(), callback);
+ }
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+
+ if (callback != null) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ }
+ });
+ }
+
+ /**
* 鐢电珯鍒犻櫎
*/
private void uniGetDelResidence(String type, Object data, DCUniMPJSCallback callback) {
+
+
String homeId = getKeyValue("homeId", getKeyValue("data", data));
HdlResidenceLogic.getInstance().delResidence(homeId, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
+ if (callback != null) {
+ uniSuccessCallback(type, null, callback);
+ }
List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId);
for (int i = 0; i < list.size(); i++) {
GatewayBean gatewayBean = list.get(i);
@@ -690,9 +897,33 @@
list.clear();//娓呯┖缂撳瓨;
// HDLLinkLocalGateway.getInstance().getGatewayList().clear();
HdlResidenceLogic.getInstance().delHouseId(homeId);//鍒犻櫎鐢电珯缂撳瓨
- //uni鏀跺埌鎴愬姛缁撴灉鍝嶅簲鍚�,浼氳嚜鍔ㄥ叧闂皬绋嬪簭锛屽湪HDLUniMPSDKManager绫婚噷闈㈡湁鏂规硶()鐩戝惉鍒板皬绋嬪簭鍏抽棴锛岀洃鍚埌灏忕▼搴忓叧闂簨浠跺悗锛屼細閲嶆柊鑾峰彇鐢电珯鍒楄〃杩涜鍒风晫闈紱
- uniSuccessCallback(type, obj, callback);
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //B绔�
+ //鏀跺埌鎴愬姛缁撴灉鍝嶅簲鍚�,浼氳嚜鍔ㄥ叧闂皬绋嬪簭锛屽湪HDLUniMPSDKManager绫婚噷闈㈡湁鏂规硶()鐩戝惉鍒板皬绋嬪簭鍏抽棴锛岀洃鍚埌灏忕▼搴忓叧闂簨浠跺悗锛屼細閲嶆柊鑾峰彇鐢电珯鍒楄〃杩涜鍒风晫闈紱
+ if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
+ HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
+ }
+ } else {
+ //C绔�
+ List<HouseIdBean> HouseIdList = HdlResidenceLogic.getInstance().getHouseIdList();
+ if (HouseIdList.size() == 0) {
+ String path = HDLUniMP.UNI_EVENT_OPEN_HOME_Null_C;
+ HdlUniLogic.getInstance().openUniMP(path, null);
+ } else {
+ HouseIdBean houseIdBean = HouseIdList.get(0);//榛樿鎷跨涓�涓�
+ HdlResidenceLogic.getInstance().switchHouse(houseIdBean, true);
+ JsonObject jsonObject = new JsonObject();
+ jsonObject.addProperty("homeId", houseIdBean.getHomeId());
+ jsonObject.addProperty("homeName", houseIdBean.getHomeName());
+ jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus() + "");
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS);
+ uniCallBackBaseBean.setData(jsonObject);
+ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
+ }
+
+ }
}
@Override
@@ -735,6 +966,10 @@
@Override
public void onSuccess(Boolean obj) {
uniSuccessCallback(type, obj, callback);
+ //鏀跺埌鎴愬姛缁撴灉鍝嶅簲鍚�,浼氳嚜鍔ㄥ叧闂皬绋嬪簭锛屽湪HDLUniMPSDKManager绫婚噷闈㈡湁鏂规硶()鐩戝惉鍒板皬绋嬪簭鍏抽棴锛岀洃鍚埌灏忕▼搴忓叧闂簨浠跺悗锛屼細閲嶆柊鑾峰彇鐢电珯鍒楄〃杩涜鍒风晫闈紱
+ if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
+ HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
+ }
}
@Override
@@ -754,6 +989,31 @@
@Override
public void onSuccess(String obj) {
uniSuccessCallback(type, obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniExceptionCallback(type, e, callback);
+ }
+ });
+
+ }
+
+ /**
+ * 鐢电珯鐨勪氦浠楿Rl(瀹夎鍟�)
+ */
+ private void uniGetDeliveryUrl(String type, Object data, DCUniMPJSCallback callback) {
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
+ HdlResidenceLogic.getInstance().getDeliveryUrl(homeId, new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String obj) {
+ try {
+ Gson g = new Gson();
+ QrcodeUrlBean qrcodeUrlBean = g.fromJson(obj, QrcodeUrlBean.class);
+ uniSuccessCallback(type, qrcodeUrlBean.getDeliveryUrl(), callback);
+ } catch (Exception ignored) {
+ uniSuccessCallback(type, obj, callback);
+ }
}
@Override
@@ -807,7 +1067,7 @@
}
/**
- * 鍛樺伐娣诲姞
+ * 鍛樺伐鍒犻櫎
*/
private void uniGetStaffDelete(String type, Object data, DCUniMPJSCallback callback) {
StaffBean staffBean = new StaffBean();
@@ -857,14 +1117,32 @@
}
/**
+ * 鑾峰彇鍛樺伐璇︽儏
+ */
+ private void uniGetStaffInfo(String type, Object data, DCUniMPJSCallback callback) {
+ String userId = getKeyValue("userId", getKeyValue("data", data));
+ HdlMemberLogic.getInstance().getStaffInfo(userId, new CloudCallBeak<StaffBean>() {
+ @Override
+ public void onSuccess(StaffBean obj) {
+ uniSuccessCallback(type, obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniExceptionCallback(type, e, callback);
+ }
+ });
+ }
+
+ /**
* 鑾峰彇鍛樺伐鍒楄〃
*/
private void uniGetStaffList(String type, Object data, DCUniMPJSCallback callback) {
long pageNo = Long.parseLong(getKeyValue("pageNo", getKeyValue("data", data)));
long pageSize = Long.parseLong(getKeyValue("pageSize", getKeyValue("data", data)));
- HdlMemberLogic.getInstance().getStaffList(pageNo, pageSize, new CloudCallBeak<PageNumberObject<List<StaffBean>>>() {
+ HdlMemberLogic.getInstance().getStaffList(pageNo, pageSize, new CloudCallBeak<PageNumberObject<StaffBean>>() {
@Override
- public void onSuccess(PageNumberObject<List<StaffBean>> obj) {
+ public void onSuccess(PageNumberObject<StaffBean> obj) {
uniSuccessCallback(type, obj.getList(), callback);
}
@@ -874,6 +1152,7 @@
}
});
}
+
/**
* 鎴愬憳缂栬緫
@@ -940,6 +1219,32 @@
HdlMemberLogic.getInstance().getMemberAdd(memberBean, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
+ uniSuccessCallback(type, obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniExceptionCallback(type, e, callback);
+ }
+ });
+ }
+
+ /**
+ * 涓嬭浇鎴愬憳锛堝瓙璐﹀彿锛夊ご鍍�
+ */
+ private void uniGetHeadPIortrait(String type, Object data, DCUniMPJSCallback callback) {
+ MemberBean memberBean = new MemberBean();
+ String memberInfo = getKeyValue("memberInfo", getKeyValue("data", data));
+ if (!TextUtils.isEmpty(memberInfo)) {
+ try {
+ memberBean = new Gson().fromJson(memberInfo, MemberBean.class);
+ } catch (Exception ignored) {
+ }
+ }
+
+ HdlMemberLogic.getInstance().getHeadPIortrait(memberBean, new CloudCallBeak<byte[]>() {
+ @Override
+ public void onSuccess(byte[] obj) {
uniSuccessCallback(type, obj, callback);
}
@@ -1019,14 +1324,14 @@
//ACCESS_COARSE_LOCATION 鍏佽浣跨敤WIFI鐑偣鎴栧熀绔欐潵鑾峰彇绮楃暐鐨勫畾浣�
if (ActivityCompat.checkSelfPermission(HDLApp.getInstance(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(HDLApp.getInstance(), Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
geolocation.setResult(-2);
- geolocation.setDes(HDLApp.getInstance().getString(R.string.exception_no_location_information_permission));
+ geolocation.setDes(HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_no_location_information_permission));
uniSuccessCallback(type, geolocation, callback);
return;
}
// 鍒ゆ柇璁惧鏄惁鏀寔瀹氫綅鍔熻兘
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
geolocation.setResult(-1);
- geolocation.setDes(HDLApp.getInstance().getString(R.string.exception_the_location_function_is_not_enabled));
+ geolocation.setDes(HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_the_location_function_is_not_enabled));
//todo 鎻愮ず鐢ㄦ埛鎵撳紑瀹氫綅鍔熻兘鎴栬�呭紩瀵肩敤鎴峰幓绯荤粺璁剧疆椤甸潰鎵撳紑瀹氫綅鍔熻兘
uniSuccessCallback(type, geolocation, callback);
return;
@@ -1034,12 +1339,12 @@
Location location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
if (location == null) {
geolocation.setResult(-3);
- geolocation.setDes(HDLApp.getInstance().getString(R.string.exception_unable_location_move10_meters_later));
+ geolocation.setDes(HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_unable_location_move10_meters_later));
uniSuccessCallback(type, geolocation, callback);
return;
}
geolocation.setResult(0);
- geolocation.setDes(HDLApp.getInstance().getString(R.string.succeed));
+ geolocation.setDes(HDLApp.getInstance().getAppLocaleContext().getString(R.string.succeed));
BigDecimal latitude = BigDecimal.valueOf(location.getLatitude());//缁忓害
BigDecimal longitude = BigDecimal.valueOf(location.getLongitude());//绾害
double lat = latitude.setScale(6, RoundingMode.HALF_DOWN).doubleValue();
@@ -1081,7 +1386,9 @@
*/
private void uniGetCurrentDeviceFirmwares(String type, Object data, DCUniMPJSCallback callback) {
String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//浜戠涓婅澶噄d
- HdlOtaLogic.getInstance().getCurrentDeviceFirmwares(deviceOidId, new CloudCallBeak<List<DeviceFirmwareBean>>() {
+ String oid = getKeyValue("oid", getKeyValue("data", data));//璁惧oid
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));//鐢电珯id
+ HdlOtaLogic.getInstance().getCurrentDeviceFirmwares(deviceOidId, oid, homeId, new CloudCallBeak<List<DeviceFirmwareBean>>() {
@Override
public void onSuccess(List<DeviceFirmwareBean> obj) {
uniSuccessCallback(type, obj, callback);
@@ -1175,9 +1482,9 @@
}
if (isBoolean) {
- uniCallbackData(type, null, 0, HDLApp.getInstance().getString(R.string.writing_firmware_upgrade_memory_succeeded), callback);
+ uniCallbackData(type, null, 0, HDLApp.getInstance().getAppLocaleContext().getString(R.string.writing_firmware_upgrade_memory_succeeded), callback);
} else {
- uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.download_firmware_upgrade_file_failed), callback);
+ uniCallbackData(type, null, -2, HDLApp.getInstance().getAppLocaleContext().getString(R.string.download_firmware_upgrade_file_failed), callback);
}
}
});
@@ -1222,7 +1529,7 @@
String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(imageId, version);
byte[] data = HdlFileLogic.getInstance().readFileByte(firmwarePathFileName);
if (data == null || data.length == 0) {
- uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.found_locally_firmware_upgrade_file), callback);
+ uniCallbackData(type, null, -2, HDLApp.getInstance().getAppLocaleContext().getString(R.string.found_locally_firmware_upgrade_file), callback);
return;
}
String md5 = HDLMD5Utils.encodeMD5(data);//缃戝叧鍥轰欢闇�瑕�
@@ -1237,14 +1544,14 @@
@Override
public void onError(HDLLinkException e) {
- uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.notify_gateway_firmware_upgrade_failed), callback);
+ uniCallbackData(type, null, -2, HDLApp.getInstance().getAppLocaleContext().getString(R.string.notify_gateway_firmware_upgrade_failed), callback);
}
});
}
@Override
public void onServiceDisconnected(ComponentName name) {
- uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.local_service_fails), callback);
+ uniCallbackData(type, null, -2, HDLApp.getInstance().getAppLocaleContext().getString(R.string.local_service_fails), callback);
}
});
} else {
@@ -1255,11 +1562,11 @@
public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
//1锛氳繛鎺ヤ腑,2锛氭晠闅�,3锛氳繍琛�,4锛氱绾�,6:閫嗗彉鍣ㄨ繛涓嶄笂浜�(鑷畾涔�)
if (cloudInverterDeviceBean == null) {
- uniCallbackData(type, null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
+ uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
return;
}
if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
- uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
+ uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
return;
}
//4:杩愯
@@ -1294,11 +1601,11 @@
public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
//1锛氳繛鎺ヤ腑,2锛氭晠闅�,3锛氳繍琛�,4锛氱绾�,6:閫嗗彉鍣ㄨ繛涓嶄笂浜�(鑷畾涔�)
if (cloudInverterDeviceBean == null) {
- uniCallbackData(type, null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
+ uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
return;
}
if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
- uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
+ uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
return;
}
//4:杩愯
@@ -1332,7 +1639,8 @@
*/
private void uniGetCurrentGatewayDrivers(String type, Object data, DCUniMPJSCallback callback) {
String deviceOid = getKeyValue("oid", getKeyValue("data", data));
- HdlOtaLogic.getInstance().getCurrentGatewayDrivers(deviceOid, new CloudCallBeak<List<GatewayDriverBean>>() {
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));//鐢电珯id
+ HdlOtaLogic.getInstance().getCurrentGatewayDrivers(deviceOid, homeId, new CloudCallBeak<List<GatewayDriverBean>>() {
@Override
public void onSuccess(List<GatewayDriverBean> obj) {
uniSuccessCallback(type, obj, callback);
@@ -1428,9 +1736,9 @@
HdlFileLogic.getInstance().deleteFile(drivePathFileName);//涓嬭浇澶辫触锛屽垹闄や笉瀹屾暣椹卞姩鏂囦欢;
}
if (isBoolean) {
- uniCallbackData(type, null, 0, HDLApp.getInstance().getString(R.string.writing_drive_memory_succeeded), callback);
+ uniCallbackData(type, null, 0, HDLApp.getInstance().getAppLocaleContext().getString(R.string.writing_drive_memory_succeeded), callback);
} else {
- uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.download_drive_file_failed), callback);
+ uniCallbackData(type, null, -2, HDLApp.getInstance().getAppLocaleContext().getString(R.string.download_drive_file_failed), callback);
}
}
});
@@ -1474,7 +1782,7 @@
String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName(driverCode, version);
byte[] data = HdlFileLogic.getInstance().readFileByte(drivePathFileName);
if (data == null || data.length == 0) {
- uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.found_locally_drive_file), callback);
+ uniCallbackData(type, null, -2, HDLApp.getInstance().getAppLocaleContext().getString(R.string.found_locally_drive_file), callback);
return;
}
String md5 = HDLMD5Utils.encodeMD5(data);//缃戝叧椹卞姩闇�瑕�
@@ -1489,14 +1797,14 @@
@Override
public void onError(HDLLinkException e) {
- uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.notify_gateway_drive_failed), callback);
+ uniCallbackData(type, null, -2, HDLApp.getInstance().getAppLocaleContext().getString(R.string.notify_gateway_drive_failed), callback);
}
});
}
@Override
public void onServiceDisconnected(ComponentName name) {
- uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.local_service_fails), callback);
+ uniCallbackData(type, null, -2, HDLApp.getInstance().getAppLocaleContext().getString(R.string.local_service_fails), callback);
}
});
} else {
@@ -1507,11 +1815,11 @@
public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
//1锛氳繛鎺ヤ腑,2锛氭晠闅�,3锛氳繍琛�,4锛氱绾�,6:閫嗗彉鍣ㄨ繛涓嶄笂浜�(鑷畾涔�)
if (cloudInverterDeviceBean == null) {
- uniCallbackData(type, null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
+ uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
return;
}
if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
- uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
+ uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
return;
}
//4:杩愯
@@ -1546,11 +1854,11 @@
public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
//1锛氳繛鎺ヤ腑,2锛氭晠闅�,3锛氳繍琛�,4锛氱绾�,6:閫嗗彉鍣ㄨ繛涓嶄笂浜�(鑷畾涔�)
if (cloudInverterDeviceBean == null) {
- uniCallbackData(type, null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
+ uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
return;
}
if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
- uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
+ uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
return;
}
//4:杩愯
@@ -1583,7 +1891,7 @@
*/
private void uniCancelDownloadingUpgradeFile(String type, Object data, DCUniMPJSCallback callback) {
HdlOtaLogic.getInstance().stopDownloadUpgradeFile();
- uniCallbackData(type, null, 0, HDLApp.getInstance().getString(R.string.cancel_download_successfully), callback);
+ uniCallbackData(type, null, 0, HDLApp.getInstance().getAppLocaleContext().getString(R.string.cancel_download_successfully), callback);
}
/**
@@ -1634,13 +1942,13 @@
public String getDeviceStatusString(int deviceStatus) {
switch (deviceStatus) {
case 1: {
- return HDLApp.getInstance().getString(R.string.my_power_station_connecting);
+ return HDLApp.getInstance().getAppLocaleContext().getString(R.string.my_power_station_connecting);
}
case 2: {
- return HDLApp.getInstance().getString(R.string.my_power_station_malfunction);
+ return HDLApp.getInstance().getAppLocaleContext().getString(R.string.my_power_station_malfunction);
}
case 4: {
- return HDLApp.getInstance().getString(R.string.my_power_station_off_line);
+ return HDLApp.getInstance().getAppLocaleContext().getString(R.string.my_power_station_off_line);
}
default:
return "";
@@ -1661,21 +1969,29 @@
if (cUserInfo == null) {
return;
}
- UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
- UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
- UserConfigManage.getInstance().Save();
+
//鑾峰彇鐢ㄦ埛澶村儚璺緞
if (cUserInfo.getMemberHeadIcon().contains("http")) {
- UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
//鏇存柊鐢ㄦ埛澶村儚
uniSuccessCallback(type, cUserInfo, callback);
+ UserConfigManage.getInstance().setUserName(cUserInfo.getMemberName());
+ UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
+ UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
+ UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
+ UserConfigManage.getInstance().Save();
+ HdlLogLogic.print("澶村儚璺緞---->>>" + cUserInfo.getMemberHeadIcon());
} else {
HdlAccountLogic.getInstance().getImageKey_C(cUserInfo.getMemberHeadIcon(), new CloudCallBeak<String>() {
@Override
public void onSuccess(String url) {
cUserInfo.setMemberHeadIcon(url);
- UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
uniSuccessCallback(type, cUserInfo, callback);
+ UserConfigManage.getInstance().setUserName(cUserInfo.getMemberName());
+ UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
+ UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
+ UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
+ UserConfigManage.getInstance().Save();
+ HdlLogLogic.print("澶村儚璺緞---->>>" + cUserInfo.getMemberHeadIcon());
}
@Override
@@ -1862,7 +2178,7 @@
public void onSuccess(Boolean obj) {
GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
if (gatewayBean == null) {
- uniCallbackData(type, null, -100, HDLApp.getInstance().getString(R.string.The_gateway_cannot_be_found_locally), callback);
+ uniCallbackData(type, null, -100, HDLApp.getInstance().getAppLocaleContext().getString(R.string.The_gateway_cannot_be_found_locally), callback);
return;
}
@@ -1909,7 +2225,7 @@
}.getType();
List<GatewayBean> list = gson.fromJson(devices, typeOfT);
if (list == null || list.size() == 0) {
- uniCallbackData(type, null, -100, HDLApp.getInstance().getString(R.string.The_gateway_cannot_be_found_locally), callback);
+ uniCallbackData(type, null, -100, HDLApp.getInstance().getAppLocaleContext().getString(R.string.The_gateway_cannot_be_found_locally), callback);
return;
}
//璁板綍鏉℃暟
@@ -1934,6 +2250,22 @@
@Override
public void onFailure(HDLException e) {
+ //娣诲姞閫嗗彉鍣ㄥけ璐ュ悗鍒濆鍖栭�嗗彉鍣�
+ HdlLogLogic.print("娣诲姞閫嗗彉鍣ㄥけ璐ュ悗寮�濮嬪垵濮嬪寲閫嗗彉鍣�-->", true);
+ for (int i = 0; i < list.size(); i++) {
+ GatewayBean gatewayBean = list.get(i);
+ HdlDeviceLogic.getInstance().initializeInverter(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄦ垚鍔�-->mac:" + gatewayBean.getDevice_mac(), true);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄥけ璐�-->mac:" + gatewayBean.getDevice_mac(), true);
+ }
+ });
+ }
uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
}
});
@@ -1973,9 +2305,12 @@
private void uniDelInverterDevice(String type, Object data, DCUniMPJSCallback callback) {
String deviceId = getKeyValue("deviceId", getKeyValue("data", data));
String homeId = getKeyValue("homeId", getKeyValue("data", data));
+ String mac = getKeyValue("mac", getKeyValue("data", data));
HdlDeviceLogic.getInstance().delInverterDevice(homeId, deviceId, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
+ //鍒濆鍖栭�嗗彉鍣ㄨ澶�
+ HdlDeviceLogic.getInstance().initializeInverter(mac, null);
//绉婚櫎鏈湴缂撳瓨
HdlDeviceLogic.getInstance().removeLocalCacheMemoryGatewayToDeviceId(homeId, deviceId);
uniSuccessCallback(type, null, callback);
@@ -1983,7 +2318,25 @@
@Override
public void onFailure(HDLException e) {
- uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ if (e.getCode() == 121005) {
+ //璁惧涓嶅瓨鍦紙121005锛夌姸鎬佺爜
+ //鍒濆鍖栭�嗗彉鍣ㄨ澶�
+ HdlDeviceLogic.getInstance().initializeInverter(mac, new LinkCallBack<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ //绉婚櫎鏈湴缂撳瓨
+ HdlDeviceLogic.getInstance().removeLocalCacheMemoryGatewayToDeviceId(homeId, deviceId);
+ uniSuccessCallback(type, null, callback);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ } else {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
}
});
}
@@ -2023,22 +2376,18 @@
HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(homeId, new CloudCallBeak<List<GatewayBean>>() {
@Override
public void onSuccess(List<GatewayBean> list) {
- if (list == null || list.size() == 0) {
- if (callback != null) {
- uniSuccessCallback(type, list, callback);
- }
- return;
- }
+ List<GatewayBean> newList = sortLogic(list);
if (callback != null) {
- uniSuccessCallback(type, list, callback);
+ uniSuccessCallback(type, newList, callback);
}
//EventBus浜嬩欢鍒嗗彂,杩涘叆浣忓畢寮�濮嬭闃呬富棰�
BaseEventBus baseEventBus = new BaseEventBus();
+ baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
- baseEventBus.setData(list);
+ baseEventBus.setData(homeId);
EventBus.getDefault().post(baseEventBus);
//杩涙潵浣忓畢璇︽儏閮借涓婁紶涓�娆id鍒楄〃鍒颁簯绔�;
- HdlDeviceLogic.getInstance().uploadOidDataToCloud(homeId, list, false, null);
+ HdlDeviceLogic.getInstance().uploadOidDataToCloud(homeId, newList, false, null);
}
@Override
@@ -2049,6 +2398,31 @@
}
});
+ }
+
+ /**
+ * 杩涜鎺掑簭锛堥�嗗彉鍣�-璐熻浇涓績锛�
+ *
+ * @param list 婧愭暟鎹�
+ * @return 杩斿洖鍒楄〃
+ */
+ private List<GatewayBean> sortLogic(List<GatewayBean> list) {
+ if (list == null || list.size() == 0) {
+ return new ArrayList<>();
+ }
+ List<GatewayBean> newList = new ArrayList<>();
+ List<GatewayBean> inverterList = new ArrayList<>();
+ List<GatewayBean> lcList = new ArrayList<>();
+ for (int i = 0; i < list.size(); i++) {
+ if (list.get(i).getSpk().equals(HdlDeviceLogic.getInstance().INVERTER_DEVICE_SPK)) {
+ inverterList.add(list.get(i));
+ } else {
+ lcList.add(list.get(i));
+ }
+ }
+ newList.addAll(inverterList);
+ newList.addAll(lcList);
+ return newList;
}
/**
@@ -2203,7 +2577,7 @@
/**
* 鍒濆鍖栭�嗗彉鍣�
*
- * @param type 璐﹀彿
+ * @param type 绫诲瀷
* @param data uni璇锋眰鏁版嵁
* @param callback uni鍥炶皟
*/
@@ -2225,7 +2599,7 @@
/**
* 鍒濆鍖栭�嗗彉鍣�
*
- * @param type 璐﹀彿
+ * @param type 绫诲瀷
* @param data uni璇锋眰鏁版嵁
* @param callback uni鍥炶皟
*/
@@ -2272,7 +2646,7 @@
/**
* 淇敼璁惧鍚嶇О閫嗗彉鍣˙MS鐢垫睜鍖�
*
- * @param type 璐﹀彿
+ * @param type 绫诲瀷
* @param data uni璇锋眰鏁版嵁
* @param callback uni鍥炶皟
*/
@@ -2289,6 +2663,98 @@
@Override
public void onFailure(HDLException e) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
+
+ /**
+ * 鑾峰彇鏈繍琛岄�嗗彉鍣ㄥ垪琛�
+ *
+ * @param type 绫诲瀷
+ * @param data uni璇锋眰鏁版嵁
+ * @param callback uni鍥炶皟
+ */
+ public void uniGetListNotRun(String type, Object data, DCUniMPJSCallback callback) {
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
+ HdlDeviceLogic.getInstance().getListNotRun(homeId, new CloudCallBeak<List<NotRunBean>>() {
+ @Override
+ public void onSuccess(List<NotRunBean> obj) {
+ uniSuccessCallback(type, obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
+
+ /**
+ * 閫嗗彉鍣ㄥ紑鏈�
+ *
+ * @param type 绫诲瀷
+ * @param data uni璇锋眰鏁版嵁
+ * @param callback uni鍥炶皟
+ */
+ public void uniSetDeviceStartup(String type, Object data, DCUniMPJSCallback callback) {
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
+ String aryJson = getKeyValue("deviceIds", getKeyValue("data", data));
+ JsonArray jsonArray = new Gson().fromJson(aryJson, JsonArray.class);
+ HdlDeviceLogic.getInstance().setDeviceStartup(homeId, jsonArray, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ uniSuccessCallback(type, obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
+
+ /**
+ * 鑾峰彇璁惧璇︽儏锛堜簯绔級
+ *
+ * @param type 绫诲瀷
+ * @param data uni璇锋眰鏁版嵁
+ * @param callback uni鍥炶皟
+ */
+ public void uniGetDeviceInfo(String type, Object data, DCUniMPJSCallback callback) {
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
+ String aryJson = getKeyValue("deviceIds", getKeyValue("data", data));
+ JsonArray jsonArray = new Gson().fromJson(aryJson, JsonArray.class);
+ HdlDeviceLogic.getInstance().getDeviceInfo(homeId, jsonArray, new CloudCallBeak<List<DeviceInfoBean>>() {
+ @Override
+ public void onSuccess(List<DeviceInfoBean> list) {
+ uniSuccessCallback(type, list, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
+
+ /**
+ * 鑾峰彇閫嗗彉鍣ㄨ鎯�
+ *
+ * @param type 绫诲瀷
+ * @param data uni璇锋眰鏁版嵁
+ * @param callback uni鍥炶皟
+ */
+ public void uniGetGatewayInfo(String type, Object data, DCUniMPJSCallback callback) {
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ HdlDeviceLogic.getInstance().getGatewayInfo(mac, new LinkCallBack<InverterBean>() {
+ @Override
+ public void onSuccess(InverterBean obj) {
+ uniSuccessCallback(type, obj, callback);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
}
});
@@ -2331,12 +2797,14 @@
//HdlLogLogic.print("uni---鍙戦��---ModBus---" + Arrays.toString(modBusBean.getData()), true);
//鍙戦�乵odbus鍗忚
- HDLModBusConnect.getInstance().Send(modBusBean.getMac(), modBusBean.getData(), new ModbusCallBack() {
+ long startTime = System.currentTimeMillis();
+ HDLModBusConnect.getInstance().asyncSend(modBusBean.getMac(), modBusBean.getData(), new ModbusCallBack() {
@Override
public void onSuccess(int[] data) {
uniSuccessCallback(type, data, callback);
// HdlLogLogic.print("uni---鎺ユ敹---ModBus---" + Arrays.toString(data), true);
-
+ long endTime = System.currentTimeMillis() - startTime;
+ Log.d("====Mobus鑰楁椂鏃堕棿====", String.valueOf(endTime));
}
@Override
@@ -2366,8 +2834,8 @@
}
if (isTokenAndRefreshToken) {
//灏忕▼搴忛偅閲屾湁鑷繁鐨勮姹傛柟娉�,浣嗛渶瑕佸師鐢熸彁渚涜繖浜涙暟鎹�
- data.put("token", UserConfigManage.getInstance().getToken());
- data.put("refreshToken", UserConfigManage.getInstance().getRefreshToken());
+ data.put("token", HDLLinkPMUser.getInstance().getAccessToken());
+ data.put("refreshToken", HDLLinkPMUser.getInstance().getRefreshToken());
if (TextUtils.isEmpty(AppConfigManage.getUserRegionUrl())) {
AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
}
--
Gitblit v1.8.0