code format

zhangzengfei

2023-01-13 e783dc858cbf3370c80a46b6bfef6d14580b6764

 util.cpp

@@ -5,15 +5,15 @@
#include "google/protobuf/util/type_resolver.h"
#include "google/protobuf/util/type_resolver_util.h"

#include "google/protobuf/message.h"
#include "google/protobuf/compiler/importer.h"
#include "google/protobuf/descriptor.h"
#include "google/protobuf/descriptor.pb.h"
#include "google/protobuf/dynamic_message.h"
#include "google/protobuf/compiler/importer.h"
#include "google/protobuf/message.h"

#include "3rdparty/yyjson/yyjson.h"
#include "3rdparty/bus_client/cbhomeclient.h"
#include "3rdparty/bus_client/message.h"
#include "3rdparty/yyjson/yyjson.h"
#include "proto/x86_64/sysset.pb.h"
#include <vector>

@@ -26,6 +26,7 @@
bool json_to_proto(const std::string &json, google::protobuf::Message& message) {
    google::protobuf::util::JsonParseOptions options;
    options.ignore_unknown_fields = true;

    return JsonStringToMessage(json, &message,options).ok();
}

@@ -34,6 +35,7 @@
    options.add_whitespace = true;
    options.always_print_primitive_fields = true;
    options.preserve_proto_field_names = true;

    return MessageToJsonString(message, &json, options).ok();
}

@@ -52,8 +54,7 @@
    return json;
}

