补交

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/parser/DialBinParser.h b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/parser/DialBinParser.h
index 2cd1305..c51604f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/parser/DialBinParser.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/parser/DialBinParser.h
@@ -27,7 +27,7 @@ class DialBinParser {
 public:\r
     static DialBinParser* GetInstance(void);\r
     bool UpdateDial(const std::string& file, FILE* fp, DialViewGroup* group);\r
-\r
+    void* MallocAndReadBuf(FILE* file, uint32_t readSize);\r
 protected:\r
     int32_t ParseDialHeader(FILE* file);\r
     int32_t ParserDialStaticImg(FILE* fp);\r
@@ -41,11 +41,11 @@ protected:
     int32_t ParserDialArcProgress(FILE* fp);\r
     int32_t ParserDialVideo(FILE* fp);\r
     int32_t ParserDialClick(FILE* fp);\r
-\r
+    \r
 private:\r
     DialBinParser();\r
     virtual ~DialBinParser();\r
-    void* MallocAndReadBuf(FILE* file, uint32_t readSize);\r
+    \r
     bool SetProgressType(FILE* fp, UIAbstractProgress* view, DialProgressType data);\r
 \r
     static constexpr uint8_t DIAL_BIN_PARSER_FUNC_NUM = 11;\r

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/parser/DialBinParser.h b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/parser/DialBinParser.h
index 2cd1305..cb81a18 100644 (file)
--- a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/parser/DialBinParser.h
+++ b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/parser/DialBinParser.h
@@ -21,40 +21,43 @@
 #include "DialBinTypes.h"\r
 #include "components/ui_abstract_progress.h"\r
 \r
-namespace OHOS {\r
+namespace OHOS\r
+{\r
 \r
-class DialBinParser {\r
-public:\r
-    static DialBinParser* GetInstance(void);\r
-    bool UpdateDial(const std::string& file, FILE* fp, DialViewGroup* group);\r
+    class DialBinParser\r
+    {\r
+    public:\r
+        static DialBinParser *GetInstance(void);\r
+        bool UpdateDial(const std::string &file, FILE *fp, DialViewGroup *group);\r
+        void *MallocAndReadBuf(FILE *file, uint32_t readSize);\r
 \r
-protected:\r
-    int32_t ParseDialHeader(FILE* file);\r
-    int32_t ParserDialStaticImg(FILE* fp);\r
-    int32_t ParserDialSequenceImg(FILE* fp);\r
-    int32_t ParserDialRotateImg(FILE* fp);\r
-    int32_t ParserDialOptionImg(FILE* fp);\r
-    int32_t ParserDialDigitalImg(FILE* fp);\r
-    int32_t ParserDialLabel(FILE* fp);\r
-    int32_t ParserDialArcLabel(FILE* fp);\r
-    int32_t ParserDialBoxProgress(FILE* fp);\r
-    int32_t ParserDialArcProgress(FILE* fp);\r
-    int32_t ParserDialVideo(FILE* fp);\r
-    int32_t ParserDialClick(FILE* fp);\r
+    protected:\r
+        int32_t ParseDialHeader(FILE *file);\r
+        int32_t ParserDialStaticImg(FILE *fp);\r
+        int32_t ParserDialSequenceImg(FILE *fp);\r
+        int32_t ParserDialRotateImg(FILE *fp);\r
+        int32_t ParserDialOptionImg(FILE *fp);\r
+        int32_t ParserDialDigitalImg(FILE *fp);\r
+        int32_t ParserDialLabel(FILE *fp);\r
+        int32_t ParserDialArcLabel(FILE *fp);\r
+        int32_t ParserDialBoxProgress(FILE *fp);\r
+        int32_t ParserDialArcProgress(FILE *fp);\r
+        int32_t ParserDialVideo(FILE *fp);\r
+        int32_t ParserDialClick(FILE *fp);\r
 \r
-private:\r
-    DialBinParser();\r
-    virtual ~DialBinParser();\r
-    void* MallocAndReadBuf(FILE* file, uint32_t readSize);\r
-    bool SetProgressType(FILE* fp, UIAbstractProgress* view, DialProgressType data);\r
+    private:\r
+        DialBinParser();\r
+        virtual ~DialBinParser();\r
+        // void* MallocAndReadBuf(FILE* file, uint32_t readSize);\r
+        bool SetProgressType(FILE *fp, UIAbstractProgress *view, DialProgressType data);\r
 \r
-    static constexpr uint8_t DIAL_BIN_PARSER_FUNC_NUM = 11;\r
-    int32_t (DialBinParser::*funcArray_[DIAL_BIN_PARSER_FUNC_NUM])(FILE*);\r
+        static constexpr uint8_t DIAL_BIN_PARSER_FUNC_NUM = 11;\r
+        int32_t (DialBinParser::*funcArray_[DIAL_BIN_PARSER_FUNC_NUM])(FILE *);\r
 \r
-    DialViewGroup* dialGroup_ = nullptr;\r
-    std::string file_;\r
-    uint32_t dirId_ = 0xfef << 20;\r
-    uint32_t imageOffset_ = 0;\r
-};\r
+        DialViewGroup *dialGroup_ = nullptr;\r
+        std::string file_;\r
+        uint32_t dirId_ = 0xfef << 20;\r
+        uint32_t imageOffset_ = 0;\r
+    };\r
 }\r
 #endif
\ No newline at end of file