Merge branch 'master' into google

wjc

10 小时以前 f151e203da870dbe281defcb1daf84a1a38ecac1

 app/src/main/java/com/hdl/photovoltaic/HDLApp.java

@@ -24,6 +24,7 @@
import com.alibaba.sdk.android.push.noonesdk.PushInitConfig;
import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory;
import com.alibaba.sdk.android.push.register.MiPushRegister;
import com.alibaba.sdk.android.push.register.OppoRegister;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GoogleApiAvailability;
import com.google.firebase.messaging.FirebaseMessaging;
@@ -62,7 +63,7 @@
import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.core.utils.QueueUtils;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
import com.umeng.analytics.MobclickAgent;
//import com.umeng.analytics.MobclickAgent;
//import com.umeng.commonsdk.UMConfigure;

import org.greenrobot.eventbus.EventBus;
@@ -252,7 +253,11 @@
            pushService.setLogLevel(CloudPushService.LOG_DEBUG);
        }
        //小米
        //appKey/appSecret在小米开发者平台获取
        MiPushRegister.register(this, "2882303761520382032", "5612038223032");
        // OPPO通道注册
        //appKey/appSecret在OPPO开发者平台获取
        OppoRegister.register(this, "d80747c83e38442aaa2e5183c310bae0", "86afce21417b49a4984816024b15d4b9");

    }

@@ -681,7 +686,8 @@
     */
    private void restartApp(Context context) {
        try {
            MobclickAgent.onKillProcess(context);
//            MobclickAgent.onKillProcess(context);
            SystemClock.sleep(300);
            Intent intent = new Intent(context, StartActivity.class);
            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
            context.startActivity(intent);