Merge branch 'mater-1.6.0' into div

admin

2019-08-23 d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2

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

@@ -72,7 +72,7 @@


      try {

         return String.format(

               "intent://flq/selfbuyandreductionactivity?data=%s#Intent;scheme=banliapp;launchFlags=0x4000000;end",

               "intent://flq/hmpush?data=%s#Intent;scheme=banliapp;launchFlags=0x4000000;end",

               URLDecoder.decode(data.toString(), "UTF-8"));

      } catch (UnsupportedEncodingException e) {

         e.printStackTrace();