Merge branch 'master' into google

wjc

14 小时以前 f151e203da870dbe281defcb1daf84a1a38ecac1

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

@@ -24,6 +24,7 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.Languages;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
@@ -33,7 +34,7 @@
import com.hdl.photovoltaic.utils.BadgeUtils;
import com.hdl.photovoltaic.utils.SharedPreUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.umeng.commonsdk.UMConfigure;
//import com.umeng.commonsdk.UMConfigure;

import java.util.List;
import java.util.Objects;
@@ -261,7 +262,7 @@
        }
        HDLApp.getInstance().isStartInitThirdSDK = true;
        //初始化友盟SDK
        initUMengSDK();
        // initUMengSDK();
//        //初始化极光推送
//        initJPush();

@@ -281,12 +282,12 @@
     * 集成教程地址：https://developer.umeng.com/docs/119267/detail/118588
     */
    private void initUMengSDK() {
        UMConfigure.preInit(this, "6801aec0bc47b67d833fd76d", "XenterraSolar");
        //appkey和channl必须保持和预初始化一致！！！
        //deviceType：设备类型，UMConfigure.DEVICE_TYPE_PHONE为手机、UMConfigure.DEVICE_TYPE_BOX为盒子
        //pushSecret：Push推送业务的secret
        UMConfigure.init(this, "6801aec0bc47b67d833fd76d", "XenterraSolar", UMConfigure.DEVICE_TYPE_PHONE, "");
        UMConfigure.setLogEnabled(false);//AppConfigManage.isDebug()
//        UMConfigure.preInit(this, "6801aec0bc47b67d833fd76d", "XenterraSolar");
//        //appkey和channl必须保持和预初始化一致！！！
//        //deviceType：设备类型，UMConfigure.DEVICE_TYPE_PHONE为手机、UMConfigure.DEVICE_TYPE_BOX为盒子
//        //pushSecret：Push推送业务的secret
//        UMConfigure.init(this, "6801aec0bc47b67d833fd76d", "XenterraSolar", UMConfigure.DEVICE_TYPE_PHONE, "");
//        UMConfigure.setLogEnabled(false);//AppConfigManage.isDebug()
    }

    /**