Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

 app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java

@@ -31,8 +31,11 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityMyPowerStationBinding;
import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
import com.hdl.photovoltaic.enums.LowerTagType;
import com.hdl.photovoltaic.enums.NetworkType;
import com.hdl.photovoltaic.enums.PowerStationStatusType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlMessageLogic;
@@ -306,7 +309,8 @@
                currentFragmentIndex = 0;
                bottomViewChangeOfStyle();
                showFragment();
                postEventBus(HomepageTitleTabSwitch.homepage);
                HdlCommonLogic.lowerTagType = LowerTagType.home;
                HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, HomepageTitleTabSwitch.homepage.toString());
            }
        });
        viewBinding.myPowerStationBottomIl1.clickTv.setOnClickListener(new View.OnClickListener() {
@@ -318,7 +322,8 @@
                currentFragmentIndex = 1;
                bottomViewChangeOfStyle();
                showFragment();
                postEventBus(HomepageTitleTabSwitch.powerstation);
                HdlCommonLogic.lowerTagType = LowerTagType.power_station;
                HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, HomepageTitleTabSwitch.powerstation.toString());
            }
        });
        viewBinding.myMessageBottomIl2.clickTv.setOnClickListener(new View.OnClickListener() {
@@ -330,7 +335,8 @@
                currentFragmentIndex = 2;
                bottomViewChangeOfStyle();
                showFragment();
                postEventBus(HomepageTitleTabSwitch.message);
                HdlCommonLogic.lowerTagType = LowerTagType.message;
                HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, HomepageTitleTabSwitch.message.toString());
            }
        });
        viewBinding.myMeBottomIl3.clickTv.setOnClickListener(new View.OnClickListener() {
@@ -342,7 +348,8 @@
                currentFragmentIndex = 3;
                bottomViewChangeOfStyle();
                showFragment();
                postEventBus(HomepageTitleTabSwitch.me);
                HdlCommonLogic.lowerTagType = LowerTagType.me;
                HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, HomepageTitleTabSwitch.me.toString());
            }
        });

@@ -366,6 +373,9 @@
        this.bottomViewChangeOfStyle();
    }

    /**
     * 底部模块样式改变
     */
    private void bottomViewChangeOfStyle() {
        if (this.currentFragmentIndex == 0) {
            //首页界面
@@ -410,17 +420,6 @@
        }
    }

    /**
     * 发布点击事件
     *
     * @param tabSwitch -
     */
    private void postEventBus(HomepageTitleTabSwitch tabSwitch) {
        BaseEventBus baseEventBus = new BaseEventBus();
        baseEventBus.setTopic(ConstantManage.homepage_title_tab_switch);
        baseEventBus.setType(tabSwitch.toString());
        EventBus.getDefault().postSticky(baseEventBus);
    }

    public void requestPermissions() {
        //消息通知限权
@@ -636,6 +635,12 @@
                    }
                });
            }
        } else if (event.getTopic().contains(ConstantManage.station_status)) {
            currentFragmentIndex = 1;
            bottomViewChangeOfStyle();
            showFragment();
            HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, event.getType());

        }
    }