修改FD230的宏为CUSTOM_ZHIHUI
authorCaisking <Casiking@zhihuishixun.com>
Tue, 16 Sep 2025 07:42:35 +0000 (15:42 +0800)
committerCaisking <Casiking@zhihuishixun.com>
Tue, 16 Sep 2025 07:42:35 +0000 (15:42 +0800)
77 files changed:
autobuild.sh
code/sdk/application/brandy/brandy_standard/thread_pri_init.c
code/sdk/application/wearable/CMakeLists.txt
code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
code/sdk/application/wearable/evb/nativeapp/brandy-native-js-fd272/libuikit_fwk.a [new file with mode: 0644]
code/sdk/application/wearable/evb/service/msg_center/brandy-native-js-fd272/libmsg_center.a [new file with mode: 0644]
code/sdk/application/wearable/fd230/nativeabilityfwk/src/Ability.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/include/BluetoothServiceOptionsView.h
code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/countdown/src/CountDownTimeNotNullView.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadModel.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadView.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/src/FindPhoneView.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchListAdapter.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchListitemView.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchModel.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchView.cpp
code/sdk/application/wearable/fd230/service/msg_center/src/msg_center_customer.cpp
code/sdk/application/wearable/fd230/service/msg_center/src/notify/drinkReminder_notification.cpp
code/sdk/application/wearable/fd230/service/msg_center/src/notify/message_notification.cpp
code/sdk/application/wearable/fd230/service/msg_center/src/notify/motion_recognition_notification.cpp
code/sdk/application/wearable/fd230/service/msg_center/src/notify/sedentaryReminder_notification.cpp
code/sdk/application/wearable/fd272/nativeabilityfwk/src/Ability.cpp
code/sdk/application/wearable/fd272/nativeapp/brandy-native-js-fd272/libuikit_fwk.a [new file with mode: 0644]
code/sdk/application/wearable/fd272/nativeapp/nativeui/classicbluetooth/include/BluetoothServiceOptionsView.h
code/sdk/application/wearable/fd272/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp
code/sdk/application/wearable/fd272/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp
code/sdk/application/wearable/fd272/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/CountDownTimeNotNullView.cpp
code/sdk/application/wearable/fd272/nativeapp/nativeui/findphone/src/FindPhoneView.cpp
code/sdk/application/wearable/fd272/nativeapp/nativeui/languagecode/src/LanguageSwitchListAdapter.cpp
code/sdk/application/wearable/fd272/nativeapp/nativeui/languagecode/src/LanguageSwitchListitemView.cpp
code/sdk/application/wearable/fd272/nativeapp/nativeui/languagecode/src/LanguageSwitchModel.cpp
code/sdk/application/wearable/fd272/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
code/sdk/application/wearable/fd272/nativeapp/nativeui/languagecode/src/LanguageSwitchView.cpp
code/sdk/application/wearable/fd272/service/msg_center/brandy-native-js-fd272/libmsg_center.a [new file with mode: 0644]
code/sdk/application/wearable/fd272/service/msg_center/src/msg_center_customer.cpp
code/sdk/application/wearable/fd272/service/msg_center/src/notify/drinkReminder_notification.cpp
code/sdk/application/wearable/fd272/service/msg_center/src/notify/message_notification.cpp
code/sdk/application/wearable/fd272/service/msg_center/src/notify/motion_recognition_notification.cpp
code/sdk/application/wearable/fd272/service/msg_center/src/notify/sedentaryReminder_notification.cpp
code/sdk/application/wearable/n9/nativeabilityfwk/src/Ability.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/classicbluetooth/include/BluetoothServiceOptionsView.h
code/sdk/application/wearable/n9/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/countdown/src/CountDownTimeNotNullView.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/findphone/src/FindPhoneView.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/languagecode/src/LanguageSwitchListAdapter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/languagecode/src/LanguageSwitchListitemView.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/languagecode/src/LanguageSwitchModel.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/languagecode/src/LanguageSwitchView.cpp
code/sdk/application/wearable/n9/service/msg_center/src/msg_center_customer.cpp
code/sdk/application/wearable/n9/service/msg_center/src/notify/drinkReminder_notification.cpp
code/sdk/application/wearable/n9/service/msg_center/src/notify/message_notification.cpp
code/sdk/application/wearable/n9/service/msg_center/src/notify/motion_recognition_notification.cpp
code/sdk/application/wearable/n9/service/msg_center/src/notify/sedentaryReminder_notification.cpp
code/sdk/application/wstp/at_service/ohosfwk/ohosfwk_at_process.cpp
code/sdk/build/config/target_config/brandy/config.py
code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd272-r/libgfx_rm.a [new file with mode: 0644]
code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd272/libgfx_rm.a [new file with mode: 0644]
code/sdk/middleware/services/gui/hal/display/brandy-native-js-fd272/libdisplay_gfx.a [new file with mode: 0644]
code/sdk/middleware/services/gui/uikit/brandy-native-js-fd272/libuikit_ext.a [new file with mode: 0644]
code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service.cpp
code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/dfx_cmd.cpp
code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/ui_test_video_play.cpp
code/sdk/middleware/utils/dfx/diag_transmit/transmit_dst.c
code/sdk/middleware/utils/dfx/diag_transmit/transmit_item.c
code/sdk/middleware/utils/dfx/diag_transmit/transmit_src.c
code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd272-r/libx_vfs_private.a [new file with mode: 0644]
code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd272/libx_vfs_private.a [new file with mode: 0644]
code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd272-r/libfs_yaffs2.a [new file with mode: 0644]
code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd272/libfs_yaffs2.a [new file with mode: 0644]

index f4d0c3b..5f51502 100644 (file)
 # 参数[clean]:
 #           clean , 加此参数代表会清空output路径下对应的编译文件,重新编译,不加此参数属于增量编译,做release的时候,建议加clean参数。
 
-# 参数[user|u8m|uoffline|oob128|z1|4part|leakcheck|autoota|autootacli|obu|cm|ct]:
+# 参数[fd230|fd272|user|u8m|uoffline|oob128|z1|4part|leakcheck|autoota|autootacli|obu|cm|ct]:
 #           此参数指定了要编译的不同配置版本。
 #         不加参数,为默认版本,nandflash资源为单分区。其他版本都是在此基础上的参数修改。
+#         fd230, 默认项目版本
+#         fd272, FD272项目版本
 #         user, 取消串口打印
 #         uoffline, 取消串口打印,开启离线日志(需要在调试ui上开启)
 #         oob128, 编译nandflash的oob区为128的版本
