Merge branch 'master' into 1.2.1_google

wjc

1 天以前 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90

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

@@ -21,6 +21,7 @@
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
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;
@@ -30,7 +31,7 @@
import com.hdl.photovoltaic.utils.LocalManageUtil;
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;

@@ -123,7 +124,7 @@
                }
            } else {
                //无网模式-跳到小程序设备列表界面
                String path = HDLUniMP.UNI_EVENT_OPEN_NONETWORKDEVICELIST + "?mac=" + UserConfigManage.getInstance().getNoNetworkDeviceMac() + "&password=" + UserConfigManage.getInstance().getNoNetworkPassword();
                String path = HDLUniMP.UNI_EVENT_OPEN_NONETWORKDEVICELIST + "?mac=" + UserConfigManage.getInstance().getNoNetworkDeviceMac() + "&password=" + UserConfigManage.getInstance().getNoNetworkPassword() + "&autoVerify=true";
                HdlUniLogic.getInstance().openUniMP(path, null);
            }
        }
@@ -248,8 +249,8 @@
            return;
        }
        HDLApp.getInstance().isStartInitThirdSDK = true;
        //初始化友盟SDK
        initUMengSDK();
//        //初始化友盟SDK
//        initUMengSDK();
        //初始化极光推送
        initJPush();

@@ -268,12 +269,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()
    }

}