完善

main.html

@@ -2233,7 +2233,7 @@
         if (ALARM_DEVS.length > 0) {
             for (var i = 0; i < ALARM_DEVS.length; i++) {
                 var s = ALARM_DEVS[i].split(">")
-                ChangeModelColor(s[0],s[1]=='1001'? DEV_HINT_COLOR : DEV_ALAR_COLOR, s[1]);
+                ChangeModelColor(s[0],s[1]==''? DEV_HINT_COLOR : DEV_ALAR_COLOR, s[1]);
             }
             ALARM_DEVS = [];//清除
         }
@@ -2324,14 +2324,19 @@
         }
     }
 
+    var MarkerMap={};//标记记录
     //设置设置名称或者模型id的颜色
     async function ChangeModelColor(name, color, hinttxt) {
         var iteminfo = modelsMap[name]
         if (iteminfo == null) return
+        if(MarkerMap[name]!=null){
+            player.Native.GisMarker.destroy(MarkerMap[name]);
+        }
         //var tmp = await player.Native.ModelTree.findItemByName(name,0,true,3);
         if (color == null || color == "") {
             //还原
             player.Native.ModelTree.restoreItemColor(iteminfo.item)
+            MarkerMap[name]=null;
         } else {
             player.Native.ModelTree.setItemColor(iteminfo.item, parseInt("0x" + color + "ff"), true)
             if (hinttxt != null && hinttxt != "") {
@@ -2352,6 +2357,7 @@
                 options.imgSize = [-1, -1];
                 var markPtr = await player.Native.GisMarker.create(options);
                 player.Native.GisMarker.update(markPtr, options);
+                MarkerMap[name] = markPtr;
             }
         }
     }