卡电量不通知的告警

card_base.cpp

@@ -76,6 +76,16 @@ void card_location_base::do_status(int st)
 		st = st & (0xFFFFFFFF ^ STATUS_HELP);
 	}
 
+	if((STATUS_POWER_LOWER_SERIOUS & st) != 0)
+	{
+		m_pwr_stat=STATUS_POWER_LOWER_SERIOUS;
+	}
+	else
+	{
+		m_pwr_stat=0;
+	}
+
+
     module_mgr::do_status((STATUS_CARD)st, m_id, m_type);
 }
 
@@ -196,7 +206,7 @@ void card_location_base::upt_card_pos(YA::_CARD_POS_&cp, point &pt)
    //     list_1318.emplace_back(x,y,speed);
    // }
    // else
-        cp.speed = abs(ceil(m_speed));
+	cp.speed = abs(ceil(m_speed));
 
 	cp.x = tool_other::round(_p.x,3);
 	cp.y = tool_other::round(_p.y,3);
@@ -206,7 +216,7 @@ void card_location_base::upt_card_pos(YA::_CARD_POS_&cp, point &pt)
 	cp.display=m_display;
 	cp.rec_time=m_time;
 	cp.level_id = m_level_id;
-	cp.stat=get_stat();
+	cp.stat=m_pwr_stat;
 	
 	swsTimerThrd.upt_card_pos(cp);
 }

card_base.h

@@ -39,6 +39,7 @@ struct card:point
 		,m_level_id(level_id)
 		,m_stat(0)
 		,m_biz_stat(0)
+		,m_pwr_stat(0)
 		,m_display(dis)
 		,m_ct(0)
         ,m_acc(0)
@@ -55,6 +56,7 @@ struct card:point
 	int32_t  m_level_id;		//职务级别
 	int		 m_stat;			//运动静止状态
 	int		 m_biz_stat;
+	int	     m_pwr_stat;		//电量状态
 	uint16_t m_display;			//1显示0不显示，往前端推送
 	uint16_t m_ct;				//ct
     ///人卡(加速度状态)，其值就是0和1，掘进机和采煤机，其值就是0~255，车辆，其值就需要乘以0.01，用于表示加速度值

websocket/jsonBuilder.cpp

@@ -120,7 +120,7 @@ namespace YA
 		tmp_object.SetInt( CardPos.dept_id );
 		Array.PushBack( tmp_object, Allocator );
 
-		//10 状态
+		//10 电量状态
 		tmp_object.SetInt( CardPos.stat );
 		Array.PushBack( tmp_object, Allocator );