From fde174d256d4dced8bef6c439ec87cd888ad140b Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 12 六月 2024 17:27:43 +0800
Subject: [PATCH] 2024年06月12日17:27:36
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 414 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 358 insertions(+), 56 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 e66c575..89379c6 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.print.PageRange;
import android.provider.Settings;
import android.text.TextUtils;
@@ -30,6 +31,7 @@
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.bean.ModBusBean;
+import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
@@ -43,10 +45,13 @@
import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
import com.hdl.photovoltaic.ui.bean.Geolocation;
import com.hdl.photovoltaic.ui.bean.LinkBean;
+import com.hdl.photovoltaic.ui.bean.MemberBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
+import com.hdl.photovoltaic.ui.bean.StaffBean;
import com.hdl.photovoltaic.ui.bean.UnCountBean;
+import com.hdl.photovoltaic.ui.bean.UserRightTypeBean;
import com.hdl.photovoltaic.ui.me.AsRegardsActivity;
-import com.hdl.photovoltaic.ui.me.PersonalDataActivity;
+import com.hdl.photovoltaic.ui.me.CPersonalDataActivity;
import com.hdl.photovoltaic.ui.me.SetActivity;
import com.hdl.photovoltaic.ui.newC.MessageCenterList;
import com.hdl.photovoltaic.ui.newC.PowerStationsListEdit;
@@ -152,7 +157,7 @@
jsonObject.addProperty("user_name", UserConfigManage.getInstance().getUserName());
jsonObject.addProperty("user_image_url", UserConfigManage.getInstance().getUserImageUrl());
jsonObject.addProperty("user_account", UserConfigManage.getInstance().getAccount());
- uniCallbackData(mode_type, jsonObject, callback);
+ uniSuccessCallback(mode_type, jsonObject, callback);
}
break;
}
@@ -197,7 +202,7 @@
}
if (callback != null) {
- uniCallbackData(type, null, callback);
+ uniSuccessCallback(type, null, callback);
}
} else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(topic)) {
//璁惧妯″潡
@@ -282,7 +287,11 @@
this.setInverterDeviceRemoteInfo(mode_type, data, callback);
}
break;
-
+ //璁惧鍚嶇О淇敼(淇敼鏄簯绔痮id鍚嶇О锛岃澶囦娇鐢╩odbus鍗忚淇敼)
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_EDIT_NAME: {
+ this.uniOidEditName(mode_type, data, callback);
+ }
+ break;
}
} else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(topic)) {
@@ -292,14 +301,14 @@
//鑾峰彇鎵嬫満wifi鍒楄〃
case HDLUniMP.UNI_EVENT_REPLY_PHONE_WIFI_LIST: {
if (callback != null) {
- uniCallbackData(mode_type, wifiUtils.getScanResult(), callback);
+ uniSuccessCallback(mode_type, wifiUtils.getScanResult(), callback);
}
}
break;
//鑾峰彇鎵嬫満褰撳墠wifi璇︽儏
case HDLUniMP.UNI_EVENT_REPLY_PHONE_WIFI_INFO: {
if (callback != null) {
- uniCallbackData(mode_type, wifiUtils.getCurrentConnectWifiInfo(), callback);
+ uniSuccessCallback(mode_type, wifiUtils.getCurrentConnectWifiInfo(), callback);
}
}
break;
@@ -428,7 +437,7 @@
case HDLUniMP.UNI_EVENT_REPLY_MINE_EDIT_USER_INFO: {
Intent intent = new Intent();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- intent.setClass(HDLApp.getInstance(), PersonalDataActivity.class);
+ intent.setClass(HDLApp.getInstance(), CPersonalDataActivity.class);
HDLApp.getInstance().startActivity(intent);
}
break;
@@ -465,6 +474,58 @@
}
break;
+ //鎴愬憳鍒楄〃
+ case HDLUniMP.UNI_EVENT_REPLY_MEMBER_LIST: {
+ uniGetMemberList(type, data, callback);
+ }
+ break;
+ //鎴愬憳娣诲姞
+ case HDLUniMP.UNI_EVENT_REPLY_MEMBER_ADD: {
+ uniGetMemberAdd(type, data, callback);
+ }
+ break;
+ //鎴愬憳鍒犻櫎
+ case HDLUniMP.UNI_EVENT_REPLY_MEMBER_DELETE: {
+ uniGetMemberDelete(type, data, callback);
+ }
+ break;
+ //鎴愬憳缂栬緫
+ case HDLUniMP.UNI_EVENT_REPLY_MEMBER_EDIT: {
+ uniGetMemberEdit(type, data, callback);
+
+ }
+ break;
+ //鑾峰彇鍛樺伐鍒楄〃
+ case HDLUniMP.UNI_EVENT_REPLY_STAFF_LIST: {
+ uniGetStaffList(type, data, callback);
+
+ }
+ break;
+ //鍛樺伐娣诲姞
+ case HDLUniMP.UNI_EVENT_REPLY_STAFF_ADD: {
+ uniGetStaffAdd(type, data, callback);
+
+ }
+ break;
+ //鍛樺伐鍒犻櫎
+ case HDLUniMP.UNI_EVENT_REPLY_STAFF_DELETE: {
+
+ uniGetStaffDelete(type, data, callback);
+
+ }
+ break;
+ //鍛樺伐缂栬緫
+ case HDLUniMP.UNI_EVENT_REPLY_STAFF_EDIT: {
+ uniGetStaffEdit(type, data, callback);
+
+ }
+ break;
+ //鑾峰彇褰撳墠璐﹀彿鍦ㄥ叕鍙哥殑韬唤
+ case HDLUniMP.UNI_EVENT_REPLY_USERRIGHTTYPe: {
+ uniGetUserRightType(type, data, callback);
+
+ }
+ break;
}
@@ -473,12 +534,12 @@
switch (type) {
//鑾峰彇娓╁害鍗曚綅
case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNIT: {
- uniCallbackData(mode_type, UserConfigManage.getInstance().getTemperature_unit(), callback);
+ uniSuccessCallback(mode_type, UserConfigManage.getInstance().getTemperature_unit(), callback);
}
break;
//鑾峰彇褰撳墠app璇█
case HDLUniMP.UNI_EVENT_REPLY_OTHER_APP_LANGUAGE: {
- uniCallbackData(mode_type, UserConfigManage.getInstance().getCurrentAppLanguage(), callback);
+ uniSuccessCallback(mode_type, UserConfigManage.getInstance().getCurrentAppLanguage(), callback);
}
break;
//鑾峰彇浣嶇疆淇℃伅
@@ -489,7 +550,7 @@
//搴旂敤鍐茬獊
case HDLUniMP.UNI_EVENT_REPLY_OTHER_APPLICATION_CONFLICT: {
if (callback != null) {
- uniCallbackData(type, HDLUdpConnect.getInstance().isBindSuccess(), callback);
+ uniSuccessCallback(type, HDLUdpConnect.getInstance().isBindSuccess(), callback);
}
}
break;
@@ -534,6 +595,12 @@
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);
+ }
+
/**
* 鍘熺敓銆愪富鍔ㄣ�戝悜灏忕▼搴忓彂閫侀�氱煡浜嬩欢
* 娉ㄦ剰锛氶渶瑕佹彁鍓嶅皬绋嬪簭鍦ㄨ繍琛屾墠鍙垚鍔�
@@ -559,6 +626,209 @@
//region ******uni鎺ュ彛鏂规硶******
+ /**
+ * 鑾峰彇褰撳墠璐﹀彿鍦ㄥ叕鍙哥殑韬唤
+ */
+ private void uniGetUserRightType(String type, Object data, DCUniMPJSCallback callback) {
+ HdlMemberLogic.getInstance().getUserRightType(new CloudCallBeak<UserRightTypeBean>() {
+ @Override
+ public void onSuccess(UserRightTypeBean userRightTypeBean) {
+ uniSuccessCallback(type, userRightTypeBean, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniExceptionCallback(type, e, callback);
+ }
+ });
+ }
+
+ /**
+ * 鍛樺伐缂栬緫
+ */
+ private void uniGetStaffEdit(String type, Object data, DCUniMPJSCallback callback) {
+ StaffBean staffBean = new StaffBean();
+ String member_info = getKeyValue("staff_info", getKeyValue("data", data));
+ if (!TextUtils.isEmpty(member_info)) {
+ try {
+ staffBean = new Gson().fromJson(member_info, StaffBean.class);
+ } catch (Exception ignored) {
+ }
+ }
+ HdlMemberLogic.getInstance().getStaffEdit(staffBean, 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 uniGetStaffDelete(String type, Object data, DCUniMPJSCallback callback) {
+ StaffBean staffBean = new StaffBean();
+ String member_info = getKeyValue("staff_info", getKeyValue("data", data));
+ if (!TextUtils.isEmpty(member_info)) {
+ try {
+ staffBean = new Gson().fromJson(member_info, StaffBean.class);
+ } catch (Exception ignored) {
+ }
+ }
+ HdlMemberLogic.getInstance().getStaffDelete(staffBean, 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 uniGetStaffAdd(String type, Object data, DCUniMPJSCallback callback) {
+ StaffBean staffBean = new StaffBean();
+ String member_info = getKeyValue("staff_info", getKeyValue("data", data));
+ if (!TextUtils.isEmpty(member_info)) {
+ try {
+ staffBean = new Gson().fromJson(member_info, StaffBean.class);
+ } catch (Exception ignored) {
+ }
+ }
+ HdlMemberLogic.getInstance().getStaffAdd(staffBean, 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 uniGetStaffList(String type, Object data, DCUniMPJSCallback callback) {
+ HdlMemberLogic.getInstance().getStaffList(1, 50, new CloudCallBeak<PageNumberObject<List<StaffBean>>>() {
+ @Override
+ public void onSuccess(PageNumberObject<List<StaffBean>> obj) {
+ uniSuccessCallback(type, obj.getList(), callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniExceptionCallback(type, e, callback);
+ }
+ });
+ }
+
+ /**
+ * 鎴愬憳缂栬緫
+ */
+ private void uniGetMemberEdit(String type, Object data, DCUniMPJSCallback callback) {
+ MemberBean memberBean = new MemberBean();
+ String member_info = getKeyValue("member_info", getKeyValue("data", data));
+ if (!TextUtils.isEmpty(member_info)) {
+ try {
+ memberBean = new Gson().fromJson(member_info, MemberBean.class);
+ } catch (Exception ignored) {
+ }
+ }
+ HdlMemberLogic.getInstance().getMemberEdit(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 uniGetMemberDelete(String type, Object data, DCUniMPJSCallback callback) {
+ MemberBean memberBean = new MemberBean();
+ String member_info = getKeyValue("member_info", getKeyValue("data", data));
+ if (!TextUtils.isEmpty(member_info)) {
+ try {
+ memberBean = new Gson().fromJson(member_info, MemberBean.class);
+ } catch (Exception ignored) {
+ }
+ }
+ HdlMemberLogic.getInstance().getMemberDelete(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 uniGetMemberAdd(String type, Object data, DCUniMPJSCallback callback) {
+ MemberBean memberBean = new MemberBean();
+ String member_info = getKeyValue("member_info", getKeyValue("data", data));
+ if (!TextUtils.isEmpty(member_info)) {
+ try {
+ memberBean = new Gson().fromJson(member_info, MemberBean.class);
+ } catch (Exception ignored) {
+ }
+ }
+ 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 uniGetMemberList(String type, Object data, DCUniMPJSCallback callback) {
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
+ MemberBean memberBean = new MemberBean();
+ memberBean.setHomeId(homeId);
+ HdlMemberLogic.getInstance().getMemberList(memberBean, new CloudCallBeak<List<MemberBean>>() {
+ @Override
+ public void onSuccess(List<MemberBean> list) {
+ uniSuccessCallback(type, list, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniExceptionCallback(type, e, callback);
+ }
+ });
+ }
/**
* 鑾峰彇鎴栬�呴厤缃�嗗彉鍣ㄧ綉缁滐紙鍖呮嫭閫嗗彉鍣ㄧ儹鐐癸紝wifi锛屼互澶綉锛変俊鎭�
@@ -581,7 +851,7 @@
@Override
public void onSuccess(String msg) {
if (callback != null) {
- uniCallbackData(type, msg, callback);
+ uniSuccessCallback(type, msg, callback);
}
}
@@ -610,7 +880,7 @@
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));
- uniCallbackData(type, geolocation, callback);
+ uniSuccessCallback(type, geolocation, callback);
return;
}
// 鍒ゆ柇璁惧鏄惁鏀寔瀹氫綅鍔熻兘
@@ -618,14 +888,14 @@
geolocation.setResult(-1);
geolocation.setDes(HDLApp.getInstance().getString(R.string.exception_the_location_function_is_not_enabled));
//todo 鎻愮ず鐢ㄦ埛鎵撳紑瀹氫綅鍔熻兘鎴栬�呭紩瀵肩敤鎴峰幓绯荤粺璁剧疆椤甸潰鎵撳紑瀹氫綅鍔熻兘
- uniCallbackData(type, geolocation, callback);
+ uniSuccessCallback(type, geolocation, callback);
return;
}
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));
- uniCallbackData(type, geolocation, callback);
+ uniSuccessCallback(type, geolocation, callback);
return;
}
geolocation.setResult(0);
@@ -636,12 +906,12 @@
double lon = longitude.setScale(6, RoundingMode.HALF_DOWN).doubleValue();
geolocation.setLatitude(lat);//缁忓害
geolocation.setLongitude(lon);//绾害
- uniCallbackData(type, geolocation, callback);
+ uniSuccessCallback(type, geolocation, callback);
} catch (Exception e) {
Geolocation geolocation = new Geolocation();
geolocation.setResult(-4);
geolocation.setDes(e.getMessage());
- uniCallbackData(type, geolocation, callback);
+ uniSuccessCallback(type, geolocation, callback);
}
}
@@ -655,7 +925,7 @@
HdlOtaLogic.getInstance().getCloudOidList(new CloudCallBeak<List<DeviceOidInfoBean>>() {
@Override
public void onSuccess(List<DeviceOidInfoBean> obj) {
- uniCallbackData(type, obj, callback);
+ uniSuccessCallback(type, obj, callback);
}
@Override
@@ -674,7 +944,7 @@
HdlOtaLogic.getInstance().getCurrentDeviceFirmwares(deviceOidId, new CloudCallBeak<List<DeviceFirmwareBean>>() {
@Override
public void onSuccess(List<DeviceFirmwareBean> obj) {
- uniCallbackData(type, obj, callback);
+ uniSuccessCallback(type, obj, callback);
}
@Override
@@ -694,7 +964,7 @@
HdlOtaLogic.getInstance().getNewDeviceFirmwares(hardwareModel, osImageId, new CloudCallBeak<List<CloudDeviceFirmwaresBean>>() {
@Override
public void onSuccess(List<CloudDeviceFirmwaresBean> obj) {
- uniCallbackData(type, obj, callback);
+ uniSuccessCallback(type, obj, callback);
}
@Override
@@ -732,7 +1002,7 @@
}
}
if (callback != null) {
- this.uniCallbackData(type, list, callback);
+ this.uniSuccessCallback(type, list, callback);
}
} catch (Exception ignored) {
}
@@ -796,7 +1066,7 @@
String module = "FW#" + imageId;//妯″潡淇℃伅(HW锛氱‖浠�)
//鍗囩骇鏈湴浼樺厛->浜戠鍗囩骇
- HdlDeviceLogic.getInstance().isLocalConnect(deviceMac, new CloudCallBeak<Boolean>() {
+ HdlDeviceLogic.getInstance().isLocalConnect(homeId, deviceMac, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean b) {
if (b) {
@@ -856,7 +1126,7 @@
HdlOtaLogic.getInstance().upgradeDeviceFirmware(deviceOidId, firmwareVersionId, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
- uniCallbackData(type, obj, callback);
+ uniSuccessCallback(type, obj, callback);
}
@Override
@@ -895,7 +1165,7 @@
HdlOtaLogic.getInstance().upgradeDeviceFirmware(deviceOidId, firmwareVersionId, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
- uniCallbackData(type, obj, callback);
+ uniSuccessCallback(type, obj, callback);
}
@Override
@@ -925,7 +1195,7 @@
HdlOtaLogic.getInstance().getCurrentGatewayDrivers(deviceOid, new CloudCallBeak<List<GatewayDriverBean>>() {
@Override
public void onSuccess(List<GatewayDriverBean> obj) {
- uniCallbackData(type, obj, callback);
+ uniSuccessCallback(type, obj, callback);
}
@Override
@@ -945,7 +1215,7 @@
HdlOtaLogic.getInstance().getNewGatewayDrivers(driveCode, osImageId, new CloudCallBeak<CloudGatewayDriversBean>() {
@Override
public void onSuccess(CloudGatewayDriversBean obj) {
- uniCallbackData(type, obj, callback);
+ uniSuccessCallback(type, obj, callback);
}
@Override
@@ -981,10 +1251,10 @@
}
}
if (callback != null) {
- this.uniCallbackData(type, list, callback);
+ this.uniSuccessCallback(type, list, callback);
}
} catch (Exception exception) {
- this.uniCallbackData(type, new ArrayList<>(), callback);
+ this.uniSuccessCallback(type, new ArrayList<>(), callback);
}
}
@@ -1048,7 +1318,7 @@
String imageId = getKeyValue("imageId", getKeyValue("data", data));//鍥轰欢闀滃儚id
String module = driverCode + "#" + imageId;
//鍗囩骇鏈湴浼樺厛->浜戠鍗囩骇
- HdlDeviceLogic.getInstance().isLocalConnect(deviceMac, new CloudCallBeak<Boolean>() {
+ HdlDeviceLogic.getInstance().isLocalConnect(homeId, deviceMac, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean b) {
if (b) {
@@ -1108,7 +1378,7 @@
HdlOtaLogic.getInstance().upgradeGatewayDriver(deviceOid, driverVersionId, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
- uniCallbackData(type, obj, callback);
+ uniSuccessCallback(type, obj, callback);
}
@Override
@@ -1147,7 +1417,7 @@
HdlOtaLogic.getInstance().upgradeGatewayDriver(deviceOid, driverVersionId, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
- uniCallbackData(type, obj, callback);
+ uniSuccessCallback(type, obj, callback);
}
@Override
@@ -1258,19 +1528,19 @@
if (cUserInfo.getMemberHeadIcon().contains("http")) {
UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
//鏇存柊鐢ㄦ埛澶村儚
- uniCallbackData(type, cUserInfo, callback);
+ uniSuccessCallback(type, cUserInfo, callback);
} else {
HdlAccountLogic.getInstance().getImageKey_C(cUserInfo.getMemberHeadIcon(), new CloudCallBeak<String>() {
@Override
public void onSuccess(String url) {
cUserInfo.setMemberHeadIcon(url);
UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
- uniCallbackData(type, cUserInfo, callback);
+ uniSuccessCallback(type, cUserInfo, callback);
}
@Override
public void onFailure(HDLException e) {
- uniCallbackData(type, cUserInfo, callback);
+ uniSuccessCallback(type, cUserInfo, callback);
}
});
}
@@ -1295,7 +1565,7 @@
HdlAccountLogic.getInstance().getImageKey_C(imageKey, new CloudCallBeak<String>() {
@Override
public void onSuccess(String url) {
- uniCallbackData(type, url, callback);
+ uniSuccessCallback(type, url, callback);
}
@Override
@@ -1317,7 +1587,7 @@
HdlDeviceLogic.getInstance().clearInverterHomeId(mac, new LinkCallBack<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
- uniCallbackData(type, null, callback);
+ uniSuccessCallback(type, null, callback);
}
@Override
@@ -1338,7 +1608,7 @@
HdlMessageLogic.getInstance().getMessageUntreatedCount(homeId, new CloudCallBeak<UnCountBean>() {
@Override
public void onSuccess(UnCountBean data) {
- uniCallbackData(type, data, callback);
+ uniSuccessCallback(type, data, callback);
}
@Override
@@ -1377,7 +1647,7 @@
HdlDeviceLogic.getInstance().editGatewayTime(mac, date, time, timezone, new LinkCallBack<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
- uniCallbackData(type, true, callback);
+ uniSuccessCallback(type, true, callback);
}
@Override
@@ -1399,7 +1669,7 @@
@Override
public void onSuccess(DeviceTimeBean deviceTimeBean) {
if (callback != null) {
- uniCallbackData(type, deviceTimeBean, callback);
+ uniSuccessCallback(type, deviceTimeBean, callback);
}
}
@@ -1422,7 +1692,7 @@
@Override
public void onSuccess(List<OidBean> list) {
if (callback != null) {
- uniCallbackData(type, list, callback);
+ uniSuccessCallback(type, list, callback);
}
}
@@ -1459,7 +1729,7 @@
HdlDeviceLogic.getInstance().addInverterDeviceToCloud(homeId, mac, gatewayBean.getGatewayType(), gatewayBean.getSid(), gatewayBean.getOid(), gatewayBean.getDevice_name(), new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
- uniCallbackData(type, null, callback);
+ uniSuccessCallback(type, null, callback);
}
@Override
@@ -1493,7 +1763,7 @@
// com.alibaba.fastjson.JSONArray jsonArray = JSON.parseArray(data);
try {
String devices = getKeyValue("devices", getKeyValue("data", data));
- String homeId = UserConfigManage.getInstance().getHomeId(); //缁戝畾鎴愬姛涔嬪悗閫氱煡
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
Gson gson = new Gson();
Type typeOfT = new TypeToken<List<GatewayBean>>() {
}.getType();
@@ -1519,7 +1789,7 @@
HdlDeviceLogic.getInstance().addAllInverterDeviceToCloud(homeId, list, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
- uniCallbackData(type, null, callback);
+ uniSuccessCallback(type, null, callback);
}
@Override
@@ -1562,11 +1832,14 @@
*/
private void uniDelInverterDevice(String type, Object data, DCUniMPJSCallback callback) {
String deviceId = getKeyValue("deviceId", getKeyValue("data", data));
- String homeId = UserConfigManage.getInstance().getHomeId();
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
+ if (TextUtils.isEmpty(homeId)) {
+ homeId = UserConfigManage.getInstance().getHomeId();
+ }
HdlDeviceLogic.getInstance().delInverterDevice(homeId, deviceId, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
- uniCallbackData(type, null, callback);
+ uniSuccessCallback(type, null, callback);
}
@Override
@@ -1588,7 +1861,7 @@
HdlDeviceLogic.getInstance().searchAllNetworkGateway(new GatewayCallBack() {
@Override
public void onSuccess(List<GatewayBean> gatewayBeanList) {
- uniCallbackData(type, gatewayBeanList, callback);
+ uniSuccessCallback(type, gatewayBeanList, callback);
}
@Override
@@ -1613,12 +1886,12 @@
public void onSuccess(List<GatewayBean> list) {
if (list == null || list.size() == 0) {
if (callback != null) {
- uniCallbackData(type, list, callback);
+ uniSuccessCallback(type, list, callback);
}
return;
}
if (callback != null) {
- uniCallbackData(type, list, callback);
+ uniSuccessCallback(type, list, callback);
}
//EventBus浜嬩欢鍒嗗彂,杩涘叆浣忓畢寮�濮嬭闃呬富棰�
BaseEventBus baseEventBus = new BaseEventBus();
@@ -1661,7 +1934,7 @@
TcpClient.getInstance().sendDataToLinkGateway(mac, TopicApi.PROPERTY_DOWN, jay, "", new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
- uniCallbackData(type, msg, callback);
+ uniSuccessCallback(type, msg, callback);
}
@Override
@@ -1699,7 +1972,7 @@
Type typeOfT = new TypeToken<BaseLocalResponse<List<LinkBean>>>() {
}.getType();
BaseLocalResponse<List<LinkBean>> baseLocalResponse = gson.fromJson(msg, typeOfT);
- uniCallbackData(type, baseLocalResponse, callback);
+ uniSuccessCallback(type, baseLocalResponse, callback);
} catch (Exception e) {
uniCallbackData(type, msg, -2, "", callback);
}
@@ -1757,7 +2030,7 @@
// logMessage("tcp鍥炲鏁版嵁", 0, strings[0] + "\r\n" + json.toString());
if (topic.endsWith("wifi/set_reply") || topic.endsWith("wifi/result/notify")) {
if (callback != null) {
- uniCallbackData(type, json, callback);
+ uniSuccessCallback(type, json, callback);
}
if (json.has("mac")) { //鍥炲鎴愬姛鍐嶆嬁璁惧mac
// this.device_mac = json.getString("mac");
@@ -1800,7 +2073,7 @@
HdlDeviceLogic.getInstance().initializeInverter(mac, new LinkCallBack<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
- uniCallbackData(type, obj, callback);
+ uniSuccessCallback(type, obj, callback);
}
@Override
@@ -1847,7 +2120,32 @@
HdlDeviceLogic.getInstance().setDeviceRemoteInfo(newList, homeId, new CloudCallBeak<List<GatewayBean>>() {
@Override
public void onSuccess(List<GatewayBean> obj) {
- uniCallbackData(type, obj, callback);
+ uniSuccessCallback(type, obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
+
+ /**
+ * 淇敼璁惧鍚嶇О閫嗗彉鍣˙MS鐢垫睜鍖�
+ *
+ * @param type 璐﹀彿
+ * @param data uni璇锋眰鏁版嵁
+ * @param callback uni鍥炶皟
+ */
+ public void uniOidEditName(String type, Object data, DCUniMPJSCallback callback) {
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
+ String deviceType = getKeyValue("deviceType", getKeyValue("data", data));
+ String deviceId = getKeyValue("deviceId", getKeyValue("data", data));
+ String name = getKeyValue("name", getKeyValue("data", data));
+ HdlDeviceLogic.getInstance().setRename(homeId, deviceType, deviceId, name, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ uniSuccessCallback(type, obj, callback);
}
@Override
@@ -1897,7 +2195,7 @@
HDLModBusConnect.getInstance().Send(modBusBean.getMac(), modBusBean.getData(), new ModbusCallBack() {
@Override
public void onSuccess(int[] data) {
- uniCallbackData(type, data, callback);
+ uniSuccessCallback(type, data, callback);
// HdlLogLogic.print("uni---鎺ユ敹---ModBus---" + Arrays.toString(data), true);
}
@@ -1946,6 +2244,13 @@
return new JSONObject();
}
+ private void uniSuccessCallback(String type, Object obj, DCUniMPJSCallback callback) {
+ uniCallbackData(type, obj, HDLLinkCode.HDL_SUCCESS.getCode(), HDLLinkCode.HDL_SUCCESS.getMsg(), callback);
+ }
+
+ private void uniExceptionCallback(String type, HDLException hdlException, DCUniMPJSCallback callback) {
+ uniCallbackData(type, null, hdlException.getCode(), hdlException.getMsg(), callback);
+ }
/**
* 缁勮uni鍙戦�佹暟鎹牸寮�
@@ -1975,9 +2280,6 @@
}
- private void uniCallbackData(String type, Object obj, DCUniMPJSCallback callback) {
- uniCallbackData(type, obj, HDLLinkCode.HDL_SUCCESS.getCode(), HDLLinkCode.HDL_SUCCESS.getMsg(), callback);
- }
/**
* 褰撳墠瀵硅薄杞� JSONObject
--
Gitblit v1.8.0