Merge branch 'mater-1.6.0' into div

admin

2019-08-13 25b7e040153e96fd7c9f649e9b0de8932e1a2a00

 fanli/src/main/java/com/yeshi/fanli/util/Constant.java

@@ -230,6 +230,14 @@
      default:// 其他类型

         return "";

      }

   }



   public static int getPlatformCode(String platform) {

      if ("android".equalsIgnoreCase(platform))

         return 1;

      else if ("ios".equalsIgnoreCase(platform))

         return 2;

      else

         return 0;// 未知

   }

}