| app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/values-en/strings.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/values-zh/strings.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/values/strings.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -1329,6 +1329,20 @@ AtomicInteger atomicInteger = new AtomicInteger(0); for (int i = 0; i < list.size(); i++) { CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i); if (cloudInverterDeviceBean == null || !cloudInverterDeviceBean.isActivate()) { //未激活设备 atomicInteger.set(atomicInteger.get() + 1); //注意:这个逆变器只能本地控制(因为拿不到mqtt通讯秘钥以及GatewayID,无法远程控制) //更新逆变器本地缓存信息 refreshGatewayCacheData(false, cloudInverterDeviceBean, null, homeId); //到最后一条，才处理回调 if (atomicInteger.get() == list.size()) { if (cloudCallBeak != null) { cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list, false)); } } HdlLogLogic.print("设备未激活(mac:" + cloudInverterDeviceBean.getOsn() + "))", true); } //获取远程设备通讯信息(拿到网关ID，mqtt通讯秘钥) getDeviceRemoteInfo(homeId, cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() { @Override @@ -1831,6 +1845,7 @@ gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//设备型号 } gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//设备spk gatewayBean.setActivate(cloudInverterDeviceBean.isActivate());//是否激活设备(true：激活；false：未激活) } app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
@@ -49,6 +49,16 @@ private HouseInfoBean.Location location;//电站地址 private String localSecret;//所属电站的本地密钥 public boolean isActivate() { return activate; } public void setActivate(boolean activate) { this.activate = activate; } private boolean activate;//是否激活设备(true：激活；false：未激活) public String getWorkStatusDesc() { return workStatusDesc==null?"":this.workStatusDesc; } app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
@@ -112,6 +112,23 @@ viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE); } if (!TextUtils.isEmpty(mMessageBean.getPlan())) { viewBinding.messageInfoAlarmTreatmentOptionsIn.lineV.setVisibility(View.GONE); } else if (!TextUtils.isEmpty(mMessageBean.getCreateTime().toString())) { viewBinding.messageInfoAlarmTimeIn.lineV.setVisibility(View.GONE); } else if (!TextUtils.isEmpty(mMessageBean.getLocationAddress())) { viewBinding.messageInfoPowerStationLocationIn.lineV.setVisibility(View.GONE); } else if (!TextUtils.isEmpty(mMessageBean.getDeviceDesc())) { viewBinding.messageInfoAlarmDeviceIn.lineV.setVisibility(View.GONE); } else if (!TextUtils.isEmpty(mMessageBean.getRemark())) { viewBinding.messageInfoRemarkIn.lineV.setVisibility(View.GONE); } else if (!TextUtils.isEmpty(mMessageBean.getDescription())) { viewBinding.messageInfoEventContentIn.lineV.setVisibility(View.GONE); } else if (!TextUtils.isEmpty(mMessageBean.getTitle())) { viewBinding.messageInfoEventTitleIn.lineV.setVisibility(View.GONE); } if (mMessageBean.getStatus().equals(MessageStateType.processed)) { //已经解决掉的隐藏 viewBinding.messageInfoBackTv.setVisibility(View.GONE); @@ -283,6 +300,22 @@ if (TextUtils.isEmpty(mMessageBean.getPlan())) { viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE); } if (!TextUtils.isEmpty(mMessageBean.getPlan())) { viewBinding.messageInfoAlarmTreatmentOptionsIn.lineV.setVisibility(View.GONE); } else if (!TextUtils.isEmpty(mMessageBean.getCreateTime().toString())) { viewBinding.messageInfoAlarmTimeIn.lineV.setVisibility(View.GONE); } else if (!TextUtils.isEmpty(mMessageBean.getLocationAddress())) { viewBinding.messageInfoPowerStationLocationIn.lineV.setVisibility(View.GONE); } else if (!TextUtils.isEmpty(mMessageBean.getDeviceDesc())) { viewBinding.messageInfoAlarmDeviceIn.lineV.setVisibility(View.GONE); } else if (!TextUtils.isEmpty(mMessageBean.getRemark())) { viewBinding.messageInfoRemarkIn.lineV.setVisibility(View.GONE); } else if (!TextUtils.isEmpty(mMessageBean.getDescription())) { viewBinding.messageInfoEventContentIn.lineV.setVisibility(View.GONE); } else if (!TextUtils.isEmpty(mMessageBean.getTitle())) { viewBinding.messageInfoEventTitleIn.lineV.setVisibility(View.GONE); } }
@@ -228,6 +228,10 @@ searchDeviceAdapter.setOnclickListener(new DeviceInfoAdapter.OnClickListener() { @Override public void onClick(int position, CloudInverterDeviceBean deviceBean) { if (!deviceBean.isActivate()) { HdlThreadLogic.toast(_mActivity, getString(R.string.device_not_activated)); return; } if (deviceBean.getDeviceStatus() == 4) { HdlThreadLogic.toast(_mActivity, R.string.device_off); return; app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
@@ -435,6 +435,10 @@ deviceInfoAdapter.setOnclickListener(new DeviceInfoAdapter.OnClickListener() { @Override public void onClick(int position, CloudInverterDeviceBean deviceBean) { if (!deviceBean.isActivate()) { HdlThreadLogic.toast(_mActivity, getString(R.string.device_not_activated)); return; } // GatewayBean gatewayBean = new GatewayBean(); // gatewayBean.setCategorySecondName(deviceBean.getCategorySecondName()); // gatewayBean.setDevice_mac(deviceBean.getOsn()); app/src/main/res/values-en/strings.xml
@@ -374,4 +374,5 @@ <string name="remark">remark</string> <string name="treatment_options">Treatment options</string> <string name="debug_status_rollback">Should the commissioning status of the %s power station be rolled back to commissioning?</string> <string name="device_not_activated">The device is not activated</string> </resources> app/src/main/res/values-zh/strings.xml
@@ -370,4 +370,5 @@ <string name="remark">备注</string> <string name="treatment_options">处理方案</string>是否将电站的调试状态回退到调试中 <string name="debug_status_rollback">是否将%s电站的调试状态回退到调试中？</string> <string name="device_not_activated">设备未激活</string> </resources> app/src/main/res/values/strings.xml
@@ -376,6 +376,6 @@ <string name="remark">remark</string> <string name="treatment_options">Treatment options</string> <string name="debug_status_rollback">Should the commissioning status of the %s power station be rolled back to commissioning?</string> <string name="device_not_activated">The device is not activated</string> </resources> sdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java
@@ -113,8 +113,19 @@ private String deviceType; private String outputActivePower;//逆变器输出有功功率 public boolean isActivate() { return activate; } public void setActivate(boolean activate) { this.activate = activate; } private boolean activate;//是否激活设备(true：激活；false：未激活) public String getWorkStatusDesc() { return workStatusDesc==null?"":this.workStatusDesc; return workStatusDesc == null ? "" : this.workStatusDesc; } public void setWorkStatusDesc(String workStatusDesc) { @@ -135,6 +146,7 @@ public void setOgMaster(boolean ogMaster) { this.ogMaster = ogMaster; } public List<String> getUids() { return uids; }
