app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/drawable/selected.png | 补丁 | 查看 | 原始文档 | 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 | 历史 |
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -92,7 +92,7 @@ this.initMqttClient(); //上传极光注册ID到云端 this.pushTokens(); // //点击极光通知栏消息进来 //点击极光通知栏消息进来 this.clickJpushNotificationMessage(); //初始化权限 this.requestPermissions(); app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
@@ -108,9 +108,13 @@ houseListAdapter.setMoveOnclickListener(new HouseListAdapter.OnMoveClickListener() { @Override public void onMoveClick(int position, HouseIdBean houseIdBean) { if (position == 0) { HdlThreadLogic.toast(_mActivity, getString(R.string.already_the_first_one)); return; } String frontHomeId = ""; if (position > 0) { frontHomeId = houseListBeanIDList.get(position - 1).getHomeId(); if (position > 1) { frontHomeId = houseListBeanIDList.get(position - 2).getHomeId(); } HdlResidenceLogic.getInstance().moveResidence(houseIdBean.getHomeId(), frontHomeId, new CloudCallBeak<Boolean>() { @Override app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java
@@ -27,6 +27,7 @@ import com.hdl.photovoltaic.widget.DelayedConfirmationCancelDialog; import com.hdl.sdk.link.common.exception.HDLLinkException; import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus; import com.hdl.sdk.link.core.bean.gateway.GatewayBean; import org.greenrobot.eventbus.EventBus; @@ -100,11 +101,12 @@ @Override public void onMoveClick(int position, HouseIdBean houseIdBean) { if (position == 0) { HdlThreadLogic.toast(_mActivity, getString(R.string.already_the_first_one)); return; } String frontHomeId = ""; if (position > 1) { frontHomeId = houseListBeanIDList.get(position - 1).getHomeId(); frontHomeId = houseListBeanIDList.get(position - 2).getHomeId(); } HdlResidenceLogic.getInstance().moveResidence(houseIdBean.getHomeId(), frontHomeId, new CloudCallBeak<Boolean>() { @Override @@ -138,8 +140,20 @@ delayedConfirmationCancelDialog.setYesOnclickListener(new DelayedConfirmationCancelDialog.onYesOnclickListener() { @Override public void Confirm() { delayedConfirmationCancelDialog.dismiss(); delete(houseIdBean.getHomeId()); showLoading(getString(R.string.deleting_please_wait)); HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(houseIdBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() { @Override public void onSuccess(List<GatewayBean> list) { deleteResidence(houseIdBean.getHomeId(), delayedConfirmationCancelDialog); initializeInverter(list); } @Override public void onFailure(HDLException e) { deleteResidence(houseIdBean.getHomeId(), delayedConfirmationCancelDialog); } }); // //删除住宅 // HdlResidenceLogic.getInstance().delResidence(houseIdBean.getHomeId(), new CloudCallBeak<Boolean>() { // @Override @@ -185,38 +199,28 @@ /** * 删除电站,逆变器 * (先获取云端上逆变器列表,开始删除电站,同时,向逆变器发送初始化逆变器指令) * (开始删除电站,同时,向逆变器发送初始化逆变器指令,无须处理结果) * * @param homeId 电站id * @param list 设备列表 */ private void delete(String homeId) { HdlDeviceLogic.getInstance().getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() { @Override public void onSuccess(List<CloudInverterDeviceBean> list) { deleteResidence(homeId); if (list != null) { for (int i = 0; i < list.size(); i++) { CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i); HdlDeviceLogic.getInstance().initializeGateway(cloudInverterDeviceBean.getOsn(), new LinkCallBack<Boolean>() { @Override public void onSuccess(Boolean obj) { } @Override public void onError(HDLLinkException e) { } }); } private void initializeInverter(List<GatewayBean> list) { if (list == null || list.size() == 0) { return; } for (int i = 0; i < list.size(); i++) { GatewayBean gatewayBean = list.get(i); HdlDeviceLogic.getInstance().initializeGateway(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() { @Override public void onSuccess(Boolean obj) { // HdlLogLogic.print("初始化逆变器成功-->mac:" + cloudInverterDeviceBean.getOsn(),true); } } @Override public void onFailure(HDLException e) { deleteResidence(homeId); } }); @Override public void onError(HDLLinkException e) { // HdlLogLogic.print("初始化逆变器失败-->mac:" + cloudInverterDeviceBean.getOsn(),true); } }); } } /** @@ -224,11 +228,13 @@ * * @param homeId 电站id */ private void deleteResidence(String homeId) { private void deleteResidence(String homeId, DelayedConfirmationCancelDialog delayedConfirmationCancelDialog) { //删除住宅 HdlResidenceLogic.getInstance().delResidence(homeId, new CloudCallBeak<Boolean>() { @Override public void onSuccess(Boolean obj) { hideLoading(); delayedConfirmationCancelDialog.dismiss(); HdlResidenceLogic.getInstance().delHouseId(homeId); initData();//初始化缓存数据 houseListAdapter.setList(houseListBeanIDList);//重新刷新列表 @@ -237,6 +243,8 @@ @Override public void onFailure(HDLException e) { hideLoading(); delayedConfirmationCancelDialog.dismiss(); HdlThreadLogic.toast(_mActivity, e); } }); app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -38,6 +38,7 @@ import com.hdl.photovoltaic.widget.DelayedConfirmationCancelDialog; import com.hdl.sdk.link.common.exception.HDLLinkException; import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus; import com.hdl.sdk.link.core.bean.gateway.GatewayBean; import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient; import java.util.ArrayList; @@ -103,9 +104,13 @@ @Override public void onMoveClick(int position, HouseIdBean houseIdBean) { if (position == 0) { HdlThreadLogic.toast(_mActivity, getString(R.string.already_the_first_one)); return; } String frontHomeId = ""; if (position > 0) { frontHomeId = houseListBeanIDList.get(position - 1).getHomeId(); if (position > 1) { frontHomeId = houseListBeanIDList.get(position - 2).getHomeId(); } HdlResidenceLogic.getInstance().moveResidence(houseIdBean.getHomeId(), frontHomeId, new CloudCallBeak<Boolean>() { @Override @@ -128,6 +133,7 @@ @Override public void onDelClick(int position, HouseIdBean houseIdBean) { DelayedConfirmationCancelDialog delayedConfirmationCancelDialog = new DelayedConfirmationCancelDialog(_mActivity); delayedConfirmationCancelDialog.setTitleContent(getString(R.string.loading_title_tip)); String homeName = "\"" + houseIdBean.getHomeName() + "\""; @@ -137,8 +143,20 @@ delayedConfirmationCancelDialog.setYesOnclickListener(new DelayedConfirmationCancelDialog.onYesOnclickListener() { @Override public void Confirm() { delayedConfirmationCancelDialog.dismiss(); delete(houseIdBean.getHomeId()); showLoading(getString(R.string.deleting_please_wait)); HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(houseIdBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() { @Override public void onSuccess(List<GatewayBean> list) { deleteResidence(houseIdBean.getHomeId(), delayedConfirmationCancelDialog); initializeInverter(list); } @Override public void onFailure(HDLException e) { deleteResidence(houseIdBean.getHomeId(), delayedConfirmationCancelDialog); } }); // //删除住宅 // HdlResidenceLogic.getInstance().delResidence(houseIdBean.getHomeId(), new CloudCallBeak<Boolean>() { // @Override @@ -242,7 +260,6 @@ } } else if (HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE.equals(eventBus.getType())) { //uin关闭住宅详情界面通知 if (MqttRecvClient.getInstance() != null) { MqttRecvClient.getInstance().removeAllTopic(); @@ -378,38 +395,28 @@ /** * 删除电站,逆变器 * (先获取云端上逆变器列表,开始删除电站,同时,向逆变器发送初始化逆变器指令) * (开始删除电站,同时,向逆变器发送初始化逆变器指令,无须处理结果) * * @param homeId 电站id * @param list 设备列表 */ private void delete(String homeId) { HdlDeviceLogic.getInstance().getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() { @Override public void onSuccess(List<CloudInverterDeviceBean> list) { deleteResidence(homeId); if (list != null) { for (int i = 0; i < list.size(); i++) { CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i); HdlDeviceLogic.getInstance().initializeGateway(cloudInverterDeviceBean.getOsn(), new LinkCallBack<Boolean>() { @Override public void onSuccess(Boolean obj) { private void initializeInverter(List<GatewayBean> list) { if (list == null || list.size() == 0) { return; } for (int i = 0; i < list.size(); i++) { GatewayBean gatewayBean = list.get(i); HdlDeviceLogic.getInstance().initializeGateway(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() { @Override public void onSuccess(Boolean obj) { // HdlLogLogic.print("初始化逆变器成功-->mac:" + cloudInverterDeviceBean.getOsn(),true); } @Override public void onError(HDLLinkException e) { // HdlLogLogic.print("初始化逆变器失败-->mac:" + cloudInverterDeviceBean.getOsn(),true); } }); } } } @Override public void onFailure(HDLException e) { deleteResidence(homeId); } }); @Override public void onError(HDLLinkException e) { // HdlLogLogic.print("初始化逆变器失败-->mac:" + cloudInverterDeviceBean.getOsn(),true); } }); } } /** @@ -417,11 +424,14 @@ * * @param homeId 电站id */ private void deleteResidence(String homeId) { private void deleteResidence(String homeId, DelayedConfirmationCancelDialog delayedConfirmationCancelDialog) { //删除住宅 HdlResidenceLogic.getInstance().delResidence(homeId, new CloudCallBeak<Boolean>() { @Override public void onSuccess(Boolean obj) { hideLoading(); delayedConfirmationCancelDialog.dismiss(); HdlResidenceLogic.getInstance().delHouseId(homeId); initData();//初始化缓存数据 houseInfoAdapter.setList(houseListBeanIDList);//重新刷新列表 @@ -430,6 +440,8 @@ @Override public void onFailure(HDLException e) { hideLoading(); delayedConfirmationCancelDialog.dismiss(); HdlThreadLogic.toast(_mActivity, e); } }); app/src/main/res/drawable/selected.pngapp/src/main/res/values-en/strings.xml
@@ -241,5 +241,7 @@ <string name="alarm_record">Alarm record</string> <string name="power_station_editing">Power station editing</string> <string name="switch_power_station">Do you want to switch the %s power station?</string> <string name="deleting_please_wait">Deleting, please wait…</string> <string name="already_the_first_one">It\'s already the first one</string> </resources> app/src/main/res/values-zh/strings.xml
@@ -241,6 +241,8 @@ <string name="alarm_record">报警记录</string> <string name="power_station_editing">电站编辑</string> <string name="switch_power_station">是否要切换%s电站?</string> <string name="deleting_please_wait">删除中,请稍等…</string> <string name="already_the_first_one">已经是第一个了.</string> </resources> app/src/main/res/values/strings.xml
@@ -240,6 +240,8 @@ <string name="alarm_record">报警记录</string> <string name="power_station_editing">电站编辑</string> <string name="switch_power_station">是否要切换%s电站?</string> <string name="deleting_please_wait">删除中,请稍等…</string> <string name="already_the_first_one">已经是第一个了.</string> </resources>