添加PIS、Neety接口

build/CMakeFiles/main.dir/CXX.includecache

@@ -1025,6 +1025,10 @@ Util/logger.h
 ../modules/TCPClient/include/Util/logger.h
 Network/TcpClient.h
 ../modules/TCPClient/include/Network/TcpClient.h
+Util/NoticeCenter.h
+../modules/TCPClient/include/Util/NoticeCenter.h
+Notices.h
+../modules/TCPClient/include/Notices.h
 SendLogin.h
 ../modules/TCPClient/include/SendLogin.h
 NettyServerCommandEnum.h
@@ -1040,6 +1044,10 @@ NettyClientCommandEnum.h
 SendHeartBeat.h
 ../modules/TCPClient/include/SendHeartBeat.h
 
+../modules/dataType/include/Crc16.h
+iostream
+-
+
 ../modules/dataType/include/InferData.h
 iostream
 -
@@ -1078,6 +1086,24 @@ rapidjson/stringbuffer.h
 rapidjson/writer.h
 -
 
+../modules/dataType/include/Notices.h
+
+../modules/dataType/include/PIDSClientResultMsg.h
+iostream
+-
+PIDSDataDefine.h
+../modules/dataType/include/PIDSDataDefine.h
+
+../modules/dataType/include/PIDSDataDefine.h
+iostream
+-
+user_app.h
+../modules/dataType/include/user_app.h
+Crc16.h
+../modules/dataType/include/Crc16.h
+Util/logger.h
+../modules/dataType/include/Util/logger.h
+
 ../modules/dataType/include/SendHeartBeat.h
 istream
 -
@@ -1201,6 +1227,10 @@ NettyClientCommandEnum.h
 ../modules/userApp/include/NettyClientCommandEnum.h
 InferData.h
 ../modules/userApp/include/InferData.h
+PIDSClientResultMsg.h
+../modules/userApp/include/PIDSClientResultMsg.h
+Notices.h
+../modules/userApp/include/Notices.h
 
 /home/nvidia/work/MIVA/source/src/main.cpp
 iostream

build/CMakeFiles/main.dir/depend.internal

@@ -86,11 +86,15 @@ CMakeFiles/main.dir/source/src/main.cpp.o
  ../3rdparty/rapidjson/include/rapidjson/stringbuffer.h
  ../3rdparty/rapidjson/include/rapidjson/writer.h
  ../modules/TCPClient/include/TCPClient.h
+ ../modules/dataType/include/Crc16.h
  ../modules/dataType/include/InferData.h
  ../modules/dataType/include/NettyClientCommandEnum.h
  ../modules/dataType/include/NettyClientResultMsg.h
  ../modules/dataType/include/NettyServerCommandEnum.h
  ../modules/dataType/include/NettyServerResultMsg.h
+ ../modules/dataType/include/Notices.h
+ ../modules/dataType/include/PIDSClientResultMsg.h
+ ../modules/dataType/include/PIDSDataDefine.h
  ../modules/dataType/include/SendHeartBeat.h
  ../modules/dataType/include/SendLogin.h
  ../modules/dataType/include/Stream.h

build/CMakeFiles/main.dir/depend.make

@@ -85,11 +85,15 @@ CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjs
 CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/stringbuffer.h
 CMakeFiles/main.dir/source/src/main.cpp.o: ../3rdparty/rapidjson/include/rapidjson/writer.h
 CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/TCPClient/include/TCPClient.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/Crc16.h
 CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/InferData.h
 CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/NettyClientCommandEnum.h
 CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/NettyClientResultMsg.h
 CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/NettyServerCommandEnum.h
 CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/NettyServerResultMsg.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/Notices.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/PIDSClientResultMsg.h
+CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/PIDSDataDefine.h
 CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/SendHeartBeat.h
 CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/SendLogin.h
 CMakeFiles/main.dir/source/src/main.cpp.o: ../modules/dataType/include/Stream.h

build/modules/CMakeFiles/modules.dir/CXX.includecache

@@ -1025,6 +1025,10 @@ Util/logger.h
 ../modules/TCPClient/include/Util/logger.h
 Network/TcpClient.h
 ../modules/TCPClient/include/Network/TcpClient.h
+Util/NoticeCenter.h
+../modules/TCPClient/include/Util/NoticeCenter.h
+Notices.h
+../modules/TCPClient/include/Notices.h
 SendLogin.h
 ../modules/TCPClient/include/SendLogin.h
 NettyServerCommandEnum.h
@@ -1040,6 +1044,10 @@ NettyClientCommandEnum.h
 SendHeartBeat.h
 ../modules/TCPClient/include/SendHeartBeat.h
 
+../modules/dataType/include/Crc16.h
+iostream
+-
+
 ../modules/dataType/include/InferData.h
 iostream
 -
