Merge remote-tracking branch 'origin/master'

Administrator

2018-11-28 6bb5a38680f204f12a0594c8c7b4ea3901894006

 fanli/src/main/java/com/yeshi/fanli/util/push/IOSPushUtil.java

@@ -138,6 +138,9 @@


      PushNotificationManager pushManager = new PushNotificationManager();

      // true：表示的是产品线上发布推送服务 false：表示的是产品测试推送服务

      if(Constant.IS_TEST)

         pushManager.initializeConnection(new AppleNotificationServerBasicImpl(certificate, certificatePassword, false));

      else

      pushManager.initializeConnection(new AppleNotificationServerBasicImpl(certificate, certificatePassword, true));



      List<Device> deviceList = new ArrayList<Device>();