@@ -47,6 +49,7 @@ DEFAULT_SSB_NAME=$DEFAULT_APPLICATION_NAME-ssb
 declare -A PROJECT_VERSIONS=(
     # 基础项目版本
     ["fd230"]="1.3.107"
+    ["fd272"]="1.3.107"
     ["user"]="1.3.107"
     ["fd230_user"]="1.3.107"
     
@@ -84,6 +87,7 @@ show_all_versions() {
     printf "%-15s %-10s %-20s\n" "项目名称" "版本号" "说明"
     echo "------------------------------------------"
     printf "%-15s %-10s %-20s\n" "fd230" "${PROJECT_VERSIONS[fd230]}" "默认项目"
+    printf "%-15s %-10s %-20s\n" "fd272" "${PROJECT_VERSIONS[fd272]}" "FD272项目"
     printf "%-15s %-10s %-20s\n" "user" "${PROJECT_VERSIONS[user]}" "用户版本"
     printf "%-15s %-10s %-20s\n" "fd230_user" "${PROJECT_VERSIONS[fd230_user]}" "FD230用户版"
     printf "%-15s %-10s %-20s\n" "xts" "${PROJECT_VERSIONS[xts]}" "XTS测试版"
@@ -174,6 +178,15 @@ SSB_NAME=$APPLICATION_NAME-ssb
 BUILD_NAME=_FD230
 fi
 
+if [ "$1" == "fd272" ]
+then
+TARGET_PACK_NAME=pack_brandy_native_js_fd272
+APPLICATION_NAME=brandy-native-js-fd272
+RECOVERY_NAME=$APPLICATION_NAME-r
+SSB_NAME=$APPLICATION_NAME-ssb
+BUILD_NAME=_FD272
+fi
+
 if [ "$1" == "fd230_user" ]
 then
 TARGET_PACK_NAME=pack_brandy_native_js
index 8eb0f4c..b3ce40c 100644 (file)
@@ -454,7 +454,7 @@ static void thread_main(const void *unused)
 {\r
     PRINT("thread_main start "NEWLINE);\r
     unused(unused);\r
-#ifdef FD230\r
+#ifdef CUSTOM_ZHIHUI\r
     uapi_pin_set_ie(S_MGPIO34, HAL_PIO_IE_DISABLE);//启动期间关闭uart输入中断,启动后开启\r
 #endif\r
     rc_calibration_func_notify();\r
@@ -612,7 +612,7 @@ static void thread_main(const void *unused)
     uapi_a5133_service_init();\r
 #endif\r
 \r
-#ifdef FD230\r
+#ifdef CUSTOM_ZHIHUI\r
     uapi_pin_set_ie(S_MGPIO34, HAL_PIO_IE_ENBALE); //启动期间关闭uart输入中断,启动后开启\r
 #endif\r
 \r
index b69b648..953b94f 100644 (file)
@@ -7,8 +7,8 @@ add_subdirectory_if_exist(fd230)
 elseif("BOARD_N9" IN_LIST DEFINES)
 add_subdirectory_if_exist(n9)
 elseif("BOARD_FD272" IN_LIST DEFINES)
-add_subdirectory_if_exist(fd272)
-elseif("LEINIAO" IN_LIST DEFINES)
+add_subdirectory_if_exist(fd272)    
+elseif("BOARD_LEINIAO" IN_LIST DEFINES)
 add_subdirectory_if_exist(ln)
 else()
 add_subdirectory_if_exist(evb)
index c16bd35..543f051 100644 (file)
@@ -17,7 +17,7 @@
 #include "securec.h"\r
 #include "cmsis_os2.h"\r
 #ifdef SUPPORT_OHOSFWK\r
-#ifdef FD230\r
+#ifdef CUSTOM_ZHIHUI\r
 #include "bluetooth/include/BluetoothWrapper.h"\r
 #else\r
 #include "bluetooth/BluetoothWrapper.h"\r
diff --git a/code/sdk/application/wearable/evb/nativeapp/brandy-native-js-fd272/libuikit_fwk.a b/code/sdk/application/wearable/evb/nativeapp/brandy-native-js-fd272/libuikit_fwk.a
new file mode 100644 (file)
index 0000000..e3ce469
Binary files /dev/null and b/code/sdk/application/wearable/evb/nativeapp/brandy-native-js-fd272/libuikit_fwk.a differ
diff --git a/code/sdk/application/wearable/evb/service/msg_center/brandy-native-js-fd272/libmsg_center.a b/code/sdk/application/wearable/evb/service/msg_center/brandy-native-js-fd272/libmsg_center.a
new file mode 100644 (file)
index 0000000..b1e105a
Binary files /dev/null and b/code/sdk/application/wearable/evb/service/msg_center/brandy-native-js-fd272/libmsg_center.a differ
index c39c575..d9a5baa 100644 (file)
@@ -319,7 +319,7 @@ bool Ability::Back_CountSlice_make_phone(const TransitionType transitionId,
             uint16_t preSlice = backStack_.top();
             backStack_.pop();
 
-            #ifdef FD230
+            #ifdef CUSTOM_ZHIHUI
             if(preSlice!=VIEW_INCOMING_CALL)
             ChangeSlice(preSlice);
             else
index e52a852..7e949bd 100644 (file)
@@ -17,7 +17,7 @@
 #include "components/ui_image_view.h"
 #include "components/ui_toggle_button.h"
 
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
 #include "aivoice/include/AiVoiceConnectingView.h"
 #endif
 
@@ -80,7 +80,7 @@ namespace OHOS
         UIToggleButton *A2DP_ToggleButton{nullptr}; // A2DP
         UIScrollView *connectingScrollView{nullptr};
 
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         AiVoiceConnectingView *p_AiVoiceConnectingView{nullptr};
 #endif
 
index 7834e77..810a315 100644 (file)
@@ -85,7 +85,7 @@ namespace OHOS
                     if (it->second == "HFP")
                     {
                         ConfigModel::GetInstance()->SetHFPState(true);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                         uapi_hfp_connect();
 #endif
                         classicBlueToothView->init_connect_timer(BluetoothServiceOptionsView::CONNECT_HFP);
@@ -93,7 +93,7 @@ namespace OHOS
                     else if (it->second == "A2DP")
                     {
                         ConfigModel::GetInstance()->SetA2DPState(true);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                         uapi_a2dp_snk_connect();
 #endif
                         classicBlueToothView->init_connect_timer(BluetoothServiceOptionsView::CONNECT_A2DP);
@@ -104,7 +104,7 @@ namespace OHOS
                     if (it->second == "HFP")
                     {
                         ConfigModel::GetInstance()->SetHFPState(false);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                         uapi_hfp_disconnect();
 #endif
                         classicBlueToothView->init_connect_timer(BluetoothServiceOptionsView::DISCONNECT_HFP);
@@ -113,7 +113,7 @@ namespace OHOS
                     {
 
                         ConfigModel::GetInstance()->SetA2DPState(false);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                         uapi_a2dp_snk_disconnect();
 #endif
                         classicBlueToothView->init_connect_timer(BluetoothServiceOptionsView::DISCONNECT_A2DP);
index fb4daba..47ff5c9 100644 (file)
@@ -76,7 +76,7 @@ namespace OHOS
                     delete A2DP_ToggleButton;
                     A2DP_ToggleButton = nullptr;
                 }
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 if (p_AiVoiceConnectingView)
                 {
                     delete p_AiVoiceConnectingView;
@@ -110,7 +110,7 @@ namespace OHOS
         switch (button_state)
         {
         case BluetoothServiceOptionsView::CONNECT_HFP:
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             if (uapi_hfp_connect_state())
             {
                 if (cm_get_A2DP_switch() && uapi_a2dp_snk_get_device_connect_state())
@@ -126,7 +126,7 @@ namespace OHOS
             break;
         case BluetoothServiceOptionsView::DISCONNECT_HFP:
 
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             if (!uapi_hfp_connect_state())
             {
                 {
@@ -136,7 +136,7 @@ namespace OHOS
 #endif
             break;
         case BluetoothServiceOptionsView::CONNECT_A2DP:
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             if (uapi_a2dp_snk_get_device_connect_state())
             {
                 connect_state++;
@@ -144,7 +144,7 @@ namespace OHOS
 #endif
             break;
         case BluetoothServiceOptionsView::DISCONNECT_A2DP:
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             if (!uapi_a2dp_snk_get_device_connect_state())
             {
                 connect_state++;
@@ -321,7 +321,7 @@ namespace OHOS
             return false;
         }
         HFP_ToggleButton->SetPosition(298, 145, 100, 50);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         HFP_ToggleButton->SetState(uapi_hfp_connect_state()); // ConfigModel::GetInstance()->GetHFPState());
 #endif
         HFP_ToggleButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);
@@ -334,7 +334,7 @@ namespace OHOS
             return false;
         }
         A2DP_ToggleButton->SetPosition(298, 265, 100, 50);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         A2DP_ToggleButton->SetState(uapi_a2dp_snk_get_device_connect_state());
 #endif
         A2DP_ToggleButton->SetStyle(STYLE_BACKGROUND_OPA, 0xffffffff);
@@ -419,7 +419,7 @@ namespace OHOS
         BlueToothScrollView->Add(A2DP_Label);
         BlueToothScrollView->Add(HFP_ToggleButton);
         BlueToothScrollView->Add(A2DP_ToggleButton);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         p_AiVoiceConnectingView = new AiVoiceConnectingView();
         if (p_AiVoiceConnectingView == nullptr)
         {
@@ -439,7 +439,7 @@ namespace OHOS
     {
         if (connectingScrollView)
             connectingScrollView->SetVisible(data);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         if (data == false)
         {
             if (A2DP_ToggleButton)
@@ -453,7 +453,7 @@ namespace OHOS
 
     void BluetoothServiceOptionsView::Button_UPdata(void)
     {
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         if (A2DP_ToggleButton)
             A2DP_ToggleButton->SetState(uapi_a2dp_snk_get_device_connect_state());
 
index d4015b7..60a8823 100644 (file)
@@ -111,7 +111,7 @@ namespace OHOS
 \r
     bool ClassicBlueToothPresenter::OnChange(UICheckBox::UICheckBoxState state)\r
     {\r
-#ifdef FD230\r
+#ifdef CUSTOM_ZHIHUI\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClassicBlueToothPresenter::OnChange");\r
         bd_addr_t bdaddr = {0};\r
         switch (state)\r
index 679d66a..7594c01 100644 (file)
@@ -90,7 +90,7 @@ namespace OHOS
             }\r
             Attention->SetPosition(193, 121, 80, 80);\r
             Attention->SetStyle(STYLE_BORDER_RADIUS, 100);\r
-            #ifdef FD230\r
+            #ifdef CUSTOM_ZHIHUI\r
             Attention->SetSrc(PNG_ATTENTION_IMAGE);\r
             #endif\r
             /* -------------------------------------------------------------------------- */\r
@@ -117,7 +117,7 @@ namespace OHOS
             }\r
             button->SetPosition(0, 366, 466, 100);\r
             button->SetViewId(COUNTDOWNTIMENOTNULLVIEWRETURNBUTTON);\r
-            #ifdef FD230\r
+            #ifdef CUSTOM_ZHIHUI\r
             button->SetImageSrc(PNG_466x100BUTTON_IMAGE, PNG_466x100BUTTON_IMAGE);\r
             #endif\r
             button->SetTextId(STR_KONW); // 知道了\r
index 3da91e2..ebfd885 100644 (file)
@@ -18,7 +18,7 @@ EphemerisDownloadModel::EphemerisDownloadModel() {}
 
 EphemerisDownloadModel::~EphemerisDownloadModel() {}
 
-void EphemerisDownloadModel::DownloadEphemeris() {}
+// void EphemerisDownloadModel::DownloadEphemeris() {}
 //获取有效期接口
 bool EphemerisDownloadModel::GetValidityPeriod() {
 #if defined(SUPPORT_GNSS)
index 96e0bd4..e9cd668 100644 (file)
@@ -116,16 +116,16 @@ bool EphemerisDownloadView::EphemerisDownloadInit() {
     btnDownload_->SetOnClickListener(presenter_);
 
     //如果有效期大于0,则不能下载 下载按键显示灰色;否则显示绿色
-    if(EphemerisDownloadModel::GetInstance().GetValidityPeriod())
-    {
-        btnDownload_->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x5f));
-        btnDownload_->SetBackgroundColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x5f));
-    }
-    else
-    {
-        btnDownload_->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff));
-        btnDownload_->SetBackgroundColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff));
-    }
+    // if(EphemerisDownloadModel::GetInstance().GetValidityPeriod())
+    // {
+    //     btnDownload_->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x5f));
+    //     btnDownload_->SetBackgroundColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x5f));
+    // }
+    // else
+    // {
+    //     btnDownload_->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff));
+    //     btnDownload_->SetBackgroundColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff));
+    // }
     
     AddViewToRootContainer(btnDownload_);
 
index 7266a0e..0eff9a4 100644 (file)
@@ -126,7 +126,7 @@ namespace OHOS
                 return;
             }
             FindPhoneImageView->SetPosition(193, 140, 80, 80);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             FindPhoneImageView->SetSrc(PNG_ATTENTION_IMAGE);
 #endif
             /* ----------------------------- FindPhoneLabel ----------------------------- */
@@ -153,7 +153,7 @@ namespace OHOS
             }
             FindPhoneLabelButton->SetPosition(0, 366, 466, 100);
             FindPhoneLabelButton->SetViewId(FINDPHONE_LABELBUTTON);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             FindPhoneLabelButton->SetImageSrc(PNG_BUTTON_466x100_IMAGE, PNG_BUTTON_466x100_IMAGE);
 #endif
             FindPhoneLabelButton->SetTextId(STR_CLOSE); // 关闭
@@ -254,7 +254,7 @@ namespace OHOS
             }
             FindPhoneLabelButton->SetPosition(0, 366, 466, 100);
             FindPhoneLabelButton->SetViewId(FINDPHONE_LABELBUTTON);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             FindPhoneLabelButton->SetImageSrc(PNG_466x100BUTTON_IMAGE, PNG_466x100BUTTON_IMAGE);
 #endif
             // FindPhoneLabelButton->SetText("停止");
index 3581dae..d95fa63 100644 (file)
@@ -98,14 +98,14 @@ namespace OHOS
             if (strcmp(LanguageSwitchModel::GetInstance().GetCurLanguageCode(), view_languageid) == 0)
             {
 // 设置选中
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 item->GetUILabelButtonExt()->SetImageSrc(PNG_CHECKBOX_ON_IMAGE, PNG_CHECKBOX_ON_IMAGE);
 #endif
             }
             else
             {
 // 设置未选中
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 item->GetUILabelButtonExt()->SetImageSrc(PNG_CHECKBOX_OFF_IMAGE, PNG_CHECKBOX_OFF_IMAGE);
 #endif
             }
index bac660c..bbecf6d 100644 (file)
@@ -61,7 +61,7 @@ namespace OHOS
         m_LabelButtonExt.SetLabelPosition(47, 0);
         m_LabelButtonExt.SetImagePosition(290, 30);
         m_LabelButtonExt.SetTouchable(true);
-        #ifdef FD230
+        #ifdef CUSTOM_ZHIHUI
         m_LabelButtonExt.SetImageSrc(PNG_CHECKBOX_OFF_IMAGE, PNG_CHECKBOX_OFF_IMAGE);
         #endif
 
index 5ce6171..a0ce602 100644 (file)
@@ -49,7 +49,7 @@ namespace OHOS
             {
                 set_hint_code(id);
                 set_hint_flag(true);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 NativeAbility::GetInstance().EnterSlice(VIEW_LANGUAGE_SWITCH);
 #endif
             }
index 0a716dd..cb2ff09 100644 (file)
@@ -109,7 +109,7 @@ namespace OHOS
                 int32_t Hint_ID = LanguageSwitchView::GetInstance()->get_hint_id();
 
                 g_planguage->ChangeLanguage(Hint_ID);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 CustomEventPublish(TOPIC_EVENT_DEVICE_BIND, power_buf, 2);
 #endif
             }
@@ -119,7 +119,7 @@ namespace OHOS
 
                 g_planguage->ChangeLanguage(Hint_ID);
 
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 CustomEventPublish(TOPIC_EVENT_DEVICE_BIND, power_buf, 2);
 #endif
             }
@@ -158,7 +158,7 @@ namespace OHOS
         {
             if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true)
             {
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 NativeAbility::GetInstance().EnterSlice(VIEW_WATCH_QR_CODE);
 #endif
             }
@@ -190,7 +190,7 @@ namespace OHOS
                 m_labelext->SetTextId(STR_LANGUAGE_SELECTION);
                 m_labelext->ForceResetText(); // 强制刷新
 
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 p_UILabelButtonExt->SetImageSrc(PNG_CHECKBOX_ON_IMAGE, PNG_CHECKBOX_ON_IMAGE);
 #endif
                 p_UILabelButtonExt->Invalidate();
@@ -211,7 +211,7 @@ namespace OHOS
         // 如果是power键,且是亮屏状态,按键释放就返回上一级
         if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             NativeAbility::GetInstance().Back();
 #endif
 #ifdef SUPPORT_BLE_SERVICE
index 2621ea5..0897dc8 100644 (file)
@@ -296,7 +296,7 @@ namespace OHOS
         button_ensure->SetImagePosition(15, 15);
         button_ensure->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff191919, UIButton::PRESSED);
         button_ensure->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         button_ensure->SetImageSrc(PNG_SYSTEM_CHECK_ON_IMAGE, PNG_SYSTEM_CHECK_ON_IMAGE);
 #endif
         button_ensure->SetViewId("BUTTON_CHECK_OK");
index 1195365..4866361 100644 (file)
@@ -40,7 +40,7 @@
 #include "bleInstruct.h"
 #endif
 
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
 
 #ifdef SUPPORT_CAT1_HFP_AG_SERV
 #include "phoneservice/include/PhoneAGService.h"
@@ -1441,7 +1441,7 @@ void MsgCenterNotifyInactivityAccumulateTimeProc(const Topic topic, Request* req
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "memcpy_s cywee_Inactivity_Accumulate_Time_Info failed, ret = %d", rets);
         return;
     }
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
     if(cywee_Inactivity_Accumulate_Time_Info->output_number == INACTIVITY_MODE_NAP_ACCUMULATE_TIME_OUTPUT)
     {
         nap_data.total_time = cywee_Inactivity_Accumulate_Time_Info->total_time;
index 6545ed2..7cdfdbf 100644 (file)
@@ -4,7 +4,7 @@
 #include "components/ui_image_view.h"
 #include "components/ui_label_ext.h"
 #include "components/ui_scroll_view.h"
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
 #include "ui_resource_string.h"
 #endif
 #include <cmsis_os2.h>
@@ -170,7 +170,7 @@ namespace OHOS
             DrinkReminderTitleLabel->SetPosition(83, 52, 300, 35);
             DrinkReminderTitleLabel->SetStyle(STYLE_TEXT_FONT, 30);
             DrinkReminderTitleLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             DrinkReminderTitleLabel->SetTextId(STR_DRINK_WATER_REMINDER);
 #else
             DrinkReminderTitleLabel->SetText("喝水提醒");
@@ -197,7 +197,7 @@ namespace OHOS
             DrinkReminderNoteLabel->SetPosition(53, 248, 360, 70);
             DrinkReminderNoteLabel->SetStyle(STYLE_TEXT_FONT, 30);
             DrinkReminderNoteLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             DrinkReminderNoteLabel->SetTextId(STR_DRINK_WATER_REMINDER_NOTE);
 #endif
             DrinkReminderNoteLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
@@ -232,7 +232,7 @@ namespace OHOS
             DrinkReminderLabel->SetPosition(133, 399, 200, 35);
             DrinkReminderLabel->SetStyle(STYLE_TEXT_FONT, 30);
             DrinkReminderLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             DrinkReminderLabel->SetTextId(STR_KONW);
 #else
             DrinkReminderLabel->SetText("知道了");
index 5991460..a909c31 100644 (file)
@@ -4,7 +4,7 @@
 #include "uiservice/include/ui_service.h"
 #include "uicomponents/UIComponents.h"
 #include "wearable_log.h"
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
 #include "message/include/MessageModel.h"
 #endif
 #include "custom_runtime.h"
@@ -67,7 +67,7 @@ namespace OHOS
             NotificationManager::GetInstance()->StopNotify();
 // 点击关闭之后通知list进行刷新
 // SendMsgToUIService(UI_UPDATE_MESSAGE_DATA, 0, nullptr, 0);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             MessageModel::GetInstance().UpdateMessageView();
 #endif
         }
@@ -81,7 +81,7 @@ namespace OHOS
         NotificationManager::GetInstance()->StopNotify();
 // 点击关闭之后通知list进行刷新
 // SendMsgToUIService(UI_UPDATE_MESSAGE_DATA, 0, nullptr, 0);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         MessageModel::GetInstance().UpdateMessageView();
 #endif
         return true;
@@ -134,7 +134,7 @@ namespace OHOS
             MessageGroupView->SetOnDragListener(dragListener);
         }
 /*获取最新message*/
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         MessageData *data = MessageModel::GetInstance().GetNewMessage();
         if (data != nullptr)
         {
@@ -338,7 +338,7 @@ namespace OHOS
         NotificationManager::GetInstance()->StopNotify();
 // 点击关闭之后通知list进行刷新
 // SendMsgToUIService(UI_UPDATE_MESSAGE_DATA, 0, nullptr, 0);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         MessageModel::GetInstance().UpdateMessageView();
 #endif
     }
