app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -54,6 +54,7 @@ import com.hdl.photovoltaic.ui.bean.HouseIdBean; import com.hdl.photovoltaic.ui.bean.LinkBean; import com.hdl.photovoltaic.ui.bean.MemberBean; import com.hdl.photovoltaic.ui.bean.MessageBean; import com.hdl.photovoltaic.ui.bean.NotRunBean; import com.hdl.photovoltaic.ui.bean.OidBean; import com.hdl.photovoltaic.ui.bean.QrcodeUrlBean; @@ -63,6 +64,7 @@ import com.hdl.photovoltaic.ui.me.AsRegardsActivity; import com.hdl.photovoltaic.ui.me.CPersonalDataActivity; import com.hdl.photovoltaic.ui.me.SetActivity; import com.hdl.photovoltaic.ui.message.MessageInfoActivity; import com.hdl.photovoltaic.ui.newC.MessageCenterListActivity; import com.hdl.photovoltaic.ui.newC.PowerStationsListActivity; import com.hdl.photovoltaic.uni.HDLUniMP; @@ -674,6 +676,21 @@ } 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; } @@ -824,7 +841,8 @@ break; //设备定位 case HDLUniMP.UNI_EVENT_REPLY_OTHER_GET_DEVICE_LOCATION: { this.uniGetDeviceFind(mode_type, data, TopicApi.DELETING_GATEWAY_FIND, callback);; this.uniGetDeviceFind(mode_type, data, TopicApi.DELETING_GATEWAY_FIND, callback); ; } break; } app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -614,7 +614,7 @@ if (topicArray.length < 2) { return; } final String HomeId = topicArray[1]; final String HomeId = topicArray[2]; HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean(); uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_home_delivery_rollback); uniCallBackBaseBean.setData(HomeId); app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -259,15 +259,16 @@ UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(0); List<HouseIdBean> HouseIdList = HdlResidenceLogic.getInstance().getHouseIdList(); if (HouseIdList.isEmpty()) { if (TextUtils.isEmpty(UserConfigManage.getInstance().getHomeId())) { String path = HDLUniMP.UNI_EVENT_OPEN_HOME_Null_C; HdlUniLogic.getInstance().openUniMP(path, null); } else { //1，解决手机没有外网，获取不到电站列表，自动登录进来，默认传上一次的住宅id； //2，之前电站列表只有一个电站，然后删除掉电站，这时住宅id还缓存着，再一次进来，默认传上一次的住宅id； String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS_C + "?homeId=" + UserConfigManage.getInstance().getHomeId() + "&homeName=" + UserConfigManage.getInstance().getHomeName(); HdlUniLogic.getInstance().openUniMP(path, null); } // if (TextUtils.isEmpty(UserConfigManage.getInstance().getHomeId())) { String path = HDLUniMP.UNI_EVENT_OPEN_HOME_Null_C; HdlUniLogic.getInstance().openUniMP(path, null); // } else { // //暂时不考虑这种情况 // //1，解决手机没有外网，获取不到电站列表，自动登录进来，默认传上一次的住宅id； // //2，之前电站列表只有一个电站，然后删除掉电站，这时住宅id还缓存着，再一次进来，默认传上一次的住宅id； // String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS_C + "?homeId=" + UserConfigManage.getInstance().getHomeId() + "&homeName=" + UserConfigManage.getInstance().getHomeName(); // HdlUniLogic.getInstance().openUniMP(path, null); // } } else { int select_home = 0; @@ -509,7 +510,7 @@ if (topicArray.length < 2) { return; } final String HomeId = topicArray[1]; final String HomeId = topicArray[2]; //先删除电站 HdlResidenceLogic.getInstance().delHouseId(HomeId); List<HouseIdBean> localHouseIdList = HdlResidenceLogic.getInstance().getHouseIdList(); @@ -520,6 +521,8 @@ uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS); uniCallBackBaseBean.setData(jsonObject); HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean); UserConfigManage.getInstance().setHomeId(""); UserConfigManage.getInstance().Save(); } else { if (HomeId.equals(UserConfigManage.getInstance().getHomeId()) || TextUtils.isEmpty(UserConfigManage.getInstance().getHomeId())) { HouseIdBean houseIdBean = localHouseIdList.get(0); @@ -534,7 +537,9 @@ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean); } } } catch (Exception e) { HdlLogLogic.print("回滚异常", false); } if (AppManagerUtils.getAppManager().existsTopActivity(PowerStationsListActivity.class, PowerStationsMoveActivity.class)) { //存在栈里再通知更新 app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java
@@ -13,7 +13,7 @@ private String homeId;//电站id private String homeName;//电站名称 private String status;//UNTREATED:未处理，PROCESSED:已处理 private Long createTime;//消息时间(报警时间) private Long createTime=0L;//消息时间(报警时间) private String deviceOidId;//设备oid id private String deviceOid;//设备oid app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
@@ -273,48 +273,48 @@ viewBinding.messageInfoPowerStationLocationIn.leftTitleTv.setText(R.string.message_alarm_detailspower_station_location); viewBinding.messageInfoAlarmTimeIn.leftTitleTv.setText(R.string.event_time); viewBinding.messageInfoAlarmTreatmentOptionsIn.leftTitleTv.setText(R.string.treatment_options); viewBinding.messageInfoHomeNameTv.setText(mMessageBean.getHomeName()); viewBinding.messageInfoEventTitleIn.rightContentTv.setText(mMessageBean.getTitle()); viewBinding.messageInfoEventContentIn.rightContentTv.setText(mMessageBean.getDescription()); viewBinding.messageInfoRemarkIn.rightContentTv.setText(mMessageBean.getRemark()); viewBinding.messageInfoAlarmDeviceIn.rightContentTv.setText(mMessageBean.getDeviceDesc()); viewBinding.messageInfoPowerStationLocationIn.rightContentTv.setText(mMessageBean.getLocationAddress()); String date = TimeUtils.getTimeFromTimestamp(mMessageBean.getCreateTime()); viewBinding.messageInfoAlarmTimeIn.rightContentTv.setText(date); viewBinding.messageInfoAlarmTreatmentOptionsIn.rightContentTv.setText(mMessageBean.getPlan()); stateStyle(viewBinding.messageInfoAlarmStateTv); try { viewBinding.messageInfoHomeNameTv.setText(mMessageBean.getHomeName()); viewBinding.messageInfoEventTitleIn.rightContentTv.setText(mMessageBean.getTitle()); viewBinding.messageInfoEventContentIn.rightContentTv.setText(mMessageBean.getDescription()); viewBinding.messageInfoRemarkIn.rightContentTv.setText(mMessageBean.getRemark()); viewBinding.messageInfoAlarmDeviceIn.rightContentTv.setText(mMessageBean.getDeviceDesc()); viewBinding.messageInfoPowerStationLocationIn.rightContentTv.setText(mMessageBean.getLocationAddress()); String date = TimeUtils.getTimeFromTimestamp(mMessageBean.getCreateTime()); viewBinding.messageInfoAlarmTimeIn.rightContentTv.setText(date); viewBinding.messageInfoAlarmTreatmentOptionsIn.rightContentTv.setText(mMessageBean.getPlan()); stateStyle(viewBinding.messageInfoAlarmStateTv); if (mMessageBean.getStatus().equals(MessageStateType.untreated) && mMessageBean.getType().equals(MessageAlarmStateType.fault)) { //发生中的消息且是故障才要显示 viewBinding.messageInfoWorkOut.setVisibility(View.VISIBLE); } if (mMessageBean.getStatus().equals(MessageStateType.untreated) && mMessageBean.getType().equals(MessageAlarmStateType.fault)) { //发生中的消息且是故障才要显示 viewBinding.messageInfoWorkOut.setVisibility(View.VISIBLE); } if (UserConfigManage.getInstance().isBAccount()) { viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.VISIBLE); } else { viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE); } if (UserConfigManage.getInstance().isBAccount()) { viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.VISIBLE); } else { viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE); } if (TextUtils.isEmpty(mMessageBean.getTitle())) { viewBinding.messageInfoEventTitleIn.getRoot().setVisibility(View.GONE); } if (TextUtils.isEmpty(mMessageBean.getDescription())) { viewBinding.messageInfoEventContentIn.getRoot().setVisibility(View.GONE); } if (TextUtils.isEmpty(mMessageBean.getRemark())) { viewBinding.messageInfoRemarkIn.getRoot().setVisibility(View.GONE); } if (TextUtils.isEmpty(mMessageBean.getDeviceDesc())) { viewBinding.messageInfoAlarmDeviceIn.getRoot().setVisibility(View.GONE); } if (TextUtils.isEmpty(mMessageBean.getLocationAddress())) { viewBinding.messageInfoPowerStationLocationIn.getRoot().setVisibility(View.GONE); } if (TextUtils.isEmpty(mMessageBean.getPlan())) { viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE); } if (TextUtils.isEmpty(mMessageBean.getTitle())) { viewBinding.messageInfoEventTitleIn.getRoot().setVisibility(View.GONE); } if (TextUtils.isEmpty(mMessageBean.getDescription())) { viewBinding.messageInfoEventContentIn.getRoot().setVisibility(View.GONE); } if (TextUtils.isEmpty(mMessageBean.getRemark())) { viewBinding.messageInfoRemarkIn.getRoot().setVisibility(View.GONE); } if (TextUtils.isEmpty(mMessageBean.getDeviceDesc())) { viewBinding.messageInfoAlarmDeviceIn.getRoot().setVisibility(View.GONE); } if (TextUtils.isEmpty(mMessageBean.getLocationAddress())) { viewBinding.messageInfoPowerStationLocationIn.getRoot().setVisibility(View.GONE); } if (TextUtils.isEmpty(mMessageBean.getPlan())) { viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE); } // // if (!TextUtils.isEmpty(mMessageBean.getPlan())) { // viewBinding.messageInfoAlarmTreatmentOptionsIn.lineV.setVisibility(View.GONE); @@ -331,6 +331,8 @@ // } else if (!TextUtils.isEmpty(mMessageBean.getTitle())) { // viewBinding.messageInfoEventTitleIn.lineV.setVisibility(View.GONE); // } } catch (Exception e) { } }
@@ -283,21 +283,19 @@ hideLoading(); } if (list != null && !list.isEmpty()) { if (!comparableList(houseListBeanIDList, list)) { //更新缓存 HdlResidenceLogic.getInstance().setHouseIdList(list, true); if (houseListAdapter != null) { //重新获取列表数据 initData(); refreshDetails(""); //更新电站选中状态 setSelectState(); //更新列表数据 houseListAdapter.setList(houseListBeanIDList); } // if (!comparableList(houseListBeanIDList, list)) { //更新缓存 HdlResidenceLogic.getInstance().setHouseIdList(list, true); if (houseListAdapter != null) { //重新获取列表数据 initData(); refreshDetails(""); //更新电站选中状态 setSelectState(); //更新列表数据 houseListAdapter.setList(houseListBeanIDList); } // } } nullDataUpdateUi(list); } app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
@@ -358,20 +358,26 @@ }); } else { showLoading(getString(R.string.deleting_please_wait)); HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(houseIdBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() { @Override public void onSuccess(List<GatewayBean> list) { //发起删除电站指令 deleteResidence(position, houseIdBean, list); if (houseIdBean.getDebugType().equals(DebugType.NORMAL)) { //【常规方式】发起删除电站指令 HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(houseIdBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() { @Override public void onSuccess(List<GatewayBean> list) { //发起删除电站指令 deleteResidence(position, houseIdBean, list); } } @Override public void onFailure(HDLException e) { //发起删除电站指令 deleteResidence(position, houseIdBean, null); } }); @Override public void onFailure(HDLException e) { //发起删除电站指令 deleteResidence(position, houseIdBean, null); } }); } else { //【简易方式】发起删除电站指令 deleteResidence(position, houseIdBean, null); } } } }); app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -124,6 +124,8 @@ public final static String UNI_EVENT_REPLY_STAFF_EDIT = "staff_edit";//员工编辑 public final static String UNI_EVENT_REPLY_USERRIGHTTYP = "user_right_type";//获取当前账号在公司的身份 public final static String UNI_EVENT_REPLY_DOWNLOAD_MEMBER_AVATAR = "download_member_avatar";//下载成员（子账号）头像 public final static String UNI_EVENT_REPLY_Message_Center_Detail = "message_center_detail";//打开消息详情 /*********Wifi模块*********/