@@ -1078,6 +1086,24 @@ rapidjson/stringbuffer.h
 rapidjson/writer.h
 -
 
+../modules/dataType/include/Notices.h
+
+../modules/dataType/include/PIDSClientResultMsg.h
+iostream
+-
+PIDSDataDefine.h
+../modules/dataType/include/PIDSDataDefine.h
+
+../modules/dataType/include/PIDSDataDefine.h
+iostream
+-
+user_app.h
+../modules/dataType/include/user_app.h
+Crc16.h
+../modules/dataType/include/Crc16.h
+Util/logger.h
+../modules/dataType/include/Util/logger.h
+
 ../modules/dataType/include/SendHeartBeat.h
 istream
 -
@@ -1225,6 +1251,10 @@ NettyClientCommandEnum.h
 ../modules/userApp/include/NettyClientCommandEnum.h
 InferData.h
 ../modules/userApp/include/InferData.h
+PIDSClientResultMsg.h
+../modules/userApp/include/PIDSClientResultMsg.h
+Notices.h
+../modules/userApp/include/Notices.h
 
 /home/nvidia/work/MIVA/modules/TCPClient/src/TCPClient.cpp
 TCPClient.h

build/modules/CMakeFiles/modules.dir/depend.internal

@@ -31,6 +31,7 @@ modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o
  ../modules/dataType/include/NettyClientResultMsg.h
  ../modules/dataType/include/NettyServerCommandEnum.h
  ../modules/dataType/include/NettyServerResultMsg.h
+ ../modules/dataType/include/Notices.h
  ../modules/dataType/include/SendHeartBeat.h
  ../modules/dataType/include/SendLogin.h
  /home/nvidia/work/MIVA/modules/TCPClient/src/TCPClient.cpp
@@ -47,9 +48,11 @@ modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o
  /usr/local/include/Thread/semaphore.h
  /usr/local/include/Thread/threadgroup.h
  /usr/local/include/Util/List.h
+ /usr/local/include/Util/NoticeCenter.h
  /usr/local/include/Util/ResourcePool.h
  /usr/local/include/Util/SSLBox.h
  /usr/local/include/Util/TimeTicker.h
+ /usr/local/include/Util/function_traits.h
  /usr/local/include/Util/logger.h
  /usr/local/include/Util/onceToken.h
  /usr/local/include/Util/util.h
@@ -195,11 +198,15 @@ modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o
  ../3rdparty/rapidjson/include/rapidjson/stringbuffer.h
  ../3rdparty/rapidjson/include/rapidjson/writer.h
  ../modules/TCPClient/include/TCPClient.h
+ ../modules/dataType/include/Crc16.h
  ../modules/dataType/include/InferData.h
  ../modules/dataType/include/NettyClientCommandEnum.h
  ../modules/dataType/include/NettyClientResultMsg.h
  ../modules/dataType/include/NettyServerCommandEnum.h
  ../modules/dataType/include/NettyServerResultMsg.h
+ ../modules/dataType/include/Notices.h
+ ../modules/dataType/include/PIDSClientResultMsg.h
+ ../modules/dataType/include/PIDSDataDefine.h
  ../modules/dataType/include/SendHeartBeat.h
  ../modules/dataType/include/SendLogin.h
  ../modules/dataType/include/Stream.h
@@ -556,11 +563,15 @@ modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o
  ../3rdparty/rapidjson/include/rapidjson/stringbuffer.h
  ../3rdparty/rapidjson/include/rapidjson/writer.h
  ../modules/TCPClient/include/TCPClient.h
+ ../modules/dataType/include/Crc16.h
  ../modules/dataType/include/InferData.h
  ../modules/dataType/include/NettyClientCommandEnum.h
  ../modules/dataType/include/NettyClientResultMsg.h
  ../modules/dataType/include/NettyServerCommandEnum.h
  ../modules/dataType/include/NettyServerResultMsg.h
+ ../modules/dataType/include/Notices.h
+ ../modules/dataType/include/PIDSClientResultMsg.h
+ ../modules/dataType/include/PIDSDataDefine.h
  ../modules/dataType/include/SendHeartBeat.h
  ../modules/dataType/include/SendLogin.h
  ../modules/dataType/include/Stream.h

build/modules/CMakeFiles/modules.dir/depend.make

