添加授权代码；

代码优化

添加授权代码；
代码优化
Hu Chunming
1 parent 3f4b245b
Showing 4 changed files with 197 additions and 102 deletions
src/PicAnalysis.cpp
src/PicAnalysis.h
src/ai_engine_module/VehicleAnalysis.cpp
src/ai_engine_module/VehicleAnalysis.h
 #include "PicAnalysis.h"
 #include "./utils/logger.hpp"
+#define AUTHORIZATION
+#define productSN "C7C1FF4EDEF1452F8BBEC8B36EAECEC0" //linux 农村一体机图片版 产品序列号
 PicAnalysis::PicAnalysis(/* args */)
 {
@@ -34,6 +36,18 @@ int PicAnalysis::init(VillageParam param) {
     int ret = SY_FAILED;
+#ifndef AUTHORIZATION
+  if (!CheckTime()) { //时间限制
+    LOG_ERROR("CheckTime failed.");
+    return -106 ;
+  }
+#else
+  if (!CheckLabel(dev_id)) { //机器授权
+    LOG_ERROR("CheckLabel failed.");
+    return -106 ;
+  }
+#endif
+
     VehicleAnalysisParam vehicle_analysis_param;
     vehicle_analysis_param.devId = dev_id;
     vehicle_analysis_param.sdk_root = param.sdk_path;
@@ -139,64 +153,30 @@ vector&lt;AnalysisResult&gt; PicAnalysis::analysis_file(vector&lt;string&gt; vec_file_path){
     return analysis_img(vec_img);
 }
-vector<AnalysisResult> PicAnalysis::va_result2AnalysisResult(va_result* result, int batchsize) {
-
-    vector<AnalysisResult> vec_result;
+vector<AnalysisResult> PicAnalysis::analysis_img(vector<sy_img> vec_img){
-    for (int b = 0; b < batchsize; b++)
-    {
-        vector<VehicleInfo> vec_info;
-        for(int c=0;c<result[b].count;c++)
-        {
-            vehicle_info result_info = result[b].info[c];
-
-            VehicleInfo info;
-            info.vehicle_detect_res         = result_info.vehicle_detect_res        ;	 
-            info.vehicle_win_detect_res     = result_info.vehicle_win_detect_res    ; 	
-            info.vehicle_body_detect_res    = result_info.vehicle_body_detect_res   ;	
-            info.vehicle_color_res          = result_info.vehicle_color_res         ;
-            info.vehicle_recg_res           = result_info.vehicle_recg_res          ;  
-            info.vehicle_plate_det_recg_res = result_info.vehicle_plate_det_recg_res;	 
-            info.vehicle_illegal_det_res    = result_info.vehicle_illegal_det_res   ; 	
-            info.vehicle_fea_res            = result_info.vehicle_fea_res           ;   	
-            info.mta_res                    = result_info.mta_res                   ;   
-            info.manned_res	 	            = result_info.manned_res	 	        ;  
-            info.type                       = result_info.type                      ;         
-            info.vpt_type                   = result_info.vpt_type                  ;
-
-
-            auto pendant_result = result_info.vehicle_pendant_det_res;
-            for (size_t j = 0; j < pendant_result.count; j++)
-            {
-                auto pendant_det_info = pendant_result.vpd_res[j];
-
-                pendant_info one_pendant_info;
-                one_pendant_info.rect = pendant_det_info.rect;
-                one_pendant_info.index = pendant_det_info.index;
-                one_pendant_info.confidence = pendant_det_info.confidence;
-                one_pendant_info.driver_copilot_info = pendant_det_info.driver_copilot_info;
-                info.vehicle_pendant_det_res.push_back(one_pendant_info);
-            }
+    std::lock_guard<std::mutex> l(m_single_mtx);
-            vec_info.push_back(info);
-        }
+    vector<AnalysisResult> vec_result;
-        AnalysisResult one_result;
-        one_result.info = vec_info;
-        vec_result.push_back(one_result);
+#ifndef AUTHORIZATION
+    if (!CheckTime()) { //时间限制
+        LOG_FATAL("authority failed!");
+        return vec_result;
     }
-
-    return vec_result;
-}
-
-vector<AnalysisResult> PicAnalysis::analysis_img(vector<sy_img> vec_img){
+#else
+    if (check_label == -1) { //机器授权
+        LOG_FATAL("authority failed!");
+        return vec_result;
+    }
+    if (!UpdateLabel()) {
+        LOG_FATAL("authority failed!");
+        return vec_result;
+    }
+#endif
     LOG_INFO("vec_img size:{}", vec_img.size());
-    std::lock_guard<std::mutex> l(m_single_mtx);
-
-    vector<AnalysisResult> vec_result;
-
     const int batch_size = vec_img.size();
     int ret = aclrtSetCurrentContext(m_ctx);
@@ -205,11 +185,7 @@ vector&lt;AnalysisResult&gt; PicAnalysis::analysis_img(vector&lt;sy_img&gt; vec_img){
         return vec_result;
     }
-    va_result* result = m_vehicle_analysis.detect(vec_img);
-    if (result) {
-        vec_result = va_result2AnalysisResult(result, batch_size);
-        m_vehicle_analysis.release_result(result, vec_img.size());
-    }
+    vec_result = m_vehicle_analysis.detect(vec_img);
     LOG_INFO("vec_result size:{}", vec_result.size());
@@ -426,4 +402,105 @@ int PicAnalysis::release() {
     aclrtDestroyContext(m_ctx);
     return 0;
+}
+
+bool PicAnalysis::CheckLabel(int devId) {
+  	const char *token_password = "village_atlas_arm_2023";
+    std::string guid = std::string("village_atlas_arm")+std::to_string(devId);
+    atlas_licence_param lic_param;
+    memset(&lic_param, 0, sizeof(atlas_licence_param));
+    sprintf(lic_param.product_id, "%s", productSN);
+    sprintf(lic_param.guid, "%s",guid.c_str());
+    sprintf(lic_param.token_pwd, "%s", token_password);
+    lic_param.channel_num = 1;
+    atlas_licence_token param_token;
+    memset(&param_token, 0, sizeof(atlas_licence_token));
+
+    int result = atlas_licence_connect(&(skt_handle), lic_param, &param_token);
+    //printf("result:%d,code:%d,msg:%s \n", result, param_token.code, param_token.msg);
+    //printf("token:%s\n", param_token.token);
+    std::string recv_token = std::string(param_token.token);
+
+    //atlas_licence_check_param check_param;
+    memset(&(check_param), 0, sizeof(atlas_licence_check_param));
+    sprintf(check_param.token_pwd, "%s", token_password);
+    sprintf(check_param.time, "%s", "2023-01-10 20:00:00");
+    sprintf(check_param.token, "%s", recv_token .c_str());
+    check_param.consume = 2;
+
+    //授权check------------
+    check_label = -1;//初始值
+    std::cout << "sy_licence_check start." << std::endl;
+    atlas_licence_check_result check_result;
+    memset(&check_result, 0, sizeof(atlas_licence_check_result));
+    check_result.code = -1;
+
+    int res = atlas_licence_check(skt_handle, check_param, &check_result);
+    if(res!=0) {
+      std::cout << "sy_licence_check failed." << std::endl;
+      return false;
+    }
+    //std::cout << "code:" << check_result.code << ",msg:" << check_result.msg << std::endl;
+    if(check_result.code!=0) {
+      std::cout << "code:" << check_result.code << ",msg:" << check_result.msg << std::endl;
+      return false;
+    }
+    std::cout << "sy_licence_check end." << std::endl;
+
+    check_label = 0;//授权成功
+    return true;
+}
+
+bool PicAnalysis::UpdateLabel() {
+    //获取系统时间，每个月1号check一次授权
+    struct tm* info;
+    int nYear, nMonth, nDay;
+    time_t raw;
+    time(&raw);
+    info = localtime(&raw);
+    nYear = info->tm_year + 1900;
+    nMonth = info->tm_mon + 1;
+    nDay = info->tm_mday;
+    if(nDay==1) {
+      if(check_label ==0) {
+        LOG_INFO("atlas_licence_check start.");
+        atlas_licence_check_result check_result;
+        memset(&check_result, 0, sizeof(atlas_licence_check_result));
+        check_result.code = -1;
+
+        int res = atlas_licence_check(skt_handle, check_param, &check_result);
+        if(res!=0) {
+          LOG_FATAL("sy_licence_check failed.");
+          return false;
+        }
+        if(check_result.code!=0) {
+          check_label = -1;
+          LOG_FATAL("atlas_licence_check code:{}, msg:{}",check_result.code, check_result.msg);
+          return false;
+        }
+        LOG_INFO("atlas_licence_check end.");
+        check_label =1;
+      }
+    }
+    else {
+      check_label =0;
+    }
+    return true;
+}
+
+bool PicAnalysis::CheckTime() {
+    struct tm* info;
+    int nYear, nMonth, nDay;
+    time_t raw;
+    time(&raw);
+    info = localtime(&raw);
+    nYear = info->tm_year + 1900;
+    nMonth = info->tm_mon + 1;
+    nDay = info->tm_mday;
+
+	if (nYear == 2025 && (nMonth <= 11 || (nMonth <= 12 && nDay <= 31))){
+        return true;
+    } else {
+        return false;
+    }
 }
 \ No newline at end of file
@@ -12,6 +12,7 @@
 #include "./utils/PathUtils.hpp"
 #include "village_inc.h"
+#include "atlas_licence.h"
 #include <mutex>
@@ -33,7 +34,9 @@ public:
 private:
     int release();
-    vector<AnalysisResult> va_result2AnalysisResult(va_result* result, int batchsize);
+    bool CheckTime();
+    bool CheckLabel(int devId);
+  	bool UpdateLabel();
 private:
     aclrtContext m_ctx{nullptr};
@@ -52,6 +55,10 @@ private:
     CropUtil m_crop_util;
     std::mutex m_single_mtx;
+
+    void *skt_handle {nullptr};//授权
+	atlas_licence_check_param check_param;//授权
+	int check_label {-1};//授权 -1=未授权  0=授权  1=授权check日已经check成功（每月一次check）
 };
@@ -72,45 +72,24 @@ int VehicleAnalysis::init(VehicleAnalysisParam tParam) {
     return 0;
 }
-va_result * VehicleAnalysis::detect(vector<sy_img> vec_img) {
+vector<AnalysisResult> VehicleAnalysis::detect(vector<sy_img> vec_img) {
     int batch_size = vec_img.size();
     va_result *result=new va_result[batch_size];
-    for(int b=0;b<batch_size;b++)
-    {
-        result[b].count=0;
-        result[b].info=new vehicle_info[100];
-        for(int c=0; c<100; c++)
-        {
-            result[b].info[c].vehicle_pendant_det_res.vpd_res=new v_pendant_d_info[300];	
-        }			
-    }
     LOG_INFO("va_batch start");
     int ret = va_batch(m_handle, vec_img.data(), batch_size, result);
+    auto vec_result = va_result2AnalysisResult(result, batch_size);
+
+    delete[] result;
+    result = nullptr;
+
     LOG_INFO("va_batch end:{}", ret);
-    //delete result
-    // for(int b=0;b<batch_size;b++)
-    // {
-    //     for(int c=0; c<100; c++)
-    //     {
-    //         if(result[b].info[c].vehicle_pendant_det_res.vpd_res!=NULL)
-    //             delete[] result[b].info[c].vehicle_pendant_det_res.vpd_res;
-    //     }
-    //     if(result[b].info!=NULL){
-    //         delete[] result[b].info;
-    //     }
-    // }
-
-    // if(result!=NULL){
-    //     delete[] result;
-    // }
-
-    return result;  
+    return vec_result;  
 }
 void VehicleAnalysis::release(){
@@ -119,22 +98,52 @@ void VehicleAnalysis::release(){
     }
 }
-void VehicleAnalysis::release_result(va_result* result, int batch_size){
-    for(int b=0;b<batch_size;b++)
+vector<AnalysisResult> VehicleAnalysis::va_result2AnalysisResult(va_result* result, int batchsize) {
+
+    vector<AnalysisResult> vec_result;
+
+    for (int b = 0; b < batchsize; b++)
     {
-        for(int c=0; c<100; c++)
+        vector<VehicleInfo> vec_info;
+        for(int c=0;c<result[b].count;c++)
         {
-            if(result[b].info[c].vehicle_pendant_det_res.vpd_res!=NULL)
-                delete[] result[b].info[c].vehicle_pendant_det_res.vpd_res;
-            
-        }
-        if(result[b].info!=NULL){
-            delete[] result[b].info;
+            vehicle_info result_info = result[b].info[c];
+
+            VehicleInfo info;
+            info.vehicle_detect_res         = result_info.vehicle_detect_res        ;	 
+            info.vehicle_win_detect_res     = result_info.vehicle_win_detect_res    ; 	
+            info.vehicle_body_detect_res    = result_info.vehicle_body_detect_res   ;	
+            info.vehicle_color_res          = result_info.vehicle_color_res         ;
+            info.vehicle_recg_res           = result_info.vehicle_recg_res          ;  
+            info.vehicle_plate_det_recg_res = result_info.vehicle_plate_det_recg_res;	 
+            info.vehicle_illegal_det_res    = result_info.vehicle_illegal_det_res   ; 	
+            info.vehicle_fea_res            = result_info.vehicle_fea_res           ;   	
+            info.mta_res                    = result_info.mta_res                   ;   
+            info.manned_res	 	            = result_info.manned_res	 	        ;  
+            info.type                       = result_info.type                      ;         
+            info.vpt_type                   = result_info.vpt_type                  ;
+
+
+            auto pendant_result = result_info.vehicle_pendant_det_res;
+            for (size_t j = 0; j < pendant_result.count; j++)
+            {
+                auto pendant_det_info = pendant_result.vpd_res[j];
+
+                pendant_info one_pendant_info;
+                one_pendant_info.rect = pendant_det_info.rect;
+                one_pendant_info.index = pendant_det_info.index;
+                one_pendant_info.confidence = pendant_det_info.confidence;
+                one_pendant_info.driver_copilot_info = pendant_det_info.driver_copilot_info;
+                info.vehicle_pendant_det_res.push_back(one_pendant_info);
+            }
+
+            vec_info.push_back(info);
         }
-            
-    }
-    if(result!=NULL){
-        delete[] result;
+        AnalysisResult one_result;
+        one_result.info = vec_info;
+        vec_result.push_back(one_result);
     }
-}
+
+    return vec_result;
+}
 \ No newline at end of file
@@ -5,6 +5,8 @@
 #include "vehicle_analysis.h"
+#include "../village_inc.h"
+
 struct DriverInfo {
     sy_rect driver_rect;
     float driver_prob;
@@ -46,13 +48,13 @@ public:
     int init(VehicleAnalysisParam tParam);
-    va_result* detect(vector<sy_img> vec_img);
-
-    void release_result(va_result*, int);
+    vector<AnalysisResult> detect(vector<sy_img> vec_img);
 private:
     void release();
+    vector<AnalysisResult> va_result2AnalysisResult(va_result* result, int batchsize);
+
 private:
     void* m_handle{nullptr};