bill 1 тиждень тому
батько
коміт
ad0f6d411c
2 змінених файлів з 67 додано та 57 видалено
  1. 64 54
      src/example/constant.ts
  2. 3 3
      src/example/platform/resource-swkk.ts

+ 64 - 54
src/example/constant.ts

@@ -22,6 +22,59 @@ export type IconGroup = {
   }[];
 };
 
+const traceIcons = [
+  { icon: "zhiwen_o", name: "手印" },
+  { icon: "zuozuji_o", name: "脚印" },
+  { icon: "youzuji_o", name: "脚印" },
+  { icon: "xieyin_o", name: "鞋印" },
+  { icon: "chelunhenji_o", name: "车轮印" },
+  { icon: "dantou_o", name: "弹头" },
+  { icon: "danke_o", name: "弹壳" },
+  { icon: "shouqiang_o", name: "手枪" },
+  { icon: "buqiang_o", name: "步枪" },
+  {
+    icon: "xuepo_o",
+    name: "血泊",
+    color: "#DD2C2C",
+    parse: { fill: "#DD2C2C", stroke: undefined },
+  },
+  {
+    icon: "xueji_o",
+    name: "血迹",
+    color: "#DD2C2C",
+    parse: { fill: "#DD2C2C", stroke: undefined },
+  },
+  { parse: { key: "trace" }, icon: "shitiz_o", name: "尸体正面" },
+  { parse: { key: "trace" }, icon: "shitib_o", name: "尸体背面" },
+  { parse: { key: "trace" }, icon: "shitifuhao_o", name: "尸体" },
+
+  { parse: { key: "trace" }, icon: "handprint", name: "手印痕迹" },
+  { parse: { key: "trace" }, icon: "footprint", name: "足迹痕迹" },
+  {
+    parse: { key: "trace" },
+    icon: "wrenchAndScrewdriver",
+    name: "工具痕迹",
+  },
+  { parse: { key: "trace" }, icon: "video", name: "视听物证" },
+  { parse: { key: "trace" }, icon: "virus", name: "生物物证" },
+  { parse: { key: "trace" }, icon: "cartridge", name: "枪弹痕迹" },
+  { parse: { key: "trace" }, icon: "poison", name: "毒化物证" },
+  {
+    parse: { key: "trace" },
+    icon: "physics_and_chemistry",
+    name: "理化物证",
+  },
+  { parse: { key: "trace" }, icon: "folder_close", name: "文捡物证" },
+  { parse: { key: "trace" }, icon: "check", name: "特殊物证" },
+  {
+    parse: { key: "trace" },
+    icon: "case_other",
+    name: "其他物证",
+  },
+  { parse: { key: "trace" }, icon: "electronic", name: "电子物证" },
+  { parse: { key: "trace" }, icon: "cube", name: "提取物品" },
+  { parse: { key: "trace" }, icon: "corpse", name: "尸体" },
+];
 export const iconGroups: IconGroup[] = [
   {
     name: "常用名称",
@@ -137,59 +190,7 @@ export const iconGroups: IconGroup[] = [
     children: [
       {
         name: "",
-        children: [
-          { icon: "zhiwen_o", name: "手印" },
-          { icon: "zuozuji_o", name: "脚印" },
-          { icon: "youzuji_o", name: "脚印" },
-          { icon: "xieyin_o", name: "鞋印" },
-          { icon: "chelunhenji_o", name: "车轮印" },
-          { icon: "dantou_o", name: "弹头" },
-          { icon: "danke_o", name: "弹壳" },
-          { icon: "shouqiang_o", name: "手枪" },
-          { icon: "buqiang_o", name: "步枪" },
-          {
-            icon: "xuepo_o",
-            name: "血泊",
-            color: "#DD2C2C",
-            parse: { fill: "#DD2C2C", stroke: undefined },
-          },
-          {
-            icon: "xueji_o",
-            name: "血迹",
-            color: "#DD2C2C",
-            parse: { fill: "#DD2C2C", stroke: undefined },
-          },
-          { parse: { key: "trace" }, icon: "shitiz_o", name: "尸体正面" },
-          { parse: { key: "trace" }, icon: "shitib_o", name: "尸体背面" },
-          { parse: { key: "trace" }, icon: "shitifuhao_o", name: "尸体" },
-
-          { parse: { key: "trace" }, icon: "handprint", name: "手印痕迹" },
-          { parse: { key: "trace" }, icon: "footprint", name: "足迹痕迹" },
-          {
-            parse: { key: "trace" },
-            icon: "wrenchAndScrewdriver",
-            name: "工具痕迹",
-          },
-          { parse: { key: "trace" }, icon: "video", name: "视听物证" },
-          { parse: { key: "trace" }, icon: "virus", name: "生物物证" },
-          { parse: { key: "trace" }, icon: "cartridge", name: "枪弹痕迹" },
-          { parse: { key: "trace" }, icon: "poison", name: "毒化物证" },
-          {
-            parse: { key: "trace" },
-            icon: "physics_and_chemistry",
-            name: "理化物证",
-          },
-          { parse: { key: "trace" }, icon: "folder_close", name: "文捡物证" },
-          { parse: { key: "trace" }, icon: "check", name: "特殊物证" },
-          {
-            parse: { key: "trace" },
-            icon: "case_other",
-            name: "其他物证",
-          },
-          { parse: { key: "trace" }, icon: "electronic", name: "电子物证" },
-          { parse: { key: "trace" }, icon: "cube", name: "提取物品" },
-          { parse: { key: "trace" }, icon: "corpse", name: "尸体" },
-        ],
+        children: traceIcons,
       },
     ],
   },
@@ -234,4 +235,13 @@ export const styleIconMap = {
   "style-17": "chelunhenji_o",
 };
 
-export const traceIconMap = {};
+export const traceIconMap: Record<string, string> = {};
+for (const icon of traceIcons) {
+  traceIconMap[icon.icon + ".png"] = icon.icon;
+  const ndx = icon.icon.lastIndexOf("_o");
+  if (~ndx) {
+    const name = icon.icon.substring(0, ndx);
+    traceIconMap[name + ".png"] = icon.icon;
+  }
+}
+console.log(traceIconMap);

+ 3 - 3
src/example/platform/resource-swkk.ts

@@ -9,7 +9,7 @@ import {
   WallTaggingInfo,
 } from "./platform-resource";
 import { lineLen, Pos, zeroEq } from "@/utils/math";
-import { aiIconMap, getIconItem, styleIconMap } from "../constant";
+import { aiIconMap, getIconItem, styleIconMap, traceIconMap } from "../constant";
 import {
   Euler,
   MathUtils,
@@ -248,9 +248,9 @@ export const getTraceTaggingInfos = async (
 
     const isSys = trace.icon.indexOf("/") > -1;
     const icon = isSys
-      ? trace.icon.substring(trace.lastIndexOf("/") + 1)
+      ? trace.icon.substring(trace.icon.lastIndexOf("/") + 1)
       : trace.icon;
-    const styleMap = (styleIconMap as any)[icon];
+    const styleMap = (traceIconMap as any)[icon];
 
     if (!icon) continue;