增加worksync图片资源

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
index 9c16e77..1d32f71 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
@@ -107,6 +107,8 @@ typedef enum : uint16_t
     VIEW_UNCONNECTED,
     //画布组件测试
     VIEW_CANVAS_TEST,
+    //中移物联
+    VIEW_CHINA_MOBILEL_IOT,
     /* -------------------------------------------------------------------------- */
     /* ----------------------------------- 训练 ----------------------------------- */
     VIEW_TRAINING,        // 训练

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
index 59a6848..53fb1ad 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
@@ -78,6 +78,7 @@ namespace OHOS
         void InitStressSlice(void);
         void InitFatigueLevelSlice(void);
         void InitUnconnectedSlice(void);
+        void InitChinamobileIOTSlice(void);
         void InitCheckAbnormalSlice(void);
         void InitCheckInvalidSlice(void);
         void InitHeartResultSlice(void);

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
index 59d9a82..b4b007b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
@@ -675,6 +675,7 @@ namespace OHOS
     static constexpr const char *PNG_APPLIST_GOAL_IMAGE = APP_LIST_PATH "/sport.bin";               // 每日目标
     static constexpr const char *PNG_APPLIST_VOICE_IMAGE = APP_LIST_PATH "/voice.bin";              // 声音
     static constexpr const char *PNG_APPLIST_AIVOICE_IMAGE = APP_LIST_PATH "/aivoice.bin";          // AI Voice(人工智能语音)
+     static constexpr const char *PNG_APPLIST_WORKWYNC_IMAGE = APP_LIST_PATH "/worksync.bin";    //workwyvc(中移物联)
     static constexpr const char *PNG_APPLIST_SLEEP_IMAGE = APP_LIST_PATH "/sleeping.bin";           // 睡眠
     static constexpr const char *PNG_APPLIST_INFORMATION_IMAGE = APP_LIST_PATH "/information.bin";  // 计算器
     static constexpr const char *PNG_APPLIST_MUSIC_IMAGE = APP_LIST_PATH "/music.bin";              // 音乐
@@ -717,6 +718,7 @@ namespace OHOS
     static constexpr const char *PNG_APPLIST_GOAL_IMAGE_BIG = APP_LIST_PATH "/applist_big_icon/sport.bin";               // 每日目标
     static constexpr const char *PNG_APPLIST_VOICE_IMAGE_BIG = APP_LIST_PATH "/applist_big_icon/voice.bin";              // 声音
     static constexpr const char *PNG_APPLIST_AIVOICE_IMAGE_BIG = APP_LIST_PATH "/applist_big_icon/aivoice.bin";          // AI Voice(人工智能语音)
+    static constexpr const char *PNG_APPLIST_CHINAMOBIELIOT_IMAGE_BIG = APP_LIST_PATH "/applist_big_icon/worksync.bin";          // 中移物联
     static constexpr const char *PNG_APPLIST_SLEEP_IMAGE_BIG = APP_LIST_PATH "/applist_big_icon/sleeping.bin";           // 睡眠
     static constexpr const char *PNG_APPLIST_INFORMATION_IMAGE_BIG = APP_LIST_PATH "/applist_big_icon/information.bin";  // 计算器
     static constexpr const char *PNG_APPLIST_MUSIC_IMAGE_BIG = APP_LIST_PATH "/applist_big_icon/music.bin";              // 音乐

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index ef59c34..3aefbb1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
@@ -150,6 +150,9 @@
 /*画布组件测试*/
 #include "canvastest/include/CanvasView.h"
 #include "canvastest/include/CanvasPresenter.h"
+/*中移物联*/
+#include "chinamobilelIOT/include/ChinaMobilelIOTView.h"
+#include "chinamobilelIOT/include/ChinaMobilelIOTPresenter.h"
 /* -------------------------------------------------------------------------- */
 #include "secondaryfunction/include/SecondaryFunctionPresenter.h"
 #include "secondaryfunction/include/SecondaryFunctionView.h"
@@ -511,6 +514,8 @@ namespace OHOS
         {VIEW_SET_TIME_FORMAT, &NativeLauncher::InitSetTimeFormatSlice},
         /*画布测试*/
         {VIEW_CANVAS_TEST, &NativeLauncher::InitCanvasTestSlice},
