modify format

Signed-off-by: zhaojunxia <zhaojunxia@kaihong.com>

hdc/service/examples/sample.h

@@ -27,12 +27,13 @@ namespace Example {
 class Basic {
     public:
     std::string basicName;
-    
-    public:
-    int getBasicId() {
+
+    int getBasicId() 
+    {
         return this->basicId;
     }
-    void setBasicId(int id) {
+    void setBasicId(int id) 
+    {
         this->basicId = id;
     }
 
@@ -42,13 +43,31 @@ class Basic {
 
 class Human : public Basic {
 public:
-    bool getOpFlag() {return this->opFlag;};
-    void setOpFlag(bool flag) { this->opFlag = flag;};
-    std::string getOpDesc() {return this->opDesc;};
-    void setOpDesc(std::string desc) { this->opDesc = desc;};
-    int getOpSeqId() {return this->opSeqId;};
-    void setOpSeqId(int id) {opSeqId = id;};
-public:
+    bool getOpFlag() 
+    {
+        return this->opFlag;
+    };
+    void setOpFlag(bool flag) 
+    { 
+        this->opFlag = flag;
+    };
+    std::string getOpDesc() 
+    {
+        return this->opDesc;
+    };
+    void setOpDesc(std::string desc) 
+    { 
+        this->opDesc = desc;
+    };
+    int getOpSeqId() 
+    {
+        return this->opSeqId;
+    };
+    void setOpSeqId(int id) 
+    {
+        opSeqId = id;
+    };
+
     std::string opName;
     int age = 0;
 private:
@@ -58,10 +77,22 @@ private:
 }
 
 struct Book {
-    int getCc() {return this->cc;};
-    void setCc(int cc) {this->cc = cc;};
-    Basic getBasicObj() {return this->basicObj;};
-    void setBasicObj(Basic obj) {this->basicObj = obj;};
+    int getCc() 
+    {
+        return this->cc;
+    };
+    void setCc(int cc) 
+    {
+        this->cc = cc;
+    };
+    Basic getBasicObj() 
+    {
+        return this->basicObj;
+    };
+    void setBasicObj(Basic obj) 
+    {
+        this->basicObj = obj;
+    };
 public:
     int aa;
     bool bb;
@@ -80,7 +111,6 @@ public:
     Book getBook(Basic& basic);
     int fun1 (Book v1);
     int fun2 (Basic& basic, Human& human);
-
 };
 
 }  // namespace Example

src/gen/generate/type.js

@@ -205,7 +205,9 @@ function generateType(name, data, inNamespace) {
       implH: '',
       implCpp: '',
       middleBody: '',
-      middleInit: ''
+      middleInit: '',
+      declarationH:''
+
     }
     let resultConnect = connectResult(name, data)
     let implH = resultConnect[1]
@@ -225,14 +227,16 @@ function generateType(name, data, inNamespace) {
         implH: implH,
         implCpp: implCpp,
         middleBody: '',
-        middleInit: middleInit
+        middleInit: middleInit,
+        declarationH:''
       }
     } else if (implCpp !== '' && middleInit !== '') {
       result = {
         implH: implH,
         implCpp: implCpp,
         middleBody: '',
-        middleInit: middleInit
+        middleInit: middleInit,
+        declarationH:''
       }
     } else {
       result = {
@@ -242,7 +246,9 @@ function generateType(name, data, inNamespace) {
   };\n`.format(name, implH),
         implCpp: implCpp,
         middleBody: '',
-        middleInit: middleInit
+        middleInit: middleInit,
+        declarationH: `
+        class %s;\r`.format(name),
       }
     }
     return result

test/storytest/test_on/test.js

@@ -67,4 +67,4 @@ describe('on', function () {
         tc3.on('OnEvent', onCallbackTest3);
         assert.strictEqual(ret, true);
     });
-});
+});