@@ -30,6 +30,7 @@ modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../modules/dataTyp
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../modules/dataType/include/NettyClientResultMsg.h
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../modules/dataType/include/NettyServerCommandEnum.h
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../modules/dataType/include/NettyServerResultMsg.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../modules/dataType/include/Notices.h
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../modules/dataType/include/SendHeartBeat.h
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../modules/dataType/include/SendLogin.h
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: ../modules/TCPClient/src/TCPClient.cpp
@@ -46,9 +47,11 @@ modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: /usr/local/include
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: /usr/local/include/Thread/semaphore.h
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: /usr/local/include/Thread/threadgroup.h
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: /usr/local/include/Util/List.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: /usr/local/include/Util/NoticeCenter.h
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: /usr/local/include/Util/ResourcePool.h
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: /usr/local/include/Util/SSLBox.h
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: /usr/local/include/Util/TimeTicker.h
+modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: /usr/local/include/Util/function_traits.h
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: /usr/local/include/Util/logger.h
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: /usr/local/include/Util/onceToken.h
 modules/CMakeFiles/modules.dir/TCPClient/src/TCPClient.cpp.o: /usr/local/include/Util/util.h
@@ -194,11 +197,15 @@ modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidj
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/stringbuffer.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../3rdparty/rapidjson/include/rapidjson/writer.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/TCPClient/include/TCPClient.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/Crc16.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/InferData.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/NettyClientCommandEnum.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/NettyClientResultMsg.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/NettyServerCommandEnum.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/NettyServerResultMsg.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/Notices.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/PIDSClientResultMsg.h
+modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/PIDSDataDefine.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/SendHeartBeat.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/SendLogin.h
 modules/CMakeFiles/modules.dir/inference/src/inference.cpp.o: ../modules/dataType/include/Stream.h
@@ -555,11 +562,15 @@ modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/stringbuffer.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../3rdparty/rapidjson/include/rapidjson/writer.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/TCPClient/include/TCPClient.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/Crc16.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/InferData.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/NettyClientCommandEnum.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/NettyClientResultMsg.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/NettyServerCommandEnum.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/NettyServerResultMsg.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/Notices.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/PIDSClientResultMsg.h
+modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/PIDSDataDefine.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/SendHeartBeat.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/SendLogin.h
 modules/CMakeFiles/modules.dir/userApp/src/user_app.cpp.o: ../modules/dataType/include/Stream.h

modules/TCPClient/include/TCPClient.h

@@ -3,6 +3,9 @@
 #include <iostream>
 #include "Util/logger.h"
 #include "Network/TcpClient.h"
+#include "Util/NoticeCenter.h"
+#include "Notices.h"
+
 using namespace std;
 using namespace toolkit;
 

modules/TCPClient/src/TCPClient.cpp

@@ -10,6 +10,8 @@ namespace MIVA
     void TCPClient::onRecv(const Buffer::Ptr &pBuf){
         //接收数据事件
         DebugL << pBuf->data() << " from port:" << get_peer_port();
+        // 广播数据
+        NoticeCenter::Instance().emitEvent(NOTICE_NETTY,pBuf);
     }
 
     void TCPClient::onFlush(){

modules/dataType/include/Notices.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#define NOTICE_INFER "NOTICE_INFER"
+#define NOTICE_NETTY "NOTICE_NETTY"
+#define NOTICE_PIS   "NOTICE_PIS"
+

modules/dataType/include/PIDSClientResultMsg.h

@@ -79,27 +79,27 @@ public:
         data[16] = this->Train;
 
         data[17] = this->Crowdedness_1;
-        data[18] = (this-> Num_1 & 0x00FF)
+        data[18] = (this-> Num_1 & 0x00FF);
         data[19] = (this-> Num_1 & 0xFF00) >> 8;
 
         data[20] = this->Crowdedness_2;
-        data[21] = (this-> Num_2 & 0x00FF)
+        data[21] = (this-> Num_2 & 0x00FF);
         data[22] = (this-> Num_2 & 0xFF00) >> 8;
 
         data[23] = this->Crowdedness_3;
-        data[24] = (this-> Num_3 & 0x00FF)
+        data[24] = (this-> Num_3 & 0x00FF);
         data[25] = (this-> Num_3 & 0xFF00) >> 8;
 
         data[26] = this->Crowdedness_4;
-        data[27] = (this-> Num_4 & 0x00FF)
+        data[27] = (this-> Num_4 & 0x00FF);
         data[28] = (this-> Num_4 & 0xFF00) >> 8;
 
         data[29] = this->Crowdedness_5;
-        data[30] = (this-> Num_5 & 0x00FF)
+        data[30] = (this-> Num_5 & 0x00FF);
         data[31] = (this-> Num_5 & 0xFF00) >> 8;
 
         data[32] = this->Crowdedness_6;
-        data[33] = (this-> Num_6 & 0x00FF)
+        data[33] = (this-> Num_6 & 0x00FF);
         data[34] = (this-> Num_6 & 0xFF00) >> 8;
 
         int16_t crc = Crc16::GetCRC16(data, 9, length);

modules/userApp/include/user_app.h

@@ -32,6 +32,8 @@
 #include "SendLogin.h"
 #include "NettyClientCommandEnum.h"
 #include "InferData.h"
+#include "PIDSClientResultMsg.h"
+#include "Notices.h"
 
 using namespace toolkit;
 using namespace mediakit;
@@ -42,9 +44,6 @@ using namespace std;
 #define ERR -1
 #define OK 0
 
-// 推理广播
-#define NOTICE_INFER "NOTICE_INFER"
-
 
 namespace MIVA
 {  
@@ -81,12 +80,15 @@ namespace MIVA
 
         int device_id;
     private:
-        // 负责链接Netty的Socker
-        std::shared_ptr<TCPClient> m_tcpClient;
+        std::shared_ptr<TCPClient> m_tcpClient = NULL;
         std::list<Stream> DataList;
         Timer::Ptr m_timer0;
+
     private:
         void ListenInfer(int Source_id, int num);
+        void ListenNettyData(const Buffer::Ptr &pBuf);
+        void ListenPISData(const Buffer::Ptr &buf, struct sockaddr *addr);
+
         void ConnectNetty();
         void ReportData();
     };

modules/userApp/src/user_app.cpp

@@ -3,6 +3,7 @@
 namespace MIVA
 {  
     std::shared_ptr<Inference> m_Infer = NULL;
+    
     std::shared_ptr<UserApp> UserApp::CreateNew(){
         return std::make_shared<UserApp>();
     }
@@ -94,11 +95,24 @@ namespace MIVA
             InfoL << "The stream to be played is not found, please add it in the background.";
         }
 
+        // 监听推理广播
         NoticeCenter::Instance().addListener(0,NOTICE_INFER,
                 [&](int Source_id, int num){
                 this->ListenInfer(Source_id, num);
         });
 
+        // 监听Neety广播
+        NoticeCenter::Instance().addListener(0, NOTICE_NETTY,
+                [&](const Buffer::Ptr &pBuf){
+                this->ListenNettyData(pBuf);
+        });
+
+        // 监听PIS广播
+        NoticeCenter::Instance().addListener(0, NOTICE_NETTY,
+                [&](const Buffer::Ptr &buf, struct sockaddr *addr){
+                this->ListenPISData(buf, addr);
+        });
+
         InfoL << "System initialization is successful!";
         return OK;
     }
