zxs пре 1 недеља
родитељ
комит
2051e93c0f
2 измењених фајлова са 24 додато и 120 уклоњено
  1. 21 120
      robot/robotics/mvc.hpp
  2. 3 0
      robot/robotics/nexus_net_client.hpp

+ 21 - 120
robot/robotics/mvc.hpp

@@ -2546,148 +2546,49 @@ namespace robotics {
 				//生成随机颜色
 				unsigned char* generate_random_color() {
 					static unsigned char colors[][3] = {
-						{25,25,112},
-						{0,0,128},
+						{47,79,79},
 						{100,149,237},
-						{72,61,139},
-						{106,90,205},
-						{123,104,238},
-						{132,112,255},
 						{0,0,205},
-						{65,105,225},
-						{0,0,255},
+						{0,191,255},
+						{30,144,255},
+						{70,130,180},
+						{0,206,209},
+						{0,255,255},
 						{0,100,0},
 						{85,107,47},
-						{143,188,143},
 						{46,139,87},
-						{60,179,113},
-						{32,178,170},
-						{154,205,50},
-						{34,139,34},
 						{107,142,35},
-						{189,183,107},
-						{218,165,32},
 						{184,134,11},
-						{188,143,143},
-						{205,92,92},
+						{218,165,32},
 						{139,69,19},
-						{160,82,45},
-						{205,133,63},
-						{244,164,96},
-						{210,180,140},
-						{210,105,30},
-						{178,34,34},
 						{165,42,42},
-						{233,150,122},
-						{250,128,114},
-						{255,160,122},
-						{255,165,0},
-						{255,140,0},
 						{255,127,80},
-						{240,128,128},
-						{255,99,71},
 						{255,69,0},
-						{255,0,0},
-						{131,111,255},
-						{122,103,238},
-						{105,89,205},
-						{71,60,139},
-						{72,118,255},
-						{67,110,238},
+						{176,48,96},
+						{160,32,240},
+						{139,137,137},
 						{58,95,205},
-						{39,64,139},
-						{0,0,255},
-						{0,0,238},
-						{0,0,205},
-						{0,0,139},
-						{30,144,255},
-						{28,134,238},
-						{24,116,205},
 						{16,78,139},
-						{99,184,255},
-						{92,172,238},
-						{79,148,205},
-						{54,100,139},
-						{0,191,255},
-						{0,178,238},
-						{205,173,0},
-						{139,117,0},
-						{255,193,37},
-						{238,180,34},
+						{0,154,205},
+						{159,182,205},
+						{0,197,205},
+						{121,205,205},
+						{69,139,116},
+						{67,205,128},
+						{0,205,102},
 						{205,155,29},
-						{139,105,20},
-						{255,185,15},
-						{238,173,14},
-						{205,149,12},
-						{139,101,8},
-						{255,165,79},
-						{238,154,73},
+						{205,85,85},
 						{205,133,63},
-						{139,90,43},
-						{255,127,36},
-						{238,118,33},
-						{205,102,29},
-						{139,69,19},
-						{255,48,48},
-						{238,44,44},
 						{205,38,38},
-						{139,26,26},
-						{255,64,64},
-						{238,59,59},
-						{205,51,51},
-						{139,35,35},
-						{255,140,105},
-						{238,130,98},
-						{205,112,84},
-						{139,76,57},
-						{139,87,66},
-						{255,165,0},
-						{238,154,0},
 						{205,133,0},
-						{139,90,0},
-						{255,127,0},
-						{238,118,0},
-						{205,102,0},
-						{139,69,0},
-						{255,114,86},
-						{238,106,80},
 						{205,91,69},
-						{139,62,47},
-						{255,99,71},
-						{238,92,66},
 						{205,79,57},
-						{139,54,38},
-						{255,69,0},
-						{238,64,0},
 						{205,55,0},
-						{139,37,0},
-						{255,0,0},
-						{238,0,0},
-						{205,0,0},
-						{139,0,0},
-						{255,20,147},
-						{238,18,137},
-						{205,16,118},
-						{139,10,80},
-						{255,110,180},
-						{238,106,167},
-						{205,96,144},
-						{139,58,98},
-						{209,95,238},
+						{205,145,158},
+						{139,28,98},
 						{180,82,205},
-						{122,55,139},
-						{191,62,255},
-						{178,58,238},
-						{154,50,205},
-						{104,34,139},
-						{155,48,255},
-						{145,44,238},
 						{125,38,205},
-						{85,26,139},
-						{171,130,255},
-						{159,121,238},
-						{137,104,205},
-						{93,71,139},
+						{139,123,139},
 						{0,0,139},
 						{0,139,139},
 						{139,0,139},

+ 3 - 0
robot/robotics/nexus_net_client.hpp

@@ -51,6 +51,9 @@ namespace robotics {
                         session_->socket().close(ec);
                         break;
                     }
+                    else if (end - begin < 5) {
+                        break;
+                    }
                     //获取数据长度
                     size_t size = size_t(std::uint8_t(*(++p))) << 24;
                     size += size_t(std::uint8_t(*(++p))) << 16;