From: root <root@hcj>
Date: Sat, 2 Mar 2024 03:40:00 +0000 (+0800)
Subject: 补交
X-Git-Tag: release_V1.2.70_20241020_135402~1274^2~38^2~9^2~1
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=03a62e11ece452595f18d146583444bec1b8b53a;p=mirrors%2FFD230.git

补交
---

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 2cd1305d3..c51604f7a 100644
--- 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:
     static DialBinParser* GetInstance(void);
     bool UpdateDial(const std::string& file, FILE* fp, DialViewGroup* group);
-
+    void* MallocAndReadBuf(FILE* file, uint32_t readSize);
 protected:
     int32_t ParseDialHeader(FILE* file);
     int32_t ParserDialStaticImg(FILE* fp);
@@ -41,11 +41,11 @@ protected:
     int32_t ParserDialArcProgress(FILE* fp);
     int32_t ParserDialVideo(FILE* fp);
     int32_t ParserDialClick(FILE* fp);
-
+    
 private:
     DialBinParser();
     virtual ~DialBinParser();
-    void* MallocAndReadBuf(FILE* file, uint32_t readSize);
+    
     bool SetProgressType(FILE* fp, UIAbstractProgress* view, DialProgressType data);
 
     static constexpr uint8_t DIAL_BIN_PARSER_FUNC_NUM = 11;
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 2cd1305d3..cb81a18bc 100644
--- 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"
 #include "components/ui_abstract_progress.h"
 
-namespace OHOS {
+namespace OHOS
+{
 
-class DialBinParser {
-public:
-    static DialBinParser* GetInstance(void);
-    bool UpdateDial(const std::string& file, FILE* fp, DialViewGroup* group);
+    class DialBinParser
+    {
+    public:
+        static DialBinParser *GetInstance(void);
+        bool UpdateDial(const std::string &file, FILE *fp, DialViewGroup *group);
+        void *MallocAndReadBuf(FILE *file, uint32_t readSize);
 
-protected:
-    int32_t ParseDialHeader(FILE* file);
-    int32_t ParserDialStaticImg(FILE* fp);
-    int32_t ParserDialSequenceImg(FILE* fp);
-    int32_t ParserDialRotateImg(FILE* fp);
-    int32_t ParserDialOptionImg(FILE* fp);
-    int32_t ParserDialDigitalImg(FILE* fp);
-    int32_t ParserDialLabel(FILE* fp);
-    int32_t ParserDialArcLabel(FILE* fp);
-    int32_t ParserDialBoxProgress(FILE* fp);
-    int32_t ParserDialArcProgress(FILE* fp);
-    int32_t ParserDialVideo(FILE* fp);
-    int32_t ParserDialClick(FILE* fp);
+    protected:
+        int32_t ParseDialHeader(FILE *file);
+        int32_t ParserDialStaticImg(FILE *fp);
+        int32_t ParserDialSequenceImg(FILE *fp);
+        int32_t ParserDialRotateImg(FILE *fp);
+        int32_t ParserDialOptionImg(FILE *fp);
+        int32_t ParserDialDigitalImg(FILE *fp);
+        int32_t ParserDialLabel(FILE *fp);
+        int32_t ParserDialArcLabel(FILE *fp);
+        int32_t ParserDialBoxProgress(FILE *fp);
+        int32_t ParserDialArcProgress(FILE *fp);
+        int32_t ParserDialVideo(FILE *fp);
+        int32_t ParserDialClick(FILE *fp);
 
-private:
-    DialBinParser();
-    virtual ~DialBinParser();
-    void* MallocAndReadBuf(FILE* file, uint32_t readSize);
-    bool SetProgressType(FILE* fp, UIAbstractProgress* view, DialProgressType data);
+    private:
+        DialBinParser();
+        virtual ~DialBinParser();
+        // void* MallocAndReadBuf(FILE* file, uint32_t readSize);
+        bool SetProgressType(FILE *fp, UIAbstractProgress *view, DialProgressType data);
 
-    static constexpr uint8_t DIAL_BIN_PARSER_FUNC_NUM = 11;
-    int32_t (DialBinParser::*funcArray_[DIAL_BIN_PARSER_FUNC_NUM])(FILE*);
+        static constexpr uint8_t DIAL_BIN_PARSER_FUNC_NUM = 11;
+        int32_t (DialBinParser::*funcArray_[DIAL_BIN_PARSER_FUNC_NUM])(FILE *);
 
-    DialViewGroup* dialGroup_ = nullptr;
-    std::string file_;
-    uint32_t dirId_ = 0xfef << 20;
-    uint32_t imageOffset_ = 0;
-};
+        DialViewGroup *dialGroup_ = nullptr;
+        std::string file_;
+        uint32_t dirId_ = 0xfef << 20;
+        uint32_t imageOffset_ = 0;
+    };
 }
 #endif
\ No newline at end of file