index 889f4ee..fde7193 100644 (file)
@@ -13,7 +13,7 @@
 #include "components/ui_image_view.h"
 #include "components/ui_label_ext.h"
 #include "components/ui_scroll_view.h"
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
 #include "ui_resource_string.h"
 #endif
 #include <service/graphic_service.h>
@@ -264,7 +264,7 @@ namespace OHOS
             MotionRecognitionNoteLabel->SetPosition(53, 210, 360, 70);
             MotionRecognitionNoteLabel->SetStyle(STYLE_TEXT_FONT, 30);
             MotionRecognitionNoteLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             MotionRecognitionNoteLabel->SetTextId(MotionRecognitionViewEventListener::GetInstance().GetMotionType());
 #endif
             MotionRecognitionNoteLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
@@ -297,7 +297,7 @@ namespace OHOS
             MotionRecognitionIgnoreLabel->SetPosition(93, MotionRecognitionIgnoreButton->GetY() + 30, 100, 30);
             MotionRecognitionIgnoreLabel->SetStyle(STYLE_TEXT_FONT, 30);
             MotionRecognitionIgnoreLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             MotionRecognitionIgnoreLabel->SetTextId(STR_IGNORE);
 #endif
             MotionRecognitionIgnoreLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
@@ -330,7 +330,7 @@ namespace OHOS
             MotionRecognitionStartLabel->SetPosition(273, MotionRecognitionStartButton->GetY() + 30, 100, 30);
             MotionRecognitionStartLabel->SetStyle(STYLE_TEXT_FONT, 30);
             MotionRecognitionStartLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             MotionRecognitionStartLabel->SetTextId(STR_START);
 #endif
             MotionRecognitionStartLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
index 18b528c..65d7c2a 100644 (file)
@@ -200,7 +200,7 @@ namespace OHOS
             SedentaryReminderTitleLabel->SetPosition(83, 52, 300, 35);
             SedentaryReminderTitleLabel->SetStyle(STYLE_TEXT_FONT, 30);
             SedentaryReminderTitleLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             SedentaryReminderTitleLabel->SetTextId(STR_SEDENTARY_REMINDER);
 #else
             SedentaryReminderTitleLabel->SetText("久坐提醒");
@@ -228,7 +228,7 @@ namespace OHOS
             SedentaryReminderNoteLabel->SetPosition(53, 248, 360, 70);
             SedentaryReminderNoteLabel->SetStyle(STYLE_TEXT_FONT, 30);
             SedentaryReminderNoteLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             // SetLabelId(SedentaryReminderNoteLabel, STR_SEDENTARY_REMINDER_NOTE);
             SedentaryReminderNoteLabel->SetTextId(STR_SEDENTARY_REMINDER_NOTE);
 #endif
@@ -266,7 +266,7 @@ namespace OHOS
             SedentaryReminderLabel->SetPosition(133, 399, 200, 35);
             SedentaryReminderLabel->SetStyle(STYLE_TEXT_FONT, 30);
             SedentaryReminderLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             SedentaryReminderLabel->SetTextId(STR_KONW);
 #else
             SedentaryReminderLabel->SetText("知道了");
