Merge branch 'hzk' into 'master'

课件应用枚举

See merge request rays/pcloud-common-parent!12

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

@@ -82,7 +82,12 @@ public enum AppTypeEnum {
     /**
      * 伴读魔法箱
      */
-    AUDIO_MAGIC("magic");
+    AUDIO_MAGIC("magic"),
+
+	/**
+	 * 课件
+	 */
+	COURSE_WARE("courseWare");
 	
 	
 	

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

@@ -45,7 +45,12 @@ public enum AppTypeEnum {
     LIVEAPP("LIVEAPP"),         //直播3.0
 	CLOCK("CLOCK"),             //打卡
 	TASTETEST("TASTETEST"),   //趣味测试
-	VIDEO_CLASSIC("VIDEO_CLASSIC");     //经典版视频
+	VIDEO_CLASSIC("VIDEO_CLASSIC"),     //经典版视频
+	TEACH_RESOURCE("TEACH_RESOURCE"),    //教辅资料包
+	COURSE_WARE("COURSE_WARE"),    //课件
+	TEST_PAPER("TEST_PAPER"),   //试卷
+	MATCH_LISTEN("MATCH_LISTEN"),  //配套听力
+	WORD_DICTATION("WORD_DICTATION");    //生词听写
 	/**
 	 * 值
 	 */

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

@@ -55,7 +55,18 @@ public enum AppTypeEnum {
     LIVEAPP("LIVEAPP"),         //直播3.0
     TASTETEST("TASTETEST"),    //趣味测试
     VIDEO_CLASSIC("VIDEO_CLASSIC"),     //经典版视频
-    AUDIO_MAGIC("AUDIO_MAGIC"); //音频伴读魔法箱
+    AUDIO_MAGIC("AUDIO_MAGIC"), //音频伴读魔法箱
+    TEACH_RESOURCE("TEACH_RESOURCE"),    //教辅资料包
+    COURSE_WARE("COURSE_WARE"),    //课件
+    TEST_PAPER("TEST_PAPER"),   //试卷
+    MATCH_LISTEN("MATCH_LISTEN"),  //配套听力
+    WORD_DICTATION("WORD_DICTATION"),    //生词听写
+    STROKE_ORDER("STROKE_ORDER"),     //笔顺动图
+    WECHAT_STUDY_GROUP("WECHAT_STUDY_GROUP"), // 微信学习交流圈
+    TASK_CLOCK("TASK_CLOCK"), //任务打卡
+    REWARD_CLOCK("REWARD_CLOCK"), //奖励打卡
+    CUSTOM_CLOCK("CUSTOM_CLOCK"), //自定义打卡
+    PIC_NOTE("PIC_NOTE"); // 图文应用
 
     /**
      * 枚举转换