+        /*中移物联*/
+        {VIEW_CHINA_MOBILEL_IOT, &NativeLauncher::InitChinamobileIOTSlice},
         /* -------------------------------------------------------------------------- */
         /*智能助手*/
         {VIEW_OFFLINEVOICE, &NativeLauncher::InitOfflineVoice},
@@ -1829,6 +1834,18 @@ namespace OHOS
         }
         NativeAbility::GetInstance().AddSliceProxy(VIEW_CANVAS_TEST, t_View);
     }
+    /*中移物联*/
+    void NativeLauncher::InitChinamobileIOTSlice(void)
+    {
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitChinamobileIOTSlice");
+        SliceProxy *t_View = new AbilitySliceProxy<ChinaMobilelIOTView, ChinaMobilelIOTPresenter>;
+        if (nullptr == t_View)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "View is nullptr");
+            return;
+        }
+        NativeAbility::GetInstance().AddSliceProxy(VIEW_CHINA_MOBILEL_IOT, t_View);
+    }
 
     /*GPSnote*/
     void NativeLauncher::InitTraingGPSNoteSlice(void)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistConfigModel.h b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistConfigModel.h
index af78b84..874713c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistConfigModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistConfigModel.h
@@ -50,6 +50,9 @@ namespace OHOS
 #endif
 #ifdef SUPPORT_ALIPAY_SEC
             {VIEW_MAIN_ALIPAY, PNG_APPLIST_ALIPAY_IMAGE_BIG, PNG_APPLIST_ALIPAY_IMAGE, PNG_APPLIST_DEFAULT_IMG, "支付宝", STR_ALIPAY, nullptr, "Z", "ALIPAY"},
