From 637e3152e3bfea430ca774c7dd178b4b9696c37f Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 26 十二月 2023 17:11:58 +0800 Subject: [PATCH] 2023年12月26日17:11:48 --- app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 78 +++++++++++++++++++++++++++++++------- 1 files changed, 63 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java index 9568c1e..692627b 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java @@ -6,6 +6,7 @@ import android.content.pm.PackageManager; import android.hardware.camera2.CameraManager; import android.os.Bundle; +import android.text.TextUtils; import android.view.View; import androidx.annotation.NonNull; @@ -15,9 +16,12 @@ import com.google.gson.Gson; import com.hdl.linkpm.sdk.core.exception.HDLException; import com.hdl.photovoltaic.R; +import com.hdl.photovoltaic.config.AppConfigManage; import com.hdl.photovoltaic.config.ConstantManage; +import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.databinding.FragmentHouseListBinding; import com.hdl.photovoltaic.base.CustomBaseFragment; +import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch; import com.hdl.photovoltaic.enums.ShowErrorMode; import com.hdl.photovoltaic.listener.CloudCallBeak; import com.hdl.photovoltaic.other.HdlCommonLogic; @@ -116,7 +120,11 @@ //鐐瑰嚮浣忓畢璇︽儏 HdlLogLogic.print("鐐瑰嚮浣忓畢璇︽儏===" + new Gson().toJson(houseIdBean), false); HdlResidenceLogic.getInstance().switchHouse(houseIdBean); - String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus(); + String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + + "?homeId=" + houseIdBean.getHomeId() + + "&homeName=" + houseIdBean.getHomeName() + + "&powerStationStatus=" + houseIdBean.getPowerStationStatus() + + "&serverAddress=" + AppConfigManage.getUserRegionUrl(); HdlUniLogic.getInstance().openUniMP(path, null); } @@ -133,15 +141,13 @@ viewBinding.fragmentHouseSrlListRc.setAdapter(houseInfoAdapter); + this.nullDataUpdateUi(houseListBeanIDList); + + } private void initData() { this.houseListBeanIDList = new ArrayList<>(); -// for (int i = 0; i < 11; i++) { -// HouseListBean houseListBean = new HouseListBean(); -// houseListBean.setHomeName("鐢电珯" + i); -// this.houseListBeanList.add(houseListBean); -// } this.houseListBeanIDList.addAll(HdlResidenceLogic.getInstance().getHouseIdList()); } @@ -153,14 +159,41 @@ @Override public void onEventMessage(BaseEventBus eventBus) { super.onEventMessage(eventBus); - if (HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION.equals(eventBus.getType())) { - //uin鍒涘缓鐢电珯鎴愬姛鍚庨�氱煡 - updateUIData(false); - if (eventBus.getData() != null) { - Gson gson = new Gson(); - String json = eventBus.getData().toString(); - HouseIdBean houseIdBean = gson.fromJson(json, HouseIdBean.class); - HdlResidenceLogic.getInstance().switchHouse(houseIdBean); + if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(eventBus.getTopic())) { + if (HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION.equals(eventBus.getType())) { + //uin鍒涘缓鐢电珯鎴愬姛鍚庨�氱煡 + updateUIData(false); + if (eventBus.getData() != null) { + Gson gson = new Gson(); + String json = eventBus.getData().toString(); + HouseIdBean houseIdBean = gson.fromJson(json, HouseIdBean.class); + HdlResidenceLogic.getInstance().switchHouse(houseIdBean); + + } + } else if (HDLUniMP.UNI_EVENT_REPLY_HOME_EDIT.equals(eventBus.getType())) { + //todo 鐜板湪榛樿鍒锋柊鍏ㄩ儴 + //uin缂栬緫浣忓畢閫氱煡 +// String homeId = HdlUniLogic.getInstance().getKeyValue("homeId", eventBus.getData()); +// String home_name = HdlUniLogic.getInstance().getKeyValue("powerStationName", eventBus.getData()); +// if (TextUtils.isEmpty(homeId) || TextUtils.isEmpty(home_name)) { +// return; +// } +// int index = -1; +// for (int i = 0; i < houseListBeanIDList.size(); i++) { +// HouseIdBean houseIdBean = houseListBeanIDList.get(i); +// if (houseIdBean.getHomeId().equals(homeId)) { +// index = i; +// houseIdBean.setHomeName(home_name); +// break; +// } +// } +// if (index > -1) { +// if (houseInfoAdapter != null) { +// //鏇存柊鍗曚釜鏁版嵁 +// houseInfoAdapter.notifyItemChanged(index); +// } +// } + } } else if (HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE.equals(eventBus.getType())) { @@ -168,6 +201,8 @@ if (MqttRecvClient.getInstance() != null) { MqttRecvClient.getInstance().removeAllTopic(); } + updateUIData(false); + } else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST.equals(eventBus.getType())) { //杩涘幓浣忓畢璇︽儏uni璇诲彇閫嗗彉鍣ㄥ垪琛ㄦ垚鍔熷悗閫氱煡 for (int i = 0; i < HdlDeviceLogic.getInstance().getCurrentHomeGatewayList().size(); i++) { @@ -179,7 +214,7 @@ } } else if (eventBus.getTopic().equals(ConstantManage.homepage_title_tab_switch)) { //鎺ユ敹澶栭儴鐐瑰嚮浜嬩欢 - if (eventBus.getType().equals(HdlCommonLogic.HomepageTitleTabSwitch.powerstation.toString())) { + if (eventBus.getType().equals(HomepageTitleTabSwitch.powerstation.toString())) { HdlLogLogic.print("姝e湪鐐瑰嚮銆愮數绔欍��"); } } @@ -212,6 +247,7 @@ } } + nullDataUpdateUi(list); } }, _mActivity, ShowErrorMode.YES); @@ -282,4 +318,16 @@ } + /** + * 娌℃湁鐢电珯鍒楄〃鐨勬牱寮� + */ + private void nullDataUpdateUi(List<HouseIdBean> list) { + if (list != null && list.size() > 0) { + viewBinding.nullListTv.setVisibility(View.GONE); + } else { + viewBinding.nullListTv.setVisibility(View.VISIBLE); + } + } + + } -- Gitblit v1.8.0