Merge remote-tracking branch 'origin/dev' into dev

2017-05-23 14:35:05 +08:00
parent 62975e5e1b 9b4e62149f
commit 9fe80cfb66
1 changed files with 4 additions and 0 deletions
--- a/app/src/main/java/com/gh/base/AppController.java
+++ b/app/src/main/java/com/gh/base/AppController.java
@ -157,6 +157,10 @@ public class AppController extends Application {
        //友盟推送
        final PushAgent pushAgent = PushAgent.getInstance(this);
        pushAgent.setAppkeyAndSecret(Config.UMENG_APPKEY, Config.UMENG_MESSAGE_SECRET);
+        if (BuildConfig.DEBUG) {
+            // 设置debug的key，覆盖掉原值，非debug build这个if分支会被去掉
+            pushAgent.setAppkeyAndSecret(Config.UMENG_APPKEY, Config.UMENG_MESSAGE_SECRET);
+        }

        //注册推送服务，每次调用register方法都会回调该接口
        pushAgent.register(new IUmengRegisterCallback() {