From: Caisking <3449750381@qq.com>
Date: Fri, 10 May 2024 03:56:28 +0000 (+0800)
Subject: 打包文件统一管理生成ui头文件
X-Git-Tag: release_V1.2.70_20241020_135402~1025^2~8^2^2~1
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=9429585cfca3276321b950fd412f9fca33be5d31;p=mirrors%2FFD230.git

打包文件统一管理生成ui头文件
---

diff --git a/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp b/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp
index 8dbaa3a11..0c0d6f8b3 100644
--- a/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp
+++ b/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp
@@ -1,12 +1,12 @@
 /***
- * @Date: 2024-04-23 16:04:40
+ * @Date: 2024-05-10 10:27:30
  * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-04-23 16:11:30
- * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.cpp
+ * @LastEditTime: 2024-05-10 11:03:56
+ * @FilePath: /sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp
  */
 
 #include "uicomponents/UIComponents.h"
-
+#include <vector>
 namespace OHOS
 {
     /***
@@ -199,75 +199,12 @@ namespace OHOS
         // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitImageView is succeed");
         return true;
     }
-    /**
-     * 创建包含图片文件路径的数组
-     * @param  basePath  包含图片文件的基本路径
-     * @param  fileExtension  图片文件的扩展名
-     * @param  numImages  图片文件的数量
-     * @return  返回包含图片文件路径的数组
-     */
-    const char **CreateImagePathsArray(const char *basePath, const char *fileExtension, int numImages)
-    {
-        const char **imagePaths = new const char *[numImages];
-        char buffer[256];
-        for (int i = 0; i < numImages; i++)
-        {
-            snprintf(buffer, sizeof(buffer), "%s/%d.%s", basePath, i + 1, fileExtension);
-            imagePaths[i] = strdup(buffer);
-        }
-        return imagePaths;
-    }
-    /**
-     * @brief 初始化UIImageAnimatorView，并设置为GIF动画。
-     *
-     * 该函数用于使用提供的GIF图像和属性初始化UIImageAnimatorView。
-     *
-     * @param imageAnimator 要初始化的UIImageAnimatorView对象的引用。
-     * @param paths GIF图像文件路径的数组。
-     * @param numFrames GIF中的帧数。
-     * @param left 视图的左侧位置。
-     * @param top 视图的顶部位置。
-     * @param width 视图的宽度。
-     * @param height 视图的高度。
-     * @param viewId 视图的ID。
-     * @param time 视图的帧速
-     * @return 如果初始化成功则返回true，否则返回false。
-     */
-    void InitImageAnimatorSource(UIImageAnimatorView *&imageAnimator, const char **imagePaths, int numFrames, int left, int top, int width, int height, const char *viewId, int time)
-    {
-        if (imageAnimator == nullptr)
-        {
-            imageAnimator = new UIImageAnimatorView();
-        }
-        imageAnimator->SetPosition(left, top);
-        imageAnimator->Resize(width, height);
-        imageAnimator->SetViewId(viewId);
-        // imageAnimator->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);
-        imageAnimator->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
-
-        ImageAnimatorInfo *imageAnimatorInfo = new ImageAnimatorInfo[numFrames];
-        for (int i = 0; i < numFrames; i++)
-        {
-            imageAnimatorInfo[i].imagePath = imagePaths[i];
-            imageAnimatorInfo[i].pos.x = left;
-            imageAnimatorInfo[i].pos.y = top;
-            imageAnimatorInfo[i].width = width;
-            imageAnimatorInfo[i].height = height;
-            imageAnimatorInfo[i].imageType = IMG_SRC_FILE_PATH;
-        }
-
-        imageAnimator->SetImageAnimatorSrc(imageAnimatorInfo, numFrames, time); // 200 is the default delay time
-        imageAnimator->SetTimeOfPause(time);
-        imageAnimator->SetRepeat(true);
-        // imageAnimator->SetReverse(true);
-        //  imageAnimator->SetVisible(true);
-    }
     /*带默认参数的初始化label*/
     void InitLabelDefault(UILabelExt *&label, int x, int y, int width, int height, const char *viewId, const char *text, int fontSize, const char *fontName)
     {
         InitLabel(label, x, y, width, height, viewId, text, fontName, fontSize);
     }
-
+    /* -------------------------------------------------------------------------- */
     /*替换字符串中的变量*/
     std::string UpdateLabelText(UILabelExt *&label, const std::string &newText, UIResourceTextId id)
     {
@@ -345,20 +282,88 @@ namespace OHOS
 
         delete labelext;
     }
+    /* -------------------------------------------------------------------------- */
+    /**
+     * 创建包含图片文件路径的数组
+     * @param  basePath  包含图片文件的基本路径
+     * @param  fileExtension  图片文件的扩展名
+     * @param  numImages  图片文件的数量
+     * @return  返回包含图片文件路径的数组
+     */
+    const char **CreateImagePathsArray(const char *basePath, const char *fileExtension, int numImages)
+    {
+        const char **imagePaths = new const char *[numImages];
+        char buffer[256];
+        for (int i = 0; i < numImages; i++)
+        {
+            snprintf(buffer, sizeof(buffer), "%s/%d.%s", basePath, i + 1, fileExtension);
+            imagePaths[i] = strdup(buffer);
+        }
+        return imagePaths;
+    }
+
     /*解析动画资源数组 imageche*/
-    void AnalysisArray(const char *fliename)
+    std::vector<ImageInfo *> AnalysisArray(const char *filename, uint32_t startId, uint32_t lastId)
     {
-#if 0
+        std::vector<ImageInfo *> imageArray;
+
         for (uint32_t i = startId; i <= lastId; i++)
         {
-            ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(i, file);
+            ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(i, filename);
             if (image == nullptr)
             {
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LoadAppMultiImages %x fail", i);
-                return;
+                // 如果加载失败，可以选择继续加载下一个，或者在这里处理其他逻辑
+                continue;
             }
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "LoadAppMultiImages %x", i);
+            imageArray.push_back(image);
         }
-#endif
+        return imageArray;
+    }
+    /**
+     * @brief 初始化UIImageAnimatorView，并设置为GIF动画。
+     *
+     * 该函数用于使用提供的GIF图像和属性初始化UIImageAnimatorView。
+     *
+     * @param imageAnimator 要初始化的UIImageAnimatorView对象的引用。
+     * @param paths GIF图像文件路径的数组。
+     * @param numFrames GIF中的帧数。
+     * @param left 视图的左侧位置。
+     * @param top 视图的顶部位置。
+     * @param width 视图的宽度。
+     * @param height 视图的高度。
+     * @param viewId 视图的ID。
+     * @param time 视图的帧速
+     * @return 如果初始化成功则返回true，否则返回false。
+     */
+    void InitImageAnimatorSource(UIImageAnimatorView *&imageAnimator, const char **imagePaths, int numFrames, int left, int top, int width, int height, const char *viewId, int time)
+    {
+        if (imageAnimator == nullptr)
+        {
+            imageAnimator = new UIImageAnimatorView();
+        }
+        imageAnimator->SetPosition(left, top);
+        imageAnimator->Resize(width, height);
+        imageAnimator->SetViewId(viewId);
+        // imageAnimator->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);
+        imageAnimator->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
+
+        ImageAnimatorInfo *imageAnimatorInfo = new ImageAnimatorInfo[numFrames];
+        for (int i = 0; i < numFrames; i++)
+        {
+            imageAnimatorInfo[i].imagePath = imagePaths[i];
+            imageAnimatorInfo[i].pos.x = left;
+            imageAnimatorInfo[i].pos.y = top;
+            imageAnimatorInfo[i].width = width;
+            imageAnimatorInfo[i].height = height;
+            imageAnimatorInfo[i].imageType = IMG_SRC_FILE_PATH;
+        }
+
+        imageAnimator->SetImageAnimatorSrc(imageAnimatorInfo, numFrames, time); // 200 is the default delay time
+        imageAnimator->SetTimeOfPause(time);
+        imageAnimator->SetRepeat(true);
+        // imageAnimator->SetReverse(true);
+        //  imageAnimator->SetVisible(true);
     }
 }