+#endif
+#if defined(CM_IOT)
+            {VIEW_CHINA_MOBILEL_IOT, PNG_APPLIST_CHINAMOBIELIOT_IMAGE_BIG, PNG_APPLIST_WORKWYNC_IMAGE, PNG_APPLIST_DEFAULT_IMG, "中移物联", STR_AI_FAMILY_MEALS, nullptr, "C", "China_Mobilel_IOT"},
 #endif
             {VIEW_MESSAGE, PNG_APPLIST_MESSAGE_IMAGE_BIG, PNG_APPLIST_MESSAGE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "消息通知", STR_MESSAGE_NOTIFICATION, nullptr, "X", "MESSAGE_NOTIFICATION"},
             {VIEW_COMPASS, PNG_APPLIST_COMPASS_IMAGE_BIG, PNG_APPLIST_COMPASS_IMAGE, PNG_APPLIST_DEFAULT_IMG, "指南针", STR_COMPASS, nullptr, "Z", "COMPASS"},

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPModel.cpp
index 0fa909c..ab22f03 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPModel.cpp
@@ -793,12 +793,16 @@ namespace OHOS
           if (CalibrationFlag == 1) // 第一次校准成功
           {
             CalibrationFlag++;
+            #if defined(BOARD_W9)
             ConfigModel::GetInstance()->set_condigData_Int(ConfigModel::CONFIGMODEL_ITEM_BP_CALIBRATION_FIRST_TIME, configValue);
+            #endif
           }
 
           else // 第二次校准成功，校准完成
           {
+            #if defined(BOARD_W9)
             ConfigModel::GetInstance()->set_condigData_Int(ConfigModel::CONFIGMODEL_ITEM_BP_CALIBRATION_SECOND_TIME, configValue);
+            #endif
             CalibrationFlag = 0;
           }
         }

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/ChinamobileIOT/notask.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/ChinamobileIOT/notask.bin
new file mode 100644 (file)
index 0000000..385eb51
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/ChinamobileIOT/notask.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa5bed1b6400410bbcc55657f2e3d13c93487cdfa1bdf9c56a79b593947697dd
+size 44056

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/ChinamobileIOT/task1.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/ChinamobileIOT/task1.bin
deleted file mode 100644 (file)
index dab93a7..0000000
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/ChinamobileIOT/task1.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63e15c8a7004a1957b4771f7ab5e8eddbb57c98f27634812da8ef606fbe6175c
-size 22424

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/ChinamobileIOT/task2.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/ChinamobileIOT/task2.bin
deleted file mode 100644 (file)
index 883f210..0000000
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/ChinamobileIOT/task2.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4b6e353d37c4ebb4888b8dff3b303099d5dfeaf0b279324267871d5587054c93
-size 15384

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/applist_icon/applist_big_icon/worksync.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/applist_icon/applist_big_icon/worksync.bin
new file mode 100644 (file)
index 0000000..8f3ad0a
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/applist_icon/applist_big_icon/worksync.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d268fe92e6deba5dceddf831b48aede90b44d868fa492de8fd4457ad630b9229
+size 6824

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/applist_icon/worksync.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/applist_icon/worksync.bin
new file mode 100644 (file)
index 0000000..ec0690c
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/applist_icon/worksync.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4445cfb51c3f7b2a624fd1e2165d6b6f157f5390bb6ce5f30a3424b9a231c20a
+size 5544

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/circle1.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/circle1.bin
new file mode 100644 (file)
index 0000000..de13a36
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/circle1.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:605e124c050239fc11a9d866c037da02427e157ac9e6ebfe229bce6ad16bee16
+size 20440

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/circle2.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/circle2.bin
new file mode 100644 (file)
index 0000000..ca39003
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/circle2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:61e19595478976d9aac704f7f5ccd4284126f16a842ceef1c2256485aabd3dda
+size 32584

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/circle3.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/circle3.bin
new file mode 100644 (file)
index 0000000..a81a127
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/circle3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8e07ae163f6dea4715827f87cd225ee7e5a19137a45140c2aa64c90db5e807f
+size 48264

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/devicebinding.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/devicebinding.bin
new file mode 100644 (file)
index 0000000..a593671
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/devicebinding.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e5c3290d7d2100683c4cd2d4a9a46e1c63a8ab7e3a2e708d647a99e4b4efb5a6
+size 56344

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/dingwei.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/dingwei.bin
new file mode 100644 (file)
index 0000000..8269394
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/dingwei.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b7c23e3d569a0a25c008825d4550b701319d717f02c4a4b5af810138fe3f2e1f
+size 6168

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/faild.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/faild.bin
new file mode 100644 (file)
index 0000000..f447f49
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/faild.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d96f919ce55670d69a0443efee47cf902fc181d62c5369b703b2dfd01d176b58
+size 11288

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/fieldcheckin.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/fieldcheckin.bin
new file mode 100644 (file)
index 0000000..526c2a7
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/fieldcheckin.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:856f395bc24217981fd1a3627e832e9849edf14b43fab2f27c1184c369dbd4ec
+size 56344

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/notask.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/notask.bin
new file mode 100644 (file)
index 0000000..385eb51
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/notask.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa5bed1b6400410bbcc55657f2e3d13c93487cdfa1bdf9c56a79b593947697dd
+size 44056

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/personalinformation.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/personalinformation.bin
new file mode 100644 (file)
index 0000000..4c2e846
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/personalinformation.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0cc1781537d080963a4d2ce1375bf6d2c87716b8dfd1bf311025bb35be770225
+size 56344

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/remind.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/remind.bin
new file mode 100644 (file)
index 0000000..0639872
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/remind.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:30d9c26fe967d1e1fe631e8439f186a0680235cedce37d41654db7fa7bce6e4d
+size 11640

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/reposition.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/reposition.bin
new file mode 100644 (file)
index 0000000..bc885d5
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/reposition.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d77248be476d4cf85b0a997d93b2988fbd5d0ef20e917305314ec8d3e69d149
+size 2264

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/success.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/success.bin
new file mode 100644 (file)
index 0000000..d15f67d
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/success.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d8530812cfec696a53bcb51b8ac89e76b496785d0a85a12268d4493cfc66e66
+size 11288

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/task.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/task.bin
new file mode 100644 (file)
index 0000000..0710d96
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/task.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad802796ae250f378a19cf3b2a62af75d8901f9746ec62fb76b09bc4845d1e65
+size 50808

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/ChinamobileIOT/worksync.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/worksync.bin
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/ChinamobileIOT/worksync.bin
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/worksync.bin

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/worktask.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/worktask.bin
new file mode 100644 (file)
index 0000000..c538f11
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/ChinamobileIOT/worktask.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e7ce044679ff9db97e957ea9dccc1854ee35ead8c593dea02eb5d535dfd85b8a
+size 56344