From: SnickerSun <snickersun@163.com>
Date: Tue, 19 Mar 2024 11:57:45 +0000 (+0800)
Subject: 修复编译问题
X-Git-Tag: release_V1.2.70_20241020_135402~1295
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=65c9dd3d27139e6e565e297a314869d1561f8fcb;p=mirrors%2FFD230.git

修复编译问题
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
index fdd8a0daa..cf45fc220 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
@@ -119,19 +119,18 @@ namespace OHOS
         {
         case UICheckBox::SELECTED:
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BlueTooth Capability Is Enabled");
-<<<<<<< HEAD
             openBle();//主动开启蓝牙
             break;
         case UICheckBox::UNSELECTED:
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BlueTooth Capability Is Disabled");
             closeBle();
-=======
-            init_btaddr_btname();
-            break;
-        case UICheckBox::UNSELECTED:
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BlueTooth Capability Is Disabled");
-            disable_bt_service();
->>>>>>> 8e1e7eb140c0231eb2571eb3826cc0fe3679ea1e
+
+          //  init_btaddr_btname();
+            // break;
+        //case UICheckBox::UNSELECTED:
+          //  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BlueTooth Capability Is Disabled");
+          //  disable_bt_service();
+
             break;
         default:
             break;
diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h
index f52b7c9c9..d09e732c9 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h
@@ -14,12 +14,7 @@
 #include "system/include/SystemSuperviseView.h"
 #include "system/include/SystemLanguageView.h"
 #include "system/include/SystemFactoryResetView.h"
-<<<<<<< HEAD
-
-
-=======
 #include "system/include/Systemupgrade.h"
->>>>>>> 8e1e7eb140c0231eb2571eb3826cc0fe3679ea1e
 namespace OHOS
 {
     static const char *ABOUT_THE_WATCH = "AboutTheWatchButton";   // 关于手表
diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index c420c5a37..8b8bf0cd3 100755
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -164,11 +164,11 @@ target = {
                           #"nativelauncher",
                            "fd230launcher",
                            "ppg_service",
-                          "acc_sensor",
+                           "acc_sensor",
                         #    "cywee",
-                          "batterry_service"
-                            "ble_service",
-                          "hid_service"
+                           "batterry_service",
+                           "ble_service",
+                           "hid_service"
 						  ],
         'ram_component_set': ['bgh', 'media', 'gpu', 'graphic_uikit', 'bgh_audio', 'dfx_set', 'ohos_set', 'wearable_set', 'alipay_set'],
         'dsp_version': 'max',