diff --git a/app/src/main/cpp/myfontface.h b/app/src/main/cpp/myfontface.h
index 8c321ee..df853d7 100644
--- a/app/src/main/cpp/myfontface.h
+++ b/app/src/main/cpp/myfontface.h
@@ -9,10 +9,10 @@
 public:
 MyFontFace()
 {
-static const unsigned int font_glyph_unicode[108] = {
-    19977, 19994, 20142, 20154, 20202, 20307, 20316, 20445, 20449, 20809, 20840, 20844, 20851, 20855, 20869, 20934, 20999, 21046, 21147, 21361, 21387, 21487, 21488, 21578, 21628, 21897, 22120, 22270, 22791, 22806, 22836, 23433, 23545, 24037, 24102, 24125, 24320, 24687, 25106, 25252, 25253, 25509, 25511, 26029, 26045, 26126, 26381, 26538, 26550, 26564, 26631, 26643, 26816, 27668, 27700, 27969, 27979, 28040, 28388, 28779, 28781, 28783, 28790, 29031, 29060, 29123, 29260, 30005, 30693, 31034, 31629, 31649, 31665, 32440, 32447, 32499, 32622, 33050, 34920, 35013, 35064, 35686, 35745, 35762, 35774, 35782, 35843, 36148, 36328, 36335, 36719, 36807, 36865, 36890, 36947, 37096, 37197, 37327, 38181, 38271, 38376, 38378, 38400, 38450, 38505, 38706, 38750, 39118
+static const unsigned int font_glyph_unicode[105] = {
+    19977, 19994, 20142, 20154, 20202, 20307, 20316, 20445, 20449, 20809, 20840, 20844, 20851, 20855, 20869, 20934, 20999, 21046, 21147, 21361, 21387, 21487, 21488, 21578, 21628, 21897, 22120, 22270, 22791, 22806, 22836, 23433, 23545, 24037, 24102, 24125, 24320, 24687, 25106, 25252, 25253, 25506, 25509, 25511, 26029, 26045, 26126, 26381, 26538, 26550, 26564, 26631, 26643, 26816, 27668, 27700, 27969, 27979, 28040, 28388, 28779, 28781, 28783, 28790, 29031, 29060, 29123, 29260, 30005, 30693, 31034, 31629, 31649, 31665, 32447, 32499, 33050, 34920, 35064, 35686, 35745, 35762, 35774, 35782, 35843, 36328, 36335, 36719, 36807, 36865, 36890, 36947, 37096, 37197, 37327, 38181, 38271, 38376, 38378, 38400, 38450, 38505, 38706, 38750, 39118
 };
-static const unsigned char font_glyph_bitmaps[108][40 * 20] = {
+static const unsigned char font_glyph_bitmaps[105][40 * 20] = {
     {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1736,6 +1736,48 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
+        0, 0, 0, 128, 154, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 83, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 4, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 159, 0, 0, 0, 0, 0, 0, 0, 80, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 159, 0, 0, 0, 0, 0, 0, 0, 80, 255, 11, 0,
+        0, 229, 255, 255, 255, 255, 191, 249, 159, 0, 183, 2, 0, 32, 172, 0, 80, 255, 11, 0,
+        0, 245, 255, 255, 255, 255, 191, 215, 125, 96, 254, 94, 0, 210, 255, 44, 64, 220, 9, 0,
+        0, 196, 221, 253, 255, 221, 157, 0, 0, 210, 255, 45, 0, 160, 255, 223, 4, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 251, 239, 4, 0, 0, 248, 255, 78, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 160, 255, 110, 0, 0, 0, 112, 255, 239, 6, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 249, 255, 8, 0, 0, 0, 0, 230, 255, 127, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 128, 255, 175, 0, 48, 253, 61, 0, 96, 254, 255, 7, 0,
+        0, 0, 0, 208, 239, 4, 0, 230, 255, 11, 0, 64, 254, 78, 0, 0, 230, 207, 2, 0,
+        0, 0, 0, 208, 239, 4, 16, 96, 206, 2, 0, 64, 254, 78, 0, 0, 96, 43, 0, 0,
+        0, 0, 0, 208, 239, 216, 143, 0, 1, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 210, 255, 255, 159, 169, 170, 170, 170, 170, 254, 174, 170, 170, 170, 170, 73, 0,
+        0, 80, 234, 255, 255, 255, 159, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
+        0, 250, 255, 255, 255, 107, 80, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
+        0, 249, 255, 255, 239, 4, 0, 0, 0, 0, 176, 255, 255, 255, 159, 0, 0, 0, 0, 0,
+        0, 248, 108, 208, 239, 4, 0, 0, 0, 0, 247, 223, 254, 238, 239, 4, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 64, 254, 127, 254, 158, 255, 11, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 176, 255, 74, 254, 94, 253, 127, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 250, 223, 66, 254, 78, 247, 239, 4, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 128, 255, 110, 64, 254, 78, 176, 255, 45, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 248, 255, 8, 64, 254, 78, 32, 253, 223, 3, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 144, 255, 175, 0, 64, 254, 78, 0, 230, 255, 77, 0, 0,
+        0, 0, 0, 208, 239, 4, 32, 252, 255, 10, 0, 64, 254, 78, 0, 112, 255, 255, 9, 0,
+        0, 0, 0, 208, 239, 4, 230, 255, 175, 0, 0, 64, 254, 78, 0, 0, 247, 255, 207, 2,
+        0, 0, 0, 211, 239, 36, 253, 255, 9, 0, 0, 64, 254, 78, 0, 0, 96, 254, 111, 0,
+        0, 198, 170, 252, 239, 4, 212, 143, 0, 0, 0, 64, 254, 78, 0, 0, 0, 212, 10, 0,
+        0, 246, 255, 255, 207, 0, 48, 4, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 228, 255, 255, 110, 0, 0, 0, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 146, 170, 105, 1, 0, 0, 0, 0, 0, 0, 48, 253, 61, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    },
+    {
         0, 0, 0, 144, 205, 4, 0, 0, 0, 0, 0, 112, 206, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 176, 255, 5, 0, 0, 0, 0, 0, 211, 255, 8, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 176, 255, 5, 0, 0, 0, 0, 0, 128, 255, 45, 0, 0, 0, 0, 0, 0,
@@ -3080,48 +3122,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 64, 156, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 144, 255, 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 117, 185, 5, 0,
-        0, 0, 0, 210, 255, 10, 0, 0, 0, 82, 85, 117, 170, 219, 253, 255, 255, 255, 9, 0,
-        0, 0, 0, 247, 239, 4, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 45, 0,
-        0, 0, 0, 252, 175, 0, 0, 0, 253, 255, 255, 255, 255, 255, 255, 222, 172, 122, 5, 0,
-        0, 0, 112, 255, 62, 0, 0, 0, 253, 175, 122, 85, 197, 255, 9, 0, 0, 0, 0, 0,
-        0, 0, 192, 255, 9, 32, 90, 0, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 0, 247, 223, 2, 128, 255, 44, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 32, 253, 143, 0, 210, 255, 9, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 128, 255, 12, 0, 249, 223, 2, 253, 95, 0, 0, 160, 255, 9, 0, 0, 0, 0, 0,
-        0, 228, 255, 6, 64, 254, 143, 0, 253, 95, 0, 0, 144, 255, 9, 0, 0, 0, 0, 0,
-        0, 250, 239, 221, 221, 255, 12, 0, 253, 95, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 248, 255, 255, 255, 239, 5, 0, 253, 95, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 229, 239, 221, 255, 175, 0, 0, 253, 95, 0, 0, 128, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 0, 112, 255, 45, 0, 0, 253, 223, 221, 221, 221, 255, 222, 221, 221, 221, 76, 0,
-        0, 0, 0, 210, 255, 7, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 95, 0,
-        0, 0, 0, 250, 191, 0, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 95, 0,
-        0, 0, 96, 254, 78, 0, 0, 0, 253, 95, 0, 0, 80, 255, 78, 0, 0, 0, 0, 0,
-        0, 0, 210, 255, 8, 0, 0, 0, 253, 95, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0,
-        0, 0, 251, 191, 0, 16, 117, 4, 253, 95, 0, 0, 32, 253, 95, 0, 0, 0, 0, 0,
-        0, 194, 255, 223, 254, 255, 255, 8, 253, 95, 0, 0, 0, 253, 111, 0, 0, 0, 0, 0,
-        0, 210, 255, 255, 255, 255, 255, 5, 253, 95, 0, 0, 0, 251, 143, 0, 0, 0, 0, 0,
-        0, 176, 255, 255, 206, 138, 37, 0, 253, 95, 0, 0, 0, 249, 175, 0, 0, 0, 0, 0,
-        0, 80, 70, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 248, 191, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 245, 223, 2, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 211, 255, 5, 0, 214, 74, 0,
-        0, 0, 0, 0, 0, 32, 183, 11, 253, 95, 0, 0, 0, 176, 255, 8, 0, 248, 191, 0,
-        0, 0, 0, 64, 201, 254, 255, 11, 253, 95, 0, 0, 96, 132, 255, 12, 0, 249, 175, 0,
-        0, 130, 235, 255, 255, 255, 255, 11, 253, 95, 0, 164, 255, 88, 254, 94, 0, 250, 143, 0,
-        0, 246, 255, 255, 255, 190, 39, 0, 253, 111, 215, 255, 255, 8, 252, 191, 0, 251, 127, 0,
-        0, 211, 255, 190, 39, 0, 0, 80, 254, 255, 255, 255, 223, 5, 247, 255, 6, 253, 94, 0,
-        0, 112, 39, 0, 0, 0, 0, 176, 255, 255, 255, 174, 4, 0, 176, 255, 223, 255, 61, 0,
-        0, 0, 0, 0, 0, 0, 0, 112, 255, 255, 108, 0, 0, 0, 64, 254, 255, 255, 11, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 235, 41, 0, 0, 0, 0, 0, 229, 255, 239, 6, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 16, 184, 74, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 229, 125, 0, 0, 0, 0, 192, 239, 7, 16, 122, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 250, 223, 2, 0, 0, 0, 208, 255, 8, 176, 255, 27, 0, 0, 0, 0,
         0, 0, 0, 64, 254, 143, 0, 0, 0, 0, 208, 255, 8, 144, 255, 239, 5, 0, 0, 0,
@@ -3206,48 +3206,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 96, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 6, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 144, 255, 221, 221, 221, 254, 223, 221, 221, 253, 239, 221, 221, 221, 255, 9, 0, 0,
-        0, 0, 144, 255, 5, 0, 0, 251, 78, 0, 0, 228, 191, 0, 0, 80, 255, 9, 0, 0,
-        0, 0, 144, 255, 5, 0, 0, 251, 78, 0, 0, 228, 191, 0, 0, 80, 255, 9, 0, 0,
-        0, 0, 144, 255, 87, 85, 85, 252, 110, 85, 85, 230, 207, 85, 85, 117, 255, 9, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 112, 205, 4, 0, 0, 0, 0, 251, 94, 0, 0, 0, 0, 64, 220, 7, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 13, 0,
-        0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 13, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 96, 220, 221, 221, 221, 221, 254, 223, 221, 221, 221, 221, 221, 9, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 89, 85, 85, 85, 85, 85, 85, 85, 85, 101, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 89, 85, 85, 85, 85, 85, 85, 85, 85, 101, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 167, 170, 186, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 173, 170, 106, 0,
-        0, 251, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 217, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 125, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 249, 255, 255, 255, 159, 0, 0, 248, 159, 0, 0, 82, 85, 85, 85, 69, 0, 0,
@@ -3332,48 +3290,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 80, 4, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 230, 126, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 32, 253, 255, 8, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 212, 255, 175, 0, 251, 95, 83, 85, 85, 85, 197, 255, 89, 85, 85, 85, 37, 0,
-        0, 0, 48, 253, 255, 10, 251, 95, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
-        0, 0, 0, 211, 239, 6, 251, 95, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
-        0, 0, 0, 64, 108, 0, 252, 95, 83, 85, 85, 85, 197, 255, 89, 85, 85, 85, 37, 0,
-        0, 0, 0, 0, 0, 231, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 213, 255, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 0, 196, 255, 255, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 180, 255, 255, 159, 251, 95, 32, 85, 85, 85, 197, 255, 89, 85, 85, 85, 1, 0,
-        0, 162, 255, 255, 191, 3, 251, 95, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 5, 0,
-        0, 176, 255, 207, 4, 0, 251, 95, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 5, 0,
-        0, 80, 238, 7, 0, 0, 251, 95, 32, 149, 88, 85, 85, 85, 85, 85, 85, 85, 1, 0,
-        0, 0, 21, 0, 0, 0, 251, 95, 80, 253, 45, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 84, 21, 64, 254, 175, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 255, 6, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 196, 221, 221, 221, 221, 221, 221, 221, 253, 239, 221, 221, 221, 221, 221, 221, 221, 125, 0,
-        0, 245, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 229, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 0, 0, 0, 0, 0, 0, 16, 251, 255, 223, 2, 0, 0, 0, 0, 18, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 212, 255, 222, 255, 9, 0, 0, 0, 180, 159, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 128, 255, 239, 101, 254, 110, 0, 0, 163, 255, 239, 5, 0, 0,
-        0, 0, 0, 0, 0, 64, 252, 255, 77, 0, 250, 239, 4, 162, 255, 255, 223, 6, 0, 0,
-        0, 0, 0, 0, 48, 250, 255, 175, 1, 0, 176, 255, 190, 255, 255, 191, 4, 0, 0, 0,
-        0, 0, 0, 64, 250, 255, 255, 13, 0, 0, 32, 253, 255, 255, 142, 1, 0, 0, 0, 0,
-        0, 0, 96, 252, 255, 255, 255, 13, 0, 0, 0, 212, 255, 207, 3, 0, 0, 0, 0, 0,
-        0, 181, 254, 255, 255, 91, 254, 13, 0, 0, 16, 53, 252, 255, 191, 4, 0, 0, 0, 0,
-        0, 247, 255, 255, 76, 64, 254, 13, 0, 130, 253, 78, 144, 255, 255, 223, 40, 0, 0, 0,
-        0, 176, 255, 58, 0, 64, 254, 77, 234, 255, 255, 78, 0, 196, 255, 255, 255, 206, 73, 0,
-        0, 64, 6, 0, 0, 96, 255, 255, 255, 255, 239, 42, 0, 0, 197, 255, 255, 255, 110, 0,
-        0, 0, 0, 0, 0, 176, 255, 255, 255, 174, 4, 0, 0, 0, 0, 146, 253, 255, 8, 0,
-        0, 0, 0, 0, 0, 128, 255, 239, 57, 0, 0, 0, 0, 0, 0, 0, 16, 134, 0, 0,
-        0, 0, 0, 0, 0, 0, 203, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 179, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 96, 255, 110, 0, 0, 160, 221, 221, 221, 221, 221, 221, 221, 221, 221, 9, 0, 0,
         0, 0, 0, 252, 207, 0, 0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0,
@@ -3668,48 +3584,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 84, 85, 85, 85, 85, 85, 85, 1, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 255, 255, 255, 255, 255, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 255, 255, 255, 255, 255, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 175, 170, 170, 170, 234, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 0, 0, 0, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 0, 0, 0, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 96, 220, 9, 208, 255, 5, 0, 0, 144, 255, 173, 170, 170, 170, 122, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 255, 255, 255, 255, 191, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 255, 255, 255, 255, 191, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 92, 85, 85, 85, 69, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 69, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 69, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 0, 251, 95, 144, 255, 9, 208, 255, 69, 254, 174, 170, 170, 170, 170, 250, 223, 0, 0,
-        0, 0, 251, 95, 144, 255, 8, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 251, 95, 176, 255, 6, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 251, 95, 208, 239, 5, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 84, 21, 228, 223, 105, 0, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 0, 248, 255, 239, 6, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 32, 253, 255, 255, 78, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 128, 255, 110, 254, 239, 4, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 230, 255, 10, 230, 255, 45, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 64, 254, 223, 3, 96, 254, 223, 66, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 230, 255, 110, 0, 0, 249, 255, 75, 254, 223, 221, 221, 221, 221, 253, 223, 0, 0,
-        0, 144, 255, 255, 8, 0, 0, 176, 255, 93, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 230, 255, 127, 0, 0, 0, 32, 205, 66, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 128, 239, 6, 0, 0, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 71, 0, 0, 0, 0, 0, 0, 48, 253, 61, 0, 0, 0, 0, 229, 207, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 76, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 255, 13, 0, 0, 0, 0, 0, 0,
         0, 0, 251, 255, 255, 255, 255, 13, 0, 0, 0, 192, 255, 9, 0, 0, 0, 0, 0, 0,
@@ -4550,7 +4424,7 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }
 };
-set_glyph(108, (const unsigned int*)font_glyph_unicode, (const unsigned char*)font_glyph_bitmaps);
+set_glyph(105, (const unsigned int*)font_glyph_unicode, (const unsigned char*)font_glyph_bitmaps);
 }
 };
 

diff --git a/app/src/main/cpp/myfontface.h b/app/src/main/cpp/myfontface.h
index 8c321ee..df853d7 100644
--- a/app/src/main/cpp/myfontface.h
+++ b/app/src/main/cpp/myfontface.h
@@ -9,10 +9,10 @@
 public:
 MyFontFace()
 {
-static const unsigned int font_glyph_unicode[108] = {
-    19977, 19994, 20142, 20154, 20202, 20307, 20316, 20445, 20449, 20809, 20840, 20844, 20851, 20855, 20869, 20934, 20999, 21046, 21147, 21361, 21387, 21487, 21488, 21578, 21628, 21897, 22120, 22270, 22791, 22806, 22836, 23433, 23545, 24037, 24102, 24125, 24320, 24687, 25106, 25252, 25253, 25509, 25511, 26029, 26045, 26126, 26381, 26538, 26550, 26564, 26631, 26643, 26816, 27668, 27700, 27969, 27979, 28040, 28388, 28779, 28781, 28783, 28790, 29031, 29060, 29123, 29260, 30005, 30693, 31034, 31629, 31649, 31665, 32440, 32447, 32499, 32622, 33050, 34920, 35013, 35064, 35686, 35745, 35762, 35774, 35782, 35843, 36148, 36328, 36335, 36719, 36807, 36865, 36890, 36947, 37096, 37197, 37327, 38181, 38271, 38376, 38378, 38400, 38450, 38505, 38706, 38750, 39118
+static const unsigned int font_glyph_unicode[105] = {
+    19977, 19994, 20142, 20154, 20202, 20307, 20316, 20445, 20449, 20809, 20840, 20844, 20851, 20855, 20869, 20934, 20999, 21046, 21147, 21361, 21387, 21487, 21488, 21578, 21628, 21897, 22120, 22270, 22791, 22806, 22836, 23433, 23545, 24037, 24102, 24125, 24320, 24687, 25106, 25252, 25253, 25506, 25509, 25511, 26029, 26045, 26126, 26381, 26538, 26550, 26564, 26631, 26643, 26816, 27668, 27700, 27969, 27979, 28040, 28388, 28779, 28781, 28783, 28790, 29031, 29060, 29123, 29260, 30005, 30693, 31034, 31629, 31649, 31665, 32447, 32499, 33050, 34920, 35064, 35686, 35745, 35762, 35774, 35782, 35843, 36328, 36335, 36719, 36807, 36865, 36890, 36947, 37096, 37197, 37327, 38181, 38271, 38376, 38378, 38400, 38450, 38505, 38706, 38750, 39118
 };
-static const unsigned char font_glyph_bitmaps[108][40 * 20] = {
+static const unsigned char font_glyph_bitmaps[105][40 * 20] = {
     {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1736,6 +1736,48 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
+        0, 0, 0, 128, 154, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 83, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 4, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 159, 0, 0, 0, 0, 0, 0, 0, 80, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 159, 0, 0, 0, 0, 0, 0, 0, 80, 255, 11, 0,
+        0, 229, 255, 255, 255, 255, 191, 249, 159, 0, 183, 2, 0, 32, 172, 0, 80, 255, 11, 0,
+        0, 245, 255, 255, 255, 255, 191, 215, 125, 96, 254, 94, 0, 210, 255, 44, 64, 220, 9, 0,
+        0, 196, 221, 253, 255, 221, 157, 0, 0, 210, 255, 45, 0, 160, 255, 223, 4, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 251, 239, 4, 0, 0, 248, 255, 78, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 160, 255, 110, 0, 0, 0, 112, 255, 239, 6, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 249, 255, 8, 0, 0, 0, 0, 230, 255, 127, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 128, 255, 175, 0, 48, 253, 61, 0, 96, 254, 255, 7, 0,
+        0, 0, 0, 208, 239, 4, 0, 230, 255, 11, 0, 64, 254, 78, 0, 0, 230, 207, 2, 0,
+        0, 0, 0, 208, 239, 4, 16, 96, 206, 2, 0, 64, 254, 78, 0, 0, 96, 43, 0, 0,
+        0, 0, 0, 208, 239, 216, 143, 0, 1, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 210, 255, 255, 159, 169, 170, 170, 170, 170, 254, 174, 170, 170, 170, 170, 73, 0,
+        0, 80, 234, 255, 255, 255, 159, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
+        0, 250, 255, 255, 255, 107, 80, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
+        0, 249, 255, 255, 239, 4, 0, 0, 0, 0, 176, 255, 255, 255, 159, 0, 0, 0, 0, 0,
+        0, 248, 108, 208, 239, 4, 0, 0, 0, 0, 247, 223, 254, 238, 239, 4, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 64, 254, 127, 254, 158, 255, 11, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 176, 255, 74, 254, 94, 253, 127, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 250, 223, 66, 254, 78, 247, 239, 4, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 128, 255, 110, 64, 254, 78, 176, 255, 45, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 248, 255, 8, 64, 254, 78, 32, 253, 223, 3, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 144, 255, 175, 0, 64, 254, 78, 0, 230, 255, 77, 0, 0,
+        0, 0, 0, 208, 239, 4, 32, 252, 255, 10, 0, 64, 254, 78, 0, 112, 255, 255, 9, 0,
+        0, 0, 0, 208, 239, 4, 230, 255, 175, 0, 0, 64, 254, 78, 0, 0, 247, 255, 207, 2,
+        0, 0, 0, 211, 239, 36, 253, 255, 9, 0, 0, 64, 254, 78, 0, 0, 96, 254, 111, 0,
+        0, 198, 170, 252, 239, 4, 212, 143, 0, 0, 0, 64, 254, 78, 0, 0, 0, 212, 10, 0,
+        0, 246, 255, 255, 207, 0, 48, 4, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 228, 255, 255, 110, 0, 0, 0, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 146, 170, 105, 1, 0, 0, 0, 0, 0, 0, 48, 253, 61, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    },
+    {
         0, 0, 0, 144, 205, 4, 0, 0, 0, 0, 0, 112, 206, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 176, 255, 5, 0, 0, 0, 0, 0, 211, 255, 8, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 176, 255, 5, 0, 0, 0, 0, 0, 128, 255, 45, 0, 0, 0, 0, 0, 0,
@@ -3080,48 +3122,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 64, 156, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 144, 255, 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 117, 185, 5, 0,
-        0, 0, 0, 210, 255, 10, 0, 0, 0, 82, 85, 117, 170, 219, 253, 255, 255, 255, 9, 0,
-        0, 0, 0, 247, 239, 4, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 45, 0,
-        0, 0, 0, 252, 175, 0, 0, 0, 253, 255, 255, 255, 255, 255, 255, 222, 172, 122, 5, 0,
-        0, 0, 112, 255, 62, 0, 0, 0, 253, 175, 122, 85, 197, 255, 9, 0, 0, 0, 0, 0,
-        0, 0, 192, 255, 9, 32, 90, 0, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 0, 247, 223, 2, 128, 255, 44, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 32, 253, 143, 0, 210, 255, 9, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 128, 255, 12, 0, 249, 223, 2, 253, 95, 0, 0, 160, 255, 9, 0, 0, 0, 0, 0,
-        0, 228, 255, 6, 64, 254, 143, 0, 253, 95, 0, 0, 144, 255, 9, 0, 0, 0, 0, 0,
-        0, 250, 239, 221, 221, 255, 12, 0, 253, 95, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 248, 255, 255, 255, 239, 5, 0, 253, 95, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 229, 239, 221, 255, 175, 0, 0, 253, 95, 0, 0, 128, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 0, 112, 255, 45, 0, 0, 253, 223, 221, 221, 221, 255, 222, 221, 221, 221, 76, 0,
-        0, 0, 0, 210, 255, 7, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 95, 0,
-        0, 0, 0, 250, 191, 0, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 95, 0,
-        0, 0, 96, 254, 78, 0, 0, 0, 253, 95, 0, 0, 80, 255, 78, 0, 0, 0, 0, 0,
-        0, 0, 210, 255, 8, 0, 0, 0, 253, 95, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0,
-        0, 0, 251, 191, 0, 16, 117, 4, 253, 95, 0, 0, 32, 253, 95, 0, 0, 0, 0, 0,
-        0, 194, 255, 223, 254, 255, 255, 8, 253, 95, 0, 0, 0, 253, 111, 0, 0, 0, 0, 0,
-        0, 210, 255, 255, 255, 255, 255, 5, 253, 95, 0, 0, 0, 251, 143, 0, 0, 0, 0, 0,
-        0, 176, 255, 255, 206, 138, 37, 0, 253, 95, 0, 0, 0, 249, 175, 0, 0, 0, 0, 0,
-        0, 80, 70, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 248, 191, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 245, 223, 2, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 211, 255, 5, 0, 214, 74, 0,
-        0, 0, 0, 0, 0, 32, 183, 11, 253, 95, 0, 0, 0, 176, 255, 8, 0, 248, 191, 0,
-        0, 0, 0, 64, 201, 254, 255, 11, 253, 95, 0, 0, 96, 132, 255, 12, 0, 249, 175, 0,
-        0, 130, 235, 255, 255, 255, 255, 11, 253, 95, 0, 164, 255, 88, 254, 94, 0, 250, 143, 0,
-        0, 246, 255, 255, 255, 190, 39, 0, 253, 111, 215, 255, 255, 8, 252, 191, 0, 251, 127, 0,
-        0, 211, 255, 190, 39, 0, 0, 80, 254, 255, 255, 255, 223, 5, 247, 255, 6, 253, 94, 0,
-        0, 112, 39, 0, 0, 0, 0, 176, 255, 255, 255, 174, 4, 0, 176, 255, 223, 255, 61, 0,
-        0, 0, 0, 0, 0, 0, 0, 112, 255, 255, 108, 0, 0, 0, 64, 254, 255, 255, 11, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 235, 41, 0, 0, 0, 0, 0, 229, 255, 239, 6, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 16, 184, 74, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 229, 125, 0, 0, 0, 0, 192, 239, 7, 16, 122, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 250, 223, 2, 0, 0, 0, 208, 255, 8, 176, 255, 27, 0, 0, 0, 0,
         0, 0, 0, 64, 254, 143, 0, 0, 0, 0, 208, 255, 8, 144, 255, 239, 5, 0, 0, 0,
@@ -3206,48 +3206,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 96, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 6, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 144, 255, 221, 221, 221, 254, 223, 221, 221, 253, 239, 221, 221, 221, 255, 9, 0, 0,
-        0, 0, 144, 255, 5, 0, 0, 251, 78, 0, 0, 228, 191, 0, 0, 80, 255, 9, 0, 0,
-        0, 0, 144, 255, 5, 0, 0, 251, 78, 0, 0, 228, 191, 0, 0, 80, 255, 9, 0, 0,
-        0, 0, 144, 255, 87, 85, 85, 252, 110, 85, 85, 230, 207, 85, 85, 117, 255, 9, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 112, 205, 4, 0, 0, 0, 0, 251, 94, 0, 0, 0, 0, 64, 220, 7, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 13, 0,
-        0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 13, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 96, 220, 221, 221, 221, 221, 254, 223, 221, 221, 221, 221, 221, 9, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 89, 85, 85, 85, 85, 85, 85, 85, 85, 101, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 89, 85, 85, 85, 85, 85, 85, 85, 85, 101, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 167, 170, 186, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 173, 170, 106, 0,
-        0, 251, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 217, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 125, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 249, 255, 255, 255, 159, 0, 0, 248, 159, 0, 0, 82, 85, 85, 85, 69, 0, 0,
@@ -3332,48 +3290,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 80, 4, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 230, 126, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 32, 253, 255, 8, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 212, 255, 175, 0, 251, 95, 83, 85, 85, 85, 197, 255, 89, 85, 85, 85, 37, 0,
-        0, 0, 48, 253, 255, 10, 251, 95, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
-        0, 0, 0, 211, 239, 6, 251, 95, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
-        0, 0, 0, 64, 108, 0, 252, 95, 83, 85, 85, 85, 197, 255, 89, 85, 85, 85, 37, 0,
-        0, 0, 0, 0, 0, 231, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 213, 255, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 0, 196, 255, 255, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 180, 255, 255, 159, 251, 95, 32, 85, 85, 85, 197, 255, 89, 85, 85, 85, 1, 0,
-        0, 162, 255, 255, 191, 3, 251, 95, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 5, 0,
-        0, 176, 255, 207, 4, 0, 251, 95, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 5, 0,
-        0, 80, 238, 7, 0, 0, 251, 95, 32, 149, 88, 85, 85, 85, 85, 85, 85, 85, 1, 0,
-        0, 0, 21, 0, 0, 0, 251, 95, 80, 253, 45, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 84, 21, 64, 254, 175, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 255, 6, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 196, 221, 221, 221, 221, 221, 221, 221, 253, 239, 221, 221, 221, 221, 221, 221, 221, 125, 0,
-        0, 245, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 229, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 0, 0, 0, 0, 0, 0, 16, 251, 255, 223, 2, 0, 0, 0, 0, 18, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 212, 255, 222, 255, 9, 0, 0, 0, 180, 159, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 128, 255, 239, 101, 254, 110, 0, 0, 163, 255, 239, 5, 0, 0,
-        0, 0, 0, 0, 0, 64, 252, 255, 77, 0, 250, 239, 4, 162, 255, 255, 223, 6, 0, 0,
-        0, 0, 0, 0, 48, 250, 255, 175, 1, 0, 176, 255, 190, 255, 255, 191, 4, 0, 0, 0,
-        0, 0, 0, 64, 250, 255, 255, 13, 0, 0, 32, 253, 255, 255, 142, 1, 0, 0, 0, 0,
-        0, 0, 96, 252, 255, 255, 255, 13, 0, 0, 0, 212, 255, 207, 3, 0, 0, 0, 0, 0,
-        0, 181, 254, 255, 255, 91, 254, 13, 0, 0, 16, 53, 252, 255, 191, 4, 0, 0, 0, 0,
-        0, 247, 255, 255, 76, 64, 254, 13, 0, 130, 253, 78, 144, 255, 255, 223, 40, 0, 0, 0,
-        0, 176, 255, 58, 0, 64, 254, 77, 234, 255, 255, 78, 0, 196, 255, 255, 255, 206, 73, 0,
-        0, 64, 6, 0, 0, 96, 255, 255, 255, 255, 239, 42, 0, 0, 197, 255, 255, 255, 110, 0,
-        0, 0, 0, 0, 0, 176, 255, 255, 255, 174, 4, 0, 0, 0, 0, 146, 253, 255, 8, 0,
-        0, 0, 0, 0, 0, 128, 255, 239, 57, 0, 0, 0, 0, 0, 0, 0, 16, 134, 0, 0,
-        0, 0, 0, 0, 0, 0, 203, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 179, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 96, 255, 110, 0, 0, 160, 221, 221, 221, 221, 221, 221, 221, 221, 221, 9, 0, 0,
         0, 0, 0, 252, 207, 0, 0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0,
@@ -3668,48 +3584,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 84, 85, 85, 85, 85, 85, 85, 1, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 255, 255, 255, 255, 255, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 255, 255, 255, 255, 255, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 175, 170, 170, 170, 234, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 0, 0, 0, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 0, 0, 0, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 96, 220, 9, 208, 255, 5, 0, 0, 144, 255, 173, 170, 170, 170, 122, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 255, 255, 255, 255, 191, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 255, 255, 255, 255, 191, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 92, 85, 85, 85, 69, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 69, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 69, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 0, 251, 95, 144, 255, 9, 208, 255, 69, 254, 174, 170, 170, 170, 170, 250, 223, 0, 0,
-        0, 0, 251, 95, 144, 255, 8, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 251, 95, 176, 255, 6, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 251, 95, 208, 239, 5, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 84, 21, 228, 223, 105, 0, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 0, 248, 255, 239, 6, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 32, 253, 255, 255, 78, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 128, 255, 110, 254, 239, 4, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 230, 255, 10, 230, 255, 45, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 64, 254, 223, 3, 96, 254, 223, 66, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 230, 255, 110, 0, 0, 249, 255, 75, 254, 223, 221, 221, 221, 221, 253, 223, 0, 0,
-        0, 144, 255, 255, 8, 0, 0, 176, 255, 93, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 230, 255, 127, 0, 0, 0, 32, 205, 66, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 128, 239, 6, 0, 0, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 71, 0, 0, 0, 0, 0, 0, 48, 253, 61, 0, 0, 0, 0, 229, 207, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 76, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 255, 13, 0, 0, 0, 0, 0, 0,
         0, 0, 251, 255, 255, 255, 255, 13, 0, 0, 0, 192, 255, 9, 0, 0, 0, 0, 0, 0,
@@ -4550,7 +4424,7 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }
 };
-set_glyph(108, (const unsigned int*)font_glyph_unicode, (const unsigned char*)font_glyph_bitmaps);
+set_glyph(105, (const unsigned int*)font_glyph_unicode, (const unsigned char*)font_glyph_bitmaps);
 }
 };
 
diff --git a/app/src/main/cpp/yolo.cpp b/app/src/main/cpp/yolo.cpp
index e3057d7..fa7b465 100644
--- a/app/src/main/cpp/yolo.cpp
+++ b/app/src/main/cpp/yolo.cpp
@@ -856,10 +856,10 @@
         "三脚架", "三通", "标准软管", "人", "作业信息公示牌", "切断阀", "危险告知牌",
         "压力表", "压力表", "防护服", "可燃气体报警控制器", "呼气器", "喉箍", "气体检测报警仪",
         "水枪", "头", "安全告知牌", "安全带", "安全帽", "安全标识", "安全标识牌",
-        "安全绳", "对讲设备", "水枪", "工服", "开关", "报警装置", "接头",
+        "安全绳", "对讲设备", "水枪", "工服", "开关", "燃气探测器", "接头",
         "施工路牌", "气体检测报警仪", "水带", "水带", "流量计", "消火栓箱", "灭火器",
         "灶台", "灶具", "照明设备", "熄火保护", "燃气管道", "燃气计量器具", "电线裸露",
-        "电路图", "警戒线", "调压器", "调长器", "贴纸", "跨电线", "路锥",
+        "电路图", "警戒线", "调压器", "调长器", "标识", "跨电线", "路锥",
         "过滤器", "配电箱内部", "配电箱外部", "长柄阀门", "闪光灯亮", "闪光灯灭", "阀门",
         "非标准软管", "送风设备", "送风设备"
 };
@@ -868,6 +868,11 @@
     for (const auto &obj: objects) {
         cv::Scalar rect_cc;
 
+        //识别出来标识贴纸但是不是配电箱场景，不显示出来
+        if (obj.label == 46 && j_scene_code != 0) {
+            break;
+        }
+
         if (obj.label == 15 || obj.label == 53 || obj.label == 54) {
             break;
         }

diff --git a/app/src/main/cpp/myfontface.h b/app/src/main/cpp/myfontface.h
index 8c321ee..df853d7 100644
--- a/app/src/main/cpp/myfontface.h
+++ b/app/src/main/cpp/myfontface.h
@@ -9,10 +9,10 @@
 public:
 MyFontFace()
 {
-static const unsigned int font_glyph_unicode[108] = {
-    19977, 19994, 20142, 20154, 20202, 20307, 20316, 20445, 20449, 20809, 20840, 20844, 20851, 20855, 20869, 20934, 20999, 21046, 21147, 21361, 21387, 21487, 21488, 21578, 21628, 21897, 22120, 22270, 22791, 22806, 22836, 23433, 23545, 24037, 24102, 24125, 24320, 24687, 25106, 25252, 25253, 25509, 25511, 26029, 26045, 26126, 26381, 26538, 26550, 26564, 26631, 26643, 26816, 27668, 27700, 27969, 27979, 28040, 28388, 28779, 28781, 28783, 28790, 29031, 29060, 29123, 29260, 30005, 30693, 31034, 31629, 31649, 31665, 32440, 32447, 32499, 32622, 33050, 34920, 35013, 35064, 35686, 35745, 35762, 35774, 35782, 35843, 36148, 36328, 36335, 36719, 36807, 36865, 36890, 36947, 37096, 37197, 37327, 38181, 38271, 38376, 38378, 38400, 38450, 38505, 38706, 38750, 39118
+static const unsigned int font_glyph_unicode[105] = {
+    19977, 19994, 20142, 20154, 20202, 20307, 20316, 20445, 20449, 20809, 20840, 20844, 20851, 20855, 20869, 20934, 20999, 21046, 21147, 21361, 21387, 21487, 21488, 21578, 21628, 21897, 22120, 22270, 22791, 22806, 22836, 23433, 23545, 24037, 24102, 24125, 24320, 24687, 25106, 25252, 25253, 25506, 25509, 25511, 26029, 26045, 26126, 26381, 26538, 26550, 26564, 26631, 26643, 26816, 27668, 27700, 27969, 27979, 28040, 28388, 28779, 28781, 28783, 28790, 29031, 29060, 29123, 29260, 30005, 30693, 31034, 31629, 31649, 31665, 32447, 32499, 33050, 34920, 35064, 35686, 35745, 35762, 35774, 35782, 35843, 36328, 36335, 36719, 36807, 36865, 36890, 36947, 37096, 37197, 37327, 38181, 38271, 38376, 38378, 38400, 38450, 38505, 38706, 38750, 39118
 };
-static const unsigned char font_glyph_bitmaps[108][40 * 20] = {
+static const unsigned char font_glyph_bitmaps[105][40 * 20] = {
     {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1736,6 +1736,48 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
+        0, 0, 0, 128, 154, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 83, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 4, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 159, 0, 0, 0, 0, 0, 0, 0, 80, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 159, 0, 0, 0, 0, 0, 0, 0, 80, 255, 11, 0,
+        0, 229, 255, 255, 255, 255, 191, 249, 159, 0, 183, 2, 0, 32, 172, 0, 80, 255, 11, 0,
+        0, 245, 255, 255, 255, 255, 191, 215, 125, 96, 254, 94, 0, 210, 255, 44, 64, 220, 9, 0,
+        0, 196, 221, 253, 255, 221, 157, 0, 0, 210, 255, 45, 0, 160, 255, 223, 4, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 251, 239, 4, 0, 0, 248, 255, 78, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 160, 255, 110, 0, 0, 0, 112, 255, 239, 6, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 249, 255, 8, 0, 0, 0, 0, 230, 255, 127, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 128, 255, 175, 0, 48, 253, 61, 0, 96, 254, 255, 7, 0,
+        0, 0, 0, 208, 239, 4, 0, 230, 255, 11, 0, 64, 254, 78, 0, 0, 230, 207, 2, 0,
+        0, 0, 0, 208, 239, 4, 16, 96, 206, 2, 0, 64, 254, 78, 0, 0, 96, 43, 0, 0,
+        0, 0, 0, 208, 239, 216, 143, 0, 1, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 210, 255, 255, 159, 169, 170, 170, 170, 170, 254, 174, 170, 170, 170, 170, 73, 0,
+        0, 80, 234, 255, 255, 255, 159, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
+        0, 250, 255, 255, 255, 107, 80, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
+        0, 249, 255, 255, 239, 4, 0, 0, 0, 0, 176, 255, 255, 255, 159, 0, 0, 0, 0, 0,
+        0, 248, 108, 208, 239, 4, 0, 0, 0, 0, 247, 223, 254, 238, 239, 4, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 64, 254, 127, 254, 158, 255, 11, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 176, 255, 74, 254, 94, 253, 127, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 250, 223, 66, 254, 78, 247, 239, 4, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 128, 255, 110, 64, 254, 78, 176, 255, 45, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 248, 255, 8, 64, 254, 78, 32, 253, 223, 3, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 144, 255, 175, 0, 64, 254, 78, 0, 230, 255, 77, 0, 0,
+        0, 0, 0, 208, 239, 4, 32, 252, 255, 10, 0, 64, 254, 78, 0, 112, 255, 255, 9, 0,
+        0, 0, 0, 208, 239, 4, 230, 255, 175, 0, 0, 64, 254, 78, 0, 0, 247, 255, 207, 2,
+        0, 0, 0, 211, 239, 36, 253, 255, 9, 0, 0, 64, 254, 78, 0, 0, 96, 254, 111, 0,
+        0, 198, 170, 252, 239, 4, 212, 143, 0, 0, 0, 64, 254, 78, 0, 0, 0, 212, 10, 0,
+        0, 246, 255, 255, 207, 0, 48, 4, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 228, 255, 255, 110, 0, 0, 0, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 146, 170, 105, 1, 0, 0, 0, 0, 0, 0, 48, 253, 61, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    },
+    {
         0, 0, 0, 144, 205, 4, 0, 0, 0, 0, 0, 112, 206, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 176, 255, 5, 0, 0, 0, 0, 0, 211, 255, 8, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 176, 255, 5, 0, 0, 0, 0, 0, 128, 255, 45, 0, 0, 0, 0, 0, 0,
@@ -3080,48 +3122,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 64, 156, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 144, 255, 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 117, 185, 5, 0,
-        0, 0, 0, 210, 255, 10, 0, 0, 0, 82, 85, 117, 170, 219, 253, 255, 255, 255, 9, 0,
-        0, 0, 0, 247, 239, 4, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 45, 0,
-        0, 0, 0, 252, 175, 0, 0, 0, 253, 255, 255, 255, 255, 255, 255, 222, 172, 122, 5, 0,
-        0, 0, 112, 255, 62, 0, 0, 0, 253, 175, 122, 85, 197, 255, 9, 0, 0, 0, 0, 0,
-        0, 0, 192, 255, 9, 32, 90, 0, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 0, 247, 223, 2, 128, 255, 44, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 32, 253, 143, 0, 210, 255, 9, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 128, 255, 12, 0, 249, 223, 2, 253, 95, 0, 0, 160, 255, 9, 0, 0, 0, 0, 0,
-        0, 228, 255, 6, 64, 254, 143, 0, 253, 95, 0, 0, 144, 255, 9, 0, 0, 0, 0, 0,
-        0, 250, 239, 221, 221, 255, 12, 0, 253, 95, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 248, 255, 255, 255, 239, 5, 0, 253, 95, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 229, 239, 221, 255, 175, 0, 0, 253, 95, 0, 0, 128, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 0, 112, 255, 45, 0, 0, 253, 223, 221, 221, 221, 255, 222, 221, 221, 221, 76, 0,
-        0, 0, 0, 210, 255, 7, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 95, 0,
-        0, 0, 0, 250, 191, 0, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 95, 0,
-        0, 0, 96, 254, 78, 0, 0, 0, 253, 95, 0, 0, 80, 255, 78, 0, 0, 0, 0, 0,
-        0, 0, 210, 255, 8, 0, 0, 0, 253, 95, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0,
-        0, 0, 251, 191, 0, 16, 117, 4, 253, 95, 0, 0, 32, 253, 95, 0, 0, 0, 0, 0,
-        0, 194, 255, 223, 254, 255, 255, 8, 253, 95, 0, 0, 0, 253, 111, 0, 0, 0, 0, 0,
-        0, 210, 255, 255, 255, 255, 255, 5, 253, 95, 0, 0, 0, 251, 143, 0, 0, 0, 0, 0,
-        0, 176, 255, 255, 206, 138, 37, 0, 253, 95, 0, 0, 0, 249, 175, 0, 0, 0, 0, 0,
-        0, 80, 70, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 248, 191, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 245, 223, 2, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 211, 255, 5, 0, 214, 74, 0,
-        0, 0, 0, 0, 0, 32, 183, 11, 253, 95, 0, 0, 0, 176, 255, 8, 0, 248, 191, 0,
-        0, 0, 0, 64, 201, 254, 255, 11, 253, 95, 0, 0, 96, 132, 255, 12, 0, 249, 175, 0,
-        0, 130, 235, 255, 255, 255, 255, 11, 253, 95, 0, 164, 255, 88, 254, 94, 0, 250, 143, 0,
-        0, 246, 255, 255, 255, 190, 39, 0, 253, 111, 215, 255, 255, 8, 252, 191, 0, 251, 127, 0,
-        0, 211, 255, 190, 39, 0, 0, 80, 254, 255, 255, 255, 223, 5, 247, 255, 6, 253, 94, 0,
-        0, 112, 39, 0, 0, 0, 0, 176, 255, 255, 255, 174, 4, 0, 176, 255, 223, 255, 61, 0,
-        0, 0, 0, 0, 0, 0, 0, 112, 255, 255, 108, 0, 0, 0, 64, 254, 255, 255, 11, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 235, 41, 0, 0, 0, 0, 0, 229, 255, 239, 6, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 16, 184, 74, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 229, 125, 0, 0, 0, 0, 192, 239, 7, 16, 122, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 250, 223, 2, 0, 0, 0, 208, 255, 8, 176, 255, 27, 0, 0, 0, 0,
         0, 0, 0, 64, 254, 143, 0, 0, 0, 0, 208, 255, 8, 144, 255, 239, 5, 0, 0, 0,
@@ -3206,48 +3206,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 96, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 6, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 144, 255, 221, 221, 221, 254, 223, 221, 221, 253, 239, 221, 221, 221, 255, 9, 0, 0,
-        0, 0, 144, 255, 5, 0, 0, 251, 78, 0, 0, 228, 191, 0, 0, 80, 255, 9, 0, 0,
-        0, 0, 144, 255, 5, 0, 0, 251, 78, 0, 0, 228, 191, 0, 0, 80, 255, 9, 0, 0,
-        0, 0, 144, 255, 87, 85, 85, 252, 110, 85, 85, 230, 207, 85, 85, 117, 255, 9, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 112, 205, 4, 0, 0, 0, 0, 251, 94, 0, 0, 0, 0, 64, 220, 7, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 13, 0,
-        0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 13, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 96, 220, 221, 221, 221, 221, 254, 223, 221, 221, 221, 221, 221, 9, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 89, 85, 85, 85, 85, 85, 85, 85, 85, 101, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 89, 85, 85, 85, 85, 85, 85, 85, 85, 101, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 167, 170, 186, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 173, 170, 106, 0,
-        0, 251, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 217, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 125, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 249, 255, 255, 255, 159, 0, 0, 248, 159, 0, 0, 82, 85, 85, 85, 69, 0, 0,
@@ -3332,48 +3290,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 80, 4, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 230, 126, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 32, 253, 255, 8, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 212, 255, 175, 0, 251, 95, 83, 85, 85, 85, 197, 255, 89, 85, 85, 85, 37, 0,
-        0, 0, 48, 253, 255, 10, 251, 95, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
-        0, 0, 0, 211, 239, 6, 251, 95, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
-        0, 0, 0, 64, 108, 0, 252, 95, 83, 85, 85, 85, 197, 255, 89, 85, 85, 85, 37, 0,
-        0, 0, 0, 0, 0, 231, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 213, 255, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 0, 196, 255, 255, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 180, 255, 255, 159, 251, 95, 32, 85, 85, 85, 197, 255, 89, 85, 85, 85, 1, 0,
-        0, 162, 255, 255, 191, 3, 251, 95, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 5, 0,
-        0, 176, 255, 207, 4, 0, 251, 95, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 5, 0,
-        0, 80, 238, 7, 0, 0, 251, 95, 32, 149, 88, 85, 85, 85, 85, 85, 85, 85, 1, 0,
-        0, 0, 21, 0, 0, 0, 251, 95, 80, 253, 45, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 84, 21, 64, 254, 175, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 255, 6, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 196, 221, 221, 221, 221, 221, 221, 221, 253, 239, 221, 221, 221, 221, 221, 221, 221, 125, 0,
-        0, 245, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 229, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 0, 0, 0, 0, 0, 0, 16, 251, 255, 223, 2, 0, 0, 0, 0, 18, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 212, 255, 222, 255, 9, 0, 0, 0, 180, 159, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 128, 255, 239, 101, 254, 110, 0, 0, 163, 255, 239, 5, 0, 0,
-        0, 0, 0, 0, 0, 64, 252, 255, 77, 0, 250, 239, 4, 162, 255, 255, 223, 6, 0, 0,
-        0, 0, 0, 0, 48, 250, 255, 175, 1, 0, 176, 255, 190, 255, 255, 191, 4, 0, 0, 0,
-        0, 0, 0, 64, 250, 255, 255, 13, 0, 0, 32, 253, 255, 255, 142, 1, 0, 0, 0, 0,
-        0, 0, 96, 252, 255, 255, 255, 13, 0, 0, 0, 212, 255, 207, 3, 0, 0, 0, 0, 0,
-        0, 181, 254, 255, 255, 91, 254, 13, 0, 0, 16, 53, 252, 255, 191, 4, 0, 0, 0, 0,
-        0, 247, 255, 255, 76, 64, 254, 13, 0, 130, 253, 78, 144, 255, 255, 223, 40, 0, 0, 0,
-        0, 176, 255, 58, 0, 64, 254, 77, 234, 255, 255, 78, 0, 196, 255, 255, 255, 206, 73, 0,
-        0, 64, 6, 0, 0, 96, 255, 255, 255, 255, 239, 42, 0, 0, 197, 255, 255, 255, 110, 0,
-        0, 0, 0, 0, 0, 176, 255, 255, 255, 174, 4, 0, 0, 0, 0, 146, 253, 255, 8, 0,
-        0, 0, 0, 0, 0, 128, 255, 239, 57, 0, 0, 0, 0, 0, 0, 0, 16, 134, 0, 0,
-        0, 0, 0, 0, 0, 0, 203, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 179, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 96, 255, 110, 0, 0, 160, 221, 221, 221, 221, 221, 221, 221, 221, 221, 9, 0, 0,
         0, 0, 0, 252, 207, 0, 0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0,
@@ -3668,48 +3584,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 84, 85, 85, 85, 85, 85, 85, 1, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 255, 255, 255, 255, 255, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 255, 255, 255, 255, 255, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 175, 170, 170, 170, 234, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 0, 0, 0, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 0, 0, 0, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 96, 220, 9, 208, 255, 5, 0, 0, 144, 255, 173, 170, 170, 170, 122, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 255, 255, 255, 255, 191, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 255, 255, 255, 255, 191, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 92, 85, 85, 85, 69, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 69, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 69, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 0, 251, 95, 144, 255, 9, 208, 255, 69, 254, 174, 170, 170, 170, 170, 250, 223, 0, 0,
-        0, 0, 251, 95, 144, 255, 8, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 251, 95, 176, 255, 6, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 251, 95, 208, 239, 5, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 84, 21, 228, 223, 105, 0, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 0, 248, 255, 239, 6, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 32, 253, 255, 255, 78, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 128, 255, 110, 254, 239, 4, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 230, 255, 10, 230, 255, 45, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 64, 254, 223, 3, 96, 254, 223, 66, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 230, 255, 110, 0, 0, 249, 255, 75, 254, 223, 221, 221, 221, 221, 253, 223, 0, 0,
-        0, 144, 255, 255, 8, 0, 0, 176, 255, 93, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 230, 255, 127, 0, 0, 0, 32, 205, 66, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 128, 239, 6, 0, 0, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 71, 0, 0, 0, 0, 0, 0, 48, 253, 61, 0, 0, 0, 0, 229, 207, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 76, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 255, 13, 0, 0, 0, 0, 0, 0,
         0, 0, 251, 255, 255, 255, 255, 13, 0, 0, 0, 192, 255, 9, 0, 0, 0, 0, 0, 0,
@@ -4550,7 +4424,7 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }
 };
-set_glyph(108, (const unsigned int*)font_glyph_unicode, (const unsigned char*)font_glyph_bitmaps);
+set_glyph(105, (const unsigned int*)font_glyph_unicode, (const unsigned char*)font_glyph_bitmaps);
 }
 };
 
diff --git a/app/src/main/cpp/yolo.cpp b/app/src/main/cpp/yolo.cpp
index e3057d7..fa7b465 100644
--- a/app/src/main/cpp/yolo.cpp
+++ b/app/src/main/cpp/yolo.cpp
@@ -856,10 +856,10 @@
         "三脚架", "三通", "标准软管", "人", "作业信息公示牌", "切断阀", "危险告知牌",
         "压力表", "压力表", "防护服", "可燃气体报警控制器", "呼气器", "喉箍", "气体检测报警仪",
         "水枪", "头", "安全告知牌", "安全带", "安全帽", "安全标识", "安全标识牌",
-        "安全绳", "对讲设备", "水枪", "工服", "开关", "报警装置", "接头",
+        "安全绳", "对讲设备", "水枪", "工服", "开关", "燃气探测器", "接头",
         "施工路牌", "气体检测报警仪", "水带", "水带", "流量计", "消火栓箱", "灭火器",
         "灶台", "灶具", "照明设备", "熄火保护", "燃气管道", "燃气计量器具", "电线裸露",
-        "电路图", "警戒线", "调压器", "调长器", "贴纸", "跨电线", "路锥",
+        "电路图", "警戒线", "调压器", "调长器", "标识", "跨电线", "路锥",
         "过滤器", "配电箱内部", "配电箱外部", "长柄阀门", "闪光灯亮", "闪光灯灭", "阀门",
         "非标准软管", "送风设备", "送风设备"
 };
@@ -868,6 +868,11 @@
     for (const auto &obj: objects) {
         cv::Scalar rect_cc;
 
+        //识别出来标识贴纸但是不是配电箱场景，不显示出来
+        if (obj.label == 46 && j_scene_code != 0) {
+            break;
+        }
+
         if (obj.label == 15 || obj.label == 53 || obj.label == 54) {
             break;
         }
diff --git a/app/src/main/cpp/yolo.h b/app/src/main/cpp/yolo.h
index 12e4b1b..3d9dfae 100644
--- a/app/src/main/cpp/yolo.h
+++ b/app/src/main/cpp/yolo.h
@@ -45,6 +45,18 @@
      * */
     int j_state = 0;
 
+    /**
+     * 当前场景
+     * <br>---------------<br>
+     * 0 - 配电箱 <br>
+     * 1 - 有限空间作业 <br>
+     * 2 - 非居用户 <br>
+     * 3 - 居民用户 <br>
+     * 4 - 调压站 <br>
+     * 5 - 建筑消防 <br>
+     * */
+    int j_scene_code = -1;
+
     int load(AAssetManager *mgr,
              const char *model_type,
              int target_size,

diff --git a/app/src/main/cpp/myfontface.h b/app/src/main/cpp/myfontface.h
index 8c321ee..df853d7 100644
--- a/app/src/main/cpp/myfontface.h
+++ b/app/src/main/cpp/myfontface.h
@@ -9,10 +9,10 @@
 public:
 MyFontFace()
 {
-static const unsigned int font_glyph_unicode[108] = {
-    19977, 19994, 20142, 20154, 20202, 20307, 20316, 20445, 20449, 20809, 20840, 20844, 20851, 20855, 20869, 20934, 20999, 21046, 21147, 21361, 21387, 21487, 21488, 21578, 21628, 21897, 22120, 22270, 22791, 22806, 22836, 23433, 23545, 24037, 24102, 24125, 24320, 24687, 25106, 25252, 25253, 25509, 25511, 26029, 26045, 26126, 26381, 26538, 26550, 26564, 26631, 26643, 26816, 27668, 27700, 27969, 27979, 28040, 28388, 28779, 28781, 28783, 28790, 29031, 29060, 29123, 29260, 30005, 30693, 31034, 31629, 31649, 31665, 32440, 32447, 32499, 32622, 33050, 34920, 35013, 35064, 35686, 35745, 35762, 35774, 35782, 35843, 36148, 36328, 36335, 36719, 36807, 36865, 36890, 36947, 37096, 37197, 37327, 38181, 38271, 38376, 38378, 38400, 38450, 38505, 38706, 38750, 39118
+static const unsigned int font_glyph_unicode[105] = {
+    19977, 19994, 20142, 20154, 20202, 20307, 20316, 20445, 20449, 20809, 20840, 20844, 20851, 20855, 20869, 20934, 20999, 21046, 21147, 21361, 21387, 21487, 21488, 21578, 21628, 21897, 22120, 22270, 22791, 22806, 22836, 23433, 23545, 24037, 24102, 24125, 24320, 24687, 25106, 25252, 25253, 25506, 25509, 25511, 26029, 26045, 26126, 26381, 26538, 26550, 26564, 26631, 26643, 26816, 27668, 27700, 27969, 27979, 28040, 28388, 28779, 28781, 28783, 28790, 29031, 29060, 29123, 29260, 30005, 30693, 31034, 31629, 31649, 31665, 32447, 32499, 33050, 34920, 35064, 35686, 35745, 35762, 35774, 35782, 35843, 36328, 36335, 36719, 36807, 36865, 36890, 36947, 37096, 37197, 37327, 38181, 38271, 38376, 38378, 38400, 38450, 38505, 38706, 38750, 39118
 };
-static const unsigned char font_glyph_bitmaps[108][40 * 20] = {
+static const unsigned char font_glyph_bitmaps[105][40 * 20] = {
     {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1736,6 +1736,48 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
+        0, 0, 0, 128, 154, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 83, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 4, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 159, 0, 0, 0, 0, 0, 0, 0, 80, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 159, 0, 0, 0, 0, 0, 0, 0, 80, 255, 11, 0,
+        0, 229, 255, 255, 255, 255, 191, 249, 159, 0, 183, 2, 0, 32, 172, 0, 80, 255, 11, 0,
+        0, 245, 255, 255, 255, 255, 191, 215, 125, 96, 254, 94, 0, 210, 255, 44, 64, 220, 9, 0,
+        0, 196, 221, 253, 255, 221, 157, 0, 0, 210, 255, 45, 0, 160, 255, 223, 4, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 251, 239, 4, 0, 0, 248, 255, 78, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 160, 255, 110, 0, 0, 0, 112, 255, 239, 6, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 249, 255, 8, 0, 0, 0, 0, 230, 255, 127, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 128, 255, 175, 0, 48, 253, 61, 0, 96, 254, 255, 7, 0,
+        0, 0, 0, 208, 239, 4, 0, 230, 255, 11, 0, 64, 254, 78, 0, 0, 230, 207, 2, 0,
+        0, 0, 0, 208, 239, 4, 16, 96, 206, 2, 0, 64, 254, 78, 0, 0, 96, 43, 0, 0,
+        0, 0, 0, 208, 239, 216, 143, 0, 1, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 210, 255, 255, 159, 169, 170, 170, 170, 170, 254, 174, 170, 170, 170, 170, 73, 0,
+        0, 80, 234, 255, 255, 255, 159, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
+        0, 250, 255, 255, 255, 107, 80, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
+        0, 249, 255, 255, 239, 4, 0, 0, 0, 0, 176, 255, 255, 255, 159, 0, 0, 0, 0, 0,
+        0, 248, 108, 208, 239, 4, 0, 0, 0, 0, 247, 223, 254, 238, 239, 4, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 64, 254, 127, 254, 158, 255, 11, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 176, 255, 74, 254, 94, 253, 127, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 250, 223, 66, 254, 78, 247, 239, 4, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 128, 255, 110, 64, 254, 78, 176, 255, 45, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 248, 255, 8, 64, 254, 78, 32, 253, 223, 3, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 144, 255, 175, 0, 64, 254, 78, 0, 230, 255, 77, 0, 0,
+        0, 0, 0, 208, 239, 4, 32, 252, 255, 10, 0, 64, 254, 78, 0, 112, 255, 255, 9, 0,
+        0, 0, 0, 208, 239, 4, 230, 255, 175, 0, 0, 64, 254, 78, 0, 0, 247, 255, 207, 2,
+        0, 0, 0, 211, 239, 36, 253, 255, 9, 0, 0, 64, 254, 78, 0, 0, 96, 254, 111, 0,
+        0, 198, 170, 252, 239, 4, 212, 143, 0, 0, 0, 64, 254, 78, 0, 0, 0, 212, 10, 0,
+        0, 246, 255, 255, 207, 0, 48, 4, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 228, 255, 255, 110, 0, 0, 0, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 146, 170, 105, 1, 0, 0, 0, 0, 0, 0, 48, 253, 61, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    },
+    {
         0, 0, 0, 144, 205, 4, 0, 0, 0, 0, 0, 112, 206, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 176, 255, 5, 0, 0, 0, 0, 0, 211, 255, 8, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 176, 255, 5, 0, 0, 0, 0, 0, 128, 255, 45, 0, 0, 0, 0, 0, 0,
@@ -3080,48 +3122,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 64, 156, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 144, 255, 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 117, 185, 5, 0,
-        0, 0, 0, 210, 255, 10, 0, 0, 0, 82, 85, 117, 170, 219, 253, 255, 255, 255, 9, 0,
-        0, 0, 0, 247, 239, 4, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 45, 0,
-        0, 0, 0, 252, 175, 0, 0, 0, 253, 255, 255, 255, 255, 255, 255, 222, 172, 122, 5, 0,
-        0, 0, 112, 255, 62, 0, 0, 0, 253, 175, 122, 85, 197, 255, 9, 0, 0, 0, 0, 0,
-        0, 0, 192, 255, 9, 32, 90, 0, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 0, 247, 223, 2, 128, 255, 44, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 32, 253, 143, 0, 210, 255, 9, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 128, 255, 12, 0, 249, 223, 2, 253, 95, 0, 0, 160, 255, 9, 0, 0, 0, 0, 0,
-        0, 228, 255, 6, 64, 254, 143, 0, 253, 95, 0, 0, 144, 255, 9, 0, 0, 0, 0, 0,
-        0, 250, 239, 221, 221, 255, 12, 0, 253, 95, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 248, 255, 255, 255, 239, 5, 0, 253, 95, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 229, 239, 221, 255, 175, 0, 0, 253, 95, 0, 0, 128, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 0, 112, 255, 45, 0, 0, 253, 223, 221, 221, 221, 255, 222, 221, 221, 221, 76, 0,
-        0, 0, 0, 210, 255, 7, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 95, 0,
-        0, 0, 0, 250, 191, 0, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 95, 0,
-        0, 0, 96, 254, 78, 0, 0, 0, 253, 95, 0, 0, 80, 255, 78, 0, 0, 0, 0, 0,
-        0, 0, 210, 255, 8, 0, 0, 0, 253, 95, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0,
-        0, 0, 251, 191, 0, 16, 117, 4, 253, 95, 0, 0, 32, 253, 95, 0, 0, 0, 0, 0,
-        0, 194, 255, 223, 254, 255, 255, 8, 253, 95, 0, 0, 0, 253, 111, 0, 0, 0, 0, 0,
-        0, 210, 255, 255, 255, 255, 255, 5, 253, 95, 0, 0, 0, 251, 143, 0, 0, 0, 0, 0,
-        0, 176, 255, 255, 206, 138, 37, 0, 253, 95, 0, 0, 0, 249, 175, 0, 0, 0, 0, 0,
-        0, 80, 70, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 248, 191, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 245, 223, 2, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 211, 255, 5, 0, 214, 74, 0,
-        0, 0, 0, 0, 0, 32, 183, 11, 253, 95, 0, 0, 0, 176, 255, 8, 0, 248, 191, 0,
-        0, 0, 0, 64, 201, 254, 255, 11, 253, 95, 0, 0, 96, 132, 255, 12, 0, 249, 175, 0,
-        0, 130, 235, 255, 255, 255, 255, 11, 253, 95, 0, 164, 255, 88, 254, 94, 0, 250, 143, 0,
-        0, 246, 255, 255, 255, 190, 39, 0, 253, 111, 215, 255, 255, 8, 252, 191, 0, 251, 127, 0,
-        0, 211, 255, 190, 39, 0, 0, 80, 254, 255, 255, 255, 223, 5, 247, 255, 6, 253, 94, 0,
-        0, 112, 39, 0, 0, 0, 0, 176, 255, 255, 255, 174, 4, 0, 176, 255, 223, 255, 61, 0,
-        0, 0, 0, 0, 0, 0, 0, 112, 255, 255, 108, 0, 0, 0, 64, 254, 255, 255, 11, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 235, 41, 0, 0, 0, 0, 0, 229, 255, 239, 6, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 16, 184, 74, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 229, 125, 0, 0, 0, 0, 192, 239, 7, 16, 122, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 250, 223, 2, 0, 0, 0, 208, 255, 8, 176, 255, 27, 0, 0, 0, 0,
         0, 0, 0, 64, 254, 143, 0, 0, 0, 0, 208, 255, 8, 144, 255, 239, 5, 0, 0, 0,
@@ -3206,48 +3206,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 96, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 6, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 144, 255, 221, 221, 221, 254, 223, 221, 221, 253, 239, 221, 221, 221, 255, 9, 0, 0,
-        0, 0, 144, 255, 5, 0, 0, 251, 78, 0, 0, 228, 191, 0, 0, 80, 255, 9, 0, 0,
-        0, 0, 144, 255, 5, 0, 0, 251, 78, 0, 0, 228, 191, 0, 0, 80, 255, 9, 0, 0,
-        0, 0, 144, 255, 87, 85, 85, 252, 110, 85, 85, 230, 207, 85, 85, 117, 255, 9, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 112, 205, 4, 0, 0, 0, 0, 251, 94, 0, 0, 0, 0, 64, 220, 7, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 13, 0,
-        0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 13, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 96, 220, 221, 221, 221, 221, 254, 223, 221, 221, 221, 221, 221, 9, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 89, 85, 85, 85, 85, 85, 85, 85, 85, 101, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 89, 85, 85, 85, 85, 85, 85, 85, 85, 101, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 167, 170, 186, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 173, 170, 106, 0,
-        0, 251, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 217, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 125, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 249, 255, 255, 255, 159, 0, 0, 248, 159, 0, 0, 82, 85, 85, 85, 69, 0, 0,
@@ -3332,48 +3290,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 80, 4, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 230, 126, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 32, 253, 255, 8, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 212, 255, 175, 0, 251, 95, 83, 85, 85, 85, 197, 255, 89, 85, 85, 85, 37, 0,
-        0, 0, 48, 253, 255, 10, 251, 95, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
-        0, 0, 0, 211, 239, 6, 251, 95, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
-        0, 0, 0, 64, 108, 0, 252, 95, 83, 85, 85, 85, 197, 255, 89, 85, 85, 85, 37, 0,
-        0, 0, 0, 0, 0, 231, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 213, 255, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 0, 196, 255, 255, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 180, 255, 255, 159, 251, 95, 32, 85, 85, 85, 197, 255, 89, 85, 85, 85, 1, 0,
-        0, 162, 255, 255, 191, 3, 251, 95, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 5, 0,
-        0, 176, 255, 207, 4, 0, 251, 95, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 5, 0,
-        0, 80, 238, 7, 0, 0, 251, 95, 32, 149, 88, 85, 85, 85, 85, 85, 85, 85, 1, 0,
-        0, 0, 21, 0, 0, 0, 251, 95, 80, 253, 45, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 84, 21, 64, 254, 175, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 255, 6, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 196, 221, 221, 221, 221, 221, 221, 221, 253, 239, 221, 221, 221, 221, 221, 221, 221, 125, 0,
-        0, 245, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 229, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 0, 0, 0, 0, 0, 0, 16, 251, 255, 223, 2, 0, 0, 0, 0, 18, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 212, 255, 222, 255, 9, 0, 0, 0, 180, 159, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 128, 255, 239, 101, 254, 110, 0, 0, 163, 255, 239, 5, 0, 0,
-        0, 0, 0, 0, 0, 64, 252, 255, 77, 0, 250, 239, 4, 162, 255, 255, 223, 6, 0, 0,
-        0, 0, 0, 0, 48, 250, 255, 175, 1, 0, 176, 255, 190, 255, 255, 191, 4, 0, 0, 0,
-        0, 0, 0, 64, 250, 255, 255, 13, 0, 0, 32, 253, 255, 255, 142, 1, 0, 0, 0, 0,
-        0, 0, 96, 252, 255, 255, 255, 13, 0, 0, 0, 212, 255, 207, 3, 0, 0, 0, 0, 0,
-        0, 181, 254, 255, 255, 91, 254, 13, 0, 0, 16, 53, 252, 255, 191, 4, 0, 0, 0, 0,
-        0, 247, 255, 255, 76, 64, 254, 13, 0, 130, 253, 78, 144, 255, 255, 223, 40, 0, 0, 0,
-        0, 176, 255, 58, 0, 64, 254, 77, 234, 255, 255, 78, 0, 196, 255, 255, 255, 206, 73, 0,
-        0, 64, 6, 0, 0, 96, 255, 255, 255, 255, 239, 42, 0, 0, 197, 255, 255, 255, 110, 0,
-        0, 0, 0, 0, 0, 176, 255, 255, 255, 174, 4, 0, 0, 0, 0, 146, 253, 255, 8, 0,
-        0, 0, 0, 0, 0, 128, 255, 239, 57, 0, 0, 0, 0, 0, 0, 0, 16, 134, 0, 0,
-        0, 0, 0, 0, 0, 0, 203, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 179, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 96, 255, 110, 0, 0, 160, 221, 221, 221, 221, 221, 221, 221, 221, 221, 9, 0, 0,
         0, 0, 0, 252, 207, 0, 0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0,
@@ -3668,48 +3584,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 84, 85, 85, 85, 85, 85, 85, 1, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 255, 255, 255, 255, 255, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 255, 255, 255, 255, 255, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 175, 170, 170, 170, 234, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 0, 0, 0, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 0, 0, 0, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 96, 220, 9, 208, 255, 5, 0, 0, 144, 255, 173, 170, 170, 170, 122, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 255, 255, 255, 255, 191, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 255, 255, 255, 255, 191, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 92, 85, 85, 85, 69, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 69, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 69, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 0, 251, 95, 144, 255, 9, 208, 255, 69, 254, 174, 170, 170, 170, 170, 250, 223, 0, 0,
-        0, 0, 251, 95, 144, 255, 8, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 251, 95, 176, 255, 6, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 251, 95, 208, 239, 5, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 84, 21, 228, 223, 105, 0, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 0, 248, 255, 239, 6, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 32, 253, 255, 255, 78, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 128, 255, 110, 254, 239, 4, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 230, 255, 10, 230, 255, 45, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 64, 254, 223, 3, 96, 254, 223, 66, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 230, 255, 110, 0, 0, 249, 255, 75, 254, 223, 221, 221, 221, 221, 253, 223, 0, 0,
-        0, 144, 255, 255, 8, 0, 0, 176, 255, 93, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 230, 255, 127, 0, 0, 0, 32, 205, 66, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 128, 239, 6, 0, 0, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 71, 0, 0, 0, 0, 0, 0, 48, 253, 61, 0, 0, 0, 0, 229, 207, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 76, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 255, 13, 0, 0, 0, 0, 0, 0,
         0, 0, 251, 255, 255, 255, 255, 13, 0, 0, 0, 192, 255, 9, 0, 0, 0, 0, 0, 0,
@@ -4550,7 +4424,7 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }
 };
-set_glyph(108, (const unsigned int*)font_glyph_unicode, (const unsigned char*)font_glyph_bitmaps);
+set_glyph(105, (const unsigned int*)font_glyph_unicode, (const unsigned char*)font_glyph_bitmaps);
 }
 };
 
diff --git a/app/src/main/cpp/yolo.cpp b/app/src/main/cpp/yolo.cpp
index e3057d7..fa7b465 100644
--- a/app/src/main/cpp/yolo.cpp
+++ b/app/src/main/cpp/yolo.cpp
@@ -856,10 +856,10 @@
         "三脚架", "三通", "标准软管", "人", "作业信息公示牌", "切断阀", "危险告知牌",
         "压力表", "压力表", "防护服", "可燃气体报警控制器", "呼气器", "喉箍", "气体检测报警仪",
         "水枪", "头", "安全告知牌", "安全带", "安全帽", "安全标识", "安全标识牌",
-        "安全绳", "对讲设备", "水枪", "工服", "开关", "报警装置", "接头",
+        "安全绳", "对讲设备", "水枪", "工服", "开关", "燃气探测器", "接头",
         "施工路牌", "气体检测报警仪", "水带", "水带", "流量计", "消火栓箱", "灭火器",
         "灶台", "灶具", "照明设备", "熄火保护", "燃气管道", "燃气计量器具", "电线裸露",
-        "电路图", "警戒线", "调压器", "调长器", "贴纸", "跨电线", "路锥",
+        "电路图", "警戒线", "调压器", "调长器", "标识", "跨电线", "路锥",
         "过滤器", "配电箱内部", "配电箱外部", "长柄阀门", "闪光灯亮", "闪光灯灭", "阀门",
         "非标准软管", "送风设备", "送风设备"
 };
@@ -868,6 +868,11 @@
     for (const auto &obj: objects) {
         cv::Scalar rect_cc;
 
+        //识别出来标识贴纸但是不是配电箱场景，不显示出来
+        if (obj.label == 46 && j_scene_code != 0) {
+            break;
+        }
+
         if (obj.label == 15 || obj.label == 53 || obj.label == 54) {
             break;
         }
diff --git a/app/src/main/cpp/yolo.h b/app/src/main/cpp/yolo.h
index 12e4b1b..3d9dfae 100644
--- a/app/src/main/cpp/yolo.h
+++ b/app/src/main/cpp/yolo.h
@@ -45,6 +45,18 @@
      * */
     int j_state = 0;
 
+    /**
+     * 当前场景
+     * <br>---------------<br>
+     * 0 - 配电箱 <br>
+     * 1 - 有限空间作业 <br>
+     * 2 - 非居用户 <br>
+     * 3 - 居民用户 <br>
+     * 4 - 调压站 <br>
+     * 5 - 建筑消防 <br>
+     * */
+    int j_scene_code = -1;
+
     int load(AAssetManager *mgr,
              const char *model_type,
              int target_size,
diff --git a/app/src/main/cpp/yolov8ncnn.cpp b/app/src/main/cpp/yolov8ncnn.cpp
index 1dce4d0..a441009 100644
--- a/app/src/main/cpp/yolov8ncnn.cpp
+++ b/app/src/main/cpp/yolov8ncnn.cpp
@@ -303,6 +303,16 @@
 }
 
 JNIEXPORT jboolean JNICALL
+Java_com_casic_br_app_external_Yolov8ncnn_setScene(JNIEnv *env, jobject thiz, jint scene_code) {
+    if (yolo_ptr == nullptr) {
+        return JNI_FALSE;
+    }
+
+    yolo_ptr->j_scene_code = scene_code;
+    return JNI_TRUE;
+}
+
+JNIEXPORT jboolean JNICALL
 Java_com_casic_br_app_external_Yolov8ncnn_onPause(JNIEnv *env, jobject thiz) {
     if (yolo_ptr == nullptr) {
         return JNI_FALSE;

diff --git a/app/src/main/cpp/myfontface.h b/app/src/main/cpp/myfontface.h
index 8c321ee..df853d7 100644
--- a/app/src/main/cpp/myfontface.h
+++ b/app/src/main/cpp/myfontface.h
@@ -9,10 +9,10 @@
 public:
 MyFontFace()
 {
-static const unsigned int font_glyph_unicode[108] = {
-    19977, 19994, 20142, 20154, 20202, 20307, 20316, 20445, 20449, 20809, 20840, 20844, 20851, 20855, 20869, 20934, 20999, 21046, 21147, 21361, 21387, 21487, 21488, 21578, 21628, 21897, 22120, 22270, 22791, 22806, 22836, 23433, 23545, 24037, 24102, 24125, 24320, 24687, 25106, 25252, 25253, 25509, 25511, 26029, 26045, 26126, 26381, 26538, 26550, 26564, 26631, 26643, 26816, 27668, 27700, 27969, 27979, 28040, 28388, 28779, 28781, 28783, 28790, 29031, 29060, 29123, 29260, 30005, 30693, 31034, 31629, 31649, 31665, 32440, 32447, 32499, 32622, 33050, 34920, 35013, 35064, 35686, 35745, 35762, 35774, 35782, 35843, 36148, 36328, 36335, 36719, 36807, 36865, 36890, 36947, 37096, 37197, 37327, 38181, 38271, 38376, 38378, 38400, 38450, 38505, 38706, 38750, 39118
+static const unsigned int font_glyph_unicode[105] = {
+    19977, 19994, 20142, 20154, 20202, 20307, 20316, 20445, 20449, 20809, 20840, 20844, 20851, 20855, 20869, 20934, 20999, 21046, 21147, 21361, 21387, 21487, 21488, 21578, 21628, 21897, 22120, 22270, 22791, 22806, 22836, 23433, 23545, 24037, 24102, 24125, 24320, 24687, 25106, 25252, 25253, 25506, 25509, 25511, 26029, 26045, 26126, 26381, 26538, 26550, 26564, 26631, 26643, 26816, 27668, 27700, 27969, 27979, 28040, 28388, 28779, 28781, 28783, 28790, 29031, 29060, 29123, 29260, 30005, 30693, 31034, 31629, 31649, 31665, 32447, 32499, 33050, 34920, 35064, 35686, 35745, 35762, 35774, 35782, 35843, 36328, 36335, 36719, 36807, 36865, 36890, 36947, 37096, 37197, 37327, 38181, 38271, 38376, 38378, 38400, 38450, 38505, 38706, 38750, 39118
 };
-static const unsigned char font_glyph_bitmaps[108][40 * 20] = {
+static const unsigned char font_glyph_bitmaps[105][40 * 20] = {
     {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1736,6 +1736,48 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
+        0, 0, 0, 128, 154, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 83, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 4, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 159, 0, 0, 0, 0, 0, 0, 0, 80, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 159, 0, 0, 0, 0, 0, 0, 0, 80, 255, 11, 0,
+        0, 229, 255, 255, 255, 255, 191, 249, 159, 0, 183, 2, 0, 32, 172, 0, 80, 255, 11, 0,
+        0, 245, 255, 255, 255, 255, 191, 215, 125, 96, 254, 94, 0, 210, 255, 44, 64, 220, 9, 0,
+        0, 196, 221, 253, 255, 221, 157, 0, 0, 210, 255, 45, 0, 160, 255, 223, 4, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 251, 239, 4, 0, 0, 248, 255, 78, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 160, 255, 110, 0, 0, 0, 112, 255, 239, 6, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 249, 255, 8, 0, 0, 0, 0, 230, 255, 127, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 128, 255, 175, 0, 48, 253, 61, 0, 96, 254, 255, 7, 0,
+        0, 0, 0, 208, 239, 4, 0, 230, 255, 11, 0, 64, 254, 78, 0, 0, 230, 207, 2, 0,
+        0, 0, 0, 208, 239, 4, 16, 96, 206, 2, 0, 64, 254, 78, 0, 0, 96, 43, 0, 0,
+        0, 0, 0, 208, 239, 216, 143, 0, 1, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 210, 255, 255, 159, 169, 170, 170, 170, 170, 254, 174, 170, 170, 170, 170, 73, 0,
+        0, 80, 234, 255, 255, 255, 159, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
+        0, 250, 255, 255, 255, 107, 80, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
+        0, 249, 255, 255, 239, 4, 0, 0, 0, 0, 176, 255, 255, 255, 159, 0, 0, 0, 0, 0,
+        0, 248, 108, 208, 239, 4, 0, 0, 0, 0, 247, 223, 254, 238, 239, 4, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 64, 254, 127, 254, 158, 255, 11, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 176, 255, 74, 254, 94, 253, 127, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 250, 223, 66, 254, 78, 247, 239, 4, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 128, 255, 110, 64, 254, 78, 176, 255, 45, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 248, 255, 8, 64, 254, 78, 32, 253, 223, 3, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 144, 255, 175, 0, 64, 254, 78, 0, 230, 255, 77, 0, 0,
+        0, 0, 0, 208, 239, 4, 32, 252, 255, 10, 0, 64, 254, 78, 0, 112, 255, 255, 9, 0,
+        0, 0, 0, 208, 239, 4, 230, 255, 175, 0, 0, 64, 254, 78, 0, 0, 247, 255, 207, 2,
+        0, 0, 0, 211, 239, 36, 253, 255, 9, 0, 0, 64, 254, 78, 0, 0, 96, 254, 111, 0,
+        0, 198, 170, 252, 239, 4, 212, 143, 0, 0, 0, 64, 254, 78, 0, 0, 0, 212, 10, 0,
+        0, 246, 255, 255, 207, 0, 48, 4, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 228, 255, 255, 110, 0, 0, 0, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 146, 170, 105, 1, 0, 0, 0, 0, 0, 0, 48, 253, 61, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    },
+    {
         0, 0, 0, 144, 205, 4, 0, 0, 0, 0, 0, 112, 206, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 176, 255, 5, 0, 0, 0, 0, 0, 211, 255, 8, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 176, 255, 5, 0, 0, 0, 0, 0, 128, 255, 45, 0, 0, 0, 0, 0, 0,
@@ -3080,48 +3122,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 64, 156, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 144, 255, 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 117, 185, 5, 0,
-        0, 0, 0, 210, 255, 10, 0, 0, 0, 82, 85, 117, 170, 219, 253, 255, 255, 255, 9, 0,
-        0, 0, 0, 247, 239, 4, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 45, 0,
-        0, 0, 0, 252, 175, 0, 0, 0, 253, 255, 255, 255, 255, 255, 255, 222, 172, 122, 5, 0,
-        0, 0, 112, 255, 62, 0, 0, 0, 253, 175, 122, 85, 197, 255, 9, 0, 0, 0, 0, 0,
-        0, 0, 192, 255, 9, 32, 90, 0, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 0, 247, 223, 2, 128, 255, 44, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 32, 253, 143, 0, 210, 255, 9, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 128, 255, 12, 0, 249, 223, 2, 253, 95, 0, 0, 160, 255, 9, 0, 0, 0, 0, 0,
-        0, 228, 255, 6, 64, 254, 143, 0, 253, 95, 0, 0, 144, 255, 9, 0, 0, 0, 0, 0,
-        0, 250, 239, 221, 221, 255, 12, 0, 253, 95, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 248, 255, 255, 255, 239, 5, 0, 253, 95, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 229, 239, 221, 255, 175, 0, 0, 253, 95, 0, 0, 128, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 0, 112, 255, 45, 0, 0, 253, 223, 221, 221, 221, 255, 222, 221, 221, 221, 76, 0,
-        0, 0, 0, 210, 255, 7, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 95, 0,
-        0, 0, 0, 250, 191, 0, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 95, 0,
-        0, 0, 96, 254, 78, 0, 0, 0, 253, 95, 0, 0, 80, 255, 78, 0, 0, 0, 0, 0,
-        0, 0, 210, 255, 8, 0, 0, 0, 253, 95, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0,
-        0, 0, 251, 191, 0, 16, 117, 4, 253, 95, 0, 0, 32, 253, 95, 0, 0, 0, 0, 0,
-        0, 194, 255, 223, 254, 255, 255, 8, 253, 95, 0, 0, 0, 253, 111, 0, 0, 0, 0, 0,
-        0, 210, 255, 255, 255, 255, 255, 5, 253, 95, 0, 0, 0, 251, 143, 0, 0, 0, 0, 0,
-        0, 176, 255, 255, 206, 138, 37, 0, 253, 95, 0, 0, 0, 249, 175, 0, 0, 0, 0, 0,
-        0, 80, 70, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 248, 191, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 245, 223, 2, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 211, 255, 5, 0, 214, 74, 0,
-        0, 0, 0, 0, 0, 32, 183, 11, 253, 95, 0, 0, 0, 176, 255, 8, 0, 248, 191, 0,
-        0, 0, 0, 64, 201, 254, 255, 11, 253, 95, 0, 0, 96, 132, 255, 12, 0, 249, 175, 0,
-        0, 130, 235, 255, 255, 255, 255, 11, 253, 95, 0, 164, 255, 88, 254, 94, 0, 250, 143, 0,
-        0, 246, 255, 255, 255, 190, 39, 0, 253, 111, 215, 255, 255, 8, 252, 191, 0, 251, 127, 0,
-        0, 211, 255, 190, 39, 0, 0, 80, 254, 255, 255, 255, 223, 5, 247, 255, 6, 253, 94, 0,
-        0, 112, 39, 0, 0, 0, 0, 176, 255, 255, 255, 174, 4, 0, 176, 255, 223, 255, 61, 0,
-        0, 0, 0, 0, 0, 0, 0, 112, 255, 255, 108, 0, 0, 0, 64, 254, 255, 255, 11, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 235, 41, 0, 0, 0, 0, 0, 229, 255, 239, 6, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 16, 184, 74, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 229, 125, 0, 0, 0, 0, 192, 239, 7, 16, 122, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 250, 223, 2, 0, 0, 0, 208, 255, 8, 176, 255, 27, 0, 0, 0, 0,
         0, 0, 0, 64, 254, 143, 0, 0, 0, 0, 208, 255, 8, 144, 255, 239, 5, 0, 0, 0,
@@ -3206,48 +3206,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 96, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 6, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 144, 255, 221, 221, 221, 254, 223, 221, 221, 253, 239, 221, 221, 221, 255, 9, 0, 0,
-        0, 0, 144, 255, 5, 0, 0, 251, 78, 0, 0, 228, 191, 0, 0, 80, 255, 9, 0, 0,
-        0, 0, 144, 255, 5, 0, 0, 251, 78, 0, 0, 228, 191, 0, 0, 80, 255, 9, 0, 0,
-        0, 0, 144, 255, 87, 85, 85, 252, 110, 85, 85, 230, 207, 85, 85, 117, 255, 9, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 112, 205, 4, 0, 0, 0, 0, 251, 94, 0, 0, 0, 0, 64, 220, 7, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 13, 0,
-        0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 13, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 96, 220, 221, 221, 221, 221, 254, 223, 221, 221, 221, 221, 221, 9, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 89, 85, 85, 85, 85, 85, 85, 85, 85, 101, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 89, 85, 85, 85, 85, 85, 85, 85, 85, 101, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 167, 170, 186, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 173, 170, 106, 0,
-        0, 251, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 217, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 125, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 249, 255, 255, 255, 159, 0, 0, 248, 159, 0, 0, 82, 85, 85, 85, 69, 0, 0,
@@ -3332,48 +3290,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 80, 4, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 230, 126, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 32, 253, 255, 8, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 212, 255, 175, 0, 251, 95, 83, 85, 85, 85, 197, 255, 89, 85, 85, 85, 37, 0,
-        0, 0, 48, 253, 255, 10, 251, 95, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
-        0, 0, 0, 211, 239, 6, 251, 95, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
-        0, 0, 0, 64, 108, 0, 252, 95, 83, 85, 85, 85, 197, 255, 89, 85, 85, 85, 37, 0,
-        0, 0, 0, 0, 0, 231, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 213, 255, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 0, 196, 255, 255, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 180, 255, 255, 159, 251, 95, 32, 85, 85, 85, 197, 255, 89, 85, 85, 85, 1, 0,
-        0, 162, 255, 255, 191, 3, 251, 95, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 5, 0,
-        0, 176, 255, 207, 4, 0, 251, 95, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 5, 0,
-        0, 80, 238, 7, 0, 0, 251, 95, 32, 149, 88, 85, 85, 85, 85, 85, 85, 85, 1, 0,
-        0, 0, 21, 0, 0, 0, 251, 95, 80, 253, 45, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 84, 21, 64, 254, 175, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 255, 6, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 196, 221, 221, 221, 221, 221, 221, 221, 253, 239, 221, 221, 221, 221, 221, 221, 221, 125, 0,
-        0, 245, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 229, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 0, 0, 0, 0, 0, 0, 16, 251, 255, 223, 2, 0, 0, 0, 0, 18, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 212, 255, 222, 255, 9, 0, 0, 0, 180, 159, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 128, 255, 239, 101, 254, 110, 0, 0, 163, 255, 239, 5, 0, 0,
-        0, 0, 0, 0, 0, 64, 252, 255, 77, 0, 250, 239, 4, 162, 255, 255, 223, 6, 0, 0,
-        0, 0, 0, 0, 48, 250, 255, 175, 1, 0, 176, 255, 190, 255, 255, 191, 4, 0, 0, 0,
-        0, 0, 0, 64, 250, 255, 255, 13, 0, 0, 32, 253, 255, 255, 142, 1, 0, 0, 0, 0,
-        0, 0, 96, 252, 255, 255, 255, 13, 0, 0, 0, 212, 255, 207, 3, 0, 0, 0, 0, 0,
-        0, 181, 254, 255, 255, 91, 254, 13, 0, 0, 16, 53, 252, 255, 191, 4, 0, 0, 0, 0,
-        0, 247, 255, 255, 76, 64, 254, 13, 0, 130, 253, 78, 144, 255, 255, 223, 40, 0, 0, 0,
-        0, 176, 255, 58, 0, 64, 254, 77, 234, 255, 255, 78, 0, 196, 255, 255, 255, 206, 73, 0,
-        0, 64, 6, 0, 0, 96, 255, 255, 255, 255, 239, 42, 0, 0, 197, 255, 255, 255, 110, 0,
-        0, 0, 0, 0, 0, 176, 255, 255, 255, 174, 4, 0, 0, 0, 0, 146, 253, 255, 8, 0,
-        0, 0, 0, 0, 0, 128, 255, 239, 57, 0, 0, 0, 0, 0, 0, 0, 16, 134, 0, 0,
-        0, 0, 0, 0, 0, 0, 203, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 179, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 96, 255, 110, 0, 0, 160, 221, 221, 221, 221, 221, 221, 221, 221, 221, 9, 0, 0,
         0, 0, 0, 252, 207, 0, 0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0,
@@ -3668,48 +3584,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 84, 85, 85, 85, 85, 85, 85, 1, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 255, 255, 255, 255, 255, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 255, 255, 255, 255, 255, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 175, 170, 170, 170, 234, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 0, 0, 0, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 0, 0, 0, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 96, 220, 9, 208, 255, 5, 0, 0, 144, 255, 173, 170, 170, 170, 122, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 255, 255, 255, 255, 191, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 255, 255, 255, 255, 191, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 92, 85, 85, 85, 69, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 69, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 69, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 0, 251, 95, 144, 255, 9, 208, 255, 69, 254, 174, 170, 170, 170, 170, 250, 223, 0, 0,
-        0, 0, 251, 95, 144, 255, 8, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 251, 95, 176, 255, 6, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 251, 95, 208, 239, 5, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 84, 21, 228, 223, 105, 0, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 0, 248, 255, 239, 6, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 32, 253, 255, 255, 78, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 128, 255, 110, 254, 239, 4, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 230, 255, 10, 230, 255, 45, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 64, 254, 223, 3, 96, 254, 223, 66, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 230, 255, 110, 0, 0, 249, 255, 75, 254, 223, 221, 221, 221, 221, 253, 223, 0, 0,
-        0, 144, 255, 255, 8, 0, 0, 176, 255, 93, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 230, 255, 127, 0, 0, 0, 32, 205, 66, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 128, 239, 6, 0, 0, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 71, 0, 0, 0, 0, 0, 0, 48, 253, 61, 0, 0, 0, 0, 229, 207, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 76, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 255, 13, 0, 0, 0, 0, 0, 0,
         0, 0, 251, 255, 255, 255, 255, 13, 0, 0, 0, 192, 255, 9, 0, 0, 0, 0, 0, 0,
@@ -4550,7 +4424,7 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }
 };
-set_glyph(108, (const unsigned int*)font_glyph_unicode, (const unsigned char*)font_glyph_bitmaps);
+set_glyph(105, (const unsigned int*)font_glyph_unicode, (const unsigned char*)font_glyph_bitmaps);
 }
 };
 
diff --git a/app/src/main/cpp/yolo.cpp b/app/src/main/cpp/yolo.cpp
index e3057d7..fa7b465 100644
--- a/app/src/main/cpp/yolo.cpp
+++ b/app/src/main/cpp/yolo.cpp
@@ -856,10 +856,10 @@
         "三脚架", "三通", "标准软管", "人", "作业信息公示牌", "切断阀", "危险告知牌",
         "压力表", "压力表", "防护服", "可燃气体报警控制器", "呼气器", "喉箍", "气体检测报警仪",
         "水枪", "头", "安全告知牌", "安全带", "安全帽", "安全标识", "安全标识牌",
-        "安全绳", "对讲设备", "水枪", "工服", "开关", "报警装置", "接头",
+        "安全绳", "对讲设备", "水枪", "工服", "开关", "燃气探测器", "接头",
         "施工路牌", "气体检测报警仪", "水带", "水带", "流量计", "消火栓箱", "灭火器",
         "灶台", "灶具", "照明设备", "熄火保护", "燃气管道", "燃气计量器具", "电线裸露",
-        "电路图", "警戒线", "调压器", "调长器", "贴纸", "跨电线", "路锥",
+        "电路图", "警戒线", "调压器", "调长器", "标识", "跨电线", "路锥",
         "过滤器", "配电箱内部", "配电箱外部", "长柄阀门", "闪光灯亮", "闪光灯灭", "阀门",
         "非标准软管", "送风设备", "送风设备"
 };
@@ -868,6 +868,11 @@
     for (const auto &obj: objects) {
         cv::Scalar rect_cc;
 
+        //识别出来标识贴纸但是不是配电箱场景，不显示出来
+        if (obj.label == 46 && j_scene_code != 0) {
+            break;
+        }
+
         if (obj.label == 15 || obj.label == 53 || obj.label == 54) {
             break;
         }
diff --git a/app/src/main/cpp/yolo.h b/app/src/main/cpp/yolo.h
index 12e4b1b..3d9dfae 100644
--- a/app/src/main/cpp/yolo.h
+++ b/app/src/main/cpp/yolo.h
@@ -45,6 +45,18 @@
      * */
     int j_state = 0;
 
+    /**
+     * 当前场景
+     * <br>---------------<br>
+     * 0 - 配电箱 <br>
+     * 1 - 有限空间作业 <br>
+     * 2 - 非居用户 <br>
+     * 3 - 居民用户 <br>
+     * 4 - 调压站 <br>
+     * 5 - 建筑消防 <br>
+     * */
+    int j_scene_code = -1;
+
     int load(AAssetManager *mgr,
              const char *model_type,
              int target_size,
diff --git a/app/src/main/cpp/yolov8ncnn.cpp b/app/src/main/cpp/yolov8ncnn.cpp
index 1dce4d0..a441009 100644
--- a/app/src/main/cpp/yolov8ncnn.cpp
+++ b/app/src/main/cpp/yolov8ncnn.cpp
@@ -303,6 +303,16 @@
 }
 
 JNIEXPORT jboolean JNICALL
+Java_com_casic_br_app_external_Yolov8ncnn_setScene(JNIEnv *env, jobject thiz, jint scene_code) {
+    if (yolo_ptr == nullptr) {
+        return JNI_FALSE;
+    }
+
+    yolo_ptr->j_scene_code = scene_code;
+    return JNI_TRUE;
+}
+
+JNIEXPORT jboolean JNICALL
 Java_com_casic_br_app_external_Yolov8ncnn_onPause(JNIEnv *env, jobject thiz) {
     if (yolo_ptr == nullptr) {
         return JNI_FALSE;
diff --git a/app/src/main/java/com/casic/br/app/extensions/String.kt b/app/src/main/java/com/casic/br/app/extensions/String.kt
index 10036ff..42b875c 100644
--- a/app/src/main/java/com/casic/br/app/extensions/String.kt
+++ b/app/src/main/java/com/casic/br/app/extensions/String.kt
@@ -83,6 +83,28 @@
     return false
 }
 
+/**
+ * 场景名转为Int，方便c++使用
+ *
+ * 配电箱 - 0
+ * 有限空间作业 - 1
+ * 非居用户 - 2
+ * 居民用户 - 3
+ * 调压站 - 4
+ * 建筑消防 - 5
+ * */
+fun String.getSceneCode(): Int {
+    when (this) {
+        "配电箱" -> return 0
+        "有限空间作业" -> return 1
+        "非居用户" -> return 2
+        "居民用户" -> return 3
+        "调压站" -> return 4
+        "建筑消防" -> return 5
+    }
+    return -1
+}
+
 fun String.compressImage(context: Context, listener: OnImageCompressListener) {
     Luban.with(context).load(this)
         .setTargetDir(context.createCompressImageDir().toString())

diff --git a/app/src/main/cpp/myfontface.h b/app/src/main/cpp/myfontface.h
index 8c321ee..df853d7 100644
--- a/app/src/main/cpp/myfontface.h
+++ b/app/src/main/cpp/myfontface.h
@@ -9,10 +9,10 @@
 public:
 MyFontFace()
 {
-static const unsigned int font_glyph_unicode[108] = {
-    19977, 19994, 20142, 20154, 20202, 20307, 20316, 20445, 20449, 20809, 20840, 20844, 20851, 20855, 20869, 20934, 20999, 21046, 21147, 21361, 21387, 21487, 21488, 21578, 21628, 21897, 22120, 22270, 22791, 22806, 22836, 23433, 23545, 24037, 24102, 24125, 24320, 24687, 25106, 25252, 25253, 25509, 25511, 26029, 26045, 26126, 26381, 26538, 26550, 26564, 26631, 26643, 26816, 27668, 27700, 27969, 27979, 28040, 28388, 28779, 28781, 28783, 28790, 29031, 29060, 29123, 29260, 30005, 30693, 31034, 31629, 31649, 31665, 32440, 32447, 32499, 32622, 33050, 34920, 35013, 35064, 35686, 35745, 35762, 35774, 35782, 35843, 36148, 36328, 36335, 36719, 36807, 36865, 36890, 36947, 37096, 37197, 37327, 38181, 38271, 38376, 38378, 38400, 38450, 38505, 38706, 38750, 39118
+static const unsigned int font_glyph_unicode[105] = {
+    19977, 19994, 20142, 20154, 20202, 20307, 20316, 20445, 20449, 20809, 20840, 20844, 20851, 20855, 20869, 20934, 20999, 21046, 21147, 21361, 21387, 21487, 21488, 21578, 21628, 21897, 22120, 22270, 22791, 22806, 22836, 23433, 23545, 24037, 24102, 24125, 24320, 24687, 25106, 25252, 25253, 25506, 25509, 25511, 26029, 26045, 26126, 26381, 26538, 26550, 26564, 26631, 26643, 26816, 27668, 27700, 27969, 27979, 28040, 28388, 28779, 28781, 28783, 28790, 29031, 29060, 29123, 29260, 30005, 30693, 31034, 31629, 31649, 31665, 32447, 32499, 33050, 34920, 35064, 35686, 35745, 35762, 35774, 35782, 35843, 36328, 36335, 36719, 36807, 36865, 36890, 36947, 37096, 37197, 37327, 38181, 38271, 38376, 38378, 38400, 38450, 38505, 38706, 38750, 39118
 };
-static const unsigned char font_glyph_bitmaps[108][40 * 20] = {
+static const unsigned char font_glyph_bitmaps[105][40 * 20] = {
     {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1736,6 +1736,48 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
+        0, 0, 0, 128, 154, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 83, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 4, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 159, 0, 0, 0, 0, 0, 0, 0, 80, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 159, 0, 0, 0, 0, 0, 0, 0, 80, 255, 11, 0,
+        0, 229, 255, 255, 255, 255, 191, 249, 159, 0, 183, 2, 0, 32, 172, 0, 80, 255, 11, 0,
+        0, 245, 255, 255, 255, 255, 191, 215, 125, 96, 254, 94, 0, 210, 255, 44, 64, 220, 9, 0,
+        0, 196, 221, 253, 255, 221, 157, 0, 0, 210, 255, 45, 0, 160, 255, 223, 4, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 251, 239, 4, 0, 0, 248, 255, 78, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 160, 255, 110, 0, 0, 0, 112, 255, 239, 6, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 249, 255, 8, 0, 0, 0, 0, 230, 255, 127, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 128, 255, 175, 0, 48, 253, 61, 0, 96, 254, 255, 7, 0,
+        0, 0, 0, 208, 239, 4, 0, 230, 255, 11, 0, 64, 254, 78, 0, 0, 230, 207, 2, 0,
+        0, 0, 0, 208, 239, 4, 16, 96, 206, 2, 0, 64, 254, 78, 0, 0, 96, 43, 0, 0,
+        0, 0, 0, 208, 239, 216, 143, 0, 1, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 210, 255, 255, 159, 169, 170, 170, 170, 170, 254, 174, 170, 170, 170, 170, 73, 0,
+        0, 80, 234, 255, 255, 255, 159, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
+        0, 250, 255, 255, 255, 107, 80, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
+        0, 249, 255, 255, 239, 4, 0, 0, 0, 0, 176, 255, 255, 255, 159, 0, 0, 0, 0, 0,
+        0, 248, 108, 208, 239, 4, 0, 0, 0, 0, 247, 223, 254, 238, 239, 4, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 64, 254, 127, 254, 158, 255, 11, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 176, 255, 74, 254, 94, 253, 127, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 250, 223, 66, 254, 78, 247, 239, 4, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 128, 255, 110, 64, 254, 78, 176, 255, 45, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 248, 255, 8, 64, 254, 78, 32, 253, 223, 3, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 144, 255, 175, 0, 64, 254, 78, 0, 230, 255, 77, 0, 0,
+        0, 0, 0, 208, 239, 4, 32, 252, 255, 10, 0, 64, 254, 78, 0, 112, 255, 255, 9, 0,
+        0, 0, 0, 208, 239, 4, 230, 255, 175, 0, 0, 64, 254, 78, 0, 0, 247, 255, 207, 2,
+        0, 0, 0, 211, 239, 36, 253, 255, 9, 0, 0, 64, 254, 78, 0, 0, 96, 254, 111, 0,
+        0, 198, 170, 252, 239, 4, 212, 143, 0, 0, 0, 64, 254, 78, 0, 0, 0, 212, 10, 0,
+        0, 246, 255, 255, 207, 0, 48, 4, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 228, 255, 255, 110, 0, 0, 0, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 146, 170, 105, 1, 0, 0, 0, 0, 0, 0, 48, 253, 61, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    },
+    {
         0, 0, 0, 144, 205, 4, 0, 0, 0, 0, 0, 112, 206, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 176, 255, 5, 0, 0, 0, 0, 0, 211, 255, 8, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 176, 255, 5, 0, 0, 0, 0, 0, 128, 255, 45, 0, 0, 0, 0, 0, 0,
@@ -3080,48 +3122,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 64, 156, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 144, 255, 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 117, 185, 5, 0,
-        0, 0, 0, 210, 255, 10, 0, 0, 0, 82, 85, 117, 170, 219, 253, 255, 255, 255, 9, 0,
-        0, 0, 0, 247, 239, 4, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 45, 0,
-        0, 0, 0, 252, 175, 0, 0, 0, 253, 255, 255, 255, 255, 255, 255, 222, 172, 122, 5, 0,
-        0, 0, 112, 255, 62, 0, 0, 0, 253, 175, 122, 85, 197, 255, 9, 0, 0, 0, 0, 0,
-        0, 0, 192, 255, 9, 32, 90, 0, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 0, 247, 223, 2, 128, 255, 44, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 32, 253, 143, 0, 210, 255, 9, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 128, 255, 12, 0, 249, 223, 2, 253, 95, 0, 0, 160, 255, 9, 0, 0, 0, 0, 0,
-        0, 228, 255, 6, 64, 254, 143, 0, 253, 95, 0, 0, 144, 255, 9, 0, 0, 0, 0, 0,
-        0, 250, 239, 221, 221, 255, 12, 0, 253, 95, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 248, 255, 255, 255, 239, 5, 0, 253, 95, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 229, 239, 221, 255, 175, 0, 0, 253, 95, 0, 0, 128, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 0, 112, 255, 45, 0, 0, 253, 223, 221, 221, 221, 255, 222, 221, 221, 221, 76, 0,
-        0, 0, 0, 210, 255, 7, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 95, 0,
-        0, 0, 0, 250, 191, 0, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 95, 0,
-        0, 0, 96, 254, 78, 0, 0, 0, 253, 95, 0, 0, 80, 255, 78, 0, 0, 0, 0, 0,
-        0, 0, 210, 255, 8, 0, 0, 0, 253, 95, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0,
-        0, 0, 251, 191, 0, 16, 117, 4, 253, 95, 0, 0, 32, 253, 95, 0, 0, 0, 0, 0,
-        0, 194, 255, 223, 254, 255, 255, 8, 253, 95, 0, 0, 0, 253, 111, 0, 0, 0, 0, 0,
-        0, 210, 255, 255, 255, 255, 255, 5, 253, 95, 0, 0, 0, 251, 143, 0, 0, 0, 0, 0,
-        0, 176, 255, 255, 206, 138, 37, 0, 253, 95, 0, 0, 0, 249, 175, 0, 0, 0, 0, 0,
-        0, 80, 70, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 248, 191, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 245, 223, 2, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 211, 255, 5, 0, 214, 74, 0,
-        0, 0, 0, 0, 0, 32, 183, 11, 253, 95, 0, 0, 0, 176, 255, 8, 0, 248, 191, 0,
-        0, 0, 0, 64, 201, 254, 255, 11, 253, 95, 0, 0, 96, 132, 255, 12, 0, 249, 175, 0,
-        0, 130, 235, 255, 255, 255, 255, 11, 253, 95, 0, 164, 255, 88, 254, 94, 0, 250, 143, 0,
-        0, 246, 255, 255, 255, 190, 39, 0, 253, 111, 215, 255, 255, 8, 252, 191, 0, 251, 127, 0,
-        0, 211, 255, 190, 39, 0, 0, 80, 254, 255, 255, 255, 223, 5, 247, 255, 6, 253, 94, 0,
-        0, 112, 39, 0, 0, 0, 0, 176, 255, 255, 255, 174, 4, 0, 176, 255, 223, 255, 61, 0,
-        0, 0, 0, 0, 0, 0, 0, 112, 255, 255, 108, 0, 0, 0, 64, 254, 255, 255, 11, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 235, 41, 0, 0, 0, 0, 0, 229, 255, 239, 6, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 16, 184, 74, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 229, 125, 0, 0, 0, 0, 192, 239, 7, 16, 122, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 250, 223, 2, 0, 0, 0, 208, 255, 8, 176, 255, 27, 0, 0, 0, 0,
         0, 0, 0, 64, 254, 143, 0, 0, 0, 0, 208, 255, 8, 144, 255, 239, 5, 0, 0, 0,
@@ -3206,48 +3206,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 96, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 6, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 144, 255, 221, 221, 221, 254, 223, 221, 221, 253, 239, 221, 221, 221, 255, 9, 0, 0,
-        0, 0, 144, 255, 5, 0, 0, 251, 78, 0, 0, 228, 191, 0, 0, 80, 255, 9, 0, 0,
-        0, 0, 144, 255, 5, 0, 0, 251, 78, 0, 0, 228, 191, 0, 0, 80, 255, 9, 0, 0,
-        0, 0, 144, 255, 87, 85, 85, 252, 110, 85, 85, 230, 207, 85, 85, 117, 255, 9, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 112, 205, 4, 0, 0, 0, 0, 251, 94, 0, 0, 0, 0, 64, 220, 7, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 13, 0,
-        0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 13, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 96, 220, 221, 221, 221, 221, 254, 223, 221, 221, 221, 221, 221, 9, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 89, 85, 85, 85, 85, 85, 85, 85, 85, 101, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 89, 85, 85, 85, 85, 85, 85, 85, 85, 101, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 167, 170, 186, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 173, 170, 106, 0,
-        0, 251, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 217, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 125, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 249, 255, 255, 255, 159, 0, 0, 248, 159, 0, 0, 82, 85, 85, 85, 69, 0, 0,
@@ -3332,48 +3290,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 80, 4, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 230, 126, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 32, 253, 255, 8, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 212, 255, 175, 0, 251, 95, 83, 85, 85, 85, 197, 255, 89, 85, 85, 85, 37, 0,
-        0, 0, 48, 253, 255, 10, 251, 95, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
-        0, 0, 0, 211, 239, 6, 251, 95, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
-        0, 0, 0, 64, 108, 0, 252, 95, 83, 85, 85, 85, 197, 255, 89, 85, 85, 85, 37, 0,
-        0, 0, 0, 0, 0, 231, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 213, 255, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 0, 196, 255, 255, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 180, 255, 255, 159, 251, 95, 32, 85, 85, 85, 197, 255, 89, 85, 85, 85, 1, 0,
-        0, 162, 255, 255, 191, 3, 251, 95, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 5, 0,
-        0, 176, 255, 207, 4, 0, 251, 95, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 5, 0,
-        0, 80, 238, 7, 0, 0, 251, 95, 32, 149, 88, 85, 85, 85, 85, 85, 85, 85, 1, 0,
-        0, 0, 21, 0, 0, 0, 251, 95, 80, 253, 45, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 84, 21, 64, 254, 175, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 255, 6, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 196, 221, 221, 221, 221, 221, 221, 221, 253, 239, 221, 221, 221, 221, 221, 221, 221, 125, 0,
-        0, 245, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 229, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 0, 0, 0, 0, 0, 0, 16, 251, 255, 223, 2, 0, 0, 0, 0, 18, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 212, 255, 222, 255, 9, 0, 0, 0, 180, 159, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 128, 255, 239, 101, 254, 110, 0, 0, 163, 255, 239, 5, 0, 0,
-        0, 0, 0, 0, 0, 64, 252, 255, 77, 0, 250, 239, 4, 162, 255, 255, 223, 6, 0, 0,
-        0, 0, 0, 0, 48, 250, 255, 175, 1, 0, 176, 255, 190, 255, 255, 191, 4, 0, 0, 0,
-        0, 0, 0, 64, 250, 255, 255, 13, 0, 0, 32, 253, 255, 255, 142, 1, 0, 0, 0, 0,
-        0, 0, 96, 252, 255, 255, 255, 13, 0, 0, 0, 212, 255, 207, 3, 0, 0, 0, 0, 0,
-        0, 181, 254, 255, 255, 91, 254, 13, 0, 0, 16, 53, 252, 255, 191, 4, 0, 0, 0, 0,
-        0, 247, 255, 255, 76, 64, 254, 13, 0, 130, 253, 78, 144, 255, 255, 223, 40, 0, 0, 0,
-        0, 176, 255, 58, 0, 64, 254, 77, 234, 255, 255, 78, 0, 196, 255, 255, 255, 206, 73, 0,
-        0, 64, 6, 0, 0, 96, 255, 255, 255, 255, 239, 42, 0, 0, 197, 255, 255, 255, 110, 0,
-        0, 0, 0, 0, 0, 176, 255, 255, 255, 174, 4, 0, 0, 0, 0, 146, 253, 255, 8, 0,
-        0, 0, 0, 0, 0, 128, 255, 239, 57, 0, 0, 0, 0, 0, 0, 0, 16, 134, 0, 0,
-        0, 0, 0, 0, 0, 0, 203, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 179, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 96, 255, 110, 0, 0, 160, 221, 221, 221, 221, 221, 221, 221, 221, 221, 9, 0, 0,
         0, 0, 0, 252, 207, 0, 0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0,
@@ -3668,48 +3584,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 84, 85, 85, 85, 85, 85, 85, 1, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 255, 255, 255, 255, 255, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 255, 255, 255, 255, 255, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 175, 170, 170, 170, 234, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 0, 0, 0, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 0, 0, 0, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 96, 220, 9, 208, 255, 5, 0, 0, 144, 255, 173, 170, 170, 170, 122, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 255, 255, 255, 255, 191, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 255, 255, 255, 255, 191, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 92, 85, 85, 85, 69, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 69, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 69, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 0, 251, 95, 144, 255, 9, 208, 255, 69, 254, 174, 170, 170, 170, 170, 250, 223, 0, 0,
-        0, 0, 251, 95, 144, 255, 8, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 251, 95, 176, 255, 6, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 251, 95, 208, 239, 5, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 84, 21, 228, 223, 105, 0, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 0, 248, 255, 239, 6, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 32, 253, 255, 255, 78, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 128, 255, 110, 254, 239, 4, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 230, 255, 10, 230, 255, 45, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 64, 254, 223, 3, 96, 254, 223, 66, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 230, 255, 110, 0, 0, 249, 255, 75, 254, 223, 221, 221, 221, 221, 253, 223, 0, 0,
-        0, 144, 255, 255, 8, 0, 0, 176, 255, 93, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 230, 255, 127, 0, 0, 0, 32, 205, 66, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 128, 239, 6, 0, 0, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 71, 0, 0, 0, 0, 0, 0, 48, 253, 61, 0, 0, 0, 0, 229, 207, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 76, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 255, 13, 0, 0, 0, 0, 0, 0,
         0, 0, 251, 255, 255, 255, 255, 13, 0, 0, 0, 192, 255, 9, 0, 0, 0, 0, 0, 0,
@@ -4550,7 +4424,7 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }
 };
-set_glyph(108, (const unsigned int*)font_glyph_unicode, (const unsigned char*)font_glyph_bitmaps);
+set_glyph(105, (const unsigned int*)font_glyph_unicode, (const unsigned char*)font_glyph_bitmaps);
 }
 };
 
diff --git a/app/src/main/cpp/yolo.cpp b/app/src/main/cpp/yolo.cpp
index e3057d7..fa7b465 100644
--- a/app/src/main/cpp/yolo.cpp
+++ b/app/src/main/cpp/yolo.cpp
@@ -856,10 +856,10 @@
         "三脚架", "三通", "标准软管", "人", "作业信息公示牌", "切断阀", "危险告知牌",
         "压力表", "压力表", "防护服", "可燃气体报警控制器", "呼气器", "喉箍", "气体检测报警仪",
         "水枪", "头", "安全告知牌", "安全带", "安全帽", "安全标识", "安全标识牌",
-        "安全绳", "对讲设备", "水枪", "工服", "开关", "报警装置", "接头",
+        "安全绳", "对讲设备", "水枪", "工服", "开关", "燃气探测器", "接头",
         "施工路牌", "气体检测报警仪", "水带", "水带", "流量计", "消火栓箱", "灭火器",
         "灶台", "灶具", "照明设备", "熄火保护", "燃气管道", "燃气计量器具", "电线裸露",
-        "电路图", "警戒线", "调压器", "调长器", "贴纸", "跨电线", "路锥",
+        "电路图", "警戒线", "调压器", "调长器", "标识", "跨电线", "路锥",
         "过滤器", "配电箱内部", "配电箱外部", "长柄阀门", "闪光灯亮", "闪光灯灭", "阀门",
         "非标准软管", "送风设备", "送风设备"
 };
@@ -868,6 +868,11 @@
     for (const auto &obj: objects) {
         cv::Scalar rect_cc;
 
+        //识别出来标识贴纸但是不是配电箱场景，不显示出来
+        if (obj.label == 46 && j_scene_code != 0) {
+            break;
+        }
+
         if (obj.label == 15 || obj.label == 53 || obj.label == 54) {
             break;
         }
diff --git a/app/src/main/cpp/yolo.h b/app/src/main/cpp/yolo.h
index 12e4b1b..3d9dfae 100644
--- a/app/src/main/cpp/yolo.h
+++ b/app/src/main/cpp/yolo.h
@@ -45,6 +45,18 @@
      * */
     int j_state = 0;
 
+    /**
+     * 当前场景
+     * <br>---------------<br>
+     * 0 - 配电箱 <br>
+     * 1 - 有限空间作业 <br>
+     * 2 - 非居用户 <br>
+     * 3 - 居民用户 <br>
+     * 4 - 调压站 <br>
+     * 5 - 建筑消防 <br>
+     * */
+    int j_scene_code = -1;
+
     int load(AAssetManager *mgr,
              const char *model_type,
              int target_size,
diff --git a/app/src/main/cpp/yolov8ncnn.cpp b/app/src/main/cpp/yolov8ncnn.cpp
index 1dce4d0..a441009 100644
--- a/app/src/main/cpp/yolov8ncnn.cpp
+++ b/app/src/main/cpp/yolov8ncnn.cpp
@@ -303,6 +303,16 @@
 }
 
 JNIEXPORT jboolean JNICALL
+Java_com_casic_br_app_external_Yolov8ncnn_setScene(JNIEnv *env, jobject thiz, jint scene_code) {
+    if (yolo_ptr == nullptr) {
+        return JNI_FALSE;
+    }
+
+    yolo_ptr->j_scene_code = scene_code;
+    return JNI_TRUE;
+}
+
+JNIEXPORT jboolean JNICALL
 Java_com_casic_br_app_external_Yolov8ncnn_onPause(JNIEnv *env, jobject thiz) {
     if (yolo_ptr == nullptr) {
         return JNI_FALSE;
diff --git a/app/src/main/java/com/casic/br/app/extensions/String.kt b/app/src/main/java/com/casic/br/app/extensions/String.kt
index 10036ff..42b875c 100644
--- a/app/src/main/java/com/casic/br/app/extensions/String.kt
+++ b/app/src/main/java/com/casic/br/app/extensions/String.kt
@@ -83,6 +83,28 @@
     return false
 }
 
+/**
+ * 场景名转为Int，方便c++使用
+ *
+ * 配电箱 - 0
+ * 有限空间作业 - 1
+ * 非居用户 - 2
+ * 居民用户 - 3
+ * 调压站 - 4
+ * 建筑消防 - 5
+ * */
+fun String.getSceneCode(): Int {
+    when (this) {
+        "配电箱" -> return 0
+        "有限空间作业" -> return 1
+        "非居用户" -> return 2
+        "居民用户" -> return 3
+        "调压站" -> return 4
+        "建筑消防" -> return 5
+    }
+    return -1
+}
+
 fun String.compressImage(context: Context, listener: OnImageCompressListener) {
     Luban.with(context).load(this)
         .setTargetDir(context.createCompressImageDir().toString())
diff --git a/app/src/main/java/com/casic/br/app/external/Yolov8ncnn.kt b/app/src/main/java/com/casic/br/app/external/Yolov8ncnn.kt
index d9f14e6..9e184e6 100644
--- a/app/src/main/java/com/casic/br/app/external/Yolov8ncnn.kt
+++ b/app/src/main/java/com/casic/br/app/external/Yolov8ncnn.kt
@@ -42,6 +42,8 @@
         surface: Surface, nativeObjAddr: Long, callBack: INativeCallback
     ): Boolean
 
+    external fun setScene(sceneCode: Int): Boolean
+
     external fun onPause(): Boolean
 
     external fun onRestart(): Boolean

diff --git a/app/src/main/cpp/myfontface.h b/app/src/main/cpp/myfontface.h
index 8c321ee..df853d7 100644
--- a/app/src/main/cpp/myfontface.h
+++ b/app/src/main/cpp/myfontface.h
@@ -9,10 +9,10 @@
 public:
 MyFontFace()
 {
-static const unsigned int font_glyph_unicode[108] = {
-    19977, 19994, 20142, 20154, 20202, 20307, 20316, 20445, 20449, 20809, 20840, 20844, 20851, 20855, 20869, 20934, 20999, 21046, 21147, 21361, 21387, 21487, 21488, 21578, 21628, 21897, 22120, 22270, 22791, 22806, 22836, 23433, 23545, 24037, 24102, 24125, 24320, 24687, 25106, 25252, 25253, 25509, 25511, 26029, 26045, 26126, 26381, 26538, 26550, 26564, 26631, 26643, 26816, 27668, 27700, 27969, 27979, 28040, 28388, 28779, 28781, 28783, 28790, 29031, 29060, 29123, 29260, 30005, 30693, 31034, 31629, 31649, 31665, 32440, 32447, 32499, 32622, 33050, 34920, 35013, 35064, 35686, 35745, 35762, 35774, 35782, 35843, 36148, 36328, 36335, 36719, 36807, 36865, 36890, 36947, 37096, 37197, 37327, 38181, 38271, 38376, 38378, 38400, 38450, 38505, 38706, 38750, 39118
+static const unsigned int font_glyph_unicode[105] = {
+    19977, 19994, 20142, 20154, 20202, 20307, 20316, 20445, 20449, 20809, 20840, 20844, 20851, 20855, 20869, 20934, 20999, 21046, 21147, 21361, 21387, 21487, 21488, 21578, 21628, 21897, 22120, 22270, 22791, 22806, 22836, 23433, 23545, 24037, 24102, 24125, 24320, 24687, 25106, 25252, 25253, 25506, 25509, 25511, 26029, 26045, 26126, 26381, 26538, 26550, 26564, 26631, 26643, 26816, 27668, 27700, 27969, 27979, 28040, 28388, 28779, 28781, 28783, 28790, 29031, 29060, 29123, 29260, 30005, 30693, 31034, 31629, 31649, 31665, 32447, 32499, 33050, 34920, 35064, 35686, 35745, 35762, 35774, 35782, 35843, 36328, 36335, 36719, 36807, 36865, 36890, 36947, 37096, 37197, 37327, 38181, 38271, 38376, 38378, 38400, 38450, 38505, 38706, 38750, 39118
 };
-static const unsigned char font_glyph_bitmaps[108][40 * 20] = {
+static const unsigned char font_glyph_bitmaps[105][40 * 20] = {
     {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1736,6 +1736,48 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
+        0, 0, 0, 128, 154, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 83, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 4, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 159, 0, 0, 0, 0, 0, 0, 0, 80, 255, 11, 0,
+        0, 0, 0, 208, 239, 4, 0, 249, 159, 0, 0, 0, 0, 0, 0, 0, 80, 255, 11, 0,
+        0, 229, 255, 255, 255, 255, 191, 249, 159, 0, 183, 2, 0, 32, 172, 0, 80, 255, 11, 0,
+        0, 245, 255, 255, 255, 255, 191, 215, 125, 96, 254, 94, 0, 210, 255, 44, 64, 220, 9, 0,
+        0, 196, 221, 253, 255, 221, 157, 0, 0, 210, 255, 45, 0, 160, 255, 223, 4, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 251, 239, 4, 0, 0, 248, 255, 78, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 160, 255, 110, 0, 0, 0, 112, 255, 239, 6, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 249, 255, 8, 0, 0, 0, 0, 230, 255, 127, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 128, 255, 175, 0, 48, 253, 61, 0, 96, 254, 255, 7, 0,
+        0, 0, 0, 208, 239, 4, 0, 230, 255, 11, 0, 64, 254, 78, 0, 0, 230, 207, 2, 0,
+        0, 0, 0, 208, 239, 4, 16, 96, 206, 2, 0, 64, 254, 78, 0, 0, 96, 43, 0, 0,
+        0, 0, 0, 208, 239, 216, 143, 0, 1, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 210, 255, 255, 159, 169, 170, 170, 170, 170, 254, 174, 170, 170, 170, 170, 73, 0,
+        0, 80, 234, 255, 255, 255, 159, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
+        0, 250, 255, 255, 255, 107, 80, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
+        0, 249, 255, 255, 239, 4, 0, 0, 0, 0, 176, 255, 255, 255, 159, 0, 0, 0, 0, 0,
+        0, 248, 108, 208, 239, 4, 0, 0, 0, 0, 247, 223, 254, 238, 239, 4, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 64, 254, 127, 254, 158, 255, 11, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 176, 255, 74, 254, 94, 253, 127, 0, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 0, 250, 223, 66, 254, 78, 247, 239, 4, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 128, 255, 110, 64, 254, 78, 176, 255, 45, 0, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 0, 248, 255, 8, 64, 254, 78, 32, 253, 223, 3, 0, 0,
+        0, 0, 0, 208, 239, 4, 0, 144, 255, 175, 0, 64, 254, 78, 0, 230, 255, 77, 0, 0,
+        0, 0, 0, 208, 239, 4, 32, 252, 255, 10, 0, 64, 254, 78, 0, 112, 255, 255, 9, 0,
+        0, 0, 0, 208, 239, 4, 230, 255, 175, 0, 0, 64, 254, 78, 0, 0, 247, 255, 207, 2,
+        0, 0, 0, 211, 239, 36, 253, 255, 9, 0, 0, 64, 254, 78, 0, 0, 96, 254, 111, 0,
+        0, 198, 170, 252, 239, 4, 212, 143, 0, 0, 0, 64, 254, 78, 0, 0, 0, 212, 10, 0,
+        0, 246, 255, 255, 207, 0, 48, 4, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 228, 255, 255, 110, 0, 0, 0, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0, 0,
+        0, 146, 170, 105, 1, 0, 0, 0, 0, 0, 0, 48, 253, 61, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    },
+    {
         0, 0, 0, 144, 205, 4, 0, 0, 0, 0, 0, 112, 206, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 176, 255, 5, 0, 0, 0, 0, 0, 211, 255, 8, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 176, 255, 5, 0, 0, 0, 0, 0, 128, 255, 45, 0, 0, 0, 0, 0, 0,
@@ -3080,48 +3122,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 64, 156, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 144, 255, 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 117, 185, 5, 0,
-        0, 0, 0, 210, 255, 10, 0, 0, 0, 82, 85, 117, 170, 219, 253, 255, 255, 255, 9, 0,
-        0, 0, 0, 247, 239, 4, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 45, 0,
-        0, 0, 0, 252, 175, 0, 0, 0, 253, 255, 255, 255, 255, 255, 255, 222, 172, 122, 5, 0,
-        0, 0, 112, 255, 62, 0, 0, 0, 253, 175, 122, 85, 197, 255, 9, 0, 0, 0, 0, 0,
-        0, 0, 192, 255, 9, 32, 90, 0, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 0, 247, 223, 2, 128, 255, 44, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 32, 253, 143, 0, 210, 255, 9, 253, 95, 0, 0, 176, 255, 9, 0, 0, 0, 0, 0,
-        0, 128, 255, 12, 0, 249, 223, 2, 253, 95, 0, 0, 160, 255, 9, 0, 0, 0, 0, 0,
-        0, 228, 255, 6, 64, 254, 143, 0, 253, 95, 0, 0, 144, 255, 9, 0, 0, 0, 0, 0,
-        0, 250, 239, 221, 221, 255, 12, 0, 253, 95, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 248, 255, 255, 255, 239, 5, 0, 253, 95, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 229, 239, 221, 255, 175, 0, 0, 253, 95, 0, 0, 128, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 0, 112, 255, 45, 0, 0, 253, 223, 221, 221, 221, 255, 222, 221, 221, 221, 76, 0,
-        0, 0, 0, 210, 255, 7, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 95, 0,
-        0, 0, 0, 250, 191, 0, 0, 0, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 95, 0,
-        0, 0, 96, 254, 78, 0, 0, 0, 253, 95, 0, 0, 80, 255, 78, 0, 0, 0, 0, 0,
-        0, 0, 210, 255, 8, 0, 0, 0, 253, 95, 0, 0, 64, 254, 78, 0, 0, 0, 0, 0,
-        0, 0, 251, 191, 0, 16, 117, 4, 253, 95, 0, 0, 32, 253, 95, 0, 0, 0, 0, 0,
-        0, 194, 255, 223, 254, 255, 255, 8, 253, 95, 0, 0, 0, 253, 111, 0, 0, 0, 0, 0,
-        0, 210, 255, 255, 255, 255, 255, 5, 253, 95, 0, 0, 0, 251, 143, 0, 0, 0, 0, 0,
-        0, 176, 255, 255, 206, 138, 37, 0, 253, 95, 0, 0, 0, 249, 175, 0, 0, 0, 0, 0,
-        0, 80, 70, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 248, 191, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 245, 223, 2, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 253, 95, 0, 0, 0, 211, 255, 5, 0, 214, 74, 0,
-        0, 0, 0, 0, 0, 32, 183, 11, 253, 95, 0, 0, 0, 176, 255, 8, 0, 248, 191, 0,
-        0, 0, 0, 64, 201, 254, 255, 11, 253, 95, 0, 0, 96, 132, 255, 12, 0, 249, 175, 0,
-        0, 130, 235, 255, 255, 255, 255, 11, 253, 95, 0, 164, 255, 88, 254, 94, 0, 250, 143, 0,
-        0, 246, 255, 255, 255, 190, 39, 0, 253, 111, 215, 255, 255, 8, 252, 191, 0, 251, 127, 0,
-        0, 211, 255, 190, 39, 0, 0, 80, 254, 255, 255, 255, 223, 5, 247, 255, 6, 253, 94, 0,
-        0, 112, 39, 0, 0, 0, 0, 176, 255, 255, 255, 174, 4, 0, 176, 255, 223, 255, 61, 0,
-        0, 0, 0, 0, 0, 0, 0, 112, 255, 255, 108, 0, 0, 0, 64, 254, 255, 255, 11, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 235, 41, 0, 0, 0, 0, 0, 229, 255, 239, 6, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 16, 184, 74, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 229, 125, 0, 0, 0, 0, 192, 239, 7, 16, 122, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 250, 223, 2, 0, 0, 0, 208, 255, 8, 176, 255, 27, 0, 0, 0, 0,
         0, 0, 0, 64, 254, 143, 0, 0, 0, 0, 208, 255, 8, 144, 255, 239, 5, 0, 0, 0,
@@ -3206,48 +3206,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 96, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 6, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 144, 255, 221, 221, 221, 254, 223, 221, 221, 253, 239, 221, 221, 221, 255, 9, 0, 0,
-        0, 0, 144, 255, 5, 0, 0, 251, 78, 0, 0, 228, 191, 0, 0, 80, 255, 9, 0, 0,
-        0, 0, 144, 255, 5, 0, 0, 251, 78, 0, 0, 228, 191, 0, 0, 80, 255, 9, 0, 0,
-        0, 0, 144, 255, 87, 85, 85, 252, 110, 85, 85, 230, 207, 85, 85, 117, 255, 9, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 144, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 9, 0, 0,
-        0, 0, 112, 205, 4, 0, 0, 0, 0, 251, 94, 0, 0, 0, 0, 64, 220, 7, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 13, 0,
-        0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 13, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 96, 220, 221, 221, 221, 221, 254, 223, 221, 221, 221, 221, 221, 9, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 89, 85, 85, 85, 85, 85, 85, 85, 85, 101, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 89, 85, 85, 85, 85, 85, 85, 85, 85, 101, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 11, 0, 0, 0,
-        0, 0, 0, 128, 255, 8, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 11, 0, 0, 0,
-        0, 167, 170, 186, 255, 171, 170, 170, 170, 170, 170, 170, 170, 170, 170, 254, 173, 170, 106, 0,
-        0, 251, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 217, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, 125, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 249, 255, 255, 255, 159, 0, 0, 248, 159, 0, 0, 82, 85, 85, 85, 69, 0, 0,
@@ -3332,48 +3290,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 80, 4, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 230, 126, 0, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 32, 253, 255, 8, 0, 251, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 212, 255, 175, 0, 251, 95, 83, 85, 85, 85, 197, 255, 89, 85, 85, 85, 37, 0,
-        0, 0, 48, 253, 255, 10, 251, 95, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
-        0, 0, 0, 211, 239, 6, 251, 95, 249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 0,
-        0, 0, 0, 64, 108, 0, 252, 95, 83, 85, 85, 85, 197, 255, 89, 85, 85, 85, 37, 0,
-        0, 0, 0, 0, 0, 231, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 213, 255, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 0, 196, 255, 255, 255, 95, 0, 0, 0, 0, 176, 255, 8, 0, 0, 0, 0, 0,
-        0, 0, 180, 255, 255, 159, 251, 95, 32, 85, 85, 85, 197, 255, 89, 85, 85, 85, 1, 0,
-        0, 162, 255, 255, 191, 3, 251, 95, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 5, 0,
-        0, 176, 255, 207, 4, 0, 251, 95, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 5, 0,
-        0, 80, 238, 7, 0, 0, 251, 95, 32, 149, 88, 85, 85, 85, 85, 85, 85, 85, 1, 0,
-        0, 0, 21, 0, 0, 0, 251, 95, 80, 253, 45, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 84, 21, 64, 254, 175, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 255, 6, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 196, 221, 221, 221, 221, 221, 221, 221, 253, 239, 221, 221, 221, 221, 221, 221, 221, 125, 0,
-        0, 245, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 229, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 159, 0,
-        0, 0, 0, 0, 0, 0, 0, 16, 251, 255, 223, 2, 0, 0, 0, 0, 18, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 212, 255, 222, 255, 9, 0, 0, 0, 180, 159, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 128, 255, 239, 101, 254, 110, 0, 0, 163, 255, 239, 5, 0, 0,
-        0, 0, 0, 0, 0, 64, 252, 255, 77, 0, 250, 239, 4, 162, 255, 255, 223, 6, 0, 0,
-        0, 0, 0, 0, 48, 250, 255, 175, 1, 0, 176, 255, 190, 255, 255, 191, 4, 0, 0, 0,
-        0, 0, 0, 64, 250, 255, 255, 13, 0, 0, 32, 253, 255, 255, 142, 1, 0, 0, 0, 0,
-        0, 0, 96, 252, 255, 255, 255, 13, 0, 0, 0, 212, 255, 207, 3, 0, 0, 0, 0, 0,
-        0, 181, 254, 255, 255, 91, 254, 13, 0, 0, 16, 53, 252, 255, 191, 4, 0, 0, 0, 0,
-        0, 247, 255, 255, 76, 64, 254, 13, 0, 130, 253, 78, 144, 255, 255, 223, 40, 0, 0, 0,
-        0, 176, 255, 58, 0, 64, 254, 77, 234, 255, 255, 78, 0, 196, 255, 255, 255, 206, 73, 0,
-        0, 64, 6, 0, 0, 96, 255, 255, 255, 255, 239, 42, 0, 0, 197, 255, 255, 255, 110, 0,
-        0, 0, 0, 0, 0, 176, 255, 255, 255, 174, 4, 0, 0, 0, 0, 146, 253, 255, 8, 0,
-        0, 0, 0, 0, 0, 128, 255, 239, 57, 0, 0, 0, 0, 0, 0, 0, 16, 134, 0, 0,
-        0, 0, 0, 0, 0, 0, 203, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 179, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 96, 255, 110, 0, 0, 160, 221, 221, 221, 221, 221, 221, 221, 221, 221, 9, 0, 0,
         0, 0, 0, 252, 207, 0, 0, 208, 255, 255, 255, 255, 255, 255, 255, 255, 255, 11, 0, 0,
@@ -3668,48 +3584,6 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     },
     {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 84, 85, 85, 85, 85, 85, 85, 1, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 255, 255, 255, 255, 255, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 255, 255, 255, 255, 255, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 175, 170, 170, 170, 234, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 0, 0, 0, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 0, 0, 0, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 96, 220, 9, 208, 255, 5, 0, 0, 144, 255, 173, 170, 170, 170, 122, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 255, 255, 255, 255, 191, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 255, 255, 255, 255, 191, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 92, 85, 85, 85, 69, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 11, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 5, 0, 0, 144, 255, 11, 0, 0, 0, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 69, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 0, 251, 95, 128, 255, 9, 208, 255, 69, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 0, 251, 95, 144, 255, 9, 208, 255, 69, 254, 174, 170, 170, 170, 170, 250, 223, 0, 0,
-        0, 0, 251, 95, 144, 255, 8, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 251, 95, 176, 255, 6, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 251, 95, 208, 239, 5, 208, 255, 69, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 84, 21, 228, 223, 105, 0, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 0, 248, 255, 239, 6, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 32, 253, 255, 255, 78, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 128, 255, 110, 254, 239, 4, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 0, 230, 255, 10, 230, 255, 45, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 64, 254, 223, 3, 96, 254, 223, 66, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 230, 255, 110, 0, 0, 249, 255, 75, 254, 223, 221, 221, 221, 221, 253, 223, 0, 0,
-        0, 144, 255, 255, 8, 0, 0, 176, 255, 93, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 230, 255, 127, 0, 0, 0, 32, 205, 66, 254, 255, 255, 255, 255, 255, 255, 223, 0, 0,
-        0, 128, 239, 6, 0, 0, 0, 0, 0, 64, 254, 78, 0, 0, 0, 0, 245, 223, 0, 0,
-        0, 0, 71, 0, 0, 0, 0, 0, 0, 48, 253, 61, 0, 0, 0, 0, 229, 207, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 254, 76, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 255, 13, 0, 0, 0, 0, 0, 0,
         0, 0, 251, 255, 255, 255, 255, 13, 0, 0, 0, 192, 255, 9, 0, 0, 0, 0, 0, 0,
@@ -4550,7 +4424,7 @@
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     }
 };
-set_glyph(108, (const unsigned int*)font_glyph_unicode, (const unsigned char*)font_glyph_bitmaps);
+set_glyph(105, (const unsigned int*)font_glyph_unicode, (const unsigned char*)font_glyph_bitmaps);
 }
 };
 
diff --git a/app/src/main/cpp/yolo.cpp b/app/src/main/cpp/yolo.cpp
index e3057d7..fa7b465 100644
--- a/app/src/main/cpp/yolo.cpp
+++ b/app/src/main/cpp/yolo.cpp
@@ -856,10 +856,10 @@
         "三脚架", "三通", "标准软管", "人", "作业信息公示牌", "切断阀", "危险告知牌",
         "压力表", "压力表", "防护服", "可燃气体报警控制器", "呼气器", "喉箍", "气体检测报警仪",
         "水枪", "头", "安全告知牌", "安全带", "安全帽", "安全标识", "安全标识牌",
-        "安全绳", "对讲设备", "水枪", "工服", "开关", "报警装置", "接头",
+        "安全绳", "对讲设备", "水枪", "工服", "开关", "燃气探测器", "接头",
         "施工路牌", "气体检测报警仪", "水带", "水带", "流量计", "消火栓箱", "灭火器",
         "灶台", "灶具", "照明设备", "熄火保护", "燃气管道", "燃气计量器具", "电线裸露",
-        "电路图", "警戒线", "调压器", "调长器", "贴纸", "跨电线", "路锥",
+        "电路图", "警戒线", "调压器", "调长器", "标识", "跨电线", "路锥",
         "过滤器", "配电箱内部", "配电箱外部", "长柄阀门", "闪光灯亮", "闪光灯灭", "阀门",
         "非标准软管", "送风设备", "送风设备"
 };
@@ -868,6 +868,11 @@
     for (const auto &obj: objects) {
         cv::Scalar rect_cc;
 
+        //识别出来标识贴纸但是不是配电箱场景，不显示出来
+        if (obj.label == 46 && j_scene_code != 0) {
+            break;
+        }
+
         if (obj.label == 15 || obj.label == 53 || obj.label == 54) {
             break;
         }
diff --git a/app/src/main/cpp/yolo.h b/app/src/main/cpp/yolo.h
index 12e4b1b..3d9dfae 100644
--- a/app/src/main/cpp/yolo.h
+++ b/app/src/main/cpp/yolo.h
@@ -45,6 +45,18 @@
      * */
     int j_state = 0;
 
+    /**
+     * 当前场景
+     * <br>---------------<br>
+     * 0 - 配电箱 <br>
+     * 1 - 有限空间作业 <br>
+     * 2 - 非居用户 <br>
+     * 3 - 居民用户 <br>
+     * 4 - 调压站 <br>
+     * 5 - 建筑消防 <br>
+     * */
+    int j_scene_code = -1;
+
     int load(AAssetManager *mgr,
              const char *model_type,
              int target_size,
diff --git a/app/src/main/cpp/yolov8ncnn.cpp b/app/src/main/cpp/yolov8ncnn.cpp
index 1dce4d0..a441009 100644
--- a/app/src/main/cpp/yolov8ncnn.cpp
+++ b/app/src/main/cpp/yolov8ncnn.cpp
@@ -303,6 +303,16 @@
 }
 
 JNIEXPORT jboolean JNICALL
+Java_com_casic_br_app_external_Yolov8ncnn_setScene(JNIEnv *env, jobject thiz, jint scene_code) {
+    if (yolo_ptr == nullptr) {
+        return JNI_FALSE;
+    }
+
+    yolo_ptr->j_scene_code = scene_code;
+    return JNI_TRUE;
+}
+
+JNIEXPORT jboolean JNICALL
 Java_com_casic_br_app_external_Yolov8ncnn_onPause(JNIEnv *env, jobject thiz) {
     if (yolo_ptr == nullptr) {
         return JNI_FALSE;
diff --git a/app/src/main/java/com/casic/br/app/extensions/String.kt b/app/src/main/java/com/casic/br/app/extensions/String.kt
index 10036ff..42b875c 100644
--- a/app/src/main/java/com/casic/br/app/extensions/String.kt
+++ b/app/src/main/java/com/casic/br/app/extensions/String.kt
@@ -83,6 +83,28 @@
     return false
 }
 
+/**
+ * 场景名转为Int，方便c++使用
+ *
+ * 配电箱 - 0
+ * 有限空间作业 - 1
+ * 非居用户 - 2
+ * 居民用户 - 3
+ * 调压站 - 4
+ * 建筑消防 - 5
+ * */
+fun String.getSceneCode(): Int {
+    when (this) {
+        "配电箱" -> return 0
+        "有限空间作业" -> return 1
+        "非居用户" -> return 2
+        "居民用户" -> return 3
+        "调压站" -> return 4
+        "建筑消防" -> return 5
+    }
+    return -1
+}
+
 fun String.compressImage(context: Context, listener: OnImageCompressListener) {
     Luban.with(context).load(this)
         .setTargetDir(context.createCompressImageDir().toString())
diff --git a/app/src/main/java/com/casic/br/app/external/Yolov8ncnn.kt b/app/src/main/java/com/casic/br/app/external/Yolov8ncnn.kt
index d9f14e6..9e184e6 100644
--- a/app/src/main/java/com/casic/br/app/external/Yolov8ncnn.kt
+++ b/app/src/main/java/com/casic/br/app/external/Yolov8ncnn.kt
@@ -42,6 +42,8 @@
         surface: Surface, nativeObjAddr: Long, callBack: INativeCallback
     ): Boolean
 
+    external fun setScene(sceneCode: Int): Boolean
+
     external fun onPause(): Boolean
 
     external fun onRestart(): Boolean
diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt
index 77aa137..264bc93 100644
--- a/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt
+++ b/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt
@@ -16,6 +16,7 @@
 import com.casic.br.app.databinding.ActivityStartCheckByYoloBinding
 import com.casic.br.app.extensions.convert2YoloResult
 import com.casic.br.app.extensions.getSceneByTarget
+import com.casic.br.app.extensions.getSceneCode
 import com.casic.br.app.extensions.initImmersionBar
 import com.casic.br.app.extensions.isTargetInScene
 import com.casic.br.app.external.INativeCallback
@@ -238,6 +239,8 @@
             isDetectTarget = true
             //调用多模型
             yolov8ncnn.loadMultiModel(assets, intArrayOf(0, 1), false)
+            //将场景传给jni
+            yolov8ncnn.setScene(sceneName.getSceneCode())
         }
     }
 
@@ -369,6 +372,9 @@
 
                             //调用多模型
                             yolov8ncnn.loadMultiModel(assets, intArrayOf(0, 1, 2), false)
+
+                            //将场景传给jni
+                            yolov8ncnn.setScene(scene.getSceneCode())
                             isDetectTarget = true
                         }