Merge branch 'master' of http://192.168.89.173/rays/pcloud-common-parent.git

pcloud-common-core/src/main/java/com/pcloud/common/core/constant/AppTypeEnum.java

@@ -77,7 +77,12 @@ public enum AppTypeEnum {
 	/**
 	 * 打卡
 	 */
-	CLOCK("clock");
+	CLOCK("clock"),
+
+    /**
+     * 伴读魔法箱
+     */
+    AUDIO_MAGIC("magic");
 	
 	
 	

pcloud-common-core/src/main/java/com/pcloud/common/core/constant/ProductTypeConstant.java

@@ -223,6 +223,11 @@ public class ProductTypeConstant {
     public static final String EBOOK_APP = "EBOOK_APP";
 
     /**
+     * 亲子伴读魔法箱
+     */
+    public static final String AUDIO_MAGIC = "AUDIO_MAGIC";
+
+    /**
      * 热门作品类型
      */
     public static final String[] HOT_PRODUCT_TYPE = {QA, PDF, VIDEO, PRETEST};
@@ -248,7 +253,7 @@ public class ProductTypeConstant {
      * 应用型作品（伴随应用使用）
      */
     public static final String[] APP_PRODUCT = {LOOK, LIVE, TUTOR, GROUP, ZSCORE, VOTE, CLOCK, TEST, AUDIOAPP, ANSWER,
-            EF, MUSIC, VIDEO_COURSE, PRETESTAPP, AUDIO_RESOURCE, QA_APP, EBOOK_APP};
+            EF, MUSIC, VIDEO_COURSE, PRETESTAPP, AUDIO_RESOURCE, QA_APP, EBOOK_APP, AUDIO_MAGIC};
 
     /**
      * 数据平台埋点型作品

pcloud-common/src/main/java/com/pcloud/common/enums/AppTypeEnum.java

@@ -54,7 +54,8 @@ public enum AppTypeEnum {
     WISH("WISH"),// 愿望单
     LIVEAPP("LIVEAPP"),         //直播3.0
     TASTETEST("TASTETEST"),    //趣味测试
-    VIDEO_CLASSIC("VIDEO_CLASSIC");     //经典版视频
+    VIDEO_CLASSIC("VIDEO_CLASSIC"),     //经典版视频
+    AUDIO_MAGIC("AUDIO_MAGIC"); //音频伴读魔法箱
 
     /**
      * 枚举转换

pcloud-common/src/main/java/com/pcloud/common/enums/QrcodeTypeEnum.java

@@ -11,7 +11,7 @@ import java.util.Map;
  */
 public enum QrcodeTypeEnum {
 
-    MAGIC("AUDIO", 0, "听画书", "MAGIC", "APP", true),
+    MAGIC("AUDIO_MAGIC", 0, "听画书", "AUDIO_MAGIC", "APP", true),
 
     REWARD("CLOCK", 1, "打卡书", "REWARD", "APP", true),