From ac7e902dca62fe00f442094a751048a802d13f90 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 16 九月 2025 09:15:28 +0800
Subject: [PATCH] 2025年09月16日09:15:27
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 434 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 338 insertions(+), 96 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 e70f0e8..55928f7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -38,21 +38,23 @@
import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.enums.LogoutType;
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.TopicApi;
import com.hdl.photovoltaic.listener.CloudCallBeak;
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.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.MessageBean;
import com.hdl.photovoltaic.ui.bean.NotRunBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.ui.bean.QrcodeUrlBean;
@@ -61,12 +63,15 @@
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.newC.MessageCenterList;
-import com.hdl.photovoltaic.ui.newC.PowerStationsListEdit;
+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.NetworkUtils;
+import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.utils.WifiUtils;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
@@ -81,7 +86,6 @@
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
import org.greenrobot.eventbus.EventBus;
-import org.json.JSONArray;
import org.json.JSONObject;
@@ -148,7 +152,7 @@
String type = getKeyValue("type", data);//灏忕被
String logTag = getKeyValue("logTag", data);//鏍囪uni鎸囦护
String mode_type = "澶х被-" + topic + "---" + "灏忕被-" + type;//鐢ㄦ潵鎵撳嵃鐨�
- HdlLogLogic.print(logTag + ":" + "uni---鍙戦��---" + mode_type + "\r\n" + data, true);
+ HdlLogLogic.print(logTag + ":" + "uni---鍙戦��---" + mode_type + "---" + data, true);
if (HDLUniMP.UNI_EVENT_REPLY_USER_MODEL.equals(topic)) {
//鐢ㄦ埛妯″潡
switch (type) {
@@ -168,7 +172,7 @@
jsonObject.addProperty("user_name", UserConfigManage.getInstance().getUserName());
jsonObject.addProperty("user_image_url", UserConfigManage.getInstance().getUserImageUrl());
jsonObject.addProperty("user_account", UserConfigManage.getInstance().getAccount());
-
+ jsonObject.addProperty("appLanguage", UserConfigManage.getInstance().getCurrentAppLanguage());
jsonObject.addProperty("token", HDLLinkPMUser.getInstance().getAccessToken());
jsonObject.addProperty("refreshToken", HDLLinkPMUser.getInstance().getRefreshToken());
if (TextUtils.isEmpty(AppConfigManage.getUserRegionUrl())) {
@@ -178,7 +182,7 @@
jsonObject.addProperty("appKey", AppConfigManage.getAppKey());
jsonObject.addProperty("appSecret", AppConfigManage.getAppSecret());
uniSuccessCallback(mode_type, jsonObject, callback);
- HdlLogLogic.print("鑾峰彇鐢ㄦ埛鏈湴缂撳瓨淇℃伅---->>>" + jsonObject.toString());
+ HdlLogLogic.print("鑾峰彇鐢ㄦ埛鏈湴缂撳瓨淇℃伅----" + jsonObject.toString());
}
break;
}
@@ -206,8 +210,22 @@
break;
//鍒涘缓鐢电珯
case HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION: {
+ //uin鍒涘缓鐢电珯鎴愬姛鍚庨�氱煡
+// HdlResidenceLogic.getInstance().getResidenceIdList("","","","","","",1,50,null);
+ try {
+ String dataJsonStr = getKeyValue("data", data);
+ if (!TextUtils.isEmpty(dataJsonStr)) {
+ Gson gson = new Gson();
+ HouseIdBean houseIdBean = gson.fromJson(dataJsonStr, HouseIdBean.class);
+ HdlResidenceLogic.getInstance().switchHouse(houseIdBean, true);
+ }
+ HdlLogLogic.print("uin鍒涘缓鐢电珯鎴愬姛鍚庨�氱煡---" + dataJsonStr, true);
+ } catch (Exception e) {
+ HdlLogLogic.print("uin鍒涘缓鐢电珯鎴愬姛鍚庨�氱煡---" + e.getMessage(), true);
+ }
+
//EventBus浜嬩欢鍒嗗彂
- HdlCommonLogic.getInstance().postEventBus(HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL, HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION, getKeyValue("data", data));
+// HdlCommonLogic.getInstance().postEventBusSticky(HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL, HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION, getKeyValue("data", data));
if (callback != null) {
uniSuccessCallback(type, null, callback);
}
@@ -381,12 +399,32 @@
this.uniGetGatewayInfo(mode_type, data, callback);
}
break;
+ //鍒犻櫎BMS/鐢垫睜鍖�
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_del_oid: {
+ 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)) {
WifiUtils wifiUtils = WifiUtils.getInstance();
//wifi妯″潡
switch (type) {
+ //鑾峰彇浣嶇疆鏉冮檺
+ case HDLUniMP.UNI_EVENT_REPLY_AUTHORIZATION_GET: {
+ boolean isLocalAuthor = PermissionUtils.checkPermission(HDLApp.getInstance(), Manifest.permission.ACCESS_FINE_LOCATION);
+ if (callback != null) {
+ JsonObject jsonObject = new JsonObject();
+ jsonObject.addProperty("localAuthor", isLocalAuthor);
+ uniSuccessCallback(mode_type, jsonObject, callback);
+ }
+ }
+ break;
//鑾峰彇鎵嬫満wifi鍒楄〃
case HDLUniMP.UNI_EVENT_REPLY_PHONE_WIFI_LIST: {
if (callback != null) {
@@ -437,10 +475,7 @@
break;
//閫嗗彉鍣ㄤ互澶綉鑾峰彇
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ETHERNET_GET: {
- if (callback != null) {
- uniSuccessCallback(type, "", callback);
- }
- //uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_ETHERNET_GET, callback);
+ uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_ETHERNET_GET, callback);
}
break;
@@ -540,7 +575,7 @@
case HDLUniMP.UNI_EVENT_REPLY_MINE_SELECTED_POWERSTATION: {
Intent intent = new Intent();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- intent.setClass(HDLApp.getInstance(), PowerStationsListEdit.class);
+ intent.setClass(HDLApp.getInstance(), PowerStationsListActivity.class);
HDLApp.getInstance().startActivity(intent);
}
break;
@@ -550,7 +585,7 @@
String isShowFault = getKeyValue("isShowFault", getKeyValue("data", data));
Intent intent = new Intent();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- intent.setClass(HDLApp.getInstance(), MessageCenterList.class);
+ intent.setClass(HDLApp.getInstance(), MessageCenterListActivity.class);
if (!TextUtils.isEmpty(homeId)) {
intent.putExtra("homeId", homeId);
}
@@ -642,12 +677,36 @@
}
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;
}
} else if (HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL.equals(topic)) {
//鍏跺畠妯″潡
switch (type) {
+
//鑾峰彇娓╁害鍗曚綅
case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNIT: {
uniSuccessCallback(mode_type, UserConfigManage.getInstance().getTemperature_unit(), callback);
@@ -686,7 +745,9 @@
break;
//uni閫氱煡鍘熺敓閫�鍑虹櫥褰�
case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOGOUT: {
- HDLLinkPMUser.getInstance().logout(0);
+ HdlLogLogic.print("uni閫氱煡鍘熺敓閫�鍑虹櫥褰�---", true);
+// HDLLinkPMUser.getInstance().logout(0);
+ HdlAccountLogic.getInstance().logout(LogoutType.NormalLogout);
}
break;
//鏈湴瀵嗛挜鑾峰彇
@@ -724,19 +785,21 @@
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 url = getKeyValue("url", getKeyValue("data", data));
+ String fileName = getKeyValue("fileName", getKeyValue("data", data));//鍞竴鏍囪瘑
+ String deviceType = getKeyValue("deviceType", getKeyValue("data", data));//璁惧绫诲瀷
+ String deviceModel = getKeyValue("deviceModel", getKeyValue("data", data));//璁惧妯″瀷
String language = getKeyValue("language", getKeyValue("data", data));
- String json = HdlESLocalJsonLogic.getInstance().readHdlESLocalJson(url, deviceModel);
+ String json = HdlESLocalJsonLogic.getInstance().readHdlESLocalJson(fileName + ".json", deviceModel);
if (TextUtils.isEmpty(json)) {
//鏈湴娌℃湁缂撳瓨
- HdlESLocalJsonLogic.getInstance().getHdlESLocalJson(url, deviceModel, new CloudCallBeak<String>() {
+ HdlESLocalJsonLogic.getInstance().getHdlESLocalJson(fileName, deviceType, deviceModel, false, new CloudCallBeak<String>() {
@Override
public void onSuccess(String obj) {
// if (callback != null) {
// uniSuccessCallback(type, obj, callback);
// }
- String s = HdlESLocalJsonLogic.getInstance().readHdlESLocalJson(url, deviceModel);
+ String s = HdlESLocalJsonLogic.getInstance().readHdlESLocalJson(fileName, deviceModel);
//鏈湴缂撳瓨鏁版嵁
if (callback != null) {
try {
@@ -745,10 +808,10 @@
} else if (s.startsWith("[")) {
uniSuccessCallback(type, new Gson().fromJson(s, JsonArray.class), callback);
} else {
- uniSuccessCallback(type, s, callback);
+ uniSuccessCallback(type, new JsonArray(), callback);
}
} catch (Exception e) {
- uniSuccessCallback(type, s, callback);
+ uniSuccessCallback(type, new JsonArray(), callback);
}
}
}
@@ -769,10 +832,10 @@
} else if (json.startsWith("[")) {
uniSuccessCallback(type, new Gson().fromJson(json, JsonArray.class), callback);
} else {
- uniSuccessCallback(type, json, callback);
+ uniSuccessCallback(type, new JsonArray(), callback);
}
} catch (Exception e) {
- uniSuccessCallback(type, json, callback);
+ uniSuccessCallback(type, new JsonArray(), callback);
}
long endTime = System.currentTimeMillis() - startTime;
Log.d("====鑰楁椂鏃堕棿====", String.valueOf(endTime));
@@ -780,31 +843,101 @@
}
}
break;
+ //uni鑾峰彇鍥剧墖
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_GET_SELECTED_IMAGE: {
+
+ }
+ 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_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)) {
+ } else if (HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL.equals(topic)) {
+ //鏃犵綉妯″紡
+ switch (type) {
+ case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_EXIT: {
+ //閫�鍑烘棤缃戞ā寮忔爣璇�
+ UserConfigManage.getInstance().setNoNetworkFlag(false);
+ UserConfigManage.getInstance().setAutomaticSkipNoNetworkFlag(false);
+ UserConfigManage.getInstance().Save();
+ uniSuccessCallback(mode_type, true, callback);
+ if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
+ HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
+ }
+ Intent intent = new Intent(HDLApp.getInstance(), LoginActivity.class);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+ HDLApp.getInstance().startActivity(intent);
+ }
+ break;
+ case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_FROM_OFFLINE: {
+ //璁惧绂荤綉鏃舵湁鍏ュ彛杩涘叆鏃犵綉妯″紡
+ uniSuccessCallback(mode_type, true, callback);
+ HdlAccountLogic.getInstance().logout(LogoutType.UniLogout);
+ }
+ break;
+ case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_DEVICE_INFO: {
try {
- jObject = new Gson().fromJson(body, JsonObject.class);
- } catch (Exception ignored) {
+ //杩涘叆鏃犵綉妯″紡閫嗗彉鍣ㄨ鎯呴〉锛岀紦瀛榤ac鍜屽瘑鐮�
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ String password = getKeyValue("password", getKeyValue("data", data));
+ UserConfigManage.getInstance().setNoNetworkDeviceMac(mac);
+ UserConfigManage.getInstance().setNoNetworkPassword(password);
+ UserConfigManage.getInstance().Save();
+ uniSuccessCallback(mode_type, true, callback);
+ } catch (Exception e) {
+ uniSuccessCallback(mode_type, e, callback);
}
}
- 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);
- }
- });
+ break;
+ case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_CLEAR_DEVICE_INFO: {
+ //鏃犵綉妯″紡閫嗗彉鍣ㄨ鎯呴〉锛屾竻闄ょ紦瀛榤ac鍜屽瘑鐮�
+ UserConfigManage.getInstance().setNoNetworkDeviceMac("");
+ UserConfigManage.getInstance().setNoNetworkPassword("");
+ UserConfigManage.getInstance().setNoNetworkFlag(false);
+ UserConfigManage.getInstance().Save();
+ uniSuccessCallback(mode_type, true, callback);
+ }
+ break;
}
+ } else if (HDLUniMP.UNI_EVENT_REPLY_UNI_SEND_TO_CLOUD.equals(topic)) {
+ //缃戠粶璇锋眰妯″潡
+ JsonObject jObject = new JsonObject();
+ String body = getKeyValue("data", data);
+ if (!TextUtils.isEmpty(body)) {
+ try {
+ jObject = new Gson().fromJson(body, JsonObject.class);
+ } catch (Exception e) {
+ uniSuccessCallback(mode_type, e, callback);
+ }
+ }
+ HttpClient.getInstance().requestHttp(type, jObject.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ //鏈湴缂撳瓨鏁版嵁
+ if (callback != null) {
+ try {
+ if (jsonStr.startsWith("{")) {
+ uniSuccessCallback(mode_type, new Gson().fromJson(jsonStr, JsonObject.class), callback);
+ } else if (jsonStr.startsWith("[")) {
+ uniSuccessCallback(mode_type, new Gson().fromJson(jsonStr, JsonArray.class), callback);
+ } else {
+ uniSuccessCallback(mode_type, jsonStr, callback);
+ }
+ } catch (Exception e) {
+ uniSuccessCallback(mode_type, jsonStr, callback);
+ }
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniExceptionCallback(mode_type, e, callback);
+ }
+ });
+
}
} catch (Exception e) {
@@ -869,6 +1002,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);
}
@@ -1294,11 +1468,20 @@
//瑙ｅ瘑璐熻浇鏁版嵁(鍐欏瘑閽ョ粰缃戝叧涓�瀹氭槸鏄庢枃锛屽洜涓洪偅鏃剁綉鍏宠繕娌℃湁瀵嗛挜)
TcpClient.getInstance().sendDataToLinkGateway(mac, false, TopicApi, jsonArray, "", new HDLLinkCallBack() {
@Override
- public void onSuccess(String msg) {
+ public void onSuccess(String s) {
if (callback != null) {
- uniSuccessCallback(type, msg, callback);
+ 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
@@ -1324,14 +1507,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;
@@ -1339,12 +1522,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();
@@ -1482,9 +1665,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);
}
}
});
@@ -1529,7 +1712,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);//缃戝叧鍥轰欢闇�瑕�
@@ -1544,14 +1727,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 {
@@ -1562,11 +1745,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);
+ 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;
}
//4:杩愯
@@ -1601,11 +1784,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);
+ 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;
}
//4:杩愯
@@ -1736,9 +1919,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);
}
}
});
@@ -1782,7 +1965,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);//缃戝叧椹卞姩闇�瑕�
@@ -1797,14 +1980,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 {
@@ -1815,11 +1998,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);
+ 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;
}
//4:杩愯
@@ -1854,11 +2037,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);
+ 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;
}
//4:杩愯
@@ -1891,7 +2074,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);
}
/**
@@ -1942,13 +2125,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 "";
@@ -1991,7 +2174,7 @@
UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
UserConfigManage.getInstance().Save();
- HdlLogLogic.print("澶村儚璺緞---->>>" + cUserInfo.getMemberHeadIcon());
+ HdlLogLogic.print("澶村儚璺緞----" + cUserInfo.getMemberHeadIcon());
}
@Override
@@ -2178,7 +2361,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;
}
@@ -2225,7 +2408,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;
}
//璁板綍鏉℃暟
@@ -2373,6 +2556,7 @@
*/
private void uniGetCurrentHomeLocalAndCloudGatewayList(String type, Object data, DCUniMPJSCallback callback) {
String homeId = getKeyValue("homeId", getKeyValue("data", data));
+// UserConfigManage.getInstance().setHomeId(homeId);
HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(homeId, new CloudCallBeak<List<GatewayBean>>() {
@Override
public void onSuccess(List<GatewayBean> list) {
@@ -2412,14 +2596,25 @@
}
List<GatewayBean> newList = new ArrayList<>();
List<GatewayBean> inverterList = new ArrayList<>();
+ List<GatewayBean> inverterUnactivatedList = 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));
+ GatewayBean gatewayBean = list.get(i);
+ if (gatewayBean == null) {
+ continue;
+ }
+ 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 {
+ lcList.add(gatewayBean);
+ }
} else {
- lcList.add(list.get(i));
+ inverterUnactivatedList.add(gatewayBean);
}
}
+ newList.addAll(inverterUnactivatedList);
newList.addAll(inverterList);
newList.addAll(lcList);
return newList;
@@ -2625,6 +2820,7 @@
inverterDeviceBean.setDeviceStatus(gatewayBean.getDeviceStatus());
inverterDeviceBean.setSpk(gatewayBean.getSpk());
inverterDeviceBean.setDeviceType(gatewayBean.getDeviceType());
+ inverterDeviceBean.setActivate(gatewayBean.isActivate());
newList.add(inverterDeviceBean);
}
}
@@ -2760,6 +2956,52 @@
});
}
+ /**
+ * 鍒犻櫎璁惧oid
+ *
+ * @param type 绫诲瀷
+ * @param data uni璇锋眰鏁版嵁
+ * @param callback uni鍥炶皟
+ */
+ public void uniDeleteOid(String type, Object data, DCUniMPJSCallback callback) {
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ String oid_json = getKeyValue("attribute_data", getKeyValue("data", data));
+ JsonArray jsonArray = new Gson().fromJson(oid_json, JsonArray.class);
+ HdlDeviceLogic.getInstance().deleteOid(mac, jsonArray, 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);
+ }
+ });
+ }
+
+ /**
+ * 璁惧娓呯┖杩愯鏁版嵁
+ *
+ * @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鍗忚鏁版嵁
@@ -2832,17 +3074,18 @@
if (data == null) {
data = new JSONObject();
}
- if (isTokenAndRefreshToken) {
- //灏忕▼搴忛偅閲屾湁鑷繁鐨勮姹傛柟娉�,浣嗛渶瑕佸師鐢熸彁渚涜繖浜涙暟鎹�
- data.put("token", HDLLinkPMUser.getInstance().getAccessToken());
- data.put("refreshToken", HDLLinkPMUser.getInstance().getRefreshToken());
- if (TextUtils.isEmpty(AppConfigManage.getUserRegionUrl())) {
- AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
- }
- data.put("serverAddress", AppConfigManage.getUserRegionUrl());
- data.put("appKey", AppConfigManage.getAppKey());
- data.put("appSecret", AppConfigManage.getAppSecret());
- }
+// if (isTokenAndRefreshToken) {
+// //灏忕▼搴忛偅閲屾湁鑷繁鐨勮姹傛柟娉�,浣嗛渶瑕佸師鐢熸彁渚涜繖浜涙暟鎹�
+// data.put("token", HDLLinkPMUser.getInstance().getAccessToken());
+// data.put("refreshToken", HDLLinkPMUser.getInstance().getRefreshToken());
+// if (TextUtils.isEmpty(AppConfigManage.getUserRegionUrl())) {
+// AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
+// }
+// data.put("serverAddress", AppConfigManage.getUserRegionUrl());
+// data.put("appKey", AppConfigManage.getAppKey());
+// data.put("appSecret", AppConfigManage.getAppSecret());
+// }
+ data.put("appLanguage", UserConfigManage.getInstance().getCurrentAppLanguage());
uniCallBackBaseBean.setData(data);
return getJSONObject(uniCallBackBaseBean);
} catch (Exception e) {
@@ -2877,8 +3120,7 @@
uniCallBackBaseBean.setData(obj);
if (callback != null) {
callback.invoke(getJSONObject(uniCallBackBaseBean));
-// callback.invoke(uniCallBackBaseBean);
- HdlLogLogic.print("鍥炲---uni---" + type + "---" + new Gson().toJson(uniCallBackBaseBean), true);
+ HdlLogLogic.print("鍥炲---uni---" + type + "---" + getJSONObject(uniCallBackBaseBean).toString(), true);
}
} catch (Exception e) {
HdlLogLogic.print("鍥炲---uni---" + type + "---" + e.getMessage(), true);
--
Gitblit v1.8.0