@@ -150,75 +164,20 @@ namespace MIVA
     // 上报识别结果
     void UserApp::ReportData()
     {
-        // 车厢IDs
-        list<int> CarIds;
-        // 推理数据
-        list<InferData> inferDatas;
-
-        vector<vector<string>> sqlRet;
-        // 同步查询
-        SqlWriter SelectCarId("select CarId from MIVA_DB.`CarId`");
-        SelectCarId << sqlRet;
-        if(!sqlRet.empty()){
-            for(auto &line : sqlRet){
-                int Id = std::atoi(line[0].c_str());
-                CarIds.push_back(Id);
-            }
-        }
 
-        sqlRet.clear();
-        inferDatas.clear();
-        // 查询各车型流的识别结果
-        std::list<int>::iterator iter;
-        for(iter=CarIds.begin(); iter!= CarIds.end(); iter++)
-        {
-            // 同步查询
-            SqlWriter SqlectStreams("select Stream,num FROM MIVA_DB.Streams WHERE Play = 1 and CarId = ?");
-            SqlectStreams << *(iter) << sqlRet;
-            if(!sqlRet.empty()){
-                for(auto &line : sqlRet){
-                    InferData infer;
-                    StreamInferData streamData;
-                    infer.CarId = *iter;
-                    streamData.uri = line[0];
-                    streamData.num = atoi(line[1].c_str());
-                    infer.data.push_back(streamData);
-                    inferDatas.push_back(infer);
-                }
-            }
-        }
-
-        list<Density> datas;
-        // 逻辑处理
-        if(!inferDatas.empty()){
-            std::list<InferData>::iterator iter1;
-            for(iter1=inferDatas.begin();iter1!=inferDatas.end();iter1++)
-            {
-                Density density;
-                density.CatId = (*iter1).CarId;
-                
-                // 先获取各个uri识别的数量
-                std::list<StreamInferData>::iterator iter2;
-                for(iter2=(*iter1).data.begin(); iter2!= (*iter1).data.end(); iter2++){
-                    density.num += (*iter2).num;
-                }
-                // 加入车重权重
-
-                
-                // 判定拥挤程度
-                density.Crowdedness = 1;
-                datas.push_back(density);
-            }
-        }
+    }
 
-        // 传输至PIS
+    // 处理Netty的数据
+    void UserApp::ListenNettyData(const Buffer::Ptr &pBuf)
+    {
 
 
+    }
 
+    // 处理PIS系统的数据
+    void UserApp::ListenPISData(const Buffer::Ptr &buf, struct sockaddr *addr)
+    {
 
-        // 传输至Netty
-        
 
     }
-
 }