From 54cb06b771447df9bca5f3eae88a9caaf8ec51ff Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 22 七月 2024 17:24:10 +0800
Subject: [PATCH] 2024年07月22日17:24:08
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 198 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 178 insertions(+), 20 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 79f0d45..0e27e38 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -10,6 +10,7 @@
import android.location.Location;
import android.location.LocationManager;
import android.os.IBinder;
+import android.os.SystemClock;
import android.print.PageRange;
import android.provider.Settings;
import android.text.TextUtils;
@@ -42,12 +43,15 @@
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.BUserInfo;
import com.hdl.photovoltaic.ui.bean.CUserInfo;
import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
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.NotRunBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.ui.bean.StaffBean;
import com.hdl.photovoltaic.ui.bean.UnCountBean;
@@ -91,6 +95,7 @@
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
+import io.dcloud.feature.sdk.DCUniMPSDK;
import io.dcloud.feature.unimp.DCUniMPJSCallback;
import okhttp3.ResponseBody;
@@ -178,6 +183,13 @@
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;
@@ -337,6 +349,16 @@
break;
//璁惧鍚嶇О淇敼(淇敼鏄簯绔痮id鍚嶇О锛岃澶囦娇鐢╩odbus鍗忚淇敼)
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_EDIT_NAME: {
+ 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.uniOidEditName(mode_type, data, callback);
}
break;
@@ -522,6 +544,12 @@
}
break;
+ //涓嬭浇鎴愬憳锛堝瓙璐﹀彿锛夊ご鍍�
+ case HDLUniMP.UNI_EVENT_REPLY_DOWNLOAD_MEMBER_AVATAR: {
+ uniGetHeadPIortrait(type, data, callback);
+
+ }
+ break;
//鎴愬憳鍒楄〃
case HDLUniMP.UNI_EVENT_REPLY_MEMBER_LIST: {
uniGetMemberList(type, data, callback);
@@ -576,7 +604,7 @@
}
break;
//鑾峰彇褰撳墠璐﹀彿鍦ㄥ叕鍙哥殑韬唤
- case HDLUniMP.UNI_EVENT_REPLY_USERRIGHTTYPe: {
+ case HDLUniMP.UNI_EVENT_REPLY_USERRIGHTTYP: {
uniGetUserRightType(type, data, callback);
}
@@ -650,12 +678,6 @@
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);
- }
-
/**
* 鍘熺敓銆愪富鍔ㄣ�戝悜灏忕▼搴忓彂閫侀�氱煡浜嬩欢
* 娉ㄦ剰锛氶渶瑕佹彁鍓嶅皬绋嬪簭鍦ㄨ繍琛屾墠鍙垚鍔�
@@ -685,10 +707,15 @@
* 鐢电珯鍒犻櫎
*/
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);
@@ -697,9 +724,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);
+ 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
@@ -742,6 +793,10 @@
@Override
public void onSuccess(Boolean obj) {
uniSuccessCallback(type, obj, callback);
+ //鏀跺埌鎴愬姛缁撴灉鍝嶅簲鍚�,浼氳嚜鍔ㄥ叧闂皬绋嬪簭锛屽湪HDLUniMPSDKManager绫婚噷闈㈡湁鏂规硶()鐩戝惉鍒板皬绋嬪簭鍏抽棴锛岀洃鍚埌灏忕▼搴忓叧闂簨浠跺悗锛屼細閲嶆柊鑾峰彇鐢电珯鍒楄〃杩涜鍒风晫闈紱
+ if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
+ HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
+ }
}
@Override
@@ -966,6 +1021,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);
}
@@ -1960,6 +2041,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);
}
});
@@ -1999,9 +2096,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);
@@ -2009,7 +2109,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);
+ }
}
});
}
@@ -2049,19 +2167,14 @@
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;
- }
if (callback != null) {
uniSuccessCallback(type, list, 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);
@@ -2229,7 +2342,7 @@
/**
* 鍒濆鍖栭�嗗彉鍣�
*
- * @param type 璐﹀彿
+ * @param type 绫诲瀷
* @param data uni璇锋眰鏁版嵁
* @param callback uni鍥炶皟
*/
@@ -2251,7 +2364,7 @@
/**
* 鍒濆鍖栭�嗗彉鍣�
*
- * @param type 璐﹀彿
+ * @param type 绫诲瀷
* @param data uni璇锋眰鏁版嵁
* @param callback uni鍥炶皟
*/
@@ -2298,7 +2411,7 @@
/**
* 淇敼璁惧鍚嶇О閫嗗彉鍣˙MS鐢垫睜鍖�
*
- * @param type 璐﹀彿
+ * @param type 绫诲瀷
* @param data uni璇锋眰鏁版嵁
* @param callback uni鍥炶皟
*/
@@ -2320,6 +2433,51 @@
});
}
+ /**
+ * 鑾峰彇鏈繍琛岄�嗗彉鍣ㄥ垪琛�
+ *
+ * @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));
+ HdlDeviceLogic.getInstance().setDeviceStartup(homeId, aryJson, 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);
+ }
+ });
+ }
+
/**
* 鍙戦�乵odbus鍗忚鏁版嵁
--
Gitblit v1.8.0