index c39c575..d9a5baa 100644 (file)
@@ -319,7 +319,7 @@ bool Ability::Back_CountSlice_make_phone(const TransitionType transitionId,
             uint16_t preSlice = backStack_.top();
             backStack_.pop();
 
-            #ifdef FD230
+            #ifdef CUSTOM_ZHIHUI
             if(preSlice!=VIEW_INCOMING_CALL)
             ChangeSlice(preSlice);
             else
diff --git a/code/sdk/application/wearable/fd272/nativeapp/brandy-native-js-fd272/libuikit_fwk.a b/code/sdk/application/wearable/fd272/nativeapp/brandy-native-js-fd272/libuikit_fwk.a
new file mode 100644 (file)
index 0000000..e3ce469
Binary files /dev/null and b/code/sdk/application/wearable/fd272/nativeapp/brandy-native-js-fd272/libuikit_fwk.a differ
index e52a852..7e949bd 100644 (file)
@@ -17,7 +17,7 @@
 #include "components/ui_image_view.h"
 #include "components/ui_toggle_button.h"
 
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
 #include "aivoice/include/AiVoiceConnectingView.h"
 #endif
 
@@ -80,7 +80,7 @@ namespace OHOS
         UIToggleButton *A2DP_ToggleButton{nullptr}; // A2DP
         UIScrollView *connectingScrollView{nullptr};
 
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         AiVoiceConnectingView *p_AiVoiceConnectingView{nullptr};
 #endif
 
index 7834e77..810a315 100644 (file)
@@ -85,7 +85,7 @@ namespace OHOS
                     if (it->second == "HFP")
                     {
                         ConfigModel::GetInstance()->SetHFPState(true);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                         uapi_hfp_connect();
 #endif
                         classicBlueToothView->init_connect_timer(BluetoothServiceOptionsView::CONNECT_HFP);
@@ -93,7 +93,7 @@ namespace OHOS
                     else if (it->second == "A2DP")
                     {
                         ConfigModel::GetInstance()->SetA2DPState(true);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                         uapi_a2dp_snk_connect();
 #endif
                         classicBlueToothView->init_connect_timer(BluetoothServiceOptionsView::CONNECT_A2DP);
@@ -104,7 +104,7 @@ namespace OHOS
                     if (it->second == "HFP")
                     {
                         ConfigModel::GetInstance()->SetHFPState(false);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                         uapi_hfp_disconnect();
 #endif
                         classicBlueToothView->init_connect_timer(BluetoothServiceOptionsView::DISCONNECT_HFP);
@@ -113,7 +113,7 @@ namespace OHOS
                     {
 
                         ConfigModel::GetInstance()->SetA2DPState(false);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                         uapi_a2dp_snk_disconnect();
 #endif
                         classicBlueToothView->init_connect_timer(BluetoothServiceOptionsView::DISCONNECT_A2DP);
index fb4daba..47ff5c9 100644 (file)
@@ -76,7 +76,7 @@ namespace OHOS
                     delete A2DP_ToggleButton;
                     A2DP_ToggleButton = nullptr;
                 }
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 if (p_AiVoiceConnectingView)
                 {
                     delete p_AiVoiceConnectingView;
@@ -110,7 +110,7 @@ namespace OHOS
         switch (button_state)
         {
         case BluetoothServiceOptionsView::CONNECT_HFP:
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             if (uapi_hfp_connect_state())
             {
                 if (cm_get_A2DP_switch() && uapi_a2dp_snk_get_device_connect_state())
@@ -126,7 +126,7 @@ namespace OHOS
             break;
         case BluetoothServiceOptionsView::DISCONNECT_HFP:
 
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             if (!uapi_hfp_connect_state())
             {
                 {
@@ -136,7 +136,7 @@ namespace OHOS
 #endif
             break;
         case BluetoothServiceOptionsView::CONNECT_A2DP:
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             if (uapi_a2dp_snk_get_device_connect_state())
             {
                 connect_state++;
@@ -144,7 +144,7 @@ namespace OHOS
 #endif
             break;
         case BluetoothServiceOptionsView::DISCONNECT_A2DP:
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             if (!uapi_a2dp_snk_get_device_connect_state())
             {
                 connect_state++;
@@ -321,7 +321,7 @@ namespace OHOS
             return false;
         }
         HFP_ToggleButton->SetPosition(298, 145, 100, 50);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         HFP_ToggleButton->SetState(uapi_hfp_connect_state()); // ConfigModel::GetInstance()->GetHFPState());
 #endif
         HFP_ToggleButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);
@@ -334,7 +334,7 @@ namespace OHOS
             return false;
         }
         A2DP_ToggleButton->SetPosition(298, 265, 100, 50);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         A2DP_ToggleButton->SetState(uapi_a2dp_snk_get_device_connect_state());
 #endif
         A2DP_ToggleButton->SetStyle(STYLE_BACKGROUND_OPA, 0xffffffff);
@@ -419,7 +419,7 @@ namespace OHOS
         BlueToothScrollView->Add(A2DP_Label);
         BlueToothScrollView->Add(HFP_ToggleButton);
         BlueToothScrollView->Add(A2DP_ToggleButton);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         p_AiVoiceConnectingView = new AiVoiceConnectingView();
         if (p_AiVoiceConnectingView == nullptr)
         {
@@ -439,7 +439,7 @@ namespace OHOS
     {
         if (connectingScrollView)
             connectingScrollView->SetVisible(data);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         if (data == false)
         {
             if (A2DP_ToggleButton)
@@ -453,7 +453,7 @@ namespace OHOS
 
     void BluetoothServiceOptionsView::Button_UPdata(void)
     {
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         if (A2DP_ToggleButton)
             A2DP_ToggleButton->SetState(uapi_a2dp_snk_get_device_connect_state());
 
index d4015b7..60a8823 100644 (file)
@@ -111,7 +111,7 @@ namespace OHOS
 \r
     bool ClassicBlueToothPresenter::OnChange(UICheckBox::UICheckBoxState state)\r
     {\r
-#ifdef FD230\r
+#ifdef CUSTOM_ZHIHUI\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClassicBlueToothPresenter::OnChange");\r
         bd_addr_t bdaddr = {0};\r
         switch (state)\r
index 679d66a..7594c01 100644 (file)
@@ -90,7 +90,7 @@ namespace OHOS
             }\r
             Attention->SetPosition(193, 121, 80, 80);\r
             Attention->SetStyle(STYLE_BORDER_RADIUS, 100);\r
-            #ifdef FD230\r
+            #ifdef CUSTOM_ZHIHUI\r
             Attention->SetSrc(PNG_ATTENTION_IMAGE);\r
             #endif\r
             /* -------------------------------------------------------------------------- */\r
@@ -117,7 +117,7 @@ namespace OHOS
             }\r
             button->SetPosition(0, 366, 466, 100);\r
             button->SetViewId(COUNTDOWNTIMENOTNULLVIEWRETURNBUTTON);\r
-            #ifdef FD230\r
+            #ifdef CUSTOM_ZHIHUI\r
             button->SetImageSrc(PNG_466x100BUTTON_IMAGE, PNG_466x100BUTTON_IMAGE);\r
             #endif\r
             button->SetTextId(STR_KONW); // 知道了\r
index 7266a0e..0eff9a4 100644 (file)
@@ -126,7 +126,7 @@ namespace OHOS
                 return;
             }
             FindPhoneImageView->SetPosition(193, 140, 80, 80);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             FindPhoneImageView->SetSrc(PNG_ATTENTION_IMAGE);
 #endif
             /* ----------------------------- FindPhoneLabel ----------------------------- */
@@ -153,7 +153,7 @@ namespace OHOS
             }
             FindPhoneLabelButton->SetPosition(0, 366, 466, 100);
             FindPhoneLabelButton->SetViewId(FINDPHONE_LABELBUTTON);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             FindPhoneLabelButton->SetImageSrc(PNG_BUTTON_466x100_IMAGE, PNG_BUTTON_466x100_IMAGE);
 #endif
             FindPhoneLabelButton->SetTextId(STR_CLOSE); // 关闭
@@ -254,7 +254,7 @@ namespace OHOS
             }
             FindPhoneLabelButton->SetPosition(0, 366, 466, 100);
             FindPhoneLabelButton->SetViewId(FINDPHONE_LABELBUTTON);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             FindPhoneLabelButton->SetImageSrc(PNG_466x100BUTTON_IMAGE, PNG_466x100BUTTON_IMAGE);
 #endif
             // FindPhoneLabelButton->SetText("停止");
index 3581dae..d95fa63 100644 (file)
@@ -98,14 +98,14 @@ namespace OHOS
             if (strcmp(LanguageSwitchModel::GetInstance().GetCurLanguageCode(), view_languageid) == 0)
             {
 // 设置选中
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 item->GetUILabelButtonExt()->SetImageSrc(PNG_CHECKBOX_ON_IMAGE, PNG_CHECKBOX_ON_IMAGE);
 #endif
             }
             else
             {
 // 设置未选中
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 item->GetUILabelButtonExt()->SetImageSrc(PNG_CHECKBOX_OFF_IMAGE, PNG_CHECKBOX_OFF_IMAGE);
 #endif
             }
index bac660c..bbecf6d 100644 (file)
@@ -61,7 +61,7 @@ namespace OHOS
         m_LabelButtonExt.SetLabelPosition(47, 0);
         m_LabelButtonExt.SetImagePosition(290, 30);
         m_LabelButtonExt.SetTouchable(true);
-        #ifdef FD230
+        #ifdef CUSTOM_ZHIHUI
         m_LabelButtonExt.SetImageSrc(PNG_CHECKBOX_OFF_IMAGE, PNG_CHECKBOX_OFF_IMAGE);
         #endif
 
index 5ce6171..a0ce602 100644 (file)
@@ -49,7 +49,7 @@ namespace OHOS
             {
                 set_hint_code(id);
                 set_hint_flag(true);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 NativeAbility::GetInstance().EnterSlice(VIEW_LANGUAGE_SWITCH);
 #endif
             }
index 0a716dd..cb2ff09 100644 (file)
@@ -109,7 +109,7 @@ namespace OHOS
                 int32_t Hint_ID = LanguageSwitchView::GetInstance()->get_hint_id();
 
                 g_planguage->ChangeLanguage(Hint_ID);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 CustomEventPublish(TOPIC_EVENT_DEVICE_BIND, power_buf, 2);
 #endif
             }
@@ -119,7 +119,7 @@ namespace OHOS
 
                 g_planguage->ChangeLanguage(Hint_ID);
 
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 CustomEventPublish(TOPIC_EVENT_DEVICE_BIND, power_buf, 2);
 #endif
             }
@@ -158,7 +158,7 @@ namespace OHOS
         {
             if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true)
             {
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 NativeAbility::GetInstance().EnterSlice(VIEW_WATCH_QR_CODE);
 #endif
             }
@@ -190,7 +190,7 @@ namespace OHOS
                 m_labelext->SetTextId(STR_LANGUAGE_SELECTION);
                 m_labelext->ForceResetText(); // 强制刷新
 
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 p_UILabelButtonExt->SetImageSrc(PNG_CHECKBOX_ON_IMAGE, PNG_CHECKBOX_ON_IMAGE);
 #endif
                 p_UILabelButtonExt->Invalidate();
@@ -211,7 +211,7 @@ namespace OHOS
         // 如果是power键,且是亮屏状态,按键释放就返回上一级
         if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             NativeAbility::GetInstance().Back();
 #endif
 #ifdef SUPPORT_BLE_SERVICE
index 2621ea5..0897dc8 100644 (file)
@@ -296,7 +296,7 @@ namespace OHOS
         button_ensure->SetImagePosition(15, 15);
         button_ensure->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff191919, UIButton::PRESSED);
         button_ensure->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         button_ensure->SetImageSrc(PNG_SYSTEM_CHECK_ON_IMAGE, PNG_SYSTEM_CHECK_ON_IMAGE);
 #endif
         button_ensure->SetViewId("BUTTON_CHECK_OK");
diff --git a/code/sdk/application/wearable/fd272/service/msg_center/brandy-native-js-fd272/libmsg_center.a b/code/sdk/application/wearable/fd272/service/msg_center/brandy-native-js-fd272/libmsg_center.a
new file mode 100644 (file)
index 0000000..b1e105a
Binary files /dev/null and b/code/sdk/application/wearable/fd272/service/msg_center/brandy-native-js-fd272/libmsg_center.a differ
index 1195365..4866361 100644 (file)
@@ -40,7 +40,7 @@
 #include "bleInstruct.h"
 #endif
 
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
 
 #ifdef SUPPORT_CAT1_HFP_AG_SERV
 #include "phoneservice/include/PhoneAGService.h"
@@ -1441,7 +1441,7 @@ void MsgCenterNotifyInactivityAccumulateTimeProc(const Topic topic, Request* req
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "memcpy_s cywee_Inactivity_Accumulate_Time_Info failed, ret = %d", rets);
         return;
     }
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
     if(cywee_Inactivity_Accumulate_Time_Info->output_number == INACTIVITY_MODE_NAP_ACCUMULATE_TIME_OUTPUT)
     {
         nap_data.total_time = cywee_Inactivity_Accumulate_Time_Info->total_time;
index 6545ed2..7cdfdbf 100644 (file)
@@ -4,7 +4,7 @@
 #include "components/ui_image_view.h"
 #include "components/ui_label_ext.h"
 #include "components/ui_scroll_view.h"
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
 #include "ui_resource_string.h"
 #endif
 #include <cmsis_os2.h>
@@ -170,7 +170,7 @@ namespace OHOS
             DrinkReminderTitleLabel->SetPosition(83, 52, 300, 35);
             DrinkReminderTitleLabel->SetStyle(STYLE_TEXT_FONT, 30);
             DrinkReminderTitleLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             DrinkReminderTitleLabel->SetTextId(STR_DRINK_WATER_REMINDER);
 #else
             DrinkReminderTitleLabel->SetText("喝水提醒");
@@ -197,7 +197,7 @@ namespace OHOS
             DrinkReminderNoteLabel->SetPosition(53, 248, 360, 70);
             DrinkReminderNoteLabel->SetStyle(STYLE_TEXT_FONT, 30);
             DrinkReminderNoteLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             DrinkReminderNoteLabel->SetTextId(STR_DRINK_WATER_REMINDER_NOTE);
 #endif
             DrinkReminderNoteLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
@@ -232,7 +232,7 @@ namespace OHOS
             DrinkReminderLabel->SetPosition(133, 399, 200, 35);
             DrinkReminderLabel->SetStyle(STYLE_TEXT_FONT, 30);
             DrinkReminderLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             DrinkReminderLabel->SetTextId(STR_KONW);
 #else
             DrinkReminderLabel->SetText("知道了");
index 5991460..a909c31 100644 (file)
@@ -4,7 +4,7 @@
 #include "uiservice/include/ui_service.h"
 #include "uicomponents/UIComponents.h"
 #include "wearable_log.h"
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
 #include "message/include/MessageModel.h"
 #endif
 #include "custom_runtime.h"
@@ -67,7 +67,7 @@ namespace OHOS
             NotificationManager::GetInstance()->StopNotify();
 // 点击关闭之后通知list进行刷新
 // SendMsgToUIService(UI_UPDATE_MESSAGE_DATA, 0, nullptr, 0);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             MessageModel::GetInstance().UpdateMessageView();
 #endif
         }
@@ -81,7 +81,7 @@ namespace OHOS
         NotificationManager::GetInstance()->StopNotify();
 // 点击关闭之后通知list进行刷新
 // SendMsgToUIService(UI_UPDATE_MESSAGE_DATA, 0, nullptr, 0);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         MessageModel::GetInstance().UpdateMessageView();
 #endif
         return true;
@@ -134,7 +134,7 @@ namespace OHOS
             MessageGroupView->SetOnDragListener(dragListener);
         }
 /*获取最新message*/
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         MessageData *data = MessageModel::GetInstance().GetNewMessage();
         if (data != nullptr)
         {
@@ -338,7 +338,7 @@ namespace OHOS
         NotificationManager::GetInstance()->StopNotify();
 // 点击关闭之后通知list进行刷新
 // SendMsgToUIService(UI_UPDATE_MESSAGE_DATA, 0, nullptr, 0);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         MessageModel::GetInstance().UpdateMessageView();
 #endif
     }
index 889f4ee..fde7193 100644 (file)
@@ -13,7 +13,7 @@
 #include "components/ui_image_view.h"
 #include "components/ui_label_ext.h"
 #include "components/ui_scroll_view.h"
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
 #include "ui_resource_string.h"
 #endif
 #include <service/graphic_service.h>
@@ -264,7 +264,7 @@ namespace OHOS
             MotionRecognitionNoteLabel->SetPosition(53, 210, 360, 70);
             MotionRecognitionNoteLabel->SetStyle(STYLE_TEXT_FONT, 30);
             MotionRecognitionNoteLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             MotionRecognitionNoteLabel->SetTextId(MotionRecognitionViewEventListener::GetInstance().GetMotionType());
 #endif
             MotionRecognitionNoteLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
@@ -297,7 +297,7 @@ namespace OHOS
             MotionRecognitionIgnoreLabel->SetPosition(93, MotionRecognitionIgnoreButton->GetY() + 30, 100, 30);
             MotionRecognitionIgnoreLabel->SetStyle(STYLE_TEXT_FONT, 30);
             MotionRecognitionIgnoreLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             MotionRecognitionIgnoreLabel->SetTextId(STR_IGNORE);
 #endif
             MotionRecognitionIgnoreLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
@@ -330,7 +330,7 @@ namespace OHOS
             MotionRecognitionStartLabel->SetPosition(273, MotionRecognitionStartButton->GetY() + 30, 100, 30);
             MotionRecognitionStartLabel->SetStyle(STYLE_TEXT_FONT, 30);
             MotionRecognitionStartLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             MotionRecognitionStartLabel->SetTextId(STR_START);
 #endif
             MotionRecognitionStartLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
index 18b528c..65d7c2a 100644 (file)
@@ -200,7 +200,7 @@ namespace OHOS
             SedentaryReminderTitleLabel->SetPosition(83, 52, 300, 35);
             SedentaryReminderTitleLabel->SetStyle(STYLE_TEXT_FONT, 30);
             SedentaryReminderTitleLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             SedentaryReminderTitleLabel->SetTextId(STR_SEDENTARY_REMINDER);
 #else
             SedentaryReminderTitleLabel->SetText("久坐提醒");
@@ -228,7 +228,7 @@ namespace OHOS
             SedentaryReminderNoteLabel->SetPosition(53, 248, 360, 70);
             SedentaryReminderNoteLabel->SetStyle(STYLE_TEXT_FONT, 30);
             SedentaryReminderNoteLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             // SetLabelId(SedentaryReminderNoteLabel, STR_SEDENTARY_REMINDER_NOTE);
             SedentaryReminderNoteLabel->SetTextId(STR_SEDENTARY_REMINDER_NOTE);
 #endif
@@ -266,7 +266,7 @@ namespace OHOS
             SedentaryReminderLabel->SetPosition(133, 399, 200, 35);
             SedentaryReminderLabel->SetStyle(STYLE_TEXT_FONT, 30);
             SedentaryReminderLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             SedentaryReminderLabel->SetTextId(STR_KONW);
 #else
             SedentaryReminderLabel->SetText("知道了");
index c39c575..d9a5baa 100644 (file)
@@ -319,7 +319,7 @@ bool Ability::Back_CountSlice_make_phone(const TransitionType transitionId,
             uint16_t preSlice = backStack_.top();
             backStack_.pop();
 
-            #ifdef FD230
+            #ifdef CUSTOM_ZHIHUI
             if(preSlice!=VIEW_INCOMING_CALL)
             ChangeSlice(preSlice);
             else
index e52a852..7e949bd 100644 (file)
@@ -17,7 +17,7 @@
 #include "components/ui_image_view.h"
 #include "components/ui_toggle_button.h"
 
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
 #include "aivoice/include/AiVoiceConnectingView.h"
 #endif
 
@@ -80,7 +80,7 @@ namespace OHOS
         UIToggleButton *A2DP_ToggleButton{nullptr}; // A2DP
         UIScrollView *connectingScrollView{nullptr};
 
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         AiVoiceConnectingView *p_AiVoiceConnectingView{nullptr};
 #endif
 
index 7834e77..810a315 100644 (file)
@@ -85,7 +85,7 @@ namespace OHOS
                     if (it->second == "HFP")
                     {
                         ConfigModel::GetInstance()->SetHFPState(true);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                         uapi_hfp_connect();
 #endif
                         classicBlueToothView->init_connect_timer(BluetoothServiceOptionsView::CONNECT_HFP);
@@ -93,7 +93,7 @@ namespace OHOS
                     else if (it->second == "A2DP")
                     {
                         ConfigModel::GetInstance()->SetA2DPState(true);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                         uapi_a2dp_snk_connect();
 #endif
                         classicBlueToothView->init_connect_timer(BluetoothServiceOptionsView::CONNECT_A2DP);
@@ -104,7 +104,7 @@ namespace OHOS
                     if (it->second == "HFP")
                     {
                         ConfigModel::GetInstance()->SetHFPState(false);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                         uapi_hfp_disconnect();
 #endif
                         classicBlueToothView->init_connect_timer(BluetoothServiceOptionsView::DISCONNECT_HFP);
@@ -113,7 +113,7 @@ namespace OHOS
                     {
 
                         ConfigModel::GetInstance()->SetA2DPState(false);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                         uapi_a2dp_snk_disconnect();
 #endif
                         classicBlueToothView->init_connect_timer(BluetoothServiceOptionsView::DISCONNECT_A2DP);
index fb4daba..47ff5c9 100644 (file)
@@ -76,7 +76,7 @@ namespace OHOS
                     delete A2DP_ToggleButton;
                     A2DP_ToggleButton = nullptr;
                 }
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 if (p_AiVoiceConnectingView)
                 {
                     delete p_AiVoiceConnectingView;
@@ -110,7 +110,7 @@ namespace OHOS
         switch (button_state)
         {
         case BluetoothServiceOptionsView::CONNECT_HFP:
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             if (uapi_hfp_connect_state())
             {
                 if (cm_get_A2DP_switch() && uapi_a2dp_snk_get_device_connect_state())
@@ -126,7 +126,7 @@ namespace OHOS
             break;
         case BluetoothServiceOptionsView::DISCONNECT_HFP:
 
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             if (!uapi_hfp_connect_state())
             {
                 {
@@ -136,7 +136,7 @@ namespace OHOS
 #endif
             break;
         case BluetoothServiceOptionsView::CONNECT_A2DP:
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             if (uapi_a2dp_snk_get_device_connect_state())
             {
                 connect_state++;
@@ -144,7 +144,7 @@ namespace OHOS
 #endif
             break;
         case BluetoothServiceOptionsView::DISCONNECT_A2DP:
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             if (!uapi_a2dp_snk_get_device_connect_state())
             {
                 connect_state++;
@@ -321,7 +321,7 @@ namespace OHOS
             return false;
         }
         HFP_ToggleButton->SetPosition(298, 145, 100, 50);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         HFP_ToggleButton->SetState(uapi_hfp_connect_state()); // ConfigModel::GetInstance()->GetHFPState());
 #endif
         HFP_ToggleButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);
@@ -334,7 +334,7 @@ namespace OHOS
             return false;
         }
         A2DP_ToggleButton->SetPosition(298, 265, 100, 50);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         A2DP_ToggleButton->SetState(uapi_a2dp_snk_get_device_connect_state());
 #endif
         A2DP_ToggleButton->SetStyle(STYLE_BACKGROUND_OPA, 0xffffffff);
@@ -419,7 +419,7 @@ namespace OHOS
         BlueToothScrollView->Add(A2DP_Label);
         BlueToothScrollView->Add(HFP_ToggleButton);
         BlueToothScrollView->Add(A2DP_ToggleButton);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         p_AiVoiceConnectingView = new AiVoiceConnectingView();
         if (p_AiVoiceConnectingView == nullptr)
         {
@@ -439,7 +439,7 @@ namespace OHOS
     {
         if (connectingScrollView)
             connectingScrollView->SetVisible(data);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         if (data == false)
         {
             if (A2DP_ToggleButton)
@@ -453,7 +453,7 @@ namespace OHOS
 
     void BluetoothServiceOptionsView::Button_UPdata(void)
     {
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         if (A2DP_ToggleButton)
             A2DP_ToggleButton->SetState(uapi_a2dp_snk_get_device_connect_state());
 
index d4015b7..60a8823 100644 (file)
@@ -111,7 +111,7 @@ namespace OHOS
 \r
     bool ClassicBlueToothPresenter::OnChange(UICheckBox::UICheckBoxState state)\r
     {\r
-#ifdef FD230\r
+#ifdef CUSTOM_ZHIHUI\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClassicBlueToothPresenter::OnChange");\r
         bd_addr_t bdaddr = {0};\r
         switch (state)\r
index 679d66a..7594c01 100644 (file)
@@ -90,7 +90,7 @@ namespace OHOS
             }\r
             Attention->SetPosition(193, 121, 80, 80);\r
             Attention->SetStyle(STYLE_BORDER_RADIUS, 100);\r
-            #ifdef FD230\r
+            #ifdef CUSTOM_ZHIHUI\r
             Attention->SetSrc(PNG_ATTENTION_IMAGE);\r
             #endif\r
             /* -------------------------------------------------------------------------- */\r
@@ -117,7 +117,7 @@ namespace OHOS
             }\r
             button->SetPosition(0, 366, 466, 100);\r
             button->SetViewId(COUNTDOWNTIMENOTNULLVIEWRETURNBUTTON);\r
-            #ifdef FD230\r
+            #ifdef CUSTOM_ZHIHUI\r
             button->SetImageSrc(PNG_466x100BUTTON_IMAGE, PNG_466x100BUTTON_IMAGE);\r
             #endif\r
             button->SetTextId(STR_KONW); // 知道了\r
index 7266a0e..0eff9a4 100644 (file)
@@ -126,7 +126,7 @@ namespace OHOS
                 return;
             }
             FindPhoneImageView->SetPosition(193, 140, 80, 80);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             FindPhoneImageView->SetSrc(PNG_ATTENTION_IMAGE);
 #endif
             /* ----------------------------- FindPhoneLabel ----------------------------- */
@@ -153,7 +153,7 @@ namespace OHOS
             }
             FindPhoneLabelButton->SetPosition(0, 366, 466, 100);
             FindPhoneLabelButton->SetViewId(FINDPHONE_LABELBUTTON);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             FindPhoneLabelButton->SetImageSrc(PNG_BUTTON_466x100_IMAGE, PNG_BUTTON_466x100_IMAGE);
 #endif
             FindPhoneLabelButton->SetTextId(STR_CLOSE); // 关闭
@@ -254,7 +254,7 @@ namespace OHOS
             }
             FindPhoneLabelButton->SetPosition(0, 366, 466, 100);
             FindPhoneLabelButton->SetViewId(FINDPHONE_LABELBUTTON);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             FindPhoneLabelButton->SetImageSrc(PNG_466x100BUTTON_IMAGE, PNG_466x100BUTTON_IMAGE);
 #endif
             // FindPhoneLabelButton->SetText("停止");
index 3581dae..d95fa63 100644 (file)
@@ -98,14 +98,14 @@ namespace OHOS
             if (strcmp(LanguageSwitchModel::GetInstance().GetCurLanguageCode(), view_languageid) == 0)
             {
 // 设置选中
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 item->GetUILabelButtonExt()->SetImageSrc(PNG_CHECKBOX_ON_IMAGE, PNG_CHECKBOX_ON_IMAGE);
 #endif
             }
             else
             {
 // 设置未选中
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 item->GetUILabelButtonExt()->SetImageSrc(PNG_CHECKBOX_OFF_IMAGE, PNG_CHECKBOX_OFF_IMAGE);
 #endif
             }
index bac660c..bbecf6d 100644 (file)
@@ -61,7 +61,7 @@ namespace OHOS
         m_LabelButtonExt.SetLabelPosition(47, 0);
         m_LabelButtonExt.SetImagePosition(290, 30);
         m_LabelButtonExt.SetTouchable(true);
-        #ifdef FD230
+        #ifdef CUSTOM_ZHIHUI
         m_LabelButtonExt.SetImageSrc(PNG_CHECKBOX_OFF_IMAGE, PNG_CHECKBOX_OFF_IMAGE);
         #endif
 
index 5ce6171..a0ce602 100644 (file)
@@ -49,7 +49,7 @@ namespace OHOS
             {
                 set_hint_code(id);
                 set_hint_flag(true);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 NativeAbility::GetInstance().EnterSlice(VIEW_LANGUAGE_SWITCH);
 #endif
             }
index 0a716dd..cb2ff09 100644 (file)
@@ -109,7 +109,7 @@ namespace OHOS
                 int32_t Hint_ID = LanguageSwitchView::GetInstance()->get_hint_id();
 
                 g_planguage->ChangeLanguage(Hint_ID);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 CustomEventPublish(TOPIC_EVENT_DEVICE_BIND, power_buf, 2);
 #endif
             }
@@ -119,7 +119,7 @@ namespace OHOS
 
                 g_planguage->ChangeLanguage(Hint_ID);
 
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 CustomEventPublish(TOPIC_EVENT_DEVICE_BIND, power_buf, 2);
 #endif
             }
@@ -158,7 +158,7 @@ namespace OHOS
         {
             if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true)
             {
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 NativeAbility::GetInstance().EnterSlice(VIEW_WATCH_QR_CODE);
 #endif
             }
@@ -190,7 +190,7 @@ namespace OHOS
                 m_labelext->SetTextId(STR_LANGUAGE_SELECTION);
                 m_labelext->ForceResetText(); // 强制刷新
 
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
                 p_UILabelButtonExt->SetImageSrc(PNG_CHECKBOX_ON_IMAGE, PNG_CHECKBOX_ON_IMAGE);
 #endif
                 p_UILabelButtonExt->Invalidate();
@@ -211,7 +211,7 @@ namespace OHOS
         // 如果是power键,且是亮屏状态,按键释放就返回上一级
         if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             NativeAbility::GetInstance().Back();
 #endif
 #ifdef SUPPORT_BLE_SERVICE
index 2621ea5..0897dc8 100644 (file)
@@ -296,7 +296,7 @@ namespace OHOS
         button_ensure->SetImagePosition(15, 15);
         button_ensure->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff191919, UIButton::PRESSED);
         button_ensure->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         button_ensure->SetImageSrc(PNG_SYSTEM_CHECK_ON_IMAGE, PNG_SYSTEM_CHECK_ON_IMAGE);
 #endif
         button_ensure->SetViewId("BUTTON_CHECK_OK");
index 1195365..4866361 100644 (file)
@@ -40,7 +40,7 @@
 #include "bleInstruct.h"
 #endif
 
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
 
 #ifdef SUPPORT_CAT1_HFP_AG_SERV
 #include "phoneservice/include/PhoneAGService.h"
@@ -1441,7 +1441,7 @@ void MsgCenterNotifyInactivityAccumulateTimeProc(const Topic topic, Request* req
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "memcpy_s cywee_Inactivity_Accumulate_Time_Info failed, ret = %d", rets);
         return;
     }
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
     if(cywee_Inactivity_Accumulate_Time_Info->output_number == INACTIVITY_MODE_NAP_ACCUMULATE_TIME_OUTPUT)
     {
         nap_data.total_time = cywee_Inactivity_Accumulate_Time_Info->total_time;
index 6545ed2..7cdfdbf 100644 (file)
@@ -4,7 +4,7 @@
 #include "components/ui_image_view.h"
 #include "components/ui_label_ext.h"
 #include "components/ui_scroll_view.h"
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
 #include "ui_resource_string.h"
 #endif
 #include <cmsis_os2.h>
@@ -170,7 +170,7 @@ namespace OHOS
             DrinkReminderTitleLabel->SetPosition(83, 52, 300, 35);
             DrinkReminderTitleLabel->SetStyle(STYLE_TEXT_FONT, 30);
             DrinkReminderTitleLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             DrinkReminderTitleLabel->SetTextId(STR_DRINK_WATER_REMINDER);
 #else
             DrinkReminderTitleLabel->SetText("喝水提醒");
@@ -197,7 +197,7 @@ namespace OHOS
             DrinkReminderNoteLabel->SetPosition(53, 248, 360, 70);
             DrinkReminderNoteLabel->SetStyle(STYLE_TEXT_FONT, 30);
             DrinkReminderNoteLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             DrinkReminderNoteLabel->SetTextId(STR_DRINK_WATER_REMINDER_NOTE);
 #endif
             DrinkReminderNoteLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
@@ -232,7 +232,7 @@ namespace OHOS
             DrinkReminderLabel->SetPosition(133, 399, 200, 35);
             DrinkReminderLabel->SetStyle(STYLE_TEXT_FONT, 30);
             DrinkReminderLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             DrinkReminderLabel->SetTextId(STR_KONW);
 #else
             DrinkReminderLabel->SetText("知道了");
index 5991460..a909c31 100644 (file)
@@ -4,7 +4,7 @@
 #include "uiservice/include/ui_service.h"
 #include "uicomponents/UIComponents.h"
 #include "wearable_log.h"
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
 #include "message/include/MessageModel.h"
 #endif
 #include "custom_runtime.h"
@@ -67,7 +67,7 @@ namespace OHOS
             NotificationManager::GetInstance()->StopNotify();
 // 点击关闭之后通知list进行刷新
 // SendMsgToUIService(UI_UPDATE_MESSAGE_DATA, 0, nullptr, 0);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             MessageModel::GetInstance().UpdateMessageView();
 #endif
         }
@@ -81,7 +81,7 @@ namespace OHOS
         NotificationManager::GetInstance()->StopNotify();
 // 点击关闭之后通知list进行刷新
 // SendMsgToUIService(UI_UPDATE_MESSAGE_DATA, 0, nullptr, 0);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         MessageModel::GetInstance().UpdateMessageView();
 #endif
         return true;
@@ -134,7 +134,7 @@ namespace OHOS
             MessageGroupView->SetOnDragListener(dragListener);
         }
 /*获取最新message*/
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         MessageData *data = MessageModel::GetInstance().GetNewMessage();
         if (data != nullptr)
         {
@@ -338,7 +338,7 @@ namespace OHOS
         NotificationManager::GetInstance()->StopNotify();
 // 点击关闭之后通知list进行刷新
 // SendMsgToUIService(UI_UPDATE_MESSAGE_DATA, 0, nullptr, 0);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
         MessageModel::GetInstance().UpdateMessageView();
 #endif
     }
index 889f4ee..fde7193 100644 (file)
@@ -13,7 +13,7 @@
 #include "components/ui_image_view.h"
 #include "components/ui_label_ext.h"
 #include "components/ui_scroll_view.h"
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
 #include "ui_resource_string.h"
 #endif
 #include <service/graphic_service.h>
@@ -264,7 +264,7 @@ namespace OHOS
             MotionRecognitionNoteLabel->SetPosition(53, 210, 360, 70);
             MotionRecognitionNoteLabel->SetStyle(STYLE_TEXT_FONT, 30);
             MotionRecognitionNoteLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             MotionRecognitionNoteLabel->SetTextId(MotionRecognitionViewEventListener::GetInstance().GetMotionType());
 #endif
             MotionRecognitionNoteLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
@@ -297,7 +297,7 @@ namespace OHOS
             MotionRecognitionIgnoreLabel->SetPosition(93, MotionRecognitionIgnoreButton->GetY() + 30, 100, 30);
             MotionRecognitionIgnoreLabel->SetStyle(STYLE_TEXT_FONT, 30);
             MotionRecognitionIgnoreLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             MotionRecognitionIgnoreLabel->SetTextId(STR_IGNORE);
 #endif
             MotionRecognitionIgnoreLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
@@ -330,7 +330,7 @@ namespace OHOS
             MotionRecognitionStartLabel->SetPosition(273, MotionRecognitionStartButton->GetY() + 30, 100, 30);
             MotionRecognitionStartLabel->SetStyle(STYLE_TEXT_FONT, 30);
             MotionRecognitionStartLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             MotionRecognitionStartLabel->SetTextId(STR_START);
 #endif
             MotionRecognitionStartLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
index 18b528c..65d7c2a 100644 (file)
@@ -200,7 +200,7 @@ namespace OHOS
             SedentaryReminderTitleLabel->SetPosition(83, 52, 300, 35);
             SedentaryReminderTitleLabel->SetStyle(STYLE_TEXT_FONT, 30);
             SedentaryReminderTitleLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             SedentaryReminderTitleLabel->SetTextId(STR_SEDENTARY_REMINDER);
 #else
             SedentaryReminderTitleLabel->SetText("久坐提醒");
@@ -228,7 +228,7 @@ namespace OHOS
             SedentaryReminderNoteLabel->SetPosition(53, 248, 360, 70);
             SedentaryReminderNoteLabel->SetStyle(STYLE_TEXT_FONT, 30);
             SedentaryReminderNoteLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             // SetLabelId(SedentaryReminderNoteLabel, STR_SEDENTARY_REMINDER_NOTE);
             SedentaryReminderNoteLabel->SetTextId(STR_SEDENTARY_REMINDER_NOTE);
 #endif
@@ -266,7 +266,7 @@ namespace OHOS
             SedentaryReminderLabel->SetPosition(133, 399, 200, 35);
             SedentaryReminderLabel->SetStyle(STYLE_TEXT_FONT, 30);
             SedentaryReminderLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
             SedentaryReminderLabel->SetTextId(STR_KONW);
 #else
             SedentaryReminderLabel->SetText("知道了");
index b19e678..baf1d38 100644 (file)
@@ -13,7 +13,7 @@
 #include "bundlems_slite_client.h"
 #include "abilityms_slite_client.h"
 #include "gt_bundle_manager_service.h"
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
 #include "uiservice/include/ui_service.h"
 #else
 #include "uiservice/ui_service.h"
@@ -24,7 +24,7 @@
 #include "js_fwk_common.h"
 #include "global.h"
 #include "msg_center_customer.h"
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
 #include "applist/include/ApplistModel.h"
 #else
 #include "applist/ApplistModel.h"
index 8bad935..6505733 100644 (file)
@@ -357,7 +357,7 @@ target = {
             'NANDFLASH_DS35X'
         ]
     },
-################# FD230 ############################
+################# CUSTOM_ZHIHUI ############################
     'brandy-native-js-fd230': {
         'base_target_name': 'brandy-native-js',
         #自定义配置项,选择硬件及功能参数
@@ -397,7 +397,7 @@ target = {
             'SUPPORT_PPG_SERVICE',
             'SUPPORT_CYWEE_SERVICE',
             'SUPPORT_BATTERY_SERVICE',
-            'FD230',
+            'CUSTOM_ZHIHUI',
             # 'SUPPORT_AUTO_OTA_SERVER',
             # 'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1',
             #"MEM_CHECK",
@@ -473,7 +473,7 @@ target = {
                     'NANDFLASH_DS35X',
                     'TPTYPE_FT6X46',
                     'CFG_FLASH_SIZE=16',
-                    'FD230',
+                    'CUSTOM_ZHIHUI',
                                        'SINGLE_USER_PARTITION'
                ],
                'ram_component': ["at_cmd"]
@@ -487,7 +487,7 @@ target = {
             'ENABLE_ECC',
             'CFG_DRIVERS_NANDFLASH',
             'CFG_FLASH_SIZE=16',
-            'FD230',
+            'CUSTOM_ZHIHUI',
             'NANDFLASH_DS35X'
         ]
     },
@@ -520,7 +520,7 @@ target = {
         'SUPPORT_CHARGER_PLUG_DETECTION_NOTIFICATION',
         # 'SUPPORT_AT_CUSTOMUTILS',
         # 'SUPPORT_BLE_SERVICE',
-        'FD230',
+        'CUSTOM_ZHIHUI',
         # 'SUPPORT_AUTO_OTA_SERVER',
         # 'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1',
         #"MEM_CHECK",
@@ -582,7 +582,7 @@ target = {
                     'NANDFLASH_DS35X',
                     'TPTYPE_FT6X46',
                     'CFG_FLASH_SIZE=16',
-                    'FD230',
+                    'CUSTOM_ZHIHUI',
                                        'SINGLE_USER_PARTITION'
                ],
                'ram_component': ["at_cmd"]
@@ -596,7 +596,7 @@ target = {
             'ENABLE_ECC',
             'CFG_DRIVERS_NANDFLASH',
             'CFG_FLASH_SIZE=16',
-            'FD230',
+            'CUSTOM_ZHIHUI',
             'NANDFLASH_DS35X'
         ]
     },
@@ -631,7 +631,7 @@ target = {
                     'SUPPORT_BAIDU_MAP',
                     'CFG_FLASH_SIZE=16',
                     'SUPPORT_BLE_SERVICE',
-                    'FD230',
+                    'CUSTOM_ZHIHUI',
                     #"MEM_CHECK",
                     #'ENABLE_WEBSOCKET',
                     'SINGLE_USER_PARTITION',
@@ -691,7 +691,7 @@ target = {
                'defines': ['FT_SINGLE_UART',
                     'CFG_FLASH_SIZE=16',
                                        'SINGLE_USER_PARTITION',
-                    'FD230',
+                    'CUSTOM_ZHIHUI',
                     'BOARD_U8',
                     'TPTYPE_CST86XX',
                     'NANDFLASH_DS35X'
@@ -705,7 +705,7 @@ target = {
                                        'SINGLE_USER_PARTITION',
                     'CFG_FLASH_SIZE=16',
                     'FT_SINGLE_UART',
-                    'FD230',
+                    'CUSTOM_ZHIHUI',
                     'BOARD_U8',
                     'NANDFLASH_DS35X'
                ],
@@ -740,7 +740,7 @@ target = {
                     'SUPPORT_BAIDU_MAP',
                     'CFG_FLASH_SIZE=8',
                     'SUPPORT_BLE_SERVICE',
-                    # 'FD230',
+                    # 'CUSTOM_ZHIHUI',
                     #"MEM_CHECK",
                     #'ENABLE_WEBSOCKET',
                     'SINGLE_USER_PARTITION',
@@ -852,7 +852,7 @@ target = {
                     'SUPPORT_BAIDU_MAP',
                     'CFG_FLASH_SIZE=8',
                     'SUPPORT_BLE_SERVICE',
-                    # 'FD230',
+                    # 'CUSTOM_ZHIHUI',
                     #"MEM_CHECK",
                     #'ENABLE_WEBSOCKET',
                     'SINGLE_USER_PARTITION',
@@ -971,7 +971,7 @@ target = {
             'SUPPORT_PPG_SERVICE',
             'SUPPORT_CYWEE_SERVICE',
             'SUPPORT_BATTERY_SERVICE',
-            'FD230',
+            'CUSTOM_ZHIHUI',
             # 'SUPPORT_AUTO_OTA_SERVER',
             # 'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1',
             #"MEM_CHECK",
@@ -1059,7 +1059,7 @@ target = {
                     'NANDFLASH_F35UQA',
                     'TPTYPE_CST86XX',
                     'CONFIG_NORFLASH_SIZE=16',
-                    'FD230',
+                    'CUSTOM_ZHIHUI',
                                        'SINGLE_USER_PARTITION'
                ],
                'ram_component': ["at_cmd"]
@@ -1073,12 +1073,140 @@ target = {
             'ENABLE_ECC',
             'CFG_DRIVERS_NANDFLASH',
             'CONFIG_NORFLASH_SIZE=16',
-            'FD230',
+            'CUSTOM_ZHIHUI',
             'NANDFLASH_F35UQA',
             'GPIO_POWERON_FLASH'
         ]
     },
 
+    ################# FD272 ############################
+    'brandy-native-js-fd272': {
+        'base_target_name': 'brandy-native-js',
+        #自定义配置项,选择硬件及功能参数
+        'defines': [
+            'BOARD_FD272',
+            # cat1 相关配置
+            'FT_SINGLE_UART',
+            'SUPPORT_CAT1_SERVICE',
+            
+            'CONFIG_EFUSE_READ_TO_RAM',
+             'CUSTOM_UTILS',
+            # 'CUSTOM_HID_SERVICE',
+            # 'WEARABLE_LOG_DEBUG',
+            'SUPPORT_RC_CALIBRATION',
+            'VIB_USE_PWM',
+            'CONFIG_PWM_SUPPORT',
+            # 'ACC_LIS2DOC',
+            'ENABLE_CUSTOM_I2C',
+            #'ENABLE_VIBRATOR',
+            'ENCODER_SUPPORT',
+            # 'SUPPORT_SPO2_NOTIFICATION',
+            # 'SUPPORT_SPO2_NOTIFICATION_TEST',
+            'SUPPORT_DEVICE_PAIRING_NOTIFICATION',
+            # 'ENABLE_FONT_VECTOR_GLOBAL', 
+            # 'ENABLE_SHAPING',
+            'SUPPORT_CHARGER_PLUG_DETECTION_NOTIFICATION',
+            # 'SUPPORT_AT_CUSTOMUTILS',
+            'SUPPORT_BLE_SERVICE',
+            'SUPPORT_MAG_SERVICE',
+            'SUPPORT_PPG_SERVICE',
+            'SUPPORT_CYWEE_SERVICE',
+            'SUPPORT_BATTERY_SERVICE',
+            'CUSTOM_ZHIHUI',
+            # 'SUPPORT_AUTO_OTA_SERVER',
+            # 'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1',
+            #"MEM_CHECK",
+            #'ENABLE_WEBSOCKET',
+            'CYWEE_MAC_ACTIVE',                        
+            #'SUPPORT_HID_SERVICE',
+            'SUPPORT_BAIDU_MAP',
+            'CFG_FLASH_SIZE=16',
+            'SINGLE_USER_PARTITION',
+            'TPTYPE_FT6X46',
+            'ROTARYENCODER_HX3507',
+            'NANDFLASH_DS35X',
+            'BLE_INSTRUCT',
+            # 'AILPAY_SUPPORT',
+            'SUPPORT_FACTORY_SERVICE',
+            # 'MEMORY_CORRUPTION',
+            
+        ],
+        #添加自定义应用
+       'ram_component': [
+                          'audio_at_service', 
+                          'media_at_service', 
+                          'bt_manager_at_service',
+                           "ppg_sensor_hx3695",
+                        #   "ppgBleService",
+                           "mag_sensor_mmc5603",
+                          "vibrator",
+                          "vibrator_service",
+                        #   "-:lwip",
+                          "cat1Service",
+                          "cat1Test",
+                          "4gTestcpp",
+                          "audio_manager",
+                          "CustomUIcomponentTool",
+                          "nativeabilityfwk",
+                          "custom_utils",
+                          "custom_utilscpp",
+                          "custom_config",
+                          "rotary_encoder",
+                           "nativelauncher",
+                            "ppg_service",
+                            "cywee_service",
+                           "batterry_service",
+                        #    "AIsystem",
+                        #    "AImain",
+                        #    "AIsyscall",
+                        #    "AIagent",
+                        #    "AIota",
+                        #    "AIsdk",
+                           "bleservice",
+                           "blemoder",
+                           "transspecard",
+                           "factorytest_service",
+                        #    "hid_service",
+                           "producttest",
+                            "ppg_hal",
+                            "mag_service",
+                            "cywee_dml",
+                            #"cyweeBleService",
+                           ],
+               'image_analysis': False,
+               'fs_image_path':'fd272',
+        'ssb_version': 'brandy-native-js-fd272-ssb',
+               # 'fs_image_path':'evb',
+               'fs_image': True
+    },
+    'brandy-native-js-fd272-r': {
+        'base_target_name': 'brandy-native-js-r',
+        #自定义配置项,选择硬件及功能参数
+        'defines': [
+                    'BOARD_FD272',
+                    'FT_SINGLE_UART',
+                    'NANDFLASH_DS35X',
+                    'TPTYPE_FT6X46',
+                    'CFG_FLASH_SIZE=16',
+                    'CUSTOM_ZHIHUI',
+                                       'SINGLE_USER_PARTITION'
+               ],
+               'ram_component': ["at_cmd"]
+    },
+    'brandy-native-js-fd272-ssb': {
+        'base_target_name': 'brandy-ssb',
+        #自定义配置项,选择硬件及功能参数
+        'defines': [
+            'BOARD_FD272',
+            'FT_SINGLE_UART',
+            'ENABLE_ECC',
+            'CFG_DRIVERS_NANDFLASH',
+            'CFG_FLASH_SIZE=16',
+            'CUSTOM_ZHIHUI',
+            'NANDFLASH_DS35X'
+        ]
+    },
+
     ################# leiniao ############################
     'brandy-native-js-ln': {
         'base_target_name': 'brandy-native-js',
@@ -1235,6 +1363,7 @@ target_group = {
     'pack_brandy_auto_ota_ser': ['brandy-ssb-native-js', 'brandy-auto-ota-ser'],
     'pack_brandy_auto_ota_cli': ['brandy-ssb-native-js', 'brandy-auto-ota-cli'],
     'pack_brandy_native_js_fd230': ['brandy-native-js-fd230-ssb', 'brandy-native-js-fd230-r', 'brandy-native-js-fd230'],
+    'pack_brandy_native_js_fd272': ['brandy-native-js-fd272-ssb', 'brandy-native-js-fd272-r', 'brandy-native-js-fd272'],
     'pack_brandy_native_js_u8': ['brandy-native-js-u8-ssb', 'brandy-native-js-u8-r', 'brandy-native-js-u8'],
     'pack_brandy_native_js_w9': ['brandy-native-js-w9-ssb', 'brandy-native-js-w9-r', 'brandy-native-js-w9'],
     'pack_brandy_native_js_n9': ['brandy-native-js-n9-ssb', 'brandy-native-js-n9-r', 'brandy-native-js-n9'],
diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd272-r/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd272-r/libgfx_rm.a
new file mode 100644 (file)
index 0000000..a731301
Binary files /dev/null and b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd272-r/libgfx_rm.a differ
diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd272/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd272/libgfx_rm.a
new file mode 100644 (file)
index 0000000..7337ef0
Binary files /dev/null and b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd272/libgfx_rm.a differ
diff --git a/code/sdk/middleware/services/gui/hal/display/brandy-native-js-fd272/libdisplay_gfx.a b/code/sdk/middleware/services/gui/hal/display/brandy-native-js-fd272/libdisplay_gfx.a
new file mode 100644 (file)
index 0000000..8864f8e
Binary files /dev/null and b/code/sdk/middleware/services/gui/hal/display/brandy-native-js-fd272/libdisplay_gfx.a differ
diff --git a/code/sdk/middleware/services/gui/uikit/brandy-native-js-fd272/libuikit_ext.a b/code/sdk/middleware/services/gui/uikit/brandy-native-js-fd272/libuikit_ext.a
new file mode 100644 (file)
index 0000000..9d278be
Binary files /dev/null and b/code/sdk/middleware/services/gui/uikit/brandy-native-js-fd272/libuikit_ext.a differ
index 8c3e46e..50bd341 100644 (file)
@@ -33,7 +33,7 @@
 #include "common/screen.h"\r
 #include "components/root_view.h"\r
 #ifdef SUPPORT_OHOSFWK\r
-#ifdef FD230\r
+#ifdef CUSTOM_ZHIHUI\r
 #include "screennotify/include/ui_screennotify.h"\r
 #else\r
 #include "screennotify/ui_screennotify.h"\r
index 7d757b0..b0e2bd3 100644 (file)
@@ -44,7 +44,7 @@
 #include "events/key_event.h"
 #endif
 #if defined (SUPPORT_DIAL_DEBUG)
-#ifdef FD230
+#ifdef CUSTOM_ZHIHUI
 #include "main/include/dial/WatchInterface.h"
 #else
 #include "main/dial/WatchInterface.h"
index be1a96f..73e8792 100644 (file)
@@ -18,7 +18,7 @@
 #include "ui_test_video_play.h"\r
 #include "components/root_view.h"\r
 #ifdef SUPPORT_OHOSFWK\r
-#ifdef FD230\r
+#ifdef CUSTOM_ZHIHUI\r
 #include "screennotify/include/ui_screennotify.h"\r
 #else\r
 #include "screennotify/ui_screennotify.h"\r
index 98082c1..c7f408c 100644 (file)
@@ -15,7 +15,7 @@
 #include "errcode.h"\r
 #include "transmit_resume.h"\r
 #ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE\r
-#ifdef FD230\r
+#ifdef CUSTOM_ZHIHUI\r
 #include "bluetooth/include/BluetoothChangeBle.h"\r
 #else\r
 #include "bluetooth/BluetoothChangeBle.h"\r
index 3b04ca4..59b3ec8 100644 (file)
@@ -22,7 +22,7 @@
 #include "diag_msg.h"\r
 #include "diag_dfx.h"\r
 #ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE\r
-#ifdef FD230\r
+#ifdef CUSTOM_ZHIHUI\r
 #include "bluetooth/include/BluetoothChangeBle.h"\r
 #else\r
 #include "bluetooth/BluetoothChangeBle.h"\r
index ca0aff2..cbde24e 100644 (file)
@@ -20,7 +20,7 @@
 #include "zdiag_adapt_layer.h"\r
 #include "errcode.h"\r
 #ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE\r
-#ifdef FD230\r
+#ifdef CUSTOM_ZHIHUI\r
 #include "bluetooth/include/BluetoothChangeBle.h"\r
 #else\r
 #include "bluetooth/BluetoothChangeBle.h"\r
diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd272-r/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd272-r/libx_vfs_private.a
new file mode 100644 (file)
index 0000000..ef8c37d
Binary files /dev/null and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd272-r/libx_vfs_private.a differ
diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd272/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd272/libx_vfs_private.a
new file mode 100644 (file)
index 0000000..1c08fcb
Binary files /dev/null and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd272/libx_vfs_private.a differ
diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd272-r/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd272-r/libfs_yaffs2.a
new file mode 100644 (file)
index 0000000..00beb36
Binary files /dev/null and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd272-r/libfs_yaffs2.a differ
diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd272/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd272/libfs_yaffs2.a
new file mode 100644 (file)
index 0000000..50e244a
Binary files /dev/null and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd272/libfs_yaffs2.a differ