feat(parser): 写了个解析

src/assets/css/anno-parser.css

@@ -0,0 +1,12 @@
+/*
+ * @description 游戏公告解析 css
+ * @since Alpha v0.1.1
+ */
+/* todo 样式美化 */
+.anno-content {
+	font-size: 16px;
+	line-height: 2;
+}
+
+.anno-content p span {
+}

src/assets/index.css

@@ -1,23 +1,13 @@
 @import "fonts/index.css";
-@import "css/mys-parser.css";
 
 /*
  * @description 米游社解析 json
  * @since Alpha v0.1.1
  */
-.mys-post-json {
+.dev-json {
 	padding: 20px;
 	border-radius: 20px;
-}
-
-.mys-post-json * {
-	color: #faf7e8 !important;
-	background-color: #2b2b2b !important;
-	font-family: "Consolas", monospace;
-}
-
-.mys-post-json .jv-toggle {
-	background-color: #faf7e8 !important;
+	font-family: Consolas, serif;
 }
 
 /* card action 内的按钮 */

src/pages/Announcements.vue

@@ -21,19 +21,29 @@
 						<div class="anno-cover" @click="toPost(item)">
 							<img :src="item.banner" alt="cover" />
 						</div>
-						<v-card-title>{{ item.title }}</v-card-title>
+						<v-card-title>
+							{{ item.title }}
+						</v-card-title>
 						<v-card-subtitle>{{ item.subtitle }}</v-card-subtitle>
 						<v-card-actions>
-							<v-btn @click="toPost(item)" class="card-btn">
+							<v-btn @click="toPost(item)" class="anno-btn">
 								<template v-slot:prepend>
-									<img src="../assets/icons/arrow-right.svg" alt="right" />
+									<img :src="item.tag_icon || '../assets/icons/arrow-right.svg'" alt="right" />
 								</template>
 								查看
 							</v-btn>
-							<v-card-subtitle
-								><v-icon>mdi-calendar</v-icon> {{ item.start_time.split(" ")[0] }} -
+							<v-card-subtitle v-show="!appStore.devMode">
+								<v-icon>mdi-calendar</v-icon>
+								{{ item.start_time.split(" ")[0] }} -
 								{{ item.end_time.split(" ")[0] }}</v-card-subtitle
 							>
+							<v-card-subtitle v-show="appStore.devMode">id: {{ item.id }}</v-card-subtitle>
+							<v-btn v-show="appStore.devMode" class="card-btn" @click="toJson(item)">
+								<template v-slot:prepend>
+									<img src="../assets/icons/arrow-right.svg" alt="right" />
+								</template>
+								查看数据
+							</v-btn>
 						</v-card-actions>
 					</v-card>
 				</div>
@@ -47,17 +57,24 @@
 						<v-card-title>{{ item.title }}</v-card-title>
 						<v-card-subtitle>{{ item.subtitle }}</v-card-subtitle>
 						<v-card-actions>
-							<v-btn @click="toPost(item)" class="card-btn">
+							<v-btn @click="toPost(item)" class="anno-btn">
 								<template v-slot:prepend>
-									<img src="../assets/icons/arrow-right.svg" alt="right" />
+									<img :src="item.tag_icon || '../assets/icons/arrow-right.svg'" alt="right" />
 								</template>
 								查看
 							</v-btn>
-							<v-card-subtitle>
+							<v-card-subtitle v-show="!appStore.devMode">
 								<v-icon>mdi-calendar</v-icon>
 								{{ item.start_time.split(" ")[0] }} -
 								{{ item.end_time.split(" ")[0] }}</v-card-subtitle
 							>
+							<v-card-subtitle v-show="appStore.devMode">id: {{ item.id }}</v-card-subtitle>
+							<v-btn v-show="appStore.devMode" class="card-btn" @click="toJson(item)">
+								<template v-slot:prepend>
+									<img src="../assets/icons/arrow-right.svg" alt="right" />
+								</template>
+								查看数据
+							</v-btn>
 						</v-card-actions>
 					</v-card>
 				</div>
@@ -77,6 +94,10 @@ import GenshinOper from "../plugins/Genshin";
 import { createTGWindow } from "../utils/TGWindow";
 // interface
 import { AnnoListData, AnnoListCard } from "../plugins/Genshin/interface/announcement";
+import useAppStore from "../store/modules/app";
+
+// store
+const appStore = useAppStore();
 
 // loading
 const loading = ref(true);
@@ -94,7 +115,7 @@ const annoData = ref({} as AnnoListData);
 
 onMounted(async () => {
 	loadingTitle.value = "正在获取公告数据";
-	annoData.value = await GenshinOper.Announcement.get.list();
+	annoData.value = await GenshinOper.Announcement.getList();
 	loadingTitle.value = "正在转换公告数据";
 	const listCards = GenshinOper.Announcement.card(annoData.value);
 	const activityCard = listCards.filter(item => item.type_label === "活动公告");
@@ -121,6 +142,16 @@ async function toPost(item: AnnoListCard) {
 	}).href;
 	createTGWindow(path, "游戏内公告", item.title, 960, 720, false);
 }
+
+async function toJson(item: AnnoListCard) {
+	const path = router.resolve({
+		name: "游戏内公告（JSON）",
+		params: {
+			anno_id: item.id,
+		},
+	}).href;
+	createTGWindow(path, "游戏内公告-JSON", item.title, 960, 720, false);
+}
 </script>
 
 <style lang="css" scoped>
@@ -155,6 +186,16 @@ async function toPost(item: AnnoListCard) {
 	transition: all 0.3s linear;
 }
 
+.anno-btn {
+	background: #546d8b;
+	color: #faf7e8;
+}
+
+.anno-btn img {
+	height: 30px;
+	width: 30px;
+}
+
 /* switch */
 .switch-btn {
 	font-family: Genshin, serif;

src/plugins/Genshin/index.ts

@@ -8,14 +8,14 @@
 // Announcement
 import { getAnnouncementList, getAnnouncementContent } from "./request/announcements";
 import { getAnnoCards } from "./utils/announcements";
+import { parseAnnoContent } from "./utils/annoParser";
 
 const GenshinOper = {
 	Announcement: {
-		get: {
-			list: getAnnouncementList,
-			content: getAnnouncementContent,
-		},
+		getList: getAnnouncementList,
+		getContent: getAnnouncementContent,
 		card: getAnnoCards,
+		parser: parseAnnoContent,
 	},
 };
 

src/plugins/Genshin/interface/announcement.ts

@@ -194,6 +194,7 @@ export interface AnnoContentItem {
  * @property {string} subtitle 公告副标题
  * @property {string} banner 公告图片
  * @property {string} type_label 公告类型标签
+ * @property {string} tag_icon 公告标签图标
  * @property {string} start_time 公告开始时间
  * @property {string} end_time 公告结束时间
  * @return {AnnoListCard}
@@ -204,6 +205,7 @@ export interface AnnoListCard {
 	subtitle: string;
 	banner: string;
 	type_label: string;
+	tag_icon: string;
 	start_time: string;
 	end_time: string;
 }

src/plugins/Genshin/utils/annoParser.ts

@@ -0,0 +1,58 @@
+/**
+ * @file plugins Genshin utils annoParser.ts
+ * @description 原神游戏内公告解析工具
+ * @author BTMuli<bt-muli@outlook.com>
+ * @since Alpha v0.1.1
+ */
+
+/**
+ * @description 解析游戏内公告数据
+ * @since Alpha v0.1.1
+ * @param {string} data 游戏内公告数据
+ * @return {string} 解析后的数据
+ */
+export function parseAnnoContent(data: string): string {
+	const htmlBase = new DOMParser().parseFromString(data, "text/html");
+	// 遍历所有 span 标签
+	htmlBase.querySelectorAll("span").forEach(span => {
+		return (span.innerHTML = deleteRedundantTag(span.innerHTML));
+	});
+	// 遍历所有 p 标签
+	htmlBase.querySelectorAll("p").forEach(p => {
+		// 如果没有子元素
+		if (p.children.length === 0) {
+			return (p.innerHTML = deleteRedundantTag(p.innerHTML));
+		}
+	});
+	return htmlBase.body.innerHTML;
+}
+
+/**
+ * @description 删除冗余的标签
+ * @since Alpha v0.1.1
+ * @param {string} data 内容
+ * @return {string} 删除后的内容
+ */
+export function deleteRedundantTag(data: string): string {
+	// 先转义一下
+	return decodeRegExp(data);
+}
+
+/**
+ * @description 转义正则表达式
+ * @since Alpha v0.1.1
+ * @param {string} data 内容
+ * @return {string} 转义后的内容
+ */
+export function decodeRegExp(data: string): string {
+	let res = data;
+	if (res.length === 0) return res;
+	res = res.replace(/&amp;/g, "&");
+	res = res.replace(/&lt;/g, "<");
+	res = res.replace(/&gt;/g, ">");
+	res = res.replace(/&nbsp;/g, " ");
+	res = res.replace(/&#39;/g, "'");
+	res = res.replace(/&quot;/g, '"');
+	res = res.replace(/&apos;/g, "'");
+	return res;
+}

src/plugins/Genshin/utils/announcements.ts

@@ -23,6 +23,7 @@ export function getAnnoCards(data: AnnoListData): AnnoListCard[] {
 				subtitle: anno.subtitle,
 				banner: anno.banner,
 				type_label: anno.type_label,
+				tag_icon: anno.tag_icon,
 				start_time: anno.start_time,
 				end_time: anno.end_time,
 			});

src/router/modules/sub.ts

@@ -11,6 +11,7 @@ import TPostJson from "../../views/t-post-json.vue";
 import TLottery from "../../views/t-lottery.vue";
 // 游戏内公告
 import TAnno from "../../views/t-anno.vue";
+import TAnnoJson from "../../views/t-anno-json.vue";
 
 const subRoutes = [
 	{
@@ -29,10 +30,15 @@ const subRoutes = [
 		component: TLottery,
 	},
 	{
-		path: "/anno/:anno_id",
+		path: "/anno_detail/:anno_id",
 		name: "游戏内公告",
 		component: TAnno,
 	},
+	{
+		path: "/anno_detail_json/:anno_id",
+		name: "游戏内公告（JSON）",
+		component: TAnnoJson,
+	},
 ];
 
 export default subRoutes;

src/views/t-anno-json.vue

@@ -0,0 +1,64 @@
+<template>
+	<div v-if="loading">
+		<t-loading :empty="loadingEmpty" :title="loadingTitle" />
+	</div>
+	<div v-else class="dev-json">
+		<div class="anno-title">活动列表 JSON</div>
+		<json-viewer :value="jsonList" copyable boxed />
+		<div class="anno-title">活动内容 JSON</div>
+		<json-viewer :value="jsonContent" copyable boxed />
+	</div>
+</template>
+<script lang="ts" setup>
+// vue
+import { ref, onMounted, reactive } from "vue";
+import { useRoute } from "vue-router";
+import TLoading from "../components/t-loading.vue";
+// plugins
+import GenshinOper from "../plugins/Genshin";
+// interface
+import { AnnoListItem, Announcement } from "../plugins/Genshin/interface/announcement";
+
+// loading
+const loading = ref(true as boolean);
+const loadingTitle = ref("正在加载");
+const loadingEmpty = ref(false as boolean);
+
+// 数据
+const anno_id = Number(useRoute().params.anno_id);
+let jsonList = reactive({});
+let jsonContent = reactive({});
+
+onMounted(async () => {
+	// 检查数据
+	if (!anno_id) {
+		loadingEmpty.value = true;
+		loadingTitle.value = "未找到数据";
+		return;
+	}
+	// 获取数据
+	loadingTitle.value = "正在获取数据...";
+	const listData = await GenshinOper.Announcement.getList();
+	listData.list.map((item: Announcement) => {
+		return item.list.map((single: AnnoListItem) => {
+			if (single.ann_id === anno_id) {
+				jsonList = single;
+				return;
+			}
+		});
+	});
+	jsonContent = await GenshinOper.Announcement.getContent(anno_id);
+	setInterval(() => {
+		loading.value = false;
+	}, 200);
+});
+</script>
+<style lang="css" scoped>
+.anno-title {
+	font-size: 20px;
+	color: #546d8b;
+	font-family: Genshin-Light, serif;
+	font-weight: 600;
+	margin: 20px 0;
+}
+</style>

src/views/t-anno.vue

@@ -5,8 +5,8 @@
 	<div v-else class="anno-body">
 		<div class="anno-title">{{ annoData.title }}</div>
 		<div class="anno-subtitle">{{ annoData.subtitle }}</div>
-		<img :src="annoData.banner" alt="cover" class="mys-post-img" />
-		<div v-html="annoHtml" />
+		<img :src="annoData.banner" alt="cover" class="anno-img" />
+		<div v-html="annoHtml" class="anno-content" />
 	</div>
 </template>
 <script lang="ts" setup>
@@ -39,9 +39,9 @@ onMounted(async () => {
 	// 获取数据
 	loadingTitle.value = "正在获取数据...";
 	try {
-		annoData.value = await GenshinOper.Announcement.get.content(anno_id);
+		annoData.value = await GenshinOper.Announcement.getContent(anno_id);
 		loadingTitle.value = "正在渲染数据...";
-		annoHtml.value = annoData.value.content;
+		annoHtml.value = GenshinOper.Announcement.parser(annoData.value.content);
 	} catch (error) {
 		loadingEmpty.value = true;
 		loadingTitle.value = "公告不存在或解析失败";
@@ -53,7 +53,8 @@ onMounted(async () => {
 });
 </script>
 <style lang="css" scoped>
-/* todo 完善样式 */
+@import "../assets/css/anno-parser.css";
+
 .anno-body {
 	margin: 20px auto;
 	width: 800px;
@@ -73,4 +74,12 @@ onMounted(async () => {
 	color: #a1aeb6;
 	margin-bottom: 16px;
 }
+
+.anno-img {
+	max-width: 100%;
+	width: 800px;
+	height: auto;
+	border-radius: 10px;
+	margin-bottom: 10px;
+}
 </style>