Merge branch 'master' into google

wjc

10 小时以前 f151e203da870dbe281defcb1daf84a1a38ecac1

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

@@ -75,7 +75,7 @@
import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
import com.umeng.analytics.MobclickAgent;
//import com.umeng.analytics.MobclickAgent;

import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -878,16 +878,16 @@
     */
    private void clickNotificationMessageTab() {
        //触发消息点击事件
//        viewBinding.myMessageBottomIl2.clickTv.performClick();
        if (currentFragmentIndex == 2) {
            HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.refresh_message_house, ConstantManage.refresh_message_house);
            return;
        }
        currentFragmentIndex = 2;
        bottomViewChangeOfStyle();
        showFragment();
        HdlCommonLogic.lowerTagType = LowerTagType.message;
        HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.refresh_message_house, ConstantManage.refresh_message_house);
        viewBinding.myMessageBottomIl2.clickTv.performClick();
//        if (currentFragmentIndex == 2) {
//            HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.refresh_message_house, ConstantManage.refresh_message_house);
//            return;
//        }
//        currentFragmentIndex = 2;
//        bottomViewChangeOfStyle();
//        showFragment();
//        HdlCommonLogic.lowerTagType = LowerTagType.message;
//        HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.refresh_message_house, ConstantManage.refresh_message_house);
    }


@@ -915,8 +915,8 @@
                return;
            } else {
                AppManagerUtils.getAppManager().finishAllActivity();
                //如果开发者调用kill或者exit之类的方法杀死进程，或者双击back键会杀死进程，请务必在此之前调用MobclickAgent.onKillProcess方法，用来保存统计数据。
                MobclickAgent.onKillProcess(_mActivity);
//                //友盟sdk如果开发者调用kill或者exit之类的方法杀死进程，或者双击back键会杀死进程，请务必在此之前调用MobclickAgent.onKillProcess方法，用来保存统计数据。
//                MobclickAgent.onKillProcess(_mActivity);
                Process.killProcess(Process.myPid());

            }