diff --git a/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.h b/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.h
index 806252a36..4602c3635 100644
--- a/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.h
+++ b/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.h
@@ -1,15 +1,10 @@
 /***
- * @Date: 2024-04-25 10:56:15
+ * @Date: 2024-05-10 10:27:30
  * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-05-06 18:24:03
- * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.h
- */
-/***
- * @Date: 2024-04-23 16:04:31
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-04-23 16:07:41
- * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.h
+ * @LastEditTime: 2024-05-10 11:04:28
+ * @FilePath: /sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.h
  */
+
 #ifndef UICOMPONENTS_H
 #define UICOMPONENTS_H
 
@@ -32,6 +27,7 @@
 #include "components/ui_card_page.h"
 #include "traing/include/TraingModel.h"
 #include "language/font/ui_resource_string.h"
+#include "common/image_cache_manager.h"
 
 namespace OHOS
 {
@@ -61,6 +57,6 @@ namespace OHOS
     /*通过labelext获取Id设置label*/
     void SetLabelId(UILabel *&label, UIResourceTextId id);
     /*解析动画资源数组 imageche*/
-    void AnalysisArray(const char *fliename);
+    std::vector<ImageInfo *> AnalysisArray(const char *filename, uint32_t startId, uint32_t lastId);
 }
 #endif // UICOMPONENTS_H
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp b/code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp
index 7c3d94fe8..8466721e2 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp
@@ -1,8 +1,8 @@
 /*** 
  * @Date: 2024-04-15 10:55:58
  * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-04-16 09:56:05
- * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp
+ * @LastEditTime: 2024-05-10 11:05:32
+ * @FilePath: /sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp
  */
 /*
  * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.
diff --git a/package_image/maincard/BloodOxygenCard.png b/package_image/maincard/BloodOxygenCard.png
new file mode 100644
index 000000000..a464790c8
Binary files /dev/null and b/package_image/maincard/BloodOxygenCard.png differ
diff --git a/package_image/maincard/BloodOxygenCard.png:Zone.Identifier b/package_image/maincard/BloodOxygenCard.png:Zone.Identifier
new file mode 100644
index 000000000..053d1127c
--- /dev/null
+++ b/package_image/maincard/BloodOxygenCard.png:Zone.Identifier
@@ -0,0 +1,3 @@
+[ZoneTransfer]
+ZoneId=3
+HostUrl=about:internet
diff --git a/package_image/maincard/CompassCard.png b/package_image/maincard/CompassCard.png
new file mode 100644
index 000000000..c2adb9c52
Binary files /dev/null and b/package_image/maincard/CompassCard.png differ
diff --git a/package_image/maincard/HeartCard.png b/package_image/maincard/HeartCard.png
new file mode 100644
index 000000000..c01c97273
Binary files /dev/null and b/package_image/maincard/HeartCard.png differ
diff --git a/package_image/maincard/MusicCard.png b/package_image/maincard/MusicCard.png
new file mode 100644
index 000000000..2db7b406e
Binary files /dev/null and b/package_image/maincard/MusicCard.png differ
diff --git a/package_image/maincard/SportCard.png b/package_image/maincard/SportCard.png
new file mode 100644
index 000000000..51589cc52
Binary files /dev/null and b/package_image/maincard/SportCard.png differ
diff --git a/package_image/maincard/TrainingCard.png b/package_image/maincard/TrainingCard.png
new file mode 100644
index 000000000..a36c891af
Binary files /dev/null and b/package_image/maincard/TrainingCard.png differ
diff --git a/package_image/maincard/WeatherCard.png b/package_image/maincard/WeatherCard.png
new file mode 100644
index 000000000..aa14e291a
Binary files /dev/null and b/package_image/maincard/WeatherCard.png differ
diff --git a/package_image/maincard/disturbicon.png b/package_image/maincard/disturbicon.png
new file mode 100644
index 000000000..fea740dc9
Binary files /dev/null and b/package_image/maincard/disturbicon.png differ
diff --git a/package_image/message/1.png b/package_image/message/1.png
new file mode 100644
index 000000000..85e839a91
Binary files /dev/null and b/package_image/message/1.png differ
diff --git a/package_image/message/10.png b/package_image/message/10.png
new file mode 100644
index 000000000..37b19a557
Binary files /dev/null and b/package_image/message/10.png differ
diff --git a/package_image/message/11.png b/package_image/message/11.png
new file mode 100644
index 000000000..caf01b10c
Binary files /dev/null and b/package_image/message/11.png differ
diff --git a/package_image/message/12.png b/package_image/message/12.png
new file mode 100644
index 000000000..8d8990c32
Binary files /dev/null and b/package_image/message/12.png differ
diff --git a/package_image/message/13.png b/package_image/message/13.png
new file mode 100644
index 000000000..8bdd4a4a2
Binary files /dev/null and b/package_image/message/13.png differ
diff --git a/package_image/message/14.png b/package_image/message/14.png
new file mode 100644
index 000000000..bad2515b3
Binary files /dev/null and b/package_image/message/14.png differ
diff --git a/package_image/message/15.png b/package_image/message/15.png
new file mode 100644
index 000000000..970cc8d34
Binary files /dev/null and b/package_image/message/15.png differ
diff --git a/package_image/message/16.png b/package_image/message/16.png
new file mode 100644
index 000000000..49a1903a6
Binary files /dev/null and b/package_image/message/16.png differ
diff --git a/package_image/message/17.png b/package_image/message/17.png
new file mode 100644
index 000000000..45d772d01
Binary files /dev/null and b/package_image/message/17.png differ
diff --git a/package_image/message/18.png b/package_image/message/18.png
new file mode 100644
index 000000000..3be6bc9f6
Binary files /dev/null and b/package_image/message/18.png differ
diff --git a/package_image/message/19.png b/package_image/message/19.png
new file mode 100644
index 000000000..9c8bea97f
Binary files /dev/null and b/package_image/message/19.png differ
diff --git a/package_image/message/2.png b/package_image/message/2.png
new file mode 100644
index 000000000..07674de84
Binary files /dev/null and b/package_image/message/2.png differ
diff --git a/package_image/message/20.png b/package_image/message/20.png
new file mode 100644
index 000000000..5de63b78e
Binary files /dev/null and b/package_image/message/20.png differ
diff --git a/package_image/message/21.png b/package_image/message/21.png
new file mode 100644
index 000000000..3b9c98beb
Binary files /dev/null and b/package_image/message/21.png differ
diff --git a/package_image/message/22.png b/package_image/message/22.png
new file mode 100644
index 000000000..3f1bca29f
Binary files /dev/null and b/package_image/message/22.png differ
diff --git a/package_image/message/23.png b/package_image/message/23.png
new file mode 100644
index 000000000..42ee09013
Binary files /dev/null and b/package_image/message/23.png differ
diff --git a/package_image/message/24.png b/package_image/message/24.png
new file mode 100644
index 000000000..66e47c337
Binary files /dev/null and b/package_image/message/24.png differ
diff --git a/package_image/message/25.png b/package_image/message/25.png
new file mode 100644
index 000000000..c10fc7ded
Binary files /dev/null and b/package_image/message/25.png differ
diff --git a/package_image/message/26.png b/package_image/message/26.png
new file mode 100644
index 000000000..6be44625e
Binary files /dev/null and b/package_image/message/26.png differ
diff --git a/package_image/message/27.png b/package_image/message/27.png
new file mode 100644
index 000000000..d827544c4
Binary files /dev/null and b/package_image/message/27.png differ
diff --git a/package_image/message/28.png b/package_image/message/28.png
new file mode 100644
index 000000000..5089b15aa
Binary files /dev/null and b/package_image/message/28.png differ
diff --git a/package_image/message/29.png b/package_image/message/29.png
new file mode 100644
index 000000000..c2a3a0260
Binary files /dev/null and b/package_image/message/29.png differ
diff --git a/package_image/message/3.png b/package_image/message/3.png
new file mode 100644
index 000000000..afd0ab751
Binary files /dev/null and b/package_image/message/3.png differ
diff --git a/package_image/message/30.png b/package_image/message/30.png
new file mode 100644
index 000000000..0f3edb7c1
Binary files /dev/null and b/package_image/message/30.png differ
diff --git a/package_image/message/31.png b/package_image/message/31.png
new file mode 100644
index 000000000..908602fdd
Binary files /dev/null and b/package_image/message/31.png differ
diff --git a/package_image/message/32.png b/package_image/message/32.png
new file mode 100644
index 000000000..e0f377c76
Binary files /dev/null and b/package_image/message/32.png differ
diff --git a/package_image/message/33.png b/package_image/message/33.png
new file mode 100644
index 000000000..333204cb1
Binary files /dev/null and b/package_image/message/33.png differ
diff --git a/package_image/message/34.png b/package_image/message/34.png
new file mode 100644
index 000000000..aff7558ee
Binary files /dev/null and b/package_image/message/34.png differ
diff --git a/package_image/message/35.png b/package_image/message/35.png
new file mode 100644
index 000000000..a8b19ccad
Binary files /dev/null and b/package_image/message/35.png differ
diff --git a/package_image/message/36.png b/package_image/message/36.png
new file mode 100644
index 000000000..0edab8236
Binary files /dev/null and b/package_image/message/36.png differ
diff --git a/package_image/message/37.png b/package_image/message/37.png
new file mode 100644
index 000000000..7f9c4cd33
Binary files /dev/null and b/package_image/message/37.png differ
diff --git a/package_image/message/38.png b/package_image/message/38.png
new file mode 100644
index 000000000..b16b7ee68
Binary files /dev/null and b/package_image/message/38.png differ
diff --git a/package_image/message/39.png b/package_image/message/39.png
new file mode 100644
index 000000000..4dea0977b
Binary files /dev/null and b/package_image/message/39.png differ
diff --git a/package_image/message/4.png b/package_image/message/4.png
new file mode 100644
index 000000000..f967151c4
Binary files /dev/null and b/package_image/message/4.png differ
diff --git a/package_image/message/40.png b/package_image/message/40.png
new file mode 100644
index 000000000..a47b707b1
Binary files /dev/null and b/package_image/message/40.png differ
diff --git a/package_image/message/41.png b/package_image/message/41.png
new file mode 100644
index 000000000..19d652cad
Binary files /dev/null and b/package_image/message/41.png differ
diff --git a/package_image/message/5.png b/package_image/message/5.png
new file mode 100644
index 000000000..33bbf36d7
Binary files /dev/null and b/package_image/message/5.png differ
diff --git a/package_image/message/6.png b/package_image/message/6.png
new file mode 100644
index 000000000..56c2ebf27
Binary files /dev/null and b/package_image/message/6.png differ
diff --git a/package_image/message/7.png b/package_image/message/7.png
new file mode 100644
index 000000000..aeddf0a44
Binary files /dev/null and b/package_image/message/7.png differ
diff --git a/package_image/message/8.png b/package_image/message/8.png
new file mode 100644
index 000000000..84e03ecfa
Binary files /dev/null and b/package_image/message/8.png differ
diff --git a/package_image/message/9.png b/package_image/message/9.png
new file mode 100644
index 000000000..a43e273aa
Binary files /dev/null and b/package_image/message/9.png differ
diff --git a/package_image/takephotos/cream/1.png b/package_image/takephotos/cream/1.png
new file mode 100644
index 000000000..f8956cb55
Binary files /dev/null and b/package_image/takephotos/cream/1.png differ
diff --git a/package_image/takephotos/cream/10.png b/package_image/takephotos/cream/10.png
new file mode 100644
index 000000000..eb0eeae71
Binary files /dev/null and b/package_image/takephotos/cream/10.png differ
diff --git a/package_image/takephotos/cream/11.png b/package_image/takephotos/cream/11.png
new file mode 100644
index 000000000..caa73fac7
Binary files /dev/null and b/package_image/takephotos/cream/11.png differ
diff --git a/package_image/takephotos/cream/12.png b/package_image/takephotos/cream/12.png
new file mode 100644
index 000000000..beef6a4ee
Binary files /dev/null and b/package_image/takephotos/cream/12.png differ
diff --git a/package_image/takephotos/cream/13.png b/package_image/takephotos/cream/13.png
new file mode 100644
index 000000000..260e32a62
Binary files /dev/null and b/package_image/takephotos/cream/13.png differ
diff --git a/package_image/takephotos/cream/14.png b/package_image/takephotos/cream/14.png
new file mode 100644
index 000000000..205b36fb1
Binary files /dev/null and b/package_image/takephotos/cream/14.png differ
diff --git a/package_image/takephotos/cream/15.png b/package_image/takephotos/cream/15.png
new file mode 100644
index 000000000..ab2979925
Binary files /dev/null and b/package_image/takephotos/cream/15.png differ
diff --git a/package_image/takephotos/cream/16.png b/package_image/takephotos/cream/16.png
new file mode 100644
index 000000000..ca3357bf4
Binary files /dev/null and b/package_image/takephotos/cream/16.png differ
diff --git a/package_image/takephotos/cream/17.png b/package_image/takephotos/cream/17.png
new file mode 100644
index 000000000..6ec169e80
Binary files /dev/null and b/package_image/takephotos/cream/17.png differ
diff --git a/package_image/takephotos/cream/18.png b/package_image/takephotos/cream/18.png
new file mode 100644
index 000000000..c22592682
Binary files /dev/null and b/package_image/takephotos/cream/18.png differ
diff --git a/package_image/takephotos/cream/19.png b/package_image/takephotos/cream/19.png
new file mode 100644
index 000000000..9e0e2c90e
Binary files /dev/null and b/package_image/takephotos/cream/19.png differ
diff --git a/package_image/takephotos/cream/2.png b/package_image/takephotos/cream/2.png
new file mode 100644
index 000000000..74daa7148
Binary files /dev/null and b/package_image/takephotos/cream/2.png differ
diff --git a/package_image/takephotos/cream/20.png b/package_image/takephotos/cream/20.png
new file mode 100644
index 000000000..e70fe2661
Binary files /dev/null and b/package_image/takephotos/cream/20.png differ
diff --git a/package_image/takephotos/cream/21.png b/package_image/takephotos/cream/21.png
new file mode 100644
index 000000000..7c3abab8e
Binary files /dev/null and b/package_image/takephotos/cream/21.png differ
diff --git a/package_image/takephotos/cream/22.png b/package_image/takephotos/cream/22.png
new file mode 100644
index 000000000..f2df8fc71
Binary files /dev/null and b/package_image/takephotos/cream/22.png differ
diff --git a/package_image/takephotos/cream/23.png b/package_image/takephotos/cream/23.png
new file mode 100644
index 000000000..5d05e72e5
Binary files /dev/null and b/package_image/takephotos/cream/23.png differ
diff --git a/package_image/takephotos/cream/24.png b/package_image/takephotos/cream/24.png
new file mode 100644
index 000000000..9a4c0db1d
Binary files /dev/null and b/package_image/takephotos/cream/24.png differ
diff --git a/package_image/takephotos/cream/25.png b/package_image/takephotos/cream/25.png
new file mode 100644
index 000000000..c69d1a24d
Binary files /dev/null and b/package_image/takephotos/cream/25.png differ
diff --git a/package_image/takephotos/cream/26.png b/package_image/takephotos/cream/26.png
new file mode 100644
index 000000000..7ff282d0f
Binary files /dev/null and b/package_image/takephotos/cream/26.png differ
diff --git a/package_image/takephotos/cream/27.png b/package_image/takephotos/cream/27.png
new file mode 100644
index 000000000..06fd1084c
Binary files /dev/null and b/package_image/takephotos/cream/27.png differ
diff --git a/package_image/takephotos/cream/28.png b/package_image/takephotos/cream/28.png
new file mode 100644
index 000000000..1990c4387
Binary files /dev/null and b/package_image/takephotos/cream/28.png differ
diff --git a/package_image/takephotos/cream/29.png b/package_image/takephotos/cream/29.png
new file mode 100644
index 000000000..f054a1a23
Binary files /dev/null and b/package_image/takephotos/cream/29.png differ
diff --git a/package_image/takephotos/cream/3.png b/package_image/takephotos/cream/3.png
new file mode 100644
index 000000000..f13568ed1
Binary files /dev/null and b/package_image/takephotos/cream/3.png differ
diff --git a/package_image/takephotos/cream/30.png b/package_image/takephotos/cream/30.png
new file mode 100644
index 000000000..5365eb6d7
Binary files /dev/null and b/package_image/takephotos/cream/30.png differ
diff --git a/package_image/takephotos/cream/31.png b/package_image/takephotos/cream/31.png
new file mode 100644
index 000000000..d8bafc6fa
Binary files /dev/null and b/package_image/takephotos/cream/31.png differ
diff --git a/package_image/takephotos/cream/32.png b/package_image/takephotos/cream/32.png
new file mode 100644
index 000000000..363647ee0
Binary files /dev/null and b/package_image/takephotos/cream/32.png differ
diff --git a/package_image/takephotos/cream/33.png b/package_image/takephotos/cream/33.png
new file mode 100644
index 000000000..f80d593fa
Binary files /dev/null and b/package_image/takephotos/cream/33.png differ
diff --git a/package_image/takephotos/cream/34.png b/package_image/takephotos/cream/34.png
new file mode 100644
index 000000000..3471303f0
Binary files /dev/null and b/package_image/takephotos/cream/34.png differ
diff --git a/package_image/takephotos/cream/35.png b/package_image/takephotos/cream/35.png
new file mode 100644
index 000000000..b517b2fa2
Binary files /dev/null and b/package_image/takephotos/cream/35.png differ
diff --git a/package_image/takephotos/cream/36.png b/package_image/takephotos/cream/36.png
new file mode 100644
index 000000000..28d55a32d
Binary files /dev/null and b/package_image/takephotos/cream/36.png differ
diff --git a/package_image/takephotos/cream/37.png b/package_image/takephotos/cream/37.png
new file mode 100644
index 000000000..221383a52
Binary files /dev/null and b/package_image/takephotos/cream/37.png differ
diff --git a/package_image/takephotos/cream/38.png b/package_image/takephotos/cream/38.png
new file mode 100644
index 000000000..a384b4eb0
Binary files /dev/null and b/package_image/takephotos/cream/38.png differ
diff --git a/package_image/takephotos/cream/39.png b/package_image/takephotos/cream/39.png
new file mode 100644
index 000000000..f72818994
Binary files /dev/null and b/package_image/takephotos/cream/39.png differ
diff --git a/package_image/takephotos/cream/4.png b/package_image/takephotos/cream/4.png
new file mode 100644
index 000000000..b45599e8f
Binary files /dev/null and b/package_image/takephotos/cream/4.png differ
diff --git a/package_image/takephotos/cream/40.png b/package_image/takephotos/cream/40.png
new file mode 100644
index 000000000..6661de274
Binary files /dev/null and b/package_image/takephotos/cream/40.png differ
diff --git a/package_image/takephotos/cream/41.png b/package_image/takephotos/cream/41.png
new file mode 100644
index 000000000..f0b68ceca
Binary files /dev/null and b/package_image/takephotos/cream/41.png differ
diff --git a/package_image/takephotos/cream/42.png b/package_image/takephotos/cream/42.png
new file mode 100644
index 000000000..b1356872a
Binary files /dev/null and b/package_image/takephotos/cream/42.png differ
diff --git a/package_image/takephotos/cream/43.png b/package_image/takephotos/cream/43.png
new file mode 100644
index 000000000..53acc4c2b
Binary files /dev/null and b/package_image/takephotos/cream/43.png differ
diff --git a/package_image/takephotos/cream/44.png b/package_image/takephotos/cream/44.png
new file mode 100644
index 000000000..9c8c32333
Binary files /dev/null and b/package_image/takephotos/cream/44.png differ
diff --git a/package_image/takephotos/cream/45.png b/package_image/takephotos/cream/45.png
new file mode 100644
index 000000000..3ce7858ad
Binary files /dev/null and b/package_image/takephotos/cream/45.png differ
diff --git a/package_image/takephotos/cream/46.png b/package_image/takephotos/cream/46.png
new file mode 100644
index 000000000..878e83bc0
Binary files /dev/null and b/package_image/takephotos/cream/46.png differ
diff --git a/package_image/takephotos/cream/47.png b/package_image/takephotos/cream/47.png
new file mode 100644
index 000000000..9478c2c50
Binary files /dev/null and b/package_image/takephotos/cream/47.png differ
diff --git a/package_image/takephotos/cream/48.png b/package_image/takephotos/cream/48.png
new file mode 100644
index 000000000..f8956cb55
Binary files /dev/null and b/package_image/takephotos/cream/48.png differ
diff --git a/package_image/takephotos/cream/49.png b/package_image/takephotos/cream/49.png
new file mode 100644
index 000000000..f8956cb55
Binary files /dev/null and b/package_image/takephotos/cream/49.png differ
diff --git a/package_image/takephotos/cream/5.png b/package_image/takephotos/cream/5.png
new file mode 100644
index 000000000..188bb31b8
Binary files /dev/null and b/package_image/takephotos/cream/5.png differ
diff --git a/package_image/takephotos/cream/50.png b/package_image/takephotos/cream/50.png
new file mode 100644
index 000000000..f8956cb55
Binary files /dev/null and b/package_image/takephotos/cream/50.png differ
diff --git a/package_image/takephotos/cream/6.png b/package_image/takephotos/cream/6.png
new file mode 100644
index 000000000..0b54ed766
Binary files /dev/null and b/package_image/takephotos/cream/6.png differ
diff --git a/package_image/takephotos/cream/7.png b/package_image/takephotos/cream/7.png
new file mode 100644
index 000000000..a87b90290
Binary files /dev/null and b/package_image/takephotos/cream/7.png differ
diff --git a/package_image/takephotos/cream/8.png b/package_image/takephotos/cream/8.png
new file mode 100644
index 000000000..349ca15e1
Binary files /dev/null and b/package_image/takephotos/cream/8.png differ
diff --git a/package_image/takephotos/cream/9.png b/package_image/takephotos/cream/9.png
new file mode 100644
index 000000000..ca9f58d3d
Binary files /dev/null and b/package_image/takephotos/cream/9.png differ
diff --git a/package_image/takephotos/smile/1.png b/package_image/takephotos/smile/1.png
new file mode 100644
index 000000000..127c4e5ee
Binary files /dev/null and b/package_image/takephotos/smile/1.png differ
diff --git a/package_image/takephotos/smile/10.png b/package_image/takephotos/smile/10.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/10.png differ
diff --git a/package_image/takephotos/smile/11.png b/package_image/takephotos/smile/11.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/11.png differ
diff --git a/package_image/takephotos/smile/12.png b/package_image/takephotos/smile/12.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/12.png differ
diff --git a/package_image/takephotos/smile/13.png b/package_image/takephotos/smile/13.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/13.png differ
diff --git a/package_image/takephotos/smile/14.png b/package_image/takephotos/smile/14.png
new file mode 100644
index 000000000..9793dcd07
Binary files /dev/null and b/package_image/takephotos/smile/14.png differ
diff --git a/package_image/takephotos/smile/15.png b/package_image/takephotos/smile/15.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/15.png differ
diff --git a/package_image/takephotos/smile/16.png b/package_image/takephotos/smile/16.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/16.png differ
diff --git a/package_image/takephotos/smile/17.png b/package_image/takephotos/smile/17.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/17.png differ
diff --git a/package_image/takephotos/smile/18.png b/package_image/takephotos/smile/18.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/18.png differ
diff --git a/package_image/takephotos/smile/19.png b/package_image/takephotos/smile/19.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/19.png differ
diff --git a/package_image/takephotos/smile/2.png b/package_image/takephotos/smile/2.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/2.png differ
diff --git a/package_image/takephotos/smile/20.png b/package_image/takephotos/smile/20.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/20.png differ
diff --git a/package_image/takephotos/smile/21.png b/package_image/takephotos/smile/21.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/21.png differ
diff --git a/package_image/takephotos/smile/22.png b/package_image/takephotos/smile/22.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/22.png differ
diff --git a/package_image/takephotos/smile/23.png b/package_image/takephotos/smile/23.png
new file mode 100644
index 000000000..91e7ea054
Binary files /dev/null and b/package_image/takephotos/smile/23.png differ
diff --git a/package_image/takephotos/smile/24.png b/package_image/takephotos/smile/24.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/24.png differ
diff --git a/package_image/takephotos/smile/25.png b/package_image/takephotos/smile/25.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/25.png differ
diff --git a/package_image/takephotos/smile/26.png b/package_image/takephotos/smile/26.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/26.png differ
diff --git a/package_image/takephotos/smile/27.png b/package_image/takephotos/smile/27.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/27.png differ
diff --git a/package_image/takephotos/smile/28.png b/package_image/takephotos/smile/28.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/28.png differ
diff --git a/package_image/takephotos/smile/3.png b/package_image/takephotos/smile/3.png
new file mode 100644
index 000000000..4d605bd78
Binary files /dev/null and b/package_image/takephotos/smile/3.png differ
diff --git a/package_image/takephotos/smile/4.png b/package_image/takephotos/smile/4.png
new file mode 100644
index 000000000..f9846bf69
Binary files /dev/null and b/package_image/takephotos/smile/4.png differ
diff --git a/package_image/takephotos/smile/5.png b/package_image/takephotos/smile/5.png
new file mode 100644
index 000000000..969b72989
Binary files /dev/null and b/package_image/takephotos/smile/5.png differ
diff --git a/package_image/takephotos/smile/6.png b/package_image/takephotos/smile/6.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/6.png differ
diff --git a/package_image/takephotos/smile/7.png b/package_image/takephotos/smile/7.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/7.png differ
diff --git a/package_image/takephotos/smile/8.png b/package_image/takephotos/smile/8.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/8.png differ
diff --git a/package_image/takephotos/smile/9.png b/package_image/takephotos/smile/9.png
new file mode 100644
index 000000000..3125e34a6
Binary files /dev/null and b/package_image/takephotos/smile/9.png differ