extern "C" int bus_dbapi_get_json_data(const char * json, char ** pptr_data, yyjson_type *ptr_type)
{
extern "C" int bus_dbapi_get_json_data(const char *json, char **pptr_data, yyjson_type *ptr_type) {
    /*{
   "success": true,
   "msg": "",
@@ -69,17 +70,20 @@
        {
            "id": "295F36D6-7489-30AC-3263-335B4660AA79",
            "name": "全天",
            "time_rule": "[{\"day\":1,\"time_range\":[{\"start\":\"05:31\",\"end\":\"21:07\"}]},{\"day\":2,\"time_range\":[{\"start\":\"01:42\",\"end\":\"23:59\"}]},{\"day\":3,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]},{\"day\":4,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]},{\"day\":5,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]},{\"day\":6,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]},{\"day\":7,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]}]"
      "time_rule":
"[{\"day\":1,\"time_range\":[{\"start\":\"05:31\",\"end\":\"21:07\"}]},{\"day\":2,\"time_range\":[{\"start\":\"01:42\",\"end\":\"23:59\"}]},{\"day\":3,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]},{\"day\":4,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]},{\"day\":5,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]},{\"day\":6,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]},{\"day\":7,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]}]"
        },
        {
            "id": "21FA488C-2858-F366-4587-CE0661BFAD60",
            "name": "SAAS",
            "time_rule": "[{\"day\":1,\"time_range\":[{\"start\":\"00:00\",\"end\":\"17:04\"}]},{\"day\":2,\"time_range\":[{\"start\":\"00:00\",\"end\":\"17:25\"}]},{\"day\":3,\"time_range\":[{\"start\":\"00:00\",\"end\":\"17:22\"}]},{\"day\":4,\"time_range\":[{\"start\":\"00:00\",\"end\":\"15:33\"}]},{\"day\":5,\"time_range\":[{\"start\":\"00:00\",\"end\":\"17:40\"}]},{\"day\":6,\"time_range\":[{\"start\":\"00:00\",\"end\":\"18:04\"}]},{\"day\":7,\"time_range\":[{\"start\":\"00:00\",\"end\":\"13:51\"}]}]"
      "time_rule":
"[{\"day\":1,\"time_range\":[{\"start\":\"00:00\",\"end\":\"17:04\"}]},{\"day\":2,\"time_range\":[{\"start\":\"00:00\",\"end\":\"17:25\"}]},{\"day\":3,\"time_range\":[{\"start\":\"00:00\",\"end\":\"17:22\"}]},{\"day\":4,\"time_range\":[{\"start\":\"00:00\",\"end\":\"15:33\"}]},{\"day\":5,\"time_range\":[{\"start\":\"00:00\",\"end\":\"17:40\"}]},{\"day\":6,\"time_range\":[{\"start\":\"00:00\",\"end\":\"18:04\"}]},{\"day\":7,\"time_range\":[{\"start\":\"00:00\",\"end\":\"13:51\"}]}]"
        },
        {
            "id": "37B82C8F-3BDB-A247-3683-F045190D2991",
            "name": "116",
            "time_rule": "[{\"day\":1,\"time_range\":[{\"start\":\"03:28\",\"end\":\"23:59\"}]},{\"day\":2,\"time_range\":[{\"start\":\"04:04\",\"end\":\"23:59\"}]},{\"day\":3,\"time_range\":[{\"start\":\"04:40\",\"end\":\"23:59\"}]},{\"day\":4,\"time_range\":[{\"start\":\"04:46\",\"end\":\"23:59\"}]},{\"day\":5,\"time_range\":[{\"start\":\"04:58\",\"end\":\"23:59\"}]},{\"day\":6,\"time_range\":[{\"start\":\"06:16\",\"end\":\"23:59\"}]},{\"day\":7,\"time_range\":[{\"start\":\"05:52\",\"end\":\"23:59\"}]}]"
      "time_rule":
"[{\"day\":1,\"time_range\":[{\"start\":\"03:28\",\"end\":\"23:59\"}]},{\"day\":2,\"time_range\":[{\"start\":\"04:04\",\"end\":\"23:59\"}]},{\"day\":3,\"time_range\":[{\"start\":\"04:40\",\"end\":\"23:59\"}]},{\"day\":4,\"time_range\":[{\"start\":\"04:46\",\"end\":\"23:59\"}]},{\"day\":5,\"time_range\":[{\"start\":\"04:58\",\"end\":\"23:59\"}]},{\"day\":6,\"time_range\":[{\"start\":\"06:16\",\"end\":\"23:59\"}]},{\"day\":7,\"time_range\":[{\"start\":\"05:52\",\"end\":\"23:59\"}]}]"
        }
    ],
    "msg": "",
@@ -91,11 +95,9 @@
    const char * success_name = "success";
    const char * msg_name = "msg";         

    if(NULL == *pptr_data)
    {
    if (NULL == *pptr_data) {
        return -1;
    }
    

    // Read JSON and get root
    yyjson_doc *doc = yyjson_read(json, strlen(json), 0);
@@ -106,8 +108,7 @@

    int  success_val = yyjson_get_bool(success);
    printf("success: %d\n", success_val);
    if(!success_val)
    {
    if (!success_val) {
        yyjson_doc_free(doc);
        return -1;
    }
@@ -136,8 +137,7 @@
    return ret;
}

bool bus_dbapi_get_topic_data(void *handle, const char* topic, crepmsg **pptr_repmsg, size_t len)
{
bool bus_dbapi_get_topic_data(void *handle, const char *topic, crepmsg **pptr_repmsg, size_t len) {
   const auto topicl = strlen(topic);
   auto reqData = make_get_request(topic);
   auto reqmsg = make_req_msg(topic, topicl, reqData, strlen(reqData));
@@ -155,7 +155,6 @@
   return true;
}
   

bool bus_dbapi_get(void *handle, const char* topic, google::protobuf::Message& message) {
   yyjson_type type = YYJSON_TYPE_OBJ;
   crepmsg *repmsg = NULL;
@@ -168,19 +167,16 @@
    char* msgdata = (char *)malloc(msglen);
    memset(msgdata, 0 , msglen);

    if(0 == bus_dbapi_get_json_data((const char *)repmsg->data, &msgdata, &type))
    {
    if (0 ==
        bus_dbapi_get_json_data((const char *)repmsg->data, &msgdata, &type)) {
        printf("======>> protomsg: %s\n", msgdata);            
    }

   std::string jsonString = msgdata;
   bRet = json_to_proto(jsonString, message);
   if (bRet) 
   {
    if (bRet) {
      printf("======>> json_to_proto done\n");
   } 
   else
   {
    } else {
      printf("======>> json_to_proto fail\n");
   }  

@@ -221,8 +217,7 @@
    memset(msgdata, 0 , msglen);

    iRet = bus_dbapi_get_json_data((const char *)repmsg->data, &msgdata, &type);
    if(0 == iRet)
    {
    if (0 == iRet) {
        printf("======>> protomsg: %s\n", msgdata); 
      bRet = true;
    }