| app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/layout/fragment_house_list.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
@@ -29,6 +29,8 @@ import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; /** * 我的-界面 @@ -263,7 +265,7 @@ } @Override @Subscribe(threadMode = ThreadMode.MAIN, sticky = true) public void onEventMessage(BaseEventBus eventBus) { super.onEventMessage(eventBus); if (eventBus == null) { @@ -272,6 +274,8 @@ //接收外部点击事件 if (eventBus.getTopic().equals(ConstantManage.homepage_title_tab_switch)) { if (eventBus.getType().equals(HomepageTitleTabSwitch.me.toString())) { // 取消粘性事件 EventBus.getDefault().removeStickyEvent(eventBus); //读取头像 if (UserConfigManage.getInstance().isBAccount()) { this.getBUserInfo(); app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -44,6 +44,10 @@ import com.hdl.sdk.link.core.bean.gateway.GatewayBean; import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; import java.util.List; @@ -404,6 +408,11 @@ private void initView() { viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE); viewBinding.deviceLabelParent.setVisibility(View.GONE); viewBinding.powerStationAllIl.stationTitleTv.setText(getString(R.string.message_all)); viewBinding.powerStationFaultsIl.stationTitleTv.setText(getString(R.string.my_power_station_malfunction)); viewBinding.hpowerStationOfflineIl.stationTitleTv.setText(getString(R.string.my_power_station_off_line)); viewBinding.powerStationConnectedIl.stationTitleTv.setText(getString(R.string.to_be_added)); //电站标签 houseInfoAdapter = new HouseInfoAdapter(_mActivity); viewBinding.fragmentHouseSrlListRc.setLayoutManager(new LinearLayoutManager(_mActivity)); @@ -437,11 +446,13 @@ * * @param eventBus 数据 */ @Override @Subscribe(threadMode = ThreadMode.MAIN, sticky = true) public void onEventMessage(BaseEventBus eventBus) { super.onEventMessage(eventBus); if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(eventBus.getTopic())) { if (HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION.equals(eventBus.getType())) { // 取消粘性事件 EventBus.getDefault().removeStickyEvent(eventBus); //uin创建电站成功后通知 loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true); if (eventBus.getData() != null) { @@ -452,6 +463,8 @@ } } else if (HDLUniMP.UNI_EVENT_REPLY_HOME_EDIT.equals(eventBus.getType())) { // 取消粘性事件 EventBus.getDefault().removeStickyEvent(eventBus); //todo 现在默认刷新全部 //uin编辑住宅通知 // String homeId = HdlUniLogic.getInstance().getKeyValue("homeId", eventBus.getData()); @@ -478,6 +491,8 @@ } } else if (HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE.equals(eventBus.getType())) { // 取消粘性事件 EventBus.getDefault().removeStickyEvent(eventBus); //uin关闭住宅详情界面通知 if (MqttRecvClient.getInstance() != null) { MqttRecvClient.getInstance().removeAllTopic(); @@ -485,6 +500,8 @@ loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true); } else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST.equals(eventBus.getType())) { // 取消粘性事件 EventBus.getDefault().removeStickyEvent(eventBus); //进去住宅详情uni读取逆变器列表成功后通知 for (int i = 0; i < HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(UserConfigManage.getInstance().getHomeId()).size(); i++) { String gatewayId = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(UserConfigManage.getInstance().getHomeId()).get(i).getGatewayId(); @@ -496,6 +513,8 @@ } else if (eventBus.getTopic().equals(ConstantManage.homepage_title_tab_switch)) { //接收外部点击事件 if (eventBus.getType().equals(HomepageTitleTabSwitch.powerstation.toString())) { // 取消粘性事件 EventBus.getDefault().removeStickyEvent(eventBus); HdlLogLogic.print("正在点击【电站】"); // HdlThreadLogic.runSubThread(new Runnable() { // @Override @@ -509,6 +528,7 @@ } } /** * 电站状态概览 */ @@ -519,10 +539,10 @@ if (statusOverviewBean == null) { return; } viewBinding.screeningConditionNumber1Tv.setText(statusOverviewBean.getTotal()); viewBinding.screeningConditionNumber2Tv.setText(statusOverviewBean.getFault()); viewBinding.screeningConditionNumber3Tv.setText(statusOverviewBean.getOffline()); viewBinding.screeningConditionNumber4Tv.setText(statusOverviewBean.getConnecting()); viewBinding.powerStationAllIl.stationTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getTotal())); viewBinding.powerStationFaultsIl.stationTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getFault())); viewBinding.hpowerStationOfflineIl.stationTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getOffline())); viewBinding.powerStationConnectedIl.stationTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getConnecting())); } @Override app/src/main/res/layout/fragment_house_list.xml
@@ -106,8 +106,7 @@ android:layout_alignParentStart="true" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_13" android:src="@drawable/search_path" /> android:src="@drawable/search_path" /> <TextView android:id="@+id/power_station_search_tv" @@ -118,8 +117,7 @@ android:layout_toEndOf="@+id/power_station_search_iv" android:text="Search the power station" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" /> android:textSize="@dimen/text_14" /> </RelativeLayout> <ImageView @@ -132,6 +130,7 @@ </RelativeLayout> <!--条件筛选--> <LinearLayout android:id="@+id/screening_condition_ll" @@ -145,139 +144,25 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl"> <LinearLayout android:id="@+id/screening_condition_1" android:layout_width="@dimen/dp_74" android:layout_height="@dimen/dp_56" android:layout_gravity="center_vertical" android:background="@drawable/station_status_no_ffffff" android:orientation="vertical"> <include android:id="@+id/power_station_all_il" layout="@layout/item_station" /> <TextView android:id="@+id/screening_condition_number1_tv" android:layout_width="match_parent" android:layout_height="@dimen/dp_25" android:layout_marginTop="7dp" android:gravity="center" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_21" android:textStyle="bold" /> <include android:id="@+id/power_station_faults_il" layout="@layout/item_station" /> <TextView android:id="@+id/screening_condition_text1_tv" android:layout_width="match_parent" android:layout_height="17dp" android:layout_marginTop="1dp" android:gravity="center" android:text="@string/message_all" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" /> <include android:id="@+id/hpower_station_offline_il" layout="@layout/item_station" /> <include android:id="@+id/power_station_connected_il" layout="@layout/item_station" /> </LinearLayout> <View android:layout_width="@dimen/dp_16" android:layout_height="match_parent" /> <LinearLayout android:id="@+id/screening_condition_2" android:layout_width="@dimen/dp_74" android:layout_height="@dimen/dp_56" android:layout_gravity="center_vertical" android:background="@drawable/station_status_no_ffffff" android:orientation="vertical"> <TextView android:id="@+id/screening_condition_number2_tv" android:layout_width="match_parent" android:layout_height="@dimen/dp_25" android:layout_marginTop="7dp" android:gravity="center" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_21" android:textStyle="bold" /> <TextView android:id="@+id/screening_condition_text2_tv" android:layout_width="match_parent" android:layout_height="@dimen/dp_17" android:layout_marginTop="1dp" android:gravity="center" android:text="@string/alarm_all_grade_malfunction" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" /> </LinearLayout> <View android:layout_width="@dimen/dp_16" android:layout_height="match_parent" /> <LinearLayout android:id="@+id/screening_condition_3" android:layout_width="@dimen/dp_74" android:layout_height="@dimen/dp_56" android:layout_gravity="center_vertical" android:background="@drawable/station_status_no_ffffff" android:orientation="vertical"> <TextView android:id="@+id/screening_condition_number3_tv" android:layout_width="match_parent" android:layout_height="@dimen/dp_25" android:layout_marginTop="7dp" android:gravity="center" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_21" android:textStyle="bold" /> <TextView android:id="@+id/screening_condition_text3_tv" android:layout_width="match_parent" android:layout_height="@dimen/dp_17" android:layout_marginTop="1dp" android:gravity="center" android:text="@string/my_power_station_off_line" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" /> </LinearLayout> <View android:layout_width="@dimen/dp_16" android:layout_height="match_parent" /> <LinearLayout android:id="@+id/screening_condition_4" android:layout_width="@dimen/dp_74" android:layout_height="@dimen/dp_56" android:layout_gravity="center_vertical" android:background="@drawable/station_status_no_ffffff" android:orientation="vertical"> <TextView android:id="@+id/screening_condition_number4_tv" android:layout_width="match_parent" android:layout_height="@dimen/dp_25" android:layout_marginTop="7dp" android:gravity="center" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_21" android:textStyle="bold" /> <TextView android:id="@+id/screening_condition_text4_tv" android:layout_width="match_parent" android:layout_height="@dimen/dp_17" android:layout_marginTop="1dp" android:gravity="center" android:text="@string/to_be_added" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" /> </LinearLayout> </LinearLayout> <!--升序降序功能--> <LinearLayout android:id="@+id/ascending_order_descending_order_parent_ll"
