增加雷鸟必要宏

diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/include/components/ui_label_ext_with_shadow.h b/code/sdk/middleware/services/gui/uikit/proprietary/include/components/ui_label_ext_with_shadow.h
index a760e61..062032c 100644 (file)
--- a/code/sdk/middleware/services/gui/uikit/proprietary/include/components/ui_label_ext_with_shadow.h
+++ b/code/sdk/middleware/services/gui/uikit/proprietary/include/components/ui_label_ext_with_shadow.h
@@ -1,17 +1,4 @@
-/*
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+#ifdef BOARD_LEINIAO
 
 #ifndef GRAPHIC_LITE_UI_LABEL_EXT_WITH_SHADOW_H
 #define GRAPHIC_LITE_UI_LABEL_EXT_WITH_SHADOW_H
@@ -82,3 +69,4 @@ protected:
 #endif // ENABLE_FONT_VECTOR_GLOBAL || ENABLE_SHAPING
 #endif // GRAPHIC_LITE_UI_LABEL_EXT_WITH_SHADOW_H
 
+#endif
\ No newline at end of file

diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/components/ui_label_ext_with_shadow.cpp b/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/components/ui_label_ext_with_shadow.cpp
index 0b53f54..558e02e 100644 (file)
--- a/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/components/ui_label_ext_with_shadow.cpp
+++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/components/ui_label_ext_with_shadow.cpp
@@ -1,18 +1,4 @@
-/*
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+#ifdef BOARD_LEINIAO
 #include "components/ui_label_ext_with_shadow.h"
 #include "common/text_with_shadow.h"
 
@@ -73,3 +59,4 @@ int16_t UILabelExtWithShadow::GetShadowOffsetY() const
 }
 } // namespace OHOS
 
+#endif
\ No newline at end of file

diff --git a/code/sdk/middleware/services/gui/uikit/ui/frameworks/common/text_with_shadow.cpp b/code/sdk/middleware/services/gui/uikit/ui/frameworks/common/text_with_shadow.cpp
index cb55f1d..dc43a8a 100644 (file)
--- a/code/sdk/middleware/services/gui/uikit/ui/frameworks/common/text_with_shadow.cpp
+++ b/code/sdk/middleware/services/gui/uikit/ui/frameworks/common/text_with_shadow.cpp
@@ -1,17 +1,6 @@
-/*
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// 自己增加阴影的阴影效果组件
+// 效果为最右与最下方两个像素显示为黑色
+#ifdef BOARD_LEINIAO
 
 #include "common/text_with_shadow.h"
 #include "draw/draw_label.h"
@@ -89,3 +78,4 @@ void TextWithShadow::Draw(BufferInfo& gfxDstBuffer,
 }
 } // namespace OHOS
 
+#endif
\ No newline at end of file

diff --git a/code/sdk/middleware/services/gui/uikit/ui/frameworks/draw/draw_label.cpp b/code/sdk/middleware/services/gui/uikit/ui/frameworks/draw/draw_label.cpp
index dd06942..3374c9e 100644 (file)
--- a/code/sdk/middleware/services/gui/uikit/ui/frameworks/draw/draw_label.cpp
+++ b/code/sdk/middleware/services/gui/uikit/ui/frameworks/draw/draw_label.cpp
@@ -59,6 +59,7 @@ void DrawLabel::DrawTextOneLine(BufferInfo& gfxDstBuffer, const LabelLineInfo& l
         }
     }
 }
+#ifdef BOARD_LEINIAO
 // 雷鸟项目增加，阴影Lable子组件
 void DrawLabel::DrawTextOneLineWithShadow(BufferInfo& gfxDstBuffer, const LabelLineInfo& labelLine, int16_t shadowOffsetX, int16_t shadowOffsetY)
 {
@@ -123,6 +124,7 @@ void DrawLabel::DrawTextOneLineWithShadow(BufferInfo& gfxDstBuffer, const LabelL
         }
     }
 }
+#endif
 
 void DrawLabel::DrawArcText(BufferInfo& gfxDstBuffer,
                             const Rect& mask,

diff --git a/code/sdk/middleware/services/gui/uikit/ui/frameworks/draw/draw_label.h b/code/sdk/middleware/services/gui/uikit/ui/frameworks/draw/draw_label.h
index 25186bf..13192f5 100644 (file)
--- a/code/sdk/middleware/services/gui/uikit/ui/frameworks/draw/draw_label.h
+++ b/code/sdk/middleware/services/gui/uikit/ui/frameworks/draw/draw_label.h
@@ -26,9 +26,12 @@ namespace OHOS {
 class DrawLabel : public HeapBase {
 public:
     static void DrawTextOneLine(BufferInfo& gfxDstBuffer, const LabelLineInfo& labelLine);
+
+    #ifdef BOARD_LEINIAO
     // 雷鸟项目增加，阴影Lable子组件
     static void DrawTextOneLineWithShadow(BufferInfo& gfxDstBuffer, const LabelLineInfo& labelLine, int16_t shadowOffsetX = 2, int16_t shadowOffsetY = 2);
-
+    #endif
+    
     static void DrawArcText(BufferInfo& gfxDstBuffer, const Rect& mask, const char* text,
                             const Point& arcCenter, uint8_t fontId, const UIArcLabel::ArcTextInfo arcTextInfo,
                             UIArcLabel::TextOrientation orientation, const Style& style, uint8_t opaScale);

diff --git a/code/sdk/middleware/services/gui/uikit/ui/interfaces/kits/common/text_with_shadow.h b/code/sdk/middleware/services/gui/uikit/ui/interfaces/kits/common/text_with_shadow.h
index 6ad287b..1afc26b 100644 (file)
--- a/code/sdk/middleware/services/gui/uikit/ui/interfaces/kits/common/text_with_shadow.h
+++ b/code/sdk/middleware/services/gui/uikit/ui/interfaces/kits/common/text_with_shadow.h
@@ -1,17 +1,6 @@
-/*
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// 自己增加阴影的阴影效果组件
+// 效果为最右与最下方两个像素显示为黑色
+#ifdef BOARD_LEINIAO
 
 #ifndef GRAPHIC_LITE_TEXT_WITH_SHADOW_H
 #define GRAPHIC_LITE_TEXT_WITH_SHADOW_H
@@ -93,3 +82,4 @@ private:
 } // namespace OHOS
 #endif // GRAPHIC_LITE_TEXT_WITH_SHADOW_H
 
+#endif
\ No newline at end of file